shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-11 00:58:38 +03:00
Code Releases Activity

qemu: Specify format= iff disk source is not empty

Browse Source 
Just recently, qemu forbade specifying format for sourceless
disks (qemu commit 39c4ae941ed992a3bb5). It kind of makes sense.
If there's no file to open, why specify its format. Anyway, I
have a domain like this:

    <disk type='file' device='cdrom'>
      <driver name='qemu' type='raw'/>
      <target dev='hda' bus='ide'/>
      <readonly/>
      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
    </disk>

and obviously I am unable to start it. Therefore, a fix on our
side is needed too.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2015-12-28 15:13:52 +01:00
parent dc77344a8e
commit d7db33bfe9
348 changed files with 780 additions and 779 deletions
src/qemu
qemu_command.c
tests/qemuxml2argvdata
qemuxml2argv-aarch64-aavmf-virtio-mmio.argsqemuxml2argv-aarch64-cpu-passthrough.argsqemuxml2argv-aarch64-kvm-32-on-64.argsqemuxml2argv-aarch64-mmio-default-pci.argsqemuxml2argv-aarch64-virt-virtio.argsqemuxml2argv-aarch64-virtio-pci.argsqemuxml2argv-arm-vexpressa9-basic.argsqemuxml2argv-arm-vexpressa9-virtio.argsqemuxml2argv-arm-virt-virtio.argsqemuxml2argv-balloon-device-auto.argsqemuxml2argv-balloon-device-period.argsqemuxml2argv-balloon-device.argsqemuxml2argv-bios-nvram.argsqemuxml2argv-bios.argsqemuxml2argv-blkdeviotune-max.argsqemuxml2argv-blkdeviotune.argsqemuxml2argv-blkiotune-device.argsqemuxml2argv-blkiotune.argsqemuxml2argv-boot-cdrom.argsqemuxml2argv-boot-complex-bootindex.argsqemuxml2argv-boot-complex.argsqemuxml2argv-boot-floppy-q35.argsqemuxml2argv-boot-floppy.argsqemuxml2argv-boot-menu-disable-drive-bootindex.argsqemuxml2argv-boot-menu-disable-drive.argsqemuxml2argv-boot-menu-disable.argsqemuxml2argv-boot-menu-enable-with-timeout.argsqemuxml2argv-boot-menu-enable.argsqemuxml2argv-boot-multi.argsqemuxml2argv-boot-network.argsqemuxml2argv-boot-order.argsqemuxml2argv-boot-strict.argsqemuxml2argv-bootindex-floppy-q35.argsqemuxml2argv-channel-guestfwd.argsqemuxml2argv-channel-spicevmc-old.argsqemuxml2argv-channel-spicevmc.argsqemuxml2argv-channel-virtio-auto.argsqemuxml2argv-channel-virtio-autoadd.argsqemuxml2argv-channel-virtio-autoassign.argsqemuxml2argv-channel-virtio-default.argsqemuxml2argv-channel-virtio-state.argsqemuxml2argv-channel-virtio-unix.argsqemuxml2argv-channel-virtio.argsqemuxml2argv-clock-catchup.argsqemuxml2argv-clock-france.argsqemuxml2argv-clock-hpet-off.argsqemuxml2argv-clock-localtime-basis-localtime.argsqemuxml2argv-clock-localtime.argsqemuxml2argv-clock-utc.argsqemuxml2argv-clock-variable.argsqemuxml2argv-console-compat-auto.argsqemuxml2argv-console-compat-chardev.argsqemuxml2argv-console-compat.argsqemuxml2argv-console-sclp.argsqemuxml2argv-console-virtio-ccw.argsqemuxml2argv-console-virtio-many.argsqemuxml2argv-console-virtio-s390.argsqemuxml2argv-console-virtio.argsqemuxml2argv-controller-order.argsqemuxml2argv-cpu-host-passthrough-features.argsqemuxml2argv-cputune-zero-shares.argsqemuxml2argv-cputune.argsqemuxml2argv-disk-aio.argsqemuxml2argv-disk-blockio.argsqemuxml2argv-disk-cdrom-empty.argsqemuxml2argv-disk-cdrom-network-ftp.argsqemuxml2argv-disk-cdrom-network-ftps.argsqemuxml2argv-disk-cdrom-network-http.argsqemuxml2argv-disk-cdrom-network-https.argsqemuxml2argv-disk-cdrom-network-tftp.argsqemuxml2argv-disk-cdrom-tray-no-device-cap.argsqemuxml2argv-disk-cdrom-tray.argsqemuxml2argv-disk-cdrom.argsqemuxml2argv-disk-copy_on_read.argsqemuxml2argv-disk-drive-boot-cdrom.argsqemuxml2argv-disk-drive-boot-disk.argsqemuxml2argv-disk-drive-cache-directsync.argsqemuxml2argv-disk-drive-cache-unsafe.argsqemuxml2argv-disk-drive-cache-v2-none.argsqemuxml2argv-disk-drive-cache-v2-wb.argsqemuxml2argv-disk-drive-cache-v2-wt.argsqemuxml2argv-disk-drive-copy-on-read.argsqemuxml2argv-disk-drive-discard.argsqemuxml2argv-disk-drive-error-policy-enospace.argsqemuxml2argv-disk-drive-error-policy-stop.argsqemuxml2argv-disk-drive-error-policy-wreport-rignore.argsqemuxml2argv-disk-drive-fmt-qcow.argsqemuxml2argv-disk-drive-network-gluster.argsqemuxml2argv-disk-drive-network-iscsi-auth.argsqemuxml2argv-disk-drive-network-iscsi-lun.argsqemuxml2argv-disk-drive-network-iscsi.argsqemuxml2argv-disk-drive-network-nbd-export.argsqemuxml2argv-disk-drive-network-nbd-ipv6-export.argsqemuxml2argv-disk-drive-network-nbd-ipv6.argsqemuxml2argv-disk-drive-network-nbd-unix.argsqemuxml2argv-disk-drive-network-nbd.argsqemuxml2argv-disk-drive-network-rbd-auth.argsqemuxml2argv-disk-drive-network-rbd-ceph-env.argsqemuxml2argv-disk-drive-network-rbd-ipv6.args
Show More

