From df89071faa0bac101f8513d5c08dc823f8a3b71d Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 20 Nov 2020 13:29:14 +0100 Subject: [PATCH] xen: recognize device_model_override Since Xen 4.2 libxl expects device_model_override="/path" instead of device_model="/path". Adjust the code to parse this as . While libxl also recognizes device_model_version="", this knob is not required for libvirt. A runtime detection exists in libvirt to select either "qemu-xen" or "qemu-xen-traditional". Since qemu-xen-traditional is marked as supported just for stubdoms there is no need to handle it. Test data files with 'device_model' were adjusted to use 'device_model_override' instead. Signed-off-by: Olaf Hering Reviewed-by: Jim Fehlig --- src/libxl/xen_common.c | 4 ++-- tests/xlconfigdata/test-disk-positional-parms-full.cfg | 2 +- tests/xlconfigdata/test-disk-positional-parms-partial.cfg | 2 +- tests/xlconfigdata/test-disk-qed.cfg | 2 +- tests/xlconfigdata/test-fullvirt-acpi-slic.cfg | 2 +- tests/xlconfigdata/test-fullvirt-cpuid.cfg | 2 +- .../test-fullvirt-direct-kernel-boot-bogus-extra.cfg | 2 +- tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.cfg | 2 +- tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg | 2 +- tests/xlconfigdata/test-fullvirt-hpet-timer.cfg | 2 +- tests/xlconfigdata/test-fullvirt-hypervisor-features.cfg | 2 +- tests/xlconfigdata/test-fullvirt-multi-timer.cfg | 2 +- tests/xlconfigdata/test-fullvirt-multiserial.cfg | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.cfg | 2 +- tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.cfg | 2 +- tests/xlconfigdata/test-fullvirt-nestedhvm.cfg | 2 +- tests/xlconfigdata/test-fullvirt-nohap.cfg | 2 +- tests/xlconfigdata/test-fullvirt-ovmf.cfg | 2 +- tests/xlconfigdata/test-fullvirt-ovswitch-tagged.cfg | 2 +- tests/xlconfigdata/test-fullvirt-ovswitch-trunked.cfg | 2 +- tests/xlconfigdata/test-fullvirt-pci.cfg | 2 +- tests/xlconfigdata/test-fullvirt-tsc-timer.cfg | 2 +- tests/xlconfigdata/test-fullvirt-type.cfg | 2 +- tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.cfg | 2 +- tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg | 2 +- tests/xlconfigdata/test-fullvirt-vnuma-partialdist.cfg | 2 +- tests/xlconfigdata/test-fullvirt-vnuma.cfg | 2 +- tests/xlconfigdata/test-net-fakemodel.cfg | 2 +- tests/xlconfigdata/test-new-disk.cfg | 2 +- tests/xlconfigdata/test-qemu-passthrough.cfg | 2 +- tests/xlconfigdata/test-rbd-multihost-noauth.cfg | 2 +- tests/xlconfigdata/test-spice-features.cfg | 2 +- tests/xlconfigdata/test-spice.cfg | 2 +- tests/xlconfigdata/test-vif-multi-ip.cfg | 2 +- tests/xlconfigdata/test-vif-rate.cfg | 2 +- tests/xlconfigdata/test-vif-typename.cfg | 2 +- tests/xmconfigdata/test-escape-paths.cfg | 2 +- tests/xmconfigdata/test-fullvirt-default-feature.cfg | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-localtime.cfg | 2 +- tests/xmconfigdata/test-fullvirt-net-netfront.cfg | 2 +- tests/xmconfigdata/test-fullvirt-new-cdrom.cfg | 2 +- tests/xmconfigdata/test-fullvirt-nohap.cfg | 2 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-file.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-null.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-pipe.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-pty.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-stdio.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-udp.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-unix.cfg | 2 +- tests/xmconfigdata/test-fullvirt-sound.cfg | 2 +- tests/xmconfigdata/test-fullvirt-usbmouse.cfg | 2 +- tests/xmconfigdata/test-fullvirt-usbtablet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-utc.cfg | 2 +- tests/xmconfigdata/test-no-source-cdrom.cfg | 2 +- tests/xmconfigdata/test-pci-dev-syntax.cfg | 2 +- tests/xmconfigdata/test-pci-devs.cfg | 2 +- 61 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index 407d28aaa5..2d1f5ea5f5 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -1508,7 +1508,7 @@ xenParseConfigCommon(virConfPtr conf, if (xenParseTimeOffset(conf, def) < 0) return -1; - if (xenConfigCopyStringOpt(conf, "device_model", &def->emulator) < 0) + if (xenConfigCopyStringOpt(conf, "device_model_override", &def->emulator) < 0) return -1; if (STREQ(nativeFormat, XEN_CONFIG_FORMAT_XL)) { @@ -2242,7 +2242,7 @@ static int xenFormatEmulator(virConfPtr conf, virDomainDefPtr def) { if (def->emulator && - xenConfigSetString(conf, "device_model", def->emulator) < 0) + xenConfigSetString(conf, "device_model_override", def->emulator) < 0) return -1; return 0; diff --git a/tests/xlconfigdata/test-disk-positional-parms-full.cfg b/tests/xlconfigdata/test-disk-positional-parms-full.cfg index 217d4dccf3..b5965945e1 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-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-disk-positional-parms-partial.cfg b/tests/xlconfigdata/test-disk-positional-parms-partial.cfg index 940304e7b2..be5e23e39e 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-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-disk-qed.cfg b/tests/xlconfigdata/test-disk-qed.cfg index 78421767de..5ae93f4d8a 100644 --- a/tests/xlconfigdata/test-disk-qed.cfg +++ b/tests/xlconfigdata/test-disk-qed.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-acpi-slic.cfg b/tests/xlconfigdata/test-fullvirt-acpi-slic.cfg index 99b1726343..b5bd9c9790 100644 --- a/tests/xlconfigdata/test-fullvirt-acpi-slic.cfg +++ b/tests/xlconfigdata/test-fullvirt-acpi-slic.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-cpuid.cfg b/tests/xlconfigdata/test-fullvirt-cpuid.cfg index bb7b9c7b32..e71a87dfe8 100644 --- a/tests/xlconfigdata/test-fullvirt-cpuid.cfg +++ b/tests/xlconfigdata/test-fullvirt-cpuid.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.cfg b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.cfg index 8012737c88..455ae0cee3 100644 --- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.cfg +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.cfg b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.cfg index 4ed5a90e18..10e64b0876 100644 --- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.cfg +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg index 110f0a0cd1..f52c33dd3e 100644 --- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-hpet-timer.cfg b/tests/xlconfigdata/test-fullvirt-hpet-timer.cfg index a566bd75a3..b73ebf330c 100644 --- a/tests/xlconfigdata/test-fullvirt-hpet-timer.cfg +++ b/tests/xlconfigdata/test-fullvirt-hpet-timer.cfg @@ -14,7 +14,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-hypervisor-features.cfg b/tests/xlconfigdata/test-fullvirt-hypervisor-features.cfg index 88f018c823..87156cc2db 100644 --- a/tests/xlconfigdata/test-fullvirt-hypervisor-features.cfg +++ b/tests/xlconfigdata/test-fullvirt-hypervisor-features.cfg @@ -13,7 +13,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-multi-timer.cfg b/tests/xlconfigdata/test-fullvirt-multi-timer.cfg index 5a78585821..c897b2a161 100644 --- a/tests/xlconfigdata/test-fullvirt-multi-timer.cfg +++ b/tests/xlconfigdata/test-fullvirt-multi-timer.cfg @@ -15,7 +15,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-multiserial.cfg b/tests/xlconfigdata/test-fullvirt-multiserial.cfg index 1fd765b087..25bc4506e7 100644 --- a/tests/xlconfigdata/test-fullvirt-multiserial.cfg +++ b/tests/xlconfigdata/test-fullvirt-multiserial.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-multiusb.cfg b/tests/xlconfigdata/test-fullvirt-multiusb.cfg index 6d456deb21..afb041d53c 100644 --- 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-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.cfg b/tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.cfg index d4b9f452de..bdf94e79e2 100644 --- a/tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.cfg +++ b/tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-nestedhvm.cfg b/tests/xlconfigdata/test-fullvirt-nestedhvm.cfg index 281f1268a5..5882bfee9f 100644 --- a/tests/xlconfigdata/test-fullvirt-nestedhvm.cfg +++ b/tests/xlconfigdata/test-fullvirt-nestedhvm.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-nohap.cfg b/tests/xlconfigdata/test-fullvirt-nohap.cfg index e7e933df6e..4235909f07 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-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-ovmf.cfg b/tests/xlconfigdata/test-fullvirt-ovmf.cfg index b08e7fd98a..4d31a81108 100644 --- a/tests/xlconfigdata/test-fullvirt-ovmf.cfg +++ b/tests/xlconfigdata/test-fullvirt-ovmf.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-ovswitch-tagged.cfg b/tests/xlconfigdata/test-fullvirt-ovswitch-tagged.cfg index 6a3dc3cfeb..5ba84ad22a 100644 --- a/tests/xlconfigdata/test-fullvirt-ovswitch-tagged.cfg +++ b/tests/xlconfigdata/test-fullvirt-ovswitch-tagged.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-ovswitch-trunked.cfg b/tests/xlconfigdata/test-fullvirt-ovswitch-trunked.cfg index 29e9d38ae8..edd53c9a08 100644 --- a/tests/xlconfigdata/test-fullvirt-ovswitch-trunked.cfg +++ b/tests/xlconfigdata/test-fullvirt-ovswitch-trunked.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-pci.cfg b/tests/xlconfigdata/test-fullvirt-pci.cfg index 5a3f572e25..e639cf9c83 100644 --- a/tests/xlconfigdata/test-fullvirt-pci.cfg +++ b/tests/xlconfigdata/test-fullvirt-pci.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-tsc-timer.cfg b/tests/xlconfigdata/test-fullvirt-tsc-timer.cfg index 587d3461f8..a30052dbf7 100644 --- a/tests/xlconfigdata/test-fullvirt-tsc-timer.cfg +++ b/tests/xlconfigdata/test-fullvirt-tsc-timer.cfg @@ -14,7 +14,7 @@ localtime = 1 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-type.cfg b/tests/xlconfigdata/test-fullvirt-type.cfg index f8ecc2e190..9a9854ef38 100644 --- a/tests/xlconfigdata/test-fullvirt-type.cfg +++ b/tests/xlconfigdata/test-fullvirt-type.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 0 parallel = "none" diff --git a/tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.cfg b/tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.cfg index edba69a172..98b7ca7f4f 100644 --- a/tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.cfg +++ b/tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg b/tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg index 8186edfee0..88f1c03fcb 100644 --- a/tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg +++ b/tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-vnuma-partialdist.cfg b/tests/xlconfigdata/test-fullvirt-vnuma-partialdist.cfg index 861a50e76b..e117794086 100644 --- a/tests/xlconfigdata/test-fullvirt-vnuma-partialdist.cfg +++ b/tests/xlconfigdata/test-fullvirt-vnuma-partialdist.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-vnuma.cfg b/tests/xlconfigdata/test-fullvirt-vnuma.cfg index 91e233ac27..2220159ba4 100644 --- a/tests/xlconfigdata/test-fullvirt-vnuma.cfg +++ b/tests/xlconfigdata/test-fullvirt-vnuma.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-net-fakemodel.cfg b/tests/xlconfigdata/test-net-fakemodel.cfg index 70bd922ac0..6df0a0dc41 100644 --- a/tests/xlconfigdata/test-net-fakemodel.cfg +++ b/tests/xlconfigdata/test-net-fakemodel.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-new-disk.cfg b/tests/xlconfigdata/test-new-disk.cfg index 4fe76b257f..20dca0c257 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-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-qemu-passthrough.cfg b/tests/xlconfigdata/test-qemu-passthrough.cfg index 42aad92205..79347d0ac8 100644 --- a/tests/xlconfigdata/test-qemu-passthrough.cfg +++ b/tests/xlconfigdata/test-qemu-passthrough.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-rbd-multihost-noauth.cfg b/tests/xlconfigdata/test-rbd-multihost-noauth.cfg index 01c15d59a1..5906865047 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-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-spice-features.cfg b/tests/xlconfigdata/test-spice-features.cfg index f8a25e497a..944c653d70 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-system-i386" +device_model_override = "/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.cfg b/tests/xlconfigdata/test-spice.cfg index abdf63dd25..976c166e04 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-system-i386" +device_model_override = "/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-vif-multi-ip.cfg b/tests/xlconfigdata/test-vif-multi-ip.cfg index 4a5d37f960..b082b9b22b 100644 --- a/tests/xlconfigdata/test-vif-multi-ip.cfg +++ b/tests/xlconfigdata/test-vif-multi-ip.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-vif-rate.cfg b/tests/xlconfigdata/test-vif-rate.cfg index 34a19a29b6..f6270c2d1e 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-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-vif-typename.cfg b/tests/xlconfigdata/test-vif-typename.cfg index fb5d94c27a..b2f1157438 100644 --- a/tests/xlconfigdata/test-vif-typename.cfg +++ b/tests/xlconfigdata/test-vif-typename.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-escape-paths.cfg b/tests/xmconfigdata/test-escape-paths.cfg index d3e410ffd2..03abf8d568 100644 --- a/tests/xmconfigdata/test-escape-paths.cfg +++ b/tests/xmconfigdata/test-escape-paths.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386&test" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386&test" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.cfg b/tests/xmconfigdata/test-fullvirt-default-feature.cfg index b01e290239..86d1d809c0 100644 --- a/tests/xmconfigdata/test-fullvirt-default-feature.cfg +++ b/tests/xmconfigdata/test-fullvirt-default-feature.cfg @@ -13,7 +13,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg index 16fe985946..1cf6fbd333 100644 --- a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg +++ b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg @@ -13,7 +13,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg index eb118427cc..bf8c4134c0 100644 --- a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg +++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg @@ -13,7 +13,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-localtime.cfg b/tests/xmconfigdata/test-fullvirt-localtime.cfg index 2f8514d5e4..bc7ed271e3 100644 --- a/tests/xmconfigdata/test-fullvirt-localtime.cfg +++ b/tests/xmconfigdata/test-fullvirt-localtime.cfg @@ -12,7 +12,7 @@ localtime = 1 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.cfg b/tests/xmconfigdata/test-fullvirt-net-netfront.cfg index b744b2184e..901f620eff 100644 --- a/tests/xmconfigdata/test-fullvirt-net-netfront.cfg +++ b/tests/xmconfigdata/test-fullvirt-net-netfront.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg index f9fce015e0..6fc9283a4c 100644 --- a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg +++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-nohap.cfg b/tests/xmconfigdata/test-fullvirt-nohap.cfg index e5375dfdb6..6bd4eb4c29 100644 --- a/tests/xmconfigdata/test-fullvirt-nohap.cfg +++ b/tests/xmconfigdata/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-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg index 94c52d975b..62e18c1af3 100644 --- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg +++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.cfg b/tests/xmconfigdata/test-fullvirt-serial-file.cfg index 9193cc8717..0574f97ccc 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-file.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-file.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.cfg b/tests/xmconfigdata/test-fullvirt-serial-null.cfg index 9ef60b4bd5..839818b228 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-null.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-null.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg index 60e41ab556..bdbfe30d1c 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg index d4e0763d15..3007e96efa 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg index efefe109b9..9af628c457 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg index 224f5274e1..cbbb30a42e 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg index e70ab847ec..d2b65b5c2d 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg index 9e7acdf0c4..8d44b053a8 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg index 964beba4fe..a6cc4a4cd9 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-sound.cfg b/tests/xmconfigdata/test-fullvirt-sound.cfg index 501463f54c..5a71618f83 100644 --- a/tests/xmconfigdata/test-fullvirt-sound.cfg +++ b/tests/xmconfigdata/test-fullvirt-sound.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg index 660f18e776..07d49573d0 100644 --- a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg +++ b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg index 90428882cc..45364b1a57 100644 --- a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg +++ b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-utc.cfg b/tests/xmconfigdata/test-fullvirt-utc.cfg index f9fce015e0..6fc9283a4c 100644 --- a/tests/xmconfigdata/test-fullvirt-utc.cfg +++ b/tests/xmconfigdata/test-fullvirt-utc.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-no-source-cdrom.cfg b/tests/xmconfigdata/test-no-source-cdrom.cfg index 8439961215..a6045244e5 100644 --- a/tests/xmconfigdata/test-no-source-cdrom.cfg +++ b/tests/xmconfigdata/test-no-source-cdrom.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "destroy" on_crash = "destroy" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-pci-dev-syntax.cfg b/tests/xmconfigdata/test-pci-dev-syntax.cfg index e0f00d9bd7..c3add42e56 100644 --- a/tests/xmconfigdata/test-pci-dev-syntax.cfg +++ b/tests/xmconfigdata/test-pci-dev-syntax.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "destroy" on_crash = "destroy" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-pci-devs.cfg b/tests/xmconfigdata/test-pci-devs.cfg index 188227e187..9c6d3311a8 100644 --- a/tests/xmconfigdata/test-pci-devs.cfg +++ b/tests/xmconfigdata/test-pci-devs.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "destroy" on_crash = "destroy" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1