[PATCH 03/24] qemuxml2argvdata: Replace 'qemu-system-i386' by 'qemu-system-x86_64' in most test files

Replace the emulator and architecture to x86_64, for all non-cpu related test cases. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/qemuxml2argvdata/440fx-ide-address-conflict.xml | 4 ++-- tests/qemuxml2argvdata/440fx-wrong-root.xml | 4 ++-- tests/qemuxml2argvdata/balloon-device-auto.args | 2 +- tests/qemuxml2argvdata/balloon-device-auto.xml | 4 ++-- tests/qemuxml2argvdata/balloon-device-deflate-off.args | 2 +- tests/qemuxml2argvdata/balloon-device-deflate-off.xml | 4 ++-- tests/qemuxml2argvdata/balloon-device-deflate.args | 2 +- tests/qemuxml2argvdata/balloon-device-deflate.xml | 4 ++-- tests/qemuxml2argvdata/balloon-device-period.args | 2 +- tests/qemuxml2argvdata/balloon-device-period.xml | 4 ++-- tests/qemuxml2argvdata/balloon-device.args | 2 +- tests/qemuxml2argvdata/balloon-device.xml | 4 ++-- tests/qemuxml2argvdata/blkiotune-device.args | 2 +- tests/qemuxml2argvdata/blkiotune-device.xml | 4 ++-- tests/qemuxml2argvdata/blkiotune.args | 2 +- tests/qemuxml2argvdata/blkiotune.xml | 4 ++-- tests/qemuxml2argvdata/channel-guestfwd.args | 2 +- tests/qemuxml2argvdata/channel-guestfwd.xml | 4 ++-- tests/qemuxml2argvdata/channel-spicevmc.args | 2 +- tests/qemuxml2argvdata/channel-spicevmc.xml | 4 ++-- tests/qemuxml2argvdata/channel-virtio-auto.args | 2 +- tests/qemuxml2argvdata/channel-virtio-auto.xml | 4 ++-- tests/qemuxml2argvdata/channel-virtio-autoadd.args | 2 +- tests/qemuxml2argvdata/channel-virtio-autoadd.xml | 4 ++-- tests/qemuxml2argvdata/channel-virtio-autoassign.args | 2 +- tests/qemuxml2argvdata/channel-virtio-autoassign.xml | 4 ++-- tests/qemuxml2argvdata/channel-virtio-default.args | 2 +- tests/qemuxml2argvdata/channel-virtio-default.xml | 4 ++-- tests/qemuxml2argvdata/channel-virtio-state.args | 2 +- tests/qemuxml2argvdata/channel-virtio-state.xml | 4 ++-- tests/qemuxml2argvdata/channel-virtio-unix.args | 2 +- tests/qemuxml2argvdata/channel-virtio-unix.xml | 4 ++-- tests/qemuxml2argvdata/channel-virtio.args | 2 +- tests/qemuxml2argvdata/channel-virtio.xml | 4 ++-- tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml | 4 ++-- tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml | 4 ++-- tests/qemuxml2argvdata/chardev-reconnect.args | 2 +- tests/qemuxml2argvdata/chardev-reconnect.xml | 4 ++-- tests/qemuxml2argvdata/clock-catchup.args | 2 +- tests/qemuxml2argvdata/clock-catchup.xml | 4 ++-- tests/qemuxml2argvdata/clock-france.args | 2 +- tests/qemuxml2argvdata/clock-france.xml | 4 ++-- tests/qemuxml2argvdata/clock-hpet-off.args | 2 +- tests/qemuxml2argvdata/clock-hpet-off.xml | 4 ++-- tests/qemuxml2argvdata/clock-localtime-basis-localtime.args | 2 +- tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml | 4 ++-- tests/qemuxml2argvdata/clock-localtime.args | 2 +- tests/qemuxml2argvdata/clock-localtime.xml | 4 ++-- tests/qemuxml2argvdata/clock-realtime.args | 2 +- tests/qemuxml2argvdata/clock-realtime.xml | 4 ++-- tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args | 4 ++-- tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml | 4 ++-- tests/qemuxml2argvdata/clock-utc.args | 2 +- tests/qemuxml2argvdata/clock-utc.xml | 4 ++-- tests/qemuxml2argvdata/clock-variable.args | 2 +- tests/qemuxml2argvdata/clock-variable.xml | 4 ++-- tests/qemuxml2argvdata/console-compat2.xml | 4 ++-- tests/qemuxml2argvdata/console-virtio-many.args | 2 +- tests/qemuxml2argvdata/console-virtio-many.xml | 4 ++-- tests/qemuxml2argvdata/console-virtio.args | 2 +- tests/qemuxml2argvdata/console-virtio.xml | 4 ++-- tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml | 4 ++-- tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml | 4 ++-- tests/qemuxml2argvdata/disk-active-commit.xml | 4 ++-- tests/qemuxml2argvdata/disk-mirror-old.xml | 4 ++-- tests/qemuxml2argvdata/disk-mirror.xml | 4 ++-- tests/qemuxml2argvdata/graphics-dbus-address.args | 2 +- tests/qemuxml2argvdata/graphics-dbus-address.xml | 4 ++-- tests/qemuxml2argvdata/graphics-dbus-audio.args | 2 +- tests/qemuxml2argvdata/graphics-dbus-audio.xml | 4 ++-- tests/qemuxml2argvdata/graphics-dbus-chardev.args | 2 +- tests/qemuxml2argvdata/graphics-dbus-chardev.xml | 4 ++-- tests/qemuxml2argvdata/graphics-dbus-p2p.args | 2 +- tests/qemuxml2argvdata/graphics-dbus-p2p.xml | 4 ++-- tests/qemuxml2argvdata/graphics-dbus-usbredir.args | 2 +- tests/qemuxml2argvdata/graphics-dbus-usbredir.xml | 4 ++-- tests/qemuxml2argvdata/graphics-dbus.args | 2 +- tests/qemuxml2argvdata/graphics-dbus.xml | 4 ++-- tests/qemuxml2argvdata/graphics-listen-network.xml | 4 ++-- tests/qemuxml2argvdata/graphics-listen-network2.xml | 4 ++-- tests/qemuxml2argvdata/graphics-sdl-fullscreen.args | 2 +- tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml | 4 ++-- tests/qemuxml2argvdata/graphics-sdl.args | 2 +- tests/qemuxml2argvdata/graphics-sdl.xml | 4 ++-- .../hostdev-mdev-display-missing-graphics.xml | 4 ++-- tests/qemuxml2argvdata/hostdev-mdev-display.xml | 4 ++-- tests/qemuxml2argvdata/hostdev-mdev-duplicate.xml | 4 ++-- .../qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml | 4 ++-- tests/qemuxml2argvdata/hostdev-mdev-precreated.args | 2 +- tests/qemuxml2argvdata/hostdev-mdev-precreated.xml | 4 ++-- tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml | 4 ++-- tests/qemuxml2argvdata/hostdev-pci-duplicate.xml | 4 ++-- tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml | 4 ++-- tests/qemuxml2argvdata/hostdev-scsi-duplicate.xml | 4 ++-- tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml | 4 ++-- tests/qemuxml2argvdata/hostdev-scsi-shareable.xml | 4 ++-- tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args | 2 +- tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml | 4 ++-- tests/qemuxml2argvdata/hostdev-usb-duplicate.xml | 4 ++-- tests/qemuxml2argvdata/hostdev-vfio-multidomain.args | 2 +- tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml | 4 ++-- tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml | 4 ++-- tests/qemuxml2argvdata/hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/hostdev-vfio.xml | 4 ++-- tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml | 4 ++-- tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml | 4 ++-- tests/qemuxml2argvdata/input-usbmouse-addr.args | 2 +- tests/qemuxml2argvdata/input-usbmouse-addr.xml | 4 ++-- tests/qemuxml2argvdata/input-usbmouse.args | 2 +- tests/qemuxml2argvdata/input-usbmouse.xml | 4 ++-- tests/qemuxml2argvdata/input-usbtablet.args | 2 +- tests/qemuxml2argvdata/input-usbtablet.xml | 4 ++-- tests/qemuxml2argvdata/kvm-features-off.args | 2 +- tests/qemuxml2argvdata/kvm-features-off.xml | 4 ++-- tests/qemuxml2argvdata/kvm-features.args | 2 +- tests/qemuxml2argvdata/kvm-features.xml | 4 ++-- tests/qemuxml2argvdata/kvm-pit-delay.args | 2 +- tests/qemuxml2argvdata/kvm-pit-delay.xml | 4 ++-- tests/qemuxml2argvdata/kvm-pit-discard.args | 2 +- tests/qemuxml2argvdata/kvm-pit-discard.xml | 4 ++-- tests/qemuxml2argvdata/kvmclock.args | 4 ++-- tests/qemuxml2argvdata/kvmclock.xml | 4 ++-- tests/qemuxml2argvdata/lease.xml | 4 ++-- tests/qemuxml2argvdata/machine-core-off.args | 2 +- tests/qemuxml2argvdata/machine-core-off.xml | 4 ++-- tests/qemuxml2argvdata/machine-core-on.args | 2 +- tests/qemuxml2argvdata/machine-core-on.xml | 4 ++-- tests/qemuxml2argvdata/machine-vmport-opt.args | 2 +- tests/qemuxml2argvdata/machine-vmport-opt.xml | 4 ++-- tests/qemuxml2argvdata/memory-align-fail.xml | 4 ++-- tests/qemuxml2argvdata/memory-hotplug-dimm.args | 2 +- tests/qemuxml2argvdata/memory-hotplug-dimm.xml | 4 ++-- tests/qemuxml2argvdata/memory-hotplug-nonuma.xml | 4 ++-- tests/qemuxml2argvdata/memory-hotplug.args | 2 +- tests/qemuxml2argvdata/memory-hotplug.xml | 4 ++-- tests/qemuxml2argvdata/memorybacking-set.xml | 4 ++-- tests/qemuxml2argvdata/memorybacking-unset.xml | 4 ++-- tests/qemuxml2argvdata/memtune-unlimited.args | 2 +- tests/qemuxml2argvdata/memtune-unlimited.xml | 4 ++-- tests/qemuxml2argvdata/memtune.args | 2 +- tests/qemuxml2argvdata/memtune.xml | 4 ++-- tests/qemuxml2argvdata/metadata-duplicate.xml | 4 ++-- tests/qemuxml2argvdata/metadata.xml | 4 ++-- tests/qemuxml2argvdata/migrate.args | 2 +- tests/qemuxml2argvdata/migrate.xml | 4 ++-- tests/qemuxml2argvdata/minimal-no-memory.xml | 4 ++-- tests/qemuxml2argvdata/minimal.args | 2 +- tests/qemuxml2argvdata/minimal.xml | 4 ++-- tests/qemuxml2argvdata/misc-acpi.args | 2 +- tests/qemuxml2argvdata/misc-acpi.xml | 4 ++-- tests/qemuxml2argvdata/misc-disable-s3.args | 2 +- tests/qemuxml2argvdata/misc-disable-s3.xml | 4 ++-- tests/qemuxml2argvdata/misc-disable-suspends.args | 2 +- tests/qemuxml2argvdata/misc-disable-suspends.xml | 4 ++-- tests/qemuxml2argvdata/misc-enable-s4.args | 2 +- tests/qemuxml2argvdata/misc-enable-s4.xml | 4 ++-- tests/qemuxml2argvdata/misc-uuid.args | 2 +- tests/qemuxml2argvdata/misc-uuid.xml | 4 ++-- tests/qemuxml2argvdata/monitor-json.args | 2 +- tests/qemuxml2argvdata/monitor-json.xml | 4 ++-- tests/qemuxml2argvdata/multifunction-pci-device.args | 2 +- tests/qemuxml2argvdata/multifunction-pci-device.xml | 4 ++-- tests/qemuxml2argvdata/net-client.args | 2 +- tests/qemuxml2argvdata/net-client.xml | 4 ++-- tests/qemuxml2argvdata/net-eth-hostip.args | 2 +- tests/qemuxml2argvdata/net-eth-hostip.xml | 4 ++-- tests/qemuxml2argvdata/net-eth-ifname.args | 2 +- tests/qemuxml2argvdata/net-eth-ifname.xml | 4 ++-- tests/qemuxml2argvdata/net-eth-names.args | 2 +- tests/qemuxml2argvdata/net-eth-names.xml | 4 ++-- tests/qemuxml2argvdata/net-eth-unmanaged-tap.args | 2 +- tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml | 4 ++-- tests/qemuxml2argvdata/net-eth.args | 2 +- tests/qemuxml2argvdata/net-eth.xml | 4 ++-- tests/qemuxml2argvdata/net-hostdev-bootorder.args | 2 +- tests/qemuxml2argvdata/net-hostdev-bootorder.xml | 4 ++-- tests/qemuxml2argvdata/net-hostdev-fail.xml | 4 ++-- tests/qemuxml2argvdata/net-hostdev-multidomain.args | 2 +- tests/qemuxml2argvdata/net-hostdev-multidomain.xml | 4 ++-- tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args | 2 +- tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml | 4 ++-- tests/qemuxml2argvdata/net-hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/net-hostdev-vfio.xml | 4 ++-- tests/qemuxml2argvdata/net-hostdev.args | 2 +- tests/qemuxml2argvdata/net-hostdev.xml | 4 ++-- tests/qemuxml2argvdata/net-mcast.args | 2 +- tests/qemuxml2argvdata/net-mcast.xml | 4 ++-- tests/qemuxml2argvdata/net-midonet.xml | 4 ++-- tests/qemuxml2argvdata/net-openvswitch.xml | 4 ++-- tests/qemuxml2argvdata/net-server.args | 2 +- tests/qemuxml2argvdata/net-server.xml | 4 ++-- tests/qemuxml2argvdata/net-udp.args | 2 +- tests/qemuxml2argvdata/net-udp.xml | 4 ++-- tests/qemuxml2argvdata/net-user-addr.args | 2 +- tests/qemuxml2argvdata/net-user-addr.xml | 4 ++-- tests/qemuxml2argvdata/net-vhostuser-fail.xml | 4 ++-- tests/qemuxml2argvdata/net-vhostuser-multiq.args | 2 +- tests/qemuxml2argvdata/net-vhostuser-multiq.xml | 4 ++-- tests/qemuxml2argvdata/net-virtio-device.args | 2 +- tests/qemuxml2argvdata/net-virtio-device.xml | 4 ++-- tests/qemuxml2argvdata/net-virtio-disable-offloads.args | 2 +- tests/qemuxml2argvdata/net-virtio-disable-offloads.xml | 4 ++-- tests/qemuxml2argvdata/net-virtio-netdev.args | 2 +- tests/qemuxml2argvdata/net-virtio-netdev.xml | 4 ++-- tests/qemuxml2argvdata/net-virtio-network-portgroup.xml | 4 ++-- .../qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml | 4 ++-- tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args | 2 +- tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml | 4 ++-- tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args | 2 +- tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml | 4 ++-- tests/qemuxml2argvdata/net-virtio-teaming-network.xml | 4 ++-- tests/qemuxml2argvdata/net-virtio-teaming.args | 2 +- tests/qemuxml2argvdata/net-virtio-teaming.xml | 4 ++-- tests/qemuxml2argvdata/net-virtio.args | 2 +- tests/qemuxml2argvdata/net-virtio.xml | 4 ++-- tests/qemuxml2argvdata/nosharepages.args | 2 +- tests/qemuxml2argvdata/nosharepages.xml | 4 ++-- tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args | 2 +- tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml | 4 ++-- .../numad-auto-memory-vcpu-no-cpuset-and-placement.args | 2 +- .../numad-auto-memory-vcpu-no-cpuset-and-placement.xml | 4 ++-- tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml | 4 ++-- .../numad-auto-vcpu-static-numatune-no-nodeset.xml | 4 ++-- tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args | 2 +- tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml | 4 ++-- tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args | 2 +- tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml | 4 ++-- tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml | 4 ++-- tests/qemuxml2argvdata/numad.args | 2 +- tests/qemuxml2argvdata/numad.xml | 4 ++-- tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args | 2 +- tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml | 4 ++-- tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml | 4 ++-- tests/qemuxml2argvdata/numatune-memory.args | 2 +- tests/qemuxml2argvdata/numatune-memory.xml | 4 ++-- .../numatune-static-nodeset-exceed-hostnode.xml | 4 ++-- tests/qemuxml2argvdata/pci-bus-invalid.xml | 4 ++-- tests/qemuxml2argvdata/pci-domain-invalid.xml | 4 ++-- tests/qemuxml2argvdata/pci-function-invalid.xml | 4 ++-- tests/qemuxml2argvdata/pci-rom.args | 2 +- tests/qemuxml2argvdata/pci-rom.xml | 4 ++-- tests/qemuxml2argvdata/pci-slot-invalid.xml | 4 ++-- tests/qemuxml2argvdata/pmu-feature-off.args | 4 ++-- tests/qemuxml2argvdata/pmu-feature-off.xml | 4 ++-- tests/qemuxml2argvdata/pmu-feature.args | 4 ++-- tests/qemuxml2argvdata/pmu-feature.xml | 4 ++-- tests/qemuxml2argvdata/qemu-ns-alt.args | 2 +- tests/qemuxml2argvdata/qemu-ns-alt.xml | 4 ++-- tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args | 2 +- tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml | 4 ++-- tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args | 2 +- tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml | 4 ++-- tests/qemuxml2argvdata/qemu-ns-commandline.args | 2 +- tests/qemuxml2argvdata/qemu-ns-commandline.xml | 4 ++-- tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args | 2 +- tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml | 4 ++-- tests/qemuxml2argvdata/qemu-ns-domain-commandline.args | 2 +- tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml | 4 ++-- tests/qemuxml2argvdata/qemu-ns-domain-ns0.args | 2 +- tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml | 4 ++-- tests/qemuxml2argvdata/qemu-ns-no-env.args | 2 +- tests/qemuxml2argvdata/qemu-ns-no-env.xml | 4 ++-- tests/qemuxml2argvdata/reboot-timeout-disabled.args | 2 +- tests/qemuxml2argvdata/reboot-timeout-disabled.xml | 4 ++-- tests/qemuxml2argvdata/reboot-timeout-enabled.args | 2 +- tests/qemuxml2argvdata/reboot-timeout-enabled.xml | 4 ++-- tests/qemuxml2argvdata/restore-v2-fd.args | 2 +- tests/qemuxml2argvdata/restore-v2-fd.xml | 4 ++-- tests/qemuxml2argvdata/restore-v2.args | 2 +- tests/qemuxml2argvdata/restore-v2.xml | 4 ++-- tests/qemuxml2argvdata/seclabel-dac-none.args | 2 +- tests/qemuxml2argvdata/seclabel-dac-none.xml | 4 ++-- tests/qemuxml2argvdata/seclabel-device-duplicates.xml | 4 ++-- tests/qemuxml2argvdata/seclabel-device-multiple.xml | 4 ++-- tests/qemuxml2argvdata/seclabel-device-relabel-invalid.xml | 4 ++-- tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml | 4 ++-- tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml | 4 ++-- tests/qemuxml2argvdata/seclabel-dynamic-none.xml | 4 ++-- tests/qemuxml2argvdata/seclabel-dynamic-override.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-override.xml | 4 ++-- tests/qemuxml2argvdata/seclabel-dynamic-relabel.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml | 4 ++-- tests/qemuxml2argvdata/seclabel-dynamic.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic.xml | 4 ++-- tests/qemuxml2argvdata/seclabel-multiple.xml | 4 ++-- tests/qemuxml2argvdata/seclabel-none.args | 2 +- tests/qemuxml2argvdata/seclabel-none.xml | 4 ++-- tests/qemuxml2argvdata/seclabel-static-labelskip.args | 2 +- tests/qemuxml2argvdata/seclabel-static-labelskip.xml | 4 ++-- tests/qemuxml2argvdata/seclabel-static-relabel.args | 2 +- tests/qemuxml2argvdata/seclabel-static-relabel.xml | 4 ++-- tests/qemuxml2argvdata/seclabel-static.args | 2 +- tests/qemuxml2argvdata/seclabel-static.xml | 4 ++-- tests/qemuxml2argvdata/serial-target-port-auto.xml | 4 ++-- tests/qemuxml2argvdata/shmem-invalid-address.xml | 4 ++-- tests/qemuxml2argvdata/shmem-invalid-size.xml | 4 ++-- tests/qemuxml2argvdata/shmem-msi-only.xml | 4 ++-- tests/qemuxml2argvdata/shmem-plain-doorbell.args | 2 +- tests/qemuxml2argvdata/shmem-plain-doorbell.xml | 4 ++-- tests/qemuxml2argvdata/shmem-small-size.xml | 4 ++-- tests/qemuxml2argvdata/shmem.args | 2 +- tests/qemuxml2argvdata/shmem.xml | 4 ++-- tests/qemuxml2argvdata/smartcard-controller.args | 2 +- tests/qemuxml2argvdata/smartcard-controller.xml | 4 ++-- .../smartcard-host-certificates-database.args | 2 +- .../qemuxml2argvdata/smartcard-host-certificates-database.xml | 4 ++-- tests/qemuxml2argvdata/smartcard-host-certificates.args | 2 +- tests/qemuxml2argvdata/smartcard-host-certificates.xml | 4 ++-- tests/qemuxml2argvdata/smartcard-host.args | 2 +- tests/qemuxml2argvdata/smartcard-host.xml | 4 ++-- tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args | 2 +- tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml | 4 ++-- tests/qemuxml2argvdata/smartcard-passthrough-tcp.args | 2 +- tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml | 4 ++-- tests/qemuxml2argvdata/smbios-date.xml | 4 ++-- tests/qemuxml2argvdata/smbios-multiple-type2.xml | 4 ++-- tests/qemuxml2argvdata/smbios-type-fwcfg.args | 2 +- tests/qemuxml2argvdata/smbios-type-fwcfg.xml | 4 ++-- tests/qemuxml2argvdata/smbios-uuid-match.xml | 4 ++-- tests/qemuxml2argvdata/smbios.args | 2 +- tests/qemuxml2argvdata/smbios.xml | 4 ++-- tests/qemuxml2argvdata/smp-dies.args | 2 +- tests/qemuxml2argvdata/smp-dies.xml | 4 ++-- tests/qemuxml2argvdata/smp.args | 2 +- tests/qemuxml2argvdata/smp.xml | 4 ++-- tests/qemuxml2argvdata/usb-bus-missing.xml | 4 ++-- tests/qemuxml2argvdata/usb-controller-xhci-limit.xml | 4 ++-- tests/qemuxml2argvdata/usb-controller-xhci.args | 2 +- tests/qemuxml2argvdata/usb-controller-xhci.xml | 4 ++-- tests/qemuxml2argvdata/usb-controller.args | 2 +- tests/qemuxml2argvdata/usb-controller.xml | 4 ++-- tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args | 2 +- tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml | 4 ++-- tests/qemuxml2argvdata/usb-hub-autoadd.args | 2 +- tests/qemuxml2argvdata/usb-hub-autoadd.xml | 4 ++-- tests/qemuxml2argvdata/usb-hub-conflict.xml | 4 ++-- tests/qemuxml2argvdata/usb-hub-nonexistent.xml | 4 ++-- tests/qemuxml2argvdata/usb-hub.args | 2 +- tests/qemuxml2argvdata/usb-hub.xml | 4 ++-- tests/qemuxml2argvdata/usb-ich9-autoassign.args | 2 +- tests/qemuxml2argvdata/usb-ich9-autoassign.xml | 4 ++-- tests/qemuxml2argvdata/usb-ich9-companion.args | 2 +- tests/qemuxml2argvdata/usb-ich9-companion.xml | 4 ++-- tests/qemuxml2argvdata/usb-ich9-ehci-addr.args | 2 +- tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml | 4 ++-- tests/qemuxml2argvdata/usb-ich9-no-companion.xml | 4 ++-- tests/qemuxml2argvdata/usb-long-port-path.args | 2 +- tests/qemuxml2argvdata/usb-long-port-path.xml | 4 ++-- tests/qemuxml2argvdata/usb-none-hub.xml | 4 ++-- tests/qemuxml2argvdata/usb-none-other.xml | 4 ++-- tests/qemuxml2argvdata/usb-none-usbtablet.xml | 4 ++-- tests/qemuxml2argvdata/usb-none.args | 2 +- tests/qemuxml2argvdata/usb-none.xml | 4 ++-- tests/qemuxml2argvdata/usb-piix3-controller.args | 2 +- tests/qemuxml2argvdata/usb-piix3-controller.xml | 4 ++-- tests/qemuxml2argvdata/usb-port-autoassign.args | 2 +- tests/qemuxml2argvdata/usb-port-autoassign.xml | 4 ++-- tests/qemuxml2argvdata/usb-port-missing.args | 2 +- tests/qemuxml2argvdata/usb-port-missing.xml | 4 ++-- tests/qemuxml2argvdata/usb-ports-out-of-range.xml | 4 ++-- tests/qemuxml2argvdata/usb-ports.args | 2 +- tests/qemuxml2argvdata/usb-ports.xml | 4 ++-- tests/qemuxml2argvdata/usb-redir-boot.args | 2 +- tests/qemuxml2argvdata/usb-redir-boot.xml | 4 ++-- tests/qemuxml2argvdata/usb-redir-filter-version.args | 2 +- tests/qemuxml2argvdata/usb-redir-filter-version.xml | 4 ++-- tests/qemuxml2argvdata/usb-redir-filter.args | 2 +- tests/qemuxml2argvdata/usb-redir-filter.xml | 4 ++-- tests/qemuxml2argvdata/usb-redir.args | 2 +- tests/qemuxml2argvdata/usb-redir.xml | 4 ++-- tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml | 4 ++-- tests/qemuxml2argvdata/usb-xhci-autoassign.args | 2 +- tests/qemuxml2argvdata/usb-xhci-autoassign.xml | 4 ++-- tests/qemuxml2argvdata/usb1-usb2.args | 2 +- tests/qemuxml2argvdata/usb1-usb2.xml | 4 ++-- tests/qemuxml2argvdata/video-invalid-multiple-devices.xml | 4 ++-- tests/qemuxml2argvdata/video-multiple-primaries.xml | 4 ++-- tests/qemuxml2argvdata/video-none-device.args | 2 +- tests/qemuxml2argvdata/video-none-device.xml | 4 ++-- tests/qemuxml2argvdata/video-qxl-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-qxl-device-vgamem.xml | 4 ++-- tests/qemuxml2argvdata/video-qxl-device.args | 2 +- tests/qemuxml2argvdata/video-qxl-device.xml | 4 ++-- tests/qemuxml2argvdata/video-qxl-heads.args | 2 +- tests/qemuxml2argvdata/video-qxl-heads.xml | 4 ++-- tests/qemuxml2argvdata/video-qxl-noheads.args | 2 +- tests/qemuxml2argvdata/video-qxl-noheads.xml | 4 ++-- tests/qemuxml2argvdata/video-qxl-resolution.args | 2 +- tests/qemuxml2argvdata/video-qxl-resolution.xml | 4 ++-- tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml | 4 ++-- tests/qemuxml2argvdata/video-qxl-sec-device.args | 2 +- tests/qemuxml2argvdata/video-qxl-sec-device.xml | 4 ++-- tests/qemuxml2argvdata/video-vga-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-vga-device-vgamem.xml | 4 ++-- tests/qemuxml2argvdata/video-vga-device.args | 2 +- tests/qemuxml2argvdata/video-vga-device.xml | 4 ++-- tests/qemuxml2argvdata/video-vga-qxl-heads.args | 2 +- tests/qemuxml2argvdata/video-vga-qxl-heads.xml | 4 ++-- tests/qemuxml2argvdata/video-virtio-gpu-device.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-device.xml | 4 ++-- tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml | 4 ++-- tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml | 4 ++-- tests/qemuxml2argvdata/video-virtio-gpu-virgl.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml | 4 ++-- tests/qemuxml2argvdata/video-virtio-vga.args | 2 +- tests/qemuxml2argvdata/video-virtio-vga.xml | 4 ++-- tests/qemuxml2argvdata/virtio-input-passthrough.args | 2 +- tests/qemuxml2argvdata/virtio-input-passthrough.xml | 4 ++-- tests/qemuxml2argvdata/virtio-input.args | 2 +- tests/qemuxml2argvdata/virtio-input.xml | 4 ++-- tests/qemuxml2argvdata/virtio-rng-default.args | 2 +- tests/qemuxml2argvdata/virtio-rng-default.xml | 4 ++-- tests/qemuxml2argvdata/virtio-rng-egd-crash.xml | 4 ++-- tests/qemuxml2argvdata/virtio-rng-egd.args | 2 +- tests/qemuxml2argvdata/virtio-rng-egd.xml | 4 ++-- tests/qemuxml2argvdata/virtio-rng-multiple.args | 2 +- tests/qemuxml2argvdata/virtio-rng-multiple.xml | 4 ++-- tests/qemuxml2argvdata/virtio-rng-random.args | 2 +- tests/qemuxml2argvdata/virtio-rng-random.xml | 4 ++-- tests/qemuxml2argvdata/vmcoreinfo.args | 2 +- tests/qemuxml2argvdata/vmcoreinfo.xml | 4 ++-- tests/qemuxml2xmloutdata/balloon-device-auto.xml | 4 ++-- tests/qemuxml2xmloutdata/balloon-device-period.xml | 4 ++-- tests/qemuxml2xmloutdata/blkiotune-device.xml | 4 ++-- tests/qemuxml2xmloutdata/blkiotune.xml | 4 ++-- tests/qemuxml2xmloutdata/channel-guestfwd.xml | 4 ++-- tests/qemuxml2xmloutdata/channel-virtio-auto.xml | 4 ++-- tests/qemuxml2xmloutdata/channel-virtio-state-active.xml | 4 ++-- tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml | 4 ++-- tests/qemuxml2xmloutdata/channel-virtio.xml | 4 ++-- tests/qemuxml2xmloutdata/clock-catchup.xml | 4 ++-- tests/qemuxml2xmloutdata/clock-localtime.xml | 4 ++-- tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml | 4 ++-- tests/qemuxml2xmloutdata/clock-utc.xml | 4 ++-- tests/qemuxml2xmloutdata/console-compat2.xml | 4 ++-- tests/qemuxml2xmloutdata/console-virtio-many.xml | 4 ++-- tests/qemuxml2xmloutdata/console-virtio.xml | 4 ++-- tests/qemuxml2xmloutdata/disk-active-commit-active.xml | 4 ++-- tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml | 4 ++-- tests/qemuxml2xmloutdata/disk-mirror-active.xml | 4 ++-- tests/qemuxml2xmloutdata/disk-mirror-inactive.xml | 4 ++-- tests/qemuxml2xmloutdata/disk-mirror-old-active.xml | 4 ++-- tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml | 4 ++-- tests/qemuxml2xmloutdata/graphics-listen-network.xml | 4 ++-- tests/qemuxml2xmloutdata/graphics-listen-network2.xml | 4 ++-- tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml | 4 ++-- tests/qemuxml2xmloutdata/graphics-sdl.xml | 4 ++-- tests/qemuxml2xmloutdata/hostdev-mdev-display.xml | 4 ++-- tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml | 4 ++-- tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml | 4 ++-- tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml | 4 ++-- tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml | 4 ++-- tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml | 4 ++-- tests/qemuxml2xmloutdata/hostdev-vfio.xml | 4 ++-- tests/qemuxml2xmloutdata/input-usbmouse.xml | 4 ++-- tests/qemuxml2xmloutdata/input-usbtablet.xml | 4 ++-- tests/qemuxml2xmloutdata/kvmclock.xml | 4 ++-- tests/qemuxml2xmloutdata/lease.xml | 4 ++-- tests/qemuxml2xmloutdata/machine-core-off.xml | 4 ++-- tests/qemuxml2xmloutdata/machine-core-on.xml | 4 ++-- tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml | 4 ++-- tests/qemuxml2xmloutdata/memory-hotplug.xml | 4 ++-- tests/qemuxml2xmloutdata/memorybacking-set.xml | 4 ++-- tests/qemuxml2xmloutdata/memorybacking-unset.xml | 4 ++-- tests/qemuxml2xmloutdata/memtune-unlimited.xml | 4 ++-- tests/qemuxml2xmloutdata/memtune.xml | 4 ++-- tests/qemuxml2xmloutdata/metadata-duplicate.xml | 4 ++-- tests/qemuxml2xmloutdata/metadata.xml | 4 ++-- tests/qemuxml2xmloutdata/migrate.xml | 4 ++-- tests/qemuxml2xmloutdata/minimal.xml | 4 ++-- tests/qemuxml2xmloutdata/misc-acpi.xml | 4 ++-- tests/qemuxml2xmloutdata/misc-disable-s3.xml | 4 ++-- tests/qemuxml2xmloutdata/misc-disable-suspends.xml | 4 ++-- tests/qemuxml2xmloutdata/misc-enable-s4.xml | 4 ++-- tests/qemuxml2xmloutdata/misc-uuid.xml | 4 ++-- tests/qemuxml2xmloutdata/net-eth-hostip.xml | 4 ++-- tests/qemuxml2xmloutdata/net-eth-ifname.xml | 4 ++-- tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml | 4 ++-- tests/qemuxml2xmloutdata/net-eth.xml | 4 ++-- tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml | 4 ++-- tests/qemuxml2xmloutdata/net-hostdev-vfio.xml | 4 ++-- tests/qemuxml2xmloutdata/net-hostdev.xml | 4 ++-- tests/qemuxml2xmloutdata/net-midonet.xml | 4 ++-- tests/qemuxml2xmloutdata/net-openvswitch.xml | 4 ++-- tests/qemuxml2xmloutdata/net-server.xml | 4 ++-- tests/qemuxml2xmloutdata/net-udp.xml | 4 ++-- tests/qemuxml2xmloutdata/net-virtio-device.xml | 4 ++-- tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml | 4 ++-- tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml | 4 ++-- tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml | 4 ++-- tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml | 4 ++-- tests/qemuxml2xmloutdata/net-virtio-teaming.xml | 4 ++-- tests/qemuxml2xmloutdata/net-virtio.xml | 4 ++-- tests/qemuxml2xmloutdata/nosharepages.xml | 4 ++-- tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml | 4 ++-- .../numad-auto-memory-vcpu-no-cpuset-and-placement.xml | 4 ++-- tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml | 4 ++-- tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml | 4 ++-- tests/qemuxml2xmloutdata/pci-rom.xml | 4 ++-- tests/qemuxml2xmloutdata/pmu-feature-off.xml | 4 ++-- tests/qemuxml2xmloutdata/pmu-feature.xml | 4 ++-- tests/qemuxml2xmloutdata/qemu-ns-no-env.xml | 4 ++-- tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml | 4 ++-- tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml | 4 ++-- tests/qemuxml2xmloutdata/restore-v2.xml | 4 ++-- tests/qemuxml2xmloutdata/seclabel-dac-none.xml | 4 ++-- tests/qemuxml2xmloutdata/seclabel-device-multiple.xml | 4 ++-- .../seclabel-dynamic-baselabel-inactive.xml | 4 ++-- .../seclabel-dynamic-labelskip-inactive.xml | 4 ++-- tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml | 4 ++-- .../qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml | 4 ++-- .../qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml | 4 ++-- tests/qemuxml2xmloutdata/seclabel-none.xml | 4 ++-- tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml | 4 ++-- .../qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml | 4 ++-- tests/qemuxml2xmloutdata/seclabel-static.xml | 4 ++-- tests/qemuxml2xmloutdata/serial-target-port-auto.xml | 4 ++-- tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml | 4 ++-- tests/qemuxml2xmloutdata/shmem.xml | 4 ++-- tests/qemuxml2xmloutdata/smartcard-controller.xml | 4 ++-- .../smartcard-host-certificates-database.xml | 4 ++-- tests/qemuxml2xmloutdata/smartcard-host-certificates.xml | 4 ++-- tests/qemuxml2xmloutdata/smartcard-host.xml | 4 ++-- tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml | 4 ++-- tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml | 4 ++-- tests/qemuxml2xmloutdata/smbios-multiple-type2.xml | 4 ++-- tests/qemuxml2xmloutdata/smbios.xml | 4 ++-- tests/qemuxml2xmloutdata/smp.xml | 4 ++-- tests/qemuxml2xmloutdata/usb-controller.xml | 4 ++-- tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml | 4 ++-- tests/qemuxml2xmloutdata/usb-none.xml | 4 ++-- tests/qemuxml2xmloutdata/usb-piix3-controller.xml | 4 ++-- tests/qemuxml2xmloutdata/usb-port-missing.xml | 4 ++-- tests/qemuxml2xmloutdata/usb-redir-filter-version.xml | 4 ++-- tests/qemuxml2xmloutdata/usb-redir-filter.xml | 4 ++-- tests/qemuxml2xmloutdata/usb-redir.xml | 4 ++-- tests/qemuxml2xmloutdata/video-none-device.xml | 4 ++-- tests/qemuxml2xmloutdata/video-qxl-heads.xml | 4 ++-- tests/qemuxml2xmloutdata/video-qxl-noheads.xml | 4 ++-- tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml | 4 ++-- tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml | 4 ++-- tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml | 4 ++-- tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml | 4 ++-- tests/qemuxml2xmloutdata/virtio-input-passthrough.xml | 4 ++-- tests/qemuxml2xmloutdata/virtio-input.xml | 4 ++-- tests/qemuxml2xmloutdata/virtio-rng-egd.xml | 4 ++-- tests/qemuxml2xmloutdata/virtio-rng-random.xml | 4 ++-- tests/qemuxml2xmloutdata/vmcoreinfo.xml | 4 ++-- 553 files changed, 935 insertions(+), 935 deletions(-) diff --git a/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml b/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml index b72a7b93e3..9fd38d4180 100644 --- a/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml +++ b/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml @@ -4,7 +4,7 @@ <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 3bd79311f4..803f28d569 100644 --- a/tests/qemuxml2argvdata/440fx-wrong-root.xml +++ b/tests/qemuxml2argvdata/440fx-wrong-root.xml @@ -9,7 +9,7 @@ <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f16464092e..5078429e1b 100644 --- a/tests/qemuxml2argvdata/balloon-device-auto.args +++ b/tests/qemuxml2argvdata/balloon-device-auto.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/balloon-device-auto.xml b/tests/qemuxml2argvdata/balloon-device-auto.xml index ddfc605bd4..e11a8c3a74 100644 --- a/tests/qemuxml2argvdata/balloon-device-auto.xml +++ b/tests/qemuxml2argvdata/balloon-device-auto.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 cdd928cea8..c1acd2f6b6 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.xml b/tests/qemuxml2argvdata/balloon-device-deflate-off.xml index ecf73abe05..00f6558b97 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate-off.xml +++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 88ef85351f..a5017e6657 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.xml b/tests/qemuxml2argvdata/balloon-device-deflate.xml index dc443bcea9..8619611552 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate.xml +++ b/tests/qemuxml2argvdata/balloon-device-deflate.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 dc8e9c2fe2..517d83feab 100644 --- a/tests/qemuxml2argvdata/balloon-device-period.args +++ b/tests/qemuxml2argvdata/balloon-device-period.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/balloon-device-period.xml b/tests/qemuxml2argvdata/balloon-device-period.xml index 8094e7a308..217ab99a7b 100644 --- a/tests/qemuxml2argvdata/balloon-device-period.xml +++ b/tests/qemuxml2argvdata/balloon-device-period.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 dc8e9c2fe2..517d83feab 100644 --- a/tests/qemuxml2argvdata/balloon-device.args +++ b/tests/qemuxml2argvdata/balloon-device.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/balloon-device.xml b/tests/qemuxml2argvdata/balloon-device.xml index 3c1c04a455..766cfd355d 100644 --- a/tests/qemuxml2argvdata/balloon-device.xml +++ b/tests/qemuxml2argvdata/balloon-device.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2argvdata/blkiotune-device.args index f16464092e..5078429e1b 100644 --- a/tests/qemuxml2argvdata/blkiotune-device.args +++ b/tests/qemuxml2argvdata/blkiotune-device.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/blkiotune-device.xml b/tests/qemuxml2argvdata/blkiotune-device.xml index 9fdc25b767..e2efaff468 100644 --- a/tests/qemuxml2argvdata/blkiotune-device.xml +++ b/tests/qemuxml2argvdata/blkiotune-device.xml @@ -24,7 +24,7 @@ </blkiotune> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -32,7 +32,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f16464092e..5078429e1b 100644 --- a/tests/qemuxml2argvdata/blkiotune.args +++ b/tests/qemuxml2argvdata/blkiotune.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/blkiotune.xml b/tests/qemuxml2argvdata/blkiotune.xml index 9c224f1035..1a887c8bf5 100644 --- a/tests/qemuxml2argvdata/blkiotune.xml +++ b/tests/qemuxml2argvdata/blkiotune.xml @@ -8,7 +8,7 @@ </blkiotune> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.args index 3c744dad44..bdd413d4bf 100644 --- a/tests/qemuxml2argvdata/channel-guestfwd.args +++ b/tests/qemuxml2argvdata/channel-guestfwd.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/channel-guestfwd.xml b/tests/qemuxml2argvdata/channel-guestfwd.xml index e463c2d970..62a3b8c36d 100644 --- a/tests/qemuxml2argvdata/channel-guestfwd.xml +++ b/tests/qemuxml2argvdata/channel-guestfwd.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 7365d77b98..da36b815b0 100644 --- a/tests/qemuxml2argvdata/channel-spicevmc.args +++ b/tests/qemuxml2argvdata/channel-spicevmc.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/channel-spicevmc.xml b/tests/qemuxml2argvdata/channel-spicevmc.xml index de5029f306..d34f3fc86b 100644 --- a/tests/qemuxml2argvdata/channel-spicevmc.xml +++ b/tests/qemuxml2argvdata/channel-spicevmc.xml @@ -4,7 +4,7 @@ <memory unit='KiB'>219136</memory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 434a686216..5bd8e2193c 100644 --- a/tests/qemuxml2argvdata/channel-virtio-auto.args +++ b/tests/qemuxml2argvdata/channel-virtio-auto.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.xml b/tests/qemuxml2argvdata/channel-virtio-auto.xml index 080a9faf95..6fd4ae63df 100644 --- a/tests/qemuxml2argvdata/channel-virtio-auto.xml +++ b/tests/qemuxml2argvdata/channel-virtio-auto.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 6ff23fdcf7..df6657f587 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.xml b/tests/qemuxml2argvdata/channel-virtio-autoadd.xml index 2daec88dc9..644dcdd82a 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoadd.xml +++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 89cc541683..b952025101 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.xml b/tests/qemuxml2argvdata/channel-virtio-autoassign.xml index 45402468c8..ed26da0188 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoassign.xml +++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 3a1b3bb0f0..5ff502848d 100644 --- a/tests/qemuxml2argvdata/channel-virtio-default.args +++ b/tests/qemuxml2argvdata/channel-virtio-default.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/channel-virtio-default.xml b/tests/qemuxml2argvdata/channel-virtio-default.xml index 28d0b218f8..bc093113b0 100644 --- a/tests/qemuxml2argvdata/channel-virtio-default.xml +++ b/tests/qemuxml2argvdata/channel-virtio-default.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 23642de1cd..6d20f431cb 100644 --- a/tests/qemuxml2argvdata/channel-virtio-state.args +++ b/tests/qemuxml2argvdata/channel-virtio-state.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/channel-virtio-state.xml b/tests/qemuxml2argvdata/channel-virtio-state.xml index 006ba1d048..9b1a014691 100644 --- a/tests/qemuxml2argvdata/channel-virtio-state.xml +++ b/tests/qemuxml2argvdata/channel-virtio-state.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 7627b530fa..6e42dc9f41 100644 --- a/tests/qemuxml2argvdata/channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/channel-virtio-unix.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.xml b/tests/qemuxml2argvdata/channel-virtio-unix.xml index 46a9286da2..505b8b158b 100644 --- a/tests/qemuxml2argvdata/channel-virtio-unix.xml +++ b/tests/qemuxml2argvdata/channel-virtio-unix.xml @@ -4,7 +4,7 @@ <memory unit='KiB'>219136</memory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -12,7 +12,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 7cf82b7941..423c27eb42 100644 --- a/tests/qemuxml2argvdata/channel-virtio.args +++ b/tests/qemuxml2argvdata/channel-virtio.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/channel-virtio.xml b/tests/qemuxml2argvdata/channel-virtio.xml index 0bf7b04d50..a70e64017d 100644 --- a/tests/qemuxml2argvdata/channel-virtio.xml +++ b/tests/qemuxml2argvdata/channel-virtio.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 2466c65523..c58b32f235 100644 --- a/tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml +++ b/tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml @@ -4,11 +4,11 @@ <memory unit='KiB'>219136</memory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 d3308b4afe..55ad0cce76 100644 --- a/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml +++ b/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml @@ -4,11 +4,11 @@ <memory unit='KiB'>219136</memory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 5c9be9b00e..aae62b8f75 100644 --- a/tests/qemuxml2argvdata/chardev-reconnect.args +++ b/tests/qemuxml2argvdata/chardev-reconnect.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/chardev-reconnect.xml b/tests/qemuxml2argvdata/chardev-reconnect.xml index 2065fe1a03..7941c7b549 100644 --- a/tests/qemuxml2argvdata/chardev-reconnect.xml +++ b/tests/qemuxml2argvdata/chardev-reconnect.xml @@ -4,11 +4,11 @@ <memory unit='KiB'>219136</memory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 1c917fc91d..d7ec73ace2 100644 --- a/tests/qemuxml2argvdata/clock-catchup.args +++ b/tests/qemuxml2argvdata/clock-catchup.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/clock-catchup.xml b/tests/qemuxml2argvdata/clock-catchup.xml index 8c22afe1c8..0d02cf47f5 100644 --- a/tests/qemuxml2argvdata/clock-catchup.xml +++ b/tests/qemuxml2argvdata/clock-catchup.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'> @@ -23,7 +23,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 50cee14245..a5664b547d 100644 --- a/tests/qemuxml2argvdata/clock-france.args +++ b/tests/qemuxml2argvdata/clock-france.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ TZ=Europe/Paris \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/clock-france.xml b/tests/qemuxml2argvdata/clock-france.xml index be9231e92f..2775b79a91 100644 --- a/tests/qemuxml2argvdata/clock-france.xml +++ b/tests/qemuxml2argvdata/clock-france.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='timezone' timezone='Europe/Paris'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 ba9047a585..b5cb297e92 100644 --- a/tests/qemuxml2argvdata/clock-hpet-off.args +++ b/tests/qemuxml2argvdata/clock-hpet-off.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/clock-hpet-off.xml b/tests/qemuxml2argvdata/clock-hpet-off.xml index 4b573464f7..11bb4abd55 100644 --- a/tests/qemuxml2argvdata/clock-hpet-off.xml +++ b/tests/qemuxml2argvdata/clock-hpet-off.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'> @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 1c8c07c6a3..8fd8f42083 100644 --- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml index 9924f865c3..c81f006579 100644 --- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml +++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='variable' adjustment='3600' basis='localtime'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 58378cc2b8..daf503d3fd 100644 --- a/tests/qemuxml2argvdata/clock-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/clock-localtime.xml b/tests/qemuxml2argvdata/clock-localtime.xml index d5f848b9e7..2f68f6dd79 100644 --- a/tests/qemuxml2argvdata/clock-localtime.xml +++ b/tests/qemuxml2argvdata/clock-localtime.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='localtime'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/clock-realtime.args b/tests/qemuxml2argvdata/clock-realtime.args index 45690e5351..6e1339e4d1 100644 --- a/tests/qemuxml2argvdata/clock-realtime.args +++ b/tests/qemuxml2argvdata/clock-realtime.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/clock-realtime.xml b/tests/qemuxml2argvdata/clock-realtime.xml index 2fc6f3df9e..5539095638 100644 --- a/tests/qemuxml2argvdata/clock-realtime.xml +++ b/tests/qemuxml2argvdata/clock-realtime.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'> @@ -15,7 +15,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 0399fdc4a1..5a952a2cf6 100644 --- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args +++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args @@ -6,13 +6,13 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ --cpu qemu32,hv-time=on \ +-cpu qemu64,hv-time=on \ -m size=219136k \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml index 14400f5d7b..638b717519 100644 --- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml +++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>6</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='network'/> </os> <features> @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 c4d5239df5..2ebb6cb762 100644 --- a/tests/qemuxml2argvdata/clock-utc.args +++ b/tests/qemuxml2argvdata/clock-utc.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/clock-utc.xml b/tests/qemuxml2argvdata/clock-utc.xml index 7e26f2ed52..6cfcb6b194 100644 --- a/tests/qemuxml2argvdata/clock-utc.xml +++ b/tests/qemuxml2argvdata/clock-utc.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 aa815b052b..ed42be8dd0 100644 --- a/tests/qemuxml2argvdata/clock-variable.args +++ b/tests/qemuxml2argvdata/clock-variable.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/clock-variable.xml b/tests/qemuxml2argvdata/clock-variable.xml index 1cb936a712..b9f56d3f9b 100644 --- a/tests/qemuxml2argvdata/clock-variable.xml +++ b/tests/qemuxml2argvdata/clock-variable.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='variable' adjustment='123456' basis='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/console-compat2.xml b/tests/qemuxml2argvdata/console-compat2.xml index 16160dcc3b..900e345b1d 100644 --- a/tests/qemuxml2argvdata/console-compat2.xml +++ b/tests/qemuxml2argvdata/console-compat2.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 1f2ac43cde..bb67eec187 100644 --- a/tests/qemuxml2argvdata/console-virtio-many.args +++ b/tests/qemuxml2argvdata/console-virtio-many.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/console-virtio-many.xml b/tests/qemuxml2argvdata/console-virtio-many.xml index a455a39751..042c5383e1 100644 --- a/tests/qemuxml2argvdata/console-virtio-many.xml +++ b/tests/qemuxml2argvdata/console-virtio-many.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 90abc51ad1..2baa069c04 100644 --- a/tests/qemuxml2argvdata/console-virtio.args +++ b/tests/qemuxml2argvdata/console-virtio.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/console-virtio.xml b/tests/qemuxml2argvdata/console-virtio.xml index 77fd040b39..315f11f591 100644 --- a/tests/qemuxml2argvdata/console-virtio.xml +++ b/tests/qemuxml2argvdata/console-virtio.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 dd9a664939..60430c6d1d 100644 --- a/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml +++ b/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml @@ -17,7 +17,7 @@ <iothreadsched iothreads='2' scheduler='fifo' priority='1'/> </cputune> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -25,7 +25,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 4e07f17ad8..8af1223bf6 100644 --- a/tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml +++ b/tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml @@ -16,7 +16,7 @@ <vcpusched vcpus='1-2' scheduler='fifo' priority='1'/> </cputune> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 28e59dcd85..469a097c3a 100644 --- a/tests/qemuxml2argvdata/disk-active-commit.xml +++ b/tests/qemuxml2argvdata/disk-active-commit.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/tmp/HostVG/QEMUGuest1-snap'/> diff --git a/tests/qemuxml2argvdata/disk-mirror-old.xml b/tests/qemuxml2argvdata/disk-mirror-old.xml index 8aca54f05b..1bdd5fcadb 100644 --- a/tests/qemuxml2argvdata/disk-mirror-old.xml +++ b/tests/qemuxml2argvdata/disk-mirror-old.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 73886e99f4..2ea4c68d90 100644 --- a/tests/qemuxml2argvdata/disk-mirror.xml +++ b/tests/qemuxml2argvdata/disk-mirror.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <backingStore/> diff --git a/tests/qemuxml2argvdata/graphics-dbus-address.args b/tests/qemuxml2argvdata/graphics-dbus-address.args index e9fd771527..0dfdb37d0a 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-address.args +++ b/tests/qemuxml2argvdata/graphics-dbus-address.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/graphics-dbus-address.xml b/tests/qemuxml2argvdata/graphics-dbus-address.xml index 1e8526b274..18e8e71701 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-address.xml +++ b/tests/qemuxml2argvdata/graphics-dbus-address.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2argvdata/graphics-dbus-audio.args b/tests/qemuxml2argvdata/graphics-dbus-audio.args index 9e07c26134..8cb0e6718c 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-audio.args +++ b/tests/qemuxml2argvdata/graphics-dbus-audio.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/graphics-dbus-audio.xml b/tests/qemuxml2argvdata/graphics-dbus-audio.xml index b1304e3f6f..b257370187 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-audio.xml +++ b/tests/qemuxml2argvdata/graphics-dbus-audio.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/graphics-dbus-chardev.args b/tests/qemuxml2argvdata/graphics-dbus-chardev.args index dac48ae5cd..d8ddc54b99 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-chardev.args +++ b/tests/qemuxml2argvdata/graphics-dbus-chardev.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/graphics-dbus-chardev.xml b/tests/qemuxml2argvdata/graphics-dbus-chardev.xml index d2ca208bd9..76f4b406db 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-chardev.xml +++ b/tests/qemuxml2argvdata/graphics-dbus-chardev.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2argvdata/graphics-dbus-p2p.args b/tests/qemuxml2argvdata/graphics-dbus-p2p.args index 3a41f089d5..d2b335aa28 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-p2p.args +++ b/tests/qemuxml2argvdata/graphics-dbus-p2p.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/graphics-dbus-p2p.xml b/tests/qemuxml2argvdata/graphics-dbus-p2p.xml index a99e695471..8d54d042b0 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-p2p.xml +++ b/tests/qemuxml2argvdata/graphics-dbus-p2p.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2argvdata/graphics-dbus-usbredir.args b/tests/qemuxml2argvdata/graphics-dbus-usbredir.args index 9a480b978f..a42aca5305 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-usbredir.args +++ b/tests/qemuxml2argvdata/graphics-dbus-usbredir.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/graphics-dbus-usbredir.xml b/tests/qemuxml2argvdata/graphics-dbus-usbredir.xml index fad6cd8b5f..769b4db57d 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-usbredir.xml +++ b/tests/qemuxml2argvdata/graphics-dbus-usbredir.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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-dbus.args b/tests/qemuxml2argvdata/graphics-dbus.args index a6cae8b8d8..56d926a0eb 100644 --- a/tests/qemuxml2argvdata/graphics-dbus.args +++ b/tests/qemuxml2argvdata/graphics-dbus.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/graphics-dbus.xml b/tests/qemuxml2argvdata/graphics-dbus.xml index be8442b3cd..8dec42cde7 100644 --- a/tests/qemuxml2argvdata/graphics-dbus.xml +++ b/tests/qemuxml2argvdata/graphics-dbus.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2argvdata/graphics-listen-network.xml b/tests/qemuxml2argvdata/graphics-listen-network.xml index f96fb01200..f1ab81ca0b 100644 --- a/tests/qemuxml2argvdata/graphics-listen-network.xml +++ b/tests/qemuxml2argvdata/graphics-listen-network.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 ede047ac38..c65314c658 100644 --- a/tests/qemuxml2argvdata/graphics-listen-network2.xml +++ b/tests/qemuxml2argvdata/graphics-listen-network2.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args index a4718718d0..96ab12917e 100644 --- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args +++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args @@ -8,7 +8,7 @@ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ XAUTHORITY=/root/.Xauthority \ DISPLAY=:0.1 \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml index 4c006e171b..f26f5d3ac7 100644 --- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml +++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 9cdaf2a652..c7d20d3e1f 100644 --- a/tests/qemuxml2argvdata/graphics-sdl.args +++ b/tests/qemuxml2argvdata/graphics-sdl.args @@ -8,7 +8,7 @@ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ XAUTHORITY=/root/.Xauthority \ DISPLAY=:0.1 \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/graphics-sdl.xml b/tests/qemuxml2argvdata/graphics-sdl.xml index 79947b715c..c7ea1bcb74 100644 --- a/tests/qemuxml2argvdata/graphics-sdl.xml +++ b/tests/qemuxml2argvdata/graphics-sdl.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 0a78309c99..527b1c45de 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 e24ca7dc90..14839bf412 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display.xml +++ b/tests/qemuxml2argvdata/hostdev-mdev-display.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <controller type='usb' index='0'> </controller> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/hostdev-mdev-duplicate.xml b/tests/qemuxml2argvdata/hostdev-mdev-duplicate.xml index 1c5e326381..604e6df9b7 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-duplicate.xml +++ b/tests/qemuxml2argvdata/hostdev-mdev-duplicate.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml b/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml index 2c899738e2..8fea6aa8f5 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml +++ b/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 c0133bff9d..2e49cff0e2 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest2,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.xml b/tests/qemuxml2argvdata/hostdev-mdev-precreated.xml index 4b198c29a6..d37b770797 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.xml +++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 81740baa00..031ea31a02 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml +++ b/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <controller type='usb' index='0'> </controller> <controller type='pci' index='0' model='pci-root'/> diff --git a/tests/qemuxml2argvdata/hostdev-pci-duplicate.xml b/tests/qemuxml2argvdata/hostdev-pci-duplicate.xml index c744fddf9f..94de97603b 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-duplicate.xml +++ b/tests/qemuxml2argvdata/hostdev-pci-duplicate.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 22eb515cbb..aa06b8d5fd 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-scsi-duplicate.xml b/tests/qemuxml2argvdata/hostdev-scsi-duplicate.xml index ea367de386..6d9b451e37 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-duplicate.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-duplicate.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 046563211e..13469ca320 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 991f75fb26..45ef214251 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-shareable.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-shareable.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 ebf1484ee0..5f8197e7ed 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest2,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml index 6e2f3da5c1..e1eec4ef25 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hostdev-usb-duplicate.xml b/tests/qemuxml2argvdata/hostdev-usb-duplicate.xml index 533a905902..34c2dc81c5 100644 --- a/tests/qemuxml2argvdata/hostdev-usb-duplicate.xml +++ b/tests/qemuxml2argvdata/hostdev-usb-duplicate.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 abcc42989e..ac9db13ab5 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest2,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml index e894e1577f..b720883913 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml +++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 521ebcf802..a9a5afd6dd 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 7741f637c6..9872d77f17 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio.args +++ b/tests/qemuxml2argvdata/hostdev-vfio.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest2,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio.xml b/tests/qemuxml2argvdata/hostdev-vfio.xml index e32ee972ba..1b438a2eef 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio.xml +++ b/tests/qemuxml2argvdata/hostdev-vfio.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml b/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml index 49cd2c827a..e5a8046ead 100644 --- a/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml +++ b/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml @@ -11,7 +11,7 @@ </memoryBacking> <vcpu placement='static'>2</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml b/tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml index ddd4a6df92..2136528267 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml +++ b/tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml @@ -15,7 +15,7 @@ <memnode cellid='3' mode='strict' nodeset='3'/> </numatune> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -31,7 +31,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxml2argvdata/input-usbmouse-addr.args index 605d88223c..06d31b4605 100644 --- a/tests/qemuxml2argvdata/input-usbmouse-addr.args +++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.xml b/tests/qemuxml2argvdata/input-usbmouse-addr.xml index 2e6cca6c51..31c943bd63 100644 --- a/tests/qemuxml2argvdata/input-usbmouse-addr.xml +++ b/tests/qemuxml2argvdata/input-usbmouse-addr.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 5e780f30d5..3b85615ce2 100644 --- a/tests/qemuxml2argvdata/input-usbmouse.args +++ b/tests/qemuxml2argvdata/input-usbmouse.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/input-usbmouse.xml b/tests/qemuxml2argvdata/input-usbmouse.xml index 533029f352..108ab0af24 100644 --- a/tests/qemuxml2argvdata/input-usbmouse.xml +++ b/tests/qemuxml2argvdata/input-usbmouse.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 1db1c47965..95ceafb413 100644 --- a/tests/qemuxml2argvdata/input-usbtablet.args +++ b/tests/qemuxml2argvdata/input-usbtablet.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/input-usbtablet.xml b/tests/qemuxml2argvdata/input-usbtablet.xml index 59ac2d35fb..5edfff1611 100644 --- a/tests/qemuxml2argvdata/input-usbtablet.xml +++ b/tests/qemuxml2argvdata/input-usbtablet.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 49d5e81ebe..61f5221adc 100644 --- a/tests/qemuxml2argvdata/kvm-features-off.args +++ b/tests/qemuxml2argvdata/kvm-features-off.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/kvm-features-off.xml b/tests/qemuxml2argvdata/kvm-features-off.xml index 7ee6525cd9..f22e75e8aa 100644 --- a/tests/qemuxml2argvdata/kvm-features-off.xml +++ b/tests/qemuxml2argvdata/kvm-features-off.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>6</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='network'/> </os> <features> @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2argvdata/kvm-features.args b/tests/qemuxml2argvdata/kvm-features.args index 9c8236c210..72ac9bc0ed 100644 --- a/tests/qemuxml2argvdata/kvm-features.args +++ b/tests/qemuxml2argvdata/kvm-features.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/kvm-features.xml b/tests/qemuxml2argvdata/kvm-features.xml index 8ce3a2b987..cd0f170ed3 100644 --- a/tests/qemuxml2argvdata/kvm-features.xml +++ b/tests/qemuxml2argvdata/kvm-features.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>6</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='network'/> </os> <features> @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argvdata/kvm-pit-delay.args index a2fa824303..f8234ba1cb 100644 --- a/tests/qemuxml2argvdata/kvm-pit-delay.args +++ b/tests/qemuxml2argvdata/kvm-pit-delay.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.xml b/tests/qemuxml2argvdata/kvm-pit-delay.xml index 3b5b6d05dd..c81a6ada73 100644 --- a/tests/qemuxml2argvdata/kvm-pit-delay.xml +++ b/tests/qemuxml2argvdata/kvm-pit-delay.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>2</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'> @@ -15,7 +15,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 c50b3351f9..b75f0945cc 100644 --- a/tests/qemuxml2argvdata/kvm-pit-discard.args +++ b/tests/qemuxml2argvdata/kvm-pit-discard.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.xml b/tests/qemuxml2argvdata/kvm-pit-discard.xml index 0af4b57106..b3832bc77f 100644 --- a/tests/qemuxml2argvdata/kvm-pit-discard.xml +++ b/tests/qemuxml2argvdata/kvm-pit-discard.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>2</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'> @@ -15,7 +15,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args index 6d7527252c..bd71be3ec0 100644 --- a/tests/qemuxml2argvdata/kvmclock.args +++ b/tests/qemuxml2argvdata/kvmclock.args @@ -6,13 +6,13 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=off,dump-guest-core=off \ -accel kvm \ --cpu qemu32,kvmclock=off \ +-cpu qemu64,kvmclock=off \ -m size=219136k \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/kvmclock.xml b/tests/qemuxml2argvdata/kvmclock.xml index 5d155e067f..7af64b4101 100644 --- a/tests/qemuxml2argvdata/kvmclock.xml +++ b/tests/qemuxml2argvdata/kvmclock.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>6</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='network'/> </os> <features> @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 d52b66b2f2..a4f1d9728d 100644 --- a/tests/qemuxml2argvdata/lease.xml +++ b/tests/qemuxml2argvdata/lease.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219200</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 c4d5239df5..2ebb6cb762 100644 --- a/tests/qemuxml2argvdata/machine-core-off.args +++ b/tests/qemuxml2argvdata/machine-core-off.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/machine-core-off.xml b/tests/qemuxml2argvdata/machine-core-off.xml index 36482550b6..dfffe8551f 100644 --- a/tests/qemuxml2argvdata/machine-core-off.xml +++ b/tests/qemuxml2argvdata/machine-core-off.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 218aee51dc..78dea552bf 100644 --- a/tests/qemuxml2argvdata/machine-core-on.args +++ b/tests/qemuxml2argvdata/machine-core-on.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/machine-core-on.xml b/tests/qemuxml2argvdata/machine-core-on.xml index 89396bb186..cd0754cc58 100644 --- a/tests/qemuxml2argvdata/machine-core-on.xml +++ b/tests/qemuxml2argvdata/machine-core-on.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 d9361967ba..88eb59d12e 100644 --- a/tests/qemuxml2argvdata/machine-vmport-opt.args +++ b/tests/qemuxml2argvdata/machine-vmport-opt.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.xml b/tests/qemuxml2argvdata/machine-vmport-opt.xml index 656e1d395f..13ec104477 100644 --- a/tests/qemuxml2argvdata/machine-vmport-opt.xml +++ b/tests/qemuxml2argvdata/machine-vmport-opt.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <features> @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/memory-align-fail.xml b/tests/qemuxml2argvdata/memory-align-fail.xml index 636f0e3d8e..bde9db9190 100644 --- a/tests/qemuxml2argvdata/memory-align-fail.xml +++ b/tests/qemuxml2argvdata/memory-align-fail.xml @@ -6,7 +6,7 @@ <currentMemory unit='KiB'>9007199254740991</currentMemory> <vcpu placement='static' cpuset='0-1'>2</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -20,7 +20,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.args index 5085035875..4e45bb059a 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.xml b/tests/qemuxml2argvdata/memory-hotplug-dimm.xml index 585e0a5f51..5b2f8cc0e4 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.xml @@ -6,7 +6,7 @@ <currentMemory unit='KiB'>1267710</currentMemory> <vcpu placement='static' cpuset='0-1'>2</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <idmap> @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 a441eb7b77..15c9937cfe 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nonuma.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nonuma.xml @@ -6,7 +6,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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.args b/tests/qemuxml2argvdata/memory-hotplug.args index a02da4662f..3bd7aaf9e5 100644 --- a/tests/qemuxml2argvdata/memory-hotplug.args +++ b/tests/qemuxml2argvdata/memory-hotplug.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/memory-hotplug.xml b/tests/qemuxml2argvdata/memory-hotplug.xml index 8d09856e95..b090febc4f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug.xml +++ b/tests/qemuxml2argvdata/memory-hotplug.xml @@ -6,7 +6,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static' cpuset='0-1'>2</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -20,7 +20,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 9bd4e72485..ec0b1f6ef5 100644 --- a/tests/qemuxml2argvdata/memorybacking-set.xml +++ b/tests/qemuxml2argvdata/memorybacking-set.xml @@ -10,7 +10,7 @@ </memoryBacking> <vcpu placement='static'>2</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/memorybacking-unset.xml b/tests/qemuxml2argvdata/memorybacking-unset.xml index c64c7397d0..816d11c10c 100644 --- a/tests/qemuxml2argvdata/memorybacking-unset.xml +++ b/tests/qemuxml2argvdata/memorybacking-unset.xml @@ -10,7 +10,7 @@ </memoryBacking> <vcpu placement='static'>2</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2argvdata/memtune-unlimited.args index f16464092e..5078429e1b 100644 --- a/tests/qemuxml2argvdata/memtune-unlimited.args +++ b/tests/qemuxml2argvdata/memtune-unlimited.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/memtune-unlimited.xml b/tests/qemuxml2argvdata/memtune-unlimited.xml index db67e409f0..3a85fc0c60 100644 --- a/tests/qemuxml2argvdata/memtune-unlimited.xml +++ b/tests/qemuxml2argvdata/memtune-unlimited.xml @@ -8,7 +8,7 @@ </memtune> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f16464092e..5078429e1b 100644 --- a/tests/qemuxml2argvdata/memtune.args +++ b/tests/qemuxml2argvdata/memtune.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/memtune.xml b/tests/qemuxml2argvdata/memtune.xml index 94a86a8070..46fef02de6 100644 --- a/tests/qemuxml2argvdata/memtune.xml +++ b/tests/qemuxml2argvdata/memtune.xml @@ -10,7 +10,7 @@ </memtune> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 fdf2110bc3..6971c40e74 100644 --- a/tests/qemuxml2argvdata/metadata-duplicate.xml +++ b/tests/qemuxml2argvdata/metadata-duplicate.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 18ab46899e..5fc10c1c85 100644 --- a/tests/qemuxml2argvdata/metadata.xml +++ b/tests/qemuxml2argvdata/metadata.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 0aa2f2a780..e46b190249 100644 --- a/tests/qemuxml2argvdata/migrate.args +++ b/tests/qemuxml2argvdata/migrate.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/migrate.xml b/tests/qemuxml2argvdata/migrate.xml index 7b4ea974eb..d14d45524e 100644 --- a/tests/qemuxml2argvdata/migrate.xml +++ b/tests/qemuxml2argvdata/migrate.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/minimal-no-memory.xml b/tests/qemuxml2argvdata/minimal-no-memory.xml index 8c6b5a71be..dfa2b6dd89 100644 --- a/tests/qemuxml2argvdata/minimal-no-memory.xml +++ b/tests/qemuxml2argvdata/minimal-no-memory.xml @@ -3,7 +3,7 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -11,7 +11,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f16464092e..5078429e1b 100644 --- a/tests/qemuxml2argvdata/minimal.args +++ b/tests/qemuxml2argvdata/minimal.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/minimal.xml b/tests/qemuxml2argvdata/minimal.xml index 8701906357..8854059ab1 100644 --- a/tests/qemuxml2argvdata/minimal.xml +++ b/tests/qemuxml2argvdata/minimal.xml @@ -10,7 +10,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 01b0c81f6f..12f2d4e6ae 100644 --- a/tests/qemuxml2argvdata/misc-acpi.args +++ b/tests/qemuxml2argvdata/misc-acpi.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/misc-acpi.xml b/tests/qemuxml2argvdata/misc-acpi.xml index 718847daee..59fbe471ff 100644 --- a/tests/qemuxml2argvdata/misc-acpi.xml +++ b/tests/qemuxml2argvdata/misc-acpi.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <features> @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 fcc5cd7795..d64b9f56ae 100644 --- a/tests/qemuxml2argvdata/misc-disable-s3.args +++ b/tests/qemuxml2argvdata/misc-disable-s3.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/misc-disable-s3.xml b/tests/qemuxml2argvdata/misc-disable-s3.xml index d65b72dbd4..13eb6e754a 100644 --- a/tests/qemuxml2argvdata/misc-disable-s3.xml +++ b/tests/qemuxml2argvdata/misc-disable-s3.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -16,7 +16,7 @@ <suspend-to-mem enabled='no'/> </pm> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 d1c3183dac..554620fe24 100644 --- a/tests/qemuxml2argvdata/misc-disable-suspends.args +++ b/tests/qemuxml2argvdata/misc-disable-suspends.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.xml b/tests/qemuxml2argvdata/misc-disable-suspends.xml index 3c51e3fb6e..4f259641be 100644 --- a/tests/qemuxml2argvdata/misc-disable-suspends.xml +++ b/tests/qemuxml2argvdata/misc-disable-suspends.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -17,7 +17,7 @@ <suspend-to-disk enabled='no'/> </pm> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 0af59b3260..0734635405 100644 --- a/tests/qemuxml2argvdata/misc-enable-s4.args +++ b/tests/qemuxml2argvdata/misc-enable-s4.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/misc-enable-s4.xml b/tests/qemuxml2argvdata/misc-enable-s4.xml index 62f32c2b02..0692a7a6b9 100644 --- a/tests/qemuxml2argvdata/misc-enable-s4.xml +++ b/tests/qemuxml2argvdata/misc-enable-s4.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -16,7 +16,7 @@ <suspend-to-disk enabled='yes'/> </pm> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 01b0c81f6f..12f2d4e6ae 100644 --- a/tests/qemuxml2argvdata/misc-uuid.args +++ b/tests/qemuxml2argvdata/misc-uuid.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/misc-uuid.xml b/tests/qemuxml2argvdata/misc-uuid.xml index 718847daee..59fbe471ff 100644 --- a/tests/qemuxml2argvdata/misc-uuid.xml +++ b/tests/qemuxml2argvdata/misc-uuid.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <features> @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/monitor-json.args b/tests/qemuxml2argvdata/monitor-json.args index 3fe4db5a94..817806f5a4 100644 --- a/tests/qemuxml2argvdata/monitor-json.args +++ b/tests/qemuxml2argvdata/monitor-json.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=encryptdisk,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-encryptdisk/master-key.aes \ diff --git a/tests/qemuxml2argvdata/monitor-json.xml b/tests/qemuxml2argvdata/monitor-json.xml index d3a630ab3e..d151884434 100644 --- a/tests/qemuxml2argvdata/monitor-json.xml +++ b/tests/qemuxml2argvdata/monitor-json.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 36c0353f19..40a25fbe7b 100644 --- a/tests/qemuxml2argvdata/multifunction-pci-device.args +++ b/tests/qemuxml2argvdata/multifunction-pci-device.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.xml b/tests/qemuxml2argvdata/multifunction-pci-device.xml index 806cfa44ae..a2e497939f 100644 --- a/tests/qemuxml2argvdata/multifunction-pci-device.xml +++ b/tests/qemuxml2argvdata/multifunction-pci-device.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='file' device='disk'> <source file='/tmp/scsidisk.img'/> <target dev='sda' bus='scsi'/> diff --git a/tests/qemuxml2argvdata/net-client.args b/tests/qemuxml2argvdata/net-client.args index ebefd3341a..3336e3fb53 100644 --- a/tests/qemuxml2argvdata/net-client.args +++ b/tests/qemuxml2argvdata/net-client.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-client.xml b/tests/qemuxml2argvdata/net-client.xml index d6a634338c..7c7805916e 100644 --- a/tests/qemuxml2argvdata/net-client.xml +++ b/tests/qemuxml2argvdata/net-client.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 05aab251e6..79dd75a39d 100644 --- a/tests/qemuxml2argvdata/net-eth-hostip.args +++ b/tests/qemuxml2argvdata/net-eth-hostip.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-eth-hostip.xml b/tests/qemuxml2argvdata/net-eth-hostip.xml index 2430941df8..16cfdabdb3 100644 --- a/tests/qemuxml2argvdata/net-eth-hostip.xml +++ b/tests/qemuxml2argvdata/net-eth-hostip.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 05aab251e6..79dd75a39d 100644 --- a/tests/qemuxml2argvdata/net-eth-ifname.args +++ b/tests/qemuxml2argvdata/net-eth-ifname.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-eth-ifname.xml b/tests/qemuxml2argvdata/net-eth-ifname.xml index 86a41c17d9..a27c82e45f 100644 --- a/tests/qemuxml2argvdata/net-eth-ifname.xml +++ b/tests/qemuxml2argvdata/net-eth-ifname.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 1a4a32cc7c..24c86a1308 100644 --- a/tests/qemuxml2argvdata/net-eth-names.args +++ b/tests/qemuxml2argvdata/net-eth-names.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-eth-names.xml b/tests/qemuxml2argvdata/net-eth-names.xml index 344cf9252d..dfd98bcf1e 100644 --- a/tests/qemuxml2argvdata/net-eth-names.xml +++ b/tests/qemuxml2argvdata/net-eth-names.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 6668a279db..5fc34bcd4d 100644 --- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args +++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml index 217b57ea0b..c86c13ad3e 100644 --- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml +++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 05aab251e6..79dd75a39d 100644 --- a/tests/qemuxml2argvdata/net-eth.args +++ b/tests/qemuxml2argvdata/net-eth.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-eth.xml b/tests/qemuxml2argvdata/net-eth.xml index 5fa415bb63..943325044e 100644 --- a/tests/qemuxml2argvdata/net-eth.xml +++ b/tests/qemuxml2argvdata/net-eth.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 9714cb899b..2e23f63a86 100644 --- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args +++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.xml b/tests/qemuxml2argvdata/net-hostdev-bootorder.xml index acf05ba164..cabfdbec9c 100644 --- a/tests/qemuxml2argvdata/net-hostdev-bootorder.xml +++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.xml @@ -5,14 +5,14 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 a2c9ee21e0..705faed508 100644 --- a/tests/qemuxml2argvdata/net-hostdev-fail.xml +++ b/tests/qemuxml2argvdata/net-hostdev-fail.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 60e19a2f0b..a08927b219 100644 --- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args +++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.xml b/tests/qemuxml2argvdata/net-hostdev-multidomain.xml index 8bb3022ce0..0989c79290 100644 --- a/tests/qemuxml2argvdata/net-hostdev-multidomain.xml +++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 de1a9dba44..c816221514 100644 --- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml index c247a15444..ae8c4e7e80 100644 --- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml +++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 6aad28d828..b0e3b64504 100644 --- a/tests/qemuxml2argvdata/net-hostdev-vfio.args +++ b/tests/qemuxml2argvdata/net-hostdev-vfio.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.xml b/tests/qemuxml2argvdata/net-hostdev-vfio.xml index 6f64229191..e6e6b6e5d3 100644 --- a/tests/qemuxml2argvdata/net-hostdev-vfio.xml +++ b/tests/qemuxml2argvdata/net-hostdev-vfio.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 8bf52c2b6f..ef4e7c872b 100644 --- a/tests/qemuxml2argvdata/net-hostdev.args +++ b/tests/qemuxml2argvdata/net-hostdev.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-hostdev.xml b/tests/qemuxml2argvdata/net-hostdev.xml index e60e615a82..bb94f7c7b8 100644 --- a/tests/qemuxml2argvdata/net-hostdev.xml +++ b/tests/qemuxml2argvdata/net-hostdev.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-mcast.args b/tests/qemuxml2argvdata/net-mcast.args index 1fbd375998..4f64e6ae23 100644 --- a/tests/qemuxml2argvdata/net-mcast.args +++ b/tests/qemuxml2argvdata/net-mcast.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-mcast.xml b/tests/qemuxml2argvdata/net-mcast.xml index a199162023..0d677df12e 100644 --- a/tests/qemuxml2argvdata/net-mcast.xml +++ b/tests/qemuxml2argvdata/net-mcast.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 2688b50236..fc539ee692 100644 --- a/tests/qemuxml2argvdata/net-midonet.xml +++ b/tests/qemuxml2argvdata/net-midonet.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 7d928b5f88..c8b64be4a0 100644 --- a/tests/qemuxml2argvdata/net-openvswitch.xml +++ b/tests/qemuxml2argvdata/net-openvswitch.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 fe3d03f5ef..43a6842b44 100644 --- a/tests/qemuxml2argvdata/net-server.args +++ b/tests/qemuxml2argvdata/net-server.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-server.xml b/tests/qemuxml2argvdata/net-server.xml index b2fa27ca93..5b17ab30b9 100644 --- a/tests/qemuxml2argvdata/net-server.xml +++ b/tests/qemuxml2argvdata/net-server.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 7a40bf070e..454ca9d75b 100644 --- a/tests/qemuxml2argvdata/net-udp.args +++ b/tests/qemuxml2argvdata/net-udp.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-udp.xml b/tests/qemuxml2argvdata/net-udp.xml index b00805d35b..911280ca17 100644 --- a/tests/qemuxml2argvdata/net-udp.xml +++ b/tests/qemuxml2argvdata/net-udp.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 fd6cc0ec59..a96e9fe3f1 100644 --- a/tests/qemuxml2argvdata/net-user-addr.args +++ b/tests/qemuxml2argvdata/net-user-addr.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-user-addr.xml b/tests/qemuxml2argvdata/net-user-addr.xml index 45e024d627..dd42c4451e 100644 --- a/tests/qemuxml2argvdata/net-user-addr.xml +++ b/tests/qemuxml2argvdata/net-user-addr.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 4050191a26..d50589af6f 100644 --- a/tests/qemuxml2argvdata/net-vhostuser-fail.xml +++ b/tests/qemuxml2argvdata/net-vhostuser-fail.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 2abd05a437..34f70166d2 100644 --- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args +++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.xml b/tests/qemuxml2argvdata/net-vhostuser-multiq.xml index 342d151d97..ed492ea41a 100644 --- a/tests/qemuxml2argvdata/net-vhostuser-multiq.xml +++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/net-virtio-device.args b/tests/qemuxml2argvdata/net-virtio-device.args index d9303a4d14..e6d9236470 100644 --- a/tests/qemuxml2argvdata/net-virtio-device.args +++ b/tests/qemuxml2argvdata/net-virtio-device.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-virtio-device.xml b/tests/qemuxml2argvdata/net-virtio-device.xml index c8bd8525eb..64d71b9164 100644 --- a/tests/qemuxml2argvdata/net-virtio-device.xml +++ b/tests/qemuxml2argvdata/net-virtio-device.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 3be0fa4625..d9f43a0142 100644 --- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args +++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.xml b/tests/qemuxml2argvdata/net-virtio-disable-offloads.xml index c8debd6ae4..ea1658ac9b 100644 --- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.xml +++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 fe5b7fb021..e0c876e239 100644 --- a/tests/qemuxml2argvdata/net-virtio-netdev.args +++ b/tests/qemuxml2argvdata/net-virtio-netdev.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.xml b/tests/qemuxml2argvdata/net-virtio-netdev.xml index f78ea5d64e..914476b9ad 100644 --- a/tests/qemuxml2argvdata/net-virtio-netdev.xml +++ b/tests/qemuxml2argvdata/net-virtio-netdev.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 47d35e8661..81b4aa8555 100644 --- a/tests/qemuxml2argvdata/net-virtio-network-portgroup.xml +++ b/tests/qemuxml2argvdata/net-virtio-network-portgroup.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 2214884a05..49b839976b 100644 --- a/tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml +++ b/tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 77837b74a4..cecbf674cc 100644 --- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args +++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml index 000af9830e..d9cdaa19d9 100644 --- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml +++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args index 72f9b42d35..3e0aaca8df 100644 --- a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args +++ b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml index ed1d4c8c05..46171ddf09 100644 --- a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml +++ b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-network.xml b/tests/qemuxml2argvdata/net-virtio-teaming-network.xml index edab52f3a1..04638cfeda 100644 --- a/tests/qemuxml2argvdata/net-virtio-teaming-network.xml +++ b/tests/qemuxml2argvdata/net-virtio-teaming-network.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.args b/tests/qemuxml2argvdata/net-virtio-teaming.args index 83e46ecbd1..15dae0e779 100644 --- a/tests/qemuxml2argvdata/net-virtio-teaming.args +++ b/tests/qemuxml2argvdata/net-virtio-teaming.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.xml b/tests/qemuxml2argvdata/net-virtio-teaming.xml index 830ce28524..a10e0c13f2 100644 --- a/tests/qemuxml2argvdata/net-virtio-teaming.xml +++ b/tests/qemuxml2argvdata/net-virtio-teaming.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 8ac6d7bc0b..064b7fffe9 100644 --- a/tests/qemuxml2argvdata/net-virtio.args +++ b/tests/qemuxml2argvdata/net-virtio.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/net-virtio.xml b/tests/qemuxml2argvdata/net-virtio.xml index 372c79d8de..2731c399cf 100644 --- a/tests/qemuxml2argvdata/net-virtio.xml +++ b/tests/qemuxml2argvdata/net-virtio.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 366973f7c5..a059b61da4 100644 --- a/tests/qemuxml2argvdata/nosharepages.args +++ b/tests/qemuxml2argvdata/nosharepages.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/nosharepages.xml b/tests/qemuxml2argvdata/nosharepages.xml index d2ab028715..78f20ec401 100644 --- a/tests/qemuxml2argvdata/nosharepages.xml +++ b/tests/qemuxml2argvdata/nosharepages.xml @@ -8,7 +8,7 @@ </memoryBacking> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 69f613e482..951de4194a 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml index 5758e65d09..b3a23763c4 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml @@ -8,7 +8,7 @@ <memory mode='interleave' placement='auto'/> </numatune> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 69f613e482..951de4194a 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 @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ 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 80314d05a3..d193543583 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 @@ -8,7 +8,7 @@ <memory mode='interleave' placement='auto'/> </numatune> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 0edf8ee46f..e06b353d25 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='auto'>2</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 517dd5dbd7..f53de51459 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml @@ -8,7 +8,7 @@ <memory mode='interleave' placement='static'/> </numatune> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 69f613e482..951de4194a 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml index a7f32b6802..7b0133720e 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml @@ -8,7 +8,7 @@ <memory mode='interleave' nodeset='0'/> </numatune> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 69f613e482..951de4194a 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml index 5758e65d09..b3a23763c4 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml @@ -8,7 +8,7 @@ <memory mode='interleave' placement='auto'/> </numatune> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 3237e7c7c5..e92966f455 100644 --- a/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml +++ b/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>2</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 69f613e482..951de4194a 100644 --- a/tests/qemuxml2argvdata/numad.args +++ b/tests/qemuxml2argvdata/numad.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/numad.xml b/tests/qemuxml2argvdata/numad.xml index ae995e2d6b..dc38889abf 100644 --- a/tests/qemuxml2argvdata/numad.xml +++ b/tests/qemuxml2argvdata/numad.xml @@ -8,7 +8,7 @@ <memory mode="interleave" placement='auto'/> </numatune> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 69f613e482..951de4194a 100644 --- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args +++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml index e6ca895b0d..dfc9473343 100644 --- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml +++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml @@ -8,7 +8,7 @@ <memory mode='preferred' placement='auto' nodeset="0-5,^4"/> </numatune> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 70e7b92f34..5dc72db833 100644 --- a/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml +++ b/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml @@ -8,7 +8,7 @@ <memory mode="strict" nodeset="0,^0"/> </numatune> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 69f613e482..951de4194a 100644 --- a/tests/qemuxml2argvdata/numatune-memory.args +++ b/tests/qemuxml2argvdata/numatune-memory.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/numatune-memory.xml b/tests/qemuxml2argvdata/numatune-memory.xml index 93ee70cc0b..ed86d5cf56 100644 --- a/tests/qemuxml2argvdata/numatune-memory.xml +++ b/tests/qemuxml2argvdata/numatune-memory.xml @@ -8,7 +8,7 @@ <memory mode="strict" nodeset="0-5,^4"/> </numatune> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 631d3bad38..647b607a28 100644 --- a/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.xml +++ b/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.xml @@ -9,7 +9,7 @@ <memnode cellid='1' mode='strict' nodeset='0'/> </numatune> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -23,7 +23,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 5884af6fc8..34bc2addb0 100644 --- a/tests/qemuxml2argvdata/pci-bus-invalid.xml +++ b/tests/qemuxml2argvdata/pci-bus-invalid.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 5884af6fc8..34bc2addb0 100644 --- a/tests/qemuxml2argvdata/pci-domain-invalid.xml +++ b/tests/qemuxml2argvdata/pci-domain-invalid.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 5642809ec0..23c9b6e4ac 100644 --- a/tests/qemuxml2argvdata/pci-function-invalid.xml +++ b/tests/qemuxml2argvdata/pci-function-invalid.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 2934cfcae6..886862eb98 100644 --- a/tests/qemuxml2argvdata/pci-rom.args +++ b/tests/qemuxml2argvdata/pci-rom.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest2,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes \ diff --git a/tests/qemuxml2argvdata/pci-rom.xml b/tests/qemuxml2argvdata/pci-rom.xml index 2e8ea4bde3..59581f60fa 100644 --- a/tests/qemuxml2argvdata/pci-rom.xml +++ b/tests/qemuxml2argvdata/pci-rom.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/pci-slot-invalid.xml b/tests/qemuxml2argvdata/pci-slot-invalid.xml index 0c4a2daef2..448ca47950 100644 --- a/tests/qemuxml2argvdata/pci-slot-invalid.xml +++ b/tests/qemuxml2argvdata/pci-slot-invalid.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 866d9b892f..4af05c4d9a 100644 --- a/tests/qemuxml2argvdata/pmu-feature-off.args +++ b/tests/qemuxml2argvdata/pmu-feature-off.args @@ -6,13 +6,13 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ --cpu qemu32,pmu=off \ +-cpu qemu64,pmu=off \ -m size=219136k \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pmu-feature-off.xml b/tests/qemuxml2argvdata/pmu-feature-off.xml index 17e1fec954..743083f290 100644 --- a/tests/qemuxml2argvdata/pmu-feature-off.xml +++ b/tests/qemuxml2argvdata/pmu-feature-off.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>6</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='network'/> </os> <features> @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 67b0c87540..26296caedb 100644 --- a/tests/qemuxml2argvdata/pmu-feature.args +++ b/tests/qemuxml2argvdata/pmu-feature.args @@ -6,13 +6,13 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ --cpu qemu32,pmu=on \ +-cpu qemu64,pmu=on \ -m size=219136k \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pmu-feature.xml b/tests/qemuxml2argvdata/pmu-feature.xml index a7f43392a4..ffd667990e 100644 --- a/tests/qemuxml2argvdata/pmu-feature.xml +++ b/tests/qemuxml2argvdata/pmu-feature.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>6</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='network'/> </os> <features> @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <memballoon model='none'/> diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvdata/qemu-ns-alt.args index dd495e83eb..0af708dfe0 100644 --- a/tests/qemuxml2argvdata/qemu-ns-alt.args +++ b/tests/qemuxml2argvdata/qemu-ns-alt.args @@ -8,7 +8,7 @@ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ NS=ns \ BAR='' \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.xml b/tests/qemuxml2argvdata/qemu-ns-alt.xml index 6b8b5ba36b..75424bcef3 100644 --- a/tests/qemuxml2argvdata/qemu-ns-alt.xml +++ b/tests/qemuxml2argvdata/qemu-ns-alt.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 81b146977b..1f4ef13cc3 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml index 9189927126..613ee56ea9 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 81b146977b..1f4ef13cc3 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml index e98d777309..1801102e31 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 81b146977b..1f4ef13cc3 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.xml b/tests/qemuxml2argvdata/qemu-ns-commandline.xml index 25f83acb12..6e8e32eee0 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline.xml +++ b/tests/qemuxml2argvdata/qemu-ns-commandline.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 81b146977b..1f4ef13cc3 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml index 9c25329b05..7b23a179cb 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 81b146977b..1f4ef13cc3 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml index 65a688fb78..250a479a81 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 81b146977b..1f4ef13cc3 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml index a5d3ec0b02..2f71f53ddb 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml +++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 b4505826d8..11a2a9b480 100644 --- a/tests/qemuxml2argvdata/qemu-ns-no-env.args +++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.xml b/tests/qemuxml2argvdata/qemu-ns-no-env.xml index 3dad42eead..d27b1ee92e 100644 --- a/tests/qemuxml2argvdata/qemu-ns-no-env.xml +++ b/tests/qemuxml2argvdata/qemu-ns-no-env.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args b/tests/qemuxml2argvdata/reboot-timeout-disabled.args index fd69ea14fc..9dfd4cad5c 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.xml b/tests/qemuxml2argvdata/reboot-timeout-disabled.xml index a815b4b274..e0876035fe 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-disabled.xml +++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>6</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='network'/> <bios rebootTimeout='-1'/> </os> @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f7ab6fb345..ce3712cdbc 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.xml b/tests/qemuxml2argvdata/reboot-timeout-enabled.xml index 4554f85323..74ded1ce21 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-enabled.xml +++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>6</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='network'/> <bios rebootTimeout='128'/> </os> @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 d00eb8542e..61c3521103 100644 --- a/tests/qemuxml2argvdata/restore-v2-fd.args +++ b/tests/qemuxml2argvdata/restore-v2-fd.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/restore-v2-fd.xml b/tests/qemuxml2argvdata/restore-v2-fd.xml index f56ba5a1e7..025578a089 100644 --- a/tests/qemuxml2argvdata/restore-v2-fd.xml +++ b/tests/qemuxml2argvdata/restore-v2-fd.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 eec598e1af..d6247264df 100644 --- a/tests/qemuxml2argvdata/restore-v2.args +++ b/tests/qemuxml2argvdata/restore-v2.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/restore-v2.xml b/tests/qemuxml2argvdata/restore-v2.xml index 7b4ea974eb..d14d45524e 100644 --- a/tests/qemuxml2argvdata/restore-v2.xml +++ b/tests/qemuxml2argvdata/restore-v2.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f16464092e..5078429e1b 100644 --- a/tests/qemuxml2argvdata/seclabel-dac-none.args +++ b/tests/qemuxml2argvdata/seclabel-dac-none.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.xml b/tests/qemuxml2argvdata/seclabel-dac-none.xml index cf1b1d557e..8a5ca7fc6b 100644 --- a/tests/qemuxml2argvdata/seclabel-dac-none.xml +++ b/tests/qemuxml2argvdata/seclabel-dac-none.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 100c67ce5f..3a0cb42e4d 100644 --- a/tests/qemuxml2argvdata/seclabel-device-duplicates.xml +++ b/tests/qemuxml2argvdata/seclabel-device-duplicates.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 cf3d3c04ee..94d1adcc01 100644 --- a/tests/qemuxml2argvdata/seclabel-device-multiple.xml +++ b/tests/qemuxml2argvdata/seclabel-device-multiple.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'> <seclabel model='selinux' relabel='yes'> diff --git a/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.xml b/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.xml index f5e2c418b6..5b924202c8 100644 --- a/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.xml +++ b/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'> <seclabel model='dac' relabel='no'/> diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args index f16464092e..5078429e1b 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml index cfebf7720d..27b776882c 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml +++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f16464092e..5078429e1b 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml index 11b52e2998..cdab31aeb7 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml +++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 ec75535c0e..c902c8e88e 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-none.xml +++ b/tests/qemuxml2argvdata/seclabel-dynamic-none.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 e20206ef0b..1f41c61f72 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.xml b/tests/qemuxml2argvdata/seclabel-dynamic-override.xml index 4946f2f0c0..255fc6bd11 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-override.xml +++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f16464092e..5078429e1b 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml index db97b92d06..26ee64aa3d 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml +++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f16464092e..5078429e1b 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.xml b/tests/qemuxml2argvdata/seclabel-dynamic.xml index f6586062da..1cde5a9ec6 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic.xml +++ b/tests/qemuxml2argvdata/seclabel-dynamic.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 9fe7bdd8df..fc349366ee 100644 --- a/tests/qemuxml2argvdata/seclabel-multiple.xml +++ b/tests/qemuxml2argvdata/seclabel-multiple.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f16464092e..5078429e1b 100644 --- a/tests/qemuxml2argvdata/seclabel-none.args +++ b/tests/qemuxml2argvdata/seclabel-none.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/seclabel-none.xml b/tests/qemuxml2argvdata/seclabel-none.xml index 03fc36443a..52b51239eb 100644 --- a/tests/qemuxml2argvdata/seclabel-none.xml +++ b/tests/qemuxml2argvdata/seclabel-none.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f16464092e..5078429e1b 100644 --- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.xml b/tests/qemuxml2argvdata/seclabel-static-labelskip.xml index 5d357acd66..d1971c8669 100644 --- a/tests/qemuxml2argvdata/seclabel-static-labelskip.xml +++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f16464092e..5078429e1b 100644 --- a/tests/qemuxml2argvdata/seclabel-static-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.xml b/tests/qemuxml2argvdata/seclabel-static-relabel.xml index dd8995bb28..b2d40ed314 100644 --- a/tests/qemuxml2argvdata/seclabel-static-relabel.xml +++ b/tests/qemuxml2argvdata/seclabel-static-relabel.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f16464092e..5078429e1b 100644 --- a/tests/qemuxml2argvdata/seclabel-static.args +++ b/tests/qemuxml2argvdata/seclabel-static.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/seclabel-static.xml b/tests/qemuxml2argvdata/seclabel-static.xml index a5d4c007e8..3448467378 100644 --- a/tests/qemuxml2argvdata/seclabel-static.xml +++ b/tests/qemuxml2argvdata/seclabel-static.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 9f9ba502b3..b430290e83 100644 --- a/tests/qemuxml2argvdata/serial-target-port-auto.xml +++ b/tests/qemuxml2argvdata/serial-target-port-auto.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 1eef5ed540..0ef64483ac 100644 --- a/tests/qemuxml2argvdata/shmem-invalid-address.xml +++ b/tests/qemuxml2argvdata/shmem-invalid-address.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 e9a383de21..ff37e5ad68 100644 --- a/tests/qemuxml2argvdata/shmem-invalid-size.xml +++ b/tests/qemuxml2argvdata/shmem-invalid-size.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 6c8025d63b..e23e27a107 100644 --- a/tests/qemuxml2argvdata/shmem-msi-only.xml +++ b/tests/qemuxml2argvdata/shmem-msi-only.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 0cda6eb716..aec63db1cf 100644 --- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args +++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.xml b/tests/qemuxml2argvdata/shmem-plain-doorbell.xml index 7c76e0fbba..d9c2a0868d 100644 --- a/tests/qemuxml2argvdata/shmem-plain-doorbell.xml +++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 7236f64577..257f3074c6 100644 --- a/tests/qemuxml2argvdata/shmem-small-size.xml +++ b/tests/qemuxml2argvdata/shmem-small-size.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 1c35a8b6de..1ca9a3354f 100644 --- a/tests/qemuxml2argvdata/shmem.args +++ b/tests/qemuxml2argvdata/shmem.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/shmem.xml b/tests/qemuxml2argvdata/shmem.xml index e09f6da780..b6dfe291df 100644 --- a/tests/qemuxml2argvdata/shmem.xml +++ b/tests/qemuxml2argvdata/shmem.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 8078935bd8..5127fd07d5 100644 --- a/tests/qemuxml2argvdata/smartcard-controller.args +++ b/tests/qemuxml2argvdata/smartcard-controller.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/smartcard-controller.xml b/tests/qemuxml2argvdata/smartcard-controller.xml index 31834ec4e8..7141ba352f 100644 --- a/tests/qemuxml2argvdata/smartcard-controller.xml +++ b/tests/qemuxml2argvdata/smartcard-controller.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 2609f5df94..4e7be2c3dc 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.xml b/tests/qemuxml2argvdata/smartcard-host-certificates-database.xml index 10d4521b98..6c02fd510e 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.xml +++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 ddde83064c..3e1c0d4267 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.xml b/tests/qemuxml2argvdata/smartcard-host-certificates.xml index 093cdb68c2..e8b93f0f2c 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates.xml +++ b/tests/qemuxml2argvdata/smartcard-host-certificates.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 8078935bd8..5127fd07d5 100644 --- a/tests/qemuxml2argvdata/smartcard-host.args +++ b/tests/qemuxml2argvdata/smartcard-host.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/smartcard-host.xml b/tests/qemuxml2argvdata/smartcard-host.xml index 4b3827fb80..20b3285c21 100644 --- a/tests/qemuxml2argvdata/smartcard-host.xml +++ b/tests/qemuxml2argvdata/smartcard-host.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 47a783326d..8f4da0c94b 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml index 76e0597a76..4c3e814799 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml +++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <smartcard mode='passthrough' type='spicevmc'/> <memballoon model='virtio'/> <graphics type='spice'/> diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args index b317e0a7d7..53074a41e8 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml index aeddc7d4a0..95fdd795b6 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml +++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 06b2e9f737..4a7a5ba649 100644 --- a/tests/qemuxml2argvdata/smbios-date.xml +++ b/tests/qemuxml2argvdata/smbios-date.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <smbios mode="sysinfo"/> </os> <sysinfo type="smbios"> @@ -18,6 +18,6 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> </devices> </domain> diff --git a/tests/qemuxml2argvdata/smbios-multiple-type2.xml b/tests/qemuxml2argvdata/smbios-multiple-type2.xml index 9e79ff21be..275f7631b3 100644 --- a/tests/qemuxml2argvdata/smbios-multiple-type2.xml +++ b/tests/qemuxml2argvdata/smbios-multiple-type2.xml @@ -35,7 +35,7 @@ </baseBoard> </sysinfo> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> <smbios mode='sysinfo'/> </os> @@ -44,7 +44,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.args b/tests/qemuxml2argvdata/smbios-type-fwcfg.args index 2e8e4c8be1..160f79adfa 100644 --- a/tests/qemuxml2argvdata/smbios-type-fwcfg.args +++ b/tests/qemuxml2argvdata/smbios-type-fwcfg.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.xml b/tests/qemuxml2argvdata/smbios-type-fwcfg.xml index dcec9d2e0d..a0864ad2e1 100644 --- a/tests/qemuxml2argvdata/smbios-type-fwcfg.xml +++ b/tests/qemuxml2argvdata/smbios-type-fwcfg.xml @@ -31,7 +31,7 @@ <entry name='opt/com.coreos/config' file='/tmp/provision.ign'/> </sysinfo> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> <smbios mode='sysinfo'/> </os> @@ -40,7 +40,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/smbios-uuid-match.xml b/tests/qemuxml2argvdata/smbios-uuid-match.xml index e424a109e5..9a18207483 100644 --- a/tests/qemuxml2argvdata/smbios-uuid-match.xml +++ b/tests/qemuxml2argvdata/smbios-uuid-match.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <smbios mode="sysinfo"/> </os> <sysinfo type="smbios"> @@ -18,6 +18,6 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> </devices> </domain> diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args index bbdd66b28f..54c7c361be 100644 --- a/tests/qemuxml2argvdata/smbios.args +++ b/tests/qemuxml2argvdata/smbios.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/smbios.xml b/tests/qemuxml2argvdata/smbios.xml index 9f67376449..b599ae83fb 100644 --- a/tests/qemuxml2argvdata/smbios.xml +++ b/tests/qemuxml2argvdata/smbios.xml @@ -40,7 +40,7 @@ </oemStrings> </sysinfo> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> <smbios mode='sysinfo'/> </os> @@ -49,7 +49,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/smp-dies.args index 679e9785e6..1b73feb8a2 100644 --- a/tests/qemuxml2argvdata/smp-dies.args +++ b/tests/qemuxml2argvdata/smp-dies.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/smp-dies.xml b/tests/qemuxml2argvdata/smp-dies.xml index caadaef8b5..a29786c0c4 100644 --- a/tests/qemuxml2argvdata/smp-dies.xml +++ b/tests/qemuxml2argvdata/smp-dies.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static' current='1'>4</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args index 50bc8af175..1b090e9dbe 100644 --- a/tests/qemuxml2argvdata/smp.args +++ b/tests/qemuxml2argvdata/smp.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/smp.xml b/tests/qemuxml2argvdata/smp.xml index 6041506ed8..274aa37f1a 100644 --- a/tests/qemuxml2argvdata/smp.xml +++ b/tests/qemuxml2argvdata/smp.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static' current='1'>2</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 23bfdc4c8f..1726043817 100644 --- a/tests/qemuxml2argvdata/usb-bus-missing.xml +++ b/tests/qemuxml2argvdata/usb-bus-missing.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 1515afea78..08a04183b6 100644 --- a/tests/qemuxml2argvdata/usb-controller-xhci-limit.xml +++ b/tests/qemuxml2argvdata/usb-controller-xhci-limit.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 7f6cdbf348..ca0b40ff28 100644 --- a/tests/qemuxml2argvdata/usb-controller-xhci.args +++ b/tests/qemuxml2argvdata/usb-controller-xhci.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.xml b/tests/qemuxml2argvdata/usb-controller-xhci.xml index 2988b18051..5ee73c9bcf 100644 --- a/tests/qemuxml2argvdata/usb-controller-xhci.xml +++ b/tests/qemuxml2argvdata/usb-controller-xhci.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 a336a06261..4a49b33727 100644 --- a/tests/qemuxml2argvdata/usb-controller.args +++ b/tests/qemuxml2argvdata/usb-controller.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/usb-controller.xml b/tests/qemuxml2argvdata/usb-controller.xml index 7757a0719c..81149b73be 100644 --- a/tests/qemuxml2argvdata/usb-controller.xml +++ b/tests/qemuxml2argvdata/usb-controller.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 313d218ec0..c1ce4d5327 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml index abf2470998..4fa5b75e0f 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml +++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 dd7d1675c2..72a969ffff 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.xml b/tests/qemuxml2argvdata/usb-hub-autoadd.xml index 65dda5a407..91e78cf595 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd.xml +++ b/tests/qemuxml2argvdata/usb-hub-autoadd.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 85ec3c4cf1..5db2211676 100644 --- a/tests/qemuxml2argvdata/usb-hub-conflict.xml +++ b/tests/qemuxml2argvdata/usb-hub-conflict.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 7b2b17a678..8a3b9cc773 100644 --- a/tests/qemuxml2argvdata/usb-hub-nonexistent.xml +++ b/tests/qemuxml2argvdata/usb-hub-nonexistent.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 645e81de1d..df6912ecf8 100644 --- a/tests/qemuxml2argvdata/usb-hub.args +++ b/tests/qemuxml2argvdata/usb-hub.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/usb-hub.xml b/tests/qemuxml2argvdata/usb-hub.xml index e9e1fef964..66bf07f180 100644 --- a/tests/qemuxml2argvdata/usb-hub.xml +++ b/tests/qemuxml2argvdata/usb-hub.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 6b24fcb208..b30ef04710 100644 --- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args +++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.xml b/tests/qemuxml2argvdata/usb-ich9-autoassign.xml index 3090255821..eb670dce8b 100644 --- a/tests/qemuxml2argvdata/usb-ich9-autoassign.xml +++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 96041805f6..03c5a04492 100644 --- a/tests/qemuxml2argvdata/usb-ich9-companion.args +++ b/tests/qemuxml2argvdata/usb-ich9-companion.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.xml b/tests/qemuxml2argvdata/usb-ich9-companion.xml index 7e31ec95d3..aa5fb12727 100644 --- a/tests/qemuxml2argvdata/usb-ich9-companion.xml +++ b/tests/qemuxml2argvdata/usb-ich9-companion.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 eb55883bd7..70b8cc7a3b 100644 --- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args +++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml index 4da9fbdf0e..e5b0cf9eb6 100644 --- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml +++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <!-- Intentionally mixed up ordering to check we assign addresses to the correct matching companions --> <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 8c34954a1a..fbd1bbeb24 100644 --- a/tests/qemuxml2argvdata/usb-ich9-no-companion.xml +++ b/tests/qemuxml2argvdata/usb-ich9-no-companion.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 5874a1ff49..210a82bc9b 100644 --- a/tests/qemuxml2argvdata/usb-long-port-path.args +++ b/tests/qemuxml2argvdata/usb-long-port-path.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/usb-long-port-path.xml b/tests/qemuxml2argvdata/usb-long-port-path.xml index 0df5c8408f..12c83204b3 100644 --- a/tests/qemuxml2argvdata/usb-long-port-path.xml +++ b/tests/qemuxml2argvdata/usb-long-port-path.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 7b6fd7d737..0f716e4e00 100644 --- a/tests/qemuxml2argvdata/usb-none-hub.xml +++ b/tests/qemuxml2argvdata/usb-none-hub.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f4e8a5e4de..0e73c1c8b6 100644 --- a/tests/qemuxml2argvdata/usb-none-other.xml +++ b/tests/qemuxml2argvdata/usb-none-other.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 36f33788dc..4f0848b441 100644 --- a/tests/qemuxml2argvdata/usb-none-usbtablet.xml +++ b/tests/qemuxml2argvdata/usb-none-usbtablet.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 2d39b29dbf..755b7fcace 100644 --- a/tests/qemuxml2argvdata/usb-none.args +++ b/tests/qemuxml2argvdata/usb-none.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/usb-none.xml b/tests/qemuxml2argvdata/usb-none.xml index 9d429dd845..a425e0e424 100644 --- a/tests/qemuxml2argvdata/usb-none.xml +++ b/tests/qemuxml2argvdata/usb-none.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 085a9a9007..fa2643e2fa 100644 --- a/tests/qemuxml2argvdata/usb-piix3-controller.args +++ b/tests/qemuxml2argvdata/usb-piix3-controller.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.xml b/tests/qemuxml2argvdata/usb-piix3-controller.xml index eafc97f7fe..4d685c696f 100644 --- a/tests/qemuxml2argvdata/usb-piix3-controller.xml +++ b/tests/qemuxml2argvdata/usb-piix3-controller.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 908025dada..2fbef8d060 100644 --- a/tests/qemuxml2argvdata/usb-port-autoassign.args +++ b/tests/qemuxml2argvdata/usb-port-autoassign.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.xml b/tests/qemuxml2argvdata/usb-port-autoassign.xml index 72a69d85f3..40c6c96b4b 100644 --- a/tests/qemuxml2argvdata/usb-port-autoassign.xml +++ b/tests/qemuxml2argvdata/usb-port-autoassign.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 fe268449ca..80713b27e4 100644 --- a/tests/qemuxml2argvdata/usb-port-missing.args +++ b/tests/qemuxml2argvdata/usb-port-missing.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/usb-port-missing.xml b/tests/qemuxml2argvdata/usb-port-missing.xml index 0d8906268f..c18bdb6758 100644 --- a/tests/qemuxml2argvdata/usb-port-missing.xml +++ b/tests/qemuxml2argvdata/usb-port-missing.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 3dd746114f..d00716885e 100644 --- a/tests/qemuxml2argvdata/usb-ports-out-of-range.xml +++ b/tests/qemuxml2argvdata/usb-ports-out-of-range.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 8119dd5400..e3e5cb73ca 100644 --- a/tests/qemuxml2argvdata/usb-ports.args +++ b/tests/qemuxml2argvdata/usb-ports.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/usb-ports.xml b/tests/qemuxml2argvdata/usb-ports.xml index 9eaf210368..6f55045edd 100644 --- a/tests/qemuxml2argvdata/usb-ports.xml +++ b/tests/qemuxml2argvdata/usb-ports.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f5f34eccca..150e3c5008 100644 --- a/tests/qemuxml2argvdata/usb-redir-boot.args +++ b/tests/qemuxml2argvdata/usb-redir-boot.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/usb-redir-boot.xml b/tests/qemuxml2argvdata/usb-redir-boot.xml index f6db55ca81..fe34b76a5f 100644 --- a/tests/qemuxml2argvdata/usb-redir-boot.xml +++ b/tests/qemuxml2argvdata/usb-redir-boot.xml @@ -5,14 +5,14 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 897886c83a..904c6f7842 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter-version.args +++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.xml b/tests/qemuxml2argvdata/usb-redir-filter-version.xml index 35a63d8438..fb0037af0d 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter-version.xml +++ b/tests/qemuxml2argvdata/usb-redir-filter-version.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 708e82417c..aba04c7485 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter.args +++ b/tests/qemuxml2argvdata/usb-redir-filter.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/usb-redir-filter.xml b/tests/qemuxml2argvdata/usb-redir-filter.xml index 30a1c1d7bb..04391381e7 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter.xml +++ b/tests/qemuxml2argvdata/usb-redir-filter.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 963db5bc87..2729c7d8d1 100644 --- a/tests/qemuxml2argvdata/usb-redir.args +++ b/tests/qemuxml2argvdata/usb-redir.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/usb-redir.xml b/tests/qemuxml2argvdata/usb-redir.xml index c0758e59fa..311fa65012 100644 --- a/tests/qemuxml2argvdata/usb-redir.xml +++ b/tests/qemuxml2argvdata/usb-redir.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 33c781a791..1261f0b2c2 100644 --- a/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml +++ b/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 8a52f6ebeb..3f7720237a 100644 --- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args +++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.xml b/tests/qemuxml2argvdata/usb-xhci-autoassign.xml index 55a40c4414..94cbbc2432 100644 --- a/tests/qemuxml2argvdata/usb-xhci-autoassign.xml +++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 c9881d3507..56d0c52e06 100644 --- a/tests/qemuxml2argvdata/usb1-usb2.args +++ b/tests/qemuxml2argvdata/usb1-usb2.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/usb1-usb2.xml b/tests/qemuxml2argvdata/usb1-usb2.xml index ed4622b03b..90bdc9ac3a 100644 --- a/tests/qemuxml2argvdata/usb1-usb2.xml +++ b/tests/qemuxml2argvdata/usb1-usb2.xml @@ -5,11 +5,11 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <memballoon model='virtio'/> <controller type='usb' index='0' model='piix3-uhci'> diff --git a/tests/qemuxml2argvdata/video-invalid-multiple-devices.xml b/tests/qemuxml2argvdata/video-invalid-multiple-devices.xml index 606c60dcea..953e826720 100644 --- a/tests/qemuxml2argvdata/video-invalid-multiple-devices.xml +++ b/tests/qemuxml2argvdata/video-invalid-multiple-devices.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/video-multiple-primaries.xml b/tests/qemuxml2argvdata/video-multiple-primaries.xml index 977227c5ff..dedfeeebc3 100644 --- a/tests/qemuxml2argvdata/video-multiple-primaries.xml +++ b/tests/qemuxml2argvdata/video-multiple-primaries.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>1048576</currentMemory> <vcpu>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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-none-device.args b/tests/qemuxml2argvdata/video-none-device.args index 8cd659c9ec..1ea72106d7 100644 --- a/tests/qemuxml2argvdata/video-none-device.args +++ b/tests/qemuxml2argvdata/video-none-device.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/video-none-device.xml b/tests/qemuxml2argvdata/video-none-device.xml index a7d4d7d3c4..82b33009a2 100644 --- a/tests/qemuxml2argvdata/video-none-device.xml +++ b/tests/qemuxml2argvdata/video-none-device.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 b6113e36be..62782829ab 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.xml b/tests/qemuxml2argvdata/video-qxl-device-vgamem.xml index d52fdf0fa0..5d0fa86708 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.xml +++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>1048576</currentMemory> <vcpu>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 e62f524b11..018aa11299 100644 --- a/tests/qemuxml2argvdata/video-qxl-device.args +++ b/tests/qemuxml2argvdata/video-qxl-device.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/video-qxl-device.xml b/tests/qemuxml2argvdata/video-qxl-device.xml index d52fdf0fa0..5d0fa86708 100644 --- a/tests/qemuxml2argvdata/video-qxl-device.xml +++ b/tests/qemuxml2argvdata/video-qxl-device.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>1048576</currentMemory> <vcpu>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 fc70ff0fd5..9c063e4ee6 100644 --- a/tests/qemuxml2argvdata/video-qxl-heads.args +++ b/tests/qemuxml2argvdata/video-qxl-heads.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/video-qxl-heads.xml b/tests/qemuxml2argvdata/video-qxl-heads.xml index 9601d671fb..8ce892d557 100644 --- a/tests/qemuxml2argvdata/video-qxl-heads.xml +++ b/tests/qemuxml2argvdata/video-qxl-heads.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.args b/tests/qemuxml2argvdata/video-qxl-noheads.args index 08272ecc30..7cec45cb49 100644 --- a/tests/qemuxml2argvdata/video-qxl-noheads.args +++ b/tests/qemuxml2argvdata/video-qxl-noheads.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.xml b/tests/qemuxml2argvdata/video-qxl-noheads.xml index f29d1284cd..80e5d25ff9 100644 --- a/tests/qemuxml2argvdata/video-qxl-noheads.xml +++ b/tests/qemuxml2argvdata/video-qxl-noheads.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 23501a435c..6343d15e6b 100644 --- a/tests/qemuxml2argvdata/video-qxl-resolution.args +++ b/tests/qemuxml2argvdata/video-qxl-resolution.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.xml b/tests/qemuxml2argvdata/video-qxl-resolution.xml index 020c2a3fe8..5715f9daa4 100644 --- a/tests/qemuxml2argvdata/video-qxl-resolution.xml +++ b/tests/qemuxml2argvdata/video-qxl-resolution.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 ac5af7c3ee..9c125f24e4 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml index 5b9427afd8..3db63d5476 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>1048576</currentMemory> <vcpu>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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.args b/tests/qemuxml2argvdata/video-qxl-sec-device.args index c835722ee8..bab9844498 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.xml b/tests/qemuxml2argvdata/video-qxl-sec-device.xml index 5b9427afd8..3db63d5476 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device.xml +++ b/tests/qemuxml2argvdata/video-qxl-sec-device.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>1048576</currentMemory> <vcpu>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 34bd93891b..92de05bf2c 100644 --- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.xml b/tests/qemuxml2argvdata/video-vga-device-vgamem.xml index 7e2080af0d..6731b4ae3c 100644 --- a/tests/qemuxml2argvdata/video-vga-device-vgamem.xml +++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>1048576</currentMemory> <vcpu>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 ef019414d2..8277171a78 100644 --- a/tests/qemuxml2argvdata/video-vga-device.args +++ b/tests/qemuxml2argvdata/video-vga-device.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/video-vga-device.xml b/tests/qemuxml2argvdata/video-vga-device.xml index 7e2080af0d..6731b4ae3c 100644 --- a/tests/qemuxml2argvdata/video-vga-device.xml +++ b/tests/qemuxml2argvdata/video-vga-device.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>1048576</currentMemory> <vcpu>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 fc70ff0fd5..9c063e4ee6 100644 --- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args +++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.xml b/tests/qemuxml2argvdata/video-vga-qxl-heads.xml index 9601d671fb..8ce892d557 100644 --- a/tests/qemuxml2argvdata/video-vga-qxl-heads.xml +++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 284c924e27..46aa2ebc30 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.xml b/tests/qemuxml2argvdata/video-virtio-gpu-device.xml index a9354d77a2..103ddd9894 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-device.xml +++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 e0a0a6627f..88ede23a04 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=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml index 9c46bfb4eb..6c9ebe89f4 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml +++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 c50b218e6d..dd02a3aea3 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml index 2c084224dd..ea63df9514 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml +++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 ad9d03bdce..c4b373e48b 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml index 97da27deed..3ece016546 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml +++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 71ee079100..2c9acd9422 100644 --- a/tests/qemuxml2argvdata/video-virtio-vga.args +++ b/tests/qemuxml2argvdata/video-virtio-vga.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/video-virtio-vga.xml b/tests/qemuxml2argvdata/video-virtio-vga.xml index a9354d77a2..103ddd9894 100644 --- a/tests/qemuxml2argvdata/video-virtio-vga.xml +++ b/tests/qemuxml2argvdata/video-virtio-vga.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 46915f9d37..ba4ba35f50 100644 --- a/tests/qemuxml2argvdata/virtio-input-passthrough.args +++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.xml b/tests/qemuxml2argvdata/virtio-input-passthrough.xml index da20214f18..d57d311749 100644 --- a/tests/qemuxml2argvdata/virtio-input-passthrough.xml +++ b/tests/qemuxml2argvdata/virtio-input-passthrough.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 b689ed9d97..4aa488a101 100644 --- a/tests/qemuxml2argvdata/virtio-input.args +++ b/tests/qemuxml2argvdata/virtio-input.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/virtio-input.xml b/tests/qemuxml2argvdata/virtio-input.xml index a464639eb6..6f07f7b8df 100644 --- a/tests/qemuxml2argvdata/virtio-input.xml +++ b/tests/qemuxml2argvdata/virtio-input.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 078eb058aa..a3a33be54f 100644 --- a/tests/qemuxml2argvdata/virtio-rng-default.args +++ b/tests/qemuxml2argvdata/virtio-rng-default.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/virtio-rng-default.xml b/tests/qemuxml2argvdata/virtio-rng-default.xml index b3e3dbfe39..c7192e1b03 100644 --- a/tests/qemuxml2argvdata/virtio-rng-default.xml +++ b/tests/qemuxml2argvdata/virtio-rng-default.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 fea626639a..aca156d0d8 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd-crash.xml +++ b/tests/qemuxml2argvdata/virtio-rng-egd-crash.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 4811003393..befc02c6e4 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.xml b/tests/qemuxml2argvdata/virtio-rng-egd.xml index 8e446f2bf9..d8ca7525f7 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd.xml +++ b/tests/qemuxml2argvdata/virtio-rng-egd.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 4ab70dc84c..3dc689d25c 100644 --- a/tests/qemuxml2argvdata/virtio-rng-multiple.args +++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.xml b/tests/qemuxml2argvdata/virtio-rng-multiple.xml index 3c0e2a7463..4b81f36cbf 100644 --- a/tests/qemuxml2argvdata/virtio-rng-multiple.xml +++ b/tests/qemuxml2argvdata/virtio-rng-multiple.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 d44f474c1b..e4c87f9b86 100644 --- a/tests/qemuxml2argvdata/virtio-rng-random.args +++ b/tests/qemuxml2argvdata/virtio-rng-random.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/virtio-rng-random.xml b/tests/qemuxml2argvdata/virtio-rng-random.xml index 738ab13d23..a6104dca4e 100644 --- a/tests/qemuxml2argvdata/virtio-rng-random.xml +++ b/tests/qemuxml2argvdata/virtio-rng-random.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 ec5ada5db7..e9f0ec94e1 100644 --- a/tests/qemuxml2argvdata/vmcoreinfo.args +++ b/tests/qemuxml2argvdata/vmcoreinfo.args @@ -6,7 +6,7 @@ LOGNAME=test \ XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ diff --git a/tests/qemuxml2argvdata/vmcoreinfo.xml b/tests/qemuxml2argvdata/vmcoreinfo.xml index f00109c5fd..b2ef1896f5 100644 --- a/tests/qemuxml2argvdata/vmcoreinfo.xml +++ b/tests/qemuxml2argvdata/vmcoreinfo.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <features> @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> diff --git a/tests/qemuxml2xmloutdata/balloon-device-auto.xml b/tests/qemuxml2xmloutdata/balloon-device-auto.xml index 4c58641aca..3480561192 100644 --- a/tests/qemuxml2xmloutdata/balloon-device-auto.xml +++ b/tests/qemuxml2xmloutdata/balloon-device-auto.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 a6c6d6db67..2c4409c3e5 100644 --- a/tests/qemuxml2xmloutdata/balloon-device-period.xml +++ b/tests/qemuxml2xmloutdata/balloon-device-period.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/blkiotune-device.xml b/tests/qemuxml2xmloutdata/blkiotune-device.xml index 6ac1464c65..917fcb18ae 100644 --- a/tests/qemuxml2xmloutdata/blkiotune-device.xml +++ b/tests/qemuxml2xmloutdata/blkiotune-device.xml @@ -24,7 +24,7 @@ </blkiotune> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -32,7 +32,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 6eb9df13f3..087b18fa8d 100644 --- a/tests/qemuxml2xmloutdata/blkiotune.xml +++ b/tests/qemuxml2xmloutdata/blkiotune.xml @@ -8,7 +8,7 @@ </blkiotune> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 acaab47946..ef2932b0ca 100644 --- a/tests/qemuxml2xmloutdata/channel-guestfwd.xml +++ b/tests/qemuxml2xmloutdata/channel-guestfwd.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 ec82bacea5..4011ab5034 100644 --- a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml +++ b/tests/qemuxml2xmloutdata/channel-virtio-auto.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 ef87c7727c..285ac5947a 100644 --- a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml +++ b/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 598241d01b..205a88b64a 100644 --- a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml +++ b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 a90679eafe..515746b44c 100644 --- a/tests/qemuxml2xmloutdata/channel-virtio.xml +++ b/tests/qemuxml2xmloutdata/channel-virtio.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 196e41b4a7..b765b7e46b 100644 --- a/tests/qemuxml2xmloutdata/clock-catchup.xml +++ b/tests/qemuxml2xmloutdata/clock-catchup.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'> @@ -23,7 +23,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 1360343b3e..164c1c9192 100644 --- a/tests/qemuxml2xmloutdata/clock-localtime.xml +++ b/tests/qemuxml2xmloutdata/clock-localtime.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='localtime'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 0f106073a9..1eabd0a87f 100644 --- a/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml +++ b/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>6</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='network'/> </os> <features> @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 95f886d23b..b41600b100 100644 --- a/tests/qemuxml2xmloutdata/clock-utc.xml +++ b/tests/qemuxml2xmloutdata/clock-utc.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 e943ef6e28..88b8f73f8f 100644 --- a/tests/qemuxml2xmloutdata/console-compat2.xml +++ b/tests/qemuxml2xmloutdata/console-compat2.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 5d3e551aa7..be11dc68b9 100644 --- a/tests/qemuxml2xmloutdata/console-virtio-many.xml +++ b/tests/qemuxml2xmloutdata/console-virtio-many.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 491f00687a..a14ba28c8d 100644 --- a/tests/qemuxml2xmloutdata/console-virtio.xml +++ b/tests/qemuxml2xmloutdata/console-virtio.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 c3068c8c93..03294b7a6c 100644 --- a/tests/qemuxml2xmloutdata/disk-active-commit-active.xml +++ b/tests/qemuxml2xmloutdata/disk-active-commit-active.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 e4fcb0c6ce..1803b844f8 100644 --- a/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml +++ b/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/tmp/HostVG/QEMUGuest1-snap'/> diff --git a/tests/qemuxml2xmloutdata/disk-mirror-active.xml b/tests/qemuxml2xmloutdata/disk-mirror-active.xml index 5a02198f97..732054c65c 100644 --- a/tests/qemuxml2xmloutdata/disk-mirror-active.xml +++ b/tests/qemuxml2xmloutdata/disk-mirror-active.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 5d2caa5fca..ae96a63a3b 100644 --- a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml +++ b/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 34ac337537..ecff3883c2 100644 --- a/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml +++ b/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 c957f8b45c..e0deb1deda 100644 --- a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml +++ b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 e6ee05d97a..f3dab792ce 100644 --- a/tests/qemuxml2xmloutdata/graphics-listen-network.xml +++ b/tests/qemuxml2xmloutdata/graphics-listen-network.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 cf01ea5d8b..2df6a44540 100644 --- a/tests/qemuxml2xmloutdata/graphics-listen-network2.xml +++ b/tests/qemuxml2xmloutdata/graphics-listen-network2.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 6c5043d8eb..8076df3ef4 100644 --- a/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml +++ b/tests/qemuxml2xmloutdata/graphics-sdl-fullscreen.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 a21d87c2a5..7516c8686a 100644 --- a/tests/qemuxml2xmloutdata/graphics-sdl.xml +++ b/tests/qemuxml2xmloutdata/graphics-sdl.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 48a1c87cae..bbcf3edde7 100644 --- a/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml +++ b/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 a3a9a0f348..ca83bbcbe0 100644 --- a/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml +++ b/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml index 4948b5e8cb..2f05bd49d1 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 55d31c80ee..40330a95c3 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 0e8e8930f9..f0856fcfc3 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 dbbe51946e..59f2c8449e 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio.xml b/tests/qemuxml2xmloutdata/hostdev-vfio.xml index 7d0433eb12..03c836a846 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> diff --git a/tests/qemuxml2xmloutdata/input-usbmouse.xml b/tests/qemuxml2xmloutdata/input-usbmouse.xml index d7646efce2..554e1616d1 100644 --- a/tests/qemuxml2xmloutdata/input-usbmouse.xml +++ b/tests/qemuxml2xmloutdata/input-usbmouse.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 add2908f82..f5ad2cdcd8 100644 --- a/tests/qemuxml2xmloutdata/input-usbtablet.xml +++ b/tests/qemuxml2xmloutdata/input-usbtablet.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/kvmclock.xml b/tests/qemuxml2xmloutdata/kvmclock.xml index 0152c59e47..809e7b3295 100644 --- a/tests/qemuxml2xmloutdata/kvmclock.xml +++ b/tests/qemuxml2xmloutdata/kvmclock.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>6</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='network'/> </os> <features> @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 a8d358d08f..38d4c5c232 100644 --- a/tests/qemuxml2xmloutdata/lease.xml +++ b/tests/qemuxml2xmloutdata/lease.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219200</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 faae1accb0..77527bfe64 100644 --- a/tests/qemuxml2xmloutdata/machine-core-off.xml +++ b/tests/qemuxml2xmloutdata/machine-core-off.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 d3d15a557e..025b88f2de 100644 --- a/tests/qemuxml2xmloutdata/machine-core-on.xml +++ b/tests/qemuxml2xmloutdata/machine-core-on.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f886ee2228..23f213dab0 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml @@ -6,7 +6,7 @@ <currentMemory unit='KiB'>1267710</currentMemory> <vcpu placement='static' cpuset='0-1'>2</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <idmap> @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/memory-hotplug.xml b/tests/qemuxml2xmloutdata/memory-hotplug.xml index 9545378508..593542072a 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug.xml @@ -6,7 +6,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static' cpuset='0-1'>2</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -20,7 +20,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 7c9ddf31dc..c5c64e3f1a 100644 --- a/tests/qemuxml2xmloutdata/memorybacking-set.xml +++ b/tests/qemuxml2xmloutdata/memorybacking-set.xml @@ -10,7 +10,7 @@ </memoryBacking> <vcpu placement='static'>2</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 2f7e8ac1ce..2753412d32 100644 --- a/tests/qemuxml2xmloutdata/memorybacking-unset.xml +++ b/tests/qemuxml2xmloutdata/memorybacking-unset.xml @@ -10,7 +10,7 @@ </memoryBacking> <vcpu placement='static'>2</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 20eff94533..032ddfc48d 100644 --- a/tests/qemuxml2xmloutdata/memtune-unlimited.xml +++ b/tests/qemuxml2xmloutdata/memtune-unlimited.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 53dae40355..ed6992ffde 100644 --- a/tests/qemuxml2xmloutdata/memtune.xml +++ b/tests/qemuxml2xmloutdata/memtune.xml @@ -10,7 +10,7 @@ </memtune> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 12c246f355..d77f4af6e1 100644 --- a/tests/qemuxml2xmloutdata/metadata-duplicate.xml +++ b/tests/qemuxml2xmloutdata/metadata-duplicate.xml @@ -9,7 +9,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 12c246f355..d77f4af6e1 100644 --- a/tests/qemuxml2xmloutdata/metadata.xml +++ b/tests/qemuxml2xmloutdata/metadata.xml @@ -9,7 +9,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 7f512929aa..82f5c9f9e8 100644 --- a/tests/qemuxml2xmloutdata/migrate.xml +++ b/tests/qemuxml2xmloutdata/migrate.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 447bfbae2d..baed180b00 100644 --- a/tests/qemuxml2xmloutdata/minimal.xml +++ b/tests/qemuxml2xmloutdata/minimal.xml @@ -10,7 +10,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -18,7 +18,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 5c7a1c7494..e92fa21b65 100644 --- a/tests/qemuxml2xmloutdata/misc-acpi.xml +++ b/tests/qemuxml2xmloutdata/misc-acpi.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <features> @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 0aa5a98159..48ce6745db 100644 --- a/tests/qemuxml2xmloutdata/misc-disable-s3.xml +++ b/tests/qemuxml2xmloutdata/misc-disable-s3.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -16,7 +16,7 @@ <suspend-to-mem enabled='no'/> </pm> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 10241eb72f..0a58fa986b 100644 --- a/tests/qemuxml2xmloutdata/misc-disable-suspends.xml +++ b/tests/qemuxml2xmloutdata/misc-disable-suspends.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -17,7 +17,7 @@ <suspend-to-disk enabled='no'/> </pm> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 464aa2482e..7e8f8d5a32 100644 --- a/tests/qemuxml2xmloutdata/misc-enable-s4.xml +++ b/tests/qemuxml2xmloutdata/misc-enable-s4.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -16,7 +16,7 @@ <suspend-to-disk enabled='yes'/> </pm> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 5c7a1c7494..e92fa21b65 100644 --- a/tests/qemuxml2xmloutdata/misc-uuid.xml +++ b/tests/qemuxml2xmloutdata/misc-uuid.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <features> @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f860850ab0..08f4e2d13f 100644 --- a/tests/qemuxml2xmloutdata/net-eth-hostip.xml +++ b/tests/qemuxml2xmloutdata/net-eth-hostip.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 d15eb3d27a..d60e4c345e 100644 --- a/tests/qemuxml2xmloutdata/net-eth-ifname.xml +++ b/tests/qemuxml2xmloutdata/net-eth-ifname.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 419bfaa0e7..216b745428 100644 --- a/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml +++ b/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 96ce9fdbf5..15e49c152b 100644 --- a/tests/qemuxml2xmloutdata/net-eth.xml +++ b/tests/qemuxml2xmloutdata/net-eth.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f92256d8ca..8a5842c55a 100644 --- a/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml +++ b/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml @@ -5,14 +5,14 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 0e5e5814ac..5d9696afd5 100644 --- a/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml +++ b/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 a9873e4af5..3e751155bd 100644 --- a/tests/qemuxml2xmloutdata/net-hostdev.xml +++ b/tests/qemuxml2xmloutdata/net-hostdev.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/net-midonet.xml b/tests/qemuxml2xmloutdata/net-midonet.xml index 17a1239ac1..2ddb6b8ad8 100644 --- a/tests/qemuxml2xmloutdata/net-midonet.xml +++ b/tests/qemuxml2xmloutdata/net-midonet.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 d35818435b..ebc11a4542 100644 --- a/tests/qemuxml2xmloutdata/net-openvswitch.xml +++ b/tests/qemuxml2xmloutdata/net-openvswitch.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/net-server.xml b/tests/qemuxml2xmloutdata/net-server.xml index 6878ec8c0a..9be587229c 100644 --- a/tests/qemuxml2xmloutdata/net-server.xml +++ b/tests/qemuxml2xmloutdata/net-server.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 ce1eb5460c..65eaabdaf5 100644 --- a/tests/qemuxml2xmloutdata/net-udp.xml +++ b/tests/qemuxml2xmloutdata/net-udp.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/net-virtio-device.xml b/tests/qemuxml2xmloutdata/net-virtio-device.xml index 9827329be7..bff89186a9 100644 --- a/tests/qemuxml2xmloutdata/net-virtio-device.xml +++ b/tests/qemuxml2xmloutdata/net-virtio-device.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 decf71b86c..7932c50269 100644 --- a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml +++ b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 0402ed8aff..11341c7d85 100644 --- a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml +++ b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 b0e5fc37b5..7474141a6e 100644 --- a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml +++ b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml b/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml index 6359fd54c7..99da3de48b 100644 --- a/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml +++ b/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> diff --git a/tests/qemuxml2xmloutdata/net-virtio-teaming.xml b/tests/qemuxml2xmloutdata/net-virtio-teaming.xml index 35fd3bc82a..05a1dd1d2f 100644 --- a/tests/qemuxml2xmloutdata/net-virtio-teaming.xml +++ b/tests/qemuxml2xmloutdata/net-virtio-teaming.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 862c5bd927..a39b9bb1df 100644 --- a/tests/qemuxml2xmloutdata/net-virtio.xml +++ b/tests/qemuxml2xmloutdata/net-virtio.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 6610d7df87..47157a59bd 100644 --- a/tests/qemuxml2xmloutdata/nosharepages.xml +++ b/tests/qemuxml2xmloutdata/nosharepages.xml @@ -8,7 +8,7 @@ </memoryBacking> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 fa81660b34..8d0cdb7cc4 100644 --- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml +++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml @@ -8,7 +8,7 @@ <memory mode='interleave' placement='auto'/> </numatune> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 19855ba207..7d25196914 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 @@ -8,7 +8,7 @@ <memory mode='interleave' placement='auto'/> </numatune> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 114a5ed2db..d905ec2978 100644 --- a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml +++ b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml @@ -8,7 +8,7 @@ <memory mode='strict' placement='auto'/> </numatune> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 5fbebbde7f..83be2dd639 100644 --- a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml +++ b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>2</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 3056c2827f..f5f19669fa 100644 --- a/tests/qemuxml2xmloutdata/pci-rom.xml +++ b/tests/qemuxml2xmloutdata/pci-rom.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> diff --git a/tests/qemuxml2xmloutdata/pmu-feature-off.xml b/tests/qemuxml2xmloutdata/pmu-feature-off.xml index 1aaa377290..77bf61d1e2 100644 --- a/tests/qemuxml2xmloutdata/pmu-feature-off.xml +++ b/tests/qemuxml2xmloutdata/pmu-feature-off.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>6</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='network'/> </os> <features> @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 bd87c33bd5..32a1813f6c 100644 --- a/tests/qemuxml2xmloutdata/pmu-feature.xml +++ b/tests/qemuxml2xmloutdata/pmu-feature.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>6</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='network'/> </os> <features> @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 54a41c5968..1a8efd598d 100644 --- a/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml +++ b/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 88f0268b8d..74b8c753e5 100644 --- a/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml +++ b/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>6</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='network'/> <bios rebootTimeout='-1'/> </os> @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 73505cbffd..3b34928f2b 100644 --- a/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml +++ b/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>6</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='network'/> <bios rebootTimeout='128'/> </os> @@ -14,7 +14,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 7f512929aa..82f5c9f9e8 100644 --- a/tests/qemuxml2xmloutdata/restore-v2.xml +++ b/tests/qemuxml2xmloutdata/restore-v2.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 7fc1c0f027..b5cc10d530 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dac-none.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 63a5e1f9d8..b571707422 100644 --- a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml +++ b/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 892438f4c9..5fa8455f77 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 892438f4c9..5fa8455f77 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 2e97312d91..a2b4a3e19e 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 11e5fbe489..56f15db911 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 2e97312d91..a2b4a3e19e 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 2e97312d91..a2b4a3e19e 100644 --- a/tests/qemuxml2xmloutdata/seclabel-none.xml +++ b/tests/qemuxml2xmloutdata/seclabel-none.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 4773d23725..3cc87b0b1f 100644 --- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml +++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 cdf0461180..ae03203ad3 100644 --- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml +++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 415f28e6fe..391b8b57f8 100644 --- a/tests/qemuxml2xmloutdata/seclabel-static.xml +++ b/tests/qemuxml2xmloutdata/seclabel-static.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 937fcfe6f5..b9241e6933 100644 --- a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml +++ b/tests/qemuxml2xmloutdata/serial-target-port-auto.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 c3b3e1bd8f..a7c3e6cb22 100644 --- a/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml +++ b/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 b4bcc666d2..bdd273de17 100644 --- a/tests/qemuxml2xmloutdata/shmem.xml +++ b/tests/qemuxml2xmloutdata/shmem.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 55c4751853..d606a10cf8 100644 --- a/tests/qemuxml2xmloutdata/smartcard-controller.xml +++ b/tests/qemuxml2xmloutdata/smartcard-controller.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f14f64bfa0..2a6a697f56 100644 --- a/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml +++ b/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 47e7302a1b..ef776fd659 100644 --- a/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml +++ b/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f8ce1a0185..c8bc4fae88 100644 --- a/tests/qemuxml2xmloutdata/smartcard-host.xml +++ b/tests/qemuxml2xmloutdata/smartcard-host.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f1463f2b0d..656c41bb6d 100644 --- a/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml +++ b/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 ecd671c9cc..e3d66b5ebf 100644 --- a/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml +++ b/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 b1daa12c44..f4febb1784 100644 --- a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml +++ b/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml @@ -35,7 +35,7 @@ </baseBoard> </sysinfo> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> <smbios mode='sysinfo'/> </os> @@ -44,7 +44,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 786bcb02a5..2207fab666 100644 --- a/tests/qemuxml2xmloutdata/smbios.xml +++ b/tests/qemuxml2xmloutdata/smbios.xml @@ -40,7 +40,7 @@ </oemStrings> </sysinfo> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> <smbios mode='sysinfo'/> </os> @@ -49,7 +49,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 951a30bfd0..69126bfa7c 100644 --- a/tests/qemuxml2xmloutdata/smp.xml +++ b/tests/qemuxml2xmloutdata/smp.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static' current='1'>2</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <cpu> @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 b088bd16d7..d551a5b7ed 100644 --- a/tests/qemuxml2xmloutdata/usb-controller.xml +++ b/tests/qemuxml2xmloutdata/usb-controller.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 26b341b058..5d0f68c324 100644 --- a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml +++ b/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <controller type='usb' index='0' model='ich9-ehci1'> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/> </controller> diff --git a/tests/qemuxml2xmloutdata/usb-none.xml b/tests/qemuxml2xmloutdata/usb-none.xml index 9ec7d39b87..bc06548ad7 100644 --- a/tests/qemuxml2xmloutdata/usb-none.xml +++ b/tests/qemuxml2xmloutdata/usb-none.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 a13c7346cd..5071b6a3d9 100644 --- a/tests/qemuxml2xmloutdata/usb-piix3-controller.xml +++ b/tests/qemuxml2xmloutdata/usb-piix3-controller.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 ce6b0b394e..def74a1ffc 100644 --- a/tests/qemuxml2xmloutdata/usb-port-missing.xml +++ b/tests/qemuxml2xmloutdata/usb-port-missing.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 4e5ebca189..28764678d9 100644 --- a/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml +++ b/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 d857a89289..e78cb9de71 100644 --- a/tests/qemuxml2xmloutdata/usb-redir-filter.xml +++ b/tests/qemuxml2xmloutdata/usb-redir-filter.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 95f4d6a1df..a972f811e4 100644 --- a/tests/qemuxml2xmloutdata/usb-redir.xml +++ b/tests/qemuxml2xmloutdata/usb-redir.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 841a95a511..1c6c417bc8 100644 --- a/tests/qemuxml2xmloutdata/video-none-device.xml +++ b/tests/qemuxml2xmloutdata/video-none-device.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 bfe8a9b846..9a8e1fca0b 100644 --- a/tests/qemuxml2xmloutdata/video-qxl-heads.xml +++ b/tests/qemuxml2xmloutdata/video-qxl-heads.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 566773d949..6243e29075 100644 --- a/tests/qemuxml2xmloutdata/video-qxl-noheads.xml +++ b/tests/qemuxml2xmloutdata/video-qxl-noheads.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 827ed19153..c1fc9c7f67 100644 --- a/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml +++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 4e91b6152f..5a233f527c 100644 --- a/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml +++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 9d8cb40620..411462bebf 100644 --- a/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml +++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 c4db021fe4..d26ada53a3 100644 --- a/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml +++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 2ff6af9832..24f5c2d06b 100644 --- a/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml +++ b/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 313920e911..76f3b5122b 100644 --- a/tests/qemuxml2xmloutdata/virtio-input.xml +++ b/tests/qemuxml2xmloutdata/virtio-input.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 a903ada842..5127097e84 100644 --- a/tests/qemuxml2xmloutdata/virtio-rng-egd.xml +++ b/tests/qemuxml2xmloutdata/virtio-rng-egd.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 f7faa2fc4e..a089b5e702 100644 --- a/tests/qemuxml2xmloutdata/virtio-rng-random.xml +++ b/tests/qemuxml2xmloutdata/virtio-rng-random.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</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 fa60ede67e..9e74938957 100644 --- a/tests/qemuxml2xmloutdata/vmcoreinfo.xml +++ b/tests/qemuxml2xmloutdata/vmcoreinfo.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <features> @@ -16,7 +16,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> -- 2.41.0