[libvirt] [PATCH 0/2] libxl: A few more fixes related to vram
Commit 3e428670 broke the xlconfigtests, which commit 96b21fb0 mostly fixed. I found that running 'make check' on a machine with Xen installed (/usr/lib/xen/bin/qemu-{dm,system-i386} exists) failed. Test files containing <emulator>/usr/lib/xen/bin/qemu-dm</emulator> resulted in vram being set to the lower default values defined by the old qemu-dm. This series takes one possible approach to fixing the problem by only using qemu-xen (aka qemu upstream) in the test files (note that libxl defaults to qemu-xen if an emulator is not specified). Actually, it's patch 2 that changes the test files. I added patch 1 after seeing errors such as libvirt: error : internal error: Child process (/usr/lib/xen/bin/qemu-dm -help) unexpected exit status 127: libvirt: error : cannot execute binary /usr/lib/xen/bin/qemu-dm: No such file or directory when specifying a non-existent emulator. Another approach, suggested by Joao, is to allow vram == 0 and when building the domain, set video_memkb in the libxl_domain_build_info struct to LIBXL_MEMKB_DEFAULT, allowing libxl to pick the correct default. For this approach, the <video> parsing logic would have to change again. Currently, it sets a vram defaults if not done by the driver post parse function. Along with adjusting the libxl driver to handle vram = 0, all the xlconfigtests would have to change. E.g. - <model type='cirrus' vram='8192' heads='1' primary='yes'/> + <model type='cirrus' heads='1' primary='yes'/> Jim Fehlig (2): libxl: don't attempt to probe a non-existent emulator xlconfigtests: use qemu-xen in all test data files src/libxl/libxl_conf.c | 3 +++ tests/xlconfigdata/test-disk-positional-parms-full.cfg | 2 +- tests/xlconfigdata/test-disk-positional-parms-full.xml | 2 +- tests/xlconfigdata/test-disk-positional-parms-partial.cfg | 2 +- tests/xlconfigdata/test-disk-positional-parms-partial.xml | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.cfg | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.xml | 2 +- tests/xlconfigdata/test-fullvirt-nohap.cfg | 2 +- tests/xlconfigdata/test-fullvirt-nohap.xml | 2 +- tests/xlconfigdata/test-new-disk.cfg | 2 +- tests/xlconfigdata/test-new-disk.xml | 2 +- tests/xlconfigdata/test-rbd-multihost-noauth.cfg | 2 +- tests/xlconfigdata/test-rbd-multihost-noauth.xml | 2 +- tests/xlconfigdata/test-spice-features.cfg | 2 +- tests/xlconfigdata/test-spice-features.xml | 2 +- tests/xlconfigdata/test-spice.cfg | 2 +- tests/xlconfigdata/test-spice.xml | 2 +- tests/xlconfigdata/test-vif-rate.cfg | 2 +- tests/xlconfigdata/test-vif-rate.xml | 2 +- 19 files changed, 21 insertions(+), 18 deletions(-) -- 2.8.2
When probing the <emulator> with '-help' to determine if it is the old qemu, errors are reported if the emulator doesn't exist libvirt: error : internal error: Child process (/usr/lib/xen/bin/qemu-dm -help) unexpected exit status 127: libvirt: error : cannot execute binary /usr/lib/xen/bin/qemu-dm: No such file or directory Avoid the probe if the specified emulator doesn't exist, squelching the error. There is no behavior change since libxlDomainGetEmulatorType() would return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN if the probe failed via virCommandRun(). Signed-off-by: Jim Fehlig <jfehlig@suse.com> --- src/libxl/libxl_conf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index d927b37..3c388c7 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -916,6 +916,9 @@ libxlDomainGetEmulatorType(const virDomainDef *def) if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { if (def->emulator) { + if (!virFileExists(def->emulator)) + goto cleanup; + cmd = virCommandNew(def->emulator); virCommandAddArgList(cmd, "-help", NULL); -- 2.8.2
On Thu, May 12, 2016 at 02:40:28PM -0600, Jim Fehlig wrote:
When probing the <emulator> with '-help' to determine if it is the old qemu, errors are reported if the emulator doesn't exist
libvirt: error : internal error: Child process (/usr/lib/xen/bin/qemu-dm -help) unexpected exit status 127: libvirt: error : cannot execute binary /usr/lib/xen/bin/qemu-dm: No such file or directory
Avoid the probe if the specified emulator doesn't exist, squelching the error. There is no behavior change since libxlDomainGetEmulatorType() would return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN if the probe failed via virCommandRun().
Signed-off-by: Jim Fehlig <jfehlig@suse.com> --- src/libxl/libxl_conf.c | 3 +++ 1 file changed, 3 insertions(+)
ACK. If we don't treat it as an error, we should not report it as one. Jan
On 05/13/2016 01:41 AM, Ján Tomko wrote:
On Thu, May 12, 2016 at 02:40:28PM -0600, Jim Fehlig wrote:
When probing the <emulator> with '-help' to determine if it is the old qemu, errors are reported if the emulator doesn't exist
libvirt: error : internal error: Child process (/usr/lib/xen/bin/qemu-dm -help) unexpected exit status 127: libvirt: error : cannot execute binary /usr/lib/xen/bin/qemu-dm: No such file or directory
Avoid the probe if the specified emulator doesn't exist, squelching the error. There is no behavior change since libxlDomainGetEmulatorType() would return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN if the probe failed via virCommandRun().
Signed-off-by: Jim Fehlig <jfehlig@suse.com> --- src/libxl/libxl_conf.c | 3 +++ 1 file changed, 3 insertions(+)
ACK. If we don't treat it as an error, we should not report it as one.
Nod. libxlDomainGetEmulatorType() is just a best effort to see if the emulator is the old xen fork of qemu. Like libxl, if that effort fails we assume upstream qemu. Note that we do verify in libxlMakeDomBuildInfo() that the specified emulator actually exists before creating the domain. Regards, Jim
Some of the test configuration files in tests/xlconfigdata use the old qemu-dm as the emulator. Many of the configuration features tested (spice, rbd, multi-usb) are not even usable with the old qemu. Change these files to use the new qemu-xen (also known as qemu upstream) emulator. Note: This change fixes xlconfigtest failures when the old qemu is actually installed on the system. During device post parse, the libxl driver attempts to invoke the emulator to determine if it is the old or new qemu so it can properly set video RAM defaults. With the old qemu installed, the default video RAM was set differently than the expected value. Changing all the test data files to use qemu-xen ensures predictable results wrt default video RAM size. Signed-off-by: Jim Fehlig <jfehlig@suse.com> --- tests/xlconfigdata/test-disk-positional-parms-full.cfg | 2 +- tests/xlconfigdata/test-disk-positional-parms-full.xml | 2 +- tests/xlconfigdata/test-disk-positional-parms-partial.cfg | 2 +- tests/xlconfigdata/test-disk-positional-parms-partial.xml | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.cfg | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.xml | 2 +- tests/xlconfigdata/test-fullvirt-nohap.cfg | 2 +- tests/xlconfigdata/test-fullvirt-nohap.xml | 2 +- tests/xlconfigdata/test-new-disk.cfg | 2 +- tests/xlconfigdata/test-new-disk.xml | 2 +- tests/xlconfigdata/test-rbd-multihost-noauth.cfg | 2 +- tests/xlconfigdata/test-rbd-multihost-noauth.xml | 2 +- tests/xlconfigdata/test-spice-features.cfg | 2 +- tests/xlconfigdata/test-spice-features.xml | 2 +- tests/xlconfigdata/test-spice.cfg | 2 +- tests/xlconfigdata/test-spice.xml | 2 +- tests/xlconfigdata/test-vif-rate.cfg | 2 +- tests/xlconfigdata/test-vif-rate.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/xlconfigdata/test-disk-positional-parms-full.cfg b/tests/xlconfigdata/test-disk-positional-parms-full.cfg index c5bbb03..217d4dc 100644 --- a/tests/xlconfigdata/test-disk-positional-parms-full.cfg +++ b/tests/xlconfigdata/test-disk-positional-parms-full.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-disk-positional-parms-full.xml b/tests/xlconfigdata/test-disk-positional-parms-full.xml index 41e8804..1bc5b43 100644 --- a/tests/xlconfigdata/test-disk-positional-parms-full.xml +++ b/tests/xlconfigdata/test-disk-positional-parms-full.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xlconfigdata/test-disk-positional-parms-partial.cfg b/tests/xlconfigdata/test-disk-positional-parms-partial.cfg index 09eeb94..fd16db0 100644 --- a/tests/xlconfigdata/test-disk-positional-parms-partial.cfg +++ b/tests/xlconfigdata/test-disk-positional-parms-partial.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-disk-positional-parms-partial.xml b/tests/xlconfigdata/test-disk-positional-parms-partial.xml index 6578e59..e86a5be 100644 --- a/tests/xlconfigdata/test-disk-positional-parms-partial.xml +++ b/tests/xlconfigdata/test-disk-positional-parms-partial.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xlconfigdata/test-fullvirt-multiusb.cfg b/tests/xlconfigdata/test-fullvirt-multiusb.cfg index 003eb2b..6d456de 100755 --- a/tests/xlconfigdata/test-fullvirt-multiusb.cfg +++ b/tests/xlconfigdata/test-fullvirt-multiusb.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-multiusb.xml b/tests/xlconfigdata/test-fullvirt-multiusb.xml index d7df23a..fcd14e9 100644 --- a/tests/xlconfigdata/test-fullvirt-multiusb.xml +++ b/tests/xlconfigdata/test-fullvirt-multiusb.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xlconfigdata/test-fullvirt-nohap.cfg b/tests/xlconfigdata/test-fullvirt-nohap.cfg index 44bfa3c..e7e933d 100644 --- a/tests/xlconfigdata/test-fullvirt-nohap.cfg +++ b/tests/xlconfigdata/test-fullvirt-nohap.cfg @@ -13,7 +13,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-nohap.xml b/tests/xlconfigdata/test-fullvirt-nohap.xml index 9cd7b0b..e57e28b 100644 --- a/tests/xlconfigdata/test-fullvirt-nohap.xml +++ b/tests/xlconfigdata/test-fullvirt-nohap.xml @@ -20,7 +20,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xlconfigdata/test-new-disk.cfg b/tests/xlconfigdata/test-new-disk.cfg index b079056..4fe76b2 100644 --- a/tests/xlconfigdata/test-new-disk.cfg +++ b/tests/xlconfigdata/test-new-disk.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-new-disk.xml b/tests/xlconfigdata/test-new-disk.xml index 41e8804..1bc5b43 100644 --- a/tests/xlconfigdata/test-new-disk.xml +++ b/tests/xlconfigdata/test-new-disk.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xlconfigdata/test-rbd-multihost-noauth.cfg b/tests/xlconfigdata/test-rbd-multihost-noauth.cfg index 99f0889..01c15d5 100644 --- a/tests/xlconfigdata/test-rbd-multihost-noauth.cfg +++ b/tests/xlconfigdata/test-rbd-multihost-noauth.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-rbd-multihost-noauth.xml b/tests/xlconfigdata/test-rbd-multihost-noauth.xml index 728aa1e..ef9bd17 100644 --- a/tests/xlconfigdata/test-rbd-multihost-noauth.xml +++ b/tests/xlconfigdata/test-rbd-multihost-noauth.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xlconfigdata/test-spice-features.cfg b/tests/xlconfigdata/test-spice-features.cfg index 48dcd86..f8a25e4 100644 --- a/tests/xlconfigdata/test-spice-features.cfg +++ b/tests/xlconfigdata/test-spice-features.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ] parallel = "none" serial = "none" diff --git a/tests/xlconfigdata/test-spice-features.xml b/tests/xlconfigdata/test-spice-features.xml index 3820732..8175760 100644 --- a/tests/xlconfigdata/test-spice-features.xml +++ b/tests/xlconfigdata/test-spice-features.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xlconfigdata/test-spice.cfg b/tests/xlconfigdata/test-spice.cfg index 7ab23e1..abdf63d 100644 --- a/tests/xlconfigdata/test-spice.cfg +++ b/tests/xlconfigdata/test-spice.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ] parallel = "none" serial = "none" diff --git a/tests/xlconfigdata/test-spice.xml b/tests/xlconfigdata/test-spice.xml index f33691f..32cad27 100644 --- a/tests/xlconfigdata/test-spice.xml +++ b/tests/xlconfigdata/test-spice.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xlconfigdata/test-vif-rate.cfg b/tests/xlconfigdata/test-vif-rate.cfg index db932e5..34a19a2 100644 --- a/tests/xlconfigdata/test-vif-rate.cfg +++ b/tests/xlconfigdata/test-vif-rate.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-vif-rate.xml b/tests/xlconfigdata/test-vif-rate.xml index 3620e2a..3ab7488 100644 --- a/tests/xlconfigdata/test-vif-rate.xml +++ b/tests/xlconfigdata/test-vif-rate.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> -- 2.8.2
On Thu, May 12, 2016 at 02:40:29PM -0600, Jim Fehlig wrote:
Some of the test configuration files in tests/xlconfigdata use the old qemu-dm as the emulator. Many of the configuration features tested (spice, rbd, multi-usb) are not even usable with the old qemu. Change these files to use the new qemu-xen (also known as qemu upstream) emulator.
Note: This change fixes xlconfigtest failures when the old
s/fixes/works around/ The emulator should not be executed at all from the test suite.
qemu is actually installed on the system. During device post parse, the libxl driver attempts to invoke the emulator to determine if it is the old or new qemu so it can properly set video RAM defaults. With the old qemu installed, the default video RAM was set differently than the expected value. Changing all the test data files to use qemu-xen ensures predictable results wrt default video RAM size.
Signed-off-by: Jim Fehlig <jfehlig@suse.com> --- tests/xlconfigdata/test-disk-positional-parms-full.cfg | 2 +- tests/xlconfigdata/test-disk-positional-parms-full.xml | 2 +- tests/xlconfigdata/test-disk-positional-parms-partial.cfg | 2 +- tests/xlconfigdata/test-disk-positional-parms-partial.xml | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.cfg | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.xml | 2 +- tests/xlconfigdata/test-fullvirt-nohap.cfg | 2 +- tests/xlconfigdata/test-fullvirt-nohap.xml | 2 +- tests/xlconfigdata/test-new-disk.cfg | 2 +- tests/xlconfigdata/test-new-disk.xml | 2 +- tests/xlconfigdata/test-rbd-multihost-noauth.cfg | 2 +- tests/xlconfigdata/test-rbd-multihost-noauth.xml | 2 +- tests/xlconfigdata/test-spice-features.cfg | 2 +- tests/xlconfigdata/test-spice-features.xml | 2 +- tests/xlconfigdata/test-spice.cfg | 2 +- tests/xlconfigdata/test-spice.xml | 2 +- tests/xlconfigdata/test-vif-rate.cfg | 2 +- tests/xlconfigdata/test-vif-rate.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-)
ACK, the values generated assumed the qemu-xen emulator, since my qemu-dm does not live in /usr/lib/xen/bin Jan
On 05/13/2016 01:40 AM, Ján Tomko wrote:
On Thu, May 12, 2016 at 02:40:29PM -0600, Jim Fehlig wrote:
Some of the test configuration files in tests/xlconfigdata use the old qemu-dm as the emulator. Many of the configuration features tested (spice, rbd, multi-usb) are not even usable with the old qemu. Change these files to use the new qemu-xen (also known as qemu upstream) emulator.
Note: This change fixes xlconfigtest failures when the old s/fixes/works around/
This is true. I'll change it.
The emulator should not be executed at all from the test suite.
Agreed, I just wasn't sure how to do that. I'll need to do more poking around the test code. Any suggestions of an existing example or pattern to follow would be much appreciated.
qemu is actually installed on the system. During device post parse, the libxl driver attempts to invoke the emulator to determine if it is the old or new qemu so it can properly set video RAM defaults. With the old qemu installed, the default video RAM was set differently than the expected value. Changing all the test data files to use qemu-xen ensures predictable results wrt default video RAM size.
Signed-off-by: Jim Fehlig <jfehlig@suse.com> --- tests/xlconfigdata/test-disk-positional-parms-full.cfg | 2 +- tests/xlconfigdata/test-disk-positional-parms-full.xml | 2 +- tests/xlconfigdata/test-disk-positional-parms-partial.cfg | 2 +- tests/xlconfigdata/test-disk-positional-parms-partial.xml | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.cfg | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.xml | 2 +- tests/xlconfigdata/test-fullvirt-nohap.cfg | 2 +- tests/xlconfigdata/test-fullvirt-nohap.xml | 2 +- tests/xlconfigdata/test-new-disk.cfg | 2 +- tests/xlconfigdata/test-new-disk.xml | 2 +- tests/xlconfigdata/test-rbd-multihost-noauth.cfg | 2 +- tests/xlconfigdata/test-rbd-multihost-noauth.xml | 2 +- tests/xlconfigdata/test-spice-features.cfg | 2 +- tests/xlconfigdata/test-spice-features.xml | 2 +- tests/xlconfigdata/test-spice.cfg | 2 +- tests/xlconfigdata/test-spice.xml | 2 +- tests/xlconfigdata/test-vif-rate.cfg | 2 +- tests/xlconfigdata/test-vif-rate.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-)
ACK, the values generated assumed the qemu-xen emulator, since my qemu-dm does not live in /usr/lib/xen/bin
You would only have qemu-dm if Xen was installed (it wouldn't be in a -devel package) and it was built with '--enable-qemu-traditional'. I think this is a good change even if as a side affect it works around the make check failures when /usr/lib/xen/bin/qemu-dm exists, As mentioned in the commit message, the changed test files contain config that require upstream qemu anyhow, so using qemu-dm provides a bad example config. I've pushed the patches. Thanks for helping with this! Regards, Jim
On 05/13/2016 10:13 AM, Jim Fehlig wrote:
On 05/13/2016 01:40 AM, Ján Tomko wrote:
On Thu, May 12, 2016 at 02:40:29PM -0600, Jim Fehlig wrote:
Some of the test configuration files in tests/xlconfigdata use the old qemu-dm as the emulator. Many of the configuration features tested (spice, rbd, multi-usb) are not even usable with the old qemu. Change these files to use the new qemu-xen (also known as qemu upstream) emulator.
Note: This change fixes xlconfigtest failures when the old s/fixes/works around/ This is true. I'll change it.
Bah. I forgot to do it before pushing :-(. Regards, Jim
participants (2)
-
Jim Fehlig -
Ján Tomko