9
src/qemu/qemu_command.c

@ -3819,6 +3819,11 @@ qemuBuildDriveStr(virConnectPtr conn,
} }
virBufferEscape(&opt, ',', ",", "%s,", source); virBufferEscape(&opt, ',', ",", "%s,", source);
if (disk->src->format > 0 &&
disk->src->type != VIR_STORAGE_TYPE_DIR)
virBufferAsprintf(&opt, "format=%s,",
virStorageFileFormatTypeToString(disk->src->format));
} }
VIR_FREE(source); VIR_FREE(source);
@ -3879,10 +3884,6 @@ qemuBuildDriveStr(virConnectPtr conn,
_("transient disks not supported yet")); _("transient disks not supported yet"));
goto error; goto error;
} }
if (disk->src->format > 0 &&
disk->src->type != VIR_STORAGE_TYPE_DIR)
virBufferAsprintf(&opt, ",format=%s",
virStorageFileFormatTypeToString(disk->src->format));
/* generate geometry command string */ /* generate geometry command string */
if (disk->geometry.cylinders > 0 && if (disk->geometry.cylinders > 0 &&

2
tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args

@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
-dtb /aarch64.dtb \ -dtb /aarch64.dtb \
-device virtio-serial-device,id=virtio-serial0 \ -device virtio-serial-device,id=virtio-serial0 \
-usb \ -usb \
-drive file=/aarch64.raw,if=none,id=drive-virtio-disk0,format=raw \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \
-net user,vlan=0,name=hostnet0 \ -net user,vlan=0,name=hostnet0 \

2
tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args

@ -18,5 +18,5 @@ QEMU_AUDIO_DRV=none \
-monitor unix:/tmp/test-monitor,server,nowait \ -monitor unix:/tmp/test-monitor,server,nowait \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/aarch64.raw,if=none,id=drive-virtio-disk0,format=raw \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0

2
tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args

@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
-initrd /arm.initrd \ -initrd /arm.initrd \
-append 'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \ -append 'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \
-usb \ -usb \
-drive file=/arm.raw,if=none,id=drive-virtio-disk0,format=raw \ -drive file=/arm.raw,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \
-net user,vlan=0,name=hostnet0 \ -net user,vlan=0,name=hostnet0 \

2
tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args

@ -25,7 +25,7 @@ QEMU_AUDIO_DRV=none \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \
-device virtio-serial-device,id=virtio-serial0 \ -device virtio-serial-device,id=virtio-serial0 \
-usb \ -usb \
-drive file=/aarch64.raw,if=none,id=drive-virtio-disk0,format=raw \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \
-net user,vlan=0,name=hostnet0 \ -net user,vlan=0,name=hostnet0 \

2
tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args

@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
-dtb /aarch64.dtb \ -dtb /aarch64.dtb \
-device virtio-serial-device,id=virtio-serial0 \ -device virtio-serial-device,id=virtio-serial0 \
-usb \ -usb \
-drive file=/aarch64.raw,if=none,id=drive-virtio-disk0,format=raw \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \
-net user,vlan=0,name=hostnet0 \ -net user,vlan=0,name=hostnet0 \

2
tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args

@ -25,7 +25,7 @@ QEMU_AUDIO_DRV=none \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \
-device virtio-scsi-pci,id=scsi0,bus=pcie.0,addr=0x3 \ -device virtio-scsi-pci,id=scsi0,bus=pcie.0,addr=0x3 \
-usb \ -usb \
-drive file=/aarch64.raw,if=none,id=drive-scsi0-0-0-0,format=raw \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-scsi0-0-0-0 \
-device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\
id=scsi0-0-0-0 \ id=scsi0-0-0-0 \
-device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:09:a4:37,bus=pcie.0,addr=0x2 \ -device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:09:a4:37,bus=pcie.0,addr=0x2 \

2
tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args

@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \
115200n8 rw root=/dev/mmcblk0p3 rootwait physmap.enabled=0' \ 115200n8 rw root=/dev/mmcblk0p3 rootwait physmap.enabled=0' \
-dtb /arm.dtb \ -dtb /arm.dtb \
-usb \ -usb \
-drive file=/arm.raw,if=sd,index=0,format=raw \ -drive file=/arm.raw,format=raw,if=sd,index=0 \
-net nic,macaddr=52:54:00:09:a4:37,vlan=0,model=lan9118,name=net0 \ -net nic,macaddr=52:54:00:09:a4:37,vlan=0,model=lan9118,name=net0 \
-net user,vlan=0,name=hostnet0 \ -net user,vlan=0,name=hostnet0 \
-serial pty -serial pty

2
tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args

@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \
-dtb /arm.dtb \ -dtb /arm.dtb \
-device virtio-serial-device,id=virtio-serial0 \ -device virtio-serial-device,id=virtio-serial0 \
-usb \ -usb \
-drive file=/arm.raw,if=none,id=drive-virtio-disk0,format=raw \ -drive file=/arm.raw,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \
-net user,vlan=0,name=hostnet0 \ -net user,vlan=0,name=hostnet0 \

2
tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args

@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \
-dtb /arm.dtb \ -dtb /arm.dtb \
-device virtio-serial-device,id=virtio-serial0 \ -device virtio-serial-device,id=virtio-serial0 \
-usb \ -usb \
-drive file=/arm.raw,if=none,id=drive-virtio-disk0,format=raw \ -drive file=/arm.raw,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \
-net user,vlan=0,name=hostnet0 \ -net user,vlan=0,name=hostnet0 \

2
tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args

@ -18,6 +18,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

2
tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args

@ -18,6 +18,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12

2
tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args

@ -18,6 +18,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12

2
tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args

@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
-monitor unix:/tmp/test-monitor,server,nowait \ -monitor unix:/tmp/test-monitor,server,nowait \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-serial pty \ -serial pty \
-device usb-tablet,id=input0 \ -device usb-tablet,id=input0 \

2
tests/qemuxml2argvdata/qemuxml2argv-bios.args

@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-serial pty \ -serial pty \
-device usb-tablet,id=input0 \ -device usb-tablet,id=input0 \

4
tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args

@ -17,10 +17,10 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=qcow2,\ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\
cache=none,bps=5000,iops=6000,bps_max=10000,iops_max=11000 \ cache=none,bps=5000,iops=6000,bps_max=10000,iops_max=11000 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-1,format=qcow2,\ -drive file=/dev/HostVG/QEMUGuest2,format=qcow2,if=none,id=drive-ide0-0-1,\
cache=none,bps_rd=5000,bps_wr=5500,iops_rd=3500,iops_wr=4000,bps_rd_max=6000,\ cache=none,bps_rd=5000,bps_wr=5500,iops_rd=3500,iops_wr=4000,bps_rd_max=6000,\
bps_wr_max=6500,iops_rd_max=7000,iops_wr_max=7500,iops_size=2000 \ bps_wr_max=6500,iops_rd_max=7000,iops_wr_max=7500,iops_size=2000 \
-device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \

4
tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args

@ -17,10 +17,10 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=qcow2,\ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\
cache=none,bps=5000,iops=6000 \ cache=none,bps=5000,iops=6000 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-1,format=qcow2,\ -drive file=/dev/HostVG/QEMUGuest2,format=qcow2,if=none,id=drive-ide0-0-1,\
cache=none,bps_rd=5000,bps_wr=5000,iops=7000 \ cache=none,bps_rd=5000,bps_wr=5000,iops=7000 \
-device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

2
tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

2
tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

2
tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot d \ -boot d \
-usb \ -usb \
-drive file=/dev/cdrom,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -drive file=/dev/cdrom,format=raw,if=ide,media=cdrom,bus=1,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

14
tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args

@ -16,22 +16,22 @@ QEMU_AUDIO_DRV=none \
-monitor unix:/tmp/test-monitor,server,nowait \ -monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \ -no-acpi \
-usb \ -usb \
-drive file=/tmp/vda.img,if=none,id=drive-virtio-disk0,format=raw \ -drive file=/tmp/vda.img,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\
id=virtio-disk0,bootindex=3 \ id=virtio-disk0,bootindex=3 \
-drive file=/tmp/vdb.img,if=none,id=drive-virtio-disk1,format=raw \ -drive file=/tmp/vdb.img,format=raw,if=none,id=drive-virtio-disk1 \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,\ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,\
id=virtio-disk1 \ id=virtio-disk1 \
-drive file=/dev/HostVG/hda,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/hda,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-drive file=/dev/HostVG/hdb,if=none,id=drive-ide0-0-1,format=raw \ -drive file=/dev/HostVG/hdb,format=raw,if=none,id=drive-ide0-0-1 \
-device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
-drive file=/dev/HostVG/hdc,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \ -drive file=/dev/HostVG/hdc,format=raw,if=none,media=cdrom,id=drive-ide0-1-0 \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
-drive file=/dev/fd0,if=none,id=drive-fdc0-0-0,format=raw \ -drive file=/dev/fd0,format=raw,if=none,id=drive-fdc0-0-0 \
-global isa-fdc.driveA=drive-fdc0-0-0 \ -global isa-fdc.driveA=drive-fdc0-0-0 \
-global isa-fdc.bootindexA=4 \ -global isa-fdc.bootindexA=4 \
-drive file=/dev/fd1,if=none,id=drive-fdc0-0-1,format=raw \ -drive file=/dev/fd1,format=raw,if=none,id=drive-fdc0-0-1 \
-global isa-fdc.driveB=drive-fdc0-0-1 \ -global isa-fdc.driveB=drive-fdc0-0-1 \
-device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x3,\ -device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x3,\
bootindex=2 \ bootindex=2 \

14
tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args

@ -17,21 +17,21 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot dnca \ -boot dnca \
-usb \ -usb \
-drive file=/tmp/vda.img,if=none,id=drive-virtio-disk0,boot=on,format=raw \ -drive file=/tmp/vda.img,format=raw,if=none,id=drive-virtio-disk0,boot=on \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\
id=virtio-disk0 \ id=virtio-disk0 \
-drive file=/tmp/vdb.img,if=none,id=drive-virtio-disk1,format=raw \ -drive file=/tmp/vdb.img,format=raw,if=none,id=drive-virtio-disk1 \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,\ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,\
id=virtio-disk1 \ id=virtio-disk1 \
-drive file=/dev/HostVG/hda,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/hda,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-drive file=/dev/HostVG/hdb,if=none,id=drive-ide0-0-1,format=raw \ -drive file=/dev/HostVG/hdb,format=raw,if=none,id=drive-ide0-0-1 \
-device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
-drive file=/dev/HostVG/hdc,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \ -drive file=/dev/HostVG/hdc,format=raw,if=none,media=cdrom,id=drive-ide0-1-0 \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
-drive file=/dev/fd0,if=none,id=drive-fdc0-0-0,format=raw \ -drive file=/dev/fd0,format=raw,if=none,id=drive-fdc0-0-0 \
-global isa-fdc.driveA=drive-fdc0-0-0 \ -global isa-fdc.driveA=drive-fdc0-0-0 \
-drive file=/dev/fd1,if=none,id=drive-fdc0-0-1,format=raw \ -drive file=/dev/fd1,format=raw,if=none,id=drive-fdc0-0-1 \
-global isa-fdc.driveB=drive-fdc0-0-1 \ -global isa-fdc.driveB=drive-fdc0-0-1 \
-device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x3 \ -device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x3 \
-net user,vlan=0,name=hostnet0 \ -net user,vlan=0,name=hostnet0 \

2
tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args

@ -18,6 +18,6 @@ QEMU_AUDIO_DRV=none \
-boot a \ -boot a \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \
-drive file=/tmp/firmware.img,if=none,id=drive-fdc0-0-0,format=raw \ -drive file=/tmp/firmware.img,format=raw,if=none,id=drive-fdc0-0-0 \
-device isa-fdc,driveA=drive-fdc0-0-0 \ -device isa-fdc,driveA=drive-fdc0-0-0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x3

4
tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args

@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot a \ -boot a \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-drive file=/tmp/firmware.img,if=floppy,unit=0,format=raw \ -drive file=/tmp/firmware.img,format=raw,if=floppy,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

2
tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args

@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot menu=off \ -boot menu=off \
-usb \ -usb \
-drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \ -drive file=/dev/cdrom,format=raw,if=none,media=cdrom,id=drive-ide0-1-0 \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

2
tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args

@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot order=d,menu=off \ -boot order=d,menu=off \
-usb \ -usb \
-drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \ -drive file=/dev/cdrom,format=raw,if=none,media=cdrom,id=drive-ide0-1-0 \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

2
tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot order=d,menu=off \ -boot order=d,menu=off \
-usb \ -usb \
-drive file=/dev/cdrom,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -drive file=/dev/cdrom,format=raw,if=ide,media=cdrom,bus=1,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

2
tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args

@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot order=d,menu=on,splash-time=3000 \ -boot order=d,menu=on,splash-time=3000 \
-usb \ -usb \
-drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \ -drive file=/dev/cdrom,format=raw,if=none,media=cdrom,id=drive-ide0-1-0 \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

2
tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args

@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot order=d,menu=on \ -boot order=d,menu=on \
-usb \ -usb \
-drive file=/dev/cdrom,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \ -drive file=/dev/cdrom,format=raw,if=none,media=cdrom,id=drive-ide0-1-0 \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

2
tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot order=dcna,menu=on \ -boot order=dcna,menu=on \
-usb \ -usb \
-drive file=/dev/cdrom,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -drive file=/dev/cdrom,format=raw,if=ide,media=cdrom,bus=1,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

2
tests/qemuxml2argvdata/qemuxml2argv-boot-network.args

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot n \ -boot n \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

10
tests/qemuxml2argvdata/qemuxml2argv-boot-order.args

@ -16,15 +16,15 @@ QEMU_AUDIO_DRV=none \
-monitor unix:/tmp/test-monitor,server,nowait \ -monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \ -no-acpi \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-drive file=/root/boot.iso,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \ -drive file=/root/boot.iso,format=raw,if=none,media=cdrom,id=drive-ide0-1-0 \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
-drive file=sheepdog:example.org:6000:image,if=none,id=drive-virtio-disk0,\ -drive file=sheepdog:example.org:6000:image,format=raw,if=none,\
format=raw \ id=drive-virtio-disk0 \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
id=virtio-disk0,bootindex=3 \ id=virtio-disk0,bootindex=3 \
-drive file=/dev/null,if=none,id=drive-fdc0-0-1,format=raw \ -drive file=/dev/null,format=raw,if=none,id=drive-fdc0-0-1 \
-global isa-fdc.driveB=drive-fdc0-0-1 \ -global isa-fdc.driveB=drive-fdc0-0-1 \
-global isa-fdc.bootindexB=4 \ -global isa-fdc.bootindexB=4 \
-device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3,\ -device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3,\

14
tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args

@ -17,22 +17,22 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot strict=on \ -boot strict=on \
-usb \ -usb \
-drive file=/tmp/vda.img,if=none,id=drive-virtio-disk0,format=raw \ -drive file=/tmp/vda.img,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\
id=virtio-disk0,bootindex=3 \ id=virtio-disk0,bootindex=3 \
-drive file=/tmp/vdb.img,if=none,id=drive-virtio-disk1,format=raw \ -drive file=/tmp/vdb.img,format=raw,if=none,id=drive-virtio-disk1 \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,\ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,\
id=virtio-disk1 \ id=virtio-disk1 \
-drive file=/dev/HostVG/hda,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/hda,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-drive file=/dev/HostVG/hdb,if=none,id=drive-ide0-0-1,format=raw \ -drive file=/dev/HostVG/hdb,format=raw,if=none,id=drive-ide0-0-1 \
-device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
-drive file=/dev/HostVG/hdc,if=none,media=cdrom,id=drive-ide0-1-0,format=raw \ -drive file=/dev/HostVG/hdc,format=raw,if=none,media=cdrom,id=drive-ide0-1-0 \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
-drive file=/dev/fd0,if=none,id=drive-fdc0-0-0,format=raw \ -drive file=/dev/fd0,format=raw,if=none,id=drive-fdc0-0-0 \
-global isa-fdc.driveA=drive-fdc0-0-0 \ -global isa-fdc.driveA=drive-fdc0-0-0 \
-global isa-fdc.bootindexA=4 \ -global isa-fdc.bootindexA=4 \
-drive file=/dev/fd1,if=none,id=drive-fdc0-0-1,format=raw \ -drive file=/dev/fd1,format=raw,if=none,id=drive-fdc0-0-1 \
-global isa-fdc.driveB=drive-fdc0-0-1 \ -global isa-fdc.driveB=drive-fdc0-0-1 \
-device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x3,\ -device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x3,\
bootindex=2 \ bootindex=2 \

2
tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args

@ -17,6 +17,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \
-drive file=/tmp/firmware.img,if=none,id=drive-fdc0-0-0,format=raw \ -drive file=/tmp/firmware.img,format=raw,if=none,id=drive-fdc0-0-0 \
-device isa-fdc,driveA=drive-fdc0-0-0,bootindexA=1 \ -device isa-fdc,driveA=drive-fdc0-0-0,bootindexA=1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x3

2
tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args

@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-chardev pipe,id=charchannel0,path=/tmp/guestfwd \ -chardev pipe,id=charchannel0,path=/tmp/guestfwd \
-netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=user-channel0 \ -netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=user-channel0 \

2
tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args

@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
-boot c \ -boot c \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-device spicevmc,bus=virtio-serial1.0,nr=3,id=channel0 \ -device spicevmc,bus=virtio-serial1.0,nr=3,id=channel0 \
-spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\

2
tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args

@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
-boot c \ -boot c \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-chardev spicevmc,id=charchannel0,name=vdagent \ -chardev spicevmc,id=charchannel0,name=vdagent \
-device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\ -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\

2
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args

@ -23,7 +23,7 @@ addr=0x3 \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
-device virtio-serial-pci,id=virtio-serial2,bus=pci.0,addr=0x4 \ -device virtio-serial-pci,id=virtio-serial2,bus=pci.0,addr=0x4 \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-chardev pty,id=charchannel0 \ -chardev pty,id=charchannel0 \
-device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\

2
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args

@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \
addr=0x3 \ addr=0x3 \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0x4 \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0x4 \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-chardev pty,id=charchannel0 \ -chardev pty,id=charchannel0 \
-device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\

2
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args

@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \
addr=0x3 \ addr=0x3 \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-chardev pty,id=charchannel0 \ -chardev pty,id=charchannel0 \
-device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel0,\ -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel0,\

2
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args

@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-chardev pty,id=charchannel0 \ -chardev pty,id=charchannel0 \
-device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\

2
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args

@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
-boot c \ -boot c \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-chardev pty,id=charchannel0 \ -chardev pty,id=charchannel0 \
-device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\ -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\

2
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args

@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-chardev socket,id=charchannel0,\ -chardev socket,id=charchannel0,\
path=/tmp/domain-QEMUGuest1/org.qemu.guest_agent.0,server,nowait \ path=/tmp/domain-QEMUGuest1/org.qemu.guest_agent.0,server,nowait \

2
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args

@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
-boot c \ -boot c \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-chardev pty,id=charchannel0 \ -chardev pty,id=charchannel0 \
-device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\ -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\

2
tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args

@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

2
tests/qemuxml2argvdata/qemuxml2argv-clock-france.args

@ -18,7 +18,7 @@ TZ=Europe/Paris \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

2
tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args

@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

2
tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args

@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

2
tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args

@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

2
tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

2
tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args

@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

2
tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-net none \ -net none \
-serial pty \ -serial pty \
-parallel none -parallel none

2
tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args

@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-chardev pty,id=charserial0 \ -chardev pty,id=charserial0 \
-device isa-serial,chardev=charserial0,id=serial0 \ -device isa-serial,chardev=charserial0,id=serial0 \

2
tests/qemuxml2argvdata/qemuxml2argv-console-compat.args

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-net none \ -net none \
-serial pty \ -serial pty \
-parallel none -parallel none

2
tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args

@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=readline \ -mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0 \
-chardev pty,id=charconsole0 \ -chardev pty,id=charconsole0 \
-device sclpconsole,chardev=charconsole0,id=console0 -device sclpconsole,chardev=charconsole0,id=console0

2
tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args

@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=readline \ -mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \ -no-acpi \
-device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0001 \ -device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0001 \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,\ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,\
bootindex=1 \ bootindex=1 \
-chardev pty,id=charconsole0 \ -chardev pty,id=charconsole0 \

2
tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args

@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
-boot c \ -boot c \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-chardev pty,id=charserial0 \ -chardev pty,id=charserial0 \
-device isa-serial,chardev=charserial0,id=serial0 \ -device isa-serial,chardev=charserial0,id=serial0 \

2
tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args

@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=readline \ -mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \ -no-acpi \
-device virtio-serial-s390,id=virtio-serial0 \ -device virtio-serial-s390,id=virtio-serial0 \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-chardev pty,id=charconsole0 \ -chardev pty,id=charconsole0 \
-device virtconsole,chardev=charconsole0,id=console0 -device virtconsole,chardev=charconsole0,id=console0

2
tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args

@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
-boot c \ -boot c \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-chardev pty,id=charconsole0 \ -chardev pty,id=charconsole0 \
-device virtconsole,chardev=charconsole0,id=console0 \ -device virtconsole,chardev=charconsole0,id=console0 \

6
tests/qemuxml2argvdata/qemuxml2argv-controller-order.args

@ -19,12 +19,12 @@ QEMU_AUDIO_DRV=spice \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x7 \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x7 \
-device usb-ccid,id=ccid0 \ -device usb-ccid,id=ccid0 \
-drive file=/tmp/fdr.img,if=none,id=drive-virtio-disk0,format=raw,cache=none,\ -drive file=/tmp/fdr.img,format=raw,if=none,id=drive-virtio-disk0,cache=none,\
aio=native \ aio=native \
-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\ -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\
id=virtio-disk0 \ id=virtio-disk0 \
-drive file=/tmp/Fedora-17-x86_64-Live-Desktop.iso,if=none,media=cdrom,\ -drive file=/tmp/Fedora-17-x86_64-Live-Desktop.iso,format=raw,if=none,\
id=drive-ide0-1-0,format=raw \ media=cdrom,id=drive-ide0-1-0 \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
-device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:4d:4b:19,bus=pci.0,addr=0x3 \ -device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:4d:4b:19,bus=pci.0,addr=0x3 \
-net user,vlan=0,name=hostnet0 \ -net user,vlan=0,name=hostnet0 \

2
tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args

@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

2
tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

2
tests/qemuxml2argvdata/qemuxml2argv-cputune.args

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args

@ -16,9 +16,9 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=qcow2,cache=none,\ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=ide,bus=0,unit=0,cache=none,\
aio=native \ aio=native \
-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw,\ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0,\
aio=threads \ aio=threads \
-net none \ -net none \
-serial none \ -serial none \

4
tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args

@ -18,9 +18,9 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1 \
-device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
-drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2,format=raw \ -drive file=/tmp/idedisk.img,format=raw,if=none,id=drive-ide0-0-2 \
-device ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,\ -device ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,\
logical_block_size=512,physical_block_size=512 \ logical_block_size=512,physical_block_size=512 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

4
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args

@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-drive if=ide,media=cdrom,bus=1,unit=0,format=raw \ -drive if=ide,media=cdrom,bus=1,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-monitor unix:/tmp/test-monitor,server,nowait \ -monitor unix:/tmp/test-monitor,server,nowait \
-boot d \ -boot d \
-usb \ -usb \
-drive file=ftp://host.name:21/url/path/file.iso,if=none,media=cdrom,\ -drive file=ftp://host.name:21/url/path/file.iso,format=raw,if=none,media=cdrom,\
id=drive-ide0-1-0,format=raw \ id=drive-ide0-1-0 \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

4
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-monitor unix:/tmp/test-monitor,server,nowait \ -monitor unix:/tmp/test-monitor,server,nowait \
-boot d \ -boot d \
-usb \ -usb \
-drive file=ftps://host.name:990/url/path/file.iso,if=none,media=cdrom,\ -drive file=ftps://host.name:990/url/path/file.iso,format=raw,if=none,\
id=drive-ide0-1-0,format=raw \ media=cdrom,id=drive-ide0-1-0 \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

4
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-monitor unix:/tmp/test-monitor,server,nowait \ -monitor unix:/tmp/test-monitor,server,nowait \
-boot d \ -boot d \
-usb \ -usb \
-drive file=http://host.name:80/url/path/file.iso,if=none,media=cdrom,\ -drive file=http://host.name:80/url/path/file.iso,format=raw,if=none,media=cdrom,\
id=drive-ide0-1-0,format=raw \ id=drive-ide0-1-0 \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

4
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-monitor unix:/tmp/test-monitor,server,nowait \ -monitor unix:/tmp/test-monitor,server,nowait \
-boot d \ -boot d \
-usb \ -usb \
-drive file=https://host.name:443/url/path/file.iso,if=none,media=cdrom,\ -drive file=https://host.name:443/url/path/file.iso,format=raw,if=none,\
id=drive-ide0-1-0,format=raw \ media=cdrom,id=drive-ide0-1-0 \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

4
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-monitor unix:/tmp/test-monitor,server,nowait \ -monitor unix:/tmp/test-monitor,server,nowait \
-boot d \ -boot d \
-usb \ -usb \
-drive file=tftp://host.name:69/url/path/file.iso,if=none,media=cdrom,\ -drive file=tftp://host.name:69/url/path/file.iso,format=raw,if=none,media=cdrom,\
id=drive-ide0-1-0,format=raw \ id=drive-ide0-1-0 \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

4
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args

@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-drive if=ide,media=cdrom,bus=1,unit=0,format=raw \ -drive if=ide,media=cdrom,bus=1,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

10
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args

@ -17,13 +17,13 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot dc \ -boot dc \
-usb \ -usb \
-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,\ -drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,\
format=qcow2 \ id=drive-virtio-disk0 \
-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
id=virtio-disk0 \ id=virtio-disk0 \
-drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,\ -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=raw,if=none,\
id=drive-ide0-1-0,format=raw \ media=cdrom,id=drive-ide0-1-0 \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
-drive if=none,media=cdrom,id=drive-ide0-1-1,format=raw \ -drive if=none,media=cdrom,id=drive-ide0-1-1 \
-device ide-drive,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \ -device ide-drive,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

4
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args

@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-drive file=/root/boot.iso,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -drive file=/root/boot.iso,format=raw,if=ide,media=cdrom,bus=1,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

8
tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args

@ -18,12 +18,12 @@ QEMU_AUDIO_DRV=none \
-boot dc \ -boot dc \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
-usb \ -usb \
-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,\ -drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,\
format=qcow2,copy-on-read=on \ id=drive-virtio-disk0,copy-on-read=on \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
id=virtio-disk0 \ id=virtio-disk0 \
-drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,\ -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=raw,if=none,\
id=drive-ide0-1-0,format=raw \ media=cdrom,id=drive-ide0-1-0 \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
-device virtio-net-pci,tx=bh,vlan=0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,\ -device virtio-net-pci,tx=bh,vlan=0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,\
addr=0x3 \ addr=0x3 \

4
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args

@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot d \ -boot d \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args

@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args

@ -16,9 +16,9 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=qcow2,\ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=ide,bus=0,unit=0,\
cache=directsync \ cache=directsync \
-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args

@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=qcow2,cache=unsafe \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=ide,bus=0,unit=0,cache=unsafe \
-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args

@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=qcow2,cache=none \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=ide,bus=0,unit=0,cache=none \
-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args

@ -16,9 +16,9 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=qcow2,\ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=ide,bus=0,unit=0,\
cache=writeback \ cache=writeback \
-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args

@ -16,9 +16,9 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=qcow2,\ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=ide,bus=0,unit=0,\
cache=writethrough \ cache=writethrough \
-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

2
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args

@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw,\ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0,\
copy-on-read=on \ copy-on-read=on \
-net none \ -net none \
-serial none \ -serial none \

8
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args

@ -17,11 +17,11 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot dc \ -boot dc \
-usb \ -usb \
-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,\ -drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,\
format=qcow2,discard=unmap \ id=drive-virtio-disk0,discard=unmap \
-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
id=virtio-disk0 \ id=virtio-disk0 \
-drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,\ -drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=raw,if=none,\
id=drive-ide0-1-0,format=raw,discard=ignore \ media=cdrom,id=drive-ide0-1-0,discard=ignore \
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

4
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args

@ -16,9 +16,9 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=qcow2,cache=none,\ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=ide,bus=0,unit=0,cache=none,\
werror=enospc \ werror=enospc \
-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args

@ -16,9 +16,9 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=qcow2,cache=none,\ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=ide,bus=0,unit=0,cache=none,\
werror=stop,rerror=stop \ werror=stop,rerror=stop \
-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args

@ -16,9 +16,9 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=qcow2,cache=none,\ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=ide,bus=0,unit=0,cache=none,\
werror=report,rerror=ignore \ werror=report,rerror=ignore \
-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args

@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=qcow2 \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=ide,bus=0,unit=0 \
-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=ide,media=cdrom,bus=1,unit=0 \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

6
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args

@ -16,9 +16,9 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=gluster://example.org:6000/Volume1/Image,if=virtio,format=raw \ -drive file=gluster://example.org:6000/Volume1/Image,format=raw,if=virtio \
-drive 'file=gluster+unix:///Volume2/Image?socket=/path/to/sock,if=virtio,\ -drive 'file=gluster+unix:///Volume2/Image?socket=/path/to/sock,format=raw,\
format=raw' \ if=virtio' \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

6
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args

@ -17,9 +17,9 @@ QEMU_AUDIO_DRV=none \
-boot c \ -boot c \
-usb \ -usb \
-drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\
6000/iqn.1992-01.com.example,if=virtio,format=raw \ 6000/iqn.1992-01.com.example,format=raw,if=virtio \
-drive file=iscsi://example.org:6000/iqn.1992-01.com.example/1,if=virtio,\ -drive file=iscsi://example.org:6000/iqn.1992-01.com.example/1,format=raw,\
format=raw \ if=virtio \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args

@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
-boot c \ -boot c \
-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
-usb \ -usb \
-drive file=iscsi://example.org:3260/iqn.1992-01.com.example,if=none,\ -drive file=iscsi://example.org:3260/iqn.1992-01.com.example,format=raw,if=none,\
id=drive-scsi0-0-0-0,format=raw \ id=drive-scsi0-0-0-0 \
-device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ -device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\
id=scsi0-0-0-0 id=scsi0-0-0-0

8
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args

@ -16,10 +16,10 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=iscsi://example.org:6000/iqn.1992-01.com.example,if=virtio,\ -drive file=iscsi://example.org:6000/iqn.1992-01.com.example,format=raw,\
format=raw \ if=virtio \
-drive file=iscsi://example.org:6000/iqn.1992-01.com.example/1,if=virtio,\ -drive file=iscsi://example.org:6000/iqn.1992-01.com.example/1,format=raw,\
format=raw \ if=virtio \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args

@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-drive file=nbd:example.org:6000:exportname=bar,if=virtio,format=raw \ -drive file=nbd:example.org:6000:exportname=bar,format=raw,if=virtio \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args

@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-drive 'file=nbd://[::1]:6000/bar,if=virtio,format=raw' \ -drive 'file=nbd://[::1]:6000/bar,format=raw,if=virtio' \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args

@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-drive 'file=nbd://[::1]:6000,if=virtio,format=raw' \ -drive 'file=nbd://[::1]:6000,format=raw,if=virtio' \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args

@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-drive file=nbd:unix:/var/run/nbdsock:exportname=bar,if=virtio,format=raw \ -drive file=nbd:unix:/var/run/nbdsock:exportname=bar,format=raw,if=virtio \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args

@ -16,8 +16,8 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-drive file=nbd:example.org:6000,if=virtio,format=raw \ -drive file=nbd:example.org:6000,format=raw,if=virtio \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args

@ -16,11 +16,11 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-drive 'file=rbd:pool/image:id=myname:\ -drive 'file=rbd:pool/image:id=myname:\
key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:\ key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:\
auth_supported=cephx\;none:mon_host=mon1.example.org\:6321\;mon2.example.org\:\ auth_supported=cephx\;none:mon_host=mon1.example.org\:6321\;mon2.example.org\:\
6322\;mon3.example.org\:6322,if=virtio,format=raw' \ 6322\;mon3.example.org\:6322,format=raw,if=virtio' \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args

@ -18,8 +18,8 @@ mon1.example.org:6321,mon2.example.org:6322,mon3.example.org:6322 \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-drive file=rbd:pool/image,if=virtio,format=raw \ -drive file=rbd:pool/image,format=raw,if=virtio \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

4
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args

@ -16,10 +16,10 @@ QEMU_AUDIO_DRV=none \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
-drive 'file=rbd:pool/image:auth_supported=none:mon_host=[\:\:1]\:\ -drive 'file=rbd:pool/image:auth_supported=none:mon_host=[\:\:1]\:\
6321\;example.org\:6789\;[ffff\:1234\:567\:abc\:\:0f]\:6322\;[2001\:db8\:\:ff00\:\ 6321\;example.org\:6789\;[ffff\:1234\:567\:abc\:\:0f]\:6322\;[2001\:db8\:\:ff00\:\
42\:8329]\:6322,if=virtio,format=raw' \ 42\:8329]\:6322,format=raw,if=virtio' \
-net none \ -net none \
-serial none \ -serial none \
-parallel none -parallel none

Some files were not shown because too many files have changed in this diff Show More