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 <jfeh...@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 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
