Devel

Download

devel@lists.libvirt.org

December 2019

74 participants
246 discussions

[libvirt] Libvirt 5.9.0 Lags
by Dincer Beken 03 Dec '19

03 Dec '19

Hello all, I am using Arch Linux 5.3.13-arch1-1 and libvirt 5.9.0. After I made a linux update (sudo pacman -Syu), I got the new, libvirt version mentioned above. But soon after I realized, while programming in eclipse, that copy paste does not work anymore. After couple of tries, when I try to copy some lines of code, it freezes for a short time, and looses the copied text in the clipboard. I converted the VM's into vdi and continuing to work with virtual box. There, on the same laptop and the same VM, I don't have that issue! Is this a known issue? I really need a fix urgently, since I ve got other VMs which are optimized for KVM. I ve also post this issue to stackoverflow: https://stackoverflow.com/questions/59155986/lags-in-libvirt-5-9-0 Many Thanks, Dincer

2 2

[libvirt] [PATCH 00/21] Incremental backup support for qemu
by Peter Krempa 03 Dec '19

03 Dec '19

This is a finished version of my RFC posted here: https://www.redhat.com/archives/libvir-list/2019-October/msg01193.html All cleanups of that series are now merged and this series has new cleanups and depending patches that I posted earlier this week. For convenience everything can be fetched at: git fetch https://gitlab.com/pipo.sk/libvirt.git blockdev-backup This series requires qemu 4.2 to work properly. Please make sure to fetch the current head. Compared to previous versions: - The API is similar to what was posted last time or in Eric's version - the backup job ID was removed, this can't be integrated with qemu async jobs as there is only one async jobs. - the virDomainBackupEnd API was removed as virDomainAbortJob can be used instead - the usage of domain job APIs is fully implemented as it was documented in previous eric's postings - the domain job completion event and completed job statistics are used to notify about the state and successful finishing of the job (see virDomainGetJobStats/virsh domjobinfo) - unfortunately block jobs and snapshots are still not supported, thus this feature will stay disabled for now: If you want to give the feature a spin you must use the following XML override: <domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> ... <qemu:capabilities> <qemu:add capability='incremental-backup'/> </qemu:capabilities> </domain> Eric Blake (5): backup: Document new XML for backups backup: Introduce virDomainBackup APIs backup: Implement backup APIs for remote driver backup: Parse and output backup XML backup: Implement virsh support for backup Peter Krempa (16): API: Introduce field for reporting temporary disk space usage of a domain job virsh: Implement VIR_DOMAIN_JOB_DISK_TEMP_(USED|TOTAL) in cmdDomjobinfo API: Add domain job operation for backups qemu: Add infrastructure for statistics of a backup job qemu: domain: Introduce QEMU_ASYNC_JOB_BACKUP async job type Add 'backup' block job type qemu: monitor: Add support for blockdev-backup via 'transaction' qemu: domain: Track backup job data in the status XML qemu: blockjob: Track internal data for 'backup' blockjob tests: qemustatusxml2xml: Add test for 'pull' type backup job conf: backup: Add fields for tracking stats of completed sub-jobs doc: Document quirk of getting block job info for a 'backup' blockjob qemu: Implement backup job APIs and qemu handling qemu: backup: Implement stats gathering while the job is running qemu: driver: Allow cancellation of the backup job qemu: blockjob: Implement concluded blockjob handler for backup blockjobs docs/docs.html.in | 3 +- docs/format.html.in | 1 + docs/formatbackup.html.in | 161 +++ docs/formatcheckpoint.html.in | 12 +- docs/index.html.in | 3 +- docs/schemas/domainbackup.rng | 214 ++++ examples/c/misc/event-test.c | 3 + include/libvirt/libvirt-domain.h | 32 +- libvirt.spec.in | 1 + mingw-libvirt.spec.in | 2 + po/POTFILES.in | 3 + src/conf/Makefile.inc.am | 2 + src/conf/backup_conf.c | 499 ++++++++ src/conf/backup_conf.h | 108 ++ src/conf/domain_conf.c | 2 +- src/conf/virconftypes.h | 3 + src/driver-hypervisor.h | 12 + src/libvirt-domain-checkpoint.c | 7 +- src/libvirt-domain.c | 142 +++ src/libvirt_private.syms | 8 + src/libvirt_public.syms | 6 + src/qemu/Makefile.inc.am | 2 + src/qemu/qemu_backup.c | 1017 +++++++++++++++++ src/qemu/qemu_backup.h | 46 + src/qemu/qemu_blockjob.c | 96 +- src/qemu/qemu_blockjob.h | 17 + src/qemu/qemu_domain.c | 140 +++ src/qemu/qemu_domain.h | 14 + src/qemu/qemu_driver.c | 68 +- src/qemu/qemu_migration.c | 2 + src/qemu/qemu_monitor.c | 13 + src/qemu/qemu_monitor.h | 15 + src/qemu/qemu_monitor_json.c | 33 + src/qemu/qemu_monitor_json.h | 8 + src/qemu/qemu_process.c | 25 + src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 33 +- src/remote_protocol-structs | 15 + tests/Makefile.am | 3 + tests/domainbackupxml2xmlin/backup-pull.xml | 9 + tests/domainbackupxml2xmlin/backup-push.xml | 9 + tests/domainbackupxml2xmlin/empty.xml | 1 + tests/domainbackupxml2xmlout/backup-pull.xml | 9 + tests/domainbackupxml2xmlout/backup-push.xml | 9 + tests/domainbackupxml2xmlout/empty.xml | 7 + tests/qemumonitorjsontest.c | 8 +- .../qemustatusxml2xmldata/backup-pull-in.xml | 607 ++++++++++ .../qemustatusxml2xmldata/backup-pull-out.xml | 1 + tests/qemuxml2xmltest.c | 2 + tests/virschematest.c | 2 + tools/Makefile.am | 1 + tools/virsh-backup.c | 144 +++ tools/virsh-backup.h | 21 + tools/virsh-domain.c | 26 +- tools/virsh.c | 2 + tools/virsh.h | 1 + tools/virsh.pod | 32 + 57 files changed, 3639 insertions(+), 25 deletions(-) create mode 100644 docs/formatbackup.html.in create mode 100644 docs/schemas/domainbackup.rng create mode 100644 src/conf/backup_conf.c create mode 100644 src/conf/backup_conf.h create mode 100644 src/qemu/qemu_backup.c create mode 100644 src/qemu/qemu_backup.h create mode 100644 tests/domainbackupxml2xmlin/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlin/backup-push.xml create mode 100644 tests/domainbackupxml2xmlin/empty.xml create mode 100644 tests/domainbackupxml2xmlout/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlout/backup-push.xml create mode 100644 tests/domainbackupxml2xmlout/empty.xml create mode 100644 tests/qemustatusxml2xmldata/backup-pull-in.xml create mode 120000 tests/qemustatusxml2xmldata/backup-pull-out.xml create mode 100644 tools/virsh-backup.c create mode 100644 tools/virsh-backup.h -- 2.23.0

3 38

[libvirt] [jenkins-ci PATCH] lcitool: Explain our use of the 'ks' kernel parameter
by Andrea Bolognani 03 Dec '19

03 Dec '19

It's not immediately obvious why we're using it even when installing a distribution like Debian, so explain the motivation in a comment. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/lcitool | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guests/lcitool b/guests/lcitool index a630971..0e27796 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -540,7 +540,9 @@ class Application: # preseed files must use a well-known name to be picked up by # d-i; for kickstart files, we can use whatever name we please # but we need to point anaconda in the right direction through - # a kernel argument + # the 'ks' kernel parameter. We can use 'ks' unconditionally + # for simplicity's sake, because distributions that don't use + # kickstart for unattended installation will simply ignore it extra_arg = "console=ttyS0 ks=file:/{}".format(install_config) virt_install = distutils.spawn.find_executable("virt-install") -- 2.23.0

2 3

[libvirt] [PATCH] maint: post-post-version-bump version bump to 6.0.0
by Ján Tomko 03 Dec '19

03 Dec '19

My commit 3bbe10205b79c8803e69c61897a0491d7a3f57c0 forgot to update the news. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed under the trivial paper bag rule. docs/news.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/news.xml b/docs/news.xml index e4533cc46e..43aa96f497 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -42,7 +42,7 @@ --> <libvirt> - <release version="v5.11.0" date="unreleased"> + <release version="v6.0.0" date="unreleased"> <section title="New features"> </section> <section title="Improvements"> -- 2.19.2

1 0

[libvirt] [PATCH] spec: Fix printing test-suite.log when make check fails
by Jiri Denemark 03 Dec '19

03 Dec '19

Commit v5.7.0-248-g03449e2504 removed "cd tests" without updating the patch to test-suite.log. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index c7fac104d9..4c6161a26f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1307,7 +1307,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \ cd %{_vpath_builddir} if ! make %{?_smp_mflags} check VIR_TEST_DEBUG=1 then - cat test-suite.log || true + cat tests/test-suite.log || true exit 1 fi -- 2.24.0

2 1

[libvirt] [PATCH] maint: post-version bump version bump to 6.0.0
by Ján Tomko 03 Dec '19

03 Dec '19

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d0ef7de750..76d28d2f67 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [5.11.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] +AC_INIT([libvirt], [6.0.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] if test $srcdir = "." then -- 2.21.0

1 0

[libvirt] [PATCH] tests: fix name of 32-bit x86 QEMU binary
by Daniel P. Berrangé 03 Dec '19

03 Dec '19

The 32-bit x86 binary is called qemu-system-i386, not qemu-system-i686. This mistake across many test XML files was not noticed because the mistake was also made in testutilsqemu.c when mocking the capabilities. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/capabilityschemadata/caps-qemu-kvm.xml | 4 ++-- tests/domainschemadata/backing-chains.xml | 2 +- tests/domainschemadata/default-cache-mode.xml | 2 +- tests/domainschemadata/maxMemory.xml | 2 +- tests/domainschemadata/timers.xml | 2 +- tests/genericxml2xmlindata/cachetune-cdp.xml | 2 +- tests/genericxml2xmlindata/cachetune-colliding-allocs.xml | 2 +- tests/genericxml2xmlindata/cachetune-colliding-monitor.xml | 2 +- tests/genericxml2xmlindata/cachetune-colliding-tunes.xml | 2 +- tests/genericxml2xmlindata/cachetune-colliding-types.xml | 2 +- tests/genericxml2xmlindata/cachetune-extra-tunes.xml | 2 +- tests/genericxml2xmlindata/cachetune-small.xml | 2 +- tests/genericxml2xmlindata/cachetune.xml | 2 +- tests/genericxml2xmlindata/chardev-reconnect-invalid-mode.xml | 2 +- .../chardev-reconnect-missing-timeout.xml | 2 +- tests/genericxml2xmlindata/chardev-reconnect.xml | 2 +- tests/genericxml2xmlindata/chardev-tcp-missing-host.xml | 2 +- tests/genericxml2xmlindata/chardev-tcp-missing-service.xml | 2 +- tests/genericxml2xmlindata/chardev-tcp-multiple-source.xml | 2 +- tests/genericxml2xmlindata/chardev-tcp.xml | 2 +- .../chardev-udp-missing-connect-service.xml | 2 +- tests/genericxml2xmlindata/chardev-udp-multiple-source.xml | 2 +- tests/genericxml2xmlindata/chardev-udp.xml | 2 +- .../chardev-unix-redirdev-missing-path.xml | 2 +- tests/genericxml2xmlindata/chardev-unix-rng-missing-path.xml | 2 +- .../chardev-unix-smartcard-missing-path.xml | 2 +- tests/genericxml2xmlindata/chardev-unix.xml | 2 +- tests/genericxml2xmlindata/disk-network-http.xml | 2 +- tests/genericxml2xmlindata/disk-virtio.xml | 2 +- .../graphics-listen-back-compat-mismatch.xml | 2 +- tests/genericxml2xmlindata/graphics-listen-back-compat.xml | 2 +- tests/genericxml2xmlindata/graphics-vnc-autoport-no.xml | 2 +- tests/genericxml2xmlindata/graphics-vnc-listen-attr-only.xml | 2 +- .../graphics-vnc-listen-element-minimal.xml | 2 +- .../graphics-vnc-listen-element-with-address.xml | 2 +- tests/genericxml2xmlindata/graphics-vnc-manual-port.xml | 2 +- tests/genericxml2xmlindata/graphics-vnc-minimal.xml | 2 +- .../graphics-vnc-socket-attr-listen-address.xml | 2 +- .../graphics-vnc-socket-attr-listen-socket-mismatch.xml | 2 +- .../graphics-vnc-socket-attr-listen-socket.xml | 2 +- tests/genericxml2xmlindata/graphics-vnc-socket-listen.xml | 2 +- tests/genericxml2xmlindata/graphics-vnc-socket.xml | 2 +- tests/genericxml2xmlindata/memorytune-colliding-allocs.xml | 2 +- tests/genericxml2xmlindata/memorytune-colliding-cachetune.xml | 2 +- tests/genericxml2xmlindata/memorytune.xml | 2 +- tests/genericxml2xmloutdata/cachetune-extra-tunes.xml | 2 +- tests/genericxml2xmloutdata/chardev-reconnect.xml | 2 +- tests/genericxml2xmloutdata/chardev-tcp.xml | 2 +- tests/genericxml2xmloutdata/chardev-udp.xml | 2 +- tests/genericxml2xmloutdata/chardev-unix.xml | 2 +- tests/genericxml2xmloutdata/disk-virtio.xml | 2 +- tests/genericxml2xmloutdata/graphics-listen-back-compat.xml | 2 +- tests/genericxml2xmloutdata/graphics-vnc-listen-attr-only.xml | 2 +- .../graphics-vnc-listen-element-minimal.xml | 2 +- .../graphics-vnc-listen-element-with-address.xml | 2 +- tests/genericxml2xmloutdata/graphics-vnc-manual-port.xml | 2 +- tests/genericxml2xmloutdata/graphics-vnc-minimal.xml | 2 +- .../graphics-vnc-socket-attr-listen-address.xml | 2 +- .../graphics-vnc-socket-attr-listen-socket.xml | 2 +- tests/genericxml2xmloutdata/graphics-vnc-socket-listen.xml | 2 +- tests/genericxml2xmloutdata/graphics-vnc-socket.xml | 2 +- tests/qemuagentdata/fsinfo.xml | 2 +- .../internal-active-invalid.xml | 2 +- .../internal-inactive-invalid.xml | 2 +- tests/qemudomaincheckpointxml2xmlout/redefine.xml | 2 +- tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml | 2 +- tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml | 2 +- tests/qemudomainsnapshotxml2xmlout/full_domain.xml | 2 +- tests/qemudomainsnapshotxml2xmlout/metadata.xml | 2 +- tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml | 2 +- .../qemuhotplug-graphics-spice-listen-network.xml | 2 +- .../qemuhotplug-graphics-spice-timeout.xml | 2 +- tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml | 2 +- tests/qemustatusxml2xmldata/blockjob-mirror-in.xml | 2 +- tests/qemuxml2argvdata/440fx-ide-address-conflict.xml | 2 +- tests/qemuxml2argvdata/440fx-wrong-root.xml | 2 +- tests/qemuxml2argvdata/balloon-device-auto.args | 2 +- tests/qemuxml2argvdata/balloon-device-auto.xml | 2 +- tests/qemuxml2argvdata/balloon-device-deflate-off.args | 2 +- tests/qemuxml2argvdata/balloon-device-deflate-off.xml | 2 +- tests/qemuxml2argvdata/balloon-device-deflate.args | 2 +- tests/qemuxml2argvdata/balloon-device-deflate.xml | 2 +- tests/qemuxml2argvdata/balloon-device-period.args | 2 +- tests/qemuxml2argvdata/balloon-device-period.xml | 2 +- tests/qemuxml2argvdata/balloon-device.args | 2 +- tests/qemuxml2argvdata/balloon-device.xml | 2 +- tests/qemuxml2argvdata/bios.args | 2 +- tests/qemuxml2argvdata/bios.xml | 2 +- tests/qemuxml2argvdata/blkdeviotune-group-num.args | 2 +- tests/qemuxml2argvdata/blkdeviotune-group-num.xml | 2 +- tests/qemuxml2argvdata/blkdeviotune-max-length.args | 2 +- tests/qemuxml2argvdata/blkdeviotune-max-length.xml | 2 +- tests/qemuxml2argvdata/blkdeviotune-max.args | 2 +- tests/qemuxml2argvdata/blkdeviotune-max.xml | 2 +- tests/qemuxml2argvdata/blkdeviotune.xml | 2 +- tests/qemuxml2argvdata/blkiotune-device.args | 2 +- tests/qemuxml2argvdata/blkiotune-device.xml | 2 +- tests/qemuxml2argvdata/blkiotune.args | 2 +- tests/qemuxml2argvdata/blkiotune.xml | 2 +- tests/qemuxml2argvdata/boot-cdrom.args | 2 +- tests/qemuxml2argvdata/boot-cdrom.xml | 2 +- tests/qemuxml2argvdata/boot-complex.args | 2 +- tests/qemuxml2argvdata/boot-complex.xml | 2 +- tests/qemuxml2argvdata/boot-dev+order.xml | 2 +- tests/qemuxml2argvdata/boot-floppy.args | 2 +- tests/qemuxml2argvdata/boot-floppy.xml | 2 +- tests/qemuxml2argvdata/boot-menu-disable-drive.args | 2 +- tests/qemuxml2argvdata/boot-menu-disable-drive.xml | 2 +- tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml | 2 +- tests/qemuxml2argvdata/boot-menu-disable.args | 2 +- tests/qemuxml2argvdata/boot-menu-disable.xml | 2 +- .../boot-menu-enable-with-timeout-invalid.xml | 2 +- tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args | 2 +- tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml | 2 +- tests/qemuxml2argvdata/boot-menu-enable.args | 2 +- tests/qemuxml2argvdata/boot-menu-enable.xml | 2 +- tests/qemuxml2argvdata/boot-multi.args | 2 +- tests/qemuxml2argvdata/boot-multi.xml | 2 +- tests/qemuxml2argvdata/boot-network.args | 2 +- tests/qemuxml2argvdata/boot-network.xml | 2 +- tests/qemuxml2argvdata/boot-order.args | 2 +- tests/qemuxml2argvdata/boot-order.xml | 2 +- tests/qemuxml2argvdata/boot-strict.args | 2 +- tests/qemuxml2argvdata/boot-strict.xml | 2 +- tests/qemuxml2argvdata/channel-guestfwd.args | 2 +- tests/qemuxml2argvdata/channel-guestfwd.xml | 2 +- tests/qemuxml2argvdata/channel-spicevmc.args | 2 +- tests/qemuxml2argvdata/channel-spicevmc.xml | 2 +- tests/qemuxml2argvdata/channel-virtio-auto.args | 2 +- tests/qemuxml2argvdata/channel-virtio-auto.xml | 2 +- tests/qemuxml2argvdata/channel-virtio-autoadd.args | 2 +- tests/qemuxml2argvdata/channel-virtio-autoadd.xml | 2 +- tests/qemuxml2argvdata/channel-virtio-autoassign.args | 2 +- tests/qemuxml2argvdata/channel-virtio-autoassign.xml | 2 +- tests/qemuxml2argvdata/channel-virtio-default.args | 2 +- tests/qemuxml2argvdata/channel-virtio-default.xml | 2 +- tests/qemuxml2argvdata/channel-virtio-state.args | 2 +- tests/qemuxml2argvdata/channel-virtio-state.xml | 2 +- tests/qemuxml2argvdata/channel-virtio-unix.args | 2 +- tests/qemuxml2argvdata/channel-virtio-unix.xml | 2 +- tests/qemuxml2argvdata/channel-virtio.args | 2 +- tests/qemuxml2argvdata/channel-virtio.xml | 2 +- tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml | 2 +- tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml | 2 +- tests/qemuxml2argvdata/chardev-reconnect.args | 2 +- tests/qemuxml2argvdata/chardev-reconnect.xml | 2 +- tests/qemuxml2argvdata/clock-catchup.args | 2 +- tests/qemuxml2argvdata/clock-catchup.xml | 2 +- tests/qemuxml2argvdata/clock-france.args | 2 +- tests/qemuxml2argvdata/clock-france.xml | 2 +- tests/qemuxml2argvdata/clock-hpet-off.args | 2 +- tests/qemuxml2argvdata/clock-hpet-off.xml | 2 +- tests/qemuxml2argvdata/clock-localtime-basis-localtime.args | 2 +- tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml | 2 +- tests/qemuxml2argvdata/clock-localtime.args | 2 +- tests/qemuxml2argvdata/clock-localtime.xml | 2 +- tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args | 2 +- tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml | 2 +- tests/qemuxml2argvdata/clock-utc.args | 2 +- tests/qemuxml2argvdata/clock-utc.xml | 2 +- tests/qemuxml2argvdata/clock-variable.args | 2 +- tests/qemuxml2argvdata/clock-variable.xml | 2 +- tests/qemuxml2argvdata/console-compat-auto.args | 2 +- tests/qemuxml2argvdata/console-compat-auto.xml | 2 +- tests/qemuxml2argvdata/console-compat-chardev.args | 2 +- tests/qemuxml2argvdata/console-compat-chardev.xml | 2 +- tests/qemuxml2argvdata/console-compat.args | 2 +- tests/qemuxml2argvdata/console-compat.xml | 2 +- tests/qemuxml2argvdata/console-compat2.xml | 2 +- tests/qemuxml2argvdata/console-virtio-many.args | 2 +- tests/qemuxml2argvdata/console-virtio-many.xml | 2 +- tests/qemuxml2argvdata/console-virtio.args | 2 +- tests/qemuxml2argvdata/console-virtio.xml | 2 +- .../controller-virtio-scsi.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/controller-virtio-scsi.xml | 2 +- tests/qemuxml2argvdata/cpu-eoi-disabled.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-disabled.xml | 2 +- tests/qemuxml2argvdata/cpu-eoi-enabled.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-enabled.xml | 2 +- tests/qemuxml2argvdata/cpu-host-model-features.xml | 2 +- tests/qemuxml2argvdata/cpu-host-passthrough-features.args | 2 +- tests/qemuxml2argvdata/cpu-host-passthrough-features.xml | 2 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +- tests/qemuxml2argvdata/cpu-kvmclock.xml | 2 +- tests/qemuxml2argvdata/cpu-minimum1.args | 2 +- tests/qemuxml2argvdata/cpu-minimum1.xml | 2 +- tests/qemuxml2argvdata/cputune-iothreads.xml | 2 +- tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml | 2 +- tests/qemuxml2argvdata/cputune-iothreadsched-zeropriority.xml | 2 +- tests/qemuxml2argvdata/cputune-iothreadsched.xml | 2 +- tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml | 2 +- tests/qemuxml2argvdata/cputune-zero-shares.args | 2 +- tests/qemuxml2argvdata/cputune-zero-shares.xml | 2 +- tests/qemuxml2argvdata/cputune.args | 2 +- tests/qemuxml2argvdata/cputune.xml | 2 +- tests/qemuxml2argvdata/debug-threads.args | 2 +- tests/qemuxml2argvdata/debug-threads.xml | 2 +- tests/qemuxml2argvdata/disk-active-commit.xml | 2 +- tests/qemuxml2argvdata/disk-address-conflict.xml | 2 +- tests/qemuxml2argvdata/disk-aio.args | 2 +- tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args | 2 +- tests/qemuxml2argvdata/disk-aio.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-aio.xml | 2 +- tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml | 2 +- tests/qemuxml2argvdata/disk-backing-chains-index.xml | 2 +- .../disk-backing-chains-noindex.x86_64-2.12.0.args | 2 +- .../disk-backing-chains-noindex.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-backing-chains-noindex.xml | 2 +- tests/qemuxml2argvdata/disk-backing-chains.xml | 2 +- tests/qemuxml2argvdata/disk-blockio.args | 2 +- tests/qemuxml2argvdata/disk-blockio.xml | 2 +- tests/qemuxml2argvdata/disk-boot-cdrom.args | 2 +- tests/qemuxml2argvdata/disk-boot-cdrom.xml | 2 +- tests/qemuxml2argvdata/disk-boot-disk.args | 2 +- tests/qemuxml2argvdata/disk-boot-disk.xml | 2 +- tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args | 2 +- tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args | 2 +- tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args | 2 +- tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args | 2 +- tests/qemuxml2argvdata/disk-cache.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-cache.xml | 2 +- .../qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-cdrom-bus-other.xml | 2 +- .../disk-cdrom-empty-network-invalid.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.xml | 2 +- tests/qemuxml2argvdata/disk-cdrom.args | 2 +- tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args | 2 +- tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-cdrom.xml | 2 +- tests/qemuxml2argvdata/disk-device-lun-type-invalid.xml | 2 +- tests/qemuxml2argvdata/disk-error-policy.args | 2 +- tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args | 2 +- tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-error-policy.xml | 2 +- tests/qemuxml2argvdata/disk-fdc-incompatible-address.xml | 2 +- tests/qemuxml2argvdata/disk-floppy-tray.args | 2 +- tests/qemuxml2argvdata/disk-floppy-tray.xml | 2 +- tests/qemuxml2argvdata/disk-floppy.args | 2 +- tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args | 2 +- tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-floppy.xml | 2 +- tests/qemuxml2argvdata/disk-fmt-cow.xml | 2 +- tests/qemuxml2argvdata/disk-fmt-dir.xml | 2 +- tests/qemuxml2argvdata/disk-fmt-iso.xml | 2 +- tests/qemuxml2argvdata/disk-fmt-qcow.args | 2 +- tests/qemuxml2argvdata/disk-fmt-qcow.xml | 2 +- tests/qemuxml2argvdata/disk-geometry.args | 2 +- tests/qemuxml2argvdata/disk-geometry.xml | 2 +- tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.xml | 2 +- .../disk-hostdev-scsi-virtio-iscsi-auth-AES.args | 2 +- .../disk-hostdev-scsi-virtio-iscsi-auth-AES.xml | 2 +- tests/qemuxml2argvdata/disk-ide-incompatible-address.xml | 2 +- tests/qemuxml2argvdata/disk-ide-split.args | 2 +- tests/qemuxml2argvdata/disk-ide-split.xml | 2 +- tests/qemuxml2argvdata/disk-ide-wwn.args | 2 +- tests/qemuxml2argvdata/disk-ide-wwn.xml | 2 +- tests/qemuxml2argvdata/disk-iscsi.args | 2 +- tests/qemuxml2argvdata/disk-iscsi.xml | 2 +- tests/qemuxml2argvdata/disk-mirror-old.xml | 2 +- tests/qemuxml2argvdata/disk-mirror.xml | 2 +- tests/qemuxml2argvdata/disk-network-gluster.args | 2 +- .../qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args | 2 +- .../qemuxml2argvdata/disk-network-gluster.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-network-gluster.xml | 2 +- .../disk-network-iscsi-auth-secrettype-invalid.xml | 2 +- .../disk-network-iscsi-auth-wrong-secrettype.xml | 2 +- tests/qemuxml2argvdata/disk-network-iscsi-modern.args | 2 +- tests/qemuxml2argvdata/disk-network-iscsi-modern.xml | 2 +- tests/qemuxml2argvdata/disk-network-iscsi.args | 2 +- tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args | 2 +- tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-network-iscsi.xml | 2 +- tests/qemuxml2argvdata/disk-network-nbd.args | 2 +- tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args | 2 +- tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-network-nbd.xml | 2 +- tests/qemuxml2argvdata/disk-network-rbd-no-colon.xml | 2 +- tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args | 2 +- tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args | 2 +- tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-network-rbd.xml | 2 +- tests/qemuxml2argvdata/disk-network-sheepdog.args | 2 +- .../qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args | 2 +- .../qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-network-sheepdog.xml | 2 +- tests/qemuxml2argvdata/disk-network-source-auth-both.xml | 2 +- tests/qemuxml2argvdata/disk-network-source-auth.args | 2 +- .../disk-network-source-auth.x86_64-2.12.0.args | 2 +- .../disk-network-source-auth.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-network-source-auth.xml | 2 +- tests/qemuxml2argvdata/disk-no-boot.args | 2 +- tests/qemuxml2argvdata/disk-no-boot.xml | 2 +- tests/qemuxml2argvdata/disk-order.args | 2 +- tests/qemuxml2argvdata/disk-order.xml | 2 +- tests/qemuxml2argvdata/disk-readonly-disk.args | 2 +- tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args | 2 +- tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-readonly-disk.xml | 2 +- tests/qemuxml2argvdata/disk-same-targets.xml | 2 +- tests/qemuxml2argvdata/disk-sata-device.args | 2 +- tests/qemuxml2argvdata/disk-sata-device.xml | 2 +- tests/qemuxml2argvdata/disk-sata-incompatible-address.xml | 2 +- .../qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args | 2 +- .../qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-scsi-device-auto.xml | 2 +- tests/qemuxml2argvdata/disk-scsi-disk-split.args | 2 +- tests/qemuxml2argvdata/disk-scsi-disk-split.xml | 2 +- tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.xml | 2 +- tests/qemuxml2argvdata/disk-scsi-disk-vpd.args | 2 +- tests/qemuxml2argvdata/disk-scsi-disk-vpd.xml | 2 +- tests/qemuxml2argvdata/disk-scsi-disk-wwn.args | 2 +- tests/qemuxml2argvdata/disk-scsi-disk-wwn.xml | 2 +- tests/qemuxml2argvdata/disk-scsi-incompatible-address.xml | 2 +- tests/qemuxml2argvdata/disk-scsi-lun-passthrough-sgio.xml | 2 +- tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args | 2 +- tests/qemuxml2argvdata/disk-scsi-lun-passthrough.xml | 2 +- tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-scsi.xml | 2 +- tests/qemuxml2argvdata/disk-serial.args | 2 +- tests/qemuxml2argvdata/disk-serial.xml | 2 +- tests/qemuxml2argvdata/disk-shared-qcow.xml | 2 +- tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args | 2 +- tests/qemuxml2argvdata/disk-shared.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-shared.xml | 2 +- tests/qemuxml2argvdata/disk-snapshot.args | 2 +- tests/qemuxml2argvdata/disk-snapshot.xml | 2 +- tests/qemuxml2argvdata/disk-source-pool-mode.args | 2 +- tests/qemuxml2argvdata/disk-source-pool-mode.xml | 2 +- tests/qemuxml2argvdata/disk-source-pool.args | 2 +- tests/qemuxml2argvdata/disk-source-pool.xml | 2 +- tests/qemuxml2argvdata/disk-transient.xml | 2 +- tests/qemuxml2argvdata/disk-usb-device-removable.args | 2 +- tests/qemuxml2argvdata/disk-usb-device-removable.xml | 2 +- tests/qemuxml2argvdata/disk-usb-device.args | 2 +- tests/qemuxml2argvdata/disk-usb-device.xml | 2 +- tests/qemuxml2argvdata/disk-usb-nosupport.xml | 2 +- tests/qemuxml2argvdata/disk-usb-pci.xml | 2 +- tests/qemuxml2argvdata/disk-virtio-queues.args | 2 +- tests/qemuxml2argvdata/disk-virtio-queues.xml | 2 +- .../disk-virtio-scsi-reservations.x86_64-2.12.0.args | 2 +- .../disk-virtio-scsi-reservations.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml | 2 +- tests/qemuxml2argvdata/disk-virtio.args | 2 +- tests/qemuxml2argvdata/disk-virtio.xml | 2 +- tests/qemuxml2argvdata/encrypted-disk-usage.args | 2 +- tests/qemuxml2argvdata/encrypted-disk-usage.xml | 2 +- tests/qemuxml2argvdata/encrypted-disk.args | 2 +- tests/qemuxml2argvdata/encrypted-disk.xml | 2 +- tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args | 2 +- tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args | 2 +- tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/eoi-disabled.xml | 2 +- tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args | 2 +- tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args | 2 +- tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/eoi-enabled.xml | 2 +- tests/qemuxml2argvdata/fips-enabled.args | 2 +- tests/qemuxml2argvdata/fips-enabled.xml | 2 +- tests/qemuxml2argvdata/floppy-drive-fat.args | 2 +- tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args | 2 +- tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/floppy-drive-fat.xml | 2 +- tests/qemuxml2argvdata/fs9p.args | 2 +- tests/qemuxml2argvdata/fs9p.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/fs9p.xml | 2 +- .../graphics-egl-headless-rendernode.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/graphics-egl-headless-rendernode.xml | 2 +- tests/qemuxml2argvdata/graphics-egl-headless.args | 2 +- .../qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/graphics-egl-headless.xml | 2 +- tests/qemuxml2argvdata/graphics-listen-network.xml | 2 +- tests/qemuxml2argvdata/graphics-listen-network2.xml | 2 +- tests/qemuxml2argvdata/graphics-sdl-egl-headless.xml | 2 +- tests/qemuxml2argvdata/graphics-sdl-fullscreen.args | 2 +- tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml | 2 +- tests/qemuxml2argvdata/graphics-sdl.args | 2 +- tests/qemuxml2argvdata/graphics-sdl.xml | 2 +- tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args | 2 +- tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml | 2 +- tests/qemuxml2argvdata/graphics-spice-agentmouse.args | 2 +- tests/qemuxml2argvdata/graphics-spice-agentmouse.xml | 2 +- tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args | 2 +- tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.xml | 2 +- tests/qemuxml2argvdata/graphics-spice-auto-socket.args | 2 +- tests/qemuxml2argvdata/graphics-spice-auto-socket.xml | 2 +- tests/qemuxml2argvdata/graphics-spice-compression.args | 2 +- tests/qemuxml2argvdata/graphics-spice-compression.xml | 2 +- tests/qemuxml2argvdata/graphics-spice-egl-headless.args | 2 +- tests/qemuxml2argvdata/graphics-spice-egl-headless.xml | 2 +- .../graphics-spice-gl-auto-rendernode.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.xml | 2 +- .../qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml | 2 +- tests/qemuxml2argvdata/graphics-spice-no-args.args | 2 +- tests/qemuxml2argvdata/graphics-spice-no-args.xml | 2 +- tests/qemuxml2argvdata/graphics-spice-qxl-vga.args | 2 +- tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml | 2 +- tests/qemuxml2argvdata/graphics-spice-sasl.args | 2 +- tests/qemuxml2argvdata/graphics-spice-sasl.xml | 2 +- tests/qemuxml2argvdata/graphics-spice-socket.args | 2 +- tests/qemuxml2argvdata/graphics-spice-socket.xml | 2 +- tests/qemuxml2argvdata/graphics-spice-timeout.args | 2 +- tests/qemuxml2argvdata/graphics-spice-timeout.xml | 2 +- tests/qemuxml2argvdata/graphics-spice-usb-redir.args | 2 +- tests/qemuxml2argvdata/graphics-spice-usb-redir.xml | 2 +- tests/qemuxml2argvdata/graphics-spice.args | 2 +- tests/qemuxml2argvdata/graphics-spice.xml | 2 +- tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.xml | 2 +- tests/qemuxml2argvdata/graphics-vnc-auto-socket.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-auto-socket.xml | 2 +- tests/qemuxml2argvdata/graphics-vnc-egl-headless.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-egl-headless.xml | 2 +- tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.xml | 2 +- tests/qemuxml2argvdata/graphics-vnc-none.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-none.xml | 2 +- tests/qemuxml2argvdata/graphics-vnc-policy.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-policy.xml | 2 +- .../graphics-vnc-remove-generated-socket.args | 2 +- .../qemuxml2argvdata/graphics-vnc-remove-generated-socket.xml | 2 +- tests/qemuxml2argvdata/graphics-vnc-sasl.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-sasl.xml | 2 +- tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.xml | 2 +- tests/qemuxml2argvdata/graphics-vnc-socket.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-socket.xml | 2 +- .../graphics-vnc-tls-secret.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-tls-secret.xml | 2 +- tests/qemuxml2argvdata/graphics-vnc-tls.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-tls.xml | 2 +- tests/qemuxml2argvdata/graphics-vnc-websocket.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-websocket.xml | 2 +- tests/qemuxml2argvdata/graphics-vnc.args | 2 +- tests/qemuxml2argvdata/graphics-vnc.xml | 2 +- .../hostdev-mdev-display-missing-graphics.xml | 2 +- .../hostdev-mdev-display-ramfb.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.xml | 2 +- ...hostdev-mdev-display-spice-egl-headless.x86_64-latest.args | 2 +- .../hostdev-mdev-display-spice-egl-headless.xml | 2 +- .../hostdev-mdev-display-spice-opengl.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.xml | 2 +- .../hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args | 2 +- .../hostdev-mdev-display-vnc-egl-headless.xml | 2 +- .../hostdev-mdev-display-vnc.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hostdev-mdev-display-vnc.xml | 2 +- tests/qemuxml2argvdata/hostdev-mdev-display.xml | 2 +- .../qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml | 2 +- tests/qemuxml2argvdata/hostdev-mdev-precreated.args | 2 +- tests/qemuxml2argvdata/hostdev-mdev-precreated.xml | 2 +- tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml | 2 +- tests/qemuxml2argvdata/hostdev-pci-address-device.args | 2 +- tests/qemuxml2argvdata/hostdev-pci-address-device.xml | 2 +- tests/qemuxml2argvdata/hostdev-pci-address.args | 2 +- tests/qemuxml2argvdata/hostdev-pci-address.xml | 2 +- tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml | 2 +- tests/qemuxml2argvdata/hostdev-scsi-boot.xml | 2 +- tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml | 2 +- tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args | 2 +- tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.xml | 2 +- tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args | 2 +- tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.xml | 2 +- tests/qemuxml2argvdata/hostdev-scsi-lsi.args | 2 +- tests/qemuxml2argvdata/hostdev-scsi-lsi.xml | 2 +- tests/qemuxml2argvdata/hostdev-scsi-rawio.xml | 2 +- tests/qemuxml2argvdata/hostdev-scsi-readonly.args | 2 +- tests/qemuxml2argvdata/hostdev-scsi-readonly.xml | 2 +- tests/qemuxml2argvdata/hostdev-scsi-sgio.xml | 2 +- tests/qemuxml2argvdata/hostdev-scsi-shareable.xml | 2 +- .../hostdev-scsi-vhost-scsi-pci-boot-fail.xml | 2 +- tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args | 2 +- tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml | 2 +- tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args | 2 +- tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml | 2 +- tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args | 2 +- tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml | 2 +- tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args | 2 +- tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml | 2 +- tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args | 2 +- tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml | 2 +- tests/qemuxml2argvdata/hostdev-usb-address-device.args | 2 +- tests/qemuxml2argvdata/hostdev-usb-address-device.xml | 2 +- tests/qemuxml2argvdata/hostdev-usb-address.args | 2 +- tests/qemuxml2argvdata/hostdev-usb-address.xml | 2 +- tests/qemuxml2argvdata/hostdev-vfio-multidomain.args | 2 +- tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml | 2 +- tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml | 2 +- tests/qemuxml2argvdata/hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/hostdev-vfio.xml | 2 +- tests/qemuxml2argvdata/hostdevs-drive-address-conflict.xml | 2 +- tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml | 2 +- tests/qemuxml2argvdata/hugepages-default-2M.args | 2 +- tests/qemuxml2argvdata/hugepages-default-2M.xml | 2 +- tests/qemuxml2argvdata/hugepages-default-system-size.args | 2 +- tests/qemuxml2argvdata/hugepages-default-system-size.xml | 2 +- tests/qemuxml2argvdata/hugepages-default.args | 2 +- tests/qemuxml2argvdata/hugepages-default.xml | 2 +- tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml | 2 +- tests/qemuxml2argvdata/hugepages-memaccess.args | 2 +- tests/qemuxml2argvdata/hugepages-memaccess.xml | 2 +- tests/qemuxml2argvdata/hugepages-memaccess2.args | 2 +- tests/qemuxml2argvdata/hugepages-memaccess2.xml | 2 +- tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml | 2 +- tests/qemuxml2argvdata/hugepages-nodeset.args | 2 +- tests/qemuxml2argvdata/hugepages-nodeset.xml | 2 +- tests/qemuxml2argvdata/hugepages-numa-default-2M.args | 2 +- tests/qemuxml2argvdata/hugepages-numa-default-2M.xml | 2 +- tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml | 2 +- tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args | 2 +- tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml | 2 +- tests/qemuxml2argvdata/hugepages-numa-nodeset.args | 2 +- tests/qemuxml2argvdata/hugepages-numa-nodeset.xml | 2 +- tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hugepages-nvdimm.xml | 2 +- tests/qemuxml2argvdata/hugepages-shared.args | 2 +- tests/qemuxml2argvdata/hugepages-shared.xml | 2 +- tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args | 2 +- tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hyperv-off.xml | 2 +- tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args | 2 +- tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hyperv-panic.xml | 2 +- .../qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hyperv-stimer-direct.xml | 2 +- tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args | 2 +- tests/qemuxml2argvdata/hyperv.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hyperv.xml | 2 +- tests/qemuxml2argvdata/input-usbmouse-addr.args | 2 +- tests/qemuxml2argvdata/input-usbmouse-addr.xml | 2 +- tests/qemuxml2argvdata/input-usbmouse.args | 2 +- tests/qemuxml2argvdata/input-usbmouse.xml | 2 +- tests/qemuxml2argvdata/input-usbtablet.args | 2 +- tests/qemuxml2argvdata/input-usbtablet.xml | 2 +- tests/qemuxml2argvdata/iothreads-disk.args | 2 +- tests/qemuxml2argvdata/iothreads-disk.xml | 2 +- tests/qemuxml2argvdata/iothreads-ids-partial.args | 2 +- tests/qemuxml2argvdata/iothreads-ids-partial.xml | 2 +- tests/qemuxml2argvdata/iothreads-ids.args | 2 +- tests/qemuxml2argvdata/iothreads-ids.xml | 2 +- tests/qemuxml2argvdata/iothreads-nocap.xml | 2 +- .../iothreads-virtio-scsi-pci.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.xml | 2 +- tests/qemuxml2argvdata/iothreads.args | 2 +- tests/qemuxml2argvdata/iothreads.xml | 2 +- tests/qemuxml2argvdata/kvm-features-off.args | 2 +- tests/qemuxml2argvdata/kvm-features-off.xml | 2 +- tests/qemuxml2argvdata/kvm-features.args | 2 +- tests/qemuxml2argvdata/kvm-features.xml | 2 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 2 +- tests/qemuxml2argvdata/kvm-pit-delay.xml | 2 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 2 +- tests/qemuxml2argvdata/kvm-pit-discard.xml | 2 +- .../qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args | 2 +- .../qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args | 2 +- .../qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/kvmclock+eoi-disabled.xml | 2 +- tests/qemuxml2argvdata/kvmclock.args | 2 +- tests/qemuxml2argvdata/kvmclock.xml | 2 +- tests/qemuxml2argvdata/lease.xml | 2 +- tests/qemuxml2argvdata/machine-core-off.args | 2 +- tests/qemuxml2argvdata/machine-core-off.xml | 2 +- tests/qemuxml2argvdata/machine-core-on.args | 2 +- tests/qemuxml2argvdata/machine-core-on.xml | 2 +- tests/qemuxml2argvdata/machine-vmport-opt.args | 2 +- tests/qemuxml2argvdata/machine-vmport-opt.xml | 2 +- tests/qemuxml2argvdata/master-key.args | 2 +- tests/qemuxml2argvdata/master-key.xml | 2 +- tests/qemuxml2argvdata/memory-align-fail.xml | 2 +- tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args | 2 +- tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml | 2 +- tests/qemuxml2argvdata/memory-hotplug-dimm.args | 2 +- tests/qemuxml2argvdata/memory-hotplug-dimm.xml | 2 +- tests/qemuxml2argvdata/memory-hotplug-nonuma.xml | 2 +- .../memory-hotplug-nvdimm-access.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml | 2 +- .../memory-hotplug-nvdimm-align.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml | 2 +- .../memory-hotplug-nvdimm-label.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml | 2 +- .../memory-hotplug-nvdimm-pmem.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml | 2 +- .../memory-hotplug-nvdimm-readonly.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml | 2 +- .../qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml | 2 +- tests/qemuxml2argvdata/memory-hotplug.args | 2 +- tests/qemuxml2argvdata/memory-hotplug.xml | 2 +- tests/qemuxml2argvdata/memorybacking-set.xml | 2 +- tests/qemuxml2argvdata/memorybacking-unset.xml | 2 +- tests/qemuxml2argvdata/memtune-unlimited.args | 2 +- tests/qemuxml2argvdata/memtune-unlimited.xml | 2 +- tests/qemuxml2argvdata/memtune.args | 2 +- tests/qemuxml2argvdata/memtune.xml | 2 +- tests/qemuxml2argvdata/metadata-duplicate.xml | 2 +- tests/qemuxml2argvdata/metadata.xml | 2 +- tests/qemuxml2argvdata/migrate.args | 2 +- tests/qemuxml2argvdata/migrate.xml | 2 +- tests/qemuxml2argvdata/minimal-msg-timestamp.args | 2 +- tests/qemuxml2argvdata/minimal-msg-timestamp.xml | 2 +- tests/qemuxml2argvdata/minimal-no-memory.xml | 2 +- tests/qemuxml2argvdata/minimal-sandbox.args | 2 +- tests/qemuxml2argvdata/minimal-sandbox.xml | 2 +- tests/qemuxml2argvdata/minimal.args | 2 +- tests/qemuxml2argvdata/minimal.xml | 2 +- tests/qemuxml2argvdata/misc-acpi.args | 2 +- tests/qemuxml2argvdata/misc-acpi.xml | 2 +- tests/qemuxml2argvdata/misc-disable-s3.args | 2 +- tests/qemuxml2argvdata/misc-disable-s3.xml | 2 +- tests/qemuxml2argvdata/misc-disable-suspends.args | 2 +- tests/qemuxml2argvdata/misc-disable-suspends.xml | 2 +- tests/qemuxml2argvdata/misc-enable-s4.args | 2 +- tests/qemuxml2argvdata/misc-enable-s4.xml | 2 +- tests/qemuxml2argvdata/misc-no-reboot.args | 2 +- tests/qemuxml2argvdata/misc-no-reboot.xml | 2 +- tests/qemuxml2argvdata/misc-uuid.args | 2 +- tests/qemuxml2argvdata/misc-uuid.xml | 2 +- tests/qemuxml2argvdata/missing-machine.xml | 2 +- tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args | 2 +- tests/qemuxml2argvdata/mlock-off.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/mlock-off.xml | 2 +- tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args | 2 +- tests/qemuxml2argvdata/mlock-on.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/mlock-on.xml | 2 +- tests/qemuxml2argvdata/monitor-json.args | 2 +- tests/qemuxml2argvdata/monitor-json.xml | 2 +- tests/qemuxml2argvdata/multifunction-pci-device.args | 2 +- tests/qemuxml2argvdata/multifunction-pci-device.xml | 2 +- tests/qemuxml2argvdata/name-escape.args | 2 +- tests/qemuxml2argvdata/name-escape.xml | 2 +- tests/qemuxml2argvdata/net-client.args | 2 +- tests/qemuxml2argvdata/net-client.xml | 2 +- tests/qemuxml2argvdata/net-eth-hostip.args | 2 +- tests/qemuxml2argvdata/net-eth-hostip.xml | 2 +- tests/qemuxml2argvdata/net-eth-ifname.args | 2 +- tests/qemuxml2argvdata/net-eth-ifname.xml | 2 +- tests/qemuxml2argvdata/net-eth-names.args | 2 +- tests/qemuxml2argvdata/net-eth-names.xml | 2 +- tests/qemuxml2argvdata/net-eth-unmanaged-tap.args | 2 +- tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml | 2 +- tests/qemuxml2argvdata/net-eth.args | 2 +- tests/qemuxml2argvdata/net-eth.xml | 2 +- tests/qemuxml2argvdata/net-hostdev-bootorder.args | 2 +- tests/qemuxml2argvdata/net-hostdev-bootorder.xml | 2 +- tests/qemuxml2argvdata/net-hostdev-fail.xml | 2 +- tests/qemuxml2argvdata/net-hostdev-multidomain.args | 2 +- tests/qemuxml2argvdata/net-hostdev-multidomain.xml | 2 +- tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args | 2 +- tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml | 2 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/net-hostdev-vfio.xml | 2 +- tests/qemuxml2argvdata/net-hostdev.args | 2 +- tests/qemuxml2argvdata/net-hostdev.xml | 2 +- tests/qemuxml2argvdata/net-many-models.args | 2 +- tests/qemuxml2argvdata/net-mcast.args | 2 +- tests/qemuxml2argvdata/net-mcast.xml | 2 +- tests/qemuxml2argvdata/net-midonet.xml | 2 +- tests/qemuxml2argvdata/net-openvswitch.xml | 2 +- tests/qemuxml2argvdata/net-server.args | 2 +- tests/qemuxml2argvdata/net-server.xml | 2 +- tests/qemuxml2argvdata/net-udp.args | 2 +- tests/qemuxml2argvdata/net-udp.xml | 2 +- tests/qemuxml2argvdata/net-user-addr.args | 2 +- tests/qemuxml2argvdata/net-user-addr.xml | 2 +- tests/qemuxml2argvdata/net-user.args | 2 +- tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args | 2 +- tests/qemuxml2argvdata/net-user.xml | 2 +- tests/qemuxml2argvdata/net-vhostuser-fail.xml | 2 +- tests/qemuxml2argvdata/net-vhostuser-multiq.args | 2 +- tests/qemuxml2argvdata/net-vhostuser-multiq.xml | 2 +- tests/qemuxml2argvdata/net-vhostuser.args | 2 +- tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args | 2 +- tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/net-vhostuser.xml | 2 +- tests/qemuxml2argvdata/net-virtio-device.args | 2 +- tests/qemuxml2argvdata/net-virtio-device.xml | 2 +- tests/qemuxml2argvdata/net-virtio-disable-offloads.args | 2 +- tests/qemuxml2argvdata/net-virtio-disable-offloads.xml | 2 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 2 +- tests/qemuxml2argvdata/net-virtio-netdev.xml | 2 +- tests/qemuxml2argvdata/net-virtio-network-portgroup.xml | 2 +- .../qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml | 2 +- tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args | 2 +- tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml | 2 +- tests/qemuxml2argvdata/net-virtio.args | 2 +- tests/qemuxml2argvdata/net-virtio.xml | 2 +- tests/qemuxml2argvdata/nosharepages.args | 2 +- tests/qemuxml2argvdata/nosharepages.xml | 2 +- tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args | 2 +- tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml | 2 +- .../numad-auto-memory-vcpu-no-cpuset-and-placement.args | 2 +- .../numad-auto-memory-vcpu-no-cpuset-and-placement.xml | 2 +- tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml | 2 +- .../numad-auto-vcpu-static-numatune-no-nodeset.xml | 2 +- tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args | 2 +- tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml | 2 +- tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args | 2 +- tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml | 2 +- tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml | 2 +- tests/qemuxml2argvdata/numad.args | 2 +- tests/qemuxml2argvdata/numad.xml | 2 +- tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args | 2 +- tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml | 2 +- tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml | 2 +- tests/qemuxml2argvdata/numatune-memory.args | 2 +- tests/qemuxml2argvdata/numatune-memory.xml | 2 +- .../numatune-static-nodeset-exceed-hostnode.xml | 2 +- tests/qemuxml2argvdata/pages-discard-hugepages.args | 2 +- tests/qemuxml2argvdata/pages-discard-hugepages.xml | 2 +- tests/qemuxml2argvdata/pages-discard.args | 2 +- tests/qemuxml2argvdata/pages-discard.xml | 2 +- tests/qemuxml2argvdata/panic-double.args | 2 +- tests/qemuxml2argvdata/panic-double.xml | 2 +- tests/qemuxml2argvdata/panic-isa.xml | 2 +- tests/qemuxml2argvdata/panic-no-address.args | 2 +- tests/qemuxml2argvdata/panic-no-address.xml | 2 +- tests/qemuxml2argvdata/panic.args | 2 +- tests/qemuxml2argvdata/panic.xml | 2 +- tests/qemuxml2argvdata/parallel-parport-chardev.args | 2 +- tests/qemuxml2argvdata/parallel-parport-chardev.xml | 2 +- tests/qemuxml2argvdata/parallel-tcp-chardev.args | 2 +- tests/qemuxml2argvdata/parallel-tcp-chardev.xml | 2 +- tests/qemuxml2argvdata/pci-bus-invalid.xml | 2 +- tests/qemuxml2argvdata/pci-domain-invalid.xml | 2 +- tests/qemuxml2argvdata/pci-function-invalid.xml | 2 +- tests/qemuxml2argvdata/pci-rom.args | 2 +- tests/qemuxml2argvdata/pci-rom.xml | 2 +- tests/qemuxml2argvdata/pci-serial-dev-chardev.args | 2 +- tests/qemuxml2argvdata/pci-serial-dev-chardev.xml | 2 +- tests/qemuxml2argvdata/pci-slot-invalid.xml | 2 +- tests/qemuxml2argvdata/pmu-feature-off.args | 2 +- tests/qemuxml2argvdata/pmu-feature-off.xml | 2 +- tests/qemuxml2argvdata/pmu-feature.args | 2 +- tests/qemuxml2argvdata/pmu-feature.xml | 2 +- tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args | 2 +- tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args | 2 +- .../qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/pv-spinlock-disabled.xml | 2 +- tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args | 2 +- tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args | 2 +- tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/pv-spinlock-enabled.xml | 2 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 2 +- tests/qemuxml2argvdata/qemu-ns-alt.xml | 2 +- tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args | 2 +- tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml | 2 +- tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args | 2 +- tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml | 2 +- tests/qemuxml2argvdata/qemu-ns-commandline.args | 2 +- tests/qemuxml2argvdata/qemu-ns-commandline.xml | 2 +- tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args | 2 +- tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml | 2 +- tests/qemuxml2argvdata/qemu-ns-domain-commandline.args | 2 +- tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml | 2 +- tests/qemuxml2argvdata/qemu-ns-domain-ns0.args | 2 +- tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml | 2 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 2 +- tests/qemuxml2argvdata/qemu-ns-no-env.xml | 2 +- tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args | 2 +- tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/qemu-ns.xml | 2 +- tests/qemuxml2argvdata/reboot-timeout-disabled.args | 2 +- tests/qemuxml2argvdata/reboot-timeout-disabled.xml | 2 +- tests/qemuxml2argvdata/reboot-timeout-enabled.args | 2 +- tests/qemuxml2argvdata/reboot-timeout-enabled.xml | 2 +- tests/qemuxml2argvdata/restore-v2-fd.args | 2 +- tests/qemuxml2argvdata/restore-v2-fd.xml | 2 +- tests/qemuxml2argvdata/restore-v2.args | 2 +- tests/qemuxml2argvdata/restore-v2.xml | 2 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 2 +- tests/qemuxml2argvdata/seclabel-dac-none.xml | 2 +- tests/qemuxml2argvdata/seclabel-device-duplicates.xml | 2 +- tests/qemuxml2argvdata/seclabel-device-multiple.xml | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-none.xml | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-override.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-override.xml | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-relabel.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml | 2 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic.xml | 2 +- tests/qemuxml2argvdata/seclabel-multiple.xml | 2 +- tests/qemuxml2argvdata/seclabel-none.args | 2 +- tests/qemuxml2argvdata/seclabel-none.xml | 2 +- tests/qemuxml2argvdata/seclabel-static-labelskip.args | 2 +- tests/qemuxml2argvdata/seclabel-static-labelskip.xml | 2 +- tests/qemuxml2argvdata/seclabel-static-relabel.args | 2 +- tests/qemuxml2argvdata/seclabel-static-relabel.xml | 2 +- tests/qemuxml2argvdata/seclabel-static.args | 2 +- tests/qemuxml2argvdata/seclabel-static.xml | 2 +- tests/qemuxml2argvdata/serial-dev-chardev-iobase.args | 2 +- tests/qemuxml2argvdata/serial-dev-chardev-iobase.xml | 2 +- tests/qemuxml2argvdata/serial-dev-chardev.args | 2 +- tests/qemuxml2argvdata/serial-dev-chardev.xml | 2 +- tests/qemuxml2argvdata/serial-file-chardev.args | 2 +- tests/qemuxml2argvdata/serial-file-chardev.xml | 2 +- tests/qemuxml2argvdata/serial-file-log.args | 2 +- tests/qemuxml2argvdata/serial-file-log.xml | 2 +- tests/qemuxml2argvdata/serial-many-chardev.args | 2 +- tests/qemuxml2argvdata/serial-many-chardev.xml | 2 +- tests/qemuxml2argvdata/serial-pty-chardev.args | 2 +- tests/qemuxml2argvdata/serial-pty-chardev.xml | 2 +- tests/qemuxml2argvdata/serial-spiceport-nospice.args | 2 +- tests/qemuxml2argvdata/serial-spiceport-nospice.xml | 2 +- tests/qemuxml2argvdata/serial-spiceport.args | 2 +- tests/qemuxml2argvdata/serial-spiceport.xml | 2 +- tests/qemuxml2argvdata/serial-target-port-auto.xml | 2 +- tests/qemuxml2argvdata/serial-tcp-chardev.args | 2 +- tests/qemuxml2argvdata/serial-tcp-chardev.xml | 2 +- tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args | 2 +- tests/qemuxml2argvdata/serial-tcp-telnet-chardev.xml | 2 +- tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args | 2 +- tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml | 2 +- tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args | 2 +- tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.xml | 2 +- tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args | 2 +- tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.xml | 2 +- tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args | 2 +- tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.xml | 2 +- tests/qemuxml2argvdata/serial-udp-chardev.args | 2 +- tests/qemuxml2argvdata/serial-udp-chardev.xml | 2 +- tests/qemuxml2argvdata/serial-unix-chardev.args | 2 +- tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/serial-unix-chardev.xml | 2 +- tests/qemuxml2argvdata/serial-vc-chardev.args | 2 +- tests/qemuxml2argvdata/serial-vc-chardev.xml | 2 +- tests/qemuxml2argvdata/shmem-invalid-address.xml | 2 +- tests/qemuxml2argvdata/shmem-invalid-size.xml | 2 +- tests/qemuxml2argvdata/shmem-msi-only.xml | 2 +- tests/qemuxml2argvdata/shmem-plain-doorbell.args | 2 +- tests/qemuxml2argvdata/shmem-plain-doorbell.xml | 2 +- tests/qemuxml2argvdata/shmem-small-size.xml | 2 +- tests/qemuxml2argvdata/shmem.args | 2 +- tests/qemuxml2argvdata/shmem.xml | 2 +- tests/qemuxml2argvdata/smartcard-controller.args | 2 +- tests/qemuxml2argvdata/smartcard-controller.xml | 2 +- .../smartcard-host-certificates-database.args | 2 +- .../qemuxml2argvdata/smartcard-host-certificates-database.xml | 2 +- tests/qemuxml2argvdata/smartcard-host-certificates.args | 2 +- tests/qemuxml2argvdata/smartcard-host-certificates.xml | 2 +- tests/qemuxml2argvdata/smartcard-host.args | 2 +- tests/qemuxml2argvdata/smartcard-host.xml | 2 +- tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args | 2 +- tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml | 2 +- tests/qemuxml2argvdata/smartcard-passthrough-tcp.args | 2 +- tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml | 2 +- tests/qemuxml2argvdata/smbios-date.xml | 2 +- tests/qemuxml2argvdata/smbios-multiple-type2.xml | 2 +- tests/qemuxml2argvdata/smbios-uuid-match.xml | 2 +- tests/qemuxml2argvdata/smbios.args | 2 +- tests/qemuxml2argvdata/smbios.xml | 2 +- tests/qemuxml2argvdata/smp.args | 2 +- tests/qemuxml2argvdata/smp.xml | 2 +- tests/qemuxml2argvdata/sound-device.args | 2 +- tests/qemuxml2argvdata/sound-device.xml | 2 +- tests/qemuxml2argvdata/sound.args | 2 +- tests/qemuxml2argvdata/sound.xml | 2 +- tests/qemuxml2argvdata/usb-bus-missing.xml | 2 +- tests/qemuxml2argvdata/usb-controller-xhci-limit.xml | 2 +- tests/qemuxml2argvdata/usb-controller-xhci.args | 2 +- tests/qemuxml2argvdata/usb-controller-xhci.xml | 2 +- tests/qemuxml2argvdata/usb-controller.args | 2 +- tests/qemuxml2argvdata/usb-controller.xml | 2 +- tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args | 2 +- tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml | 2 +- tests/qemuxml2argvdata/usb-hub-autoadd.args | 2 +- tests/qemuxml2argvdata/usb-hub-autoadd.xml | 2 +- tests/qemuxml2argvdata/usb-hub-conflict.xml | 2 +- tests/qemuxml2argvdata/usb-hub-nonexistent.xml | 2 +- tests/qemuxml2argvdata/usb-hub.args | 2 +- tests/qemuxml2argvdata/usb-hub.xml | 2 +- tests/qemuxml2argvdata/usb-ich9-autoassign.args | 2 +- tests/qemuxml2argvdata/usb-ich9-autoassign.xml | 2 +- tests/qemuxml2argvdata/usb-ich9-companion.args | 2 +- tests/qemuxml2argvdata/usb-ich9-companion.xml | 2 +- tests/qemuxml2argvdata/usb-ich9-ehci-addr.args | 2 +- tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml | 2 +- tests/qemuxml2argvdata/usb-ich9-no-companion.xml | 2 +- tests/qemuxml2argvdata/usb-long-port-path.args | 2 +- tests/qemuxml2argvdata/usb-long-port-path.xml | 2 +- tests/qemuxml2argvdata/usb-none-hub.xml | 2 +- tests/qemuxml2argvdata/usb-none-other.xml | 2 +- tests/qemuxml2argvdata/usb-none-usbtablet.xml | 2 +- tests/qemuxml2argvdata/usb-none.args | 2 +- tests/qemuxml2argvdata/usb-none.xml | 2 +- tests/qemuxml2argvdata/usb-piix3-controller.args | 2 +- tests/qemuxml2argvdata/usb-piix3-controller.xml | 2 +- tests/qemuxml2argvdata/usb-port-autoassign.args | 2 +- tests/qemuxml2argvdata/usb-port-autoassign.xml | 2 +- tests/qemuxml2argvdata/usb-port-missing.args | 2 +- tests/qemuxml2argvdata/usb-port-missing.xml | 2 +- tests/qemuxml2argvdata/usb-ports-out-of-range.xml | 2 +- tests/qemuxml2argvdata/usb-ports.args | 2 +- tests/qemuxml2argvdata/usb-ports.xml | 2 +- tests/qemuxml2argvdata/usb-redir-boot.args | 2 +- tests/qemuxml2argvdata/usb-redir-boot.xml | 2 +- tests/qemuxml2argvdata/usb-redir-filter-version.args | 2 +- tests/qemuxml2argvdata/usb-redir-filter-version.xml | 2 +- tests/qemuxml2argvdata/usb-redir-filter.args | 2 +- tests/qemuxml2argvdata/usb-redir-filter.xml | 2 +- tests/qemuxml2argvdata/usb-redir.args | 2 +- tests/qemuxml2argvdata/usb-redir.xml | 2 +- tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml | 2 +- tests/qemuxml2argvdata/usb-xhci-autoassign.args | 2 +- tests/qemuxml2argvdata/usb-xhci-autoassign.xml | 2 +- tests/qemuxml2argvdata/usb1-usb2.args | 2 +- tests/qemuxml2argvdata/usb1-usb2.xml | 2 +- .../vhost-user-gpu-secondary.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/vhost-user-gpu-secondary.xml | 2 +- tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/vhost-user-vga.xml | 2 +- .../video-bochs-display-device.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/video-bochs-display-device.xml | 2 +- tests/qemuxml2argvdata/video-invalid-multiple-devices.xml | 2 +- tests/qemuxml2argvdata/video-invalid.xml | 2 +- tests/qemuxml2argvdata/video-none-device.args | 2 +- tests/qemuxml2argvdata/video-none-device.xml | 2 +- tests/qemuxml2argvdata/video-qxl-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-qxl-device-vgamem.xml | 2 +- tests/qemuxml2argvdata/video-qxl-device.args | 2 +- tests/qemuxml2argvdata/video-qxl-device.xml | 2 +- tests/qemuxml2argvdata/video-qxl-heads.args | 2 +- tests/qemuxml2argvdata/video-qxl-heads.xml | 2 +- tests/qemuxml2argvdata/video-qxl-nodevice.args | 2 +- tests/qemuxml2argvdata/video-qxl-nodevice.xml | 2 +- tests/qemuxml2argvdata/video-qxl-noheads.args | 2 +- tests/qemuxml2argvdata/video-qxl-noheads.xml | 2 +- tests/qemuxml2argvdata/video-qxl-resolution.args | 2 +- tests/qemuxml2argvdata/video-qxl-resolution.xml | 2 +- tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml | 2 +- .../video-qxl-sec-device-vram64.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/video-qxl-sec-device-vram64.xml | 2 +- tests/qemuxml2argvdata/video-qxl-sec-device.args | 2 +- tests/qemuxml2argvdata/video-qxl-sec-device.xml | 2 +- .../video-ramfb-display-device.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/video-ramfb-display-device.xml | 2 +- tests/qemuxml2argvdata/video-vga-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-vga-device-vgamem.xml | 2 +- tests/qemuxml2argvdata/video-vga-device.args | 2 +- tests/qemuxml2argvdata/video-vga-device.xml | 2 +- tests/qemuxml2argvdata/video-vga-nodevice.args | 2 +- tests/qemuxml2argvdata/video-vga-nodevice.xml | 2 +- tests/qemuxml2argvdata/video-vga-qxl-heads.args | 2 +- tests/qemuxml2argvdata/video-vga-qxl-heads.xml | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-device.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-device.xml | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-virgl.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml | 2 +- tests/qemuxml2argvdata/video-virtio-vga.args | 2 +- tests/qemuxml2argvdata/video-virtio-vga.xml | 2 +- tests/qemuxml2argvdata/virtio-input-passthrough.args | 2 +- tests/qemuxml2argvdata/virtio-input-passthrough.xml | 2 +- tests/qemuxml2argvdata/virtio-input.args | 2 +- tests/qemuxml2argvdata/virtio-input.xml | 2 +- tests/qemuxml2argvdata/virtio-rng-default.args | 2 +- tests/qemuxml2argvdata/virtio-rng-default.xml | 2 +- tests/qemuxml2argvdata/virtio-rng-egd-crash.xml | 2 +- tests/qemuxml2argvdata/virtio-rng-egd.args | 2 +- tests/qemuxml2argvdata/virtio-rng-egd.xml | 2 +- tests/qemuxml2argvdata/virtio-rng-multiple.args | 2 +- tests/qemuxml2argvdata/virtio-rng-multiple.xml | 2 +- tests/qemuxml2argvdata/virtio-rng-random.args | 2 +- tests/qemuxml2argvdata/virtio-rng-random.xml | 2 +- tests/qemuxml2argvdata/vmcoreinfo.args | 2 +- tests/qemuxml2argvdata/vmcoreinfo.xml | 2 +- tests/qemuxml2argvdata/watchdog-device.args | 2 +- tests/qemuxml2argvdata/watchdog-device.xml | 2 +- tests/qemuxml2argvdata/watchdog-dump.args | 2 +- tests/qemuxml2argvdata/watchdog-dump.xml | 2 +- tests/qemuxml2argvdata/watchdog-injectnmi.args | 2 +- tests/qemuxml2argvdata/watchdog-injectnmi.xml | 2 +- tests/qemuxml2argvdata/watchdog.args | 2 +- tests/qemuxml2argvdata/watchdog.xml | 2 +- tests/qemuxml2xmloutdata/balloon-device-auto.xml | 2 +- tests/qemuxml2xmloutdata/balloon-device-period.xml | 2 +- tests/qemuxml2xmloutdata/blkdeviotune.xml | 2 +- tests/qemuxml2xmloutdata/blkiotune-device.xml | 2 +- tests/qemuxml2xmloutdata/blkiotune.xml | 2 +- tests/qemuxml2xmloutdata/boot-cdrom.xml | 2 +- tests/qemuxml2xmloutdata/boot-floppy.xml | 2 +- tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml | 2 +- tests/qemuxml2xmloutdata/boot-menu-disable.xml | 2 +- tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml | 2 +- tests/qemuxml2xmloutdata/boot-multi.xml | 2 +- tests/qemuxml2xmloutdata/boot-network.xml | 2 +- tests/qemuxml2xmloutdata/boot-order.xml | 2 +- tests/qemuxml2xmloutdata/channel-guestfwd.xml | 2 +- tests/qemuxml2xmloutdata/channel-virtio-auto.xml | 2 +- tests/qemuxml2xmloutdata/channel-virtio-state-active.xml | 2 +- tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml | 2 +- tests/qemuxml2xmloutdata/channel-virtio.xml | 2 +- tests/qemuxml2xmloutdata/clock-catchup.xml | 2 +- tests/qemuxml2xmloutdata/clock-localtime.xml | 2 +- tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml | 2 +- tests/qemuxml2xmloutdata/clock-utc.xml | 2 +- tests/qemuxml2xmloutdata/console-compat-auto.xml | 2 +- tests/qemuxml2xmloutdata/console-compat.xml | 2 +- tests/qemuxml2xmloutdata/console-compat2.xml | 2 +- tests/qemuxml2xmloutdata/console-virtio-many.xml | 2 +- tests/qemuxml2xmloutdata/console-virtio.xml | 2 +- tests/qemuxml2xmloutdata/controller-virtio-scsi.xml | 2 +- tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml | 2 +- tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml | 2 +- tests/qemuxml2xmloutdata/cpu-host-model-features.xml | 2 +- tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml | 2 +- tests/qemuxml2xmloutdata/cpu-kvmclock.xml | 2 +- tests/qemuxml2xmloutdata/cputune-iothreads.xml | 2 +- .../qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml | 2 +- tests/qemuxml2xmloutdata/cputune-iothreadsched.xml | 2 +- tests/qemuxml2xmloutdata/cputune-zero-shares.xml | 2 +- tests/qemuxml2xmloutdata/cputune.xml | 2 +- tests/qemuxml2xmloutdata/disk-active-commit-active.xml | 2 +- tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml | 2 +- tests/qemuxml2xmloutdata/disk-aio.xml | 2 +- tests/qemuxml2xmloutdata/disk-backing-chains-active.xml | 2 +- tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml | 2 +- tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml | 2 +- .../qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml | 2 +- tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml | 2 +- tests/qemuxml2xmloutdata/disk-boot-cdrom.xml | 2 +- tests/qemuxml2xmloutdata/disk-boot-disk.xml | 2 +- tests/qemuxml2xmloutdata/disk-cache.xml | 2 +- tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml | 2 +- .../disk-cdrom-empty-network-invalid.x86_64-latest.xml | 2 +- tests/qemuxml2xmloutdata/disk-cdrom.xml | 2 +- tests/qemuxml2xmloutdata/disk-error-policy.xml | 2 +- tests/qemuxml2xmloutdata/disk-fat.xml | 2 +- tests/qemuxml2xmloutdata/disk-floppy.xml | 2 +- tests/qemuxml2xmloutdata/disk-fmt-qcow.xml | 2 +- tests/qemuxml2xmloutdata/disk-mirror-active.xml | 2 +- tests/qemuxml2xmloutdata/disk-mirror-inactive.xml | 2 +- tests/qemuxml2xmloutdata/disk-mirror-old-active.xml | 2 +- tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml | 2 +- tests/qemuxml2xmloutdata/disk-network-gluster.xml | 2 +- tests/qemuxml2xmloutdata/disk-network-iscsi.xml | 2 +- tests/qemuxml2xmloutdata/disk-network-nbd.xml | 2 +- tests/qemuxml2xmloutdata/disk-network-rbd.xml | 2 +- tests/qemuxml2xmloutdata/disk-network-sheepdog.xml | 2 +- tests/qemuxml2xmloutdata/disk-network-source-auth.xml | 2 +- tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml | 2 +- tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml | 2 +- tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml | 2 +- tests/qemuxml2xmloutdata/disk-scsi.xml | 2 +- tests/qemuxml2xmloutdata/disk-serial.xml | 2 +- tests/qemuxml2xmloutdata/disk-source-pool-mode.xml | 2 +- tests/qemuxml2xmloutdata/disk-source-pool.xml | 2 +- tests/qemuxml2xmloutdata/disk-usb-device.xml | 2 +- tests/qemuxml2xmloutdata/disk-virtio.xml | 2 +- tests/qemuxml2xmloutdata/encrypted-disk.xml | 2 +- tests/qemuxml2xmloutdata/eoi-disabled.xml | 2 +- tests/qemuxml2xmloutdata/eoi-enabled.xml | 2 +- tests/qemuxml2xmloutdata/floppy-drive-fat.xml | 2 +- tests/qemuxml2xmloutdata/graphics-egl-headless-rendernode.xml | 2 +- tests/qemuxml2xmloutdata/graphics-listen-network.xml | 2 +- tests/qemuxml2xmloutdata/graphics-listen-network2.xml | 2 +- tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml | 2 +- tests/qemuxml2xmloutdata/graphics-sdl.xml | 2 +- tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml | 2 +- tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml | 2 +- tests/qemuxml2xmloutdata/graphics-spice-compression.xml | 2 +- tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml | 2 +- tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml | 2 +- tests/qemuxml2xmloutdata/graphics-spice-socket.xml | 2 +- tests/qemuxml2xmloutdata/graphics-spice-timeout.xml | 2 +- tests/qemuxml2xmloutdata/graphics-spice.xml | 2 +- tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml | 2 +- tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml | 2 +- tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml | 2 +- tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml | 2 +- .../graphics-vnc-remove-generated-socket-active.xml | 2 +- .../graphics-vnc-remove-generated-socket-inactive.xml | 2 +- tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml | 2 +- tests/qemuxml2xmloutdata/graphics-vnc-socket.xml | 2 +- tests/qemuxml2xmloutdata/graphics-vnc-tls.xml | 2 +- tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml | 2 +- tests/qemuxml2xmloutdata/graphics-vnc.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-mdev-display.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-pci-address.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-usb-address.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-vfio.xml | 2 +- tests/qemuxml2xmloutdata/hugepages-default.xml | 2 +- tests/qemuxml2xmloutdata/hugepages-nodeset.xml | 2 +- tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml | 2 +- tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml | 2 +- tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml | 2 +- tests/qemuxml2xmloutdata/hugepages-shared.xml | 2 +- tests/qemuxml2xmloutdata/hyperv-off.xml | 2 +- tests/qemuxml2xmloutdata/hyperv-panic.xml | 2 +- tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml | 2 +- tests/qemuxml2xmloutdata/hyperv.xml | 2 +- tests/qemuxml2xmloutdata/input-usbmouse.xml | 2 +- tests/qemuxml2xmloutdata/input-usbtablet.xml | 2 +- tests/qemuxml2xmloutdata/iothreads-disk.xml | 2 +- tests/qemuxml2xmloutdata/iothreads-ids-partial.xml | 2 +- tests/qemuxml2xmloutdata/iothreads-ids.xml | 2 +- tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml | 2 +- tests/qemuxml2xmloutdata/iothreads.xml | 2 +- tests/qemuxml2xmloutdata/kvm-features-off.xml | 2 +- tests/qemuxml2xmloutdata/kvm-features.xml | 2 +- tests/qemuxml2xmloutdata/kvmclock.xml | 2 +- tests/qemuxml2xmloutdata/lease.xml | 2 +- tests/qemuxml2xmloutdata/machine-core-off.xml | 2 +- tests/qemuxml2xmloutdata/machine-core-on.xml | 2 +- tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml | 2 +- tests/qemuxml2xmloutdata/memory-hotplug-nonuma.xml | 2 +- tests/qemuxml2xmloutdata/memory-hotplug.xml | 2 +- tests/qemuxml2xmloutdata/memorybacking-set.xml | 2 +- tests/qemuxml2xmloutdata/memorybacking-unset.xml | 2 +- tests/qemuxml2xmloutdata/memtune-unlimited.xml | 2 +- tests/qemuxml2xmloutdata/memtune.xml | 2 +- tests/qemuxml2xmloutdata/metadata-duplicate.xml | 2 +- tests/qemuxml2xmloutdata/metadata.xml | 2 +- tests/qemuxml2xmloutdata/migrate.xml | 2 +- tests/qemuxml2xmloutdata/minimal.xml | 2 +- tests/qemuxml2xmloutdata/misc-acpi.xml | 2 +- tests/qemuxml2xmloutdata/misc-disable-s3.xml | 2 +- tests/qemuxml2xmloutdata/misc-disable-suspends.xml | 2 +- tests/qemuxml2xmloutdata/misc-enable-s4.xml | 2 +- tests/qemuxml2xmloutdata/misc-no-reboot.xml | 2 +- tests/qemuxml2xmloutdata/misc-uuid.xml | 2 +- tests/qemuxml2xmloutdata/net-eth-hostip.xml | 2 +- tests/qemuxml2xmloutdata/net-eth-ifname.xml | 2 +- tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml | 2 +- tests/qemuxml2xmloutdata/net-eth.xml | 2 +- tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml | 2 +- tests/qemuxml2xmloutdata/net-hostdev-vfio.xml | 2 +- tests/qemuxml2xmloutdata/net-hostdev.xml | 2 +- tests/qemuxml2xmloutdata/net-many-models.xml | 2 +- tests/qemuxml2xmloutdata/net-midonet.xml | 2 +- tests/qemuxml2xmloutdata/net-openvswitch.xml | 2 +- tests/qemuxml2xmloutdata/net-udp.xml | 2 +- tests/qemuxml2xmloutdata/net-user.xml | 2 +- tests/qemuxml2xmloutdata/net-vhostuser.xml | 2 +- tests/qemuxml2xmloutdata/net-virtio-device.xml | 2 +- tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml | 2 +- tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml | 2 +- tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml | 2 +- tests/qemuxml2xmloutdata/net-virtio.xml | 2 +- tests/qemuxml2xmloutdata/nographics-vga.xml | 2 +- tests/qemuxml2xmloutdata/nosharepages.xml | 2 +- tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml | 2 +- .../numad-auto-memory-vcpu-no-cpuset-and-placement.xml | 2 +- tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml | 2 +- tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml | 2 +- tests/qemuxml2xmloutdata/panic-double.xml | 2 +- tests/qemuxml2xmloutdata/panic-isa.xml | 2 +- tests/qemuxml2xmloutdata/panic-no-address.xml | 2 +- tests/qemuxml2xmloutdata/panic.xml | 2 +- tests/qemuxml2xmloutdata/parallel-tcp.xml | 2 +- tests/qemuxml2xmloutdata/pci-rom.xml | 2 +- tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml | 2 +- tests/qemuxml2xmloutdata/pmu-feature-off.xml | 2 +- tests/qemuxml2xmloutdata/pmu-feature.xml | 2 +- tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml | 2 +- tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml | 2 +- tests/qemuxml2xmloutdata/qemu-ns-no-env.xml | 2 +- tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml | 2 +- tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml | 2 +- tests/qemuxml2xmloutdata/restore-v2.xml | 2 +- tests/qemuxml2xmloutdata/seclabel-dac-none.xml | 2 +- tests/qemuxml2xmloutdata/seclabel-device-multiple.xml | 2 +- .../seclabel-dynamic-baselabel-inactive.xml | 2 +- .../seclabel-dynamic-labelskip-inactive.xml | 2 +- tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml | 2 +- .../qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml | 2 +- .../qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml | 2 +- tests/qemuxml2xmloutdata/seclabel-none.xml | 2 +- tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml | 2 +- .../qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml | 2 +- tests/qemuxml2xmloutdata/seclabel-static.xml | 2 +- tests/qemuxml2xmloutdata/serial-dev.xml | 2 +- tests/qemuxml2xmloutdata/serial-file.xml | 2 +- tests/qemuxml2xmloutdata/serial-many.xml | 2 +- tests/qemuxml2xmloutdata/serial-pty.xml | 2 +- tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml | 2 +- tests/qemuxml2xmloutdata/serial-spiceport.xml | 2 +- tests/qemuxml2xmloutdata/serial-target-port-auto.xml | 2 +- tests/qemuxml2xmloutdata/serial-tcp-telnet.xml | 2 +- tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml | 2 +- tests/qemuxml2xmloutdata/serial-tcp.xml | 2 +- tests/qemuxml2xmloutdata/serial-udp.xml | 2 +- tests/qemuxml2xmloutdata/serial-unix.xml | 2 +- tests/qemuxml2xmloutdata/serial-vc.xml | 2 +- tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml | 2 +- tests/qemuxml2xmloutdata/shmem.xml | 2 +- tests/qemuxml2xmloutdata/smartcard-controller.xml | 2 +- .../smartcard-host-certificates-database.xml | 2 +- tests/qemuxml2xmloutdata/smartcard-host-certificates.xml | 2 +- tests/qemuxml2xmloutdata/smartcard-host.xml | 2 +- tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml | 2 +- tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml | 2 +- tests/qemuxml2xmloutdata/smbios-multiple-type2.xml | 2 +- tests/qemuxml2xmloutdata/smbios.xml | 2 +- tests/qemuxml2xmloutdata/smp.xml | 2 +- tests/qemuxml2xmloutdata/sound-device.xml | 2 +- tests/qemuxml2xmloutdata/sound.xml | 2 +- tests/qemuxml2xmloutdata/usb-controller.xml | 2 +- tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml | 2 +- tests/qemuxml2xmloutdata/usb-none.xml | 2 +- tests/qemuxml2xmloutdata/usb-piix3-controller.xml | 2 +- tests/qemuxml2xmloutdata/usb-port-missing.xml | 2 +- tests/qemuxml2xmloutdata/usb-redir-filter-version.xml | 2 +- tests/qemuxml2xmloutdata/usb-redir-filter.xml | 2 +- tests/qemuxml2xmloutdata/usb-redir.xml | 2 +- tests/qemuxml2xmloutdata/video-none-device.xml | 2 +- tests/qemuxml2xmloutdata/video-qxl-heads.xml | 2 +- tests/qemuxml2xmloutdata/video-qxl-noheads.xml | 2 +- tests/qemuxml2xmloutdata/video-qxl-resolution.xml | 2 +- tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml | 2 +- tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml | 2 +- tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml | 2 +- tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml | 2 +- tests/qemuxml2xmloutdata/virtio-input-passthrough.xml | 2 +- tests/qemuxml2xmloutdata/virtio-input.xml | 2 +- tests/qemuxml2xmloutdata/virtio-rng-egd.xml | 2 +- tests/qemuxml2xmloutdata/virtio-rng-random.xml | 2 +- tests/qemuxml2xmloutdata/vmcoreinfo.xml | 2 +- tests/qemuxml2xmloutdata/watchdog.xml | 2 +- tests/testutilsqemu.c | 2 +- tests/virsh-define-dev-segfault | 2 +- 1242 files changed, 1243 insertions(+), 1243 deletions(-) diff --git a/tests/capabilityschemadata/caps-qemu-kvm.xml b/tests/capabilityschemadata/caps-qemu-kvm.xml index 4b3895dbd1..65c3bba7c4 100644 --- a/tests/capabilityschemadata/caps-qemu-kvm.xml +++ b/tests/capabilityschemadata/caps-qemu-kvm.xml @@ -35,14 +35,14 @@ <os_type>hvm</os_type> <arch name='i686'> <wordsize>32</wordsize> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <machine maxCpus='255'>pc-0.11</machine> <machine canonical='pc-0.11' maxCpus='255'>pc</machine> <machine maxCpus='255'>pc-0.10</machine> <machine maxCpus='1'>isapc</machine> <domain type='qemu'/> <domain type='kvm'> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <machine maxCpus='255'>pc-0.11</machine> <machine canonical='pc-0.11' maxCpus='255'>pc</machine> <machine maxCpus='255'>pc-0.10</machine> diff --git a/tests/domainschemadata/backing-chains.xml b/tests/domainschemadata/backing-chains.xml index 7fd3013474..908eba5c1a 100644 --- a/tests/domainschemadata/backing-chains.xml +++ b/tests/domainschemadata/backing-chains.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='qcow2'/> <source protocol='gluster' name='Volume2/Image'> diff --git a/tests/domainschemadata/default-cache-mode.xml b/tests/domainschemadata/default-cache-mode.xml index b5d2ed8673..a11232316d 100644 --- a/tests/domainschemadata/default-cache-mode.xml +++ b/tests/domainschemadata/default-cache-mode.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='raw' cache='default'/> <source file='/var/lib/libvirt/images/QEMUGuest1'/> diff --git a/tests/domainschemadata/maxMemory.xml b/tests/domainschemadata/maxMemory.xml index f1562f591e..366442999c 100644 --- a/tests/domainschemadata/maxMemory.xml +++ b/tests/domainschemadata/maxMemory.xml @@ -14,6 +14,6 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> </devices> </domain> diff --git a/tests/domainschemadata/timers.xml b/tests/domainschemadata/timers.xml index 8af431a807..75131bd7c1 100644 --- a/tests/domainschemadata/timers.xml +++ b/tests/domainschemadata/timers.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/genericxml2xmlindata/cachetune-cdp.xml b/tests/genericxml2xmlindata/cachetune-cdp.xml index 9f4c13906e..10ab8a9f92 100644 --- a/tests/genericxml2xmlindata/cachetune-cdp.xml +++ b/tests/genericxml2xmlindata/cachetune-cdp.xml @@ -28,7 +28,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/cachetune-colliding-allocs.xml b/tests/genericxml2xmlindata/cachetune-colliding-allocs.xml index 82c9176cba..108d401a63 100644 --- a/tests/genericxml2xmlindata/cachetune-colliding-allocs.xml +++ b/tests/genericxml2xmlindata/cachetune-colliding-allocs.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/cachetune-colliding-monitor.xml b/tests/genericxml2xmlindata/cachetune-colliding-monitor.xml index d481fb55c0..a8a6ee272f 100644 --- a/tests/genericxml2xmlindata/cachetune-colliding-monitor.xml +++ b/tests/genericxml2xmlindata/cachetune-colliding-monitor.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/cachetune-colliding-tunes.xml b/tests/genericxml2xmlindata/cachetune-colliding-tunes.xml index a0f37028c9..73ba041815 100644 --- a/tests/genericxml2xmlindata/cachetune-colliding-tunes.xml +++ b/tests/genericxml2xmlindata/cachetune-colliding-tunes.xml @@ -21,7 +21,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/cachetune-colliding-types.xml b/tests/genericxml2xmlindata/cachetune-colliding-types.xml index c229eccee4..5ce9274693 100644 --- a/tests/genericxml2xmlindata/cachetune-colliding-types.xml +++ b/tests/genericxml2xmlindata/cachetune-colliding-types.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/cachetune-extra-tunes.xml b/tests/genericxml2xmlindata/cachetune-extra-tunes.xml index d3b01a8ecd..07ef372749 100644 --- a/tests/genericxml2xmlindata/cachetune-extra-tunes.xml +++ b/tests/genericxml2xmlindata/cachetune-extra-tunes.xml @@ -22,7 +22,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/cachetune-small.xml b/tests/genericxml2xmlindata/cachetune-small.xml index 748be086c3..ac511d3a19 100644 --- a/tests/genericxml2xmlindata/cachetune-small.xml +++ b/tests/genericxml2xmlindata/cachetune-small.xml @@ -25,7 +25,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/cachetune.xml b/tests/genericxml2xmlindata/cachetune.xml index 645cab7771..8f9d19b4de 100644 --- a/tests/genericxml2xmlindata/cachetune.xml +++ b/tests/genericxml2xmlindata/cachetune.xml @@ -22,7 +22,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/chardev-reconnect-invalid-mode.xml b/tests/genericxml2xmlindata/chardev-reconnect-invalid-mode.xml index 3fce6c4d37..a76e640e02 100644 --- a/tests/genericxml2xmlindata/chardev-reconnect-invalid-mode.xml +++ b/tests/genericxml2xmlindata/chardev-reconnect-invalid-mode.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='0'/> <channel type='tcp'> <source mode='bind' host='localhost' service='5678'> diff --git a/tests/genericxml2xmlindata/chardev-reconnect-missing-timeout.xml b/tests/genericxml2xmlindata/chardev-reconnect-missing-timeout.xml index 010dc6cc80..d24033057b 100644 --- a/tests/genericxml2xmlindata/chardev-reconnect-missing-timeout.xml +++ b/tests/genericxml2xmlindata/chardev-reconnect-missing-timeout.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='0'/> <channel type='tcp'> <source mode='connect' host='localhost' service='5678'> diff --git a/tests/genericxml2xmlindata/chardev-reconnect.xml b/tests/genericxml2xmlindata/chardev-reconnect.xml index 1bd69ecc73..f72c0e3fde 100644 --- a/tests/genericxml2xmlindata/chardev-reconnect.xml +++ b/tests/genericxml2xmlindata/chardev-reconnect.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='0'/> <channel type='tcp'> <source mode='connect' host='localhost' service='5678'> diff --git a/tests/genericxml2xmlindata/chardev-tcp-missing-host.xml b/tests/genericxml2xmlindata/chardev-tcp-missing-host.xml index 523c34f29b..80604cae5d 100644 --- a/tests/genericxml2xmlindata/chardev-tcp-missing-host.xml +++ b/tests/genericxml2xmlindata/chardev-tcp-missing-host.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='0'/> <channel type='tcp'> <source mode='bind' service='5678'/> diff --git a/tests/genericxml2xmlindata/chardev-tcp-missing-service.xml b/tests/genericxml2xmlindata/chardev-tcp-missing-service.xml index 880f07436a..83f487ef77 100644 --- a/tests/genericxml2xmlindata/chardev-tcp-missing-service.xml +++ b/tests/genericxml2xmlindata/chardev-tcp-missing-service.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='0'/> <channel type='tcp'> <source mode='bind' host='localhost'/> diff --git a/tests/genericxml2xmlindata/chardev-tcp-multiple-source.xml b/tests/genericxml2xmlindata/chardev-tcp-multiple-source.xml index bb8592aa4f..14782f5b78 100644 --- a/tests/genericxml2xmlindata/chardev-tcp-multiple-source.xml +++ b/tests/genericxml2xmlindata/chardev-tcp-multiple-source.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='0'/> <channel type='tcp'> <source mode='bind' host='localhost' service='5678'/> diff --git a/tests/genericxml2xmlindata/chardev-tcp.xml b/tests/genericxml2xmlindata/chardev-tcp.xml index e59c572a12..c48da37ba8 100644 --- a/tests/genericxml2xmlindata/chardev-tcp.xml +++ b/tests/genericxml2xmlindata/chardev-tcp.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='0'/> <channel type='tcp'> <source host='localhost' service='5678'/> diff --git a/tests/genericxml2xmlindata/chardev-udp-missing-connect-service.xml b/tests/genericxml2xmlindata/chardev-udp-missing-connect-service.xml index c7ed52b457..cff4b4526f 100644 --- a/tests/genericxml2xmlindata/chardev-udp-missing-connect-service.xml +++ b/tests/genericxml2xmlindata/chardev-udp-missing-connect-service.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='0'/> <channel type='udp'> <source mode='connect' host='localhost'/> diff --git a/tests/genericxml2xmlindata/chardev-udp-multiple-source.xml b/tests/genericxml2xmlindata/chardev-udp-multiple-source.xml index 2b87a1bfaa..b918b1980d 100644 --- a/tests/genericxml2xmlindata/chardev-udp-multiple-source.xml +++ b/tests/genericxml2xmlindata/chardev-udp-multiple-source.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='0'/> <channel type='udp'> <source mode='connect' host='localhost' service='5678'/> diff --git a/tests/genericxml2xmlindata/chardev-udp.xml b/tests/genericxml2xmlindata/chardev-udp.xml index 34441ae68e..75437d5871 100644 --- a/tests/genericxml2xmlindata/chardev-udp.xml +++ b/tests/genericxml2xmlindata/chardev-udp.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='0'/> <channel type='udp'> <source service='5678'/> diff --git a/tests/genericxml2xmlindata/chardev-unix-redirdev-missing-path.xml b/tests/genericxml2xmlindata/chardev-unix-redirdev-missing-path.xml index f0d6f3d60a..223f635384 100644 --- a/tests/genericxml2xmlindata/chardev-unix-redirdev-missing-path.xml +++ b/tests/genericxml2xmlindata/chardev-unix-redirdev-missing-path.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='0'/> <controller type='usb'/> <redirdev bus='usb' type='unix'> diff --git a/tests/genericxml2xmlindata/chardev-unix-rng-missing-path.xml b/tests/genericxml2xmlindata/chardev-unix-rng-missing-path.xml index fb45c044f8..4519cf24c4 100644 --- a/tests/genericxml2xmlindata/chardev-unix-rng-missing-path.xml +++ b/tests/genericxml2xmlindata/chardev-unix-rng-missing-path.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='0'/> <memballoon model='none'/> <rng model='virtio'> diff --git a/tests/genericxml2xmlindata/chardev-unix-smartcard-missing-path.xml b/tests/genericxml2xmlindata/chardev-unix-smartcard-missing-path.xml index 451c8aa660..9faad81302 100644 --- a/tests/genericxml2xmlindata/chardev-unix-smartcard-missing-path.xml +++ b/tests/genericxml2xmlindata/chardev-unix-smartcard-missing-path.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='0'/> <smartcard mode='passthrough' type='unix'> <source mode='connect'/> diff --git a/tests/genericxml2xmlindata/chardev-unix.xml b/tests/genericxml2xmlindata/chardev-unix.xml index bc715a3ae8..ab93498b81 100644 --- a/tests/genericxml2xmlindata/chardev-unix.xml +++ b/tests/genericxml2xmlindata/chardev-unix.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='0'/> <controller type='usb'/> <smartcard mode='passthrough' type='unix'> diff --git a/tests/genericxml2xmlindata/disk-network-http.xml b/tests/genericxml2xmlindata/disk-network-http.xml index ec4520c7b2..fde1222fd0 100644 --- a/tests/genericxml2xmlindata/disk-network-http.xml +++ b/tests/genericxml2xmlindata/disk-network-http.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='http' name='test.img'> diff --git a/tests/genericxml2xmlindata/disk-virtio.xml b/tests/genericxml2xmlindata/disk-virtio.xml index 5731465a54..75fcd153b4 100644 --- a/tests/genericxml2xmlindata/disk-virtio.xml +++ b/tests/genericxml2xmlindata/disk-virtio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/genericxml2xmlindata/graphics-listen-back-compat-mismatch.xml b/tests/genericxml2xmlindata/graphics-listen-back-compat-mismatch.xml index 31589f6a49..9b598d329b 100644 --- a/tests/genericxml2xmlindata/graphics-listen-back-compat-mismatch.xml +++ b/tests/genericxml2xmlindata/graphics-listen-back-compat-mismatch.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/graphics-listen-back-compat.xml b/tests/genericxml2xmlindata/graphics-listen-back-compat.xml index 2b90bc4af4..15d21148b8 100644 --- a/tests/genericxml2xmlindata/graphics-listen-back-compat.xml +++ b/tests/genericxml2xmlindata/graphics-listen-back-compat.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/graphics-vnc-autoport-no.xml b/tests/genericxml2xmlindata/graphics-vnc-autoport-no.xml index c4641d9d9a..0f9b475cd0 100644 --- a/tests/genericxml2xmlindata/graphics-vnc-autoport-no.xml +++ b/tests/genericxml2xmlindata/graphics-vnc-autoport-no.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/graphics-vnc-listen-attr-only.xml b/tests/genericxml2xmlindata/graphics-vnc-listen-attr-only.xml index 72f805e33a..958bc1f45b 100644 --- a/tests/genericxml2xmlindata/graphics-vnc-listen-attr-only.xml +++ b/tests/genericxml2xmlindata/graphics-vnc-listen-attr-only.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/graphics-vnc-listen-element-minimal.xml b/tests/genericxml2xmlindata/graphics-vnc-listen-element-minimal.xml index 2a4855e8e1..d6823d2079 100644 --- a/tests/genericxml2xmlindata/graphics-vnc-listen-element-minimal.xml +++ b/tests/genericxml2xmlindata/graphics-vnc-listen-element-minimal.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/graphics-vnc-listen-element-with-address.xml b/tests/genericxml2xmlindata/graphics-vnc-listen-element-with-address.xml index 2a4855e8e1..d6823d2079 100644 --- a/tests/genericxml2xmlindata/graphics-vnc-listen-element-with-address.xml +++ b/tests/genericxml2xmlindata/graphics-vnc-listen-element-with-address.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/graphics-vnc-manual-port.xml b/tests/genericxml2xmlindata/graphics-vnc-manual-port.xml index a7514baff9..b6411044f5 100644 --- a/tests/genericxml2xmlindata/graphics-vnc-manual-port.xml +++ b/tests/genericxml2xmlindata/graphics-vnc-manual-port.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/graphics-vnc-minimal.xml b/tests/genericxml2xmlindata/graphics-vnc-minimal.xml index 6b9abf9855..14094a8f9c 100644 --- a/tests/genericxml2xmlindata/graphics-vnc-minimal.xml +++ b/tests/genericxml2xmlindata/graphics-vnc-minimal.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-address.xml b/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-address.xml index 50e2d13bf1..8f3af8b996 100644 --- a/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-address.xml +++ b/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-address.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket-mismatch.xml b/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket-mismatch.xml index f56d65c398..18d829f209 100644 --- a/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket-mismatch.xml +++ b/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket-mismatch.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket.xml b/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket.xml index ab1c68bcbb..d9154558a9 100644 --- a/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket.xml +++ b/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/graphics-vnc-socket-listen.xml b/tests/genericxml2xmlindata/graphics-vnc-socket-listen.xml index 9e316b09de..49d7d65632 100644 --- a/tests/genericxml2xmlindata/graphics-vnc-socket-listen.xml +++ b/tests/genericxml2xmlindata/graphics-vnc-socket-listen.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/graphics-vnc-socket.xml b/tests/genericxml2xmlindata/graphics-vnc-socket.xml index 57fd1220d8..5dc57ec252 100644 --- a/tests/genericxml2xmlindata/graphics-vnc-socket.xml +++ b/tests/genericxml2xmlindata/graphics-vnc-socket.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/memorytune-colliding-allocs.xml b/tests/genericxml2xmlindata/memorytune-colliding-allocs.xml index 9b8ebaa084..bd42de5f1c 100644 --- a/tests/genericxml2xmlindata/memorytune-colliding-allocs.xml +++ b/tests/genericxml2xmlindata/memorytune-colliding-allocs.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/memorytune-colliding-cachetune.xml b/tests/genericxml2xmlindata/memorytune-colliding-cachetune.xml index 5416870de2..db2c1f6c56 100644 --- a/tests/genericxml2xmlindata/memorytune-colliding-cachetune.xml +++ b/tests/genericxml2xmlindata/memorytune-colliding-cachetune.xml @@ -21,7 +21,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmlindata/memorytune.xml b/tests/genericxml2xmlindata/memorytune.xml index 7486b542c5..187409e525 100644 --- a/tests/genericxml2xmlindata/memorytune.xml +++ b/tests/genericxml2xmlindata/memorytune.xml @@ -26,7 +26,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmloutdata/cachetune-extra-tunes.xml b/tests/genericxml2xmloutdata/cachetune-extra-tunes.xml index db85af08da..6992197d2d 100644 --- a/tests/genericxml2xmloutdata/cachetune-extra-tunes.xml +++ b/tests/genericxml2xmloutdata/cachetune-extra-tunes.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmloutdata/chardev-reconnect.xml b/tests/genericxml2xmloutdata/chardev-reconnect.xml index d0e2cd23da..0a521249a8 100644 --- a/tests/genericxml2xmloutdata/chardev-reconnect.xml +++ b/tests/genericxml2xmloutdata/chardev-reconnect.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='0'/> <channel type='tcp'> <source mode='connect' host='localhost' service='5678'> diff --git a/tests/genericxml2xmloutdata/chardev-tcp.xml b/tests/genericxml2xmloutdata/chardev-tcp.xml index ef217c0abb..a1aadf0dc8 100644 --- a/tests/genericxml2xmloutdata/chardev-tcp.xml +++ b/tests/genericxml2xmloutdata/chardev-tcp.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='0'/> <channel type='tcp'> <source mode='connect' host='localhost' service='5678'/> diff --git a/tests/genericxml2xmloutdata/chardev-udp.xml b/tests/genericxml2xmloutdata/chardev-udp.xml index c9b3e5550c..fc9a5c0b45 100644 --- a/tests/genericxml2xmloutdata/chardev-udp.xml +++ b/tests/genericxml2xmloutdata/chardev-udp.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='0'/> <channel type='udp'> <source mode='connect' service='5678'/> diff --git a/tests/genericxml2xmloutdata/chardev-unix.xml b/tests/genericxml2xmloutdata/chardev-unix.xml index c797cbff8a..7af2237441 100644 --- a/tests/genericxml2xmloutdata/chardev-unix.xml +++ b/tests/genericxml2xmloutdata/chardev-unix.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='0'/> <controller type='usb' index='0'/> <controller type='ccid' index='0'/> diff --git a/tests/genericxml2xmloutdata/disk-virtio.xml b/tests/genericxml2xmloutdata/disk-virtio.xml index 5731465a54..75fcd153b4 100644 --- a/tests/genericxml2xmloutdata/disk-virtio.xml +++ b/tests/genericxml2xmloutdata/disk-virtio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/genericxml2xmloutdata/graphics-listen-back-compat.xml b/tests/genericxml2xmloutdata/graphics-listen-back-compat.xml index 5dfffae3bb..91fa2e7eea 100644 --- a/tests/genericxml2xmloutdata/graphics-listen-back-compat.xml +++ b/tests/genericxml2xmloutdata/graphics-listen-back-compat.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmloutdata/graphics-vnc-listen-attr-only.xml b/tests/genericxml2xmloutdata/graphics-vnc-listen-attr-only.xml index 3d0c035434..dcf8659eb3 100644 --- a/tests/genericxml2xmloutdata/graphics-vnc-listen-attr-only.xml +++ b/tests/genericxml2xmloutdata/graphics-vnc-listen-attr-only.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmloutdata/graphics-vnc-listen-element-minimal.xml b/tests/genericxml2xmloutdata/graphics-vnc-listen-element-minimal.xml index 3d0c035434..dcf8659eb3 100644 --- a/tests/genericxml2xmloutdata/graphics-vnc-listen-element-minimal.xml +++ b/tests/genericxml2xmloutdata/graphics-vnc-listen-element-minimal.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmloutdata/graphics-vnc-listen-element-with-address.xml b/tests/genericxml2xmloutdata/graphics-vnc-listen-element-with-address.xml index 3d0c035434..dcf8659eb3 100644 --- a/tests/genericxml2xmloutdata/graphics-vnc-listen-element-with-address.xml +++ b/tests/genericxml2xmloutdata/graphics-vnc-listen-element-with-address.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmloutdata/graphics-vnc-manual-port.xml b/tests/genericxml2xmloutdata/graphics-vnc-manual-port.xml index b18d8eb828..a969d92372 100644 --- a/tests/genericxml2xmloutdata/graphics-vnc-manual-port.xml +++ b/tests/genericxml2xmloutdata/graphics-vnc-manual-port.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmloutdata/graphics-vnc-minimal.xml b/tests/genericxml2xmloutdata/graphics-vnc-minimal.xml index b18d8eb828..a969d92372 100644 --- a/tests/genericxml2xmloutdata/graphics-vnc-minimal.xml +++ b/tests/genericxml2xmloutdata/graphics-vnc-minimal.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-address.xml b/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-address.xml index aa2314a227..7ccd280e71 100644 --- a/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-address.xml +++ b/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-address.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-socket.xml b/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-socket.xml index aa2314a227..7ccd280e71 100644 --- a/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-socket.xml +++ b/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-socket.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmloutdata/graphics-vnc-socket-listen.xml b/tests/genericxml2xmloutdata/graphics-vnc-socket-listen.xml index bdcdfdc7cf..897d9e448a 100644 --- a/tests/genericxml2xmloutdata/graphics-vnc-socket-listen.xml +++ b/tests/genericxml2xmloutdata/graphics-vnc-socket-listen.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/genericxml2xmloutdata/graphics-vnc-socket.xml b/tests/genericxml2xmloutdata/graphics-vnc-socket.xml index bdcdfdc7cf..897d9e448a 100644 --- a/tests/genericxml2xmloutdata/graphics-vnc-socket.xml +++ b/tests/genericxml2xmloutdata/graphics-vnc-socket.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuagentdata/fsinfo.xml b/tests/qemuagentdata/fsinfo.xml index d27d627b57..233968fc29 100644 --- a/tests/qemuagentdata/fsinfo.xml +++ b/tests/qemuagentdata/fsinfo.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <source file='/tmp/idedisk.img'/> <target dev='hdc' bus='ide'/> diff --git a/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml b/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml index a518c58915..2b6d8298c2 100644 --- a/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml +++ b/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/tmp/data.img'/> diff --git a/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml b/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml index df14c97836..427df0b4cf 100644 --- a/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml +++ b/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/tmp/data.img'/> diff --git a/tests/qemudomaincheckpointxml2xmlout/redefine.xml b/tests/qemudomaincheckpointxml2xmlout/redefine.xml index 823ae1ee2d..524360fb4c 100644 --- a/tests/qemudomaincheckpointxml2xmlout/redefine.xml +++ b/tests/qemudomaincheckpointxml2xmlout/redefine.xml @@ -22,7 +22,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml b/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml index a9adbdc2a3..12bc6d953e 100644 --- a/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml +++ b/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml @@ -39,7 +39,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml b/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml index 415fa0aed3..c165e1f81d 100644 --- a/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml +++ b/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml @@ -29,7 +29,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk' snapshot='no'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemudomainsnapshotxml2xmlout/full_domain.xml b/tests/qemudomainsnapshotxml2xmlout/full_domain.xml index ff3f08950b..080f6d50a3 100644 --- a/tests/qemudomainsnapshotxml2xmlout/full_domain.xml +++ b/tests/qemudomainsnapshotxml2xmlout/full_domain.xml @@ -22,7 +22,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemudomainsnapshotxml2xmlout/metadata.xml b/tests/qemudomainsnapshotxml2xmlout/metadata.xml index 1e50494cb5..e5fa60819c 100644 --- a/tests/qemudomainsnapshotxml2xmlout/metadata.xml +++ b/tests/qemudomainsnapshotxml2xmlout/metadata.xml @@ -26,7 +26,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml b/tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml index 341025c477..ad77405266 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-listen-network.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-listen-network.xml index 3435dadbcf..2323521f5e 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-listen-network.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-listen-network.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml index d3bec1ec8b..0ca19e9610 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml @@ -38,7 +38,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/var/lib/libvirt/images/f14.img'/> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml index 19933bcf2d..657b6ccbed 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml index abd9f62965..bcef338fda 100644 --- a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml +++ b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml @@ -39,7 +39,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml b/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml index 4195880aac..b72a7b93e3 100644 --- a/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml +++ b/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/440fx-wrong-root.xml b/tests/qemuxml2argvdata/440fx-wrong-root.xml index 8e4802d557..3bd79311f4 100644 --- a/tests/qemuxml2argvdata/440fx-wrong-root.xml +++ b/tests/qemuxml2argvdata/440fx-wrong-root.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pcie-root'/> diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxml2argvdata/balloon-device-auto.args index 3a1f010e3e..60253f43ec 100644 --- a/tests/qemuxml2argvdata/balloon-device-auto.args +++ b/tests/qemuxml2argvdata/balloon-device-auto.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/balloon-device-auto.xml b/tests/qemuxml2argvdata/balloon-device-auto.xml index 8922f09002..ddfc605bd4 100644 --- a/tests/qemuxml2argvdata/balloon-device-auto.xml +++ b/tests/qemuxml2argvdata/balloon-device-auto.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests/qemuxml2argvdata/balloon-device-deflate-off.args index 619f78bab4..e81db15972 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.xml b/tests/qemuxml2argvdata/balloon-device-deflate-off.xml index 59afb74a43..ecf73abe05 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate-off.xml +++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qemuxml2argvdata/balloon-device-deflate.args index 04fc761c5f..3aa255187b 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.xml b/tests/qemuxml2argvdata/balloon-device-deflate.xml index 25c34ac94c..dc443bcea9 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate.xml +++ b/tests/qemuxml2argvdata/balloon-device-deflate.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemuxml2argvdata/balloon-device-period.args index 170fe6a551..8a6cc8dec5 100644 --- a/tests/qemuxml2argvdata/balloon-device-period.args +++ b/tests/qemuxml2argvdata/balloon-device-period.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/balloon-device-period.xml b/tests/qemuxml2argvdata/balloon-device-period.xml index d4ab2368ca..8094e7a308 100644 --- a/tests/qemuxml2argvdata/balloon-device-period.xml +++ b/tests/qemuxml2argvdata/balloon-device-period.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2argvdata/balloon-device.args index 170fe6a551..8a6cc8dec5 100644 --- a/tests/qemuxml2argvdata/balloon-device.args +++ b/tests/qemuxml2argvdata/balloon-device.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/balloon-device.xml b/tests/qemuxml2argvdata/balloon-device.xml index 8443ac28ff..3c1c04a455 100644 --- a/tests/qemuxml2argvdata/balloon-device.xml +++ b/tests/qemuxml2argvdata/balloon-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/bios.args b/tests/qemuxml2argvdata/bios.args index 2edfc1d38e..6b636575b1 100644 --- a/tests/qemuxml2argvdata/bios.args +++ b/tests/qemuxml2argvdata/bios.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name test-bios \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/bios.xml b/tests/qemuxml2argvdata/bios.xml index a9481e7b5a..82092c1893 100644 --- a/tests/qemuxml2argvdata/bios.xml +++ b/tests/qemuxml2argvdata/bios.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.args b/tests/qemuxml2argvdata/blkdeviotune-group-num.args index 63500e9d03..dfa7155b1e 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-group-num.args +++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.xml b/tests/qemuxml2argvdata/blkdeviotune-group-num.xml index c70d3b2afd..c82430a1e9 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-group-num.xml +++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.args b/tests/qemuxml2argvdata/blkdeviotune-max-length.args index 12f699aeb8..5d301a465d 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max-length.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.xml b/tests/qemuxml2argvdata/blkdeviotune-max-length.xml index f2e7528d98..83fea5c567 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max-length.xml +++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.args b/tests/qemuxml2argvdata/blkdeviotune-max.args index 623894a633..4548443377 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.xml b/tests/qemuxml2argvdata/blkdeviotune-max.xml index 55e118fcd3..3c604c2837 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max.xml +++ b/tests/qemuxml2argvdata/blkdeviotune-max.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/blkdeviotune.xml b/tests/qemuxml2argvdata/blkdeviotune.xml index ef5651c535..268b4fb3af 100644 --- a/tests/qemuxml2argvdata/blkdeviotune.xml +++ b/tests/qemuxml2argvdata/blkdeviotune.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2argvdata/blkiotune-device.args index 3a1f010e3e..60253f43ec 100644 --- a/tests/qemuxml2argvdata/blkiotune-device.args +++ b/tests/qemuxml2argvdata/blkiotune-device.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/blkiotune-device.xml b/tests/qemuxml2argvdata/blkiotune-device.xml index 48fd37dba2..9fdc25b767 100644 --- a/tests/qemuxml2argvdata/blkiotune-device.xml +++ b/tests/qemuxml2argvdata/blkiotune-device.xml @@ -32,7 +32,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata/blkiotune.args index 3a1f010e3e..60253f43ec 100644 --- a/tests/qemuxml2argvdata/blkiotune.args +++ b/tests/qemuxml2argvdata/blkiotune.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/blkiotune.xml b/tests/qemuxml2argvdata/blkiotune.xml index a0b7b034d3..9c224f1035 100644 --- a/tests/qemuxml2argvdata/blkiotune.xml +++ b/tests/qemuxml2argvdata/blkiotune.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/boot-cdrom.args b/tests/qemuxml2argvdata/boot-cdrom.args index 1f9acd0a01..c5d66e7b82 100644 --- a/tests/qemuxml2argvdata/boot-cdrom.args +++ b/tests/qemuxml2argvdata/boot-cdrom.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/boot-cdrom.xml b/tests/qemuxml2argvdata/boot-cdrom.xml index 584323facc..374c8c38ce 100644 --- a/tests/qemuxml2argvdata/boot-cdrom.xml +++ b/tests/qemuxml2argvdata/boot-cdrom.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='cdrom'> <driver name='qemu' type='raw'/> <source dev='/dev/cdrom'/> diff --git a/tests/qemuxml2argvdata/boot-complex.args b/tests/qemuxml2argvdata/boot-complex.args index e473a53153..0fbfc3c242 100644 --- a/tests/qemuxml2argvdata/boot-complex.args +++ b/tests/qemuxml2argvdata/boot-complex.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/boot-complex.xml b/tests/qemuxml2argvdata/boot-complex.xml index 6b2bcd8b87..959acfb4ca 100644 --- a/tests/qemuxml2argvdata/boot-complex.xml +++ b/tests/qemuxml2argvdata/boot-complex.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <source file='/tmp/vdb.img'/> <target dev='vdb' bus='virtio'/> diff --git a/tests/qemuxml2argvdata/boot-dev+order.xml b/tests/qemuxml2argvdata/boot-dev+order.xml index 28490b5239..e4bb3b1f48 100644 --- a/tests/qemuxml2argvdata/boot-dev+order.xml +++ b/tests/qemuxml2argvdata/boot-dev+order.xml @@ -15,7 +15,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/boot-floppy.args b/tests/qemuxml2argvdata/boot-floppy.args index f68f51e4f4..a2b70dc96a 100644 --- a/tests/qemuxml2argvdata/boot-floppy.args +++ b/tests/qemuxml2argvdata/boot-floppy.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/boot-floppy.xml b/tests/qemuxml2argvdata/boot-floppy.xml index 5731302348..324c9c81d8 100644 --- a/tests/qemuxml2argvdata/boot-floppy.xml +++ b/tests/qemuxml2argvdata/boot-floppy.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args b/tests/qemuxml2argvdata/boot-menu-disable-drive.args index 22a87e5cda..f3e2c97537 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args +++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.xml b/tests/qemuxml2argvdata/boot-menu-disable-drive.xml index 8d9c1ae7d1..e33b61f13f 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable-drive.xml +++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='cdrom'> <source dev='/dev/cdrom'/> <target dev='hdc' bus='ide'/> diff --git a/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml b/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml index 19850da21f..a7ae02fda0 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml +++ b/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='cdrom'> <source dev='/dev/cdrom'/> <target dev='hdc' bus='ide'/> diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args b/tests/qemuxml2argvdata/boot-menu-disable.args index 22a87e5cda..f3e2c97537 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable.args +++ b/tests/qemuxml2argvdata/boot-menu-disable.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/boot-menu-disable.xml b/tests/qemuxml2argvdata/boot-menu-disable.xml index 09d4268d23..6a61f088d9 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable.xml +++ b/tests/qemuxml2argvdata/boot-menu-disable.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='cdrom'> <source dev='/dev/cdrom'/> <target dev='hdc' bus='ide'/> diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml index e0c81ae10f..5af6f5bb95 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml +++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='cdrom'> <source dev='/dev/cdrom'/> <target dev='hdc' bus='ide'/> diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args index 5fa7c31b2a..4df0ae4624 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args +++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml index 09232cb28e..e467aedd1e 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml +++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='cdrom'> <source dev='/dev/cdrom'/> <target dev='hdc' bus='ide'/> diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args b/tests/qemuxml2argvdata/boot-menu-enable.args index b95aa3688c..83b4fbde44 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable.args +++ b/tests/qemuxml2argvdata/boot-menu-enable.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/boot-menu-enable.xml b/tests/qemuxml2argvdata/boot-menu-enable.xml index 83b49abddc..5f2f4aedb4 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable.xml +++ b/tests/qemuxml2argvdata/boot-menu-enable.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='cdrom'> <source dev='/dev/cdrom'/> <target dev='hdc' bus='ide'/> diff --git a/tests/qemuxml2argvdata/boot-multi.args b/tests/qemuxml2argvdata/boot-multi.args index b95aa3688c..83b4fbde44 100644 --- a/tests/qemuxml2argvdata/boot-multi.args +++ b/tests/qemuxml2argvdata/boot-multi.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/boot-multi.xml b/tests/qemuxml2argvdata/boot-multi.xml index acfcd45a40..83f8e6aa23 100644 --- a/tests/qemuxml2argvdata/boot-multi.xml +++ b/tests/qemuxml2argvdata/boot-multi.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='cdrom'> <source dev='/dev/cdrom'/> <target dev='hdc' bus='ide'/> diff --git a/tests/qemuxml2argvdata/boot-network.args b/tests/qemuxml2argvdata/boot-network.args index 100928275f..9ca3f75df3 100644 --- a/tests/qemuxml2argvdata/boot-network.args +++ b/tests/qemuxml2argvdata/boot-network.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/boot-network.xml b/tests/qemuxml2argvdata/boot-network.xml index f0cb4bc7a1..6233605ac5 100644 --- a/tests/qemuxml2argvdata/boot-network.xml +++ b/tests/qemuxml2argvdata/boot-network.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/boot-order.args b/tests/qemuxml2argvdata/boot-order.args index f2c862968a..57d4b88989 100644 --- a/tests/qemuxml2argvdata/boot-order.args +++ b/tests/qemuxml2argvdata/boot-order.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/boot-order.xml b/tests/qemuxml2argvdata/boot-order.xml index a8e094e854..6a95658ad2 100644 --- a/tests/qemuxml2argvdata/boot-order.xml +++ b/tests/qemuxml2argvdata/boot-order.xml @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/boot-strict.args b/tests/qemuxml2argvdata/boot-strict.args index 3da9d70654..827814cbb9 100644 --- a/tests/qemuxml2argvdata/boot-strict.args +++ b/tests/qemuxml2argvdata/boot-strict.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/boot-strict.xml b/tests/qemuxml2argvdata/boot-strict.xml index 6b2bcd8b87..959acfb4ca 100644 --- a/tests/qemuxml2argvdata/boot-strict.xml +++ b/tests/qemuxml2argvdata/boot-strict.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <source file='/tmp/vdb.img'/> <target dev='vdb' bus='virtio'/> diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.args index 18f3a5b410..0338d0c5e3 100644 --- a/tests/qemuxml2argvdata/channel-guestfwd.args +++ b/tests/qemuxml2argvdata/channel-guestfwd.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/channel-guestfwd.xml b/tests/qemuxml2argvdata/channel-guestfwd.xml index 240356d7c6..e463c2d970 100644 --- a/tests/qemuxml2argvdata/channel-guestfwd.xml +++ b/tests/qemuxml2argvdata/channel-guestfwd.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2argvdata/channel-spicevmc.args index c7845d6ca0..adb7707270 100644 --- a/tests/qemuxml2argvdata/channel-spicevmc.args +++ b/tests/qemuxml2argvdata/channel-spicevmc.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/channel-spicevmc.xml b/tests/qemuxml2argvdata/channel-spicevmc.xml index 95d0c20647..de5029f306 100644 --- a/tests/qemuxml2argvdata/channel-spicevmc.xml +++ b/tests/qemuxml2argvdata/channel-spicevmc.xml @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxml2argvdata/channel-virtio-auto.args index 0c439728fb..e7d6531021 100644 --- a/tests/qemuxml2argvdata/channel-virtio-auto.args +++ b/tests/qemuxml2argvdata/channel-virtio-auto.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.xml b/tests/qemuxml2argvdata/channel-virtio-auto.xml index 042b94fa81..080a9faf95 100644 --- a/tests/qemuxml2argvdata/channel-virtio-auto.xml +++ b/tests/qemuxml2argvdata/channel-virtio-auto.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qemuxml2argvdata/channel-virtio-autoadd.args index 23d90f5f0d..9daac162d0 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.xml b/tests/qemuxml2argvdata/channel-virtio-autoadd.xml index d84d990236..2daec88dc9 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoadd.xml +++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/qemuxml2argvdata/channel-virtio-autoassign.args index 56125fae06..67d1662096 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.xml b/tests/qemuxml2argvdata/channel-virtio-autoassign.xml index 32d4b8b1bd..45402468c8 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoassign.xml +++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qemuxml2argvdata/channel-virtio-default.args index abc3b797e8..f3e0f591be 100644 --- a/tests/qemuxml2argvdata/channel-virtio-default.args +++ b/tests/qemuxml2argvdata/channel-virtio-default.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/channel-virtio-default.xml b/tests/qemuxml2argvdata/channel-virtio-default.xml index fc06dba501..aab9ce1a97 100644 --- a/tests/qemuxml2argvdata/channel-virtio-default.xml +++ b/tests/qemuxml2argvdata/channel-virtio-default.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemuxml2argvdata/channel-virtio-state.args index d99b75b9be..38a9f41b1e 100644 --- a/tests/qemuxml2argvdata/channel-virtio-state.args +++ b/tests/qemuxml2argvdata/channel-virtio-state.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/channel-virtio-state.xml b/tests/qemuxml2argvdata/channel-virtio-state.xml index 00ed2c63d5..006ba1d048 100644 --- a/tests/qemuxml2argvdata/channel-virtio-state.xml +++ b/tests/qemuxml2argvdata/channel-virtio-state.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxml2argvdata/channel-virtio-unix.args index ecc06941cb..fd42b897fd 100644 --- a/tests/qemuxml2argvdata/channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/channel-virtio-unix.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.xml b/tests/qemuxml2argvdata/channel-virtio-unix.xml index cd0c0ab256..a34551a9e0 100644 --- a/tests/qemuxml2argvdata/channel-virtio-unix.xml +++ b/tests/qemuxml2argvdata/channel-virtio-unix.xml @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2argvdata/channel-virtio.args index 44dd32a210..1d22c3633f 100644 --- a/tests/qemuxml2argvdata/channel-virtio.args +++ b/tests/qemuxml2argvdata/channel-virtio.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/channel-virtio.xml b/tests/qemuxml2argvdata/channel-virtio.xml index fdeb847da3..0bf7b04d50 100644 --- a/tests/qemuxml2argvdata/channel-virtio.xml +++ b/tests/qemuxml2argvdata/channel-virtio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml b/tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml index 3cb67ecdcc..9f62ae7545 100644 --- a/tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml +++ b/tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml @@ -8,7 +8,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='1'> <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> </controller> diff --git a/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml b/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml index 73dac66816..d3308b4afe 100644 --- a/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml +++ b/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml @@ -8,7 +8,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='1'> <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> </controller> diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args b/tests/qemuxml2argvdata/chardev-reconnect.args index 84e760aba0..851052d5a5 100644 --- a/tests/qemuxml2argvdata/chardev-reconnect.args +++ b/tests/qemuxml2argvdata/chardev-reconnect.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/chardev-reconnect.xml b/tests/qemuxml2argvdata/chardev-reconnect.xml index 41ee248db3..13a4b18bff 100644 --- a/tests/qemuxml2argvdata/chardev-reconnect.xml +++ b/tests/qemuxml2argvdata/chardev-reconnect.xml @@ -8,7 +8,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='virtio-serial' index='1'> <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> </controller> diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argvdata/clock-catchup.args index ca872b96e7..4cf109a0e8 100644 --- a/tests/qemuxml2argvdata/clock-catchup.args +++ b/tests/qemuxml2argvdata/clock-catchup.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/clock-catchup.xml b/tests/qemuxml2argvdata/clock-catchup.xml index 94d2dd0333..8c22afe1c8 100644 --- a/tests/qemuxml2argvdata/clock-catchup.xml +++ b/tests/qemuxml2argvdata/clock-catchup.xml @@ -23,7 +23,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvdata/clock-france.args index b08811f884..f814906c01 100644 --- a/tests/qemuxml2argvdata/clock-france.args +++ b/tests/qemuxml2argvdata/clock-france.args @@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ TZ=Europe/Paris \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/clock-france.xml b/tests/qemuxml2argvdata/clock-france.xml index 626b9efcc0..be9231e92f 100644 --- a/tests/qemuxml2argvdata/clock-france.xml +++ b/tests/qemuxml2argvdata/clock-france.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2argvdata/clock-hpet-off.args index 64c8ca111e..89e510e977 100644 --- a/tests/qemuxml2argvdata/clock-hpet-off.args +++ b/tests/qemuxml2argvdata/clock-hpet-off.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/clock-hpet-off.xml b/tests/qemuxml2argvdata/clock-hpet-off.xml index 6ae8b809e1..4b573464f7 100644 --- a/tests/qemuxml2argvdata/clock-hpet-off.xml +++ b/tests/qemuxml2argvdata/clock-hpet-off.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args index ade15a2b7e..4b78d2ac23 100644 --- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml index c29b761b28..9924f865c3 100644 --- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml +++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2argvdata/clock-localtime.args index cfbf59c3c5..e6f80f0085 100644 --- a/tests/qemuxml2argvdata/clock-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/clock-localtime.xml b/tests/qemuxml2argvdata/clock-localtime.xml index 551459114a..d5f848b9e7 100644 --- a/tests/qemuxml2argvdata/clock-localtime.xml +++ b/tests/qemuxml2argvdata/clock-localtime.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args index d75585bf0f..cb96ffbef3 100644 --- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args +++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=kvm,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml index 76eead99ad..14400f5d7b 100644 --- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml +++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/clock-utc.args b/tests/qemuxml2argvdata/clock-utc.args index a9bd75becf..e38898e335 100644 --- a/tests/qemuxml2argvdata/clock-utc.args +++ b/tests/qemuxml2argvdata/clock-utc.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/clock-utc.xml b/tests/qemuxml2argvdata/clock-utc.xml index bddb259630..7e26f2ed52 100644 --- a/tests/qemuxml2argvdata/clock-utc.xml +++ b/tests/qemuxml2argvdata/clock-utc.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2argvdata/clock-variable.args index afe7c48dc5..9fd990da1f 100644 --- a/tests/qemuxml2argvdata/clock-variable.args +++ b/tests/qemuxml2argvdata/clock-variable.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/clock-variable.xml b/tests/qemuxml2argvdata/clock-variable.xml index d3e6396cbf..1cb936a712 100644 --- a/tests/qemuxml2argvdata/clock-variable.xml +++ b/tests/qemuxml2argvdata/clock-variable.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/console-compat-auto.args b/tests/qemuxml2argvdata/console-compat-auto.args index 683399d307..4d6d6e376c 100644 --- a/tests/qemuxml2argvdata/console-compat-auto.args +++ b/tests/qemuxml2argvdata/console-compat-auto.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/console-compat-auto.xml b/tests/qemuxml2argvdata/console-compat-auto.xml index 1789e003c8..2355747451 100644 --- a/tests/qemuxml2argvdata/console-compat-auto.xml +++ b/tests/qemuxml2argvdata/console-compat-auto.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args b/tests/qemuxml2argvdata/console-compat-chardev.args index 683399d307..4d6d6e376c 100644 --- a/tests/qemuxml2argvdata/console-compat-chardev.args +++ b/tests/qemuxml2argvdata/console-compat-chardev.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/console-compat-chardev.xml b/tests/qemuxml2argvdata/console-compat-chardev.xml index 939e3aeff2..4acf635bd4 100644 --- a/tests/qemuxml2argvdata/console-compat-chardev.xml +++ b/tests/qemuxml2argvdata/console-compat-chardev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/console-compat.args b/tests/qemuxml2argvdata/console-compat.args index 539c5a05bc..8a6d72fb6e 100644 --- a/tests/qemuxml2argvdata/console-compat.args +++ b/tests/qemuxml2argvdata/console-compat.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/console-compat.xml b/tests/qemuxml2argvdata/console-compat.xml index 359511a690..a932b9c4b6 100644 --- a/tests/qemuxml2argvdata/console-compat.xml +++ b/tests/qemuxml2argvdata/console-compat.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/console-compat2.xml b/tests/qemuxml2argvdata/console-compat2.xml index 74f12409ec..16160dcc3b 100644 --- a/tests/qemuxml2argvdata/console-compat2.xml +++ b/tests/qemuxml2argvdata/console-compat2.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxml2argvdata/console-virtio-many.args index baa538d697..ec81652e20 100644 --- a/tests/qemuxml2argvdata/console-virtio-many.args +++ b/tests/qemuxml2argvdata/console-virtio-many.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/console-virtio-many.xml b/tests/qemuxml2argvdata/console-virtio-many.xml index c26a9c294f..a455a39751 100644 --- a/tests/qemuxml2argvdata/console-virtio-many.xml +++ b/tests/qemuxml2argvdata/console-virtio-many.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2argvdata/console-virtio.args index 61115cd1b2..30a47a915b 100644 --- a/tests/qemuxml2argvdata/console-virtio.args +++ b/tests/qemuxml2argvdata/console-virtio.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/console-virtio.xml b/tests/qemuxml2argvdata/console-virtio.xml index b9c9c5785f..77fd040b39 100644 --- a/tests/qemuxml2argvdata/console-virtio.xml +++ b/tests/qemuxml2argvdata/console-virtio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args index 1647cfdd97..9d7bf325ca 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.xml b/tests/qemuxml2argvdata/controller-virtio-scsi.xml index 844e4ad397..2474c3bec5 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.xml +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sda' bus='scsi'/> diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.args b/tests/qemuxml2argvdata/cpu-eoi-disabled.args index 57fad2b666..786f9b693c 100644 --- a/tests/qemuxml2argvdata/cpu-eoi-disabled.args +++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.xml b/tests/qemuxml2argvdata/cpu-eoi-disabled.xml index 62ba7134af..657de0482a 100644 --- a/tests/qemuxml2argvdata/cpu-eoi-disabled.xml +++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.xml @@ -21,7 +21,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.args b/tests/qemuxml2argvdata/cpu-eoi-enabled.args index 04836db5fd..90bacb0224 100644 --- a/tests/qemuxml2argvdata/cpu-eoi-enabled.args +++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.xml b/tests/qemuxml2argvdata/cpu-eoi-enabled.xml index fde0f354bb..bc8934f260 100644 --- a/tests/qemuxml2argvdata/cpu-eoi-enabled.xml +++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.xml @@ -21,7 +21,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/cpu-host-model-features.xml b/tests/qemuxml2argvdata/cpu-host-model-features.xml index 22034eae5d..5de4c0cde1 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-features.xml +++ b/tests/qemuxml2argvdata/cpu-host-model-features.xml @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args index cbe333ee64..a4de9d3de9 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=kvm,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.xml b/tests/qemuxml2argvdata/cpu-host-passthrough-features.xml index 639dd5f6d9..bb4dd87f65 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.xml +++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.xml @@ -23,7 +23,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args b/tests/qemuxml2argvdata/cpu-kvmclock.args index 10990429d9..39d368a359 100644 --- a/tests/qemuxml2argvdata/cpu-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-kvmclock.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=kvm,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.xml b/tests/qemuxml2argvdata/cpu-kvmclock.xml index 25d3ee757a..2be6066f89 100644 --- a/tests/qemuxml2argvdata/cpu-kvmclock.xml +++ b/tests/qemuxml2argvdata/cpu-kvmclock.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args b/tests/qemuxml2argvdata/cpu-minimum1.args index 94a560b6e7..8246efd563 100644 --- a/tests/qemuxml2argvdata/cpu-minimum1.args +++ b/tests/qemuxml2argvdata/cpu-minimum1.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=kvm,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/cpu-minimum1.xml b/tests/qemuxml2argvdata/cpu-minimum1.xml index cedd7c658c..806bf2efb2 100644 --- a/tests/qemuxml2argvdata/cpu-minimum1.xml +++ b/tests/qemuxml2argvdata/cpu-minimum1.xml @@ -16,6 +16,6 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> </devices> </domain> diff --git a/tests/qemuxml2argvdata/cputune-iothreads.xml b/tests/qemuxml2argvdata/cputune-iothreads.xml index 311a1d3604..d55d85c07d 100644 --- a/tests/qemuxml2argvdata/cputune-iothreads.xml +++ b/tests/qemuxml2argvdata/cputune-iothreads.xml @@ -25,7 +25,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml b/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml index 830177e603..dd9a664939 100644 --- a/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml +++ b/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml @@ -25,7 +25,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/cputune-iothreadsched-zeropriority.xml b/tests/qemuxml2argvdata/cputune-iothreadsched-zeropriority.xml index 3d049e31a5..1144e0f132 100644 --- a/tests/qemuxml2argvdata/cputune-iothreadsched-zeropriority.xml +++ b/tests/qemuxml2argvdata/cputune-iothreadsched-zeropriority.xml @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/cputune-iothreadsched.xml b/tests/qemuxml2argvdata/cputune-iothreadsched.xml index 56cb434e4a..73bcec602e 100644 --- a/tests/qemuxml2argvdata/cputune-iothreadsched.xml +++ b/tests/qemuxml2argvdata/cputune-iothreadsched.xml @@ -25,7 +25,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml b/tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml index 2c1667a633..4e07f17ad8 100644 --- a/tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml +++ b/tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.args b/tests/qemuxml2argvdata/cputune-zero-shares.args index 3d71d03b9c..7270aafeb7 100644 --- a/tests/qemuxml2argvdata/cputune-zero-shares.args +++ b/tests/qemuxml2argvdata/cputune-zero-shares.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.xml b/tests/qemuxml2argvdata/cputune-zero-shares.xml index cb03330cc6..0b1369fe05 100644 --- a/tests/qemuxml2argvdata/cputune-zero-shares.xml +++ b/tests/qemuxml2argvdata/cputune-zero-shares.xml @@ -21,7 +21,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/cputune.args b/tests/qemuxml2argvdata/cputune.args index 3d71d03b9c..7270aafeb7 100644 --- a/tests/qemuxml2argvdata/cputune.args +++ b/tests/qemuxml2argvdata/cputune.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/cputune.xml b/tests/qemuxml2argvdata/cputune.xml index b67c71c0e6..d7a5db0bb6 100644 --- a/tests/qemuxml2argvdata/cputune.xml +++ b/tests/qemuxml2argvdata/cputune.xml @@ -25,7 +25,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/debug-threads.args b/tests/qemuxml2argvdata/debug-threads.args index 23637be1ac..d73625e94e 100644 --- a/tests/qemuxml2argvdata/debug-threads.args +++ b/tests/qemuxml2argvdata/debug-threads.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1,debug-threads=on \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/debug-threads.xml b/tests/qemuxml2argvdata/debug-threads.xml index 9ef92f8feb..8701906357 100644 --- a/tests/qemuxml2argvdata/debug-threads.xml +++ b/tests/qemuxml2argvdata/debug-threads.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/disk-active-commit.xml b/tests/qemuxml2argvdata/disk-active-commit.xml index 8ed66fdcc0..28e59dcd85 100644 --- a/tests/qemuxml2argvdata/disk-active-commit.xml +++ b/tests/qemuxml2argvdata/disk-active-commit.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/tmp/HostVG/QEMUGuest1-snap'/> diff --git a/tests/qemuxml2argvdata/disk-address-conflict.xml b/tests/qemuxml2argvdata/disk-address-conflict.xml index 3500d373f7..eeec87d70f 100644 --- a/tests/qemuxml2argvdata/disk-address-conflict.xml +++ b/tests/qemuxml2argvdata/disk-address-conflict.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sda' bus='sata'/> diff --git a/tests/qemuxml2argvdata/disk-aio.args b/tests/qemuxml2argvdata/disk-aio.args index 55ddfcbdf3..1b4dffc84c 100644 --- a/tests/qemuxml2argvdata/disk-aio.args +++ b/tests/qemuxml2argvdata/disk-aio.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args index 9148b98ba5..f8a89493f6 100644 --- a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args index a424e58a48..b30edf4dbe 100644 --- a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-aio.xml b/tests/qemuxml2argvdata/disk-aio.xml index b1cab775a0..02ac3aadc6 100644 --- a/tests/qemuxml2argvdata/disk-aio.xml +++ b/tests/qemuxml2argvdata/disk-aio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='qcow2' cache='none' io='native'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml b/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml index 591819fbb6..019ba45135 100644 --- a/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml +++ b/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/export/vmimages/1.raw'/> diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.xml b/tests/qemuxml2argvdata/disk-backing-chains-index.xml index 5e0a03fbc4..7ef4e16e81 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-index.xml +++ b/tests/qemuxml2argvdata/disk-backing-chains-index.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='qcow2'/> <source protocol='gluster' name='Volume2/Image' index='2'> diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args index fb8a62dde3..a8675debd5 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args index a2f030f165..4108943574 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.xml b/tests/qemuxml2argvdata/disk-backing-chains-noindex.xml index 1336d0fdd6..0b78539114 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.xml +++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='qcow2'/> <source protocol='gluster' name='Volume2/Image'> diff --git a/tests/qemuxml2argvdata/disk-backing-chains.xml b/tests/qemuxml2argvdata/disk-backing-chains.xml index 2eaafb34e7..7fe84da3f0 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains.xml +++ b/tests/qemuxml2argvdata/disk-backing-chains.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='qcow2'/> <source protocol='gluster' name='Volume2/Image'> diff --git a/tests/qemuxml2argvdata/disk-blockio.args b/tests/qemuxml2argvdata/disk-blockio.args index 8ed9ac87fd..72aa592fef 100644 --- a/tests/qemuxml2argvdata/disk-blockio.args +++ b/tests/qemuxml2argvdata/disk-blockio.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-blockio.xml b/tests/qemuxml2argvdata/disk-blockio.xml index ea5c861773..1f78b38cb6 100644 --- a/tests/qemuxml2argvdata/disk-blockio.xml +++ b/tests/qemuxml2argvdata/disk-blockio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='cdrom'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/disk-boot-cdrom.args b/tests/qemuxml2argvdata/disk-boot-cdrom.args index 540df3a736..c574cb02e6 100644 --- a/tests/qemuxml2argvdata/disk-boot-cdrom.args +++ b/tests/qemuxml2argvdata/disk-boot-cdrom.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-boot-cdrom.xml b/tests/qemuxml2argvdata/disk-boot-cdrom.xml index 27ce402e59..53156b1c1a 100644 --- a/tests/qemuxml2argvdata/disk-boot-cdrom.xml +++ b/tests/qemuxml2argvdata/disk-boot-cdrom.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-boot-disk.args b/tests/qemuxml2argvdata/disk-boot-disk.args index 909f060b19..435ddd6194 100644 --- a/tests/qemuxml2argvdata/disk-boot-disk.args +++ b/tests/qemuxml2argvdata/disk-boot-disk.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-boot-disk.xml b/tests/qemuxml2argvdata/disk-boot-disk.xml index fcd5887920..950922f7b8 100644 --- a/tests/qemuxml2argvdata/disk-boot-disk.xml +++ b/tests/qemuxml2argvdata/disk-boot-disk.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args index 64db701de8..b598bacb94 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc-i440fx-2.6,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args index e1a7299b12..7279921ae6 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args index e69fae40ff..82e45effba 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args index 60b9982549..8d0904260a 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args index 49dee03493..3dca80dacd 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-cache.xml b/tests/qemuxml2argvdata/disk-cache.xml index 7e7d45459c..5104c8469f 100644 --- a/tests/qemuxml2argvdata/disk-cache.xml +++ b/tests/qemuxml2argvdata/disk-cache.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='qcow2' cache='writeback'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args index b2ac9b5c04..d1b75e7607 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.xml b/tests/qemuxml2argvdata/disk-cdrom-bus-other.xml index a142373afb..e73db8c6ab 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.xml +++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='cdrom'> <driver name='qemu' type='raw'/> <source file='/root/boot.iso'/> diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args index bdd89d7506..88d5fa7929 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.xml b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.xml index f593b33c91..be26ead90e 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.xml +++ b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='cdrom'> <driver name='qemu' type='raw'/> <target dev='hdd' bus='ide'/> diff --git a/tests/qemuxml2argvdata/disk-cdrom.args b/tests/qemuxml2argvdata/disk-cdrom.args index fc9e241a81..cbac368129 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.args +++ b/tests/qemuxml2argvdata/disk-cdrom.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args index 9250cf58d0..2440acc78a 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args index a32daba5e7..27c74caf8e 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-cdrom.xml b/tests/qemuxml2argvdata/disk-cdrom.xml index f5e9f7395d..b051b16642 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.xml +++ b/tests/qemuxml2argvdata/disk-cdrom.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-device-lun-type-invalid.xml b/tests/qemuxml2argvdata/disk-device-lun-type-invalid.xml index 956aed866e..84d448ab10 100644 --- a/tests/qemuxml2argvdata/disk-device-lun-type-invalid.xml +++ b/tests/qemuxml2argvdata/disk-device-lun-type-invalid.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='lun' rawio='yes'> <driver name='qemu' type='qcow2'/> <source file='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-error-policy.args b/tests/qemuxml2argvdata/disk-error-policy.args index 6d4c7ea5e2..c339203e2e 100644 --- a/tests/qemuxml2argvdata/disk-error-policy.args +++ b/tests/qemuxml2argvdata/disk-error-policy.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args index 7451620798..26e8f56e58 100644 --- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args index 2ed63972bc..ee2b05cb8b 100644 --- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-error-policy.xml b/tests/qemuxml2argvdata/disk-error-policy.xml index 708c13fc0e..0efb374f67 100644 --- a/tests/qemuxml2argvdata/disk-error-policy.xml +++ b/tests/qemuxml2argvdata/disk-error-policy.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='qcow2' cache='none' error_policy='stop'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-fdc-incompatible-address.xml b/tests/qemuxml2argvdata/disk-fdc-incompatible-address.xml index b454fb7f46..3ac2febd5a 100644 --- a/tests/qemuxml2argvdata/disk-fdc-incompatible-address.xml +++ b/tests/qemuxml2argvdata/disk-fdc-incompatible-address.xml @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='floppy'> <source dev='/dev/fd0'/> <target dev='fda' bus='fdc'/> diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.args b/tests/qemuxml2argvdata/disk-floppy-tray.args index c350b9969a..e8a4472ebc 100644 --- a/tests/qemuxml2argvdata/disk-floppy-tray.args +++ b/tests/qemuxml2argvdata/disk-floppy-tray.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.xml b/tests/qemuxml2argvdata/disk-floppy-tray.xml index 4b9bc1b6c9..23cc5d49a2 100644 --- a/tests/qemuxml2argvdata/disk-floppy-tray.xml +++ b/tests/qemuxml2argvdata/disk-floppy-tray.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/disk-floppy.args b/tests/qemuxml2argvdata/disk-floppy.args index 996f222df6..83ec46bb9d 100644 --- a/tests/qemuxml2argvdata/disk-floppy.args +++ b/tests/qemuxml2argvdata/disk-floppy.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args index fd9fe1d54e..d4f11f8ca0 100644 --- a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args index 1376eaeed6..1dba6d5666 100644 --- a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-floppy.xml b/tests/qemuxml2argvdata/disk-floppy.xml index ad840420a1..7005351332 100644 --- a/tests/qemuxml2argvdata/disk-floppy.xml +++ b/tests/qemuxml2argvdata/disk-floppy.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-fmt-cow.xml b/tests/qemuxml2argvdata/disk-fmt-cow.xml index 91c62ea055..3ba83a281a 100644 --- a/tests/qemuxml2argvdata/disk-fmt-cow.xml +++ b/tests/qemuxml2argvdata/disk-fmt-cow.xml @@ -10,7 +10,7 @@ </os> <clock offset='utc'/> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='cow'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-fmt-dir.xml b/tests/qemuxml2argvdata/disk-fmt-dir.xml index ede3f8e186..8a4f9fa9d5 100644 --- a/tests/qemuxml2argvdata/disk-fmt-dir.xml +++ b/tests/qemuxml2argvdata/disk-fmt-dir.xml @@ -10,7 +10,7 @@ </os> <clock offset='utc'/> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='dir'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-fmt-iso.xml b/tests/qemuxml2argvdata/disk-fmt-iso.xml index ad2825bfb2..834ef696cf 100644 --- a/tests/qemuxml2argvdata/disk-fmt-iso.xml +++ b/tests/qemuxml2argvdata/disk-fmt-iso.xml @@ -10,7 +10,7 @@ </os> <clock offset='utc'/> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='iso'/> <source file='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.args b/tests/qemuxml2argvdata/disk-fmt-qcow.args index aec12436d7..9c24ce384f 100644 --- a/tests/qemuxml2argvdata/disk-fmt-qcow.args +++ b/tests/qemuxml2argvdata/disk-fmt-qcow.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.xml b/tests/qemuxml2argvdata/disk-fmt-qcow.xml index fe7bbff5f6..06044266f2 100644 --- a/tests/qemuxml2argvdata/disk-fmt-qcow.xml +++ b/tests/qemuxml2argvdata/disk-fmt-qcow.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='qcow2'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-geometry.args b/tests/qemuxml2argvdata/disk-geometry.args index ed84a79c73..eefa7dc24e 100644 --- a/tests/qemuxml2argvdata/disk-geometry.args +++ b/tests/qemuxml2argvdata/disk-geometry.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-geometry.xml b/tests/qemuxml2argvdata/disk-geometry.xml index 4f2b16eed7..3bd802acec 100644 --- a/tests/qemuxml2argvdata/disk-geometry.xml +++ b/tests/qemuxml2argvdata/disk-geometry.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <geometry cyls='16383' heads='16' secs='63' trans='lba'/> diff --git a/tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.xml b/tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.xml index 777d8579ca..2f6606b91c 100644 --- a/tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.xml +++ b/tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sda' bus='scsi'/> diff --git a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args index dbdc296d13..aece52dad2 100644 --- a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args +++ b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.xml b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.xml index 21a0b11e5c..3b13f9284c 100644 --- a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.xml +++ b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <auth username='myname'> diff --git a/tests/qemuxml2argvdata/disk-ide-incompatible-address.xml b/tests/qemuxml2argvdata/disk-ide-incompatible-address.xml index 4713893cee..5ca566d20a 100644 --- a/tests/qemuxml2argvdata/disk-ide-incompatible-address.xml +++ b/tests/qemuxml2argvdata/disk-ide-incompatible-address.xml @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-ide-split.args b/tests/qemuxml2argvdata/disk-ide-split.args index 8394222efa..c1a0cc7bfc 100644 --- a/tests/qemuxml2argvdata/disk-ide-split.args +++ b/tests/qemuxml2argvdata/disk-ide-split.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-ide-split.xml b/tests/qemuxml2argvdata/disk-ide-split.xml index 6796886c1f..352b5e31fe 100644 --- a/tests/qemuxml2argvdata/disk-ide-split.xml +++ b/tests/qemuxml2argvdata/disk-ide-split.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='cdrom'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.args b/tests/qemuxml2argvdata/disk-ide-wwn.args index 61c13f4253..939daad00d 100644 --- a/tests/qemuxml2argvdata/disk-ide-wwn.args +++ b/tests/qemuxml2argvdata/disk-ide-wwn.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.xml b/tests/qemuxml2argvdata/disk-ide-wwn.xml index c512cc6f09..7b84b7e9ee 100644 --- a/tests/qemuxml2argvdata/disk-ide-wwn.xml +++ b/tests/qemuxml2argvdata/disk-ide-wwn.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/disk-iscsi.args b/tests/qemuxml2argvdata/disk-iscsi.args index 278f46ae12..9297e95127 100644 --- a/tests/qemuxml2argvdata/disk-iscsi.args +++ b/tests/qemuxml2argvdata/disk-iscsi.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-iscsi.xml b/tests/qemuxml2argvdata/disk-iscsi.xml index 98f04e26a4..04d821989f 100644 --- a/tests/qemuxml2argvdata/disk-iscsi.xml +++ b/tests/qemuxml2argvdata/disk-iscsi.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan.hdserver:hydrar-desktop.win7vm-lun-0'/> diff --git a/tests/qemuxml2argvdata/disk-mirror-old.xml b/tests/qemuxml2argvdata/disk-mirror-old.xml index 1250794563..8aca54f05b 100644 --- a/tests/qemuxml2argvdata/disk-mirror-old.xml +++ b/tests/qemuxml2argvdata/disk-mirror-old.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <backingStore/> diff --git a/tests/qemuxml2argvdata/disk-mirror.xml b/tests/qemuxml2argvdata/disk-mirror.xml index 5a825c54ac..2d61fe29c3 100644 --- a/tests/qemuxml2argvdata/disk-mirror.xml +++ b/tests/qemuxml2argvdata/disk-mirror.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <backingStore/> diff --git a/tests/qemuxml2argvdata/disk-network-gluster.args b/tests/qemuxml2argvdata/disk-network-gluster.args index ac5fd8f3c8..7664284f7c 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args index bca51ff5d7..2721147b3a 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args index 76aeccf6d8..2c5bf86c2d 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-network-gluster.xml b/tests/qemuxml2argvdata/disk-network-gluster.xml index 8ba4e50b36..c20a57a59a 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.xml +++ b/tests/qemuxml2argvdata/disk-network-gluster.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='gluster' name='Volume1/Image'> diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid.xml b/tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid.xml index 7e6b623c3a..03512ec6c9 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid.xml +++ b/tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <auth username='myname'> diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.xml b/tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.xml index 4854abd6c9..9c48a4a700 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.xml +++ b/tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <auth username='myname'> diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args index a5035a56f0..762dc0e04a 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml b/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml index d1be9c4e7d..759d5e217f 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml +++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='iscsi' name='iqn.1992-01.com.example'> diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.args b/tests/qemuxml2argvdata/disk-network-iscsi.args index 3a500c0ca0..53b3821ea7 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args index 372888e444..55347521da 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args index 5bf3e350df..8831db6622 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.xml b/tests/qemuxml2argvdata/disk-network-iscsi.xml index ecc8ead3cc..8a55f1b23b 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.xml +++ b/tests/qemuxml2argvdata/disk-network-iscsi.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='iscsi' name='iqn.1992-01.com.example'> diff --git a/tests/qemuxml2argvdata/disk-network-nbd.args b/tests/qemuxml2argvdata/disk-network-nbd.args index d78830aa3b..17576fe932 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args index a462dcfd27..1742f01e25 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args index 95ef39093c..8dd224b4b2 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-network-nbd.xml b/tests/qemuxml2argvdata/disk-network-nbd.xml index f9630d6655..eda00c103e 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.xml +++ b/tests/qemuxml2argvdata/disk-network-nbd.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='nbd'> diff --git a/tests/qemuxml2argvdata/disk-network-rbd-no-colon.xml b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.xml index 66e149baf4..e3a04afebd 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd-no-colon.xml +++ b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args index 80969bdc43..18cb534552 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args index 4920bfb520..50af3eb653 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -machine pc-i440fx-2.5,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args index 28cea02729..2d05e63cd2 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-network-rbd.xml b/tests/qemuxml2argvdata/disk-network-rbd.xml index 124a80cdf8..b516a755a8 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.xml +++ b/tests/qemuxml2argvdata/disk-network-rbd.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='rbd' name='pool/image'> diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.args b/tests/qemuxml2argvdata/disk-network-sheepdog.args index 9bc0b1e101..cf832062bb 100644 --- a/tests/qemuxml2argvdata/disk-network-sheepdog.args +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args index 25f6e4b7f5..653fa1af40 100644 --- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args index c2b1156f0c..03ceb36a54 100644 --- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.xml b/tests/qemuxml2argvdata/disk-network-sheepdog.xml index 131a3fc3f2..3d6d3b2ae9 100644 --- a/tests/qemuxml2argvdata/disk-network-sheepdog.xml +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMU,Guest,,1'/> diff --git a/tests/qemuxml2argvdata/disk-network-source-auth-both.xml b/tests/qemuxml2argvdata/disk-network-source-auth-both.xml index fed75ad70e..852e2eaae2 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth-both.xml +++ b/tests/qemuxml2argvdata/disk-network-source-auth-both.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <auth username='myname'> diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.args b/tests/qemuxml2argvdata/disk-network-source-auth.args index e177baf511..e68b81fde0 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.args +++ b/tests/qemuxml2argvdata/disk-network-source-auth.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args index caba015187..f34c6b678d 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args index 357a277c46..057cd97273 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.xml b/tests/qemuxml2argvdata/disk-network-source-auth.xml index bd84cc42f6..7cc5c96ae7 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.xml +++ b/tests/qemuxml2argvdata/disk-network-source-auth.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'> diff --git a/tests/qemuxml2argvdata/disk-no-boot.args b/tests/qemuxml2argvdata/disk-no-boot.args index 94c6186062..190129ea97 100644 --- a/tests/qemuxml2argvdata/disk-no-boot.args +++ b/tests/qemuxml2argvdata/disk-no-boot.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-no-boot.xml b/tests/qemuxml2argvdata/disk-no-boot.xml index 03533477f4..9125013e7b 100644 --- a/tests/qemuxml2argvdata/disk-no-boot.xml +++ b/tests/qemuxml2argvdata/disk-no-boot.xml @@ -15,7 +15,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/disk-order.args b/tests/qemuxml2argvdata/disk-order.args index 1d4e490de4..d85c4017ed 100644 --- a/tests/qemuxml2argvdata/disk-order.args +++ b/tests/qemuxml2argvdata/disk-order.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-order.xml b/tests/qemuxml2argvdata/disk-order.xml index e9dfc2e466..4586faa54a 100644 --- a/tests/qemuxml2argvdata/disk-order.xml +++ b/tests/qemuxml2argvdata/disk-order.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='cdrom'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hdc' bus='ide'/> diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.args b/tests/qemuxml2argvdata/disk-readonly-disk.args index 4b58ff1432..6e25779ce0 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.args +++ b/tests/qemuxml2argvdata/disk-readonly-disk.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args index 87719ff12b..34ef204632 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args index 5ca36c0871..aeda701bfe 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.xml b/tests/qemuxml2argvdata/disk-readonly-disk.xml index 137ab0a923..a01d2073c8 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.xml +++ b/tests/qemuxml2argvdata/disk-readonly-disk.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/disk-same-targets.xml b/tests/qemuxml2argvdata/disk-same-targets.xml index 799b299a29..c1104a8eab 100644 --- a/tests/qemuxml2argvdata/disk-same-targets.xml +++ b/tests/qemuxml2argvdata/disk-same-targets.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/disk-sata-device.args b/tests/qemuxml2argvdata/disk-sata-device.args index e0d242a494..572ca20eb2 100644 --- a/tests/qemuxml2argvdata/disk-sata-device.args +++ b/tests/qemuxml2argvdata/disk-sata-device.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-sata-device.xml b/tests/qemuxml2argvdata/disk-sata-device.xml index 9cae432231..9f711451b1 100644 --- a/tests/qemuxml2argvdata/disk-sata-device.xml +++ b/tests/qemuxml2argvdata/disk-sata-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sda' bus='sata'/> diff --git a/tests/qemuxml2argvdata/disk-sata-incompatible-address.xml b/tests/qemuxml2argvdata/disk-sata-incompatible-address.xml index 20c9a0860a..72f8a0bcbb 100644 --- a/tests/qemuxml2argvdata/disk-sata-incompatible-address.xml +++ b/tests/qemuxml2argvdata/disk-sata-incompatible-address.xml @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args index 89d692602c..b3cf61b112 100644 --- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args +++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args index 7cff9c94b6..f75da5425a 100644 --- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.xml b/tests/qemuxml2argvdata/disk-scsi-device-auto.xml index 66aa6fa96a..4c0c35dbf8 100644 --- a/tests/qemuxml2argvdata/disk-scsi-device-auto.xml +++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.args b/tests/qemuxml2argvdata/disk-scsi-disk-split.args index 7d20d861eb..a0ef28d777 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-split.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-split.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.xml b/tests/qemuxml2argvdata/disk-scsi-disk-split.xml index c3105c3fb9..757981a7b7 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-split.xml +++ b/tests/qemuxml2argvdata/disk-scsi-disk-split.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='cdrom'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sda' bus='scsi'/> diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.xml b/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.xml index 6c83715be2..a49170e63e 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.xml +++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sda' bus='virtio'/> diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args index 77d8eecd5d..8cc1057613 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.xml b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.xml index 13125e9be8..aadfa59608 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.xml +++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='cdrom'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sda' bus='scsi'/> diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args index 06df67d3d1..7c92f85f43 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.xml b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.xml index b398473c6e..0bbc1fc1e3 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.xml +++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='cdrom'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='sda' bus='scsi'/> diff --git a/tests/qemuxml2argvdata/disk-scsi-incompatible-address.xml b/tests/qemuxml2argvdata/disk-scsi-incompatible-address.xml index bdf6a1bb09..74eb327a1f 100644 --- a/tests/qemuxml2argvdata/disk-scsi-incompatible-address.xml +++ b/tests/qemuxml2argvdata/disk-scsi-incompatible-address.xml @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough-sgio.xml b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough-sgio.xml index f5eda6ef18..3e561642a3 100644 --- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough-sgio.xml +++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough-sgio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='lun' rawio='no' sgio='unfiltered'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='scsi'/> diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args index 2161c09c04..9f51c6d906 100644 --- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args +++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.xml b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.xml index 5028908254..1ab8a39ea7 100644 --- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.xml +++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='lun'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='scsi'/> diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args index ad07d206d6..a7d85b58db 100644 --- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-scsi.xml b/tests/qemuxml2argvdata/disk-scsi.xml index dda413eb0c..7fbb785a37 100644 --- a/tests/qemuxml2argvdata/disk-scsi.xml +++ b/tests/qemuxml2argvdata/disk-scsi.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/disk-serial.args b/tests/qemuxml2argvdata/disk-serial.args index bdd67c23f5..bbd10a106a 100644 --- a/tests/qemuxml2argvdata/disk-serial.args +++ b/tests/qemuxml2argvdata/disk-serial.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=kvm,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-serial.xml b/tests/qemuxml2argvdata/disk-serial.xml index 18e72bb4ba..88572871df 100644 --- a/tests/qemuxml2argvdata/disk-serial.xml +++ b/tests/qemuxml2argvdata/disk-serial.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/disk-shared-qcow.xml b/tests/qemuxml2argvdata/disk-shared-qcow.xml index ca88a944b3..358e65f7a0 100644 --- a/tests/qemuxml2argvdata/disk-shared-qcow.xml +++ b/tests/qemuxml2argvdata/disk-shared-qcow.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='qcow2'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args index 94eb0fe05c..d35e7a5f6e 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args index 375e2de560..9ab0e8cf39 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-shared.xml b/tests/qemuxml2argvdata/disk-shared.xml index ec351ee1ae..952d9abebf 100644 --- a/tests/qemuxml2argvdata/disk-shared.xml +++ b/tests/qemuxml2argvdata/disk-shared.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-snapshot.args b/tests/qemuxml2argvdata/disk-snapshot.args index 1bd26551f3..9098536356 100644 --- a/tests/qemuxml2argvdata/disk-snapshot.args +++ b/tests/qemuxml2argvdata/disk-snapshot.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-snapshot.xml b/tests/qemuxml2argvdata/disk-snapshot.xml index 56e56ffe74..661a044ea0 100644 --- a/tests/qemuxml2argvdata/disk-snapshot.xml +++ b/tests/qemuxml2argvdata/disk-snapshot.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk' snapshot='internal'> <driver name='qemu' type='qcow2' cache='none'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.args b/tests/qemuxml2argvdata/disk-source-pool-mode.args index e76ff9067f..d55fcf0ff4 100644 --- a/tests/qemuxml2argvdata/disk-source-pool-mode.args +++ b/tests/qemuxml2argvdata/disk-source-pool-mode.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.xml b/tests/qemuxml2argvdata/disk-source-pool-mode.xml index 3f5a2d5246..512ffe5e18 100644 --- a/tests/qemuxml2argvdata/disk-source-pool-mode.xml +++ b/tests/qemuxml2argvdata/disk-source-pool-mode.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='volume' device='cdrom'> <source pool='pool-iscsi-auth' volume='unit:0:0:1' mode='host'> <seclabel model='selinux' relabel='yes'> diff --git a/tests/qemuxml2argvdata/disk-source-pool.args b/tests/qemuxml2argvdata/disk-source-pool.args index 7c05599822..f37a7b3b67 100644 --- a/tests/qemuxml2argvdata/disk-source-pool.args +++ b/tests/qemuxml2argvdata/disk-source-pool.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-source-pool.xml b/tests/qemuxml2argvdata/disk-source-pool.xml index 31b148b4bb..a6ce7fd349 100644 --- a/tests/qemuxml2argvdata/disk-source-pool.xml +++ b/tests/qemuxml2argvdata/disk-source-pool.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator>  <disk device='cdrom' type='volume'> diff --git a/tests/qemuxml2argvdata/disk-transient.xml b/tests/qemuxml2argvdata/disk-transient.xml index 55e5374400..00ddb6487a 100644 --- a/tests/qemuxml2argvdata/disk-transient.xml +++ b/tests/qemuxml2argvdata/disk-transient.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.args b/tests/qemuxml2argvdata/disk-usb-device-removable.args index 99287c6c40..61ca1589a2 100644 --- a/tests/qemuxml2argvdata/disk-usb-device-removable.args +++ b/tests/qemuxml2argvdata/disk-usb-device-removable.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.xml b/tests/qemuxml2argvdata/disk-usb-device-removable.xml index 632780030d..1375c45714 100644 --- a/tests/qemuxml2argvdata/disk-usb-device-removable.xml +++ b/tests/qemuxml2argvdata/disk-usb-device-removable.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/disk-usb-device.args b/tests/qemuxml2argvdata/disk-usb-device.args index c313888e36..515be277cf 100644 --- a/tests/qemuxml2argvdata/disk-usb-device.args +++ b/tests/qemuxml2argvdata/disk-usb-device.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-usb-device.xml b/tests/qemuxml2argvdata/disk-usb-device.xml index a24bb2ff6f..19a536868b 100644 --- a/tests/qemuxml2argvdata/disk-usb-device.xml +++ b/tests/qemuxml2argvdata/disk-usb-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/disk-usb-nosupport.xml b/tests/qemuxml2argvdata/disk-usb-nosupport.xml index 98e3bbc02b..b88ecf1935 100644 --- a/tests/qemuxml2argvdata/disk-usb-nosupport.xml +++ b/tests/qemuxml2argvdata/disk-usb-nosupport.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-usb-pci.xml b/tests/qemuxml2argvdata/disk-usb-pci.xml index 5b96c7d7d2..7f76b24314 100644 --- a/tests/qemuxml2argvdata/disk-usb-pci.xml +++ b/tests/qemuxml2argvdata/disk-usb-pci.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.args b/tests/qemuxml2argvdata/disk-virtio-queues.args index d14cf7681c..bd3a1a9135 100644 --- a/tests/qemuxml2argvdata/disk-virtio-queues.args +++ b/tests/qemuxml2argvdata/disk-virtio-queues.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.xml b/tests/qemuxml2argvdata/disk-virtio-queues.xml index 37885c6f9c..641204e71f 100644 --- a/tests/qemuxml2argvdata/disk-virtio-queues.xml +++ b/tests/qemuxml2argvdata/disk-virtio-queues.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='raw' queues='4'/> <source file='/tmp/data.img'/> diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args index e0bc344f76..21b267f176 100644 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args index bd07929eec..6b59d536b2 100644 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml index acad600ef8..590cb2cae5 100644 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='lun'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'> diff --git a/tests/qemuxml2argvdata/disk-virtio.args b/tests/qemuxml2argvdata/disk-virtio.args index 92230b007b..7c217255c2 100644 --- a/tests/qemuxml2argvdata/disk-virtio.args +++ b/tests/qemuxml2argvdata/disk-virtio.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/disk-virtio.xml b/tests/qemuxml2argvdata/disk-virtio.xml index cefb53d4b2..0406e9bd75 100644 --- a/tests/qemuxml2argvdata/disk-virtio.xml +++ b/tests/qemuxml2argvdata/disk-virtio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.args b/tests/qemuxml2argvdata/encrypted-disk-usage.args index b77375df57..4522d2cb84 100644 --- a/tests/qemuxml2argvdata/encrypted-disk-usage.args +++ b/tests/qemuxml2argvdata/encrypted-disk-usage.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-encryptdisk/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name encryptdisk \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.xml b/tests/qemuxml2argvdata/encrypted-disk-usage.xml index 205283b59d..9e9f757380 100644 --- a/tests/qemuxml2argvdata/encrypted-disk-usage.xml +++ b/tests/qemuxml2argvdata/encrypted-disk-usage.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk'/> diff --git a/tests/qemuxml2argvdata/encrypted-disk.args b/tests/qemuxml2argvdata/encrypted-disk.args index b77375df57..4522d2cb84 100644 --- a/tests/qemuxml2argvdata/encrypted-disk.args +++ b/tests/qemuxml2argvdata/encrypted-disk.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-encryptdisk/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name encryptdisk \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/encrypted-disk.xml b/tests/qemuxml2argvdata/encrypted-disk.xml index 275724bdaf..e996cde889 100644 --- a/tests/qemuxml2argvdata/encrypted-disk.xml +++ b/tests/qemuxml2argvdata/encrypted-disk.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk'/> diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args index 5596739288..fb12878f2e 100644 --- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args +++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args index 5cd7bb0a15..b0a004f316 100644 --- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args index f811931759..2f578da149 100644 --- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/eoi-disabled.xml b/tests/qemuxml2argvdata/eoi-disabled.xml index 89838bca1b..84d81ba2ca 100644 --- a/tests/qemuxml2argvdata/eoi-disabled.xml +++ b/tests/qemuxml2argvdata/eoi-disabled.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args index 03b3d05582..96bfba2dac 100644 --- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args +++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args index 38e978b399..b008c779fa 100644 --- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args index 25c03ae4d2..995d7b8d31 100644 --- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/eoi-enabled.xml b/tests/qemuxml2argvdata/eoi-enabled.xml index 73167e19ba..5de74634b0 100644 --- a/tests/qemuxml2argvdata/eoi-enabled.xml +++ b/tests/qemuxml2argvdata/eoi-enabled.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/fips-enabled.args b/tests/qemuxml2argvdata/fips-enabled.args index 22bc823b4a..91b32bd96c 100644 --- a/tests/qemuxml2argvdata/fips-enabled.args +++ b/tests/qemuxml2argvdata/fips-enabled.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -enable-fips \ diff --git a/tests/qemuxml2argvdata/fips-enabled.xml b/tests/qemuxml2argvdata/fips-enabled.xml index 95f2d748dc..359e00929a 100644 --- a/tests/qemuxml2argvdata/fips-enabled.xml +++ b/tests/qemuxml2argvdata/fips-enabled.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.args b/tests/qemuxml2argvdata/floppy-drive-fat.args index 8552073543..c654ae598a 100644 --- a/tests/qemuxml2argvdata/floppy-drive-fat.args +++ b/tests/qemuxml2argvdata/floppy-drive-fat.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args index b3ecac19e6..90ab4214d9 100644 --- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args index 1bf202659e..b6da75fa66 100644 --- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.xml b/tests/qemuxml2argvdata/floppy-drive-fat.xml index 7b56bcf9d8..7ec9492ed4 100644 --- a/tests/qemuxml2argvdata/floppy-drive-fat.xml +++ b/tests/qemuxml2argvdata/floppy-drive-fat.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='dir' device='floppy'> <driver name='qemu' type='fat'/> <source dir='/var/somefiles'/> diff --git a/tests/qemuxml2argvdata/fs9p.args b/tests/qemuxml2argvdata/fs9p.args index 5b028c7a80..87bdf4da77 100644 --- a/tests/qemuxml2argvdata/fs9p.args +++ b/tests/qemuxml2argvdata/fs9p.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args b/tests/qemuxml2argvdata/fs9p.x86_64-latest.args index 47b7580817..cef9c614f7 100644 --- a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fs9p.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/fs9p.xml b/tests/qemuxml2argvdata/fs9p.xml index aaa7c466b4..9431015de2 100644 --- a/tests/qemuxml2argvdata/fs9p.xml +++ b/tests/qemuxml2argvdata/fs9p.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0' model='none'/> <filesystem type='mount'> <source dir='/export/to/guest'/> diff --git a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args index d7b86e6270..296aa12b41 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.xml b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.xml index a8d54e75da..d8c8166e33 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.xml +++ b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args b/tests/qemuxml2argvdata/graphics-egl-headless.args index a15666bff2..76d7583462 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless.args +++ b/tests/qemuxml2argvdata/graphics-egl-headless.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args index d7b86e6270..296aa12b41 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.xml b/tests/qemuxml2argvdata/graphics-egl-headless.xml index 7b001cd2eb..9ae377bf04 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless.xml +++ b/tests/qemuxml2argvdata/graphics-egl-headless.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/graphics-listen-network.xml b/tests/qemuxml2argvdata/graphics-listen-network.xml index d0aaa35824..f96fb01200 100644 --- a/tests/qemuxml2argvdata/graphics-listen-network.xml +++ b/tests/qemuxml2argvdata/graphics-listen-network.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/graphics-listen-network2.xml b/tests/qemuxml2argvdata/graphics-listen-network2.xml index 2aa21e3332..ede047ac38 100644 --- a/tests/qemuxml2argvdata/graphics-listen-network2.xml +++ b/tests/qemuxml2argvdata/graphics-listen-network2.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/graphics-sdl-egl-headless.xml b/tests/qemuxml2argvdata/graphics-sdl-egl-headless.xml index 955dfeb3c2..04bda90226 100644 --- a/tests/qemuxml2argvdata/graphics-sdl-egl-headless.xml +++ b/tests/qemuxml2argvdata/graphics-sdl-egl-headless.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args index 2d01e57ddb..a34f9d43c7 100644 --- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args +++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args @@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ XAUTHORITY=/root/.Xauthority \ DISPLAY=:0.1 \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml index 2164c74782..4c006e171b 100644 --- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml +++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvdata/graphics-sdl.args index ef11a503ce..c0c354b824 100644 --- a/tests/qemuxml2argvdata/graphics-sdl.args +++ b/tests/qemuxml2argvdata/graphics-sdl.args @@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ XAUTHORITY=/root/.Xauthority \ DISPLAY=:0.1 \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-sdl.xml b/tests/qemuxml2argvdata/graphics-sdl.xml index d8c66dff81..79947b715c 100644 --- a/tests/qemuxml2argvdata/graphics-sdl.xml +++ b/tests/qemuxml2argvdata/graphics-sdl.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args index 756939d434..abcebd1774 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args +++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml index 04b48a6e95..2ef19b1cf9 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml +++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args index ffb4078ab2..9bed352312 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args +++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.xml b/tests/qemuxml2argvdata/graphics-spice-agentmouse.xml index 01778b1ad4..f6a28d6d4c 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.xml +++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.xml @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args index f377aa35e9..843e82935e 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.xml b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.xml index 5ae3b51911..b58e185b3e 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.xml +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args index f377aa35e9..843e82935e 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.xml b/tests/qemuxml2argvdata/graphics-spice-auto-socket.xml index 696a32d007..a8bfa9f315 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.xml +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.args b/tests/qemuxml2argvdata/graphics-spice-compression.args index 3a610e5beb..1f06d88e04 100644 --- a/tests/qemuxml2argvdata/graphics-spice-compression.args +++ b/tests/qemuxml2argvdata/graphics-spice-compression.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.xml b/tests/qemuxml2argvdata/graphics-spice-compression.xml index d6683fa486..2d2bae8bc2 100644 --- a/tests/qemuxml2argvdata/graphics-spice-compression.xml +++ b/tests/qemuxml2argvdata/graphics-spice-compression.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args index bd94af7e1e..54b7184376 100644 --- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args +++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.xml b/tests/qemuxml2argvdata/graphics-spice-egl-headless.xml index fafae13a0f..dd771dcf3a 100644 --- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.xml +++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args index 00057eb3e5..bfe53c041e 100644 --- a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.xml b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.xml index b48e7bc94e..9e408d105f 100644 --- a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.xml +++ b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='spice' autoport='no'> diff --git a/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml b/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml index 25ae61cef6..39f94c35bb 100644 --- a/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml +++ b/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.args b/tests/qemuxml2argvdata/graphics-spice-no-args.args index c354f0d843..76f74c0fc5 100644 --- a/tests/qemuxml2argvdata/graphics-spice-no-args.args +++ b/tests/qemuxml2argvdata/graphics-spice-no-args.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.xml b/tests/qemuxml2argvdata/graphics-spice-no-args.xml index 7ae1999dd5..17685472a8 100644 --- a/tests/qemuxml2argvdata/graphics-spice-no-args.xml +++ b/tests/qemuxml2argvdata/graphics-spice-no-args.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='spice' autoport='no'/> diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args index 7f2d3141b9..630e620186 100644 --- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args +++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml index c264a842d1..64c48fcbe1 100644 --- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml +++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.args b/tests/qemuxml2argvdata/graphics-spice-sasl.args index 314262787b..bc2293d6a0 100644 --- a/tests/qemuxml2argvdata/graphics-spice-sasl.args +++ b/tests/qemuxml2argvdata/graphics-spice-sasl.args @@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ SASL_CONF_PATH=/root/.sasl2 \ QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.xml b/tests/qemuxml2argvdata/graphics-spice-sasl.xml index 20471872e3..6b15807402 100644 --- a/tests/qemuxml2argvdata/graphics-spice-sasl.xml +++ b/tests/qemuxml2argvdata/graphics-spice-sasl.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.args b/tests/qemuxml2argvdata/graphics-spice-socket.args index eb3e5d4816..e781357277 100644 --- a/tests/qemuxml2argvdata/graphics-spice-socket.args +++ b/tests/qemuxml2argvdata/graphics-spice-socket.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.xml b/tests/qemuxml2argvdata/graphics-spice-socket.xml index d80d54326e..600f2edcc7 100644 --- a/tests/qemuxml2argvdata/graphics-spice-socket.xml +++ b/tests/qemuxml2argvdata/graphics-spice-socket.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.args b/tests/qemuxml2argvdata/graphics-spice-timeout.args index 0da6c10ddc..3f6cf4a8e2 100644 --- a/tests/qemuxml2argvdata/graphics-spice-timeout.args +++ b/tests/qemuxml2argvdata/graphics-spice-timeout.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-f14/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-f14/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-f14/.config \ QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name f14 \ -S \ -machine pc,accel=kvm,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.xml b/tests/qemuxml2argvdata/graphics-spice-timeout.xml index b6714e6518..6bb4eb8f4c 100644 --- a/tests/qemuxml2argvdata/graphics-spice-timeout.xml +++ b/tests/qemuxml2argvdata/graphics-spice-timeout.xml @@ -38,7 +38,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/var/lib/libvirt/images/f14.img'/> diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args index 82ed40ded4..c46bddf617 100644 --- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args +++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.xml b/tests/qemuxml2argvdata/graphics-spice-usb-redir.xml index e99d1fdf22..64a5948b29 100644 --- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.xml +++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='127.0.0.1'> <listen type='address' address='127.0.0.1'/> <channel name='main' mode='secure'/> diff --git a/tests/qemuxml2argvdata/graphics-spice.args b/tests/qemuxml2argvdata/graphics-spice.args index 723a23001b..4c38960b72 100644 --- a/tests/qemuxml2argvdata/graphics-spice.args +++ b/tests/qemuxml2argvdata/graphics-spice.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-spice.xml b/tests/qemuxml2argvdata/graphics-spice.xml index 19933bcf2d..657b6ccbed 100644 --- a/tests/qemuxml2argvdata/graphics-spice.xml +++ b/tests/qemuxml2argvdata/graphics-spice.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args index dc82316693..5e3bb6e0b5 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args +++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.xml b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.xml index 2c0448b630..05e2bd9426 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.xml +++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args index 87dc057688..12697fc206 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args +++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.xml b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.xml index ba6987a4c4..db532dd203 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.xml +++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args index f50bff03ed..3c0901d1a5 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args +++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.xml b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.xml index 570cf2e50f..5095d3e7e4 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.xml +++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args index 6edeccb0f8..82a77778c2 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args +++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.xml b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.xml index 5ca53c7063..5600ad408a 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.xml +++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.args b/tests/qemuxml2argvdata/graphics-vnc-none.args index b8fc049d95..f9259c7fe7 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-none.args +++ b/tests/qemuxml2argvdata/graphics-vnc-none.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.xml b/tests/qemuxml2argvdata/graphics-vnc-none.xml index 20142572cf..4a18ed3d92 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-none.xml +++ b/tests/qemuxml2argvdata/graphics-vnc-none.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.args b/tests/qemuxml2argvdata/graphics-vnc-policy.args index 7115c5133f..17fde4e5a1 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-policy.args +++ b/tests/qemuxml2argvdata/graphics-vnc-policy.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.xml b/tests/qemuxml2argvdata/graphics-vnc-policy.xml index 5a6ab0599e..344f019079 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-policy.xml +++ b/tests/qemuxml2argvdata/graphics-vnc-policy.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args index 6200e7132f..7ee7a3777c 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args +++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.xml b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.xml index c6d3f4176d..5de3160f41 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.xml +++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.args b/tests/qemuxml2argvdata/graphics-vnc-sasl.args index 1bbde63c2e..32972582e7 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-sasl.args +++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.args @@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ SASL_CONF_PATH=/root/.sasl2 \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.xml b/tests/qemuxml2argvdata/graphics-vnc-sasl.xml index d0729e830d..e05045a23c 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-sasl.xml +++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args index 20cb1db45b..7b845de69b 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args +++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.xml b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.xml index 2b9758fecb..ab99f4fd13 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.xml +++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.xml @@ -8,7 +8,7 @@ <type arch='i686' machine='pc'>hvm</type> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <graphics type='vnc'> <listen type='socket' socket='/tmp/foo=bar.sock'/> </graphics> diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.args b/tests/qemuxml2argvdata/graphics-vnc-socket.args index be7ccfdc18..8fe87adde8 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-socket.args +++ b/tests/qemuxml2argvdata/graphics-vnc-socket.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.xml b/tests/qemuxml2argvdata/graphics-vnc-socket.xml index 849ae00951..fda7fb7364 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-socket.xml +++ b/tests/qemuxml2argvdata/graphics-vnc-socket.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args index 4180df6b65..8bd4f95f7d 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args @@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ SASL_CONF_PATH=/root/.sasl2 \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.xml b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.xml index 079f6241c4..df7b3caf7d 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.xml +++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.args b/tests/qemuxml2argvdata/graphics-vnc-tls.args index 89cef8d7b6..7d89329aa2 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls.args @@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ SASL_CONF_PATH=/root/.sasl2 \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args index a976e5d88c..3ec25996c9 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args @@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ SASL_CONF_PATH=/root/.sasl2 \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -machine pc-i440fx-2.4,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args index 78579e4dc2..dcfbb4b658 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args @@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ SASL_CONF_PATH=/root/.sasl2 \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.xml b/tests/qemuxml2argvdata/graphics-vnc-tls.xml index 079f6241c4..df7b3caf7d 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls.xml +++ b/tests/qemuxml2argvdata/graphics-vnc-tls.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.args b/tests/qemuxml2argvdata/graphics-vnc-websocket.args index 4d9531a8d6..c094c0d0f0 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-websocket.args +++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.xml b/tests/qemuxml2argvdata/graphics-vnc-websocket.xml index c5c507c8ec..cca3392f82 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-websocket.xml +++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/graphics-vnc.args b/tests/qemuxml2argvdata/graphics-vnc.args index 6edeccb0f8..82a77778c2 100644 --- a/tests/qemuxml2argvdata/graphics-vnc.args +++ b/tests/qemuxml2argvdata/graphics-vnc.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/graphics-vnc.xml b/tests/qemuxml2argvdata/graphics-vnc.xml index f9994703d2..aa0edbaebc 100644 --- a/tests/qemuxml2argvdata/graphics-vnc.xml +++ b/tests/qemuxml2argvdata/graphics-vnc.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml b/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml index 55b60ba133..0a78309c99 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> </controller> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args index 30d2f83318..f7949a9e7d 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest2,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.xml b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.xml index 2e7851b2b0..6fdc477ca2 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.xml +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> </controller> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args index d15ffa6dc4..0c7737712c 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest2,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.xml b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.xml index 3a686ad2bf..fc73dac562 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.xml +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> </controller> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args index 5bda70c8e2..d861c96404 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest2,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.xml b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.xml index a632e58a41..db92bb98c3 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.xml +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> </controller> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args index 9c5060cdb0..e616aee570 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest2,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.xml b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.xml index ddcf617692..940fddae05 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.xml +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> </controller> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args index d8ba568145..8831636938 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest2,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.xml b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.xml index a70f506865..6c9fc419ac 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.xml +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> </controller> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display.xml b/tests/qemuxml2argvdata/hostdev-mdev-display.xml index ac4e9a7eaa..e24ca7dc90 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display.xml +++ b/tests/qemuxml2argvdata/hostdev-mdev-display.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> </controller> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml b/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml index a5c10b8401..2c899738e2 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml +++ b/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args index c6dac47a18..207ac5740b 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.xml b/tests/qemuxml2argvdata/hostdev-mdev-precreated.xml index a525b23550..4b198c29a6 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.xml +++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> </controller> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml b/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml index 6a321c8a42..81740baa00 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml +++ b/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> </controller> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.args b/tests/qemuxml2argvdata/hostdev-pci-address-device.args index 79654f44bb..98d4a62c18 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address-device.args +++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.xml b/tests/qemuxml2argvdata/hostdev-pci-address-device.xml index 814fdcc271..7a99fc8444 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address-device.xml +++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.args b/tests/qemuxml2argvdata/hostdev-pci-address.args index 0a57a8f29e..edec271444 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address.args +++ b/tests/qemuxml2argvdata/hostdev-pci-address.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.xml b/tests/qemuxml2argvdata/hostdev-pci-address.xml index 17968350ff..5f8090336f 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address.xml +++ b/tests/qemuxml2argvdata/hostdev-pci-address.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> diff --git a/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml b/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml index 6f8cf56ae7..22eb515cbb 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-scsi-boot.xml b/tests/qemuxml2argvdata/hostdev-scsi-boot.xml index 13e159be8e..8762f57c2b 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-boot.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-boot.xml @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml b/tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml index 8c654c4b23..046563211e 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args index 45c76cf55d..03e77517b4 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.xml b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.xml index d39885bb01..439aa05db0 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args index 3d4d42e8f1..f215fba066 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.xml b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.xml index d84d0b3e26..85885aad8d 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi.args index 48dc03ac0a..cf90224e9a 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml b/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml index df4777c4c1..34c41e3fe6 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-scsi-rawio.xml b/tests/qemuxml2argvdata/hostdev-scsi-rawio.xml index 2ece5949f9..eb60e550f0 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-rawio.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-rawio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-scsi-readonly.args b/tests/qemuxml2argvdata/hostdev-scsi-readonly.args index 7b8b87b659..0e481e7464 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-readonly.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-readonly.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-readonly.xml b/tests/qemuxml2argvdata/hostdev-scsi-readonly.xml index 1cdf5625ce..2e70edd640 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-readonly.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-readonly.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-scsi-sgio.xml b/tests/qemuxml2argvdata/hostdev-scsi-sgio.xml index bad2ceb1f7..bfc5346807 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-sgio.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-sgio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-scsi-shareable.xml b/tests/qemuxml2argvdata/hostdev-scsi-shareable.xml index 3b176a26c3..991f75fb26 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-shareable.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-shareable.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci-boot-fail.xml b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci-boot-fail.xml index 94f590b11b..da67520bfb 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci-boot-fail.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci-boot-fail.xml @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args index d07fb3db5f..3e8b590ea0 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml index 13455f672e..6e2f3da5c1 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args index ca70730ce7..4ce2029adb 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml index 0f63f98872..388cd63314 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args index ab03327cef..050e74a449 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml index 9a457db497..88684c9405 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args index 93c315b08d..364c4a10a5 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml index aa56cac064..0fe01de1ab 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args index ec23a30bc1..6a24db3aea 100644 --- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args +++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml index 8fd6720c7a..ac1360f87f 100644 --- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml +++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.args b/tests/qemuxml2argvdata/hostdev-usb-address-device.args index e42c39886d..5a10d45b3b 100644 --- a/tests/qemuxml2argvdata/hostdev-usb-address-device.args +++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.xml b/tests/qemuxml2argvdata/hostdev-usb-address-device.xml index 0fe6d63618..9027564584 100644 --- a/tests/qemuxml2argvdata/hostdev-usb-address-device.xml +++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.args b/tests/qemuxml2argvdata/hostdev-usb-address.args index f6ad4f6ffc..eb17911423 100644 --- a/tests/qemuxml2argvdata/hostdev-usb-address.args +++ b/tests/qemuxml2argvdata/hostdev-usb-address.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.xml b/tests/qemuxml2argvdata/hostdev-usb-address.xml index 9deb2a64af..7d0c338311 100644 --- a/tests/qemuxml2argvdata/hostdev-usb-address.xml +++ b/tests/qemuxml2argvdata/hostdev-usb-address.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args index 959d2a8888..6bf3ef8021 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml index 7c34b65c7f..e894e1577f 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml +++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml b/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml index bfb2f83a3b..521ebcf802 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvdata/hostdev-vfio.args index f2025afcd4..d7eaa774ca 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio.args +++ b/tests/qemuxml2argvdata/hostdev-vfio.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio.xml b/tests/qemuxml2argvdata/hostdev-vfio.xml index b2e6c62e7e..e32ee972ba 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio.xml +++ b/tests/qemuxml2argvdata/hostdev-vfio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdevs-drive-address-conflict.xml b/tests/qemuxml2argvdata/hostdevs-drive-address-conflict.xml index c78c1be959..509319b3ea 100644 --- a/tests/qemuxml2argvdata/hostdevs-drive-address-conflict.xml +++ b/tests/qemuxml2argvdata/hostdevs-drive-address-conflict.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <hostdev mode='subsystem' type='scsi' managed='no'> <source> <adapter name='scsi_host2'/> diff --git a/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml b/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml index eb0943b105..49cd2c827a 100644 --- a/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml +++ b/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.args b/tests/qemuxml2argvdata/hugepages-default-2M.args index f4cdf71cb0..014d71c9ec 100644 --- a/tests/qemuxml2argvdata/hugepages-default-2M.args +++ b/tests/qemuxml2argvdata/hugepages-default-2M.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name SomeDummyHugepagesGuest \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.xml b/tests/qemuxml2argvdata/hugepages-default-2M.xml index ac219a7800..ce67853f26 100644 --- a/tests/qemuxml2argvdata/hugepages-default-2M.xml +++ b/tests/qemuxml2argvdata/hugepages-default-2M.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.args b/tests/qemuxml2argvdata/hugepages-default-system-size.args index c650e12830..bcf6e6bf0e 100644 --- a/tests/qemuxml2argvdata/hugepages-default-system-size.args +++ b/tests/qemuxml2argvdata/hugepages-default-system-size.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name SomeDummyHugepagesGuest \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.xml b/tests/qemuxml2argvdata/hugepages-default-system-size.xml index 8a809ead5e..5beeffed9c 100644 --- a/tests/qemuxml2argvdata/hugepages-default-system-size.xml +++ b/tests/qemuxml2argvdata/hugepages-default-system-size.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2argvdata/hugepages-default.args b/tests/qemuxml2argvdata/hugepages-default.args index eda90426c6..3184e4ea07 100644 --- a/tests/qemuxml2argvdata/hugepages-default.args +++ b/tests/qemuxml2argvdata/hugepages-default.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hugepages-default.xml b/tests/qemuxml2argvdata/hugepages-default.xml index 99f53828fe..18508b381f 100644 --- a/tests/qemuxml2argvdata/hugepages-default.xml +++ b/tests/qemuxml2argvdata/hugepages-default.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml b/tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml index 418d42ed60..ddd4a6df92 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml +++ b/tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml @@ -31,7 +31,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args b/tests/qemuxml2argvdata/hugepages-memaccess.args index 861556abf6..7cfbce7c7c 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.xml b/tests/qemuxml2argvdata/hugepages-memaccess.xml index cd75440254..68ef572616 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess.xml +++ b/tests/qemuxml2argvdata/hugepages-memaccess.xml @@ -33,7 +33,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args b/tests/qemuxml2argvdata/hugepages-memaccess2.args index 66146a20ee..654baebf9f 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess2.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.xml b/tests/qemuxml2argvdata/hugepages-memaccess2.xml index 205f9efd92..c7652847fa 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess2.xml +++ b/tests/qemuxml2argvdata/hugepages-memaccess2.xml @@ -33,7 +33,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml b/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml index 477d3f1f2b..e082725844 100644 --- a/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml +++ b/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.args b/tests/qemuxml2argvdata/hugepages-nodeset.args index f4cdf71cb0..014d71c9ec 100644 --- a/tests/qemuxml2argvdata/hugepages-nodeset.args +++ b/tests/qemuxml2argvdata/hugepages-nodeset.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name SomeDummyHugepagesGuest \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.xml b/tests/qemuxml2argvdata/hugepages-nodeset.xml index 4a85ddffad..6aae88741c 100644 --- a/tests/qemuxml2argvdata/hugepages-nodeset.xml +++ b/tests/qemuxml2argvdata/hugepages-nodeset.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args index 6e8146c895..bbf3c9f67a 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args +++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name SomeDummyHugepagesGuest \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml b/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml index 357c77da2a..87811aaf4b 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml +++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml b/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml index 8211d72be9..eed8922071 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml +++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml @@ -27,7 +27,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args index aa3fd0a7c9..7849143e69 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args +++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name SomeDummyHugepagesGuest \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml index b19bdedb36..6c0eb24c98 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml +++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args index 87893ca56f..7b510be6b3 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args +++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml b/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml index e81fa44d58..00d390dc20 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml +++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml @@ -27,7 +27,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args index 7f0a93cee4..9056e56cb7 100644 --- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.xml b/tests/qemuxml2argvdata/hugepages-nvdimm.xml index babb3a6179..b784777805 100644 --- a/tests/qemuxml2argvdata/hugepages-nvdimm.xml +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.xml @@ -26,7 +26,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2argvdata/hugepages-shared.args b/tests/qemuxml2argvdata/hugepages-shared.args index 1b48fec3a0..545b86b223 100644 --- a/tests/qemuxml2argvdata/hugepages-shared.args +++ b/tests/qemuxml2argvdata/hugepages-shared.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/hugepages-shared.xml b/tests/qemuxml2argvdata/hugepages-shared.xml index 4902ce6f20..462ca8a5ae 100644 --- a/tests/qemuxml2argvdata/hugepages-shared.xml +++ b/tests/qemuxml2argvdata/hugepages-shared.xml @@ -31,7 +31,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args index d99bfb4d4e..6909b71d52 100644 --- a/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args index 52f7473e14..fc2429741b 100644 --- a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/hyperv-off.xml b/tests/qemuxml2argvdata/hyperv-off.xml index 59c1e17ccd..b22090ac9b 100644 --- a/tests/qemuxml2argvdata/hyperv-off.xml +++ b/tests/qemuxml2argvdata/hyperv-off.xml @@ -32,7 +32,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args index 5a16ac97ee..55e5099717 100644 --- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args index c92df8b79f..7eab402eaf 100644 --- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/hyperv-panic.xml b/tests/qemuxml2argvdata/hyperv-panic.xml index 9497c96e2b..f9b38de001 100644 --- a/tests/qemuxml2argvdata/hyperv-panic.xml +++ b/tests/qemuxml2argvdata/hyperv-panic.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args index 34e27c75f0..4aa78bc98f 100644 --- a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/hyperv-stimer-direct.xml b/tests/qemuxml2argvdata/hyperv-stimer-direct.xml index 9c865f5746..44525ef52a 100644 --- a/tests/qemuxml2argvdata/hyperv-stimer-direct.xml +++ b/tests/qemuxml2argvdata/hyperv-stimer-direct.xml @@ -23,7 +23,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args index 7966cebdc1..b9d9542892 100644 --- a/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv.x86_64-latest.args index 33c70bb7e7..f30438dd91 100644 --- a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/hyperv.xml b/tests/qemuxml2argvdata/hyperv.xml index c6feaed528..45e460f7de 100644 --- a/tests/qemuxml2argvdata/hyperv.xml +++ b/tests/qemuxml2argvdata/hyperv.xml @@ -32,7 +32,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxml2argvdata/input-usbmouse-addr.args index 28472f32cd..36d9fc4f90 100644 --- a/tests/qemuxml2argvdata/input-usbmouse-addr.args +++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.xml b/tests/qemuxml2argvdata/input-usbmouse-addr.xml index b2fb3a480f..2e6cca6c51 100644 --- a/tests/qemuxml2argvdata/input-usbmouse-addr.xml +++ b/tests/qemuxml2argvdata/input-usbmouse-addr.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/input-usbmouse.args b/tests/qemuxml2argvdata/input-usbmouse.args index 23505ff31c..fc83eef3aa 100644 --- a/tests/qemuxml2argvdata/input-usbmouse.args +++ b/tests/qemuxml2argvdata/input-usbmouse.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/input-usbmouse.xml b/tests/qemuxml2argvdata/input-usbmouse.xml index 69bb2032f2..533029f352 100644 --- a/tests/qemuxml2argvdata/input-usbmouse.xml +++ b/tests/qemuxml2argvdata/input-usbmouse.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/input-usbtablet.args b/tests/qemuxml2argvdata/input-usbtablet.args index c10b57d8ac..8a96f66411 100644 --- a/tests/qemuxml2argvdata/input-usbtablet.args +++ b/tests/qemuxml2argvdata/input-usbtablet.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/input-usbtablet.xml b/tests/qemuxml2argvdata/input-usbtablet.xml index 5f0ad8d832..59ac2d35fb 100644 --- a/tests/qemuxml2argvdata/input-usbtablet.xml +++ b/tests/qemuxml2argvdata/input-usbtablet.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/iothreads-disk.args b/tests/qemuxml2argvdata/iothreads-disk.args index 1587342ac3..e3dcb1d1b3 100644 --- a/tests/qemuxml2argvdata/iothreads-disk.args +++ b/tests/qemuxml2argvdata/iothreads-disk.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/iothreads-disk.xml b/tests/qemuxml2argvdata/iothreads-disk.xml index 0aa32c3923..bbfac34db5 100644 --- a/tests/qemuxml2argvdata/iothreads-disk.xml +++ b/tests/qemuxml2argvdata/iothreads-disk.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.args b/tests/qemuxml2argvdata/iothreads-ids-partial.args index 10a68dfb72..58e764d78a 100644 --- a/tests/qemuxml2argvdata/iothreads-ids-partial.args +++ b/tests/qemuxml2argvdata/iothreads-ids-partial.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.xml b/tests/qemuxml2argvdata/iothreads-ids-partial.xml index 1d3c267f90..25069acf80 100644 --- a/tests/qemuxml2argvdata/iothreads-ids-partial.xml +++ b/tests/qemuxml2argvdata/iothreads-ids-partial.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/iothreads-ids.args b/tests/qemuxml2argvdata/iothreads-ids.args index 3b90e18be9..009dcc9d72 100644 --- a/tests/qemuxml2argvdata/iothreads-ids.args +++ b/tests/qemuxml2argvdata/iothreads-ids.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/iothreads-ids.xml b/tests/qemuxml2argvdata/iothreads-ids.xml index d662d6a499..d41a07efa5 100644 --- a/tests/qemuxml2argvdata/iothreads-ids.xml +++ b/tests/qemuxml2argvdata/iothreads-ids.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/iothreads-nocap.xml b/tests/qemuxml2argvdata/iothreads-nocap.xml index d2b1829b31..fa04d735cd 100644 --- a/tests/qemuxml2argvdata/iothreads-nocap.xml +++ b/tests/qemuxml2argvdata/iothreads-nocap.xml @@ -22,7 +22,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args index df4c565a17..8785f0bb44 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.xml b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.xml index e2bc297873..bbbbd2439f 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.xml +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/iothreads.args b/tests/qemuxml2argvdata/iothreads.args index 37a90b58c3..5bc2350741 100644 --- a/tests/qemuxml2argvdata/iothreads.args +++ b/tests/qemuxml2argvdata/iothreads.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/iothreads.xml b/tests/qemuxml2argvdata/iothreads.xml index ce67c384bd..1c860ddd25 100644 --- a/tests/qemuxml2argvdata/iothreads.xml +++ b/tests/qemuxml2argvdata/iothreads.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/kvm-features-off.args b/tests/qemuxml2argvdata/kvm-features-off.args index 59a79376d1..54d166912e 100644 --- a/tests/qemuxml2argvdata/kvm-features-off.args +++ b/tests/qemuxml2argvdata/kvm-features-off.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/kvm-features-off.xml b/tests/qemuxml2argvdata/kvm-features-off.xml index ab2c16202c..21d492c8b9 100644 --- a/tests/qemuxml2argvdata/kvm-features-off.xml +++ b/tests/qemuxml2argvdata/kvm-features-off.xml @@ -20,7 +20,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/kvm-features.args b/tests/qemuxml2argvdata/kvm-features.args index 8372ca897d..5753a3eb3f 100644 --- a/tests/qemuxml2argvdata/kvm-features.args +++ b/tests/qemuxml2argvdata/kvm-features.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=kvm,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/kvm-features.xml b/tests/qemuxml2argvdata/kvm-features.xml index b942e89a92..85f74786c9 100644 --- a/tests/qemuxml2argvdata/kvm-features.xml +++ b/tests/qemuxml2argvdata/kvm-features.xml @@ -21,7 +21,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argvdata/kvm-pit-delay.args index c26b7b3de4..f51fb19f85 100644 --- a/tests/qemuxml2argvdata/kvm-pit-delay.args +++ b/tests/qemuxml2argvdata/kvm-pit-delay.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.xml b/tests/qemuxml2argvdata/kvm-pit-delay.xml index 1541f8f05f..3b5b6d05dd 100644 --- a/tests/qemuxml2argvdata/kvm-pit-delay.xml +++ b/tests/qemuxml2argvdata/kvm-pit-delay.xml @@ -15,7 +15,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2argvdata/kvm-pit-discard.args index 23658d954b..a71d9d68b8 100644 --- a/tests/qemuxml2argvdata/kvm-pit-discard.args +++ b/tests/qemuxml2argvdata/kvm-pit-discard.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.xml b/tests/qemuxml2argvdata/kvm-pit-discard.xml index 3aff9fef6a..0af4b57106 100644 --- a/tests/qemuxml2argvdata/kvm-pit-discard.xml +++ b/tests/qemuxml2argvdata/kvm-pit-discard.xml @@ -15,7 +15,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args index 1a566358c0..cb2eba75ff 100644 --- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args +++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args index 0a96928277..c67e253746 100644 --- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args index f13573df8a..51b72b3f33 100644 --- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.xml b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.xml index 265184e3a1..00e60ac700 100644 --- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.xml +++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.xml @@ -20,7 +20,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args index 029a2a0d5d..65bea1d0b0 100644 --- a/tests/qemuxml2argvdata/kvmclock.args +++ b/tests/qemuxml2argvdata/kvmclock.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=kvm,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/kvmclock.xml b/tests/qemuxml2argvdata/kvmclock.xml index 1b18ee70e5..5d155e067f 100644 --- a/tests/qemuxml2argvdata/kvmclock.xml +++ b/tests/qemuxml2argvdata/kvmclock.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/lease.xml b/tests/qemuxml2argvdata/lease.xml index 607484a410..d52b66b2f2 100644 --- a/tests/qemuxml2argvdata/lease.xml +++ b/tests/qemuxml2argvdata/lease.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/machine-core-off.args b/tests/qemuxml2argvdata/machine-core-off.args index a9bd75becf..e38898e335 100644 --- a/tests/qemuxml2argvdata/machine-core-off.args +++ b/tests/qemuxml2argvdata/machine-core-off.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/machine-core-off.xml b/tests/qemuxml2argvdata/machine-core-off.xml index 18af6926f8..36482550b6 100644 --- a/tests/qemuxml2argvdata/machine-core-off.xml +++ b/tests/qemuxml2argvdata/machine-core-off.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/machine-core-on.args b/tests/qemuxml2argvdata/machine-core-on.args index f7daff8d74..b3d271e161 100644 --- a/tests/qemuxml2argvdata/machine-core-on.args +++ b/tests/qemuxml2argvdata/machine-core-on.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=on \ diff --git a/tests/qemuxml2argvdata/machine-core-on.xml b/tests/qemuxml2argvdata/machine-core-on.xml index d02b7e87c3..89396bb186 100644 --- a/tests/qemuxml2argvdata/machine-core-on.xml +++ b/tests/qemuxml2argvdata/machine-core-on.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml2argvdata/machine-vmport-opt.args index a67dd9f5b0..f3f5ddff1d 100644 --- a/tests/qemuxml2argvdata/machine-vmport-opt.args +++ b/tests/qemuxml2argvdata/machine-vmport-opt.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,vmport=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.xml b/tests/qemuxml2argvdata/machine-vmport-opt.xml index 22fc040b28..656e1d395f 100644 --- a/tests/qemuxml2argvdata/machine-vmport-opt.xml +++ b/tests/qemuxml2argvdata/machine-vmport-opt.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/master-key.args b/tests/qemuxml2argvdata/master-key.args index 636e84d986..9e91135f31 100644 --- a/tests/qemuxml2argvdata/master-key.args +++ b/tests/qemuxml2argvdata/master-key.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/master-key.xml b/tests/qemuxml2argvdata/master-key.xml index 848d0dd2eb..ecf8a2db85 100644 --- a/tests/qemuxml2argvdata/master-key.xml +++ b/tests/qemuxml2argvdata/master-key.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/memory-align-fail.xml b/tests/qemuxml2argvdata/memory-align-fail.xml index d1306058bb..75c1a46068 100644 --- a/tests/qemuxml2argvdata/memory-align-fail.xml +++ b/tests/qemuxml2argvdata/memory-align-fail.xml @@ -20,7 +20,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='ide' index='0'/> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args index 222aa4c0b4..9ba3f8b7a0 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml index 9503557cc9..c289fdd5ff 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml @@ -20,7 +20,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.args index 068e4be98b..0ac48db399 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.xml b/tests/qemuxml2argvdata/memory-hotplug-dimm.xml index 9ef85ad40a..c68336f871 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.xml @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/memory-hotplug-nonuma.xml b/tests/qemuxml2argvdata/memory-hotplug-nonuma.xml index 5165317038..a441eb7b77 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nonuma.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nonuma.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args index ee860097e8..beac9ab22a 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml index b41484ad2b..4e62dd0e18 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args index 9705dcd137..3e599098f0 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml index a8c5198e9e..defa109e80 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args index b3f750456c..05a473dbcc 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml index e266147a29..89d01d672f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args index 07ec6b68fa..c3554ac101 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml index 060d75c541..e6a4f7901a 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args index 0b7a379914..e1d3fc57a4 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml index 170992c9fc..dd48540712 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args index 2d7cdedcf4..dc6ddd3a0e 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml index 751ad27474..9c76dda6c8 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2argvdata/memory-hotplug.args index 8c50c11edd..c2c80ecf00 100644 --- a/tests/qemuxml2argvdata/memory-hotplug.args +++ b/tests/qemuxml2argvdata/memory-hotplug.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/memory-hotplug.xml b/tests/qemuxml2argvdata/memory-hotplug.xml index 3bda22bc89..e1f086567b 100644 --- a/tests/qemuxml2argvdata/memory-hotplug.xml +++ b/tests/qemuxml2argvdata/memory-hotplug.xml @@ -20,7 +20,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/memorybacking-set.xml b/tests/qemuxml2argvdata/memorybacking-set.xml index dd195cbb50..9bd4e72485 100644 --- a/tests/qemuxml2argvdata/memorybacking-set.xml +++ b/tests/qemuxml2argvdata/memorybacking-set.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/memorybacking-unset.xml b/tests/qemuxml2argvdata/memorybacking-unset.xml index 5a4ef96896..c64c7397d0 100644 --- a/tests/qemuxml2argvdata/memorybacking-unset.xml +++ b/tests/qemuxml2argvdata/memorybacking-unset.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2argvdata/memtune-unlimited.args index 3a1f010e3e..60253f43ec 100644 --- a/tests/qemuxml2argvdata/memtune-unlimited.args +++ b/tests/qemuxml2argvdata/memtune-unlimited.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/memtune-unlimited.xml b/tests/qemuxml2argvdata/memtune-unlimited.xml index 58c37dc1ad..db67e409f0 100644 --- a/tests/qemuxml2argvdata/memtune-unlimited.xml +++ b/tests/qemuxml2argvdata/memtune-unlimited.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args index 3a1f010e3e..60253f43ec 100644 --- a/tests/qemuxml2argvdata/memtune.args +++ b/tests/qemuxml2argvdata/memtune.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/memtune.xml b/tests/qemuxml2argvdata/memtune.xml index 1fd607e523..94a86a8070 100644 --- a/tests/qemuxml2argvdata/memtune.xml +++ b/tests/qemuxml2argvdata/memtune.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/metadata-duplicate.xml b/tests/qemuxml2argvdata/metadata-duplicate.xml index 0c3cbaf6da..fdf2110bc3 100644 --- a/tests/qemuxml2argvdata/metadata-duplicate.xml +++ b/tests/qemuxml2argvdata/metadata-duplicate.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/metadata.xml b/tests/qemuxml2argvdata/metadata.xml index 5fddf94622..18ab46899e 100644 --- a/tests/qemuxml2argvdata/metadata.xml +++ b/tests/qemuxml2argvdata/metadata.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/migrate.args b/tests/qemuxml2argvdata/migrate.args index c8fa035acf..c977c62ab4 100644 --- a/tests/qemuxml2argvdata/migrate.args +++ b/tests/qemuxml2argvdata/migrate.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/migrate.xml b/tests/qemuxml2argvdata/migrate.xml index be60ddcbe5..7b4ea974eb 100644 --- a/tests/qemuxml2argvdata/migrate.xml +++ b/tests/qemuxml2argvdata/migrate.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/minimal-msg-timestamp.args b/tests/qemuxml2argvdata/minimal-msg-timestamp.args index a932e4aa78..42ca3cbf38 100644 --- a/tests/qemuxml2argvdata/minimal-msg-timestamp.args +++ b/tests/qemuxml2argvdata/minimal-msg-timestamp.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/minimal-msg-timestamp.xml b/tests/qemuxml2argvdata/minimal-msg-timestamp.xml index 97ad905826..6a2b2a18e7 100644 --- a/tests/qemuxml2argvdata/minimal-msg-timestamp.xml +++ b/tests/qemuxml2argvdata/minimal-msg-timestamp.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/minimal-no-memory.xml b/tests/qemuxml2argvdata/minimal-no-memory.xml index d4a6a4fb50..8c6b5a71be 100644 --- a/tests/qemuxml2argvdata/minimal-no-memory.xml +++ b/tests/qemuxml2argvdata/minimal-no-memory.xml @@ -11,7 +11,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/minimal-sandbox.args b/tests/qemuxml2argvdata/minimal-sandbox.args index 998b21b00d..3f7078605c 100644 --- a/tests/qemuxml2argvdata/minimal-sandbox.args +++ b/tests/qemuxml2argvdata/minimal-sandbox.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/minimal-sandbox.xml b/tests/qemuxml2argvdata/minimal-sandbox.xml index 9ef92f8feb..8701906357 100644 --- a/tests/qemuxml2argvdata/minimal-sandbox.xml +++ b/tests/qemuxml2argvdata/minimal-sandbox.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args index 3a1f010e3e..60253f43ec 100644 --- a/tests/qemuxml2argvdata/minimal.args +++ b/tests/qemuxml2argvdata/minimal.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/minimal.xml b/tests/qemuxml2argvdata/minimal.xml index 9ef92f8feb..8701906357 100644 --- a/tests/qemuxml2argvdata/minimal.xml +++ b/tests/qemuxml2argvdata/minimal.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/misc-acpi.args b/tests/qemuxml2argvdata/misc-acpi.args index c73239bbb3..5ddfded151 100644 --- a/tests/qemuxml2argvdata/misc-acpi.args +++ b/tests/qemuxml2argvdata/misc-acpi.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/misc-acpi.xml b/tests/qemuxml2argvdata/misc-acpi.xml index cc51799dee..718847daee 100644 --- a/tests/qemuxml2argvdata/misc-acpi.xml +++ b/tests/qemuxml2argvdata/misc-acpi.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args b/tests/qemuxml2argvdata/misc-disable-s3.args index 12c0e37fb4..a327c45a8f 100644 --- a/tests/qemuxml2argvdata/misc-disable-s3.args +++ b/tests/qemuxml2argvdata/misc-disable-s3.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/misc-disable-s3.xml b/tests/qemuxml2argvdata/misc-disable-s3.xml index 5860c0c068..d65b72dbd4 100644 --- a/tests/qemuxml2argvdata/misc-disable-s3.xml +++ b/tests/qemuxml2argvdata/misc-disable-s3.xml @@ -16,7 +16,7 @@ <suspend-to-mem enabled='no'/> </pm> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args b/tests/qemuxml2argvdata/misc-disable-suspends.args index 7be83760d4..b36dfe8512 100644 --- a/tests/qemuxml2argvdata/misc-disable-suspends.args +++ b/tests/qemuxml2argvdata/misc-disable-suspends.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.xml b/tests/qemuxml2argvdata/misc-disable-suspends.xml index 5b0ffb132d..3c51e3fb6e 100644 --- a/tests/qemuxml2argvdata/misc-disable-suspends.xml +++ b/tests/qemuxml2argvdata/misc-disable-suspends.xml @@ -17,7 +17,7 @@ <suspend-to-disk enabled='no'/> </pm> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args b/tests/qemuxml2argvdata/misc-enable-s4.args index b4e411d430..4b99bdd51c 100644 --- a/tests/qemuxml2argvdata/misc-enable-s4.args +++ b/tests/qemuxml2argvdata/misc-enable-s4.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/misc-enable-s4.xml b/tests/qemuxml2argvdata/misc-enable-s4.xml index d8eed5eaab..62f32c2b02 100644 --- a/tests/qemuxml2argvdata/misc-enable-s4.xml +++ b/tests/qemuxml2argvdata/misc-enable-s4.xml @@ -16,7 +16,7 @@ <suspend-to-disk enabled='yes'/> </pm> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/misc-no-reboot.args b/tests/qemuxml2argvdata/misc-no-reboot.args index daa6762ff1..057568bbe0 100644 --- a/tests/qemuxml2argvdata/misc-no-reboot.args +++ b/tests/qemuxml2argvdata/misc-no-reboot.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/misc-no-reboot.xml b/tests/qemuxml2argvdata/misc-no-reboot.xml index 9bf051f0e6..80abc68388 100644 --- a/tests/qemuxml2argvdata/misc-no-reboot.xml +++ b/tests/qemuxml2argvdata/misc-no-reboot.xml @@ -13,7 +13,7 @@ <on_reboot>destroy</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/misc-uuid.args b/tests/qemuxml2argvdata/misc-uuid.args index c73239bbb3..5ddfded151 100644 --- a/tests/qemuxml2argvdata/misc-uuid.args +++ b/tests/qemuxml2argvdata/misc-uuid.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/misc-uuid.xml b/tests/qemuxml2argvdata/misc-uuid.xml index cc51799dee..718847daee 100644 --- a/tests/qemuxml2argvdata/misc-uuid.xml +++ b/tests/qemuxml2argvdata/misc-uuid.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/missing-machine.xml b/tests/qemuxml2argvdata/missing-machine.xml index 2900baec90..30735b503a 100644 --- a/tests/qemuxml2argvdata/missing-machine.xml +++ b/tests/qemuxml2argvdata/missing-machine.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args b/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args index cea23c4d8a..8f3725ebd5 100644 --- a/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args +++ b/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args b/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args index 84bf8b96a7..daf40197ab 100644 --- a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/mlock-off.xml b/tests/qemuxml2argvdata/mlock-off.xml index 16400bae67..433011caa0 100644 --- a/tests/qemuxml2argvdata/mlock-off.xml +++ b/tests/qemuxml2argvdata/mlock-off.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args b/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args index 2ea145d798..46e63a287f 100644 --- a/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args +++ b/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args b/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args index ec1376561e..04d43af859 100644 --- a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args +++ b/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/mlock-on.xml b/tests/qemuxml2argvdata/mlock-on.xml index a2bf9e1d93..5ec181d821 100644 --- a/tests/qemuxml2argvdata/mlock-on.xml +++ b/tests/qemuxml2argvdata/mlock-on.xml @@ -12,7 +12,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/monitor-json.args b/tests/qemuxml2argvdata/monitor-json.args index fcd0f36498..50bbb36f27 100644 --- a/tests/qemuxml2argvdata/monitor-json.args +++ b/tests/qemuxml2argvdata/monitor-json.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-encryptdisk/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name encryptdisk \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/monitor-json.xml b/tests/qemuxml2argvdata/monitor-json.xml index 1bd0dae61f..d3a630ab3e 100644 --- a/tests/qemuxml2argvdata/monitor-json.xml +++ b/tests/qemuxml2argvdata/monitor-json.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/dev/hda1'/> diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/qemuxml2argvdata/multifunction-pci-device.args index cb810e758a..abf230fbac 100644 --- a/tests/qemuxml2argvdata/multifunction-pci-device.args +++ b/tests/qemuxml2argvdata/multifunction-pci-device.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.xml b/tests/qemuxml2argvdata/multifunction-pci-device.xml index 5c295b66ad..806cfa44ae 100644 --- a/tests/qemuxml2argvdata/multifunction-pci-device.xml +++ b/tests/qemuxml2argvdata/multifunction-pci-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <source file='/tmp/scsidisk.img'/> <target dev='sda' bus='scsi'/> diff --git a/tests/qemuxml2argvdata/name-escape.args b/tests/qemuxml2argvdata/name-escape.args index d6356561dd..1ba2dfbf83 100644 --- a/tests/qemuxml2argvdata/name-escape.args +++ b/tests/qemuxml2argvdata/name-escape.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-foo=1,bar=2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-foo=1,bar=2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-foo=1,bar=2/.config \ QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=foo=1,,bar=2,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo=1,,\ diff --git a/tests/qemuxml2argvdata/name-escape.xml b/tests/qemuxml2argvdata/name-escape.xml index fab2a77547..6aefac19b2 100644 --- a/tests/qemuxml2argvdata/name-escape.xml +++ b/tests/qemuxml2argvdata/name-escape.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/net-client.args b/tests/qemuxml2argvdata/net-client.args index 42d182c6ec..0aa6645c4d 100644 --- a/tests/qemuxml2argvdata/net-client.args +++ b/tests/qemuxml2argvdata/net-client.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-client.xml b/tests/qemuxml2argvdata/net-client.xml index e9dece8d56..d6a634338c 100644 --- a/tests/qemuxml2argvdata/net-client.xml +++ b/tests/qemuxml2argvdata/net-client.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args b/tests/qemuxml2argvdata/net-eth-hostip.args index 91d7fdbbc5..ff136626a7 100644 --- a/tests/qemuxml2argvdata/net-eth-hostip.args +++ b/tests/qemuxml2argvdata/net-eth-hostip.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-eth-hostip.xml b/tests/qemuxml2argvdata/net-eth-hostip.xml index 9dc9a8c0fc..2430941df8 100644 --- a/tests/qemuxml2argvdata/net-eth-hostip.xml +++ b/tests/qemuxml2argvdata/net-eth-hostip.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args b/tests/qemuxml2argvdata/net-eth-ifname.args index 91d7fdbbc5..ff136626a7 100644 --- a/tests/qemuxml2argvdata/net-eth-ifname.args +++ b/tests/qemuxml2argvdata/net-eth-ifname.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-eth-ifname.xml b/tests/qemuxml2argvdata/net-eth-ifname.xml index dd0d752071..86a41c17d9 100644 --- a/tests/qemuxml2argvdata/net-eth-ifname.xml +++ b/tests/qemuxml2argvdata/net-eth-ifname.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/net-eth-names.args b/tests/qemuxml2argvdata/net-eth-names.args index bf3083697d..a79edee524 100644 --- a/tests/qemuxml2argvdata/net-eth-names.args +++ b/tests/qemuxml2argvdata/net-eth-names.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-eth-names.xml b/tests/qemuxml2argvdata/net-eth-names.xml index 37639b30cb..344cf9252d 100644 --- a/tests/qemuxml2argvdata/net-eth-names.xml +++ b/tests/qemuxml2argvdata/net-eth-names.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args index 2bb99e96da..435843bc27 100644 --- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args +++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml index 7f5a0c217b..217b57ea0b 100644 --- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml +++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/net-eth.args index 91d7fdbbc5..ff136626a7 100644 --- a/tests/qemuxml2argvdata/net-eth.args +++ b/tests/qemuxml2argvdata/net-eth.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-eth.xml b/tests/qemuxml2argvdata/net-eth.xml index 48acadf013..5fa415bb63 100644 --- a/tests/qemuxml2argvdata/net-eth.xml +++ b/tests/qemuxml2argvdata/net-eth.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args b/tests/qemuxml2argvdata/net-hostdev-bootorder.args index 515b0c58d3..7c7e5bc3a2 100644 --- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args +++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.xml b/tests/qemuxml2argvdata/net-hostdev-bootorder.xml index cd9f32b2f3..acf05ba164 100644 --- a/tests/qemuxml2argvdata/net-hostdev-bootorder.xml +++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.xml @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-hostdev-fail.xml b/tests/qemuxml2argvdata/net-hostdev-fail.xml index 50b102c658..a2c9ee21e0 100644 --- a/tests/qemuxml2argvdata/net-hostdev-fail.xml +++ b/tests/qemuxml2argvdata/net-hostdev-fail.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-multidomain.args index 18c5e98188..46f28022fd 100644 --- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args +++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.xml b/tests/qemuxml2argvdata/net-hostdev-multidomain.xml index 27e5f0f724..8bb3022ce0 100644 --- a/tests/qemuxml2argvdata/net-hostdev-multidomain.xml +++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args index 7e4ee5d62d..ed8332ddfe 100644 --- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml index c73edf8e44..c247a15444 100644 --- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml +++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.args b/tests/qemuxml2argvdata/net-hostdev-vfio.args index b0178a81bb..cd875f60c9 100644 --- a/tests/qemuxml2argvdata/net-hostdev-vfio.args +++ b/tests/qemuxml2argvdata/net-hostdev-vfio.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.xml b/tests/qemuxml2argvdata/net-hostdev-vfio.xml index aff681c0fb..6f64229191 100644 --- a/tests/qemuxml2argvdata/net-hostdev-vfio.xml +++ b/tests/qemuxml2argvdata/net-hostdev-vfio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-hostdev.args b/tests/qemuxml2argvdata/net-hostdev.args index aa9e91db82..bd49544de6 100644 --- a/tests/qemuxml2argvdata/net-hostdev.args +++ b/tests/qemuxml2argvdata/net-hostdev.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-hostdev.xml b/tests/qemuxml2argvdata/net-hostdev.xml index 829d8b850b..e60e615a82 100644 --- a/tests/qemuxml2argvdata/net-hostdev.xml +++ b/tests/qemuxml2argvdata/net-hostdev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-many-models.args b/tests/qemuxml2argvdata/net-many-models.args index 1bde5652b5..36b057131f 100644 --- a/tests/qemuxml2argvdata/net-many-models.args +++ b/tests/qemuxml2argvdata/net-many-models.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-mcast.args b/tests/qemuxml2argvdata/net-mcast.args index f888f2f71a..e8b71a3ded 100644 --- a/tests/qemuxml2argvdata/net-mcast.args +++ b/tests/qemuxml2argvdata/net-mcast.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-mcast.xml b/tests/qemuxml2argvdata/net-mcast.xml index 05117af289..a199162023 100644 --- a/tests/qemuxml2argvdata/net-mcast.xml +++ b/tests/qemuxml2argvdata/net-mcast.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-midonet.xml b/tests/qemuxml2argvdata/net-midonet.xml index 90e35d9bc9..2688b50236 100644 --- a/tests/qemuxml2argvdata/net-midonet.xml +++ b/tests/qemuxml2argvdata/net-midonet.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-openvswitch.xml b/tests/qemuxml2argvdata/net-openvswitch.xml index d8e12372cb..7d928b5f88 100644 --- a/tests/qemuxml2argvdata/net-openvswitch.xml +++ b/tests/qemuxml2argvdata/net-openvswitch.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-server.args b/tests/qemuxml2argvdata/net-server.args index 86ca61c25b..b92e520820 100644 --- a/tests/qemuxml2argvdata/net-server.args +++ b/tests/qemuxml2argvdata/net-server.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-server.xml b/tests/qemuxml2argvdata/net-server.xml index f3703a9fc3..b2fa27ca93 100644 --- a/tests/qemuxml2argvdata/net-server.xml +++ b/tests/qemuxml2argvdata/net-server.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/net-udp.args index ee8077ece0..1390298e2e 100644 --- a/tests/qemuxml2argvdata/net-udp.args +++ b/tests/qemuxml2argvdata/net-udp.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-udp.xml b/tests/qemuxml2argvdata/net-udp.xml index 30d5fdbea1..b00805d35b 100644 --- a/tests/qemuxml2argvdata/net-udp.xml +++ b/tests/qemuxml2argvdata/net-udp.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-user-addr.args b/tests/qemuxml2argvdata/net-user-addr.args index 5a828dd091..6cc82d9e62 100644 --- a/tests/qemuxml2argvdata/net-user-addr.args +++ b/tests/qemuxml2argvdata/net-user-addr.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-user-addr.xml b/tests/qemuxml2argvdata/net-user-addr.xml index 0b5f151989..f20f820eaa 100644 --- a/tests/qemuxml2argvdata/net-user-addr.xml +++ b/tests/qemuxml2argvdata/net-user-addr.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/net-user.args b/tests/qemuxml2argvdata/net-user.args index 888c16cb29..a8d43b0684 100644 --- a/tests/qemuxml2argvdata/net-user.args +++ b/tests/qemuxml2argvdata/net-user.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args b/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args index 3fb745c212..190b068191 100644 --- a/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/net-user.xml b/tests/qemuxml2argvdata/net-user.xml index 4cea980388..b8f3c67338 100644 --- a/tests/qemuxml2argvdata/net-user.xml +++ b/tests/qemuxml2argvdata/net-user.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/net-vhostuser-fail.xml b/tests/qemuxml2argvdata/net-vhostuser-fail.xml index 63dbfc77a5..4050191a26 100644 --- a/tests/qemuxml2argvdata/net-vhostuser-fail.xml +++ b/tests/qemuxml2argvdata/net-vhostuser-fail.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args b/tests/qemuxml2argvdata/net-vhostuser-multiq.args index 689a7452fe..691ef39edd 100644 --- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args +++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.xml b/tests/qemuxml2argvdata/net-vhostuser-multiq.xml index a30cce6b31..342d151d97 100644 --- a/tests/qemuxml2argvdata/net-vhostuser-multiq.xml +++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/net-vhostuser.args b/tests/qemuxml2argvdata/net-vhostuser.args index 25641eb512..1acc910ad1 100644 --- a/tests/qemuxml2argvdata/net-vhostuser.args +++ b/tests/qemuxml2argvdata/net-vhostuser.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args b/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args index 17a97e3315..58dcbb510b 100644 --- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args +++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -machine pc-i440fx-2.5,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args index 042d569385..c2b498c616 100644 --- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/net-vhostuser.xml b/tests/qemuxml2argvdata/net-vhostuser.xml index 1c491549b6..f392c89ee4 100644 --- a/tests/qemuxml2argvdata/net-vhostuser.xml +++ b/tests/qemuxml2argvdata/net-vhostuser.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/net-virtio-device.args b/tests/qemuxml2argvdata/net-virtio-device.args index 9fd0bafd23..67b0592fab 100644 --- a/tests/qemuxml2argvdata/net-virtio-device.args +++ b/tests/qemuxml2argvdata/net-virtio-device.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-virtio-device.xml b/tests/qemuxml2argvdata/net-virtio-device.xml index 9ddb9f5b9a..c8bd8525eb 100644 --- a/tests/qemuxml2argvdata/net-virtio-device.xml +++ b/tests/qemuxml2argvdata/net-virtio-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args index 90b8c4eeef..a9ac9687db 100644 --- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args +++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.xml b/tests/qemuxml2argvdata/net-virtio-disable-offloads.xml index 3e7b34abfd..c8debd6ae4 100644 --- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.xml +++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest7'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.args b/tests/qemuxml2argvdata/net-virtio-netdev.args index 86d832cb53..32d3b6b541 100644 --- a/tests/qemuxml2argvdata/net-virtio-netdev.args +++ b/tests/qemuxml2argvdata/net-virtio-netdev.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.xml b/tests/qemuxml2argvdata/net-virtio-netdev.xml index e7534c29ee..f78ea5d64e 100644 --- a/tests/qemuxml2argvdata/net-virtio-netdev.xml +++ b/tests/qemuxml2argvdata/net-virtio-netdev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-virtio-network-portgroup.xml b/tests/qemuxml2argvdata/net-virtio-network-portgroup.xml index 3d6cd02a73..47d35e8661 100644 --- a/tests/qemuxml2argvdata/net-virtio-network-portgroup.xml +++ b/tests/qemuxml2argvdata/net-virtio-network-portgroup.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml b/tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml index 52bdcf533b..2214884a05 100644 --- a/tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml +++ b/tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args index 466eb61ce3..758da237dd 100644 --- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args +++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml index b51931d525..000af9830e 100644 --- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml +++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-virtio.args b/tests/qemuxml2argvdata/net-virtio.args index da5073020a..4beb5ca75f 100644 --- a/tests/qemuxml2argvdata/net-virtio.args +++ b/tests/qemuxml2argvdata/net-virtio.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/net-virtio.xml b/tests/qemuxml2argvdata/net-virtio.xml index 93bd5d1bce..372c79d8de 100644 --- a/tests/qemuxml2argvdata/net-virtio.xml +++ b/tests/qemuxml2argvdata/net-virtio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/nosharepages.args b/tests/qemuxml2argvdata/nosharepages.args index 45b2261603..3993edfc4b 100644 --- a/tests/qemuxml2argvdata/nosharepages.args +++ b/tests/qemuxml2argvdata/nosharepages.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off,mem-merge=off \ diff --git a/tests/qemuxml2argvdata/nosharepages.xml b/tests/qemuxml2argvdata/nosharepages.xml index 53fa96bcdf..d2ab028715 100644 --- a/tests/qemuxml2argvdata/nosharepages.xml +++ b/tests/qemuxml2argvdata/nosharepages.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args index 3d71d03b9c..7270aafeb7 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml index 5ab3a8546d..50dbc3c466 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args index 3d71d03b9c..7270aafeb7 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml index 4ea112a6b4..d9cd6b83f1 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml b/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml index d3c4e4be1f..f21ba0a786 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml index dcb16bfd74..378d17face 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args index 3d71d03b9c..7270aafeb7 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml index b4cda72bcf..e20bd8db0b 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args index 3d71d03b9c..7270aafeb7 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml index 5ab3a8546d..50dbc3c466 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml b/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml index e06b149baa..7ccaa5aff4 100644 --- a/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml +++ b/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args index 3d71d03b9c..7270aafeb7 100644 --- a/tests/qemuxml2argvdata/numad.args +++ b/tests/qemuxml2argvdata/numad.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/numad.xml b/tests/qemuxml2argvdata/numad.xml index 76e97ce092..081a59a013 100644 --- a/tests/qemuxml2argvdata/numad.xml +++ b/tests/qemuxml2argvdata/numad.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args index 3d71d03b9c..7270aafeb7 100644 --- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args +++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml index a7c4c77a2a..44ec55a810 100644 --- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml +++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml b/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml index 5bf2a7b630..441f2b8989 100644 --- a/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml +++ b/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/numatune-memory.args b/tests/qemuxml2argvdata/numatune-memory.args index 3d71d03b9c..7270aafeb7 100644 --- a/tests/qemuxml2argvdata/numatune-memory.args +++ b/tests/qemuxml2argvdata/numatune-memory.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/numatune-memory.xml b/tests/qemuxml2argvdata/numatune-memory.xml index dce4e49bb4..c9887dbebc 100644 --- a/tests/qemuxml2argvdata/numatune-memory.xml +++ b/tests/qemuxml2argvdata/numatune-memory.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.xml b/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.xml index 3e0741475f..631d3bad38 100644 --- a/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.xml +++ b/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.xml @@ -23,7 +23,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.args b/tests/qemuxml2argvdata/pages-discard-hugepages.args index 6e8146c895..bbf3c9f67a 100644 --- a/tests/qemuxml2argvdata/pages-discard-hugepages.args +++ b/tests/qemuxml2argvdata/pages-discard-hugepages.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name SomeDummyHugepagesGuest \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.xml b/tests/qemuxml2argvdata/pages-discard-hugepages.xml index d1620d1946..ae294c8f41 100644 --- a/tests/qemuxml2argvdata/pages-discard-hugepages.xml +++ b/tests/qemuxml2argvdata/pages-discard-hugepages.xml @@ -22,7 +22,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2argvdata/pages-discard.args b/tests/qemuxml2argvdata/pages-discard.args index 42c5582720..b2aed77ff9 100644 --- a/tests/qemuxml2argvdata/pages-discard.args +++ b/tests/qemuxml2argvdata/pages-discard.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/pages-discard.xml b/tests/qemuxml2argvdata/pages-discard.xml index a8c6b74d95..adb718887a 100644 --- a/tests/qemuxml2argvdata/pages-discard.xml +++ b/tests/qemuxml2argvdata/pages-discard.xml @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2argvdata/panic-double.args b/tests/qemuxml2argvdata/panic-double.args index 7f49d3482e..745efc7cf2 100644 --- a/tests/qemuxml2argvdata/panic-double.args +++ b/tests/qemuxml2argvdata/panic-double.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/panic-double.xml b/tests/qemuxml2argvdata/panic-double.xml index 0e6d2ee71d..a4813c94ed 100644 --- a/tests/qemuxml2argvdata/panic-double.xml +++ b/tests/qemuxml2argvdata/panic-double.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/panic-isa.xml b/tests/qemuxml2argvdata/panic-isa.xml index 25a9c72ed5..34e8bd7a01 100644 --- a/tests/qemuxml2argvdata/panic-isa.xml +++ b/tests/qemuxml2argvdata/panic-isa.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/panic-no-address.args b/tests/qemuxml2argvdata/panic-no-address.args index 71fa88cda1..b4adee02bc 100644 --- a/tests/qemuxml2argvdata/panic-no-address.args +++ b/tests/qemuxml2argvdata/panic-no-address.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/panic-no-address.xml b/tests/qemuxml2argvdata/panic-no-address.xml index 0dc2e454de..1c79e65d76 100644 --- a/tests/qemuxml2argvdata/panic-no-address.xml +++ b/tests/qemuxml2argvdata/panic-no-address.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/panic.args b/tests/qemuxml2argvdata/panic.args index de4d449779..51e107e1d0 100644 --- a/tests/qemuxml2argvdata/panic.args +++ b/tests/qemuxml2argvdata/panic.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/panic.xml b/tests/qemuxml2argvdata/panic.xml index a34b4f85f7..2ceb11ac2a 100644 --- a/tests/qemuxml2argvdata/panic.xml +++ b/tests/qemuxml2argvdata/panic.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args b/tests/qemuxml2argvdata/parallel-parport-chardev.args index d30b2fe0f4..c1b1852174 100644 --- a/tests/qemuxml2argvdata/parallel-parport-chardev.args +++ b/tests/qemuxml2argvdata/parallel-parport-chardev.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.xml b/tests/qemuxml2argvdata/parallel-parport-chardev.xml index 8fad75ab43..abd2a6fd41 100644 --- a/tests/qemuxml2argvdata/parallel-parport-chardev.xml +++ b/tests/qemuxml2argvdata/parallel-parport-chardev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args b/tests/qemuxml2argvdata/parallel-tcp-chardev.args index fd4f5ad810..2ab87fb17a 100644 --- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args +++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.xml b/tests/qemuxml2argvdata/parallel-tcp-chardev.xml index 30fefa30a2..30573888e5 100644 --- a/tests/qemuxml2argvdata/parallel-tcp-chardev.xml +++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/pci-bus-invalid.xml b/tests/qemuxml2argvdata/pci-bus-invalid.xml index 21f1dc98af..5884af6fc8 100644 --- a/tests/qemuxml2argvdata/pci-bus-invalid.xml +++ b/tests/qemuxml2argvdata/pci-bus-invalid.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/pci-domain-invalid.xml b/tests/qemuxml2argvdata/pci-domain-invalid.xml index 21f1dc98af..5884af6fc8 100644 --- a/tests/qemuxml2argvdata/pci-domain-invalid.xml +++ b/tests/qemuxml2argvdata/pci-domain-invalid.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/pci-function-invalid.xml b/tests/qemuxml2argvdata/pci-function-invalid.xml index 6254027ab1..5642809ec0 100644 --- a/tests/qemuxml2argvdata/pci-function-invalid.xml +++ b/tests/qemuxml2argvdata/pci-function-invalid.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args index 4a5dc4161a..d82e1d047b 100644 --- a/tests/qemuxml2argvdata/pci-rom.args +++ b/tests/qemuxml2argvdata/pci-rom.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/pci-rom.xml b/tests/qemuxml2argvdata/pci-rom.xml index 09cafb35a9..2e8ea4bde3 100644 --- a/tests/qemuxml2argvdata/pci-rom.xml +++ b/tests/qemuxml2argvdata/pci-rom.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args index 4889e5b83e..92858a2167 100644 --- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.xml b/tests/qemuxml2argvdata/pci-serial-dev-chardev.xml index a9b35318e1..c4d73a86c8 100644 --- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.xml +++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/pci-slot-invalid.xml b/tests/qemuxml2argvdata/pci-slot-invalid.xml index 77c3acf3db..0c4a2daef2 100644 --- a/tests/qemuxml2argvdata/pci-slot-invalid.xml +++ b/tests/qemuxml2argvdata/pci-slot-invalid.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args b/tests/qemuxml2argvdata/pmu-feature-off.args index a392959902..37ab3eacb1 100644 --- a/tests/qemuxml2argvdata/pmu-feature-off.args +++ b/tests/qemuxml2argvdata/pmu-feature-off.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/pmu-feature-off.xml b/tests/qemuxml2argvdata/pmu-feature-off.xml index d7a45bfb4a..17e1fec954 100644 --- a/tests/qemuxml2argvdata/pmu-feature-off.xml +++ b/tests/qemuxml2argvdata/pmu-feature-off.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/pmu-feature.args b/tests/qemuxml2argvdata/pmu-feature.args index f8682204c3..b0ac523678 100644 --- a/tests/qemuxml2argvdata/pmu-feature.args +++ b/tests/qemuxml2argvdata/pmu-feature.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/pmu-feature.xml b/tests/qemuxml2argvdata/pmu-feature.xml index de9068e7ec..a7f43392a4 100644 --- a/tests/qemuxml2argvdata/pmu-feature.xml +++ b/tests/qemuxml2argvdata/pmu-feature.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <memballoon model='none'/> diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args index 5e8f4f62e4..7e3c90e467 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args +++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args index 4c7414400e..76e439c2b4 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args index 13fd7253a9..6f07b32685 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.xml b/tests/qemuxml2argvdata/pv-spinlock-disabled.xml index 40e3aab192..e3212313bb 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-disabled.xml +++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args index 79e097e554..c5d0095242 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args +++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args index b8a1007675..e19ebfda0b 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args index 919bbd037e..ad8dffc9e5 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.xml b/tests/qemuxml2argvdata/pv-spinlock-enabled.xml index 7bdda8e748..531480d4b3 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-enabled.xml +++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvdata/qemu-ns-alt.args index ad858b3da1..7e4cffa4d0 100644 --- a/tests/qemuxml2argvdata/qemu-ns-alt.args +++ b/tests/qemuxml2argvdata/qemu-ns-alt.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ NS=ns \ BAR='' \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.xml b/tests/qemuxml2argvdata/qemu-ns-alt.xml index 491fc2d80b..6b8b5ba36b 100644 --- a/tests/qemuxml2argvdata/qemu-ns-alt.xml +++ b/tests/qemuxml2argvdata/qemu-ns-alt.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args index b7798e68e7..fc1592f168 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml index 293f993d2a..9189927126 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args index b7798e68e7..fc1592f168 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml index e7b9deca47..e98d777309 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxml2argvdata/qemu-ns-commandline.args index b7798e68e7..fc1592f168 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.xml b/tests/qemuxml2argvdata/qemu-ns-commandline.xml index c70d6854fb..25f83acb12 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline.xml +++ b/tests/qemuxml2argvdata/qemu-ns-commandline.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args index b7798e68e7..fc1592f168 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml index bbb62efefc..9c25329b05 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args index b7798e68e7..fc1592f168 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml index 377e0de375..65a688fb78 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args index b7798e68e7..fc1592f168 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml index 5c5f00fbfc..a5d3ec0b02 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml +++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemu-ns-no-env.args index 897162a8d9..74f7b88761 100644 --- a/tests/qemuxml2argvdata/qemu-ns-no-env.args +++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.xml b/tests/qemuxml2argvdata/qemu-ns-no-env.xml index 57c7d7afd0..3dad42eead 100644 --- a/tests/qemuxml2argvdata/qemu-ns-no-env.xml +++ b/tests/qemuxml2argvdata/qemu-ns-no-env.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args b/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args index 2f49af885b..0f3253f831 100644 --- a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ NS=ns \ BAR='' \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args index f898ab2e07..51ba863a5f 100644 --- a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args +++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args @@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ NS=ns \ BAR='' \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/qemu-ns.xml b/tests/qemuxml2argvdata/qemu-ns.xml index 02cbf4bbd9..515d4fabec 100644 --- a/tests/qemuxml2argvdata/qemu-ns.xml +++ b/tests/qemuxml2argvdata/qemu-ns.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args b/tests/qemuxml2argvdata/reboot-timeout-disabled.args index d5973b4192..1ddc18b7c5 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.xml b/tests/qemuxml2argvdata/reboot-timeout-disabled.xml index 8af83c5a42..a815b4b274 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-disabled.xml +++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args b/tests/qemuxml2argvdata/reboot-timeout-enabled.args index 34774b76af..e31f37e112 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.xml b/tests/qemuxml2argvdata/reboot-timeout-enabled.xml index 663ed692cd..4554f85323 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-enabled.xml +++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args b/tests/qemuxml2argvdata/restore-v2-fd.args index 70f0b40f34..cc0a751483 100644 --- a/tests/qemuxml2argvdata/restore-v2-fd.args +++ b/tests/qemuxml2argvdata/restore-v2-fd.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/restore-v2-fd.xml b/tests/qemuxml2argvdata/restore-v2-fd.xml index 2e009be5fa..f56ba5a1e7 100644 --- a/tests/qemuxml2argvdata/restore-v2-fd.xml +++ b/tests/qemuxml2argvdata/restore-v2-fd.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/restore-v2.args b/tests/qemuxml2argvdata/restore-v2.args index 54cae8096c..ac3d16f3c3 100644 --- a/tests/qemuxml2argvdata/restore-v2.args +++ b/tests/qemuxml2argvdata/restore-v2.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/restore-v2.xml b/tests/qemuxml2argvdata/restore-v2.xml index be60ddcbe5..7b4ea974eb 100644 --- a/tests/qemuxml2argvdata/restore-v2.xml +++ b/tests/qemuxml2argvdata/restore-v2.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2argvdata/seclabel-dac-none.args index 3a1f010e3e..60253f43ec 100644 --- a/tests/qemuxml2argvdata/seclabel-dac-none.args +++ b/tests/qemuxml2argvdata/seclabel-dac-none.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.xml b/tests/qemuxml2argvdata/seclabel-dac-none.xml index e76e2906f5..cf1b1d557e 100644 --- a/tests/qemuxml2argvdata/seclabel-dac-none.xml +++ b/tests/qemuxml2argvdata/seclabel-dac-none.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/seclabel-device-duplicates.xml b/tests/qemuxml2argvdata/seclabel-device-duplicates.xml index 0b65f4397c..100c67ce5f 100644 --- a/tests/qemuxml2argvdata/seclabel-device-duplicates.xml +++ b/tests/qemuxml2argvdata/seclabel-device-duplicates.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'> <seclabel model='selinux' relabel='no'/> diff --git a/tests/qemuxml2argvdata/seclabel-device-multiple.xml b/tests/qemuxml2argvdata/seclabel-device-multiple.xml index 5ad10df2fe..cf3d3c04ee 100644 --- a/tests/qemuxml2argvdata/seclabel-device-multiple.xml +++ b/tests/qemuxml2argvdata/seclabel-device-multiple.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'> <seclabel model='selinux' relabel='yes'> diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args index 3a1f010e3e..60253f43ec 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml index 915cf9d869..cfebf7720d 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml +++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args index 3a1f010e3e..60253f43ec 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml index 63b21b5261..11b52e2998 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml +++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'> <seclabel model='selinux' labelskip='yes'/> diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-none.xml b/tests/qemuxml2argvdata/seclabel-dynamic-none.xml index 265bc36df7..ec75535c0e 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-none.xml +++ b/tests/qemuxml2argvdata/seclabel-dynamic-none.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/qemuxml2argvdata/seclabel-dynamic-override.args index a0cdc581c9..b561a77139 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.xml b/tests/qemuxml2argvdata/seclabel-dynamic-override.xml index 39dd3b78d4..4946f2f0c0 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-override.xml +++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'> <seclabel model='selinux' relabel='no'/> diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args index 3a1f010e3e..60253f43ec 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml index ede8440b67..db97b92d06 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml +++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2argvdata/seclabel-dynamic.args index 3a1f010e3e..60253f43ec 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.xml b/tests/qemuxml2argvdata/seclabel-dynamic.xml index 9b017e730b..f6586062da 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic.xml +++ b/tests/qemuxml2argvdata/seclabel-dynamic.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/seclabel-multiple.xml b/tests/qemuxml2argvdata/seclabel-multiple.xml index f31ea74a91..9fe7bdd8df 100644 --- a/tests/qemuxml2argvdata/seclabel-multiple.xml +++ b/tests/qemuxml2argvdata/seclabel-multiple.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'> <seclabel model='selinux' labelskip='yes'/> diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argvdata/seclabel-none.args index 3a1f010e3e..60253f43ec 100644 --- a/tests/qemuxml2argvdata/seclabel-none.args +++ b/tests/qemuxml2argvdata/seclabel-none.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/seclabel-none.xml b/tests/qemuxml2argvdata/seclabel-none.xml index 3f4e9d7865..03fc36443a 100644 --- a/tests/qemuxml2argvdata/seclabel-none.xml +++ b/tests/qemuxml2argvdata/seclabel-none.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/qemuxml2argvdata/seclabel-static-labelskip.args index 3a1f010e3e..60253f43ec 100644 --- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.xml b/tests/qemuxml2argvdata/seclabel-static-labelskip.xml index a52b423ea3..5d357acd66 100644 --- a/tests/qemuxml2argvdata/seclabel-static-labelskip.xml +++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'> <seclabel model='selinux' labelskip='yes'/> diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qemuxml2argvdata/seclabel-static-relabel.args index 3a1f010e3e..60253f43ec 100644 --- a/tests/qemuxml2argvdata/seclabel-static-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.xml b/tests/qemuxml2argvdata/seclabel-static-relabel.xml index eb00b9fdcd..dd8995bb28 100644 --- a/tests/qemuxml2argvdata/seclabel-static-relabel.xml +++ b/tests/qemuxml2argvdata/seclabel-static-relabel.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2argvdata/seclabel-static.args index 3a1f010e3e..60253f43ec 100644 --- a/tests/qemuxml2argvdata/seclabel-static.args +++ b/tests/qemuxml2argvdata/seclabel-static.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/seclabel-static.xml b/tests/qemuxml2argvdata/seclabel-static.xml index 9e9a5246da..a5d4c007e8 100644 --- a/tests/qemuxml2argvdata/seclabel-static.xml +++ b/tests/qemuxml2argvdata/seclabel-static.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args index 9c4211e25a..239c13167d 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.xml b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.xml index 3c847989bd..559910af8a 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.xml +++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args b/tests/qemuxml2argvdata/serial-dev-chardev.args index 32c41d63e2..96053f22c3 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.xml b/tests/qemuxml2argvdata/serial-dev-chardev.xml index dffd27d063..7cf428fb17 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev.xml +++ b/tests/qemuxml2argvdata/serial-dev-chardev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args b/tests/qemuxml2argvdata/serial-file-chardev.args index ea16446da7..435b9eb689 100644 --- a/tests/qemuxml2argvdata/serial-file-chardev.args +++ b/tests/qemuxml2argvdata/serial-file-chardev.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/serial-file-chardev.xml b/tests/qemuxml2argvdata/serial-file-chardev.xml index fe0a5f8fbd..f90d0dd5ef 100644 --- a/tests/qemuxml2argvdata/serial-file-chardev.xml +++ b/tests/qemuxml2argvdata/serial-file-chardev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/serial-file-log.args b/tests/qemuxml2argvdata/serial-file-log.args index 72c5070786..35334297ff 100644 --- a/tests/qemuxml2argvdata/serial-file-log.args +++ b/tests/qemuxml2argvdata/serial-file-log.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/serial-file-log.xml b/tests/qemuxml2argvdata/serial-file-log.xml index 319772dd67..01d529b5ef 100644 --- a/tests/qemuxml2argvdata/serial-file-log.xml +++ b/tests/qemuxml2argvdata/serial-file-log.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args b/tests/qemuxml2argvdata/serial-many-chardev.args index 80e5dc3523..31800b30ff 100644 --- a/tests/qemuxml2argvdata/serial-many-chardev.args +++ b/tests/qemuxml2argvdata/serial-many-chardev.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/serial-many-chardev.xml b/tests/qemuxml2argvdata/serial-many-chardev.xml index 034ad45fd6..c486a64fd7 100644 --- a/tests/qemuxml2argvdata/serial-many-chardev.xml +++ b/tests/qemuxml2argvdata/serial-many-chardev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args b/tests/qemuxml2argvdata/serial-pty-chardev.args index 683399d307..4d6d6e376c 100644 --- a/tests/qemuxml2argvdata/serial-pty-chardev.args +++ b/tests/qemuxml2argvdata/serial-pty-chardev.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.xml b/tests/qemuxml2argvdata/serial-pty-chardev.xml index db5782ec50..82fbb3a23f 100644 --- a/tests/qemuxml2argvdata/serial-pty-chardev.xml +++ b/tests/qemuxml2argvdata/serial-pty-chardev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/serial-spiceport-nospice.args b/tests/qemuxml2argvdata/serial-spiceport-nospice.args index 3a1f010e3e..60253f43ec 100644 --- a/tests/qemuxml2argvdata/serial-spiceport-nospice.args +++ b/tests/qemuxml2argvdata/serial-spiceport-nospice.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/serial-spiceport-nospice.xml b/tests/qemuxml2argvdata/serial-spiceport-nospice.xml index 3c4be0cdcb..0c1aeab818 100644 --- a/tests/qemuxml2argvdata/serial-spiceport-nospice.xml +++ b/tests/qemuxml2argvdata/serial-spiceport-nospice.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/serial-spiceport.args b/tests/qemuxml2argvdata/serial-spiceport.args index e1ba3893cc..6e3d4e4ea0 100644 --- a/tests/qemuxml2argvdata/serial-spiceport.args +++ b/tests/qemuxml2argvdata/serial-spiceport.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/serial-spiceport.xml b/tests/qemuxml2argvdata/serial-spiceport.xml index e0a6126d5c..46a0bf7db4 100644 --- a/tests/qemuxml2argvdata/serial-spiceport.xml +++ b/tests/qemuxml2argvdata/serial-spiceport.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/serial-target-port-auto.xml b/tests/qemuxml2argvdata/serial-target-port-auto.xml index 98f39f3211..9f9ba502b3 100644 --- a/tests/qemuxml2argvdata/serial-target-port-auto.xml +++ b/tests/qemuxml2argvdata/serial-target-port-auto.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args b/tests/qemuxml2argvdata/serial-tcp-chardev.args index 78d55ad39d..dd91391343 100644 --- a/tests/qemuxml2argvdata/serial-tcp-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-chardev.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.xml b/tests/qemuxml2argvdata/serial-tcp-chardev.xml index 09cd68f14e..f19225dc47 100644 --- a/tests/qemuxml2argvdata/serial-tcp-chardev.xml +++ b/tests/qemuxml2argvdata/serial-tcp-chardev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args index 60c7eb8b9c..a372863fa7 100644 --- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.xml b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.xml index 79987aabdf..48a3c00183 100644 --- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.xml +++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args index c750df077d..c08869bd49 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml index ddda2c62b9..7a834f83a2 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args index 3538686f1a..c84e58eef3 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.xml b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.xml index 7e9af60ee0..75c6c7f5f4 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.xml +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args index 3538686f1a..c84e58eef3 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.xml b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.xml index 7e9af60ee0..75c6c7f5f4 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.xml +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args index 495e168563..051c8abc14 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.xml b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.xml index 18f51e5383..670f282b84 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.xml +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args b/tests/qemuxml2argvdata/serial-udp-chardev.args index 9e24ca713e..27fda92418 100644 --- a/tests/qemuxml2argvdata/serial-udp-chardev.args +++ b/tests/qemuxml2argvdata/serial-udp-chardev.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.xml b/tests/qemuxml2argvdata/serial-udp-chardev.xml index 420daadb56..15f65fbe87 100644 --- a/tests/qemuxml2argvdata/serial-udp-chardev.xml +++ b/tests/qemuxml2argvdata/serial-udp-chardev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args b/tests/qemuxml2argvdata/serial-unix-chardev.args index 2b6683f843..26998323ff 100644 --- a/tests/qemuxml2argvdata/serial-unix-chardev.args +++ b/tests/qemuxml2argvdata/serial-unix-chardev.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args index 4c9b1fefea..3e42d2577b 100644 --- a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.xml b/tests/qemuxml2argvdata/serial-unix-chardev.xml index f977d4d25c..18a7fac574 100644 --- a/tests/qemuxml2argvdata/serial-unix-chardev.xml +++ b/tests/qemuxml2argvdata/serial-unix-chardev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='unix'> diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args b/tests/qemuxml2argvdata/serial-vc-chardev.args index e49968e2ad..f5a5bab576 100644 --- a/tests/qemuxml2argvdata/serial-vc-chardev.args +++ b/tests/qemuxml2argvdata/serial-vc-chardev.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.xml b/tests/qemuxml2argvdata/serial-vc-chardev.xml index b84cdbe77b..9c056cb401 100644 --- a/tests/qemuxml2argvdata/serial-vc-chardev.xml +++ b/tests/qemuxml2argvdata/serial-vc-chardev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/shmem-invalid-address.xml b/tests/qemuxml2argvdata/shmem-invalid-address.xml index 6a4645fff2..1eef5ed540 100644 --- a/tests/qemuxml2argvdata/shmem-invalid-address.xml +++ b/tests/qemuxml2argvdata/shmem-invalid-address.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <memballoon model='none'/> diff --git a/tests/qemuxml2argvdata/shmem-invalid-size.xml b/tests/qemuxml2argvdata/shmem-invalid-size.xml index f7096dc1a9..e9a383de21 100644 --- a/tests/qemuxml2argvdata/shmem-invalid-size.xml +++ b/tests/qemuxml2argvdata/shmem-invalid-size.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <memballoon model='none'/> diff --git a/tests/qemuxml2argvdata/shmem-msi-only.xml b/tests/qemuxml2argvdata/shmem-msi-only.xml index f4c61ad4fa..6c8025d63b 100644 --- a/tests/qemuxml2argvdata/shmem-msi-only.xml +++ b/tests/qemuxml2argvdata/shmem-msi-only.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <memballoon model='none'/> diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.args b/tests/qemuxml2argvdata/shmem-plain-doorbell.args index 836d244474..6ed86b7448 100644 --- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args +++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.xml b/tests/qemuxml2argvdata/shmem-plain-doorbell.xml index 32f6098ff4..e248d637a5 100644 --- a/tests/qemuxml2argvdata/shmem-plain-doorbell.xml +++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/shmem-small-size.xml b/tests/qemuxml2argvdata/shmem-small-size.xml index 32e1e220a1..7236f64577 100644 --- a/tests/qemuxml2argvdata/shmem-small-size.xml +++ b/tests/qemuxml2argvdata/shmem-small-size.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <memballoon model='none'/> diff --git a/tests/qemuxml2argvdata/shmem.args b/tests/qemuxml2argvdata/shmem.args index 685bbaf824..f2f3c3e95d 100644 --- a/tests/qemuxml2argvdata/shmem.args +++ b/tests/qemuxml2argvdata/shmem.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/shmem.xml b/tests/qemuxml2argvdata/shmem.xml index f37b82fb77..e09f6da780 100644 --- a/tests/qemuxml2argvdata/shmem.xml +++ b/tests/qemuxml2argvdata/shmem.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/smartcard-controller.args b/tests/qemuxml2argvdata/smartcard-controller.args index 744370ba4d..7e9442045d 100644 --- a/tests/qemuxml2argvdata/smartcard-controller.args +++ b/tests/qemuxml2argvdata/smartcard-controller.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/smartcard-controller.xml b/tests/qemuxml2argvdata/smartcard-controller.xml index 06a1bab385..31834ec4e8 100644 --- a/tests/qemuxml2argvdata/smartcard-controller.xml +++ b/tests/qemuxml2argvdata/smartcard-controller.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='ccid' index='0'/> <smartcard mode='host'> <address type='ccid' controller='0' slot='0'/> diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args index 29da01ac06..9381649668 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.xml b/tests/qemuxml2argvdata/smartcard-host-certificates-database.xml index fa35645736..10d4521b98 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.xml +++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <smartcard mode='host-certificates'> <certificate>cert1</certificate> <certificate>cert2</certificate> diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args b/tests/qemuxml2argvdata/smartcard-host-certificates.args index 0570b34f70..eecc454343 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.xml b/tests/qemuxml2argvdata/smartcard-host-certificates.xml index 64babee9af..093cdb68c2 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates.xml +++ b/tests/qemuxml2argvdata/smartcard-host-certificates.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <smartcard mode='host-certificates'> <certificate>cert1</certificate> <certificate>cert2</certificate> diff --git a/tests/qemuxml2argvdata/smartcard-host.args b/tests/qemuxml2argvdata/smartcard-host.args index 744370ba4d..7e9442045d 100644 --- a/tests/qemuxml2argvdata/smartcard-host.args +++ b/tests/qemuxml2argvdata/smartcard-host.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/smartcard-host.xml b/tests/qemuxml2argvdata/smartcard-host.xml index fe2b0530b6..4b3827fb80 100644 --- a/tests/qemuxml2argvdata/smartcard-host.xml +++ b/tests/qemuxml2argvdata/smartcard-host.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <smartcard mode='host'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args index 16a3bad057..983648a21f 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml index e97441e791..c0baa1e34b 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml +++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <smartcard mode='passthrough' type='spicevmc'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args index a4dca17c3e..bac4418803 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml index 5cb9eee8db..aeddc7d4a0 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml +++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <smartcard mode='passthrough' type='tcp'> <source mode='bind' host='127.0.0.1' service='2001'/> <protocol type='raw'/> diff --git a/tests/qemuxml2argvdata/smbios-date.xml b/tests/qemuxml2argvdata/smbios-date.xml index 2e6cfde46b..06b2e9f737 100644 --- a/tests/qemuxml2argvdata/smbios-date.xml +++ b/tests/qemuxml2argvdata/smbios-date.xml @@ -18,6 +18,6 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> </devices> </domain> diff --git a/tests/qemuxml2argvdata/smbios-multiple-type2.xml b/tests/qemuxml2argvdata/smbios-multiple-type2.xml index ec24577d6c..9e79ff21be 100644 --- a/tests/qemuxml2argvdata/smbios-multiple-type2.xml +++ b/tests/qemuxml2argvdata/smbios-multiple-type2.xml @@ -44,7 +44,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/smbios-uuid-match.xml b/tests/qemuxml2argvdata/smbios-uuid-match.xml index a891226668..e424a109e5 100644 --- a/tests/qemuxml2argvdata/smbios-uuid-match.xml +++ b/tests/qemuxml2argvdata/smbios-uuid-match.xml @@ -18,6 +18,6 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> </devices> </domain> diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args index 3ece803561..8ded1cb085 100644 --- a/tests/qemuxml2argvdata/smbios.args +++ b/tests/qemuxml2argvdata/smbios.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/smbios.xml b/tests/qemuxml2argvdata/smbios.xml index ad8d139375..9f67376449 100644 --- a/tests/qemuxml2argvdata/smbios.xml +++ b/tests/qemuxml2argvdata/smbios.xml @@ -49,7 +49,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args index 21ee2572f2..dbf714c976 100644 --- a/tests/qemuxml2argvdata/smp.args +++ b/tests/qemuxml2argvdata/smp.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/smp.xml b/tests/qemuxml2argvdata/smp.xml index 8ebe888a96..55d5cdeff2 100644 --- a/tests/qemuxml2argvdata/smp.xml +++ b/tests/qemuxml2argvdata/smp.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/sound-device.args b/tests/qemuxml2argvdata/sound-device.args index 4d70d5f3b0..ce159a7054 100644 --- a/tests/qemuxml2argvdata/sound-device.args +++ b/tests/qemuxml2argvdata/sound-device.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/sound-device.xml b/tests/qemuxml2argvdata/sound-device.xml index c544e9313e..b9427f880a 100644 --- a/tests/qemuxml2argvdata/sound-device.xml +++ b/tests/qemuxml2argvdata/sound-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/sound.args b/tests/qemuxml2argvdata/sound.args index 1ab237dffa..7ed0c1e507 100644 --- a/tests/qemuxml2argvdata/sound.args +++ b/tests/qemuxml2argvdata/sound.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/sound.xml b/tests/qemuxml2argvdata/sound.xml index b8b198d043..dd45361a69 100644 --- a/tests/qemuxml2argvdata/sound.xml +++ b/tests/qemuxml2argvdata/sound.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/usb-bus-missing.xml b/tests/qemuxml2argvdata/usb-bus-missing.xml index 831a4c0afb..23bfdc4c8f 100644 --- a/tests/qemuxml2argvdata/usb-bus-missing.xml +++ b/tests/qemuxml2argvdata/usb-bus-missing.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <memballoon model='virtio'/> <input type='mouse' bus='usb'> diff --git a/tests/qemuxml2argvdata/usb-controller-xhci-limit.xml b/tests/qemuxml2argvdata/usb-controller-xhci-limit.xml index 951ab5b35c..1515afea78 100644 --- a/tests/qemuxml2argvdata/usb-controller-xhci-limit.xml +++ b/tests/qemuxml2argvdata/usb-controller-xhci-limit.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0' model='nec-xhci' ports='16'/> <memballoon model='none'/> </devices> diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args b/tests/qemuxml2argvdata/usb-controller-xhci.args index a8c461b99e..a23d0c4710 100644 --- a/tests/qemuxml2argvdata/usb-controller-xhci.args +++ b/tests/qemuxml2argvdata/usb-controller-xhci.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.xml b/tests/qemuxml2argvdata/usb-controller-xhci.xml index b2e8beac14..2988b18051 100644 --- a/tests/qemuxml2argvdata/usb-controller-xhci.xml +++ b/tests/qemuxml2argvdata/usb-controller-xhci.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0' model='nec-xhci' ports='8'/> <memballoon model='none'/> </devices> diff --git a/tests/qemuxml2argvdata/usb-controller.args b/tests/qemuxml2argvdata/usb-controller.args index b3745dd1e8..4aa1388409 100644 --- a/tests/qemuxml2argvdata/usb-controller.args +++ b/tests/qemuxml2argvdata/usb-controller.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/usb-controller.xml b/tests/qemuxml2argvdata/usb-controller.xml index af9e9dc201..7757a0719c 100644 --- a/tests/qemuxml2argvdata/usb-controller.xml +++ b/tests/qemuxml2argvdata/usb-controller.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args index e65f5f6964..b944dcb78e 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml index ef3bec9190..abf2470998 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml +++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <memballoon model='virtio'/> <input type='mouse' bus='usb'> diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args b/tests/qemuxml2argvdata/usb-hub-autoadd.args index ad5a00c950..fbfc88bede 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.xml b/tests/qemuxml2argvdata/usb-hub-autoadd.xml index b56287e754..65dda5a407 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd.xml +++ b/tests/qemuxml2argvdata/usb-hub-autoadd.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <memballoon model='virtio'/> <input type='mouse' bus='usb'> diff --git a/tests/qemuxml2argvdata/usb-hub-conflict.xml b/tests/qemuxml2argvdata/usb-hub-conflict.xml index 222ae3df2a..85ec3c4cf1 100644 --- a/tests/qemuxml2argvdata/usb-hub-conflict.xml +++ b/tests/qemuxml2argvdata/usb-hub-conflict.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <memballoon model='virtio'/> <hub type='usb'> diff --git a/tests/qemuxml2argvdata/usb-hub-nonexistent.xml b/tests/qemuxml2argvdata/usb-hub-nonexistent.xml index 3da5916b1b..7b2b17a678 100644 --- a/tests/qemuxml2argvdata/usb-hub-nonexistent.xml +++ b/tests/qemuxml2argvdata/usb-hub-nonexistent.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <memballoon model='virtio'/> <input type='mouse' bus='usb'> diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args index 121d39e554..24b5217455 100644 --- a/tests/qemuxml2argvdata/usb-hub.args +++ b/tests/qemuxml2argvdata/usb-hub.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/usb-hub.xml b/tests/qemuxml2argvdata/usb-hub.xml index 9b2b85eabd..e9e1fef964 100644 --- a/tests/qemuxml2argvdata/usb-hub.xml +++ b/tests/qemuxml2argvdata/usb-hub.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <memballoon model='virtio'/> <hub type='usb'> diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args b/tests/qemuxml2argvdata/usb-ich9-autoassign.args index 2008ff188b..dee4c843be 100644 --- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args +++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.xml b/tests/qemuxml2argvdata/usb-ich9-autoassign.xml index c1e1a46664..3090255821 100644 --- a/tests/qemuxml2argvdata/usb-ich9-autoassign.xml +++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0' model='ich9-ehci1'> <address type='pci' domain='0' bus='0' slot='4' function='7'/> </controller> diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args b/tests/qemuxml2argvdata/usb-ich9-companion.args index 1dba733d36..b1f2478e72 100644 --- a/tests/qemuxml2argvdata/usb-ich9-companion.args +++ b/tests/qemuxml2argvdata/usb-ich9-companion.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.xml b/tests/qemuxml2argvdata/usb-ich9-companion.xml index b9a8dd34ec..7e31ec95d3 100644 --- a/tests/qemuxml2argvdata/usb-ich9-companion.xml +++ b/tests/qemuxml2argvdata/usb-ich9-companion.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0' model='ich9-ehci1'> <address type='pci' domain='0' bus='0' slot='4' function='7'/> </controller> diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args index 033b42f1f8..a2c46c00f7 100644 --- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args +++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml index ee34ba6a4f..4da9fbdf0e 100644 --- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml +++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator>  <controller type='usb' index='0' model='ich9-ehci1'> diff --git a/tests/qemuxml2argvdata/usb-ich9-no-companion.xml b/tests/qemuxml2argvdata/usb-ich9-no-companion.xml index 00c38a019a..8c34954a1a 100644 --- a/tests/qemuxml2argvdata/usb-ich9-no-companion.xml +++ b/tests/qemuxml2argvdata/usb-ich9-no-companion.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0' model='ich9-uhci2'> <master startport='2'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0'/> diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args b/tests/qemuxml2argvdata/usb-long-port-path.args index 60753a9b67..caddab712d 100644 --- a/tests/qemuxml2argvdata/usb-long-port-path.args +++ b/tests/qemuxml2argvdata/usb-long-port-path.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/usb-long-port-path.xml b/tests/qemuxml2argvdata/usb-long-port-path.xml index 5f627485bb..0df5c8408f 100644 --- a/tests/qemuxml2argvdata/usb-long-port-path.xml +++ b/tests/qemuxml2argvdata/usb-long-port-path.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2argvdata/usb-none-hub.xml b/tests/qemuxml2argvdata/usb-none-hub.xml index 50f45f85fc..7b6fd7d737 100644 --- a/tests/qemuxml2argvdata/usb-none-hub.xml +++ b/tests/qemuxml2argvdata/usb-none-hub.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' model='none' index='0'/> <memballoon model='virtio'/> <hub type='usb'> diff --git a/tests/qemuxml2argvdata/usb-none-other.xml b/tests/qemuxml2argvdata/usb-none-other.xml index 15891b3a9a..f4e8a5e4de 100644 --- a/tests/qemuxml2argvdata/usb-none-other.xml +++ b/tests/qemuxml2argvdata/usb-none-other.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0' model='none'/> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> diff --git a/tests/qemuxml2argvdata/usb-none-usbtablet.xml b/tests/qemuxml2argvdata/usb-none-usbtablet.xml index c93b8cdd96..36f33788dc 100644 --- a/tests/qemuxml2argvdata/usb-none-usbtablet.xml +++ b/tests/qemuxml2argvdata/usb-none-usbtablet.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' model='none' index='0'/> <input type='tablet' bus='usb'/> <memballoon model='virtio'/> diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/usb-none.args index c0af8428c7..a3a01b7e74 100644 --- a/tests/qemuxml2argvdata/usb-none.args +++ b/tests/qemuxml2argvdata/usb-none.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/usb-none.xml b/tests/qemuxml2argvdata/usb-none.xml index c3190550e9..9d429dd845 100644 --- a/tests/qemuxml2argvdata/usb-none.xml +++ b/tests/qemuxml2argvdata/usb-none.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0' model='none'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args b/tests/qemuxml2argvdata/usb-piix3-controller.args index 8fed0891f0..6000e89bbf 100644 --- a/tests/qemuxml2argvdata/usb-piix3-controller.args +++ b/tests/qemuxml2argvdata/usb-piix3-controller.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.xml b/tests/qemuxml2argvdata/usb-piix3-controller.xml index 0df5c0335b..eafc97f7fe 100644 --- a/tests/qemuxml2argvdata/usb-piix3-controller.xml +++ b/tests/qemuxml2argvdata/usb-piix3-controller.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0' model='piix3-uhci'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args b/tests/qemuxml2argvdata/usb-port-autoassign.args index bf31faaf17..bd3c573a86 100644 --- a/tests/qemuxml2argvdata/usb-port-autoassign.args +++ b/tests/qemuxml2argvdata/usb-port-autoassign.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.xml b/tests/qemuxml2argvdata/usb-port-autoassign.xml index 7e220437c9..72a69d85f3 100644 --- a/tests/qemuxml2argvdata/usb-port-autoassign.xml +++ b/tests/qemuxml2argvdata/usb-port-autoassign.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <memballoon model='virtio'/> <hub type='usb'> diff --git a/tests/qemuxml2argvdata/usb-port-missing.args b/tests/qemuxml2argvdata/usb-port-missing.args index d01071fc50..480968883d 100644 --- a/tests/qemuxml2argvdata/usb-port-missing.args +++ b/tests/qemuxml2argvdata/usb-port-missing.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/usb-port-missing.xml b/tests/qemuxml2argvdata/usb-port-missing.xml index ed33b17b95..0d8906268f 100644 --- a/tests/qemuxml2argvdata/usb-port-missing.xml +++ b/tests/qemuxml2argvdata/usb-port-missing.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <memballoon model='virtio'/> <input type='mouse' bus='usb'> diff --git a/tests/qemuxml2argvdata/usb-ports-out-of-range.xml b/tests/qemuxml2argvdata/usb-ports-out-of-range.xml index 17a1adfdcc..3dd746114f 100644 --- a/tests/qemuxml2argvdata/usb-ports-out-of-range.xml +++ b/tests/qemuxml2argvdata/usb-ports-out-of-range.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <memballoon model='virtio'/> <hub type='usb'> diff --git a/tests/qemuxml2argvdata/usb-ports.args b/tests/qemuxml2argvdata/usb-ports.args index 511242ac04..5f04bf088d 100644 --- a/tests/qemuxml2argvdata/usb-ports.args +++ b/tests/qemuxml2argvdata/usb-ports.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/usb-ports.xml b/tests/qemuxml2argvdata/usb-ports.xml index 8cea0104f9..9eaf210368 100644 --- a/tests/qemuxml2argvdata/usb-ports.xml +++ b/tests/qemuxml2argvdata/usb-ports.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <memballoon model='virtio'/> <hub type='usb'> diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args b/tests/qemuxml2argvdata/usb-redir-boot.args index 84b716a420..9f6b49310d 100644 --- a/tests/qemuxml2argvdata/usb-redir-boot.args +++ b/tests/qemuxml2argvdata/usb-redir-boot.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/usb-redir-boot.xml b/tests/qemuxml2argvdata/usb-redir-boot.xml index 8f299d2ad4..9fbcaa2256 100644 --- a/tests/qemuxml2argvdata/usb-redir-boot.xml +++ b/tests/qemuxml2argvdata/usb-redir-boot.xml @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0' model='ich9-ehci1'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x7'/> </controller> diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args b/tests/qemuxml2argvdata/usb-redir-filter-version.args index 569d736b5a..89dcbfaaa1 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter-version.args +++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.xml b/tests/qemuxml2argvdata/usb-redir-filter-version.xml index d51def34dc..2e45517c2f 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter-version.xml +++ b/tests/qemuxml2argvdata/usb-redir-filter-version.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <redirdev bus='usb' type='spicevmc'> diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args b/tests/qemuxml2argvdata/usb-redir-filter.args index 337ba0208a..d801505f98 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter.args +++ b/tests/qemuxml2argvdata/usb-redir-filter.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/usb-redir-filter.xml b/tests/qemuxml2argvdata/usb-redir-filter.xml index 0bc15f0df1..791725efb3 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter.xml +++ b/tests/qemuxml2argvdata/usb-redir-filter.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0' model='ich9-ehci1'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x7'/> </controller> diff --git a/tests/qemuxml2argvdata/usb-redir.args b/tests/qemuxml2argvdata/usb-redir.args index 479a880e9b..d4f1e0dd0e 100644 --- a/tests/qemuxml2argvdata/usb-redir.args +++ b/tests/qemuxml2argvdata/usb-redir.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/usb-redir.xml b/tests/qemuxml2argvdata/usb-redir.xml index 67624b657c..b2c805dba8 100644 --- a/tests/qemuxml2argvdata/usb-redir.xml +++ b/tests/qemuxml2argvdata/usb-redir.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0' model='ich9-ehci1'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x7'/> </controller> diff --git a/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml b/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml index 383607ebf5..33c781a791 100644 --- a/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml +++ b/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args b/tests/qemuxml2argvdata/usb-xhci-autoassign.args index 82e4dcdf7a..d68ff5f90f 100644 --- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args +++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.xml b/tests/qemuxml2argvdata/usb-xhci-autoassign.xml index fce3c18819..55a40c4414 100644 --- a/tests/qemuxml2argvdata/usb-xhci-autoassign.xml +++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0' model='nec-xhci' ports='8'/> <hub type='usb'/> <input type='mouse' bus='usb'> diff --git a/tests/qemuxml2argvdata/usb1-usb2.args b/tests/qemuxml2argvdata/usb1-usb2.args index e6308a1078..9098cc6d9a 100644 --- a/tests/qemuxml2argvdata/usb1-usb2.args +++ b/tests/qemuxml2argvdata/usb1-usb2.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/usb1-usb2.xml b/tests/qemuxml2argvdata/usb1-usb2.xml index 9ff2478d53..ed4622b03b 100644 --- a/tests/qemuxml2argvdata/usb1-usb2.xml +++ b/tests/qemuxml2argvdata/usb1-usb2.xml @@ -9,7 +9,7 @@ <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <memballoon model='virtio'/> <controller type='usb' index='0' model='piix3-uhci'> diff --git a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args index 46c53c45fa..1f42fdce19 100644 --- a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.xml b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.xml index bb1f345532..f59bd7364c 100644 --- a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.xml +++ b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.xml @@ -22,7 +22,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args index 0b67b34797..b8f6d1243c 100644 --- a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/vhost-user-vga.xml b/tests/qemuxml2argvdata/vhost-user-vga.xml index baa0242725..f5cf35d0ec 100644 --- a/tests/qemuxml2argvdata/vhost-user-vga.xml +++ b/tests/qemuxml2argvdata/vhost-user-vga.xml @@ -22,7 +22,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args index 2112c10576..4d1f81f933 100644 --- a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/video-bochs-display-device.xml b/tests/qemuxml2argvdata/video-bochs-display-device.xml index 3c59bf7c6a..bf789566e4 100644 --- a/tests/qemuxml2argvdata/video-bochs-display-device.xml +++ b/tests/qemuxml2argvdata/video-bochs-display-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/video-invalid-multiple-devices.xml b/tests/qemuxml2argvdata/video-invalid-multiple-devices.xml index 3f105efaae..606c60dcea 100644 --- a/tests/qemuxml2argvdata/video-invalid-multiple-devices.xml +++ b/tests/qemuxml2argvdata/video-invalid-multiple-devices.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/video-invalid.xml b/tests/qemuxml2argvdata/video-invalid.xml index 68ae12a418..9f24b7a096 100644 --- a/tests/qemuxml2argvdata/video-invalid.xml +++ b/tests/qemuxml2argvdata/video-invalid.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/video-none-device.args b/tests/qemuxml2argvdata/video-none-device.args index 0fe0b2abff..193ff21414 100644 --- a/tests/qemuxml2argvdata/video-none-device.args +++ b/tests/qemuxml2argvdata/video-none-device.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/video-none-device.xml b/tests/qemuxml2argvdata/video-none-device.xml index c1c60c1d9e..a7d4d7d3c4 100644 --- a/tests/qemuxml2argvdata/video-none-device.xml +++ b/tests/qemuxml2argvdata/video-none-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args index e977437d76..aef42cc1c8 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.xml b/tests/qemuxml2argvdata/video-qxl-device-vgamem.xml index ee8e2e6893..d52fdf0fa0 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.xml +++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/video-qxl-device.args b/tests/qemuxml2argvdata/video-qxl-device.args index f4877c63a9..575a6d4cfd 100644 --- a/tests/qemuxml2argvdata/video-qxl-device.args +++ b/tests/qemuxml2argvdata/video-qxl-device.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/video-qxl-device.xml b/tests/qemuxml2argvdata/video-qxl-device.xml index ee8e2e6893..d52fdf0fa0 100644 --- a/tests/qemuxml2argvdata/video-qxl-device.xml +++ b/tests/qemuxml2argvdata/video-qxl-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/video-qxl-heads.args b/tests/qemuxml2argvdata/video-qxl-heads.args index f8df91e556..74cab50ba5 100644 --- a/tests/qemuxml2argvdata/video-qxl-heads.args +++ b/tests/qemuxml2argvdata/video-qxl-heads.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/video-qxl-heads.xml b/tests/qemuxml2argvdata/video-qxl-heads.xml index d878ddcd6d..9601d671fb 100644 --- a/tests/qemuxml2argvdata/video-qxl-heads.xml +++ b/tests/qemuxml2argvdata/video-qxl-heads.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/video-qxl-nodevice.args b/tests/qemuxml2argvdata/video-qxl-nodevice.args index 7a21464d58..830b5f9c3e 100644 --- a/tests/qemuxml2argvdata/video-qxl-nodevice.args +++ b/tests/qemuxml2argvdata/video-qxl-nodevice.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/video-qxl-nodevice.xml b/tests/qemuxml2argvdata/video-qxl-nodevice.xml index ee8e2e6893..d52fdf0fa0 100644 --- a/tests/qemuxml2argvdata/video-qxl-nodevice.xml +++ b/tests/qemuxml2argvdata/video-qxl-nodevice.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.args b/tests/qemuxml2argvdata/video-qxl-noheads.args index fea9f14b29..8c38697fe7 100644 --- a/tests/qemuxml2argvdata/video-qxl-noheads.args +++ b/tests/qemuxml2argvdata/video-qxl-noheads.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.xml b/tests/qemuxml2argvdata/video-qxl-noheads.xml index c20d267b9c..f29d1284cd 100644 --- a/tests/qemuxml2argvdata/video-qxl-noheads.xml +++ b/tests/qemuxml2argvdata/video-qxl-noheads.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.args b/tests/qemuxml2argvdata/video-qxl-resolution.args index ed2e4422da..1fdaf7e02e 100644 --- a/tests/qemuxml2argvdata/video-qxl-resolution.args +++ b/tests/qemuxml2argvdata/video-qxl-resolution.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.xml b/tests/qemuxml2argvdata/video-qxl-resolution.xml index 1bc415f3f8..e693cbce47 100644 --- a/tests/qemuxml2argvdata/video-qxl-resolution.xml +++ b/tests/qemuxml2argvdata/video-qxl-resolution.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args index 7e11b75ebf..3c47329c8d 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml index c736735a4a..5b9427afd8 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args index d814b11674..486e5b70af 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.xml b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.xml index 6bd0909c59..50ac972e1a 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.xml +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='ide' index='0'/> <video> <model type='qxl' heads='1'/> diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args b/tests/qemuxml2argvdata/video-qxl-sec-device.args index 73f96ecf77..6fb728658a 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.xml b/tests/qemuxml2argvdata/video-qxl-sec-device.xml index c736735a4a..5b9427afd8 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device.xml +++ b/tests/qemuxml2argvdata/video-qxl-sec-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args index 98983a1e26..707061269e 100644 --- a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,\ diff --git a/tests/qemuxml2argvdata/video-ramfb-display-device.xml b/tests/qemuxml2argvdata/video-ramfb-display-device.xml index 4123dad372..ad1c35e491 100644 --- a/tests/qemuxml2argvdata/video-ramfb-display-device.xml +++ b/tests/qemuxml2argvdata/video-ramfb-display-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args b/tests/qemuxml2argvdata/video-vga-device-vgamem.args index 8fdf4fb8be..c267f4bf67 100644 --- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.xml b/tests/qemuxml2argvdata/video-vga-device-vgamem.xml index 21b4119ce7..7e2080af0d 100644 --- a/tests/qemuxml2argvdata/video-vga-device-vgamem.xml +++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/video-vga-device.args b/tests/qemuxml2argvdata/video-vga-device.args index 259d6c8732..132d67ed89 100644 --- a/tests/qemuxml2argvdata/video-vga-device.args +++ b/tests/qemuxml2argvdata/video-vga-device.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/video-vga-device.xml b/tests/qemuxml2argvdata/video-vga-device.xml index 21b4119ce7..7e2080af0d 100644 --- a/tests/qemuxml2argvdata/video-vga-device.xml +++ b/tests/qemuxml2argvdata/video-vga-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/video-vga-nodevice.args b/tests/qemuxml2argvdata/video-vga-nodevice.args index 5498963335..cf21cafcef 100644 --- a/tests/qemuxml2argvdata/video-vga-nodevice.args +++ b/tests/qemuxml2argvdata/video-vga-nodevice.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/video-vga-nodevice.xml b/tests/qemuxml2argvdata/video-vga-nodevice.xml index 21b4119ce7..7e2080af0d 100644 --- a/tests/qemuxml2argvdata/video-vga-nodevice.xml +++ b/tests/qemuxml2argvdata/video-vga-nodevice.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args b/tests/qemuxml2argvdata/video-vga-qxl-heads.args index eb53f091c5..154bc1c2b7 100644 --- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args +++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.xml b/tests/qemuxml2argvdata/video-vga-qxl-heads.xml index d878ddcd6d..9601d671fb 100644 --- a/tests/qemuxml2argvdata/video-vga-qxl-heads.xml +++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args b/tests/qemuxml2argvdata/video-virtio-gpu-device.args index 4f1d917b13..050d989bad 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.xml b/tests/qemuxml2argvdata/video-virtio-gpu-device.xml index e7af3192c9..a9354d77a2 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-device.xml +++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args index 64d52e8052..7a5df40546 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml index 9dea73fbe4..9c46bfb4eb 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml +++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args index 3acd363a9a..8852351ef0 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml index 3aeb3e1f55..2c084224dd 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml +++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args index a73a752392..42760eba60 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml index 305657c553..97da27deed 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml +++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/video-virtio-vga.args b/tests/qemuxml2argvdata/video-virtio-vga.args index 48a1822f79..cb87552342 100644 --- a/tests/qemuxml2argvdata/video-virtio-vga.args +++ b/tests/qemuxml2argvdata/video-virtio-vga.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/video-virtio-vga.xml b/tests/qemuxml2argvdata/video-virtio-vga.xml index e7af3192c9..a9354d77a2 100644 --- a/tests/qemuxml2argvdata/video-virtio-vga.xml +++ b/tests/qemuxml2argvdata/video-virtio-vga.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args b/tests/qemuxml2argvdata/virtio-input-passthrough.args index 46dce511db..d26952c181 100644 --- a/tests/qemuxml2argvdata/virtio-input-passthrough.args +++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.xml b/tests/qemuxml2argvdata/virtio-input-passthrough.xml index 00881a0530..da20214f18 100644 --- a/tests/qemuxml2argvdata/virtio-input-passthrough.xml +++ b/tests/qemuxml2argvdata/virtio-input-passthrough.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='passthrough' bus='virtio'> diff --git a/tests/qemuxml2argvdata/virtio-input.args b/tests/qemuxml2argvdata/virtio-input.args index 30141cc2df..c89997af6b 100644 --- a/tests/qemuxml2argvdata/virtio-input.args +++ b/tests/qemuxml2argvdata/virtio-input.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/virtio-input.xml b/tests/qemuxml2argvdata/virtio-input.xml index 0f69cfb076..a464639eb6 100644 --- a/tests/qemuxml2argvdata/virtio-input.xml +++ b/tests/qemuxml2argvdata/virtio-input.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='virtio'/> diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args b/tests/qemuxml2argvdata/virtio-rng-default.args index ea46104ee1..c21e0176e2 100644 --- a/tests/qemuxml2argvdata/virtio-rng-default.args +++ b/tests/qemuxml2argvdata/virtio-rng-default.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/virtio-rng-default.xml b/tests/qemuxml2argvdata/virtio-rng-default.xml index a91e6fbd04..b3e3dbfe39 100644 --- a/tests/qemuxml2argvdata/virtio-rng-default.xml +++ b/tests/qemuxml2argvdata/virtio-rng-default.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <memballoon model='virtio'/> <rng model='virtio'> diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-crash.xml b/tests/qemuxml2argvdata/virtio-rng-egd-crash.xml index 2573f005a3..fea626639a 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd-crash.xml +++ b/tests/qemuxml2argvdata/virtio-rng-egd-crash.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <memballoon model='virtio'/> diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args b/tests/qemuxml2argvdata/virtio-rng-egd.args index ad58f40e28..b07549c4ec 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.xml b/tests/qemuxml2argvdata/virtio-rng-egd.xml index b3d91df324..8e446f2bf9 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd.xml +++ b/tests/qemuxml2argvdata/virtio-rng-egd.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args b/tests/qemuxml2argvdata/virtio-rng-multiple.args index 881cdf0bce..c70eba02ed 100644 --- a/tests/qemuxml2argvdata/virtio-rng-multiple.args +++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.xml b/tests/qemuxml2argvdata/virtio-rng-multiple.xml index 63e02d86ad..3c0e2a7463 100644 --- a/tests/qemuxml2argvdata/virtio-rng-multiple.xml +++ b/tests/qemuxml2argvdata/virtio-rng-multiple.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <memballoon model='virtio'/> diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args b/tests/qemuxml2argvdata/virtio-rng-random.args index 2ab2f2300d..dbe014849d 100644 --- a/tests/qemuxml2argvdata/virtio-rng-random.args +++ b/tests/qemuxml2argvdata/virtio-rng-random.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/virtio-rng-random.xml b/tests/qemuxml2argvdata/virtio-rng-random.xml index a71af148fb..738ab13d23 100644 --- a/tests/qemuxml2argvdata/virtio-rng-random.xml +++ b/tests/qemuxml2argvdata/virtio-rng-random.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdata/vmcoreinfo.args index 50684be6ad..e4b1bbeb5f 100644 --- a/tests/qemuxml2argvdata/vmcoreinfo.args +++ b/tests/qemuxml2argvdata/vmcoreinfo.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/vmcoreinfo.xml b/tests/qemuxml2argvdata/vmcoreinfo.xml index f8e5865310..f00109c5fd 100644 --- a/tests/qemuxml2argvdata/vmcoreinfo.xml +++ b/tests/qemuxml2argvdata/vmcoreinfo.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/watchdog-device.args b/tests/qemuxml2argvdata/watchdog-device.args index 074c38d8a4..5e5e33db7a 100644 --- a/tests/qemuxml2argvdata/watchdog-device.args +++ b/tests/qemuxml2argvdata/watchdog-device.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/watchdog-device.xml b/tests/qemuxml2argvdata/watchdog-device.xml index b2c5f670f6..a65caf5be4 100644 --- a/tests/qemuxml2argvdata/watchdog-device.xml +++ b/tests/qemuxml2argvdata/watchdog-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/watchdog-dump.args b/tests/qemuxml2argvdata/watchdog-dump.args index 0d44092607..9d69a49c73 100644 --- a/tests/qemuxml2argvdata/watchdog-dump.args +++ b/tests/qemuxml2argvdata/watchdog-dump.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/watchdog-dump.xml b/tests/qemuxml2argvdata/watchdog-dump.xml index cdc48edb0c..f2d3db7788 100644 --- a/tests/qemuxml2argvdata/watchdog-dump.xml +++ b/tests/qemuxml2argvdata/watchdog-dump.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.args b/tests/qemuxml2argvdata/watchdog-injectnmi.args index ea59463c04..9109a713e0 100644 --- a/tests/qemuxml2argvdata/watchdog-injectnmi.args +++ b/tests/qemuxml2argvdata/watchdog-injectnmi.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.xml b/tests/qemuxml2argvdata/watchdog-injectnmi.xml index 0d8f2ac50e..ea33be583b 100644 --- a/tests/qemuxml2argvdata/watchdog-injectnmi.xml +++ b/tests/qemuxml2argvdata/watchdog-injectnmi.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/watchdog.args b/tests/qemuxml2argvdata/watchdog.args index 8775d7f3c6..bfd901929c 100644 --- a/tests/qemuxml2argvdata/watchdog.args +++ b/tests/qemuxml2argvdata/watchdog.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ +/usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ diff --git a/tests/qemuxml2argvdata/watchdog.xml b/tests/qemuxml2argvdata/watchdog.xml index 4557a774cd..afeccbc58b 100644 --- a/tests/qemuxml2argvdata/watchdog.xml +++ b/tests/qemuxml2argvdata/watchdog.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/balloon-device-auto.xml b/tests/qemuxml2xmloutdata/balloon-device-auto.xml index cc92b7823f..974f94ed20 100644 --- a/tests/qemuxml2xmloutdata/balloon-device-auto.xml +++ b/tests/qemuxml2xmloutdata/balloon-device-auto.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/balloon-device-period.xml b/tests/qemuxml2xmloutdata/balloon-device-period.xml index 45c7a22f39..bebb93071f 100644 --- a/tests/qemuxml2xmloutdata/balloon-device-period.xml +++ b/tests/qemuxml2xmloutdata/balloon-device-period.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/blkdeviotune.xml b/tests/qemuxml2xmloutdata/blkdeviotune.xml index 25154b6bf4..ed8c8809db 100644 --- a/tests/qemuxml2xmloutdata/blkdeviotune.xml +++ b/tests/qemuxml2xmloutdata/blkdeviotune.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/blkiotune-device.xml b/tests/qemuxml2xmloutdata/blkiotune-device.xml index 4a3a6b4327..c1fa4579c5 100644 --- a/tests/qemuxml2xmloutdata/blkiotune-device.xml +++ b/tests/qemuxml2xmloutdata/blkiotune-device.xml @@ -32,7 +32,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/blkiotune.xml b/tests/qemuxml2xmloutdata/blkiotune.xml index 79f899d717..8a80c8c15f 100644 --- a/tests/qemuxml2xmloutdata/blkiotune.xml +++ b/tests/qemuxml2xmloutdata/blkiotune.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/boot-cdrom.xml b/tests/qemuxml2xmloutdata/boot-cdrom.xml index 4fbf7ca786..5778f5da41 100644 --- a/tests/qemuxml2xmloutdata/boot-cdrom.xml +++ b/tests/qemuxml2xmloutdata/boot-cdrom.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='cdrom'> <driver name='qemu' type='raw'/> <source dev='/dev/cdrom'/> diff --git a/tests/qemuxml2xmloutdata/boot-floppy.xml b/tests/qemuxml2xmloutdata/boot-floppy.xml index cc97b6a66f..5af9ebb4b8 100644 --- a/tests/qemuxml2xmloutdata/boot-floppy.xml +++ b/tests/qemuxml2xmloutdata/boot-floppy.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml index 8962ffbdd9..fc9b2df8ce 100644 --- a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml +++ b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='cdrom'> <driver name='qemu' type='raw'/> <source dev='/dev/cdrom'/> diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable.xml b/tests/qemuxml2xmloutdata/boot-menu-disable.xml index 8962ffbdd9..fc9b2df8ce 100644 --- a/tests/qemuxml2xmloutdata/boot-menu-disable.xml +++ b/tests/qemuxml2xmloutdata/boot-menu-disable.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='cdrom'> <driver name='qemu' type='raw'/> <source dev='/dev/cdrom'/> diff --git a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml index 90f323a1e2..654b8fec27 100644 --- a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml +++ b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='cdrom'> <driver name='qemu' type='raw'/> <source dev='/dev/cdrom'/> diff --git a/tests/qemuxml2xmloutdata/boot-multi.xml b/tests/qemuxml2xmloutdata/boot-multi.xml index 390d198f25..34f810c928 100644 --- a/tests/qemuxml2xmloutdata/boot-multi.xml +++ b/tests/qemuxml2xmloutdata/boot-multi.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='cdrom'> <driver name='qemu' type='raw'/> <source dev='/dev/cdrom'/> diff --git a/tests/qemuxml2xmloutdata/boot-network.xml b/tests/qemuxml2xmloutdata/boot-network.xml index ceb7a93b13..4ac5309ce1 100644 --- a/tests/qemuxml2xmloutdata/boot-network.xml +++ b/tests/qemuxml2xmloutdata/boot-network.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/boot-order.xml b/tests/qemuxml2xmloutdata/boot-order.xml index 1e4ca91d05..fee34a4cea 100644 --- a/tests/qemuxml2xmloutdata/boot-order.xml +++ b/tests/qemuxml2xmloutdata/boot-order.xml @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/channel-guestfwd.xml b/tests/qemuxml2xmloutdata/channel-guestfwd.xml index 3eeddda0b4..6a5a63eacf 100644 --- a/tests/qemuxml2xmloutdata/channel-guestfwd.xml +++ b/tests/qemuxml2xmloutdata/channel-guestfwd.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml b/tests/qemuxml2xmloutdata/channel-virtio-auto.xml index 3bed3b6c0d..38eccce8d3 100644 --- a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml +++ b/tests/qemuxml2xmloutdata/channel-virtio-auto.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml b/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml index 4487ea47dd..9a28e4f012 100644 --- a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml +++ b/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml index 0a427ba484..24925cc89a 100644 --- a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml +++ b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/channel-virtio.xml b/tests/qemuxml2xmloutdata/channel-virtio.xml index 5400658353..3125261484 100644 --- a/tests/qemuxml2xmloutdata/channel-virtio.xml +++ b/tests/qemuxml2xmloutdata/channel-virtio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/clock-catchup.xml b/tests/qemuxml2xmloutdata/clock-catchup.xml index e171fae534..0468b9129b 100644 --- a/tests/qemuxml2xmloutdata/clock-catchup.xml +++ b/tests/qemuxml2xmloutdata/clock-catchup.xml @@ -23,7 +23,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/clock-localtime.xml b/tests/qemuxml2xmloutdata/clock-localtime.xml index 3ba3000bc2..7a01365de8 100644 --- a/tests/qemuxml2xmloutdata/clock-localtime.xml +++ b/tests/qemuxml2xmloutdata/clock-localtime.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml b/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml index 49b235fe90..e166eb4417 100644 --- a/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml +++ b/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/clock-utc.xml b/tests/qemuxml2xmloutdata/clock-utc.xml index c1e963a78d..f8051b7607 100644 --- a/tests/qemuxml2xmloutdata/clock-utc.xml +++ b/tests/qemuxml2xmloutdata/clock-utc.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/console-compat-auto.xml b/tests/qemuxml2xmloutdata/console-compat-auto.xml index ec7ca296e3..ea9c6449fe 100644 --- a/tests/qemuxml2xmloutdata/console-compat-auto.xml +++ b/tests/qemuxml2xmloutdata/console-compat-auto.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/console-compat.xml b/tests/qemuxml2xmloutdata/console-compat.xml index 6a52800a33..06c4b0f6bc 100644 --- a/tests/qemuxml2xmloutdata/console-compat.xml +++ b/tests/qemuxml2xmloutdata/console-compat.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/console-compat2.xml b/tests/qemuxml2xmloutdata/console-compat2.xml index 8c7bbb768e..e97f9cef31 100644 --- a/tests/qemuxml2xmloutdata/console-compat2.xml +++ b/tests/qemuxml2xmloutdata/console-compat2.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/console-virtio-many.xml b/tests/qemuxml2xmloutdata/console-virtio-many.xml index 4f718dfbd8..0bb429c2de 100644 --- a/tests/qemuxml2xmloutdata/console-virtio-many.xml +++ b/tests/qemuxml2xmloutdata/console-virtio-many.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/console-virtio.xml b/tests/qemuxml2xmloutdata/console-virtio.xml index 334cc21c2e..23983f67ed 100644 --- a/tests/qemuxml2xmloutdata/console-virtio.xml +++ b/tests/qemuxml2xmloutdata/console-virtio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml index f810a70baf..6a9f0963ca 100644 --- a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml +++ b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml index 8aa954e478..f528efa8db 100644 --- a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml +++ b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml @@ -21,7 +21,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml index adc8393d79..0353b72c02 100644 --- a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml +++ b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml @@ -21,7 +21,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-features.xml b/tests/qemuxml2xmloutdata/cpu-host-model-features.xml index 6480bd5494..635811ecbd 100644 --- a/tests/qemuxml2xmloutdata/cpu-host-model-features.xml +++ b/tests/qemuxml2xmloutdata/cpu-host-model-features.xml @@ -23,7 +23,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml index 6d47bd84fe..9a961eb1a1 100644 --- a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml +++ b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml @@ -23,7 +23,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/cpu-kvmclock.xml b/tests/qemuxml2xmloutdata/cpu-kvmclock.xml index a01879fd3a..3f89c8fec7 100644 --- a/tests/qemuxml2xmloutdata/cpu-kvmclock.xml +++ b/tests/qemuxml2xmloutdata/cpu-kvmclock.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/cputune-iothreads.xml b/tests/qemuxml2xmloutdata/cputune-iothreads.xml index e647cf70e7..57649745f0 100644 --- a/tests/qemuxml2xmloutdata/cputune-iothreads.xml +++ b/tests/qemuxml2xmloutdata/cputune-iothreads.xml @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml b/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml index 0ba6b5ae93..694723d261 100644 --- a/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml +++ b/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml @@ -27,7 +27,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml b/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml index a496f13e14..6103531ed1 100644 --- a/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml +++ b/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml @@ -27,7 +27,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/cputune-zero-shares.xml b/tests/qemuxml2xmloutdata/cputune-zero-shares.xml index cea21402dc..8837b69eb3 100644 --- a/tests/qemuxml2xmloutdata/cputune-zero-shares.xml +++ b/tests/qemuxml2xmloutdata/cputune-zero-shares.xml @@ -21,7 +21,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/cputune.xml b/tests/qemuxml2xmloutdata/cputune.xml index 612eb76e71..ee789cdc85 100644 --- a/tests/qemuxml2xmloutdata/cputune.xml +++ b/tests/qemuxml2xmloutdata/cputune.xml @@ -25,7 +25,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/disk-active-commit-active.xml b/tests/qemuxml2xmloutdata/disk-active-commit-active.xml index cc26af1096..739941b470 100644 --- a/tests/qemuxml2xmloutdata/disk-active-commit-active.xml +++ b/tests/qemuxml2xmloutdata/disk-active-commit-active.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/tmp/HostVG/QEMUGuest1-snap'/> diff --git a/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml b/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml index b14345049d..5488e15b84 100644 --- a/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml +++ b/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/tmp/HostVG/QEMUGuest1-snap'/> diff --git a/tests/qemuxml2xmloutdata/disk-aio.xml b/tests/qemuxml2xmloutdata/disk-aio.xml index e1ab88e48d..01c1468b09 100644 --- a/tests/qemuxml2xmloutdata/disk-aio.xml +++ b/tests/qemuxml2xmloutdata/disk-aio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='qcow2' cache='none' io='native'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml index e24956f106..866bd9ca7e 100644 --- a/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml +++ b/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='qcow2'/> <source protocol='gluster' name='Volume2/Image'> diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml index e39e218873..0d5ca917d3 100644 --- a/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml +++ b/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='qcow2'/> <source protocol='gluster' name='Volume2/Image'> diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml index 2b5bc9e1b4..2569185ddf 100644 --- a/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml +++ b/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='qcow2'/> <source protocol='gluster' name='Volume2/Image' index='2'> diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml index 29d1ad002d..a1c0fb4620 100644 --- a/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml +++ b/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='qcow2'/> <source protocol='gluster' name='Volume2/Image'> diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml index 29d1ad002d..a1c0fb4620 100644 --- a/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml +++ b/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='qcow2'/> <source protocol='gluster' name='Volume2/Image'> diff --git a/tests/qemuxml2xmloutdata/disk-boot-cdrom.xml b/tests/qemuxml2xmloutdata/disk-boot-cdrom.xml index 49c1a69b6d..3c6b557e1f 100644 --- a/tests/qemuxml2xmloutdata/disk-boot-cdrom.xml +++ b/tests/qemuxml2xmloutdata/disk-boot-cdrom.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/disk-boot-disk.xml b/tests/qemuxml2xmloutdata/disk-boot-disk.xml index 34ea2c9d6d..86f3c878a8 100644 --- a/tests/qemuxml2xmloutdata/disk-boot-disk.xml +++ b/tests/qemuxml2xmloutdata/disk-boot-disk.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/disk-cache.xml b/tests/qemuxml2xmloutdata/disk-cache.xml index cba4067f0d..b81c9c2368 100644 --- a/tests/qemuxml2xmloutdata/disk-cache.xml +++ b/tests/qemuxml2xmloutdata/disk-cache.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='qcow2' cache='writeback'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml b/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml index e5eb7d6a98..10262e40d7 100644 --- a/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml +++ b/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='cdrom'> <driver name='qemu' type='raw'/> <source file='/root/boot.iso'/> diff --git a/tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml index f7772d832c..b0eaeb10ba 100644 --- a/tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='cdrom'> <driver name='qemu' type='raw'/> <target dev='hdd' bus='ide'/> diff --git a/tests/qemuxml2xmloutdata/disk-cdrom.xml b/tests/qemuxml2xmloutdata/disk-cdrom.xml index 7696785930..3e6475c276 100644 --- a/tests/qemuxml2xmloutdata/disk-cdrom.xml +++ b/tests/qemuxml2xmloutdata/disk-cdrom.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/disk-error-policy.xml b/tests/qemuxml2xmloutdata/disk-error-policy.xml index 0e534a1add..2a091eb2db 100644 --- a/tests/qemuxml2xmloutdata/disk-error-policy.xml +++ b/tests/qemuxml2xmloutdata/disk-error-policy.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='qcow2' cache='none' error_policy='stop'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/disk-fat.xml b/tests/qemuxml2xmloutdata/disk-fat.xml index aae0334dff..d716c1f76f 100644 --- a/tests/qemuxml2xmloutdata/disk-fat.xml +++ b/tests/qemuxml2xmloutdata/disk-fat.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='dir' device='disk'> <driver name='qemu' type='fat'/> <source dir='/var/somefiles'/> diff --git a/tests/qemuxml2xmloutdata/disk-floppy.xml b/tests/qemuxml2xmloutdata/disk-floppy.xml index c00508f36c..2c2402a671 100644 --- a/tests/qemuxml2xmloutdata/disk-floppy.xml +++ b/tests/qemuxml2xmloutdata/disk-floppy.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/disk-fmt-qcow.xml b/tests/qemuxml2xmloutdata/disk-fmt-qcow.xml index c12e6d2bdf..e10748ffce 100644 --- a/tests/qemuxml2xmloutdata/disk-fmt-qcow.xml +++ b/tests/qemuxml2xmloutdata/disk-fmt-qcow.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='qcow2'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/disk-mirror-active.xml b/tests/qemuxml2xmloutdata/disk-mirror-active.xml index bebdb849c2..17fb061d49 100644 --- a/tests/qemuxml2xmloutdata/disk-mirror-active.xml +++ b/tests/qemuxml2xmloutdata/disk-mirror-active.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml b/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml index 5c9b72738d..157ffcf6b2 100644 --- a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml +++ b/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml b/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml index f8a885aec8..14d4ed3522 100644 --- a/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml +++ b/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml index 5c9b72738d..157ffcf6b2 100644 --- a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml +++ b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/disk-network-gluster.xml b/tests/qemuxml2xmloutdata/disk-network-gluster.xml index 2c7c46b013..0b596df987 100644 --- a/tests/qemuxml2xmloutdata/disk-network-gluster.xml +++ b/tests/qemuxml2xmloutdata/disk-network-gluster.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='gluster' name='Volume1/Image'> diff --git a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml b/tests/qemuxml2xmloutdata/disk-network-iscsi.xml index f1348d583e..757b9b7b52 100644 --- a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml +++ b/tests/qemuxml2xmloutdata/disk-network-iscsi.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='iscsi' name='iqn.1992-01.com.example/0'> diff --git a/tests/qemuxml2xmloutdata/disk-network-nbd.xml b/tests/qemuxml2xmloutdata/disk-network-nbd.xml index 818e8d7d7c..0f169ca537 100644 --- a/tests/qemuxml2xmloutdata/disk-network-nbd.xml +++ b/tests/qemuxml2xmloutdata/disk-network-nbd.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='nbd'> diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd.xml b/tests/qemuxml2xmloutdata/disk-network-rbd.xml index a870bb82f8..7c74604f43 100644 --- a/tests/qemuxml2xmloutdata/disk-network-rbd.xml +++ b/tests/qemuxml2xmloutdata/disk-network-rbd.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='rbd' name='pool/image'> diff --git a/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml b/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml index f4b8029f64..bbe3998e88 100644 --- a/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml +++ b/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMU,Guest,,1'/> diff --git a/tests/qemuxml2xmloutdata/disk-network-source-auth.xml b/tests/qemuxml2xmloutdata/disk-network-source-auth.xml index 9dc063dea9..b9f06448c1 100644 --- a/tests/qemuxml2xmloutdata/disk-network-source-auth.xml +++ b/tests/qemuxml2xmloutdata/disk-network-source-auth.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'> diff --git a/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml b/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml index 012b3cc263..d02db8fb0d 100644 --- a/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml +++ b/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml b/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml index c36f07db1c..080d20d0df 100644 --- a/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml +++ b/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='cdrom'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml b/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml index 604ee8c9e3..99bbd119eb 100644 --- a/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml +++ b/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='lun' rawio='no' sgio='unfiltered'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/disk-scsi.xml b/tests/qemuxml2xmloutdata/disk-scsi.xml index 45fed6423a..062a907303 100644 --- a/tests/qemuxml2xmloutdata/disk-scsi.xml +++ b/tests/qemuxml2xmloutdata/disk-scsi.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/disk-serial.xml b/tests/qemuxml2xmloutdata/disk-serial.xml index a803cd959c..e29cefe0e8 100644 --- a/tests/qemuxml2xmloutdata/disk-serial.xml +++ b/tests/qemuxml2xmloutdata/disk-serial.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml b/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml index 29706200db..35ffadc26c 100644 --- a/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml +++ b/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='volume' device='cdrom'> <driver name='qemu'/> <source pool='pool-iscsi-auth' volume='unit:0:0:1' mode='host'> diff --git a/tests/qemuxml2xmloutdata/disk-source-pool.xml b/tests/qemuxml2xmloutdata/disk-source-pool.xml index 807d1099ed..d7d9457452 100644 --- a/tests/qemuxml2xmloutdata/disk-source-pool.xml +++ b/tests/qemuxml2xmloutdata/disk-source-pool.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='volume' device='cdrom'> <driver name='qemu'/> <source pool='pool-disk' volume='block+cdrom'> diff --git a/tests/qemuxml2xmloutdata/disk-usb-device.xml b/tests/qemuxml2xmloutdata/disk-usb-device.xml index 07282c87a0..60342112b3 100644 --- a/tests/qemuxml2xmloutdata/disk-usb-device.xml +++ b/tests/qemuxml2xmloutdata/disk-usb-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/disk-virtio.xml b/tests/qemuxml2xmloutdata/disk-virtio.xml index 6d3d793c54..884f7aadb4 100644 --- a/tests/qemuxml2xmloutdata/disk-virtio.xml +++ b/tests/qemuxml2xmloutdata/disk-virtio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/encrypted-disk.xml b/tests/qemuxml2xmloutdata/encrypted-disk.xml index 3c9d2fbafc..dbde16dbe3 100644 --- a/tests/qemuxml2xmloutdata/encrypted-disk.xml +++ b/tests/qemuxml2xmloutdata/encrypted-disk.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk'/> diff --git a/tests/qemuxml2xmloutdata/eoi-disabled.xml b/tests/qemuxml2xmloutdata/eoi-disabled.xml index 90ed25d6a2..6bea44a47c 100644 --- a/tests/qemuxml2xmloutdata/eoi-disabled.xml +++ b/tests/qemuxml2xmloutdata/eoi-disabled.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/eoi-enabled.xml b/tests/qemuxml2xmloutdata/eoi-enabled.xml index 13b3b73e31..b416894d88 100644 --- a/tests/qemuxml2xmloutdata/eoi-enabled.xml +++ b/tests/qemuxml2xmloutdata/eoi-enabled.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/floppy-drive-fat.xml b/tests/qemuxml2xmloutdata/floppy-drive-fat.xml index 0f561e773a..7e573d31d2 100644 --- a/tests/qemuxml2xmloutdata/floppy-drive-fat.xml +++ b/tests/qemuxml2xmloutdata/floppy-drive-fat.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='dir' device='floppy'> <driver name='qemu' type='fat'/> <source dir='/var/somefiles'/> diff --git a/tests/qemuxml2xmloutdata/graphics-egl-headless-rendernode.xml b/tests/qemuxml2xmloutdata/graphics-egl-headless-rendernode.xml index 9b7ac89928..8800d54008 100644 --- a/tests/qemuxml2xmloutdata/graphics-egl-headless-rendernode.xml +++ b/tests/qemuxml2xmloutdata/graphics-egl-headless-rendernode.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/graphics-listen-network.xml b/tests/qemuxml2xmloutdata/graphics-listen-network.xml index 144d315b57..4df676b10e 100644 --- a/tests/qemuxml2xmloutdata/graphics-listen-network.xml +++ b/tests/qemuxml2xmloutdata/graphics-listen-network.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/graphics-listen-network2.xml b/tests/qemuxml2xmloutdata/graphics-listen-network2.xml index ad44f67443..a4a9ccea2e 100644 --- a/tests/qemuxml2xmloutdata/graphics-listen-network2.xml +++ b/tests/qemuxml2xmloutdata/graphics-listen-network2.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml b/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml index 3897a0ae82..6c5043d8eb 100644 --- a/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml +++ b/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/graphics-sdl.xml b/tests/qemuxml2xmloutdata/graphics-sdl.xml index 961ed52e59..a21d87c2a5 100644 --- a/tests/qemuxml2xmloutdata/graphics-sdl.xml +++ b/tests/qemuxml2xmloutdata/graphics-sdl.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml index d41bb6e3f6..03bf7cf107 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml index 12dcc75f5a..e8534d961a 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/graphics-spice-compression.xml b/tests/qemuxml2xmloutdata/graphics-spice-compression.xml index 27854421c5..83d656e4f0 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-compression.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-compression.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml b/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml index 6d96264914..cf3119ae8d 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml b/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml index 78af3846df..9e311d8f2e 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/graphics-spice-socket.xml b/tests/qemuxml2xmloutdata/graphics-spice-socket.xml index 0c6ab900a5..2dd9beb37f 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-socket.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-socket.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml b/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml index 87d04c8866..3f0babd8fc 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml @@ -38,7 +38,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/var/lib/libvirt/images/f14.img'/> diff --git a/tests/qemuxml2xmloutdata/graphics-spice.xml b/tests/qemuxml2xmloutdata/graphics-spice.xml index 1822bc35cc..c45c825644 100644 --- a/tests/qemuxml2xmloutdata/graphics-spice.xml +++ b/tests/qemuxml2xmloutdata/graphics-spice.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml b/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml index 1cf420d890..9a70bd510c 100644 --- a/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml +++ b/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml b/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml index 962b3047e6..57fe2ee0e6 100644 --- a/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml +++ b/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml b/tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml index 4155c10397..0376383722 100644 --- a/tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml +++ b/tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml b/tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml index 89da5dff9c..cc83ca4b79 100644 --- a/tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml +++ b/tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.xml b/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.xml index 2b4690df3e..4415aa9253 100644 --- a/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.xml +++ b/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.xml b/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.xml index 1cf420d890..9a70bd510c 100644 --- a/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.xml +++ b/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml b/tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml index 7b53c2ae1f..d46a2c4542 100644 --- a/tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml +++ b/tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-socket.xml b/tests/qemuxml2xmloutdata/graphics-vnc-socket.xml index 24419738ca..314fa84372 100644 --- a/tests/qemuxml2xmloutdata/graphics-vnc-socket.xml +++ b/tests/qemuxml2xmloutdata/graphics-vnc-socket.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml b/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml index dcbc4bcf1d..42d1adceb8 100644 --- a/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml +++ b/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml b/tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml index ae54f2d906..ddc4c67302 100644 --- a/tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml +++ b/tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/graphics-vnc.xml b/tests/qemuxml2xmloutdata/graphics-vnc.xml index 89da5dff9c..cc83ca4b79 100644 --- a/tests/qemuxml2xmloutdata/graphics-vnc.xml +++ b/tests/qemuxml2xmloutdata/graphics-vnc.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml b/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml index d0a85913ac..d8a71e1f25 100644 --- a/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml +++ b/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml b/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml index 9d35fac366..2d66ebaac6 100644 --- a/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml +++ b/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-address.xml b/tests/qemuxml2xmloutdata/hostdev-pci-address.xml index 59cb86e1d5..e923b50b05 100644 --- a/tests/qemuxml2xmloutdata/hostdev-pci-address.xml +++ b/tests/qemuxml2xmloutdata/hostdev-pci-address.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml index 3b4242e409..e23d3d3901 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml index 1b0da12f60..6c76c5c592 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml index beeb3cb11e..d0e025d815 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi-auth.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml index cff162b4ea..463357a20c 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml index d8931da38a..6fb6979399 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml index df1375d1a5..16b27e72bf 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml index dd252f8524..17bb7e3904 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml index 05cefc003b..1513429773 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml index 31aa2dd3b5..f8f4389cd6 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml index 174096b0d9..2d2bdbf0b6 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml index a3886ec750..b6dc1dbb8f 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml index d31af322ac..4addf5ebc8 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml index df87897323..81ae94318b 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-usb-address.xml b/tests/qemuxml2xmloutdata/hostdev-usb-address.xml index 9e3377317a..4a2d7f6439 100644 --- a/tests/qemuxml2xmloutdata/hostdev-usb-address.xml +++ b/tests/qemuxml2xmloutdata/hostdev-usb-address.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio.xml b/tests/qemuxml2xmloutdata/hostdev-vfio.xml index 15a845f4d1..aa17a3e212 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> diff --git a/tests/qemuxml2xmloutdata/hugepages-default.xml b/tests/qemuxml2xmloutdata/hugepages-default.xml index 40043434ee..89916f4581 100644 --- a/tests/qemuxml2xmloutdata/hugepages-default.xml +++ b/tests/qemuxml2xmloutdata/hugepages-default.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/hugepages-nodeset.xml b/tests/qemuxml2xmloutdata/hugepages-nodeset.xml index ac219a7800..ce67853f26 100644 --- a/tests/qemuxml2xmloutdata/hugepages-nodeset.xml +++ b/tests/qemuxml2xmloutdata/hugepages-nodeset.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml b/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml index 3777824e1a..b320f69a2d 100644 --- a/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml +++ b/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml index 1230edfd02..977f5ccd19 100644 --- a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml +++ b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml index affd124048..e57bb55449 100644 --- a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml +++ b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml @@ -27,7 +27,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/hugepages-shared.xml b/tests/qemuxml2xmloutdata/hugepages-shared.xml index e56d1ace83..0382614c30 100644 --- a/tests/qemuxml2xmloutdata/hugepages-shared.xml +++ b/tests/qemuxml2xmloutdata/hugepages-shared.xml @@ -31,7 +31,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/hyperv-off.xml b/tests/qemuxml2xmloutdata/hyperv-off.xml index 1b7d82b14a..7fd8748c6f 100644 --- a/tests/qemuxml2xmloutdata/hyperv-off.xml +++ b/tests/qemuxml2xmloutdata/hyperv-off.xml @@ -32,7 +32,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/hyperv-panic.xml b/tests/qemuxml2xmloutdata/hyperv-panic.xml index bf8cd43231..c96a7506df 100644 --- a/tests/qemuxml2xmloutdata/hyperv-panic.xml +++ b/tests/qemuxml2xmloutdata/hyperv-panic.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml b/tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml index 806164beea..a04e80e575 100644 --- a/tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml +++ b/tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml @@ -23,7 +23,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/hyperv.xml b/tests/qemuxml2xmloutdata/hyperv.xml index 5510d3dfad..07cfcce320 100644 --- a/tests/qemuxml2xmloutdata/hyperv.xml +++ b/tests/qemuxml2xmloutdata/hyperv.xml @@ -32,7 +32,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/input-usbmouse.xml b/tests/qemuxml2xmloutdata/input-usbmouse.xml index df62e5fef9..3dbb0eee9e 100644 --- a/tests/qemuxml2xmloutdata/input-usbmouse.xml +++ b/tests/qemuxml2xmloutdata/input-usbmouse.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/input-usbtablet.xml b/tests/qemuxml2xmloutdata/input-usbtablet.xml index 471e05304a..5b5b7bd77a 100644 --- a/tests/qemuxml2xmloutdata/input-usbtablet.xml +++ b/tests/qemuxml2xmloutdata/input-usbtablet.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/iothreads-disk.xml b/tests/qemuxml2xmloutdata/iothreads-disk.xml index f4170de6e2..3eeed00703 100644 --- a/tests/qemuxml2xmloutdata/iothreads-disk.xml +++ b/tests/qemuxml2xmloutdata/iothreads-disk.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/iothreads-ids-partial.xml b/tests/qemuxml2xmloutdata/iothreads-ids-partial.xml index c4a51a9ab1..fbc4cb3ab9 100644 --- a/tests/qemuxml2xmloutdata/iothreads-ids-partial.xml +++ b/tests/qemuxml2xmloutdata/iothreads-ids-partial.xml @@ -20,7 +20,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/iothreads-ids.xml b/tests/qemuxml2xmloutdata/iothreads-ids.xml index ef2cfdc6fe..2b64bc446f 100644 --- a/tests/qemuxml2xmloutdata/iothreads-ids.xml +++ b/tests/qemuxml2xmloutdata/iothreads-ids.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml index 29036c8964..2bdc91501c 100644 --- a/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml +++ b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/iothreads.xml b/tests/qemuxml2xmloutdata/iothreads.xml index b4fa7e6e8f..c2fc2e3918 100644 --- a/tests/qemuxml2xmloutdata/iothreads.xml +++ b/tests/qemuxml2xmloutdata/iothreads.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/kvm-features-off.xml b/tests/qemuxml2xmloutdata/kvm-features-off.xml index a0ef9c7e9e..9068be3e7b 100644 --- a/tests/qemuxml2xmloutdata/kvm-features-off.xml +++ b/tests/qemuxml2xmloutdata/kvm-features-off.xml @@ -20,7 +20,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/kvm-features.xml b/tests/qemuxml2xmloutdata/kvm-features.xml index b6f16ced1d..7c554671b3 100644 --- a/tests/qemuxml2xmloutdata/kvm-features.xml +++ b/tests/qemuxml2xmloutdata/kvm-features.xml @@ -21,7 +21,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/kvmclock.xml b/tests/qemuxml2xmloutdata/kvmclock.xml index e502bfd125..729b4eccd6 100644 --- a/tests/qemuxml2xmloutdata/kvmclock.xml +++ b/tests/qemuxml2xmloutdata/kvmclock.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/lease.xml b/tests/qemuxml2xmloutdata/lease.xml index a6ba5903cc..87258c8f7e 100644 --- a/tests/qemuxml2xmloutdata/lease.xml +++ b/tests/qemuxml2xmloutdata/lease.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/machine-core-off.xml b/tests/qemuxml2xmloutdata/machine-core-off.xml index 11c6bd8ed3..2b7a1b4712 100644 --- a/tests/qemuxml2xmloutdata/machine-core-off.xml +++ b/tests/qemuxml2xmloutdata/machine-core-off.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/machine-core-on.xml b/tests/qemuxml2xmloutdata/machine-core-on.xml index 286981f076..37508e8782 100644 --- a/tests/qemuxml2xmloutdata/machine-core-on.xml +++ b/tests/qemuxml2xmloutdata/machine-core-on.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml index d26675852f..f4a118cea5 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nonuma.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nonuma.xml index 0b6c6f7923..7c277f01a3 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-nonuma.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-nonuma.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/memory-hotplug.xml b/tests/qemuxml2xmloutdata/memory-hotplug.xml index a5d82346be..0e02f210bc 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug.xml @@ -20,7 +20,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/memorybacking-set.xml b/tests/qemuxml2xmloutdata/memorybacking-set.xml index ea15f2783f..da1ebadfd1 100644 --- a/tests/qemuxml2xmloutdata/memorybacking-set.xml +++ b/tests/qemuxml2xmloutdata/memorybacking-set.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/memorybacking-unset.xml b/tests/qemuxml2xmloutdata/memorybacking-unset.xml index cf21e7162b..b90988d3f1 100644 --- a/tests/qemuxml2xmloutdata/memorybacking-unset.xml +++ b/tests/qemuxml2xmloutdata/memorybacking-unset.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/memtune-unlimited.xml b/tests/qemuxml2xmloutdata/memtune-unlimited.xml index 1910edab41..24e5aadcdf 100644 --- a/tests/qemuxml2xmloutdata/memtune-unlimited.xml +++ b/tests/qemuxml2xmloutdata/memtune-unlimited.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/memtune.xml b/tests/qemuxml2xmloutdata/memtune.xml index 55db8a2daf..59de8b2c02 100644 --- a/tests/qemuxml2xmloutdata/memtune.xml +++ b/tests/qemuxml2xmloutdata/memtune.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/metadata-duplicate.xml b/tests/qemuxml2xmloutdata/metadata-duplicate.xml index 2ac9c2aa54..8955445eb0 100644 --- a/tests/qemuxml2xmloutdata/metadata-duplicate.xml +++ b/tests/qemuxml2xmloutdata/metadata-duplicate.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/metadata.xml b/tests/qemuxml2xmloutdata/metadata.xml index 2ac9c2aa54..8955445eb0 100644 --- a/tests/qemuxml2xmloutdata/metadata.xml +++ b/tests/qemuxml2xmloutdata/metadata.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/migrate.xml b/tests/qemuxml2xmloutdata/migrate.xml index ab681aab9d..757791af10 100644 --- a/tests/qemuxml2xmloutdata/migrate.xml +++ b/tests/qemuxml2xmloutdata/migrate.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/minimal.xml b/tests/qemuxml2xmloutdata/minimal.xml index 1a0cf56824..aae7d84719 100644 --- a/tests/qemuxml2xmloutdata/minimal.xml +++ b/tests/qemuxml2xmloutdata/minimal.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/misc-acpi.xml b/tests/qemuxml2xmloutdata/misc-acpi.xml index 0dd1a3d782..6114d43b13 100644 --- a/tests/qemuxml2xmloutdata/misc-acpi.xml +++ b/tests/qemuxml2xmloutdata/misc-acpi.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/misc-disable-s3.xml b/tests/qemuxml2xmloutdata/misc-disable-s3.xml index 0c447fe584..efdcc3bd37 100644 --- a/tests/qemuxml2xmloutdata/misc-disable-s3.xml +++ b/tests/qemuxml2xmloutdata/misc-disable-s3.xml @@ -16,7 +16,7 @@ <suspend-to-mem enabled='no'/> </pm> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/misc-disable-suspends.xml b/tests/qemuxml2xmloutdata/misc-disable-suspends.xml index eac8ee9cd7..6e94800d6f 100644 --- a/tests/qemuxml2xmloutdata/misc-disable-suspends.xml +++ b/tests/qemuxml2xmloutdata/misc-disable-suspends.xml @@ -17,7 +17,7 @@ <suspend-to-disk enabled='no'/> </pm> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/misc-enable-s4.xml b/tests/qemuxml2xmloutdata/misc-enable-s4.xml index a246b0b5ca..e9c5d5e63f 100644 --- a/tests/qemuxml2xmloutdata/misc-enable-s4.xml +++ b/tests/qemuxml2xmloutdata/misc-enable-s4.xml @@ -16,7 +16,7 @@ <suspend-to-disk enabled='yes'/> </pm> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/misc-no-reboot.xml b/tests/qemuxml2xmloutdata/misc-no-reboot.xml index 6e026b1356..9f3a4d487a 100644 --- a/tests/qemuxml2xmloutdata/misc-no-reboot.xml +++ b/tests/qemuxml2xmloutdata/misc-no-reboot.xml @@ -13,7 +13,7 @@ <on_reboot>destroy</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/misc-uuid.xml b/tests/qemuxml2xmloutdata/misc-uuid.xml index 0dd1a3d782..6114d43b13 100644 --- a/tests/qemuxml2xmloutdata/misc-uuid.xml +++ b/tests/qemuxml2xmloutdata/misc-uuid.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/net-eth-hostip.xml b/tests/qemuxml2xmloutdata/net-eth-hostip.xml index 4b104a72c2..3990dfbdf9 100644 --- a/tests/qemuxml2xmloutdata/net-eth-hostip.xml +++ b/tests/qemuxml2xmloutdata/net-eth-hostip.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/net-eth-ifname.xml b/tests/qemuxml2xmloutdata/net-eth-ifname.xml index c36baa0ec3..275f0c9b0c 100644 --- a/tests/qemuxml2xmloutdata/net-eth-ifname.xml +++ b/tests/qemuxml2xmloutdata/net-eth-ifname.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml b/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml index cdff179932..061d1b5954 100644 --- a/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml +++ b/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/net-eth.xml b/tests/qemuxml2xmloutdata/net-eth.xml index 898bda633a..8e84643c98 100644 --- a/tests/qemuxml2xmloutdata/net-eth.xml +++ b/tests/qemuxml2xmloutdata/net-eth.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml b/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml index d9ecf40cf0..f6ddad49c0 100644 --- a/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml +++ b/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml b/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml index 3f057a8249..324c75e990 100644 --- a/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml +++ b/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/net-hostdev.xml b/tests/qemuxml2xmloutdata/net-hostdev.xml index bede4b034f..7403bff9a0 100644 --- a/tests/qemuxml2xmloutdata/net-hostdev.xml +++ b/tests/qemuxml2xmloutdata/net-hostdev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/net-many-models.xml b/tests/qemuxml2xmloutdata/net-many-models.xml index 8fb3be920b..3f2a642574 100644 --- a/tests/qemuxml2xmloutdata/net-many-models.xml +++ b/tests/qemuxml2xmloutdata/net-many-models.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0' model='none'/> <controller type='pci' index='0' model='pci-root'/> <interface type='user'> diff --git a/tests/qemuxml2xmloutdata/net-midonet.xml b/tests/qemuxml2xmloutdata/net-midonet.xml index 49fe8f6ec2..61e3ec8919 100644 --- a/tests/qemuxml2xmloutdata/net-midonet.xml +++ b/tests/qemuxml2xmloutdata/net-midonet.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/net-openvswitch.xml b/tests/qemuxml2xmloutdata/net-openvswitch.xml index 13efaca2cb..7b53846a08 100644 --- a/tests/qemuxml2xmloutdata/net-openvswitch.xml +++ b/tests/qemuxml2xmloutdata/net-openvswitch.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/net-udp.xml b/tests/qemuxml2xmloutdata/net-udp.xml index efd74cb36d..fedb99f001 100644 --- a/tests/qemuxml2xmloutdata/net-udp.xml +++ b/tests/qemuxml2xmloutdata/net-udp.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/net-user.xml b/tests/qemuxml2xmloutdata/net-user.xml index 49902e2a9b..35283da488 100644 --- a/tests/qemuxml2xmloutdata/net-user.xml +++ b/tests/qemuxml2xmloutdata/net-user.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/net-vhostuser.xml b/tests/qemuxml2xmloutdata/net-vhostuser.xml index 9655c21ede..e0a5335896 100644 --- a/tests/qemuxml2xmloutdata/net-vhostuser.xml +++ b/tests/qemuxml2xmloutdata/net-vhostuser.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/net-virtio-device.xml b/tests/qemuxml2xmloutdata/net-virtio-device.xml index f1238cde2b..9caa289116 100644 --- a/tests/qemuxml2xmloutdata/net-virtio-device.xml +++ b/tests/qemuxml2xmloutdata/net-virtio-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml index e5cad4078b..15958be87b 100644 --- a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml +++ b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest7'/> diff --git a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml index fe8c5657ce..d298204250 100644 --- a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml +++ b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml index 753c2f247e..fce6d083ae 100644 --- a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml +++ b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/net-virtio.xml b/tests/qemuxml2xmloutdata/net-virtio.xml index 309d4ea2cc..2ed622e923 100644 --- a/tests/qemuxml2xmloutdata/net-virtio.xml +++ b/tests/qemuxml2xmloutdata/net-virtio.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/nographics-vga.xml b/tests/qemuxml2xmloutdata/nographics-vga.xml index ab681aab9d..757791af10 100644 --- a/tests/qemuxml2xmloutdata/nographics-vga.xml +++ b/tests/qemuxml2xmloutdata/nographics-vga.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/nosharepages.xml b/tests/qemuxml2xmloutdata/nosharepages.xml index 1acb86f4f2..dd5d24eaee 100644 --- a/tests/qemuxml2xmloutdata/nosharepages.xml +++ b/tests/qemuxml2xmloutdata/nosharepages.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml index 6e3aa331c5..133177b679 100644 --- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml +++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml index 0be69f5b02..dc14ecd139 100644 --- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml +++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml index 04d9a3ee5e..76d7c3b835 100644 --- a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml +++ b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml index 3dae444172..523962117e 100644 --- a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml +++ b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/panic-double.xml b/tests/qemuxml2xmloutdata/panic-double.xml index 45e9b72012..b3d0f79ee3 100644 --- a/tests/qemuxml2xmloutdata/panic-double.xml +++ b/tests/qemuxml2xmloutdata/panic-double.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/panic-isa.xml b/tests/qemuxml2xmloutdata/panic-isa.xml index 8f4f330d54..ef75c59046 100644 --- a/tests/qemuxml2xmloutdata/panic-isa.xml +++ b/tests/qemuxml2xmloutdata/panic-isa.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/panic-no-address.xml b/tests/qemuxml2xmloutdata/panic-no-address.xml index b05d2209ac..129e66cd99 100644 --- a/tests/qemuxml2xmloutdata/panic-no-address.xml +++ b/tests/qemuxml2xmloutdata/panic-no-address.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/panic.xml b/tests/qemuxml2xmloutdata/panic.xml index 8f4f330d54..ef75c59046 100644 --- a/tests/qemuxml2xmloutdata/panic.xml +++ b/tests/qemuxml2xmloutdata/panic.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/parallel-tcp.xml b/tests/qemuxml2xmloutdata/parallel-tcp.xml index 96887cb040..4cad78f847 100644 --- a/tests/qemuxml2xmloutdata/parallel-tcp.xml +++ b/tests/qemuxml2xmloutdata/parallel-tcp.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/pci-rom.xml b/tests/qemuxml2xmloutdata/pci-rom.xml index 982231fefe..62945054d4 100644 --- a/tests/qemuxml2xmloutdata/pci-rom.xml +++ b/tests/qemuxml2xmloutdata/pci-rom.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> diff --git a/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml index 5308d4d253..9fe7fd5cc1 100644 --- a/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml +++ b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/pmu-feature-off.xml b/tests/qemuxml2xmloutdata/pmu-feature-off.xml index f14a5b7a76..9398014694 100644 --- a/tests/qemuxml2xmloutdata/pmu-feature-off.xml +++ b/tests/qemuxml2xmloutdata/pmu-feature-off.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/pmu-feature.xml b/tests/qemuxml2xmloutdata/pmu-feature.xml index 71734e7b11..7fee1ae0ac 100644 --- a/tests/qemuxml2xmloutdata/pmu-feature.xml +++ b/tests/qemuxml2xmloutdata/pmu-feature.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml b/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml index 2f48bb5884..b8f23b070b 100644 --- a/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml +++ b/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml b/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml index 29e2b2c74c..5d30fa0f10 100644 --- a/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml +++ b/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml b/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml index 46455c0a7b..f4e95d92c0 100644 --- a/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml +++ b/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml b/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml index 29b608af0a..5a5e2ffd9d 100644 --- a/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml +++ b/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml b/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml index 49ed16774f..a2383d57bf 100644 --- a/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml +++ b/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/restore-v2.xml b/tests/qemuxml2xmloutdata/restore-v2.xml index ab681aab9d..757791af10 100644 --- a/tests/qemuxml2xmloutdata/restore-v2.xml +++ b/tests/qemuxml2xmloutdata/restore-v2.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml b/tests/qemuxml2xmloutdata/seclabel-dac-none.xml index 04418be906..a82cdf167f 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dac-none.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml b/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml index 46b6b210b5..eaec802054 100644 --- a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml +++ b/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'> diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml index 7163015192..db8d3f3bf9 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml index 7163015192..db8d3f3bf9 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml index 067889262c..ce7b409947 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml index 9e21c054b0..aadcf5a516 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'> diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml index 067889262c..ce7b409947 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/seclabel-none.xml b/tests/qemuxml2xmloutdata/seclabel-none.xml index 067889262c..ce7b409947 100644 --- a/tests/qemuxml2xmloutdata/seclabel-none.xml +++ b/tests/qemuxml2xmloutdata/seclabel-none.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml index 7c448675e2..48ffcded63 100644 --- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml +++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'> diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml index e705b5452c..d8d93fe016 100644 --- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml +++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/seclabel-static.xml b/tests/qemuxml2xmloutdata/seclabel-static.xml index 2197104d57..b633a9f829 100644 --- a/tests/qemuxml2xmloutdata/seclabel-static.xml +++ b/tests/qemuxml2xmloutdata/seclabel-static.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/serial-dev.xml b/tests/qemuxml2xmloutdata/serial-dev.xml index 7c52cd479c..18317c590a 100644 --- a/tests/qemuxml2xmloutdata/serial-dev.xml +++ b/tests/qemuxml2xmloutdata/serial-dev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/serial-file.xml b/tests/qemuxml2xmloutdata/serial-file.xml index 69bd55e531..1860db8a27 100644 --- a/tests/qemuxml2xmloutdata/serial-file.xml +++ b/tests/qemuxml2xmloutdata/serial-file.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/serial-many.xml b/tests/qemuxml2xmloutdata/serial-many.xml index 6f8bccd40d..3d72053535 100644 --- a/tests/qemuxml2xmloutdata/serial-many.xml +++ b/tests/qemuxml2xmloutdata/serial-many.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/serial-pty.xml b/tests/qemuxml2xmloutdata/serial-pty.xml index 21a10ff731..7d8266cbda 100644 --- a/tests/qemuxml2xmloutdata/serial-pty.xml +++ b/tests/qemuxml2xmloutdata/serial-pty.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml b/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml index 560f4d2b77..5ab1ecae7f 100644 --- a/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml +++ b/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/serial-spiceport.xml b/tests/qemuxml2xmloutdata/serial-spiceport.xml index 287f3817e1..5fca7b19c5 100644 --- a/tests/qemuxml2xmloutdata/serial-spiceport.xml +++ b/tests/qemuxml2xmloutdata/serial-spiceport.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml b/tests/qemuxml2xmloutdata/serial-target-port-auto.xml index cc10a55bcf..9aae2ac044 100644 --- a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml +++ b/tests/qemuxml2xmloutdata/serial-target-port-auto.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/serial-tcp-telnet.xml b/tests/qemuxml2xmloutdata/serial-tcp-telnet.xml index 4cf3d4ed24..a2110221f8 100644 --- a/tests/qemuxml2xmloutdata/serial-tcp-telnet.xml +++ b/tests/qemuxml2xmloutdata/serial-tcp-telnet.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml index 44a5be35b4..4823338365 100644 --- a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml +++ b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/serial-tcp.xml b/tests/qemuxml2xmloutdata/serial-tcp.xml index 499147b509..a4f754de3a 100644 --- a/tests/qemuxml2xmloutdata/serial-tcp.xml +++ b/tests/qemuxml2xmloutdata/serial-tcp.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/serial-udp.xml b/tests/qemuxml2xmloutdata/serial-udp.xml index 8ee793b54f..1bd7c29fe2 100644 --- a/tests/qemuxml2xmloutdata/serial-udp.xml +++ b/tests/qemuxml2xmloutdata/serial-udp.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/serial-unix.xml b/tests/qemuxml2xmloutdata/serial-unix.xml index 8dae21fb3e..850a1d6766 100644 --- a/tests/qemuxml2xmloutdata/serial-unix.xml +++ b/tests/qemuxml2xmloutdata/serial-unix.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/serial-vc.xml b/tests/qemuxml2xmloutdata/serial-vc.xml index 09f40a976a..c7826f3284 100644 --- a/tests/qemuxml2xmloutdata/serial-vc.xml +++ b/tests/qemuxml2xmloutdata/serial-vc.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml b/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml index b22f636220..c5dd0f4598 100644 --- a/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml +++ b/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/shmem.xml b/tests/qemuxml2xmloutdata/shmem.xml index 4713964a32..3145b3fc21 100644 --- a/tests/qemuxml2xmloutdata/shmem.xml +++ b/tests/qemuxml2xmloutdata/shmem.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/smartcard-controller.xml b/tests/qemuxml2xmloutdata/smartcard-controller.xml index dc7365b0b6..b996c5b3db 100644 --- a/tests/qemuxml2xmloutdata/smartcard-controller.xml +++ b/tests/qemuxml2xmloutdata/smartcard-controller.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='ccid' index='0'/> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> diff --git a/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml b/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml index 55d54a4355..6d22110698 100644 --- a/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml +++ b/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml b/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml index e0835f6c05..d0e545da61 100644 --- a/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml +++ b/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/smartcard-host.xml b/tests/qemuxml2xmloutdata/smartcard-host.xml index abb2c4b6ec..acd5675ff4 100644 --- a/tests/qemuxml2xmloutdata/smartcard-host.xml +++ b/tests/qemuxml2xmloutdata/smartcard-host.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml b/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml index 38755e2d7b..0de8c9d270 100644 --- a/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml +++ b/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml b/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml index 2232daa359..c02f1e2526 100644 --- a/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml +++ b/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml b/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml index d3dd152aed..62dcf0d176 100644 --- a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml +++ b/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml @@ -44,7 +44,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/smbios.xml b/tests/qemuxml2xmloutdata/smbios.xml index 931c291d21..5385556b39 100644 --- a/tests/qemuxml2xmloutdata/smbios.xml +++ b/tests/qemuxml2xmloutdata/smbios.xml @@ -49,7 +49,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/smp.xml b/tests/qemuxml2xmloutdata/smp.xml index dedcc1b4a9..d3712cb7df 100644 --- a/tests/qemuxml2xmloutdata/smp.xml +++ b/tests/qemuxml2xmloutdata/smp.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/sound-device.xml b/tests/qemuxml2xmloutdata/sound-device.xml index cbf4d17918..62d658b9cd 100644 --- a/tests/qemuxml2xmloutdata/sound-device.xml +++ b/tests/qemuxml2xmloutdata/sound-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/sound.xml b/tests/qemuxml2xmloutdata/sound.xml index 6448c5e254..d1d208322b 100644 --- a/tests/qemuxml2xmloutdata/sound.xml +++ b/tests/qemuxml2xmloutdata/sound.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/usb-controller.xml b/tests/qemuxml2xmloutdata/usb-controller.xml index e2683b057a..2041803aad 100644 --- a/tests/qemuxml2xmloutdata/usb-controller.xml +++ b/tests/qemuxml2xmloutdata/usb-controller.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml b/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml index 23d3dedc0e..da6705fe54 100644 --- a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml +++ b/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0' model='ich9-ehci1'> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/> </controller> diff --git a/tests/qemuxml2xmloutdata/usb-none.xml b/tests/qemuxml2xmloutdata/usb-none.xml index fdc558428c..4ccaf8d1a0 100644 --- a/tests/qemuxml2xmloutdata/usb-none.xml +++ b/tests/qemuxml2xmloutdata/usb-none.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0' model='none'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2xmloutdata/usb-piix3-controller.xml b/tests/qemuxml2xmloutdata/usb-piix3-controller.xml index 2ed1fd0f21..903cf80e70 100644 --- a/tests/qemuxml2xmloutdata/usb-piix3-controller.xml +++ b/tests/qemuxml2xmloutdata/usb-piix3-controller.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/usb-port-missing.xml b/tests/qemuxml2xmloutdata/usb-port-missing.xml index 5f907b7345..74f88e6ac1 100644 --- a/tests/qemuxml2xmloutdata/usb-port-missing.xml +++ b/tests/qemuxml2xmloutdata/usb-port-missing.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml b/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml index d1d966bcf5..fb2bfd7ad7 100644 --- a/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml +++ b/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/usb-redir-filter.xml b/tests/qemuxml2xmloutdata/usb-redir-filter.xml index d78e7e5d41..56cfbac2bc 100644 --- a/tests/qemuxml2xmloutdata/usb-redir-filter.xml +++ b/tests/qemuxml2xmloutdata/usb-redir-filter.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0' model='ich9-ehci1'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x7'/> </controller> diff --git a/tests/qemuxml2xmloutdata/usb-redir.xml b/tests/qemuxml2xmloutdata/usb-redir.xml index 18dccb18c9..45c44721f4 100644 --- a/tests/qemuxml2xmloutdata/usb-redir.xml +++ b/tests/qemuxml2xmloutdata/usb-redir.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0' model='ich9-ehci1'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x7'/> </controller> diff --git a/tests/qemuxml2xmloutdata/video-none-device.xml b/tests/qemuxml2xmloutdata/video-none-device.xml index 82615f5125..06d088a94f 100644 --- a/tests/qemuxml2xmloutdata/video-none-device.xml +++ b/tests/qemuxml2xmloutdata/video-none-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/video-qxl-heads.xml b/tests/qemuxml2xmloutdata/video-qxl-heads.xml index 69c625bddc..0dd35c184b 100644 --- a/tests/qemuxml2xmloutdata/video-qxl-heads.xml +++ b/tests/qemuxml2xmloutdata/video-qxl-heads.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/video-qxl-noheads.xml b/tests/qemuxml2xmloutdata/video-qxl-noheads.xml index 6ba2817002..293ffe4743 100644 --- a/tests/qemuxml2xmloutdata/video-qxl-noheads.xml +++ b/tests/qemuxml2xmloutdata/video-qxl-noheads.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/video-qxl-resolution.xml b/tests/qemuxml2xmloutdata/video-qxl-resolution.xml index 1bc415f3f8..e693cbce47 100644 --- a/tests/qemuxml2xmloutdata/video-qxl-resolution.xml +++ b/tests/qemuxml2xmloutdata/video-qxl-resolution.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml index 307d226cda..17d826ba69 100644 --- a/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml +++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml index da03dd5da8..4e91b6152f 100644 --- a/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml +++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml index 720d362230..b570c535fd 100644 --- a/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml +++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml index d2e73302f3..c63c450385 100644 --- a/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml +++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml b/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml index fa83881ea3..9778dd3da9 100644 --- a/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml +++ b/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/virtio-input.xml b/tests/qemuxml2xmloutdata/virtio-input.xml index d853c15d76..a08d1f741c 100644 --- a/tests/qemuxml2xmloutdata/virtio-input.xml +++ b/tests/qemuxml2xmloutdata/virtio-input.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/virtio-rng-egd.xml b/tests/qemuxml2xmloutdata/virtio-rng-egd.xml index 5a790f0246..d7302d0ad9 100644 --- a/tests/qemuxml2xmloutdata/virtio-rng-egd.xml +++ b/tests/qemuxml2xmloutdata/virtio-rng-egd.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/virtio-rng-random.xml b/tests/qemuxml2xmloutdata/virtio-rng-random.xml index a06e489e72..959d79e6ee 100644 --- a/tests/qemuxml2xmloutdata/virtio-rng-random.xml +++ b/tests/qemuxml2xmloutdata/virtio-rng-random.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/vmcoreinfo.xml b/tests/qemuxml2xmloutdata/vmcoreinfo.xml index 48b75d7d44..ec0f9559dd 100644 --- a/tests/qemuxml2xmloutdata/vmcoreinfo.xml +++ b/tests/qemuxml2xmloutdata/vmcoreinfo.xml @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/watchdog.xml b/tests/qemuxml2xmloutdata/watchdog.xml index 22247b09eb..657ff5397f 100644 --- a/tests/qemuxml2xmloutdata/watchdog.xml +++ b/tests/qemuxml2xmloutdata/watchdog.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 3a21dfac71..594b462316 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -33,7 +33,7 @@ typedef enum { } QEMUBinType; static const char *QEMUBinList[] = { - "/usr/bin/qemu-system-i686", + "/usr/bin/qemu-system-i386", "/usr/bin/qemu-system-x86_64", "/usr/bin/qemu-system-aarch64", "/usr/bin/qemu-system-arm", diff --git a/tests/virsh-define-dev-segfault b/tests/virsh-define-dev-segfault index 06f548fda7..a7533ba9b0 100755 --- a/tests/virsh-define-dev-segfault +++ b/tests/virsh-define-dev-segfault @@ -31,7 +31,7 @@ cat <<\EOF > D.xml || fail=1 <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> + <emulator>/usr/bin/qemu-system-i386</emulator> <controller type='usb' index='0'/> <serial type='pty'> <target port='0'/> -- 2.23.0

2 1

[libvirt] CLZERO support for AMD
by Ani Sinha 03 Dec '19

03 Dec '19

Hi : I see a commit in qemu that adds support for CLZERO but in CPUIDs. : commit e900135dcfb676a4019dc206395e02db5d1de0d6 Author: Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> Date: Wed Sep 25 23:49:48 2019 +0200 i386: Add CPUID bit for CLZERO and XSAVEERPTR The CPUID bits CLZERO and XSAVEERPTR are availble on AMD's ZEN platform and could be passed to the guest. Signed-off-by: Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> Is there a corresponding change in libvirt adding this capability? Libvirt complains when I add it manually in the vm xml: # virsh create newvm.xml error: Failed to create domain from newvm.xml error: unsupported configuration: unknown CPU feature: clzero # grep clzero newvm.xml <feature policy='require' name='clzero'/> Should we add it? thanks ani

2 2

[libvirt] [PATCH] news: Fix XML validation
by Jim Fehlig 03 Dec '19

03 Dec '19

The news schema requires two digits for both month and day in the date attribute. s/2/02/ in the day value of date to fix the following 'make check' failure 2165) Checking ../docs/news.xml against ../news.rng ... libvirt: XML Util error : XML document failed to validate against schema: Unable to validate doc against /home/jfehlig/virt/upstream/libvirt/build/../docs/schemas/../news.rng Element release failed to validate attributes Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Pushing under the build-breaker rule. One could argue the schema could be relaxed, but let's fix the build first. docs/news.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/news.xml b/docs/news.xml index 55b227839e..46a3466238 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -42,7 +42,7 @@ --> <libvirt> - <release version="v5.10.0" date="2019-12-2"> + <release version="v5.10.0" date="2019-12-02"> <section title="New features"> <change> <summary> -- 2.24.0

3 2

[libvirt] [PATCH v2 0/2] Fix errors in valid range of scsi unit
by Han Han 03 Dec '19

03 Dec '19

v1: https://www.redhat.com/archives/libvir-list/2019-November/msg01451.html Han Han (2): conf: fix logic error for scsi units rng: Extend the valid range of drive unit docs/schemas/domaincommon.rng | 2 +- src/conf/domain_conf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.24.0.rc1

3 7

Jump to page: