On 11/05/2015 12:33 PM, Daniel P. Berrange wrote: > The -name arg was added in QEMU 0.9.1, so the QEMU driver can > assume it is always available. > > Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx> After dealing with merge conflicts (which I used 'git add' and of course won't have diffs), there were more long line errors. This patch should apply after resolving those conflicts John
>From 40c2d79be4960319f102c9725b072a20bfe31b1e Mon Sep 17 00:00:00 2001 From: John Ferlan <jferlan@xxxxxxxxxx> Date: Thu, 5 Nov 2015 16:50:08 -0500 Subject: [PATCH 9/9] Fix syntax-check errors for patch 7/7 Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx> --- tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-clock-france.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-panic.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args | 3 ++- 34 files changed, 68 insertions(+), 34 deletions(-) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args index 10889c6..469d9a4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-aarch64 -name aarch64test -S -M virt -cpu host -m 1024 -smp 1 -nographic \ +/usr/bin/qemu-system-aarch64 -name aarch64test \ +-S -M virt -cpu host -m 1024 -smp 1 -nographic \ -nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ -boot c -usb -drive file=/aarch64.raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args index d4f66c5..7ccd762 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-aarch64 -name aarch64test -S -M virt -no-kvm -cpu cortex-a53 -m 1024 -smp 1 \ +/usr/bin/qemu-system-aarch64 -name aarch64test \ +-S -M virt -no-kvm -cpu cortex-a53 -m 1024 -smp 1 \ -nographic -nodefaults -monitor unix:/tmp/test-monitor,server,nowait -boot c \ -kernel /aarch64.kernel -initrd /aarch64.initrd -append console=ttyAMA0 -usb \ -net nic,macaddr=52:54:00:09:a4:37,vlan=0,model=virtio,name=net0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args index 2960198..a21125b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-aarch64 -name armtest -S -M virt -cpu host,aarch64=off -m 1024 -smp 1 \ +/usr/bin/qemu-system-aarch64 -name armtest \ +-S -M virt -cpu host,aarch64=off -m 1024 -smp 1 \ -nographic -nodefconfig -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait \ -boot c -kernel /arm.kernel -initrd /arm.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args index 9470031..25c5fb0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-aarch64 -name aarch64test -S -M virt -cpu cortex-a53 -m 1024 -smp 1 \ +/usr/bin/qemu-system-aarch64 -name aarch64test \ +-S -M virt -cpu cortex-a53 -m 1024 -smp 1 \ -nographic -nodefconfig -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -boot c \ -kernel /aarch64.kernel -initrd /aarch64.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args index c0b6bec..ddeaf31 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-aarch64 -name aarch64test -S -M virt -cpu cortex-a53 -m 1024 -smp 1 \ +/usr/bin/qemu-system-aarch64 -name aarch64test \ +-S -M virt -cpu cortex-a53 -m 1024 -smp 1 \ -nographic -nodefconfig -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -boot c \ -kernel /aarch64.kernel -initrd /aarch64.initrd \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args index 0460e5e..562e751 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \ -device virtio-serial-pci,id=virtio-serial0,max_ports=4,vectors=4,bus=pci.0\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args index cb96da4..d119009 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args index b0dbcfe..130a7f4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi -boot c \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args index 64d4f3b..9e11fa9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args index 0846ef7..8e40d29 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args @@ -1,4 +1,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -TZ=Europe/Paris /usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -monitor \ +TZ=Europe/Paris /usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 1 -nographic -monitor \ unix:/tmp/test-monitor,server,nowait -rtc base=localtime -no-acpi -boot c -usb -drive \ file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args b/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args index 8d7cd8d..25f39a9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args @@ -1,4 +1,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-x86_64 -name qemu-host -S -machine pc-0.11,accel=tcg -m 4096 -smp 4 \ +/usr/bin/qemu-system-x86_64 -name qemu-host \ +-S -machine pc-0.11,accel=tcg -m 4096 -smp 4 \ -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -usb -net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args index 51d041d..b211bba 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1 \ -device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args index f34b700..3ad7ecb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 -usb \ -drive file=iscsi://example.org:3260/iqn.1992-01.com.example,if=none,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args index 6e475bd..81aaacf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-ppc64 -name QEMUGuest1 -S -M pseries -m 214 -smp 1 -nographic -monitor \ +/usr/bin/qemu-system-ppc64 -name QEMUGuest1 \ +-S -M pseries -m 214 -smp 1 -nographic -monitor \ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -drive \ file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \ file=/dev/fd0,if=floppy,unit=0 -drive file=/tmp/firmware.img,if=floppy,unit=1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args index cc2245a..092bb9b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1 \ -device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args index 97a6b86..7fa5f0e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -device lsi,id=scsi1,bus=pci.0,addr=0x4 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args index b3e3c5e..73081eb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -device lsi,id=scsi1,bus=pci.0,addr=0x4 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args index bfa1c3b..c6ba090 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -device lsi,id=scsi1,bus=pci.0,addr=0x4 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args index 33ce9b4..05d8f3a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -drive \ file=/some/block/device/unit:0:0:1,if=none,media=cdrom,id=drive-ide0-0-1 -device \ ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 -drive \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args index e6f3282..09d9881 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -drive \ file=/some/block/device/cdrom,if=none,media=cdrom,id=drive-ide0-0-1 -device \ ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 -drive \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args index bbf01de..2095f0c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 8 -nographic -nodefconfig -nodefaults \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 8 -nographic -nodefconfig -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -device virtio-scsi-pci,id=scsi0,cmd_per_lun=50,bus=pci.0,addr=0x3 \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args index 565ed5a..4cdb78b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 8 -nographic -nodefconfig -nodefaults \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 8 -nographic -nodefconfig -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -device virtio-scsi-pci,id=scsi0,ioeventfd=on,bus=pci.0,addr=0x3 \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args index 9accab5..44220f4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 8 -nographic -nodefconfig -nodefaults \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 8 -nographic -nodefconfig -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -device virtio-scsi-pci,id=scsi0,max_sectors=512,bus=pci.0,addr=0x3 \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args index 8b7bfd1..f346853 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 8 -nographic -nodefconfig -nodefaults \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 8 -nographic -nodefconfig -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -device virtio-scsi-pci,id=scsi0,num_queues=8,bus=pci.0,addr=0x3 \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args index beed33d..2184817 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args @@ -1,4 +1,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 1 -monitor unix:/tmp/test-monitor,server,nowait \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 1 -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ -net none -serial none -parallel none -vnc 127.0.0.1:59630,share=allow-exclusive diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args index afe650c..0e71d18 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args @@ -1,4 +1,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-x86_64 -name QEMUGuest1 -S -M pc-0.11 -m 214 -smp 1 -nographic -monitor \ +/usr/bin/qemu-system-x86_64 -name QEMUGuest1 \ +-S -M pc-0.11 -m 214 -smp 1 -nographic -monitor \ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -drive \ file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args index 3ae2fc0..1ffebd3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m size=219136k,slots=16,maxmem=1099511627776k -smp 2 \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m size=219136k,slots=16,maxmem=1099511627776k -smp 2 \ -numa node,nodeid=0,cpus=0-1,mem=214 \ -object memory-backend-file,id=memdimm0,prealloc=yes,\ mem-path=/dev/hugepages2M/libvirt/qemu,size=536870912,host-nodes=1-3,policy=bind \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args index 125ca6d..c3f9696 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m size=219136k,slots=16,maxmem=1099511627776k -smp 2 \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m size=219136k,slots=16,maxmem=1099511627776k -smp 2 \ -numa node,nodeid=0,cpus=0-1,mem=214 \ -object memory-backend-ram,id=memdimm0,size=536870912 \ -device pc-dimm,node=0,memdev=memdimm0,id=dimm0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args index 8a10814..a5ddf9b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -drive file=/dev/HostVG/QEMUGuest7,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args b/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args index 2511b55..4bf99a6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic.args b/tests/qemuxml2argvdata/qemuxml2argv-panic.args index 09c0c72..14cdfa3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-panic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-panic.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args index b86ce4e..4b70fbe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args @@ -1,6 +1,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ /usr/bin/qemu-kvm \ --name lots-of-disks -S -M pc-i440fx-1.4 -cpu qemu64,-kvmclock -bios /usr/share/seabios/bios.bin \ +-name lots-of-disks \ +-S -M pc-i440fx-1.4 -cpu qemu64,-kvmclock -bios /usr/share/seabios/bios.bin \ -m 3907 -smp 1 -nographic -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -boot c \ -device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args index aee06cc..edf61bc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +/usr/bin/qemu -name QEMUGuest1 \ +-S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -usb \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args index 2538b84..8e48e67 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args @@ -1,4 +1,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/libexec/qemu-kvm -name QEMUGuest1 -S -M pc-1.2 -m 2048 -smp 2 -nographic -nodefaults \ +/usr/libexec/qemu-kvm -name QEMUGuest1 \ +-S -M pc-1.2 -m 2048 -smp 2 -nographic -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -- 2.1.0
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list