diff options
| author |   Daniel P. Berrange <berrange@redhat.com> | 2008-09-05 11:52:12 +0000 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2008-09-05 11:52:12 +0000 |
| commit | 126d3ebeeaa78fb2da31d6534756d45ee7d45bf1 (patch) | |
| tree | 71fa982522f3fa345adb3295702c8eeb48e2db2a /tests | |
| parent | Fix xen capabilities data creation (diff) | |
| download | libvirt-126d3ebeeaa78fb2da31d6534756d45ee7d45bf1.tar.gz libvirt-126d3ebeeaa78fb2da31d6534756d45ee7d45bf1.tar.bz2 libvirt-126d3ebeeaa78fb2da31d6534756d45ee7d45bf1.zip | |
Fix starting of xen domains without a PVFB console by removing default emulator
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/xmconfigdata/test-paravirt-net-e1000.xml | 1 | ||||
| -rw-r--r-- | tests/xmconfigdata/test-paravirt-new-pvfb.xml | 1 | ||||
| -rw-r--r-- | tests/xmconfigdata/test-paravirt-old-pvfb.xml | 1 | ||||
| -rw-r--r-- | tests/xml2sexprdata/xml2sexpr-fv-kernel.xml | 1 | ||||
| -rw-r--r-- | tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr | 2 |
5 files changed, 2 insertions, 4 deletions
diff --git a/tests/xmconfigdata/test-paravirt-net-e1000.xml b/tests/xmconfigdata/test-paravirt-net-e1000.xml index 8efab5871..c423af12a 100644 --- a/tests/xmconfigdata/test-paravirt-net-e1000.xml +++ b/tests/xmconfigdata/test-paravirt-net-e1000.xml @@ -13,7 +13,6 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> <driver name='phy'/> <source dev='/dev/HostVG/XenGuest1'/> diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb.xml b/tests/xmconfigdata/test-paravirt-new-pvfb.xml index 620f701e0..de1a9aeca 100644 --- a/tests/xmconfigdata/test-paravirt-new-pvfb.xml +++ b/tests/xmconfigdata/test-paravirt-new-pvfb.xml @@ -13,7 +13,6 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> <driver name='phy'/> <source dev='/dev/HostVG/XenGuest1'/> diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb.xml b/tests/xmconfigdata/test-paravirt-old-pvfb.xml index 620f701e0..de1a9aeca 100644 --- a/tests/xmconfigdata/test-paravirt-old-pvfb.xml +++ b/tests/xmconfigdata/test-paravirt-old-pvfb.xml @@ -13,7 +13,6 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> <driver name='phy'/> <source dev='/dev/HostVG/XenGuest1'/> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-kernel.xml b/tests/xml2sexprdata/xml2sexpr-fv-kernel.xml index d33218c50..6c76669e5 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-kernel.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-kernel.xml @@ -14,6 +14,7 @@ <on_reboot>destroy</on_reboot> <on_crash>destroy</on_crash> <devices> + <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='file' device='disk'> <source file='/root/some.img'/> <target dev='xvda'/> diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr index 7a04acbb1..7d4de13a9 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr @@ -1 +1 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')(device_model '/usr/lib/xen/bin/qemu-dm')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vkbd))(device (vfb (type vnc)(vncunused 0)(vncdisplay 6)(vnclisten '127.0.0.1')(vncpasswd '123456')(keymap 'ja'))))
\ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vkbd))(device (vfb (type vnc)(vncunused 0)(vncdisplay 6)(vnclisten '127.0.0.1')(vncpasswd '123456')(keymap 'ja'))))
\ No newline at end of file |