← Back to branch summary

~serge-hallyn/ubuntu/raring/libvirt/libvirt-hugepages

« back to all changes in this revision

Viewing changes to tests/qemuxml2argvdata/qemu.sh

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-13 15:44:12 UTC
  • mfrom: (1.2.13)
  • Revision ID: package-import@ubuntu.com-20120513154412-fgmn5sxqdzgnzlx3
Tags: 0.9.12-0ubuntu1
* New upstream version:
  * Synchronize with debian packaging:
    - debian/control: Update build depends.
    - debian/libvirt-bin.postrm: Cleanup /var/log/libvirt
      on purge.
    - Bump standards verson (no changes).
    - debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch: Added
  * Dropped patches:
    - debian/patches/Debianize-libvirt-guests.patch
    - debian/patches/rewrite-lxc-controller-eof-handling-yet-again
    - debian/patches/ubuntu/libnl13.patch
    - debian/patches/ubuntu/fix-lxc-startup-error.patch
    - debian/patches/ubuntu/fix-bridge-fd.patch
    - debian/patches/ubuntu/skip-labelling-network-disks.patch
    - debian/patches/ubuntu/xen-xend-shutdown-detection.patch
    - debian/patches/ubuntu/xen-config-no-vfb-for-hvm.patch
    - debian/patches/debian/Disable-daemon-start-test.patch
    - debian/patches/debian/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
    - debian/patches/ubuntu/9006-default-config-test-case.patch
    - debian/patches/fix-block-migration.patch
    - debian/patches/ubuntu/9022-qemu-unescape-HMP-commands-before-converting-them-to.patch
    - debian/patches/ubuntu/9023-qemu-change-rbd-auth_supported-separation-character-.patch
    - debian/patches/ubuntu/9024-qemu-allow-snapshotting-of-sheepdog-and-rbd-disks.patch
    - debian/patches/9025-qemu-change-rbd-auth_supported-separation-character-.patch
    - debian/patches/ubuntu/arm-gcc-workaround.patch
  * Rediffed:
    - debian/patches/Allow-libvirt-group-to-access-the-socket.patch
    - debian/patches/Disable-failing-virnetsockettest.patch
    - debian/patches/dnsmasq-as-priv-user
    - debian/patches/9002-better_default_uri_virsh.patch
  * debian/control: Add libnl-route-3-dev ass a build depends.
  * debian/patches/libnl3-build-fix.patch: Fix build with libnl3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/qemuxml2argvdata/qemu.sh
1
1
#! /bin/sh
2
2
 
3
 
candidates="/usr/bin/qemu-kvm
4
 
            /usr/libexec/qemu-kvm
5
 
            /usr/bin/qemu-system-x86_64
6
 
            /usr/bin/qemu"
7
 
qemu=
8
 
for candidate in $candidates; do
9
 
    if test -x $candidate; then
10
 
        qemu=$candidate
11
 
        break
12
 
    fi
13
 
done
14
 
 
15
 
real_qemu()
16
 
{
17
 
    if test x$qemu != x; then
18
 
        exec $qemu "$@"
19
 
    else
20
 
        return 1
21
 
    fi
22
 
}
23
 
 
24
 
faked_machine()
25
 
{
26
 
    echo "pc"
27
 
}
28
 
 
29
 
faked_cpu()
30
 
{
31
 
    cat <<EOF
32
 
x86       Opteron_G3
33
 
x86       Opteron_G2
34
 
x86       Opteron_G1
35
 
x86          Nehalem
36
 
x86           Penryn
37
 
x86           Conroe
38
 
x86           [n270]
39
 
x86         [athlon]
40
 
x86       [pentium3]
41
 
x86       [pentium2]
42
 
x86        [pentium]
43
 
x86            [486]
44
 
x86        [coreduo]
45
 
x86         [qemu32]
46
 
x86          [kvm64]
47
 
x86       [core2duo]
48
 
x86         [phenom]
49
 
x86         [qemu64]
50
 
x86           [host]
51
 
EOF
52
 
}
 
3
. ${0%/*}/qemu-lib.sh
53
4
 
54
5
case $* in
55
6
"-M ?")