From 8afd34f2d890749fe3036d2d804a3c18d647bafd Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Fri, 6 Nov 2015 13:20:06 +0000 Subject: [PATCH] tests: redo test argv file line wrapping Back in commit bd6c46fa0cfe275c24debc1152cfc5206c04b59b Author: Juerg Haefliger Date: Mon Jan 31 06:42:57 2011 -0500 tests: handle backspace-newline pairs in test input files all the test argv files were line wrapped so that the args were less than 80 characters. The way the line wrapping was done turns out to be quite undesirable, because it often leaves multiple parameters on the same line. If we later need to add or remove individual parameters, then it leaves us having to redo line wrapping. This commit changes the line wrapping so that every single "-param value" is one its own new line. If the "value" is still too long, then we break on ',' or ':' or ' ' as needed. This means that when we come to add / remove parameters from the test files line, the patch diffs will only ever show a single line added/removed which will greatly simplify review work. Signed-off-by: Daniel P. Berrange --- cfg.mk | 16 +- .../bhyvexml2argv-acpiapic.args | 10 +- .../bhyvexml2argv-acpiapic.ldargs | 4 +- .../bhyvexml2argvdata/bhyvexml2argv-base.args | 8 +- .../bhyvexml2argv-base.ldargs | 4 +- .../bhyvexml2argv-bhyveload-explicitargs.args | 8 +- ...hyvexml2argv-bhyveload-explicitargs.ldargs | 5 +- .../bhyvexml2argv-console.args | 11 +- .../bhyvexml2argv-console.ldargs | 4 +- .../bhyvexml2argv-custom-loader.args | 8 +- .../bhyvexml2argv-custom-loader.ldargs | 5 +- .../bhyvexml2argv-disk-cdrom-grub.args | 8 +- .../bhyvexml2argv-disk-cdrom-grub.ldargs | 6 +- .../bhyvexml2argv-disk-cdrom.args | 8 +- .../bhyvexml2argv-disk-cdrom.ldargs | 4 +- .../bhyvexml2argv-disk-virtio.args | 8 +- .../bhyvexml2argv-disk-virtio.ldargs | 4 +- .../bhyvexml2argv-grub-bootorder.args | 11 +- .../bhyvexml2argv-grub-bootorder.ldargs | 4 +- .../bhyvexml2argv-grub-bootorder2.args | 11 +- .../bhyvexml2argv-grub-bootorder2.ldargs | 4 +- .../bhyvexml2argv-grub-defaults.args | 8 +- .../bhyvexml2argv-grub-defaults.ldargs | 4 +- .../bhyvexml2argv-localtime.args | 7 +- .../bhyvexml2argv-localtime.ldargs | 4 +- .../bhyvexml2argv-macaddr.args | 8 +- .../bhyvexml2argv-macaddr.ldargs | 4 +- .../bhyvexml2argv-serial-grub-nocons.args | 11 +- .../bhyvexml2argv-serial-grub-nocons.ldargs | 4 +- .../bhyvexml2argv-serial-grub.args | 11 +- .../bhyvexml2argv-serial-grub.ldargs | 7 +- .../bhyvexml2argv-serial.args | 11 +- .../bhyvexml2argv-serial.ldargs | 4 +- .../nat-default-linux.args | 137 +- .../nat-ipv6-linux.args | 200 +- .../nat-many-ips-linux.args | 261 +- .../nat-no-dhcp-linux.args | 190 +- .../nat-tftp-linux.args | 146 +- .../route-default-linux.args | 91 +- .../ah-ipv6-linux.args | 112 +- tests/nwfilterxml2firewalldata/ah-linux.args | 107 +- .../all-ipv6-linux.args | 112 +- tests/nwfilterxml2firewalldata/all-linux.args | 107 +- tests/nwfilterxml2firewalldata/arp-linux.args | 54 +- .../comment-linux.args | 248 +- .../conntrack-linux.args | 49 +- .../esp-ipv6-linux.args | 112 +- tests/nwfilterxml2firewalldata/esp-linux.args | 107 +- .../example-1-linux.args | 80 +- .../example-2-linux.args | 97 +- .../hex-data-linux.args | 140 +- .../icmp-direction-linux.args | 36 +- .../icmp-direction2-linux.args | 36 +- .../icmp-direction3-linux.args | 36 +- .../nwfilterxml2firewalldata/icmp-linux.args | 45 +- .../icmpv6-linux.args | 62 +- .../nwfilterxml2firewalldata/igmp-linux.args | 107 +- tests/nwfilterxml2firewalldata/ip-linux.args | 38 +- .../nwfilterxml2firewalldata/ipset-linux.args | 180 +- .../ipt-no-macspoof-linux.args | 14 +- .../nwfilterxml2firewalldata/ipv6-linux.args | 176 +- .../nwfilterxml2firewalldata/iter1-linux.args | 108 +- .../nwfilterxml2firewalldata/iter2-linux.args | 2160 ++++++++++++++--- .../nwfilterxml2firewalldata/iter3-linux.args | 183 +- tests/nwfilterxml2firewalldata/mac-linux.args | 32 +- .../nwfilterxml2firewalldata/rarp-linux.args | 57 +- .../sctp-ipv6-linux.args | 119 +- .../nwfilterxml2firewalldata/sctp-linux.args | 121 +- tests/nwfilterxml2firewalldata/stp-linux.args | 74 +- .../target-linux.args | 368 ++- .../target2-linux.args | 71 +- .../tcp-ipv6-linux.args | 119 +- tests/nwfilterxml2firewalldata/tcp-linux.args | 131 +- .../udp-ipv6-linux.args | 119 +- tests/nwfilterxml2firewalldata/udp-linux.args | 121 +- .../udplite-ipv6-linux.args | 112 +- .../udplite-linux.args | 107 +- .../nwfilterxml2firewalldata/vlan-linux.args | 70 +- ...emuxml2argv-aarch64-aavmf-virtio-mmio.args | 33 +- .../qemuxml2argv-aarch64-cpu-passthrough.args | 23 +- .../qemuxml2argv-aarch64-gic.args | 25 +- .../qemuxml2argv-aarch64-gicv3.args | 25 +- .../qemuxml2argv-aarch64-kvm-32-on-64.args | 28 +- ...qemuxml2argv-aarch64-mmio-default-pci.args | 34 +- ...qemuxml2argv-aarch64-virt-default-nic.args | 28 +- .../qemuxml2argv-aarch64-virt-virtio.args | 34 +- .../qemuxml2argv-aarch64-virtio-pci.args | 37 +- .../qemuxml2argv-arm-vexpressa9-basic.args | 32 +- .../qemuxml2argv-arm-vexpressa9-nodevs.args | 26 +- .../qemuxml2argv-arm-vexpressa9-virtio.args | 32 +- .../qemuxml2argv-arm-virt-virtio.args | 32 +- .../qemuxml2argv-balloon-device-auto.args | 26 +- .../qemuxml2argv-balloon-device-period.args | 26 +- .../qemuxml2argv-balloon-device.args | 26 +- .../qemuxml2argv-bios-nvram.args | 23 +- tests/qemuxml2argvdata/qemuxml2argv-bios.args | 26 +- .../qemuxml2argv-blkdeviotune-max.args | 26 +- .../qemuxml2argv-blkdeviotune.args | 30 +- .../qemuxml2argv-blkiotune-device.args | 25 +- .../qemuxml2argv-blkiotune.args | 25 +- .../qemuxml2argv-boot-cdrom.args | 24 +- .../qemuxml2argv-boot-complex-bootindex.args | 17 +- .../qemuxml2argv-boot-complex.args | 7 +- .../qemuxml2argv-boot-floppy-q35.args | 19 +- .../qemuxml2argv-boot-floppy.args | 26 +- ...rgv-boot-menu-disable-drive-bootindex.args | 7 +- .../qemuxml2argv-boot-menu-disable-drive.args | 7 +- .../qemuxml2argv-boot-menu-disable.args | 23 +- ...ml2argv-boot-menu-enable-with-timeout.args | 7 +- .../qemuxml2argv-boot-menu-enable.args | 7 +- .../qemuxml2argv-boot-multi.args | 23 +- .../qemuxml2argv-boot-network.args | 25 +- .../qemuxml2argv-boot-order.args | 14 +- .../qemuxml2argv-boot-strict.args | 17 +- .../qemuxml2argv-bootindex-floppy-q35.args | 17 +- .../qemuxml2argv-channel-guestfwd.args | 31 +- .../qemuxml2argv-channel-spicevmc-old.args | 31 +- .../qemuxml2argv-channel-spicevmc.args | 34 +- .../qemuxml2argv-channel-virtio-auto.args | 65 +- .../qemuxml2argv-channel-virtio-autoadd.args | 19 +- ...emuxml2argv-channel-virtio-autoassign.args | 58 +- .../qemuxml2argv-channel-virtio-default.args | 23 +- .../qemuxml2argv-channel-virtio-state.args | 22 +- .../qemuxml2argv-channel-virtio-unix.args | 35 +- .../qemuxml2argv-channel-virtio.args | 35 +- .../qemuxml2argv-clock-catchup.args | 26 +- .../qemuxml2argv-clock-france.args | 26 +- .../qemuxml2argv-clock-hpet-off.args | 28 +- ...2argv-clock-localtime-basis-localtime.args | 24 +- .../qemuxml2argv-clock-localtime.args | 24 +- .../qemuxml2argv-clock-timer-hyperv-rtc.args | 25 +- .../qemuxml2argv-clock-utc.args | 22 +- .../qemuxml2argv-clock-variable.args | 26 +- .../qemuxml2argv-console-compat-auto.args | 25 +- .../qemuxml2argv-console-compat-chardev.args | 28 +- .../qemuxml2argv-console-compat.args | 25 +- .../qemuxml2argv-console-sclp.args | 27 +- .../qemuxml2argv-console-virtio-ccw.args | 26 +- .../qemuxml2argv-console-virtio-many.args | 43 +- .../qemuxml2argv-console-virtio-s390.args | 22 +- .../qemuxml2argv-console-virtio.args | 33 +- .../qemuxml2argv-controller-order.args | 64 +- .../qemuxml2argv-cpu-Haswell-noTSX.args | 24 +- .../qemuxml2argv-cpu-Haswell.args | 24 +- .../qemuxml2argv-cpu-Haswell2.args | 24 +- .../qemuxml2argv-cpu-Haswell3.args | 24 +- .../qemuxml2argv-cpu-eoi-disabled.args | 22 +- .../qemuxml2argv-cpu-eoi-enabled.args | 22 +- .../qemuxml2argv-cpu-exact1.args | 25 +- .../qemuxml2argv-cpu-exact2-nofallback.args | 25 +- .../qemuxml2argv-cpu-exact2.args | 25 +- .../qemuxml2argv-cpu-fallback.args | 3 +- .../qemuxml2argv-cpu-host-kvmclock.args | 26 +- .../qemuxml2argv-cpu-host-model-fallback.args | 7 +- .../qemuxml2argv-cpu-host-model-vendor.args | 7 +- .../qemuxml2argv-cpu-host-model.args | 6 +- ...ml2argv-cpu-host-passthrough-features.args | 3 +- .../qemuxml2argv-cpu-host-passthrough.args | 3 +- .../qemuxml2argv-cpu-kvmclock.args | 26 +- .../qemuxml2argv-cpu-minimum1.args | 26 +- .../qemuxml2argv-cpu-minimum2.args | 25 +- .../qemuxml2argv-cpu-numa-disjoint.args | 25 +- ...muxml2argv-cpu-numa-no-memory-element.args | 24 +- .../qemuxml2argv-cpu-numa1.args | 25 +- .../qemuxml2argv-cpu-numa2.args | 24 +- .../qemuxml2argv-cpu-strict1.args | 23 +- .../qemuxml2argv-cpu-topology1.args | 22 +- .../qemuxml2argv-cpu-topology2.args | 23 +- .../qemuxml2argv-cpu-topology3.args | 23 +- .../qemuxml2argv-cputune-numatune.args | 24 +- .../qemuxml2argv-cputune-zero-shares.args | 24 +- .../qemuxml2argv-cputune.args | 24 +- .../qemuxml2argv-default-kvm-host-arch.args | 23 +- .../qemuxml2argv-default-qemu-host-arch.args | 23 +- .../qemuxml2argv-disk-aio.args | 28 +- .../qemuxml2argv-disk-blockio.args | 21 +- .../qemuxml2argv-disk-cdrom-empty.args | 26 +- .../qemuxml2argv-disk-cdrom-network-ftp.args | 23 +- .../qemuxml2argv-disk-cdrom-network-ftps.args | 24 +- .../qemuxml2argv-disk-cdrom-network-http.args | 23 +- ...qemuxml2argv-disk-cdrom-network-https.args | 24 +- .../qemuxml2argv-disk-cdrom-network-tftp.args | 23 +- ...ml2argv-disk-cdrom-tray-no-device-cap.args | 25 +- .../qemuxml2argv-disk-cdrom-tray.args | 24 +- .../qemuxml2argv-disk-cdrom.args | 26 +- .../qemuxml2argv-disk-copy_on_read.args | 33 +- .../qemuxml2argv-disk-drive-boot-cdrom.args | 27 +- .../qemuxml2argv-disk-drive-boot-disk.args | 27 +- ...uxml2argv-disk-drive-cache-directsync.args | 28 +- .../qemuxml2argv-disk-drive-cache-unsafe.args | 27 +- ...qemuxml2argv-disk-drive-cache-v1-none.args | 27 +- .../qemuxml2argv-disk-drive-cache-v1-wb.args | 27 +- .../qemuxml2argv-disk-drive-cache-v1-wt.args | 27 +- ...qemuxml2argv-disk-drive-cache-v2-none.args | 27 +- .../qemuxml2argv-disk-drive-cache-v2-wb.args | 28 +- .../qemuxml2argv-disk-drive-cache-v2-wt.args | 28 +- .../qemuxml2argv-disk-drive-copy-on-read.args | 26 +- .../qemuxml2argv-disk-drive-discard.args | 24 +- ...argv-disk-drive-error-policy-enospace.args | 28 +- ...xml2argv-disk-drive-error-policy-stop.args | 28 +- ...sk-drive-error-policy-wreport-rignore.args | 28 +- .../qemuxml2argv-disk-drive-fat.args | 25 +- .../qemuxml2argv-disk-drive-fmt-qcow.args | 27 +- ...muxml2argv-disk-drive-network-gluster.args | 28 +- ...ml2argv-disk-drive-network-iscsi-auth.args | 28 +- ...xml2argv-disk-drive-network-iscsi-lun.args | 28 +- ...qemuxml2argv-disk-drive-network-iscsi.args | 24 +- ...ml2argv-disk-drive-network-nbd-export.args | 24 +- ...gv-disk-drive-network-nbd-ipv6-export.args | 26 +- ...uxml2argv-disk-drive-network-nbd-ipv6.args | 26 +- ...uxml2argv-disk-drive-network-nbd-unix.args | 24 +- .../qemuxml2argv-disk-drive-network-nbd.args | 24 +- ...uxml2argv-disk-drive-network-rbd-auth.args | 33 +- ...2argv-disk-drive-network-rbd-ceph-env.args | 29 +- ...uxml2argv-disk-drive-network-rbd-ipv6.args | 32 +- .../qemuxml2argv-disk-drive-network-rbd.args | 37 +- ...uxml2argv-disk-drive-network-sheepdog.args | 24 +- .../qemuxml2argv-disk-drive-no-boot.args | 7 +- ...qemuxml2argv-disk-drive-readonly-disk.args | 32 +- ...ml2argv-disk-drive-readonly-no-device.args | 27 +- .../qemuxml2argv-disk-drive-shared.args | 29 +- .../qemuxml2argv-disk-floppy-pseries.args | 28 +- ...l2argv-disk-floppy-tray-no-device-cap.args | 26 +- .../qemuxml2argv-disk-floppy-tray.args | 20 +- .../qemuxml2argv-disk-floppy.args | 27 +- .../qemuxml2argv-disk-geometry.args | 27 +- .../qemuxml2argv-disk-ide-drive-split.args | 21 +- .../qemuxml2argv-disk-ide-wwn.args | 26 +- .../qemuxml2argv-disk-ioeventfd.args | 35 +- .../qemuxml2argv-disk-iscsi.args | 28 +- .../qemuxml2argv-disk-many.args | 28 +- .../qemuxml2argv-disk-order.args | 7 +- .../qemuxml2argv-disk-sata-device.args | 29 +- .../qemuxml2argv-disk-scsi-device-auto.args | 31 +- .../qemuxml2argv-disk-scsi-device.args | 31 +- .../qemuxml2argv-disk-scsi-disk-split.args | 20 +- .../qemuxml2argv-disk-scsi-disk-vpd.args | 24 +- .../qemuxml2argv-disk-scsi-disk-wwn.args | 20 +- ...emuxml2argv-disk-scsi-lun-passthrough.args | 28 +- .../qemuxml2argv-disk-scsi-megasas.args | 35 +- .../qemuxml2argv-disk-scsi-virtio-scsi.args | 35 +- .../qemuxml2argv-disk-scsi-vscsi.args | 28 +- .../qemuxml2argv-disk-serial.args | 24 +- .../qemuxml2argv-disk-snapshot.args | 24 +- .../qemuxml2argv-disk-source-pool-mode.args | 36 +- .../qemuxml2argv-disk-source-pool.args | 35 +- ...emuxml2argv-disk-usb-device-removable.args | 32 +- .../qemuxml2argv-disk-usb-device.args | 31 +- .../qemuxml2argv-disk-usb.args | 26 +- .../qemuxml2argv-disk-virtio-ccw-many.args | 20 +- .../qemuxml2argv-disk-virtio-ccw.args | 20 +- .../qemuxml2argv-disk-virtio-s390.args | 20 +- .../qemuxml2argv-disk-virtio-scsi-ccw.args | 27 +- ...xml2argv-disk-virtio-scsi-cmd_per_lun.args | 24 +- ...muxml2argv-disk-virtio-scsi-ioeventfd.args | 24 +- ...xml2argv-disk-virtio-scsi-max_sectors.args | 24 +- ...uxml2argv-disk-virtio-scsi-num_queues.args | 24 +- .../qemuxml2argv-disk-virtio.args | 30 +- .../qemuxml2argv-disk-xenvbd.args | 30 +- .../qemuxml2argv-encrypted-disk.args | 37 +- .../qemuxml2argv-eoi-disabled.args | 24 +- .../qemuxml2argv-eoi-enabled.args | 24 +- .../qemuxml2argv-event_idx.args | 31 +- .../qemuxml2argv-fips-enabled.args | 25 +- .../qemuxml2argv-floppy-drive-fat.args | 25 +- .../qemuxml2argv-fs9p-ccw.args | 42 +- tests/qemuxml2argvdata/qemuxml2argv-fs9p.args | 40 +- .../qemuxml2argv-graphics-sdl-fullscreen.args | 25 +- .../qemuxml2argv-graphics-sdl.args | 25 +- ...l2argv-graphics-spice-agent-file-xfer.args | 27 +- ...emuxml2argv-graphics-spice-agentmouse.args | 27 +- ...muxml2argv-graphics-spice-compression.args | 30 +- .../qemuxml2argv-graphics-spice-qxl-vga.args | 28 +- .../qemuxml2argv-graphics-spice-sasl.args | 27 +- .../qemuxml2argv-graphics-spice-timeout.args | 35 +- ...qemuxml2argv-graphics-spice-usb-redir.args | 32 +- .../qemuxml2argv-graphics-spice.args | 32 +- .../qemuxml2argv-graphics-vnc-policy.args | 24 +- .../qemuxml2argv-graphics-vnc-sasl.args | 28 +- .../qemuxml2argv-graphics-vnc-socket.args | 24 +- .../qemuxml2argv-graphics-vnc-tls.args | 27 +- .../qemuxml2argv-graphics-vnc-websocket.args | 22 +- .../qemuxml2argv-graphics-vnc.args | 24 +- ...muxml2argv-hostdev-pci-address-device.args | 27 +- .../qemuxml2argv-hostdev-pci-address.args | 26 +- .../qemuxml2argv-hostdev-scsi-boot.args | 27 +- ...uxml2argv-hostdev-scsi-lsi-iscsi-auth.args | 31 +- .../qemuxml2argv-hostdev-scsi-lsi-iscsi.args | 27 +- .../qemuxml2argv-hostdev-scsi-lsi.args | 22 +- .../qemuxml2argv-hostdev-scsi-readonly.args | 27 +- ...l2argv-hostdev-scsi-virtio-iscsi-auth.args | 39 +- ...emuxml2argv-hostdev-scsi-virtio-iscsi.args | 35 +- ...qemuxml2argv-hostdev-scsi-virtio-scsi.args | 27 +- ...2argv-hostdev-usb-address-device-boot.args | 23 +- ...muxml2argv-hostdev-usb-address-device.args | 25 +- .../qemuxml2argv-hostdev-usb-address.args | 26 +- ...qemuxml2argv-hostdev-vfio-multidomain.args | 27 +- .../qemuxml2argv-hostdev-vfio.args | 27 +- .../qemuxml2argv-hotplug-base.args | 15 +- .../qemuxml2argv-hugepages-numa.args | 27 +- .../qemuxml2argv-hugepages-pages.args | 27 +- .../qemuxml2argv-hugepages-pages2.args | 24 +- .../qemuxml2argv-hugepages-pages3.args | 24 +- .../qemuxml2argv-hugepages-pages5.args | 25 +- .../qemuxml2argv-hugepages-pages6.args | 24 +- .../qemuxml2argv-hugepages-shared.args | 35 +- .../qemuxml2argv-hugepages.args | 27 +- .../qemuxml2argv-hyperv-off.args | 20 +- .../qemuxml2argvdata/qemuxml2argv-hyperv.args | 22 +- .../qemuxml2argv-input-usbmouse-addr.args | 25 +- .../qemuxml2argv-input-usbmouse.args | 26 +- .../qemuxml2argv-input-usbtablet.args | 26 +- ...emuxml2argv-iothreads-disk-virtio-ccw.args | 21 +- .../qemuxml2argv-iothreads-disk.args | 28 +- .../qemuxml2argv-iothreads-ids-partial.args | 26 +- .../qemuxml2argv-iothreads-ids.args | 26 +- .../qemuxml2argv-iothreads.args | 26 +- .../qemuxml2argv-kvm-features-off.args | 20 +- .../qemuxml2argv-kvm-features.args | 22 +- .../qemuxml2argv-kvm-pit-delay.args | 24 +- .../qemuxml2argv-kvm-pit-device.args | 24 +- tests/qemuxml2argvdata/qemuxml2argv-kvm.args | 23 +- .../qemuxml2argv-kvmclock+eoi-disabled.args | 24 +- .../qemuxml2argv-kvmclock.args | 25 +- .../qemuxml2argvdata/qemuxml2argv-lease.args | 26 +- ...uxml2argv-machine-aeskeywrap-off-argv.args | 19 +- ...muxml2argv-machine-aeskeywrap-off-cap.args | 19 +- ...uxml2argv-machine-aeskeywrap-off-caps.args | 19 +- ...muxml2argv-machine-aeskeywrap-on-argv.args | 19 +- ...emuxml2argv-machine-aeskeywrap-on-cap.args | 19 +- ...muxml2argv-machine-aeskeywrap-on-caps.args | 19 +- .../qemuxml2argv-machine-aliases1.args | 24 +- .../qemuxml2argv-machine-aliases2.args | 25 +- .../qemuxml2argv-machine-core-off.args | 24 +- .../qemuxml2argv-machine-core-on.args | 24 +- ...uxml2argv-machine-deakeywrap-off-argv.args | 19 +- ...muxml2argv-machine-deakeywrap-off-cap.args | 19 +- ...uxml2argv-machine-deakeywrap-off-caps.args | 19 +- ...muxml2argv-machine-deakeywrap-on-argv.args | 19 +- ...emuxml2argv-machine-deakeywrap-on-cap.args | 19 +- ...muxml2argv-machine-deakeywrap-on-caps.args | 19 +- ...emuxml2argv-machine-keywrap-none-argv.args | 19 +- ...emuxml2argv-machine-keywrap-none-caps.args | 19 +- .../qemuxml2argv-machine-keywrap-none.args | 19 +- .../qemuxml2argv-machine-usb-opt.args | 24 +- .../qemuxml2argv-machine-vmport-opt.args | 24 +- ...qemuxml2argv-memory-hotplug-dimm-addr.args | 22 +- .../qemuxml2argv-memory-hotplug-dimm.args | 22 +- .../qemuxml2argv-memory-hotplug.args | 25 +- .../qemuxml2argv-memtune-unlimited.args | 25 +- .../qemuxml2argv-memtune.args | 25 +- .../qemuxml2argv-metadata.args | 25 +- .../qemuxml2argv-migrate-numa-unaligned.args | 24 +- .../qemuxml2argv-migrate.args | 26 +- .../qemuxml2argv-minimal-msg-timestamp.args | 26 +- .../qemuxml2argv-minimal-s390.args | 24 +- .../qemuxml2argv-minimal.args | 25 +- .../qemuxml2argv-misc-acpi.args | 23 +- .../qemuxml2argv-misc-disable-s3.args | 26 +- .../qemuxml2argv-misc-disable-suspends.args | 27 +- .../qemuxml2argv-misc-enable-s4.args | 26 +- .../qemuxml2argv-misc-no-reboot.args | 24 +- .../qemuxml2argv-misc-uuid.args | 23 +- .../qemuxml2argv-mlock-off.args | 24 +- .../qemuxml2argv-mlock-on.args | 24 +- .../qemuxml2argv-mlock-unsupported.args | 23 +- .../qemuxml2argv-monitor-json.args | 27 +- ...qemuxml2argv-multifunction-pci-device.args | 24 +- .../qemuxml2argv-net-client.args | 27 +- .../qemuxml2argv-net-eth-ifname.args | 27 +- .../qemuxml2argv-net-eth-names.args | 31 +- .../qemuxml2argv-net-eth.args | 27 +- .../qemuxml2argv-net-hostdev-multidomain.args | 24 +- ...xml2argv-net-hostdev-vfio-multidomain.args | 24 +- .../qemuxml2argv-net-hostdev-vfio.args | 24 +- .../qemuxml2argv-net-hostdev.args | 24 +- .../qemuxml2argv-net-mcast.args | 27 +- .../qemuxml2argv-net-server.args | 27 +- .../qemuxml2argv-net-udp.args | 26 +- .../qemuxml2argv-net-user.args | 25 +- .../qemuxml2argv-net-vhostuser-multiq.args | 32 +- .../qemuxml2argv-net-vhostuser.args | 28 +- .../qemuxml2argv-net-virtio-ccw.args | 20 +- .../qemuxml2argv-net-virtio-device.args | 28 +- ...uxml2argv-net-virtio-disable-offloads.args | 29 +- .../qemuxml2argv-net-virtio-netdev.args | 30 +- .../qemuxml2argv-net-virtio-s390.args | 20 +- .../qemuxml2argv-net-virtio.args | 25 +- .../qemuxml2argv-no-shutdown.args | 3 +- .../qemuxml2argv-nographics-vga.args | 26 +- .../qemuxml2argv-nographics.args | 25 +- .../qemuxml2argv-nosharepages.args | 23 +- ...ml2argv-numad-auto-memory-vcpu-cpuset.args | 25 +- ...o-memory-vcpu-no-cpuset-and-placement.args | 25 +- ...2argv-numad-auto-vcpu-static-numatune.args | 25 +- ...ml2argv-numad-static-memory-auto-vcpu.args | 25 +- .../qemuxml2argvdata/qemuxml2argv-numad.args | 25 +- ...ml2argv-numatune-auto-nodeset-invalid.args | 24 +- .../qemuxml2argv-numatune-auto-prefer.args | 23 +- ...muxml2argv-numatune-memnode-no-memory.args | 23 +- .../qemuxml2argv-numatune-memnode.args | 27 +- .../qemuxml2argv-numatune-memory.args | 25 +- .../qemuxml2argv-panic-no-address.args | 24 +- .../qemuxml2argvdata/qemuxml2argv-panic.args | 21 +- ...qemuxml2argv-parallel-parport-chardev.args | 31 +- .../qemuxml2argv-parallel-tcp-chardev.args | 31 +- .../qemuxml2argv-parallel-tcp.args | 25 +- .../qemuxml2argv-pci-autoadd-addr.args | 21 +- .../qemuxml2argv-pci-autoadd-idx.args | 21 +- .../qemuxml2argv-pci-bridge-many-disks.args | 338 ++- .../qemuxml2argv-pci-many.args | 104 +- .../qemuxml2argv-pci-rom.args | 30 +- .../qemuxml2argv-pci-serial-dev-chardev.args | 24 +- .../qemuxml2argv-pcie-root-port.args | 23 +- .../qemuxml2argv-pcie-root.args | 18 +- ...uxml2argv-pcie-switch-downstream-port.args | 23 +- ...emuxml2argv-pcie-switch-upstream-port.args | 23 +- .../qemuxml2argv-pcihole64-none.args | 22 +- .../qemuxml2argv-pcihole64-q35.args | 25 +- .../qemuxml2argv-pcihole64.args | 22 +- .../qemuxml2argv-pmu-feature-off.args | 22 +- .../qemuxml2argv-pmu-feature.args | 22 +- .../qemuxml2argv-ppc-dtb.args | 29 +- .../qemuxml2argv-ppce500-serial.args | 26 +- .../qemuxml2argv-pseries-basic.args | 22 +- .../qemuxml2argv-pseries-cpu-compat.args | 22 +- .../qemuxml2argv-pseries-cpu-exact.args | 23 +- .../qemuxml2argv-pseries-cpu-le.args | 22 +- .../qemuxml2argv-pseries-disk.args | 20 +- .../qemuxml2argv-pseries-nvram.args | 20 +- .../qemuxml2argv-pseries-panic-missing.args | 22 +- ...qemuxml2argv-pseries-panic-no-address.args | 22 +- .../qemuxml2argv-pseries-usb-default.args | 24 +- .../qemuxml2argv-pseries-usb-kbd.args | 21 +- .../qemuxml2argv-pseries-usb-multi.args | 30 +- ...emuxml2argv-pseries-vio-user-assigned.args | 26 +- .../qemuxml2argv-pseries-vio.args | 26 +- .../qemuxml2argv-pv-spinlock-disabled.args | 24 +- .../qemuxml2argv-pv-spinlock-enabled.args | 24 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 23 +- .../qemuxml2argv-qemu-ns-no-env.args | 26 +- .../qemuxml2argv-qemu-ns.args | 28 +- .../qemuxml2argv-reboot-timeout-disabled.args | 23 +- .../qemuxml2argv-reboot-timeout-enabled.args | 23 +- .../qemuxml2argv-restore-v1.args | 26 +- .../qemuxml2argv-restore-v2-fd.args | 26 +- .../qemuxml2argv-restore-v2.args | 26 +- ...2argv-s390-allow-bogus-usb-controller.args | 24 +- ...emuxml2argv-s390-allow-bogus-usb-none.args | 20 +- .../qemuxml2argv-seclabel-dac-none.args | 25 +- ...muxml2argv-seclabel-dynamic-baselabel.args | 25 +- ...muxml2argv-seclabel-dynamic-labelskip.args | 23 +- ...emuxml2argv-seclabel-dynamic-override.args | 25 +- ...qemuxml2argv-seclabel-dynamic-relabel.args | 25 +- .../qemuxml2argv-seclabel-dynamic.args | 25 +- .../qemuxml2argv-seclabel-none.args | 25 +- ...emuxml2argv-seclabel-static-labelskip.args | 23 +- .../qemuxml2argv-seclabel-static-relabel.args | 25 +- .../qemuxml2argv-seclabel-static.args | 26 +- ...emuxml2argv-serial-dev-chardev-iobase.args | 30 +- .../qemuxml2argv-serial-dev-chardev.args | 30 +- .../qemuxml2argv-serial-dev.args | 23 +- .../qemuxml2argv-serial-file-chardev.args | 31 +- .../qemuxml2argv-serial-file.args | 25 +- .../qemuxml2argv-serial-many-chardev.args | 34 +- .../qemuxml2argv-serial-many.args | 26 +- .../qemuxml2argv-serial-pty-chardev.args | 28 +- .../qemuxml2argv-serial-pty.args | 25 +- ...qemuxml2argv-serial-spiceport-nospice.args | 25 +- .../qemuxml2argv-serial-spiceport.args | 23 +- .../qemuxml2argv-serial-tcp-chardev.args | 31 +- ...emuxml2argv-serial-tcp-telnet-chardev.args | 31 +- .../qemuxml2argv-serial-tcp-telnet.args | 25 +- .../qemuxml2argv-serial-tcp.args | 25 +- .../qemuxml2argv-serial-udp-chardev.args | 32 +- .../qemuxml2argv-serial-udp.args | 26 +- .../qemuxml2argv-serial-unix-chardev.args | 31 +- .../qemuxml2argv-serial-unix.args | 25 +- .../qemuxml2argv-serial-vc-chardev.args | 28 +- .../qemuxml2argv-serial-vc.args | 25 +- .../qemuxml2argvdata/qemuxml2argv-shmem.args | 32 +- .../qemuxml2argv-smartcard-controller.args | 28 +- ...uxml2argv-smartcard-host-certificates.args | 32 +- .../qemuxml2argv-smartcard-host.args | 28 +- ...l2argv-smartcard-passthrough-spicevmc.args | 27 +- ...emuxml2argv-smartcard-passthrough-tcp.args | 28 +- .../qemuxml2argvdata/qemuxml2argv-smbios.args | 26 +- tests/qemuxml2argvdata/qemuxml2argv-smp.args | 25 +- .../qemuxml2argv-sound-device.args | 37 +- .../qemuxml2argvdata/qemuxml2argv-sound.args | 26 +- .../qemuxml2argv-tpm-passthrough.args | 19 +- .../qemuxml2argv-usb-controller.args | 22 +- .../qemuxml2argv-usb-hub.args | 22 +- .../qemuxml2argv-usb-ich9-companion.args | 24 +- .../qemuxml2argv-usb-ich9-ehci-addr.args | 30 +- .../qemuxml2argv-usb-none.args | 21 +- .../qemuxml2argv-usb-piix3-controller.args | 21 +- .../qemuxml2argv-usb-ports.args | 22 +- .../qemuxml2argv-usb-redir-boot.args | 23 +- ...qemuxml2argv-usb-redir-filter-version.args | 32 +- .../qemuxml2argv-usb-redir-filter.args | 25 +- .../qemuxml2argv-usb-redir.args | 25 +- .../qemuxml2argv-usb1-usb2.args | 27 +- ...xml2argv-video-device-pciaddr-default.args | 24 +- .../qemuxml2argv-video-qxl-device-vgamem.args | 25 +- .../qemuxml2argv-video-qxl-device.args | 25 +- .../qemuxml2argv-video-qxl-nodevice.args | 24 +- ...uxml2argv-video-qxl-sec-device-vgamem.args | 27 +- .../qemuxml2argv-video-qxl-sec-device.args | 27 +- .../qemuxml2argv-video-vga-device-vgamem.args | 20 +- .../qemuxml2argv-video-vga-device.args | 20 +- .../qemuxml2argv-video-vga-nodevice.args | 24 +- .../qemuxml2argv-virtio-lun.args | 27 +- .../qemuxml2argv-virtio-rng-ccw.args | 26 +- .../qemuxml2argv-virtio-rng-default.args | 19 +- .../qemuxml2argv-virtio-rng-egd.args | 21 +- .../qemuxml2argv-virtio-rng-multiple.args | 21 +- .../qemuxml2argv-virtio-rng-random.args | 22 +- .../qemuxml2argv-watchdog-device.args | 28 +- .../qemuxml2argv-watchdog-diag288.args | 25 +- .../qemuxml2argv-watchdog-dump.args | 27 +- .../qemuxml2argv-watchdog-injectnmi.args | 27 +- .../qemuxml2argv-watchdog.args | 27 +- .../qemuxmlns-qemu-ns-commandline-ns0.args | 24 +- .../qemuxmlns-qemu-ns-commandline-ns1.args | 24 +- .../qemuxmlns-qemu-ns-commandline.args | 24 +- ...uxmlns-qemu-ns-domain-commandline-ns0.args | 24 +- .../qemuxmlns-qemu-ns-domain-commandline.args | 24 +- .../qemuxmlns-qemu-ns-domain-ns0.args | 24 +- .../qemuxmlns-qemu-ns-domain.args | 24 +- tests/test-wrap-argv.pl | 128 + 531 files changed, 15361 insertions(+), 3944 deletions(-) create mode 100644 tests/test-wrap-argv.pl diff --git a/cfg.mk b/cfg.mk index a9bba382d7..db513be730 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1068,7 +1068,7 @@ _autogen: # regenerate HACKING as part of the syntax-check ifneq ($(_gl-Makefile),) -syntax-check: $(top_srcdir)/HACKING bracket-spacing-check +syntax-check: $(top_srcdir)/HACKING bracket-spacing-check test-wrap-argv endif bracket-spacing-check: @@ -1077,6 +1077,20 @@ bracket-spacing-check: { echo '$(ME): incorrect formatting, see HACKING for rules' 1>&2; \ exit 1; } +test-wrap-argv: + $(AM_V_GEN)files=`$(VC_LIST) | grep -E '\.(ldargs|args)'`; \ + for file in $$files ; \ + do \ + $(PERL) $(top_srcdir)/tests/test-wrap-argv.pl $$file > $${file}-t ; \ + diff $$file $${file}-t; \ + res=$$? ; \ + rm $${file}-t ; \ + test $$res == 0 || { \ + echo "$(ME): Incorrect line wrapping in $$file." 1>&2; \ + echo "$(ME): Use test-wrap-argv.pl to wrap test data files" 1>&2; \ + exit 1; } \ + done + # sc_po_check can fail if generated files are not built first sc_po_check: \ $(srcdir)/daemon/remote_dispatch.h \ diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args index 6b26964812..e1afefd55f 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args @@ -1,3 +1,11 @@ -/usr/sbin/bhyve -c 1 -m 214 -A -I -u -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-A \ +-I \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs index 215d65fb25..32538b558e 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs @@ -1 +1,3 @@ -/usr/sbin/bhyveload -m 214 -d /tmp/freebsd.img bhyve +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-base.args b/tests/bhyvexml2argvdata/bhyvexml2argv-base.args index 118735e1f4..88de179345 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-base.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-base.args @@ -1,3 +1,9 @@ -/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs index 215d65fb25..32538b558e 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs @@ -1 +1,3 @@ -/usr/sbin/bhyveload -m 214 -d /tmp/freebsd.img bhyve +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args index 118735e1f4..88de179345 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args @@ -1,3 +1,9 @@ -/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.ldargs index a3f58f0217..73871acad0 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.ldargs +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.ldargs @@ -1 +1,4 @@ -/usr/sbin/bhyveload -X -Y -Z +/usr/sbin/bhyveload \ +-X \ +-Y \ +-Z diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console.args b/tests/bhyvexml2argvdata/bhyvexml2argv-console.args index 311977705b..fdd89872ad 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-console.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console.args @@ -1,4 +1,11 @@ -/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img \ --s 1,lpc -l com1,/dev/nmdm0A bhyve +-s 1,lpc \ +-l com1,/dev/nmdm0A bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs index 215d65fb25..32538b558e 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs @@ -1 +1,3 @@ -/usr/sbin/bhyveload -m 214 -d /tmp/freebsd.img bhyve +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args index 118735e1f4..88de179345 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args @@ -1,3 +1,9 @@ -/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.ldargs index 100e163c74..359ad90a2c 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.ldargs +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.ldargs @@ -1 +1,4 @@ -/fizz_buzz_bazz -X -Y -Z +/fizz_buzz_bazz \ +-X \ +-Y \ +-Z diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args index 2b1281f06f..20c62d4b8f 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args @@ -1,3 +1,9 @@ -/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-cd,/tmp/cdrom.iso bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs index d9161ba8a6..bcf901ef09 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs @@ -1,2 +1,4 @@ -/usr/local/sbin/grub-bhyve --root cd --device-map '' --memory 214 \ -bhyve +/usr/local/sbin/grub-bhyve \ +--root cd \ +--device-map '' \ +--memory 214 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args index 2b1281f06f..20c62d4b8f 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args @@ -1,3 +1,9 @@ -/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-cd,/tmp/cdrom.iso bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs index 0eb3cc966f..24e0bc2bd9 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs @@ -1 +1,3 @@ -/usr/sbin/bhyveload -m 214 -d /tmp/cdrom.iso bhyve +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/cdrom.iso bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args index da0577c186..4cc9e46f6b 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args @@ -1,3 +1,9 @@ -/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,virtio-blk,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs index 215d65fb25..32538b558e 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs @@ -1 +1,3 @@ -/usr/sbin/bhyveload -m 214 -d /tmp/freebsd.img bhyve +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args index fc0522de18..52434233bc 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args @@ -1,6 +1,11 @@ -/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd1.img \ -s 2:0,ahci-hd,/tmp/freebsd2.img \ --s 2:0,ahci-hd,/tmp/freebsd3.img \ -bhyve +-s 2:0,ahci-hd,/tmp/freebsd3.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs index 91c15ce736..7d9a5155a1 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs @@ -1,2 +1,4 @@ -/usr/local/sbin/grub-bhyve --root hd0,msdos1 --device-map '' \ +/usr/local/sbin/grub-bhyve \ +--root hd0,msdos1 \ +--device-map '' \ --memory 214 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args index fc0522de18..52434233bc 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args @@ -1,6 +1,11 @@ -/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd1.img \ -s 2:0,ahci-hd,/tmp/freebsd2.img \ --s 2:0,ahci-hd,/tmp/freebsd3.img \ -bhyve +-s 2:0,ahci-hd,/tmp/freebsd3.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs index 91c15ce736..7d9a5155a1 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs @@ -1,2 +1,4 @@ -/usr/local/sbin/grub-bhyve --root hd0,msdos1 --device-map '' \ +/usr/local/sbin/grub-bhyve \ +--root hd0,msdos1 \ +--device-map '' \ --memory 214 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args index 118735e1f4..88de179345 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args @@ -1,3 +1,9 @@ -/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs index 91c15ce736..7d9a5155a1 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs @@ -1,2 +1,4 @@ -/usr/local/sbin/grub-bhyve --root hd0,msdos1 --device-map '' \ +/usr/local/sbin/grub-bhyve \ +--root hd0,msdos1 \ +--device-map '' \ --memory 214 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args index 4122e627b0..d9f11b435e 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args @@ -1,3 +1,8 @@ -/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-H \ +-P \ +-s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs index 215d65fb25..32538b558e 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs @@ -1 +1,3 @@ -/usr/sbin/bhyveload -m 214 -d /tmp/freebsd.img bhyve +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args index 77c3a17ba2..677a466bab 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args @@ -1,3 +1,9 @@ -/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:22:ee:11 \ -s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs index 215d65fb25..32538b558e 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs @@ -1 +1,3 @@ -/usr/sbin/bhyveload -m 214 -d /tmp/freebsd.img bhyve +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args index 311977705b..fdd89872ad 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args @@ -1,4 +1,11 @@ -/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img \ --s 1,lpc -l com1,/dev/nmdm0A bhyve +-s 1,lpc \ +-l com1,/dev/nmdm0A bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs index 91c15ce736..7d9a5155a1 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs @@ -1,2 +1,4 @@ -/usr/local/sbin/grub-bhyve --root hd0,msdos1 --device-map '' \ +/usr/local/sbin/grub-bhyve \ +--root hd0,msdos1 \ +--device-map '' \ --memory 214 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args index 311977705b..fdd89872ad 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args @@ -1,4 +1,11 @@ -/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img \ --s 1,lpc -l com1,/dev/nmdm0A bhyve +-s 1,lpc \ +-l com1,/dev/nmdm0A bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs index 5645097d40..1ee7fd4cdf 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs @@ -1,2 +1,5 @@ -/usr/local/sbin/grub-bhyve --root hd0,msdos1 --device-map '' \ ---memory 214 --cons-dev /dev/nmdm0A bhyve +/usr/local/sbin/grub-bhyve \ +--root hd0,msdos1 \ +--device-map '' \ +--memory 214 \ +--cons-dev /dev/nmdm0A bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args index 311977705b..fdd89872ad 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args @@ -1,4 +1,11 @@ -/usr/sbin/bhyve -c 1 -m 214 -u -H -P -s 0:0,hostbridge \ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ -s 2:0,ahci-hd,/tmp/freebsd.img \ --s 1,lpc -l com1,/dev/nmdm0A bhyve +-s 1,lpc \ +-l com1,/dev/nmdm0A bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs index 215d65fb25..32538b558e 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs @@ -1 +1,3 @@ -/usr/sbin/bhyveload -m 214 -d /tmp/freebsd.img bhyve +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/networkxml2firewalldata/nat-default-linux.args b/tests/networkxml2firewalldata/nat-default-linux.args index b92a84528f..ffdafdff0e 100644 --- a/tests/networkxml2firewalldata/nat-default-linux.args +++ b/tests/networkxml2firewalldata/nat-default-linux.args @@ -1,30 +1,107 @@ -iptables --table filter --insert INPUT --in-interface virbr0 --protocol tcp \ ---destination-port 67 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 67 --jump ACCEPT -iptables --table filter --insert OUTPUT --out-interface virbr0 --protocol udp \ ---destination-port 68 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol tcp \ ---destination-port 53 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 53 --jump ACCEPT -iptables --table filter --insert FORWARD --in-interface virbr0 --jump REJECT -iptables --table filter --insert FORWARD --out-interface virbr0 --jump REJECT -iptables --table filter --insert FORWARD --in-interface virbr0 \ ---out-interface virbr0 --jump ACCEPT -iptables --table filter --insert FORWARD --source 192.168.122.0/24 \ ---in-interface virbr0 --jump ACCEPT -iptables --table filter --insert FORWARD --destination 192.168.122.0/24 \ ---out-interface virbr0 --match conntrack --ctstate ESTABLISHED,RELATED --jump ACCEPT -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 '!' \ ---destination 192.168.122.0/24 --jump MASQUERADE -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ --p udp '!' --destination 192.168.122.0/24 --jump MASQUERADE --to-ports 1024-65535 -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ --p tcp '!' --destination 192.168.122.0/24 --jump MASQUERADE --to-ports 1024-65535 -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ ---destination 255.255.255.255/32 --jump RETURN -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ ---destination 224.0.0.0/24 --jump RETURN -iptables --table mangle --insert POSTROUTING --out-interface virbr0 \ ---protocol udp --destination-port 68 --jump CHECKSUM --checksum-fill +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol tcp \ +--destination-port 67 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 67 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert OUTPUT \ +--out-interface virbr0 \ +--protocol udp \ +--destination-port 68 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol tcp \ +--destination-port 53 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 53 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--in-interface virbr0 \ +--jump REJECT +iptables \ +--table filter \ +--insert FORWARD \ +--out-interface virbr0 \ +--jump REJECT +iptables \ +--table filter \ +--insert FORWARD \ +--in-interface virbr0 \ +--out-interface virbr0 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--source 192.168.122.0/24 \ +--in-interface virbr0 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--destination 192.168.122.0/24 \ +--out-interface virbr0 \ +--match conntrack \ +--ctstate ESTABLISHED,RELATED \ +--jump ACCEPT +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +-p udp '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE \ +--to-ports 1024-65535 +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +-p tcp '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE \ +--to-ports 1024-65535 +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +--destination 255.255.255.255/32 \ +--jump RETURN +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +--destination 224.0.0.0/24 \ +--jump RETURN +iptables \ +--table mangle \ +--insert POSTROUTING \ +--out-interface virbr0 \ +--protocol udp \ +--destination-port 68 \ +--jump CHECKSUM \ +--checksum-fill diff --git a/tests/networkxml2firewalldata/nat-ipv6-linux.args b/tests/networkxml2firewalldata/nat-ipv6-linux.args index 2fae0db542..22285afa10 100644 --- a/tests/networkxml2firewalldata/nat-ipv6-linux.args +++ b/tests/networkxml2firewalldata/nat-ipv6-linux.args @@ -1,44 +1,156 @@ -iptables --table filter --insert INPUT --in-interface virbr0 --protocol tcp \ ---destination-port 67 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 67 --jump ACCEPT -iptables --table filter --insert OUTPUT --out-interface virbr0 --protocol udp \ ---destination-port 68 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol tcp \ ---destination-port 53 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 53 --jump ACCEPT -iptables --table filter --insert FORWARD --in-interface virbr0 --jump REJECT -iptables --table filter --insert FORWARD --out-interface virbr0 --jump REJECT -iptables --table filter --insert FORWARD --in-interface virbr0 \ ---out-interface virbr0 --jump ACCEPT -ip6tables --table filter --insert FORWARD --in-interface virbr0 --jump REJECT -ip6tables --table filter --insert FORWARD --out-interface virbr0 --jump REJECT -ip6tables --table filter --insert FORWARD --in-interface virbr0 \ ---out-interface virbr0 --jump ACCEPT -ip6tables --table filter --insert INPUT --in-interface virbr0 --protocol tcp \ ---destination-port 53 --jump ACCEPT -ip6tables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 53 --jump ACCEPT -ip6tables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 547 --jump ACCEPT -iptables --table filter --insert FORWARD --source 192.168.122.0/24 \ ---in-interface virbr0 --jump ACCEPT -iptables --table filter --insert FORWARD --destination 192.168.122.0/24 \ ---out-interface virbr0 --match conntrack --ctstate ESTABLISHED,RELATED --jump ACCEPT -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 '!' \ ---destination 192.168.122.0/24 --jump MASQUERADE -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ --p udp '!' --destination 192.168.122.0/24 --jump MASQUERADE --to-ports 1024-65535 -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ --p tcp '!' --destination 192.168.122.0/24 --jump MASQUERADE --to-ports 1024-65535 -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ ---destination 255.255.255.255/32 --jump RETURN -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ ---destination 224.0.0.0/24 --jump RETURN -ip6tables --table filter --insert FORWARD --source 2001:db8:ca2:2::/64 \ ---in-interface virbr0 --jump ACCEPT -ip6tables --table filter --insert FORWARD --destination 2001:db8:ca2:2::/64 \ ---out-interface virbr0 --jump ACCEPT -iptables --table mangle --insert POSTROUTING --out-interface virbr0 \ ---protocol udp --destination-port 68 --jump CHECKSUM --checksum-fill +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol tcp \ +--destination-port 67 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 67 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert OUTPUT \ +--out-interface virbr0 \ +--protocol udp \ +--destination-port 68 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol tcp \ +--destination-port 53 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 53 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--in-interface virbr0 \ +--jump REJECT +iptables \ +--table filter \ +--insert FORWARD \ +--out-interface virbr0 \ +--jump REJECT +iptables \ +--table filter \ +--insert FORWARD \ +--in-interface virbr0 \ +--out-interface virbr0 \ +--jump ACCEPT +ip6tables \ +--table filter \ +--insert FORWARD \ +--in-interface virbr0 \ +--jump REJECT +ip6tables \ +--table filter \ +--insert FORWARD \ +--out-interface virbr0 \ +--jump REJECT +ip6tables \ +--table filter \ +--insert FORWARD \ +--in-interface virbr0 \ +--out-interface virbr0 \ +--jump ACCEPT +ip6tables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol tcp \ +--destination-port 53 \ +--jump ACCEPT +ip6tables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 53 \ +--jump ACCEPT +ip6tables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 547 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--source 192.168.122.0/24 \ +--in-interface virbr0 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--destination 192.168.122.0/24 \ +--out-interface virbr0 \ +--match conntrack \ +--ctstate ESTABLISHED,RELATED \ +--jump ACCEPT +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +-p udp '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE \ +--to-ports 1024-65535 +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +-p tcp '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE \ +--to-ports 1024-65535 +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +--destination 255.255.255.255/32 \ +--jump RETURN +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +--destination 224.0.0.0/24 \ +--jump RETURN +ip6tables \ +--table filter \ +--insert FORWARD \ +--source 2001:db8:ca2:2::/64 \ +--in-interface virbr0 \ +--jump ACCEPT +ip6tables \ +--table filter \ +--insert FORWARD \ +--destination 2001:db8:ca2:2::/64 \ +--out-interface virbr0 \ +--jump ACCEPT +iptables \ +--table mangle \ +--insert POSTROUTING \ +--out-interface virbr0 \ +--protocol udp \ +--destination-port 68 \ +--jump CHECKSUM \ +--checksum-fill diff --git a/tests/networkxml2firewalldata/nat-many-ips-linux.args b/tests/networkxml2firewalldata/nat-many-ips-linux.args index 8e8923dadf..aff9f69664 100644 --- a/tests/networkxml2firewalldata/nat-many-ips-linux.args +++ b/tests/networkxml2firewalldata/nat-many-ips-linux.args @@ -1,58 +1,203 @@ -iptables --table filter --insert INPUT --in-interface virbr0 --protocol tcp \ ---destination-port 67 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 67 --jump ACCEPT -iptables --table filter --insert OUTPUT --out-interface virbr0 --protocol udp \ ---destination-port 68 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol tcp \ ---destination-port 53 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 53 --jump ACCEPT -iptables --table filter --insert FORWARD --in-interface virbr0 --jump REJECT -iptables --table filter --insert FORWARD --out-interface virbr0 --jump REJECT -iptables --table filter --insert FORWARD --in-interface virbr0 \ ---out-interface virbr0 --jump ACCEPT -iptables --table filter --insert FORWARD --source 192.168.122.0/24 \ ---in-interface virbr0 --jump ACCEPT -iptables --table filter --insert FORWARD --destination 192.168.122.0/24 \ ---out-interface virbr0 --match conntrack --ctstate ESTABLISHED,RELATED --jump ACCEPT -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 '!' \ ---destination 192.168.122.0/24 --jump MASQUERADE -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ --p udp '!' --destination 192.168.122.0/24 --jump MASQUERADE --to-ports 1024-65535 -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ --p tcp '!' --destination 192.168.122.0/24 --jump MASQUERADE --to-ports 1024-65535 -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ ---destination 255.255.255.255/32 --jump RETURN -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ ---destination 224.0.0.0/24 --jump RETURN -iptables --table filter --insert FORWARD --source 192.168.128.0/24 \ ---in-interface virbr0 --jump ACCEPT -iptables --table filter --insert FORWARD --destination 192.168.128.0/24 \ ---out-interface virbr0 --match conntrack --ctstate ESTABLISHED,RELATED --jump ACCEPT -iptables --table nat --insert POSTROUTING --source 192.168.128.0/24 '!' \ ---destination 192.168.128.0/24 --jump MASQUERADE -iptables --table nat --insert POSTROUTING --source 192.168.128.0/24 \ --p udp '!' --destination 192.168.128.0/24 --jump MASQUERADE --to-ports 1024-65535 -iptables --table nat --insert POSTROUTING --source 192.168.128.0/24 \ --p tcp '!' --destination 192.168.128.0/24 --jump MASQUERADE --to-ports 1024-65535 -iptables --table nat --insert POSTROUTING --source 192.168.128.0/24 \ ---destination 255.255.255.255/32 --jump RETURN -iptables --table nat --insert POSTROUTING --source 192.168.128.0/24 \ ---destination 224.0.0.0/24 --jump RETURN -iptables --table filter --insert FORWARD --source 192.168.150.0/24 \ ---in-interface virbr0 --jump ACCEPT -iptables --table filter --insert FORWARD --destination 192.168.150.0/24 \ ---out-interface virbr0 --match conntrack --ctstate ESTABLISHED,RELATED --jump ACCEPT -iptables --table nat --insert POSTROUTING --source 192.168.150.0/24 '!' \ ---destination 192.168.150.0/24 --jump MASQUERADE -iptables --table nat --insert POSTROUTING --source 192.168.150.0/24 \ --p udp '!' --destination 192.168.150.0/24 --jump MASQUERADE --to-ports 1024-65535 -iptables --table nat --insert POSTROUTING --source 192.168.150.0/24 \ --p tcp '!' --destination 192.168.150.0/24 --jump MASQUERADE --to-ports 1024-65535 -iptables --table nat --insert POSTROUTING --source 192.168.150.0/24 \ ---destination 255.255.255.255/32 --jump RETURN -iptables --table nat --insert POSTROUTING --source 192.168.150.0/24 \ ---destination 224.0.0.0/24 --jump RETURN -iptables --table mangle --insert POSTROUTING --out-interface virbr0 \ ---protocol udp --destination-port 68 --jump CHECKSUM --checksum-fill +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol tcp \ +--destination-port 67 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 67 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert OUTPUT \ +--out-interface virbr0 \ +--protocol udp \ +--destination-port 68 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol tcp \ +--destination-port 53 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 53 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--in-interface virbr0 \ +--jump REJECT +iptables \ +--table filter \ +--insert FORWARD \ +--out-interface virbr0 \ +--jump REJECT +iptables \ +--table filter \ +--insert FORWARD \ +--in-interface virbr0 \ +--out-interface virbr0 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--source 192.168.122.0/24 \ +--in-interface virbr0 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--destination 192.168.122.0/24 \ +--out-interface virbr0 \ +--match conntrack \ +--ctstate ESTABLISHED,RELATED \ +--jump ACCEPT +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +-p udp '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE \ +--to-ports 1024-65535 +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +-p tcp '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE \ +--to-ports 1024-65535 +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +--destination 255.255.255.255/32 \ +--jump RETURN +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +--destination 224.0.0.0/24 \ +--jump RETURN +iptables \ +--table filter \ +--insert FORWARD \ +--source 192.168.128.0/24 \ +--in-interface virbr0 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--destination 192.168.128.0/24 \ +--out-interface virbr0 \ +--match conntrack \ +--ctstate ESTABLISHED,RELATED \ +--jump ACCEPT +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.128.0/24 '!' \ +--destination 192.168.128.0/24 \ +--jump MASQUERADE +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.128.0/24 \ +-p udp '!' \ +--destination 192.168.128.0/24 \ +--jump MASQUERADE \ +--to-ports 1024-65535 +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.128.0/24 \ +-p tcp '!' \ +--destination 192.168.128.0/24 \ +--jump MASQUERADE \ +--to-ports 1024-65535 +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.128.0/24 \ +--destination 255.255.255.255/32 \ +--jump RETURN +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.128.0/24 \ +--destination 224.0.0.0/24 \ +--jump RETURN +iptables \ +--table filter \ +--insert FORWARD \ +--source 192.168.150.0/24 \ +--in-interface virbr0 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--destination 192.168.150.0/24 \ +--out-interface virbr0 \ +--match conntrack \ +--ctstate ESTABLISHED,RELATED \ +--jump ACCEPT +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.150.0/24 '!' \ +--destination 192.168.150.0/24 \ +--jump MASQUERADE +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.150.0/24 \ +-p udp '!' \ +--destination 192.168.150.0/24 \ +--jump MASQUERADE \ +--to-ports 1024-65535 +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.150.0/24 \ +-p tcp '!' \ +--destination 192.168.150.0/24 \ +--jump MASQUERADE \ +--to-ports 1024-65535 +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.150.0/24 \ +--destination 255.255.255.255/32 \ +--jump RETURN +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.150.0/24 \ +--destination 224.0.0.0/24 \ +--jump RETURN +iptables \ +--table mangle \ +--insert POSTROUTING \ +--out-interface virbr0 \ +--protocol udp \ +--destination-port 68 \ +--jump CHECKSUM \ +--checksum-fill diff --git a/tests/networkxml2firewalldata/nat-no-dhcp-linux.args b/tests/networkxml2firewalldata/nat-no-dhcp-linux.args index e6635f0ad7..2a9d79054e 100644 --- a/tests/networkxml2firewalldata/nat-no-dhcp-linux.args +++ b/tests/networkxml2firewalldata/nat-no-dhcp-linux.args @@ -1,42 +1,148 @@ -iptables --table filter --insert INPUT --in-interface virbr0 --protocol tcp \ ---destination-port 67 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 67 --jump ACCEPT -iptables --table filter --insert OUTPUT --out-interface virbr0 --protocol udp \ ---destination-port 68 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol tcp \ ---destination-port 53 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 53 --jump ACCEPT -iptables --table filter --insert FORWARD --in-interface virbr0 --jump REJECT -iptables --table filter --insert FORWARD --out-interface virbr0 --jump REJECT -iptables --table filter --insert FORWARD --in-interface virbr0 \ ---out-interface virbr0 --jump ACCEPT -ip6tables --table filter --insert FORWARD --in-interface virbr0 --jump REJECT -ip6tables --table filter --insert FORWARD --out-interface virbr0 --jump REJECT -ip6tables --table filter --insert FORWARD --in-interface virbr0 \ ---out-interface virbr0 --jump ACCEPT -ip6tables --table filter --insert INPUT --in-interface virbr0 --protocol tcp \ ---destination-port 53 --jump ACCEPT -ip6tables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 53 --jump ACCEPT -ip6tables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 547 --jump ACCEPT -iptables --table filter --insert FORWARD --source 192.168.122.0/24 \ ---in-interface virbr0 --jump ACCEPT -iptables --table filter --insert FORWARD --destination 192.168.122.0/24 \ ---out-interface virbr0 --match conntrack --ctstate ESTABLISHED,RELATED --jump ACCEPT -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 '!' \ ---destination 192.168.122.0/24 --jump MASQUERADE -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ --p udp '!' --destination 192.168.122.0/24 --jump MASQUERADE --to-ports 1024-65535 -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ --p tcp '!' --destination 192.168.122.0/24 --jump MASQUERADE --to-ports 1024-65535 -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ ---destination 255.255.255.255/32 --jump RETURN -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ ---destination 224.0.0.0/24 --jump RETURN -ip6tables --table filter --insert FORWARD --source 2001:db8:ca2:2::/64 \ ---in-interface virbr0 --jump ACCEPT -ip6tables --table filter --insert FORWARD --destination 2001:db8:ca2:2::/64 \ ---out-interface virbr0 --jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol tcp \ +--destination-port 67 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 67 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert OUTPUT \ +--out-interface virbr0 \ +--protocol udp \ +--destination-port 68 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol tcp \ +--destination-port 53 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 53 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--in-interface virbr0 \ +--jump REJECT +iptables \ +--table filter \ +--insert FORWARD \ +--out-interface virbr0 \ +--jump REJECT +iptables \ +--table filter \ +--insert FORWARD \ +--in-interface virbr0 \ +--out-interface virbr0 \ +--jump ACCEPT +ip6tables \ +--table filter \ +--insert FORWARD \ +--in-interface virbr0 \ +--jump REJECT +ip6tables \ +--table filter \ +--insert FORWARD \ +--out-interface virbr0 \ +--jump REJECT +ip6tables \ +--table filter \ +--insert FORWARD \ +--in-interface virbr0 \ +--out-interface virbr0 \ +--jump ACCEPT +ip6tables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol tcp \ +--destination-port 53 \ +--jump ACCEPT +ip6tables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 53 \ +--jump ACCEPT +ip6tables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 547 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--source 192.168.122.0/24 \ +--in-interface virbr0 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--destination 192.168.122.0/24 \ +--out-interface virbr0 \ +--match conntrack \ +--ctstate ESTABLISHED,RELATED \ +--jump ACCEPT +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +-p udp '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE \ +--to-ports 1024-65535 +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +-p tcp '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE \ +--to-ports 1024-65535 +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +--destination 255.255.255.255/32 \ +--jump RETURN +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +--destination 224.0.0.0/24 \ +--jump RETURN +ip6tables \ +--table filter \ +--insert FORWARD \ +--source 2001:db8:ca2:2::/64 \ +--in-interface virbr0 \ +--jump ACCEPT +ip6tables \ +--table filter \ +--insert FORWARD \ +--destination 2001:db8:ca2:2::/64 \ +--out-interface virbr0 \ +--jump ACCEPT diff --git a/tests/networkxml2firewalldata/nat-tftp-linux.args b/tests/networkxml2firewalldata/nat-tftp-linux.args index 2eac1e0668..1a06f0d0a5 100644 --- a/tests/networkxml2firewalldata/nat-tftp-linux.args +++ b/tests/networkxml2firewalldata/nat-tftp-linux.args @@ -1,32 +1,114 @@ -iptables --table filter --insert INPUT --in-interface virbr0 --protocol tcp \ ---destination-port 67 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 67 --jump ACCEPT -iptables --table filter --insert OUTPUT --out-interface virbr0 --protocol udp \ ---destination-port 68 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol tcp \ ---destination-port 53 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 53 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 69 --jump ACCEPT -iptables --table filter --insert FORWARD --in-interface virbr0 --jump REJECT -iptables --table filter --insert FORWARD --out-interface virbr0 --jump REJECT -iptables --table filter --insert FORWARD --in-interface virbr0 \ ---out-interface virbr0 --jump ACCEPT -iptables --table filter --insert FORWARD --source 192.168.122.0/24 \ ---in-interface virbr0 --jump ACCEPT -iptables --table filter --insert FORWARD --destination 192.168.122.0/24 \ ---out-interface virbr0 --match conntrack --ctstate ESTABLISHED,RELATED --jump ACCEPT -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 '!' \ ---destination 192.168.122.0/24 --jump MASQUERADE -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ --p udp '!' --destination 192.168.122.0/24 --jump MASQUERADE --to-ports 1024-65535 -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ --p tcp '!' --destination 192.168.122.0/24 --jump MASQUERADE --to-ports 1024-65535 -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ ---destination 255.255.255.255/32 --jump RETURN -iptables --table nat --insert POSTROUTING --source 192.168.122.0/24 \ ---destination 224.0.0.0/24 --jump RETURN -iptables --table mangle --insert POSTROUTING --out-interface virbr0 \ ---protocol udp --destination-port 68 --jump CHECKSUM --checksum-fill +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol tcp \ +--destination-port 67 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 67 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert OUTPUT \ +--out-interface virbr0 \ +--protocol udp \ +--destination-port 68 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol tcp \ +--destination-port 53 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 53 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 69 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--in-interface virbr0 \ +--jump REJECT +iptables \ +--table filter \ +--insert FORWARD \ +--out-interface virbr0 \ +--jump REJECT +iptables \ +--table filter \ +--insert FORWARD \ +--in-interface virbr0 \ +--out-interface virbr0 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--source 192.168.122.0/24 \ +--in-interface virbr0 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--destination 192.168.122.0/24 \ +--out-interface virbr0 \ +--match conntrack \ +--ctstate ESTABLISHED,RELATED \ +--jump ACCEPT +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +-p udp '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE \ +--to-ports 1024-65535 +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +-p tcp '!' \ +--destination 192.168.122.0/24 \ +--jump MASQUERADE \ +--to-ports 1024-65535 +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +--destination 255.255.255.255/32 \ +--jump RETURN +iptables \ +--table nat \ +--insert POSTROUTING \ +--source 192.168.122.0/24 \ +--destination 224.0.0.0/24 \ +--jump RETURN +iptables \ +--table mangle \ +--insert POSTROUTING \ +--out-interface virbr0 \ +--protocol udp \ +--destination-port 68 \ +--jump CHECKSUM \ +--checksum-fill diff --git a/tests/networkxml2firewalldata/route-default-linux.args b/tests/networkxml2firewalldata/route-default-linux.args index 2ebef08fe2..65563ff8b4 100644 --- a/tests/networkxml2firewalldata/route-default-linux.args +++ b/tests/networkxml2firewalldata/route-default-linux.args @@ -1,20 +1,71 @@ -iptables --table filter --insert INPUT --in-interface virbr0 --protocol tcp \ ---destination-port 67 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 67 --jump ACCEPT -iptables --table filter --insert OUTPUT --out-interface virbr0 --protocol udp \ ---destination-port 68 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol tcp \ ---destination-port 53 --jump ACCEPT -iptables --table filter --insert INPUT --in-interface virbr0 --protocol udp \ ---destination-port 53 --jump ACCEPT -iptables --table filter --insert FORWARD --in-interface virbr0 --jump REJECT -iptables --table filter --insert FORWARD --out-interface virbr0 --jump REJECT -iptables --table filter --insert FORWARD --in-interface virbr0 \ ---out-interface virbr0 --jump ACCEPT -iptables --table filter --insert FORWARD --source 192.168.122.0/24 \ ---in-interface virbr0 --jump ACCEPT -iptables --table filter --insert FORWARD --destination 192.168.122.0/24 \ ---out-interface virbr0 --jump ACCEPT -iptables --table mangle --insert POSTROUTING --out-interface virbr0 \ ---protocol udp --destination-port 68 --jump CHECKSUM --checksum-fill +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol tcp \ +--destination-port 67 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 67 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert OUTPUT \ +--out-interface virbr0 \ +--protocol udp \ +--destination-port 68 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol tcp \ +--destination-port 53 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert INPUT \ +--in-interface virbr0 \ +--protocol udp \ +--destination-port 53 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--in-interface virbr0 \ +--jump REJECT +iptables \ +--table filter \ +--insert FORWARD \ +--out-interface virbr0 \ +--jump REJECT +iptables \ +--table filter \ +--insert FORWARD \ +--in-interface virbr0 \ +--out-interface virbr0 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--source 192.168.122.0/24 \ +--in-interface virbr0 \ +--jump ACCEPT +iptables \ +--table filter \ +--insert FORWARD \ +--destination 192.168.122.0/24 \ +--out-interface virbr0 \ +--jump ACCEPT +iptables \ +--table mangle \ +--insert POSTROUTING \ +--out-interface virbr0 \ +--protocol udp \ +--destination-port 68 \ +--jump CHECKSUM \ +--checksum-fill diff --git a/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args b/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args index ba2c3027cf..35c9de38b8 100644 --- a/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args @@ -1,20 +1,92 @@ -ip6tables -A FJ-vnet0 -p ah -m mac --mac-source 01:02:03:04:05:06 \ ---source f:e:d::c:b:a/127 --destination a:b:c::d:e:f/128 -m dscp --dscp 2 -m state \ ---state NEW,ESTABLISHED -j RETURN -ip6tables -A FP-vnet0 -p ah --destination f:e:d::c:b:a/127 \ ---source a:b:c::d:e:f/128 -m dscp --dscp 2 -m state --state ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p ah -m mac --mac-source 01:02:03:04:05:06 \ ---source f:e:d::c:b:a/127 --destination a:b:c::d:e:f/128 -m dscp --dscp 2 -m state \ ---state NEW,ESTABLISHED -j RETURN -ip6tables -A FJ-vnet0 -p ah --destination a:b:c::/128 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -ip6tables -A FP-vnet0 -p ah -m mac --mac-source 01:02:03:04:05:06 \ ---source a:b:c::/128 -m dscp --dscp 33 -m state --state NEW,ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p ah --destination a:b:c::/128 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -ip6tables -A FJ-vnet0 -p ah --destination ::10.1.2.3/128 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -ip6tables -A FP-vnet0 -p ah -m mac --mac-source 01:02:03:04:05:06 \ ---source ::10.1.2.3/128 -m dscp --dscp 33 -m state --state NEW,ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p ah --destination ::10.1.2.3/128 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p ah \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source f:e:d::c:b:a/127 \ +--destination a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p ah \ +--destination f:e:d::c:b:a/127 \ +--source a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p ah \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source f:e:d::c:b:a/127 \ +--destination a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p ah \ +--destination a:b:c::/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p ah \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source a:b:c::/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p ah \ +--destination a:b:c::/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p ah \ +--destination ::10.1.2.3/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p ah \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source ::10.1.2.3/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p ah \ +--destination ::10.1.2.3/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN diff --git a/tests/nwfilterxml2firewalldata/ah-linux.args b/tests/nwfilterxml2firewalldata/ah-linux.args index 807b010670..269636754e 100644 --- a/tests/nwfilterxml2firewalldata/ah-linux.args +++ b/tests/nwfilterxml2firewalldata/ah-linux.args @@ -1,18 +1,89 @@ -iptables -A FJ-vnet0 -p ah -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p ah --source 10.1.2.3/32 -m dscp --dscp 2 -m state \ ---state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p ah -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p ah --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p ah -m mac --mac-source 01:02:03:04:05:06 \ ---source 10.1.2.3/22 -m dscp --dscp 33 -m state --state NEW,ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p ah --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p ah --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p ah -m mac --mac-source 01:02:03:04:05:06 \ ---source 10.1.2.3/22 -m dscp --dscp 33 -m state --state NEW,ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p ah --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN +iptables \ +-A FJ-vnet0 \ +-p ah \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p ah \ +--source 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p ah \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p ah \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p ah \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p ah \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p ah \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p ah \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p ah \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN diff --git a/tests/nwfilterxml2firewalldata/all-ipv6-linux.args b/tests/nwfilterxml2firewalldata/all-ipv6-linux.args index 68155eadf9..2f84c1bfea 100644 --- a/tests/nwfilterxml2firewalldata/all-ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/all-ipv6-linux.args @@ -1,20 +1,92 @@ -ip6tables -A FJ-vnet0 -p all -m mac --mac-source 01:02:03:04:05:06 \ ---source f:e:d::c:b:a/127 --destination a:b:c::d:e:f/128 -m dscp --dscp 2 -m state \ ---state NEW,ESTABLISHED -j RETURN -ip6tables -A FP-vnet0 -p all --destination f:e:d::c:b:a/127 \ ---source a:b:c::d:e:f/128 -m dscp --dscp 2 -m state --state ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p all -m mac --mac-source 01:02:03:04:05:06 \ ---source f:e:d::c:b:a/127 --destination a:b:c::d:e:f/128 -m dscp --dscp 2 -m state \ ---state NEW,ESTABLISHED -j RETURN -ip6tables -A FJ-vnet0 -p all --destination a:b:c::/128 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -ip6tables -A FP-vnet0 -p all -m mac --mac-source 01:02:03:04:05:06 \ ---source a:b:c::/128 -m dscp --dscp 33 -m state --state NEW,ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p all --destination a:b:c::/128 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -ip6tables -A FJ-vnet0 -p all --destination ::10.1.2.3/128 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -ip6tables -A FP-vnet0 -p all -m mac --mac-source 01:02:03:04:05:06 \ ---source ::10.1.2.3/128 -m dscp --dscp 33 -m state --state NEW,ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p all --destination ::10.1.2.3/128 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p all \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source f:e:d::c:b:a/127 \ +--destination a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p all \ +--destination f:e:d::c:b:a/127 \ +--source a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p all \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source f:e:d::c:b:a/127 \ +--destination a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p all \ +--destination a:b:c::/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p all \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source a:b:c::/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p all \ +--destination a:b:c::/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p all \ +--destination ::10.1.2.3/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p all \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source ::10.1.2.3/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p all \ +--destination ::10.1.2.3/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN diff --git a/tests/nwfilterxml2firewalldata/all-linux.args b/tests/nwfilterxml2firewalldata/all-linux.args index 048cc3dd09..7ea769f74f 100644 --- a/tests/nwfilterxml2firewalldata/all-linux.args +++ b/tests/nwfilterxml2firewalldata/all-linux.args @@ -1,18 +1,89 @@ -iptables -A FJ-vnet0 -p all -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p all --source 10.1.2.3/32 -m dscp --dscp 2 -m state \ ---state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p all -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p all --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p all -m mac --mac-source 01:02:03:04:05:06 \ ---source 10.1.2.3/22 -m dscp --dscp 33 -m state --state NEW,ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p all --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p all --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p all -m mac --mac-source 01:02:03:04:05:06 \ ---source 10.1.2.3/22 -m dscp --dscp 33 -m state --state NEW,ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p all --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN +iptables \ +-A FJ-vnet0 \ +-p all \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p all \ +--source 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p all \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p all \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p all \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p all \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p all \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p all \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p all \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN diff --git a/tests/nwfilterxml2firewalldata/arp-linux.args b/tests/nwfilterxml2firewalldata/arp-linux.args index d46adc20f7..b1360175c4 100644 --- a/tests/nwfilterxml2firewalldata/arp-linux.args +++ b/tests/nwfilterxml2firewalldata/arp-linux.args @@ -1,11 +1,45 @@ -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff -p 0x806 --arp-htype 12 --arp-opcode 1 \ ---arp-ptype 0x22 --arp-mac-src 01:02:03:04:05:06 --arp-mac-dst 0a:0b:0c:0d:0e:0f \ +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ +-p 0x806 \ +--arp-htype 12 \ +--arp-opcode 1 \ +--arp-ptype 0x22 \ +--arp-mac-src 01:02:03:04:05:06 \ +--arp-mac-dst 0a:0b:0c:0d:0e:0f \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-p 0x806 \ +--arp-htype 255 \ +--arp-opcode 1 \ +--arp-ptype 0xff \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-p 0x806 \ +--arp-htype 256 \ +--arp-opcode 11 \ +--arp-ptype 0x100 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-p 0x806 \ +--arp-htype 65535 \ +--arp-opcode 65535 \ +--arp-ptype 0xffff \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-p 0x806 \ +--arp-gratuitous \ -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --p 0x806 --arp-htype 255 --arp-opcode 1 --arp-ptype 0xff -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --p 0x806 --arp-htype 256 --arp-opcode 11 --arp-ptype 0x100 -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --p 0x806 --arp-htype 65535 --arp-opcode 65535 --arp-ptype 0xffff -j ACCEPT -ebtables -t nat -A libvirt-P-vnet0 -p 0x806 --arp-gratuitous -j ACCEPT diff --git a/tests/nwfilterxml2firewalldata/comment-linux.args b/tests/nwfilterxml2firewalldata/comment-linux.args index 8ce3cb92fc..462b2e2177 100644 --- a/tests/nwfilterxml2firewalldata/comment-linux.args +++ b/tests/nwfilterxml2firewalldata/comment-linux.args @@ -1,49 +1,201 @@ -ebtables -t nat -A libvirt-P-vnet0 -p 0x1234 -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff -p ipv4 --ip-source 10.1.2.3/32 \ ---ip-destination 10.1.2.3/32 --ip-protocol 17 --ip-source-port 291:564 \ ---ip-destination-port 13398:17767 --ip-tos 0x32 -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:fe \ --d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:80 -p ipv6 --ip6-source ::10.1.2.3/22 \ ---ip6-destination ::10.1.2.3/113 --ip6-protocol 6 --ip6-source-port 273:400 \ ---ip6-destination-port 13107:65535 -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff -p 0x806 --arp-htype 18 --arp-opcode 1 \ ---arp-ptype 0x56 --arp-mac-src 01:02:03:04:05:06 --arp-mac-dst 0a:0b:0c:0d:0e:0f \ +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-p 0x1234 \ -j ACCEPT -iptables -A FJ-vnet0 -p udp -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 34 --sport 291:400 --dport 564:1092 -m state \ ---state NEW,ESTABLISHED -m comment --comment 'udp rule' -j RETURN -iptables -A FP-vnet0 -p udp --source 10.1.2.3/32 -m dscp --dscp 34 \ ---dport 291:400 --sport 564:1092 -m state --state ESTABLISHED -m comment \ ---comment 'udp rule' -j ACCEPT -iptables -A HJ-vnet0 -p udp -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 34 --sport 291:400 --dport 564:1092 -m state \ ---state NEW,ESTABLISHED -m comment --comment 'udp rule' -j RETURN -ip6tables -A FJ-vnet0 -p tcp --destination a:b:c::/128 -m dscp --dscp 57 \ ---dport 32:33 --sport 256:4369 -m state --state ESTABLISHED -m comment \ ---comment 'tcp/ipv6 rule' -j RETURN -ip6tables -A FP-vnet0 -p tcp -m mac --mac-source 01:02:03:04:05:06 \ ---source a:b:c::/128 -m dscp --dscp 57 --sport 32:33 --dport 256:4369 -m state \ ---state NEW,ESTABLISHED -m comment --comment 'tcp/ipv6 rule' -j ACCEPT -ip6tables -A HJ-vnet0 -p tcp --destination a:b:c::/128 -m dscp --dscp 57 \ ---dport 32:33 --sport 256:4369 -m state --state ESTABLISHED -m comment \ ---comment 'tcp/ipv6 rule' -j RETURN -ip6tables -A FJ-vnet0 -p udp -m state --state ESTABLISHED -m comment \ ---comment '`ls`;${COLUMNS};$(ls);"test";&'\''3 spaces'\''' -j RETURN -ip6tables -A FP-vnet0 -p udp -m state --state NEW,ESTABLISHED -m comment \ ---comment '`ls`;${COLUMNS};$(ls);"test";&'\''3 spaces'\''' -j ACCEPT -ip6tables -A HJ-vnet0 -p udp -m state --state ESTABLISHED -m comment \ ---comment '`ls`;${COLUMNS};$(ls);"test";&'\''3 spaces'\''' -j RETURN -ip6tables -A FJ-vnet0 -p sctp -m state --state ESTABLISHED -m comment \ ---comment 'comment with lone '\'', `, ", `, \, $x, and two spaces' -j RETURN -ip6tables -A FP-vnet0 -p sctp -m state --state NEW,ESTABLISHED -m comment \ ---comment 'comment with lone '\'', `, ", `, \, $x, and two spaces' -j ACCEPT -ip6tables -A HJ-vnet0 -p sctp -m state --state ESTABLISHED -m comment \ ---comment 'comment with lone '\'', `, ", `, \, $x, and two spaces' -j RETURN -ip6tables -A FJ-vnet0 -p ah -m state --state ESTABLISHED -m comment \ ---comment 'tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm -f ${tmp}' -j RETURN -ip6tables -A FP-vnet0 -p ah -m state --state NEW,ESTABLISHED -m comment \ ---comment 'tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm -f ${tmp}' -j ACCEPT -ip6tables -A HJ-vnet0 -p ah -m state --state ESTABLISHED -m comment \ ---comment 'tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm -f ${tmp}' -j RETURN +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ +-p ipv4 \ +--ip-source 10.1.2.3/32 \ +--ip-destination 10.1.2.3/32 \ +--ip-protocol 17 \ +--ip-source-port 291:564 \ +--ip-destination-port 13398:17767 \ +--ip-tos 0x32 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:fe \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:80 \ +-p ipv6 \ +--ip6-source ::10.1.2.3/22 \ +--ip6-destination ::10.1.2.3/113 \ +--ip6-protocol 6 \ +--ip6-source-port 273:400 \ +--ip6-destination-port 13107:65535 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ +-p 0x806 \ +--arp-htype 18 \ +--arp-opcode 1 \ +--arp-ptype 0x56 \ +--arp-mac-src 01:02:03:04:05:06 \ +--arp-mac-dst 0a:0b:0c:0d:0e:0f \ +-j ACCEPT +iptables \ +-A FJ-vnet0 \ +-p udp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 34 \ +--sport 291:400 \ +--dport 564:1092 \ +-m state \ +--state NEW,ESTABLISHED \ +-m comment \ +--comment 'udp rule' \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +--source 10.1.2.3/32 \ +-m dscp \ +--dscp 34 \ +--dport 291:400 \ +--sport 564:1092 \ +-m state \ +--state ESTABLISHED \ +-m comment \ +--comment 'udp rule' \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 34 \ +--sport 291:400 \ +--dport 564:1092 \ +-m state \ +--state NEW,ESTABLISHED \ +-m comment \ +--comment 'udp rule' \ +-j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p tcp \ +--destination a:b:c::/128 \ +-m dscp \ +--dscp 57 \ +--dport 32:33 \ +--sport 256:4369 \ +-m state \ +--state ESTABLISHED \ +-m comment \ +--comment 'tcp/ipv6 rule' \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p tcp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source a:b:c::/128 \ +-m dscp \ +--dscp 57 \ +--sport 32:33 \ +--dport 256:4369 \ +-m state \ +--state NEW,ESTABLISHED \ +-m comment \ +--comment 'tcp/ipv6 rule' \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p tcp \ +--destination a:b:c::/128 \ +-m dscp \ +--dscp 57 \ +--dport 32:33 \ +--sport 256:4369 \ +-m state \ +--state ESTABLISHED \ +-m comment \ +--comment 'tcp/ipv6 rule' \ +-j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p udp \ +-m state \ +--state ESTABLISHED \ +-m comment \ +--comment '`ls`;${COLUMNS};$(ls);"test";&'\''3 spaces'\''' \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p udp \ +-m state \ +--state NEW,ESTABLISHED \ +-m comment \ +--comment '`ls`;${COLUMNS};$(ls);"test";&'\''3 spaces'\''' \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p udp \ +-m state \ +--state ESTABLISHED \ +-m comment \ +--comment '`ls`;${COLUMNS};$(ls);"test";&'\''3 spaces'\''' \ +-j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p sctp \ +-m state \ +--state ESTABLISHED \ +-m comment \ +--comment 'comment with lone '\'', `, ", `, \, $x, and two spaces' \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p sctp \ +-m state \ +--state NEW,ESTABLISHED \ +-m comment \ +--comment 'comment with lone '\'', `, ", `, \, $x, and two spaces' \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p sctp \ +-m state \ +--state ESTABLISHED \ +-m comment \ +--comment 'comment with lone '\'', `, ", `, \, $x, and two spaces' \ +-j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p ah \ +-m state \ +--state ESTABLISHED \ +-m comment \ +--comment 'tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm \ +-f ${tmp}' \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p ah \ +-m state \ +--state NEW,ESTABLISHED \ +-m comment \ +--comment 'tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm \ +-f ${tmp}' \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p ah \ +-m state \ +--state ESTABLISHED \ +-m comment \ +--comment 'tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm \ +-f ${tmp}' \ +-j RETURN diff --git a/tests/nwfilterxml2firewalldata/conntrack-linux.args b/tests/nwfilterxml2firewalldata/conntrack-linux.args index 7f3fddd3a3..c653049e8e 100644 --- a/tests/nwfilterxml2firewalldata/conntrack-linux.args +++ b/tests/nwfilterxml2firewalldata/conntrack-linux.args @@ -1,7 +1,42 @@ -iptables -A FJ-vnet0 -p icmp -m connlimit --connlimit-above 1 -j DROP -iptables -A HJ-vnet0 -p icmp -m connlimit --connlimit-above 1 -j DROP -iptables -A FJ-vnet0 -p tcp -m connlimit --connlimit-above 2 -j DROP -iptables -A HJ-vnet0 -p tcp -m connlimit --connlimit-above 2 -j DROP -iptables -A FJ-vnet0 -p all -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p all -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p all -m state --state NEW,ESTABLISHED -j RETURN +iptables \ +-A FJ-vnet0 \ +-p icmp \ +-m connlimit \ +--connlimit-above 1 \ +-j DROP +iptables \ +-A HJ-vnet0 \ +-p icmp \ +-m connlimit \ +--connlimit-above 1 \ +-j DROP +iptables \ +-A FJ-vnet0 \ +-p tcp \ +-m connlimit \ +--connlimit-above 2 \ +-j DROP +iptables \ +-A HJ-vnet0 \ +-p tcp \ +-m connlimit \ +--connlimit-above 2 \ +-j DROP +iptables \ +-A FJ-vnet0 \ +-p all \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p all \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p all \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN diff --git a/tests/nwfilterxml2firewalldata/esp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/esp-ipv6-linux.args index abe8a92f53..51cf74815b 100644 --- a/tests/nwfilterxml2firewalldata/esp-ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/esp-ipv6-linux.args @@ -1,20 +1,92 @@ -ip6tables -A FJ-vnet0 -p esp -m mac --mac-source 01:02:03:04:05:06 \ ---source f:e:d::c:b:a/127 --destination a:b:c::d:e:f/128 -m dscp --dscp 2 -m state \ ---state NEW,ESTABLISHED -j RETURN -ip6tables -A FP-vnet0 -p esp --destination f:e:d::c:b:a/127 \ ---source a:b:c::d:e:f/128 -m dscp --dscp 2 -m state --state ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p esp -m mac --mac-source 01:02:03:04:05:06 \ ---source f:e:d::c:b:a/127 --destination a:b:c::d:e:f/128 -m dscp --dscp 2 -m state \ ---state NEW,ESTABLISHED -j RETURN -ip6tables -A FJ-vnet0 -p esp --destination a:b:c::/128 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -ip6tables -A FP-vnet0 -p esp -m mac --mac-source 01:02:03:04:05:06 \ ---source a:b:c::/128 -m dscp --dscp 33 -m state --state NEW,ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p esp --destination a:b:c::/128 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -ip6tables -A FJ-vnet0 -p esp --destination ::10.1.2.3/128 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -ip6tables -A FP-vnet0 -p esp -m mac --mac-source 01:02:03:04:05:06 \ ---source ::10.1.2.3/128 -m dscp --dscp 33 -m state --state NEW,ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p esp --destination ::10.1.2.3/128 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p esp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source f:e:d::c:b:a/127 \ +--destination a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p esp \ +--destination f:e:d::c:b:a/127 \ +--source a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p esp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source f:e:d::c:b:a/127 \ +--destination a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p esp \ +--destination a:b:c::/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p esp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source a:b:c::/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p esp \ +--destination a:b:c::/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p esp \ +--destination ::10.1.2.3/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p esp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source ::10.1.2.3/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p esp \ +--destination ::10.1.2.3/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN diff --git a/tests/nwfilterxml2firewalldata/esp-linux.args b/tests/nwfilterxml2firewalldata/esp-linux.args index eee656085e..17acb8133c 100644 --- a/tests/nwfilterxml2firewalldata/esp-linux.args +++ b/tests/nwfilterxml2firewalldata/esp-linux.args @@ -1,18 +1,89 @@ -iptables -A FJ-vnet0 -p esp -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p esp --source 10.1.2.3/32 -m dscp --dscp 2 -m state \ ---state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p esp -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p esp --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p esp -m mac --mac-source 01:02:03:04:05:06 \ ---source 10.1.2.3/22 -m dscp --dscp 33 -m state --state NEW,ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p esp --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p esp --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p esp -m mac --mac-source 01:02:03:04:05:06 \ ---source 10.1.2.3/22 -m dscp --dscp 33 -m state --state NEW,ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p esp --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN +iptables \ +-A FJ-vnet0 \ +-p esp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p esp \ +--source 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p esp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p esp \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p esp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p esp \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p esp \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p esp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p esp \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN diff --git a/tests/nwfilterxml2firewalldata/example-1-linux.args b/tests/nwfilterxml2firewalldata/example-1-linux.args index 2a7bd35d1c..c5549f8dd6 100644 --- a/tests/nwfilterxml2firewalldata/example-1-linux.args +++ b/tests/nwfilterxml2firewalldata/example-1-linux.args @@ -1,13 +1,69 @@ -iptables -A FJ-vnet0 -p tcp --sport 22 -m state --state ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --dport 22 -m state --state NEW,ESTABLISHED \ +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--sport 22 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--dport 22 \ +-m state \ +--state NEW,ESTABLISHED \ -j ACCEPT -iptables -A HJ-vnet0 -p tcp --sport 22 -m state --state ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p icmp -m state --state ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p icmp -m state --state NEW,ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p icmp -m state --state ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p all -m state --state ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p all -m state --state NEW,ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p all -m state --state ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p all -j DROP -iptables -A FP-vnet0 -p all -j DROP -iptables -A HJ-vnet0 -p all -j DROP +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--sport 22 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p icmp \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p icmp \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p icmp \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p all \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p all \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p all \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p all \ +-j DROP +iptables \ +-A FP-vnet0 \ +-p all \ +-j DROP +iptables \ +-A HJ-vnet0 \ +-p all \ +-j DROP diff --git a/tests/nwfilterxml2firewalldata/example-2-linux.args b/tests/nwfilterxml2firewalldata/example-2-linux.args index 6bd08148fb..2db58f1e0f 100644 --- a/tests/nwfilterxml2firewalldata/example-2-linux.args +++ b/tests/nwfilterxml2firewalldata/example-2-linux.args @@ -1,20 +1,77 @@ -iptables -A FJ-vnet0 -p all -m state --state ESTABLISHED,RELATED -m comment \ ---comment 'out: existing and related (ftp) connections' -j RETURN -iptables -A HJ-vnet0 -p all -m state --state ESTABLISHED,RELATED -m comment \ ---comment 'out: existing and related (ftp) connections' -j RETURN -iptables -A FP-vnet0 -p all -m state --state ESTABLISHED -m comment \ ---comment 'in: existing connections' -j ACCEPT -iptables -A FP-vnet0 -p tcp --dport 21:22 -m state --state NEW -m comment \ ---comment 'in: ftp and ssh' -j ACCEPT -iptables -A FP-vnet0 -p icmp -m state --state NEW -m comment \ ---comment 'in: icmp' -j ACCEPT -iptables -A FJ-vnet0 -p udp --dport 53 -m state --state NEW -m comment \ ---comment 'out: DNS lookups' -j RETURN -iptables -A HJ-vnet0 -p udp --dport 53 -m state --state NEW -m comment \ ---comment 'out: DNS lookups' -j RETURN -iptables -A FJ-vnet0 -p all -m comment \ ---comment 'inout: drop all non-accepted traffic' -j DROP -iptables -A FP-vnet0 -p all -m comment \ ---comment 'inout: drop all non-accepted traffic' -j DROP -iptables -A HJ-vnet0 -p all -m comment \ ---comment 'inout: drop all non-accepted traffic' -j DROP +iptables \ +-A FJ-vnet0 \ +-p all \ +-m state \ +--state ESTABLISHED,RELATED \ +-m comment \ +--comment 'out: existing and related (ftp) connections' \ +-j RETURN +iptables \ +-A HJ-vnet0 \ +-p all \ +-m state \ +--state ESTABLISHED,RELATED \ +-m comment \ +--comment 'out: existing and related (ftp) connections' \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p all \ +-m state \ +--state ESTABLISHED \ +-m comment \ +--comment 'in: existing connections' \ +-j ACCEPT +iptables \ +-A FP-vnet0 \ +-p tcp \ +--dport 21:22 \ +-m state \ +--state NEW \ +-m comment \ +--comment 'in: ftp and ssh' \ +-j ACCEPT +iptables \ +-A FP-vnet0 \ +-p icmp \ +-m state \ +--state NEW \ +-m comment \ +--comment 'in: icmp' \ +-j ACCEPT +iptables \ +-A FJ-vnet0 \ +-p udp \ +--dport 53 \ +-m state \ +--state NEW \ +-m comment \ +--comment 'out: DNS lookups' \ +-j RETURN +iptables \ +-A HJ-vnet0 \ +-p udp \ +--dport 53 \ +-m state \ +--state NEW \ +-m comment \ +--comment 'out: DNS lookups' \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p all \ +-m comment \ +--comment 'inout: drop all non-accepted traffic' \ +-j DROP +iptables \ +-A FP-vnet0 \ +-p all \ +-m comment \ +--comment 'inout: drop all non-accepted traffic' \ +-j DROP +iptables \ +-A HJ-vnet0 \ +-p all \ +-m comment \ +--comment 'inout: drop all non-accepted traffic' \ +-j DROP diff --git a/tests/nwfilterxml2firewalldata/hex-data-linux.args b/tests/nwfilterxml2firewalldata/hex-data-linux.args index 4d95acfc2b..f1a1f588f2 100644 --- a/tests/nwfilterxml2firewalldata/hex-data-linux.args +++ b/tests/nwfilterxml2firewalldata/hex-data-linux.args @@ -1,28 +1,114 @@ -ebtables -t nat -A libvirt-P-vnet0 -p 0x1234 -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff -p ipv4 --ip-source 10.1.2.3/32 \ ---ip-destination 10.1.2.3/32 --ip-protocol 17 --ip-source-port 291:564 \ ---ip-destination-port 13398:17767 --ip-tos 0x32 -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:fe \ --d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:80 -p ipv6 --ip6-source ::10.1.2.3/22 \ ---ip6-destination ::10.1.2.3/113 --ip6-protocol 6 --ip6-source-port 273:400 \ ---ip6-destination-port 13107:65535 -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff -p 0x806 --arp-htype 18 --arp-opcode 1 \ ---arp-ptype 0x56 --arp-mac-src 01:02:03:04:05:06 --arp-mac-dst 0a:0b:0c:0d:0e:0f \ +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-p 0x1234 \ -j ACCEPT -iptables -A FJ-vnet0 -p udp -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 34 --sport 291:400 --dport 564:1092 -m state \ ---state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp --source 10.1.2.3/32 -m dscp --dscp 34 \ ---dport 291:400 --sport 564:1092 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 34 --sport 291:400 --dport 564:1092 -m state \ ---state NEW,ESTABLISHED -j RETURN -ip6tables -A FJ-vnet0 -p tcp --destination a:b:c::/128 -m dscp --dscp 57 \ ---dport 32:33 --sport 256:4369 -m state --state ESTABLISHED -j RETURN -ip6tables -A FP-vnet0 -p tcp -m mac --mac-source 01:02:03:04:05:06 \ ---source a:b:c::/128 -m dscp --dscp 57 --sport 32:33 --dport 256:4369 -m state \ ---state NEW,ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p tcp --destination a:b:c::/128 -m dscp --dscp 57 \ ---dport 32:33 --sport 256:4369 -m state --state ESTABLISHED -j RETURN +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ +-p ipv4 \ +--ip-source 10.1.2.3/32 \ +--ip-destination 10.1.2.3/32 \ +--ip-protocol 17 \ +--ip-source-port 291:564 \ +--ip-destination-port 13398:17767 \ +--ip-tos 0x32 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:fe \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:80 \ +-p ipv6 \ +--ip6-source ::10.1.2.3/22 \ +--ip6-destination ::10.1.2.3/113 \ +--ip6-protocol 6 \ +--ip6-source-port 273:400 \ +--ip6-destination-port 13107:65535 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ +-p 0x806 \ +--arp-htype 18 \ +--arp-opcode 1 \ +--arp-ptype 0x56 \ +--arp-mac-src 01:02:03:04:05:06 \ +--arp-mac-dst 0a:0b:0c:0d:0e:0f \ +-j ACCEPT +iptables \ +-A FJ-vnet0 \ +-p udp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 34 \ +--sport 291:400 \ +--dport 564:1092 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +--source 10.1.2.3/32 \ +-m dscp \ +--dscp 34 \ +--dport 291:400 \ +--sport 564:1092 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 34 \ +--sport 291:400 \ +--dport 564:1092 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p tcp \ +--destination a:b:c::/128 \ +-m dscp \ +--dscp 57 \ +--dport 32:33 \ +--sport 256:4369 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p tcp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source a:b:c::/128 \ +-m dscp \ +--dscp 57 \ +--sport 32:33 \ +--dport 256:4369 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p tcp \ +--destination a:b:c::/128 \ +-m dscp \ +--dscp 57 \ +--dport 32:33 \ +--sport 256:4369 \ +-m state \ +--state ESTABLISHED \ +-j RETURN diff --git a/tests/nwfilterxml2firewalldata/icmp-direction-linux.args b/tests/nwfilterxml2firewalldata/icmp-direction-linux.args index fd693e6e66..9f481fa831 100644 --- a/tests/nwfilterxml2firewalldata/icmp-direction-linux.args +++ b/tests/nwfilterxml2firewalldata/icmp-direction-linux.args @@ -1,9 +1,33 @@ -iptables -A FP-vnet0 -p icmp --icmp-type 0 -m state --state NEW,ESTABLISHED \ +iptables \ +-A FP-vnet0 \ +-p icmp \ +--icmp-type 0 \ +-m state \ +--state NEW,ESTABLISHED \ -j ACCEPT -iptables -A FJ-vnet0 -p icmp --icmp-type 8 -m state --state NEW,ESTABLISHED \ +iptables \ +-A FJ-vnet0 \ +-p icmp \ +--icmp-type 8 \ +-m state \ +--state NEW,ESTABLISHED \ -j RETURN -iptables -A HJ-vnet0 -p icmp --icmp-type 8 -m state --state NEW,ESTABLISHED \ +iptables \ +-A HJ-vnet0 \ +-p icmp \ +--icmp-type 8 \ +-m state \ +--state NEW,ESTABLISHED \ -j RETURN -iptables -A FJ-vnet0 -p icmp -j DROP -iptables -A FP-vnet0 -p icmp -j DROP -iptables -A HJ-vnet0 -p icmp -j DROP +iptables \ +-A FJ-vnet0 \ +-p icmp \ +-j DROP +iptables \ +-A FP-vnet0 \ +-p icmp \ +-j DROP +iptables \ +-A HJ-vnet0 \ +-p icmp \ +-j DROP diff --git a/tests/nwfilterxml2firewalldata/icmp-direction2-linux.args b/tests/nwfilterxml2firewalldata/icmp-direction2-linux.args index 7686a8b1ee..1faa3d880a 100644 --- a/tests/nwfilterxml2firewalldata/icmp-direction2-linux.args +++ b/tests/nwfilterxml2firewalldata/icmp-direction2-linux.args @@ -1,9 +1,33 @@ -iptables -A FP-vnet0 -p icmp --icmp-type 8 -m state --state NEW,ESTABLISHED \ +iptables \ +-A FP-vnet0 \ +-p icmp \ +--icmp-type 8 \ +-m state \ +--state NEW,ESTABLISHED \ -j ACCEPT -iptables -A FJ-vnet0 -p icmp --icmp-type 0 -m state --state NEW,ESTABLISHED \ +iptables \ +-A FJ-vnet0 \ +-p icmp \ +--icmp-type 0 \ +-m state \ +--state NEW,ESTABLISHED \ -j RETURN -iptables -A HJ-vnet0 -p icmp --icmp-type 0 -m state --state NEW,ESTABLISHED \ +iptables \ +-A HJ-vnet0 \ +-p icmp \ +--icmp-type 0 \ +-m state \ +--state NEW,ESTABLISHED \ -j RETURN -iptables -A FJ-vnet0 -p icmp -j DROP -iptables -A FP-vnet0 -p icmp -j DROP -iptables -A HJ-vnet0 -p icmp -j DROP +iptables \ +-A FJ-vnet0 \ +-p icmp \ +-j DROP +iptables \ +-A FP-vnet0 \ +-p icmp \ +-j DROP +iptables \ +-A HJ-vnet0 \ +-p icmp \ +-j DROP diff --git a/tests/nwfilterxml2firewalldata/icmp-direction3-linux.args b/tests/nwfilterxml2firewalldata/icmp-direction3-linux.args index 37d1717b9a..6cc8e132d9 100644 --- a/tests/nwfilterxml2firewalldata/icmp-direction3-linux.args +++ b/tests/nwfilterxml2firewalldata/icmp-direction3-linux.args @@ -1,6 +1,30 @@ -iptables -A FJ-vnet0 -p icmp -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p icmp -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p icmp -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p all -j DROP -iptables -A FP-vnet0 -p all -j DROP -iptables -A HJ-vnet0 -p all -j DROP +iptables \ +-A FJ-vnet0 \ +-p icmp \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p icmp \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p icmp \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p all \ +-j DROP +iptables \ +-A FP-vnet0 \ +-p all \ +-j DROP +iptables \ +-A HJ-vnet0 \ +-p all \ +-j DROP diff --git a/tests/nwfilterxml2firewalldata/icmp-linux.args b/tests/nwfilterxml2firewalldata/icmp-linux.args index 6ebf541d11..d808f0ea60 100644 --- a/tests/nwfilterxml2firewalldata/icmp-linux.args +++ b/tests/nwfilterxml2firewalldata/icmp-linux.args @@ -1,9 +1,36 @@ -iptables -A FJ-vnet0 -p icmp -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 --icmp-type 12/11 -m state \ ---state NEW,ESTABLISHED -j RETURN -iptables -A HJ-vnet0 -p icmp -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 --icmp-type 12/11 -m state \ ---state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p icmp -m mac --mac-source 01:02:03:04:05:06 \ ---source 10.1.2.3/22 -m dscp --dscp 33 --icmp-type 255/255 -m state \ ---state NEW,ESTABLISHED -j ACCEPT +iptables \ +-A FJ-vnet0 \ +-p icmp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +--icmp-type 12/11 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A HJ-vnet0 \ +-p icmp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +--icmp-type 12/11 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p icmp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +--icmp-type 255/255 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT diff --git a/tests/nwfilterxml2firewalldata/icmpv6-linux.args b/tests/nwfilterxml2firewalldata/icmpv6-linux.args index 9359442d98..92190eb311 100644 --- a/tests/nwfilterxml2firewalldata/icmpv6-linux.args +++ b/tests/nwfilterxml2firewalldata/icmpv6-linux.args @@ -1,12 +1,50 @@ -ip6tables -A FJ-vnet0 -p icmpv6 -m mac --mac-source 01:02:03:04:05:06 \ ---source f:e:d::c:b:a/127 --destination a:b:c::d:e:f/128 -m dscp --dscp 2 \ ---icmpv6-type 12/11 -m state --state NEW,ESTABLISHED -j RETURN -ip6tables -A HJ-vnet0 -p icmpv6 -m mac --mac-source 01:02:03:04:05:06 \ ---source f:e:d::c:b:a/127 --destination a:b:c::d:e:f/128 -m dscp --dscp 2 \ ---icmpv6-type 12/11 -m state --state NEW,ESTABLISHED -j RETURN -ip6tables -A FP-vnet0 -p icmpv6 -m mac --mac-source 01:02:03:04:05:06 \ ---source a:b:c::/128 -m dscp --dscp 33 --icmpv6-type 255/255 -m state \ ---state NEW,ESTABLISHED -j ACCEPT -ip6tables -A FP-vnet0 -p icmpv6 -m mac --mac-source 01:02:03:04:05:06 \ ---source ::10.1.2.3/128 -m dscp --dscp 33 --icmpv6-type 255/255 -m state \ ---state NEW,ESTABLISHED -j ACCEPT +ip6tables \ +-A FJ-vnet0 \ +-p icmpv6 \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source f:e:d::c:b:a/127 \ +--destination a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +--icmpv6-type 12/11 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +ip6tables \ +-A HJ-vnet0 \ +-p icmpv6 \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source f:e:d::c:b:a/127 \ +--destination a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +--icmpv6-type 12/11 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p icmpv6 \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source a:b:c::/128 \ +-m dscp \ +--dscp 33 \ +--icmpv6-type 255/255 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A FP-vnet0 \ +-p icmpv6 \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source ::10.1.2.3/128 \ +-m dscp \ +--dscp 33 \ +--icmpv6-type 255/255 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT diff --git a/tests/nwfilterxml2firewalldata/igmp-linux.args b/tests/nwfilterxml2firewalldata/igmp-linux.args index b562d516be..727463a62d 100644 --- a/tests/nwfilterxml2firewalldata/igmp-linux.args +++ b/tests/nwfilterxml2firewalldata/igmp-linux.args @@ -1,18 +1,89 @@ -iptables -A FJ-vnet0 -p igmp -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p igmp --source 10.1.2.3/32 -m dscp --dscp 2 -m state \ ---state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p igmp -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p igmp --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p igmp -m mac --mac-source 01:02:03:04:05:06 \ ---source 10.1.2.3/22 -m dscp --dscp 33 -m state --state NEW,ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p igmp --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p igmp --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p igmp -m mac --mac-source 01:02:03:04:05:06 \ ---source 10.1.2.3/22 -m dscp --dscp 33 -m state --state NEW,ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p igmp --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m state --state ESTABLISHED -j RETURN +iptables \ +-A FJ-vnet0 \ +-p igmp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p igmp \ +--source 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p igmp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p igmp \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p igmp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p igmp \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p igmp \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p igmp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p igmp \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN diff --git a/tests/nwfilterxml2firewalldata/ip-linux.args b/tests/nwfilterxml2firewalldata/ip-linux.args index ceae1e6ba1..399a47491e 100644 --- a/tests/nwfilterxml2firewalldata/ip-linux.args +++ b/tests/nwfilterxml2firewalldata/ip-linux.args @@ -1,8 +1,30 @@ -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff -p ipv4 --ip-source 10.1.2.3/32 \ ---ip-destination 10.1.2.3/32 --ip-protocol 17 --ip-source-port 20:22 \ ---ip-destination-port 100:101 -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -p ipv4 --ip-source 10.1.2.3/17 \ ---ip-destination 10.1.2.3/24 --ip-protocol 17 --ip-tos 0x3f -j ACCEPT -ebtables -t nat -A libvirt-P-vnet0 -p ipv4 --ip-source 10.1.2.3/31 \ ---ip-destination 10.1.2.3/25 --ip-protocol 255 --ip-tos 0x3f -j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ +-p ipv4 \ +--ip-source 10.1.2.3/32 \ +--ip-destination 10.1.2.3/32 \ +--ip-protocol 17 \ +--ip-source-port 20:22 \ +--ip-destination-port 100:101 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-p ipv4 \ +--ip-source 10.1.2.3/17 \ +--ip-destination 10.1.2.3/24 \ +--ip-protocol 17 \ +--ip-tos 0x3f \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-p ipv4 \ +--ip-source 10.1.2.3/31 \ +--ip-destination 10.1.2.3/25 \ +--ip-protocol 255 \ +--ip-tos 0x3f \ +-j ACCEPT diff --git a/tests/nwfilterxml2firewalldata/ipset-linux.args b/tests/nwfilterxml2firewalldata/ipset-linux.args index 9ec202de39..0fe0739962 100644 --- a/tests/nwfilterxml2firewalldata/ipset-linux.args +++ b/tests/nwfilterxml2firewalldata/ipset-linux.args @@ -1,36 +1,144 @@ -iptables -A FJ-vnet0 -p all -m state --state NEW,ESTABLISHED -m set \ ---match-set tck_test src,dst -j RETURN -iptables -A FP-vnet0 -p all -m state --state ESTABLISHED -m set \ ---match-set tck_test dst,src -j ACCEPT -iptables -A HJ-vnet0 -p all -m state --state NEW,ESTABLISHED -m set \ ---match-set tck_test src,dst -j RETURN -iptables -A FP-vnet0 -p all -m set --match-set tck_test src,dst -m comment \ ---comment in+NONE -j ACCEPT -iptables -A FJ-vnet0 -p all -m set --match-set tck_test src,dst -m comment \ ---comment out+NONE -j RETURN -iptables -A HJ-vnet0 -p all -m set --match-set tck_test src,dst -m comment \ ---comment out+NONE -j RETURN -iptables -A FJ-vnet0 -p all -m state --state ESTABLISHED -m set \ ---match-set tck_test dst,src,dst -j RETURN -iptables -A FP-vnet0 -p all -m state --state NEW,ESTABLISHED -m set \ ---match-set tck_test src,dst,src -j ACCEPT -iptables -A HJ-vnet0 -p all -m state --state ESTABLISHED -m set \ ---match-set tck_test dst,src,dst -j RETURN -iptables -A FJ-vnet0 -p all -m state --state ESTABLISHED -m set \ ---match-set tck_test dst,src,dst -j RETURN -iptables -A FP-vnet0 -p all -m state --state NEW,ESTABLISHED -m set \ ---match-set tck_test src,dst,src -j ACCEPT -iptables -A HJ-vnet0 -p all -m state --state ESTABLISHED -m set \ ---match-set tck_test dst,src,dst -j RETURN -iptables -A FJ-vnet0 -p all -m state --state ESTABLISHED -m set \ ---match-set tck_test dst,src -j RETURN -iptables -A FP-vnet0 -p all -m state --state NEW,ESTABLISHED -m set \ ---match-set tck_test src,dst -j ACCEPT -iptables -A HJ-vnet0 -p all -m state --state ESTABLISHED -m set \ ---match-set tck_test dst,src -j RETURN -iptables -A FJ-vnet0 -p all -m set --match-set tck_test dst,src -m comment \ ---comment inout -j RETURN -iptables -A FP-vnet0 -p all -m set --match-set tck_test src,dst -m comment \ ---comment inout -j ACCEPT -iptables -A HJ-vnet0 -p all -m set --match-set tck_test dst,src -m comment \ ---comment inout -j RETURN +iptables \ +-A FJ-vnet0 \ +-p all \ +-m state \ +--state NEW,ESTABLISHED \ +-m set \ +--match-set tck_test src,dst \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p all \ +-m state \ +--state ESTABLISHED \ +-m set \ +--match-set tck_test dst,src \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p all \ +-m state \ +--state NEW,ESTABLISHED \ +-m set \ +--match-set tck_test src,dst \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p all \ +-m set \ +--match-set tck_test src,dst \ +-m comment \ +--comment in+NONE \ +-j ACCEPT +iptables \ +-A FJ-vnet0 \ +-p all \ +-m set \ +--match-set tck_test src,dst \ +-m comment \ +--comment out+NONE \ +-j RETURN +iptables \ +-A HJ-vnet0 \ +-p all \ +-m set \ +--match-set tck_test src,dst \ +-m comment \ +--comment out+NONE \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p all \ +-m state \ +--state ESTABLISHED \ +-m set \ +--match-set tck_test dst,src,dst \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p all \ +-m state \ +--state NEW,ESTABLISHED \ +-m set \ +--match-set tck_test src,dst,src \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p all \ +-m state \ +--state ESTABLISHED \ +-m set \ +--match-set tck_test dst,src,dst \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p all \ +-m state \ +--state ESTABLISHED \ +-m set \ +--match-set tck_test dst,src,dst \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p all \ +-m state \ +--state NEW,ESTABLISHED \ +-m set \ +--match-set tck_test src,dst,src \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p all \ +-m state \ +--state ESTABLISHED \ +-m set \ +--match-set tck_test dst,src,dst \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p all \ +-m state \ +--state ESTABLISHED \ +-m set \ +--match-set tck_test dst,src \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p all \ +-m state \ +--state NEW,ESTABLISHED \ +-m set \ +--match-set tck_test src,dst \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p all \ +-m state \ +--state ESTABLISHED \ +-m set \ +--match-set tck_test dst,src \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p all \ +-m set \ +--match-set tck_test dst,src \ +-m comment \ +--comment inout \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p all \ +-m set \ +--match-set tck_test src,dst \ +-m comment \ +--comment inout \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p all \ +-m set \ +--match-set tck_test dst,src \ +-m comment \ +--comment inout \ +-j RETURN diff --git a/tests/nwfilterxml2firewalldata/ipt-no-macspoof-linux.args b/tests/nwfilterxml2firewalldata/ipt-no-macspoof-linux.args index dc1bbdb165..86ab228fb8 100644 --- a/tests/nwfilterxml2firewalldata/ipt-no-macspoof-linux.args +++ b/tests/nwfilterxml2firewalldata/ipt-no-macspoof-linux.args @@ -1,2 +1,12 @@ -iptables -A FP-vnet0 -p all -m mac '!' --mac-source 12:34:56:78:9a:bc -j DROP -iptables -A FP-vnet0 -p all -m mac '!' --mac-source aa:aa:aa:aa:aa:aa -j DROP +iptables \ +-A FP-vnet0 \ +-p all \ +-m mac '!' \ +--mac-source 12:34:56:78:9a:bc \ +-j DROP +iptables \ +-A FP-vnet0 \ +-p all \ +-m mac '!' \ +--mac-source aa:aa:aa:aa:aa:aa \ +-j DROP diff --git a/tests/nwfilterxml2firewalldata/ipv6-linux.args b/tests/nwfilterxml2firewalldata/ipv6-linux.args index 735f663716..6fba19f2eb 100644 --- a/tests/nwfilterxml2firewalldata/ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/ipv6-linux.args @@ -1,36 +1,140 @@ -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:fe \ --d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:80 -p ipv6 --ip6-source ::10.1.2.3/22 \ ---ip6-destination ::10.1.2.3/113 --ip6-protocol 17 --ip6-source-port 20:22 \ ---ip6-destination-port 100:101 -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -p ipv6 --ip6-destination 1::2/128 \ ---ip6-source a:b:c::/65 --ip6-protocol 6 --ip6-destination-port 20:22 \ ---ip6-source-port 100:101 -j ACCEPT -ebtables -t nat -A libvirt-P-vnet0 -p ipv6 --ip6-source 1::2/128 \ ---ip6-destination a:b:c::/65 --ip6-protocol 6 --ip6-source-port 20:22 \ ---ip6-destination-port 100:101 -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -p ipv6 --ip6-destination 1::2/128 \ ---ip6-source a:b:c::/65 --ip6-protocol 6 --ip6-destination-port 255:256 \ ---ip6-source-port 65535:65535 -j ACCEPT -ebtables -t nat -A libvirt-P-vnet0 -p ipv6 --ip6-source 1::2/128 \ ---ip6-destination a:b:c::/65 --ip6-protocol 6 --ip6-source-port 255:256 \ ---ip6-destination-port 65535:65535 -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -p ipv6 --ip6-destination 1::2/128 \ ---ip6-source a:b:c::/65 --ip6-protocol 18 -j ACCEPT -ebtables -t nat -A libvirt-P-vnet0 -p ipv6 --ip6-source 1::2/128 \ ---ip6-destination a:b:c::/65 --ip6-protocol 18 -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -p ipv6 --ip6-destination 1::2/128 \ ---ip6-source a:b:c::/65 --ip6-protocol 58 --ip6-icmp-type 1:11/10:11 -j ACCEPT -ebtables -t nat -A libvirt-P-vnet0 -p ipv6 --ip6-source 1::2/128 \ ---ip6-destination a:b:c::/65 --ip6-protocol 58 --ip6-icmp-type 1:11/10:11 -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -p ipv6 --ip6-destination 1::2/128 \ ---ip6-source a:b:c::/65 --ip6-protocol 58 --ip6-icmp-type 1:1/10:10 -j ACCEPT -ebtables -t nat -A libvirt-P-vnet0 -p ipv6 --ip6-source 1::2/128 \ ---ip6-destination a:b:c::/65 --ip6-protocol 58 --ip6-icmp-type 1:1/10:10 -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -p ipv6 --ip6-destination 1::2/128 \ ---ip6-source a:b:c::/65 --ip6-protocol 58 --ip6-icmp-type 0:255/10:10 -j ACCEPT -ebtables -t nat -A libvirt-P-vnet0 -p ipv6 --ip6-source 1::2/128 \ ---ip6-destination a:b:c::/65 --ip6-protocol 58 --ip6-icmp-type 0:255/10:10 -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -p ipv6 --ip6-destination 1::2/128 \ ---ip6-source a:b:c::/65 --ip6-protocol 58 --ip6-icmp-type 1:1/0:255 -j ACCEPT -ebtables -t nat -A libvirt-P-vnet0 -p ipv6 --ip6-source 1::2/128 \ ---ip6-destination a:b:c::/65 --ip6-protocol 58 --ip6-icmp-type 1:1/0:255 -j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:fe \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:80 \ +-p ipv6 \ +--ip6-source ::10.1.2.3/22 \ +--ip6-destination ::10.1.2.3/113 \ +--ip6-protocol 17 \ +--ip6-source-port 20:22 \ +--ip6-destination-port 100:101 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-p ipv6 \ +--ip6-destination 1::2/128 \ +--ip6-source a:b:c::/65 \ +--ip6-protocol 6 \ +--ip6-destination-port 20:22 \ +--ip6-source-port 100:101 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-p ipv6 \ +--ip6-source 1::2/128 \ +--ip6-destination a:b:c::/65 \ +--ip6-protocol 6 \ +--ip6-source-port 20:22 \ +--ip6-destination-port 100:101 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-p ipv6 \ +--ip6-destination 1::2/128 \ +--ip6-source a:b:c::/65 \ +--ip6-protocol 6 \ +--ip6-destination-port 255:256 \ +--ip6-source-port 65535:65535 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-p ipv6 \ +--ip6-source 1::2/128 \ +--ip6-destination a:b:c::/65 \ +--ip6-protocol 6 \ +--ip6-source-port 255:256 \ +--ip6-destination-port 65535:65535 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-p ipv6 \ +--ip6-destination 1::2/128 \ +--ip6-source a:b:c::/65 \ +--ip6-protocol 18 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-p ipv6 \ +--ip6-source 1::2/128 \ +--ip6-destination a:b:c::/65 \ +--ip6-protocol 18 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-p ipv6 \ +--ip6-destination 1::2/128 \ +--ip6-source a:b:c::/65 \ +--ip6-protocol 58 \ +--ip6-icmp-type 1:11/10:11 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-p ipv6 \ +--ip6-source 1::2/128 \ +--ip6-destination a:b:c::/65 \ +--ip6-protocol 58 \ +--ip6-icmp-type 1:11/10:11 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-p ipv6 \ +--ip6-destination 1::2/128 \ +--ip6-source a:b:c::/65 \ +--ip6-protocol 58 \ +--ip6-icmp-type 1:1/10:10 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-p ipv6 \ +--ip6-source 1::2/128 \ +--ip6-destination a:b:c::/65 \ +--ip6-protocol 58 \ +--ip6-icmp-type 1:1/10:10 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-p ipv6 \ +--ip6-destination 1::2/128 \ +--ip6-source a:b:c::/65 \ +--ip6-protocol 58 \ +--ip6-icmp-type 0:255/10:10 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-p ipv6 \ +--ip6-source 1::2/128 \ +--ip6-destination a:b:c::/65 \ +--ip6-protocol 58 \ +--ip6-icmp-type 0:255/10:10 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-p ipv6 \ +--ip6-destination 1::2/128 \ +--ip6-source a:b:c::/65 \ +--ip6-protocol 58 \ +--ip6-icmp-type 1:1/0:255 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-p ipv6 \ +--ip6-source 1::2/128 \ +--ip6-destination a:b:c::/65 \ +--ip6-protocol 58 \ +--ip6-icmp-type 1:1/0:255 \ +-j ACCEPT diff --git a/tests/nwfilterxml2firewalldata/iter1-linux.args b/tests/nwfilterxml2firewalldata/iter1-linux.args index f6d96edba0..31f37cf537 100644 --- a/tests/nwfilterxml2firewalldata/iter1-linux.args +++ b/tests/nwfilterxml2firewalldata/iter1-linux.args @@ -1,18 +1,90 @@ -iptables -A FJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 2 --sport 80 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 1.1.1.1 -m dscp --dscp 2 --dport 80 \ --m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 2 --sport 80 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 2.2.2.2 -m dscp --dscp 2 --sport 90 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 2.2.2.2 -m dscp --dscp 2 --dport 90 \ --m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 2.2.2.2 -m dscp --dscp 2 --sport 90 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 3.3.3.3 -m dscp --dscp 2 --sport 80 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 3.3.3.3 -m dscp --dscp 2 --dport 80 \ --m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 3.3.3.3 -m dscp --dscp 2 --sport 80 \ --m state --state NEW,ESTABLISHED -j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 2 \ +--sport 80 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 2 \ +--dport 80 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 2 \ +--sport 80 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 2 \ +--sport 90 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 2 \ +--dport 90 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 2 \ +--sport 90 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 2 \ +--sport 80 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 2 \ +--dport 80 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 2 \ +--sport 80 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN diff --git a/tests/nwfilterxml2firewalldata/iter2-linux.args b/tests/nwfilterxml2firewalldata/iter2-linux.args index a799cd538d..4230a9d524 100644 --- a/tests/nwfilterxml2firewalldata/iter2-linux.args +++ b/tests/nwfilterxml2firewalldata/iter2-linux.args @@ -1,342 +1,1818 @@ -iptables -A FJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 1 --sport 80 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 1.1.1.1 -m dscp --dscp 1 --dport 80 \ --m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 1 --sport 80 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 2.2.2.2 -m dscp --dscp 1 --sport 90 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 2.2.2.2 -m dscp --dscp 1 --dport 90 \ --m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 2.2.2.2 -m dscp --dscp 1 --sport 90 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 3.3.3.3 -m dscp --dscp 1 --sport 80 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 3.3.3.3 -m dscp --dscp 1 --dport 80 \ --m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 3.3.3.3 -m dscp --dscp 1 --sport 80 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udp --source 1.1.1.1 -m dscp --dscp 2 --sport 80 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp --destination 1.1.1.1 -m dscp --dscp 2 --dport 80 \ --m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp --source 1.1.1.1 -m dscp --dscp 2 --sport 80 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udp --source 2.2.2.2 -m dscp --dscp 2 --sport 80 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp --destination 2.2.2.2 -m dscp --dscp 2 --dport 80 \ --m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp --source 2.2.2.2 -m dscp --dscp 2 --sport 80 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udp --source 3.3.3.3 -m dscp --dscp 2 --sport 80 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp --destination 3.3.3.3 -m dscp --dscp 2 --dport 80 \ --m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp --source 3.3.3.3 -m dscp --dscp 2 --sport 80 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udp --source 1.1.1.1 -m dscp --dscp 2 --sport 90 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp --destination 1.1.1.1 -m dscp --dscp 2 --dport 90 \ --m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp --source 1.1.1.1 -m dscp --dscp 2 --sport 90 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udp --source 2.2.2.2 -m dscp --dscp 2 --sport 90 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp --destination 2.2.2.2 -m dscp --dscp 2 --dport 90 \ --m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp --source 2.2.2.2 -m dscp --dscp 2 --sport 90 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udp --source 3.3.3.3 -m dscp --dscp 2 --sport 90 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp --destination 3.3.3.3 -m dscp --dscp 2 --dport 90 \ --m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp --source 3.3.3.3 -m dscp --dscp 2 --sport 90 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p sctp --source 1.1.1.1 -m dscp --dscp 3 --sport 80 \ ---dport 1080 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p sctp --destination 1.1.1.1 -m dscp --dscp 3 \ ---dport 80 --sport 1080 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p sctp --source 1.1.1.1 -m dscp --dscp 3 --sport 80 \ ---dport 1080 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p sctp --source 2.2.2.2 -m dscp --dscp 3 --sport 80 \ ---dport 1080 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p sctp --destination 2.2.2.2 -m dscp --dscp 3 \ ---dport 80 --sport 1080 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p sctp --source 2.2.2.2 -m dscp --dscp 3 --sport 80 \ ---dport 1080 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p sctp --source 3.3.3.3 -m dscp --dscp 3 --sport 80 \ ---dport 1080 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p sctp --destination 3.3.3.3 -m dscp --dscp 3 \ ---dport 80 --sport 1080 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p sctp --source 3.3.3.3 -m dscp --dscp 3 --sport 80 \ ---dport 1080 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p sctp --source 1.1.1.1 -m dscp --dscp 3 --sport 90 \ ---dport 1090 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p sctp --destination 1.1.1.1 -m dscp --dscp 3 \ ---dport 90 --sport 1090 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p sctp --source 1.1.1.1 -m dscp --dscp 3 --sport 90 \ ---dport 1090 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p sctp --source 2.2.2.2 -m dscp --dscp 3 --sport 90 \ ---dport 1090 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p sctp --destination 2.2.2.2 -m dscp --dscp 3 \ ---dport 90 --sport 1090 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p sctp --source 2.2.2.2 -m dscp --dscp 3 --sport 90 \ ---dport 1090 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p sctp --source 3.3.3.3 -m dscp --dscp 3 --sport 90 \ ---dport 1090 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p sctp --destination 3.3.3.3 -m dscp --dscp 3 \ ---dport 90 --sport 1090 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p sctp --source 3.3.3.3 -m dscp --dscp 3 --sport 90 \ ---dport 1090 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p sctp --source 1.1.1.1 -m dscp --dscp 3 --sport 80 \ ---dport 1100 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p sctp --destination 1.1.1.1 -m dscp --dscp 3 \ ---dport 80 --sport 1100 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p sctp --source 1.1.1.1 -m dscp --dscp 3 --sport 80 \ ---dport 1100 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p sctp --source 2.2.2.2 -m dscp --dscp 3 --sport 80 \ ---dport 1100 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p sctp --destination 2.2.2.2 -m dscp --dscp 3 \ ---dport 80 --sport 1100 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p sctp --source 2.2.2.2 -m dscp --dscp 3 --sport 80 \ ---dport 1100 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p sctp --source 3.3.3.3 -m dscp --dscp 3 --sport 80 \ ---dport 1100 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p sctp --destination 3.3.3.3 -m dscp --dscp 3 \ ---dport 80 --sport 1100 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p sctp --source 3.3.3.3 -m dscp --dscp 3 --sport 80 \ ---dport 1100 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p sctp --source 1.1.1.1 -m dscp --dscp 3 --sport 80 \ ---dport 1110 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p sctp --destination 1.1.1.1 -m dscp --dscp 3 \ ---dport 80 --sport 1110 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p sctp --source 1.1.1.1 -m dscp --dscp 3 --sport 80 \ ---dport 1110 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p sctp --source 2.2.2.2 -m dscp --dscp 3 --sport 80 \ ---dport 1110 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p sctp --destination 2.2.2.2 -m dscp --dscp 3 \ ---dport 80 --sport 1110 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p sctp --source 2.2.2.2 -m dscp --dscp 3 --sport 80 \ ---dport 1110 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p sctp --source 3.3.3.3 -m dscp --dscp 3 --sport 80 \ ---dport 1110 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p sctp --destination 3.3.3.3 -m dscp --dscp 3 \ ---dport 80 --sport 1110 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p sctp --source 3.3.3.3 -m dscp --dscp 3 --sport 80 \ ---dport 1110 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 4 --sport 80 \ ---dport 1080 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 1.1.1.1 -m dscp --dscp 4 --dport 80 \ ---sport 1080 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 4 --sport 80 \ ---dport 1080 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 2.2.2.2 -m dscp --dscp 4 --sport 80 \ ---dport 1080 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 2.2.2.2 -m dscp --dscp 4 --dport 80 \ ---sport 1080 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 2.2.2.2 -m dscp --dscp 4 --sport 80 \ ---dport 1080 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 3.3.3.3 -m dscp --dscp 4 --sport 80 \ ---dport 1080 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 3.3.3.3 -m dscp --dscp 4 --dport 80 \ ---sport 1080 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 3.3.3.3 -m dscp --dscp 4 --sport 80 \ ---dport 1080 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 4 --sport 90 \ ---dport 1080 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 1.1.1.1 -m dscp --dscp 4 --dport 90 \ ---sport 1080 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 4 --sport 90 \ ---dport 1080 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 2.2.2.2 -m dscp --dscp 4 --sport 90 \ ---dport 1080 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 2.2.2.2 -m dscp --dscp 4 --dport 90 \ ---sport 1080 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 2.2.2.2 -m dscp --dscp 4 --sport 90 \ ---dport 1080 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 3.3.3.3 -m dscp --dscp 4 --sport 90 \ ---dport 1080 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 3.3.3.3 -m dscp --dscp 4 --dport 90 \ ---sport 1080 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 3.3.3.3 -m dscp --dscp 4 --sport 90 \ ---dport 1080 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 4 --sport 80 \ ---dport 1090 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 1.1.1.1 -m dscp --dscp 4 --dport 80 \ ---sport 1090 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 4 --sport 80 \ ---dport 1090 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 2.2.2.2 -m dscp --dscp 4 --sport 80 \ ---dport 1090 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 2.2.2.2 -m dscp --dscp 4 --dport 80 \ ---sport 1090 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 2.2.2.2 -m dscp --dscp 4 --sport 80 \ ---dport 1090 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 3.3.3.3 -m dscp --dscp 4 --sport 80 \ ---dport 1090 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 3.3.3.3 -m dscp --dscp 4 --dport 80 \ ---sport 1090 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 3.3.3.3 -m dscp --dscp 4 --sport 80 \ ---dport 1090 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 4 --sport 90 \ ---dport 1090 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 1.1.1.1 -m dscp --dscp 4 --dport 90 \ ---sport 1090 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 4 --sport 90 \ ---dport 1090 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 2.2.2.2 -m dscp --dscp 4 --sport 90 \ ---dport 1090 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 2.2.2.2 -m dscp --dscp 4 --dport 90 \ ---sport 1090 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 2.2.2.2 -m dscp --dscp 4 --sport 90 \ ---dport 1090 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 3.3.3.3 -m dscp --dscp 4 --sport 90 \ ---dport 1090 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 3.3.3.3 -m dscp --dscp 4 --dport 90 \ ---sport 1090 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 3.3.3.3 -m dscp --dscp 4 --sport 90 \ ---dport 1090 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 4 --sport 80 \ ---dport 1100 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 1.1.1.1 -m dscp --dscp 4 --dport 80 \ ---sport 1100 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 4 --sport 80 \ ---dport 1100 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 2.2.2.2 -m dscp --dscp 4 --sport 80 \ ---dport 1100 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 2.2.2.2 -m dscp --dscp 4 --dport 80 \ ---sport 1100 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 2.2.2.2 -m dscp --dscp 4 --sport 80 \ ---dport 1100 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 3.3.3.3 -m dscp --dscp 4 --sport 80 \ ---dport 1100 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 3.3.3.3 -m dscp --dscp 4 --dport 80 \ ---sport 1100 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 3.3.3.3 -m dscp --dscp 4 --sport 80 \ ---dport 1100 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 4 --sport 90 \ ---dport 1100 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 1.1.1.1 -m dscp --dscp 4 --dport 90 \ ---sport 1100 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 4 --sport 90 \ ---dport 1100 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 2.2.2.2 -m dscp --dscp 4 --sport 90 \ ---dport 1100 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 2.2.2.2 -m dscp --dscp 4 --dport 90 \ ---sport 1100 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 2.2.2.2 -m dscp --dscp 4 --sport 90 \ ---dport 1100 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 3.3.3.3 -m dscp --dscp 4 --sport 90 \ ---dport 1100 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 3.3.3.3 -m dscp --dscp 4 --dport 90 \ ---sport 1100 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 3.3.3.3 -m dscp --dscp 4 --sport 90 \ ---dport 1100 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 4 --sport 80 \ ---dport 1110 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 1.1.1.1 -m dscp --dscp 4 --dport 80 \ ---sport 1110 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 4 --sport 80 \ ---dport 1110 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 2.2.2.2 -m dscp --dscp 4 --sport 80 \ ---dport 1110 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 2.2.2.2 -m dscp --dscp 4 --dport 80 \ ---sport 1110 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 2.2.2.2 -m dscp --dscp 4 --sport 80 \ ---dport 1110 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 3.3.3.3 -m dscp --dscp 4 --sport 80 \ ---dport 1110 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 3.3.3.3 -m dscp --dscp 4 --dport 80 \ ---sport 1110 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 3.3.3.3 -m dscp --dscp 4 --sport 80 \ ---dport 1110 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 4 --sport 90 \ ---dport 1110 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 1.1.1.1 -m dscp --dscp 4 --dport 90 \ ---sport 1110 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 4 --sport 90 \ ---dport 1110 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 2.2.2.2 -m dscp --dscp 4 --sport 90 \ ---dport 1110 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 2.2.2.2 -m dscp --dscp 4 --dport 90 \ ---sport 1110 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 2.2.2.2 -m dscp --dscp 4 --sport 90 \ ---dport 1110 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 3.3.3.3 -m dscp --dscp 4 --sport 90 \ ---dport 1110 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 3.3.3.3 -m dscp --dscp 4 --dport 90 \ ---sport 1110 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 3.3.3.3 -m dscp --dscp 4 --sport 90 \ ---dport 1110 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udp --source 1.1.1.1 --destination 1.1.1.1 -m dscp \ ---dscp 5 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp --destination 1.1.1.1 --source 1.1.1.1 -m dscp \ ---dscp 5 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp --source 1.1.1.1 --destination 1.1.1.1 -m dscp \ ---dscp 5 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udp --source 2.2.2.2 --destination 1.1.1.1 -m dscp \ ---dscp 5 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp --destination 2.2.2.2 --source 1.1.1.1 -m dscp \ ---dscp 5 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp --source 2.2.2.2 --destination 1.1.1.1 -m dscp \ ---dscp 5 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udp --source 3.3.3.3 --destination 1.1.1.1 -m dscp \ ---dscp 5 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp --destination 3.3.3.3 --source 1.1.1.1 -m dscp \ ---dscp 5 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp --source 3.3.3.3 --destination 1.1.1.1 -m dscp \ ---dscp 5 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udp --source 1.1.1.1 --destination 2.2.2.2 -m dscp \ ---dscp 5 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp --destination 1.1.1.1 --source 2.2.2.2 -m dscp \ ---dscp 5 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp --source 1.1.1.1 --destination 2.2.2.2 -m dscp \ ---dscp 5 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udp --source 2.2.2.2 --destination 2.2.2.2 -m dscp \ ---dscp 5 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp --destination 2.2.2.2 --source 2.2.2.2 -m dscp \ ---dscp 5 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp --source 2.2.2.2 --destination 2.2.2.2 -m dscp \ ---dscp 5 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udp --source 3.3.3.3 --destination 2.2.2.2 -m dscp \ ---dscp 5 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp --destination 3.3.3.3 --source 2.2.2.2 -m dscp \ ---dscp 5 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp --source 3.3.3.3 --destination 2.2.2.2 -m dscp \ ---dscp 5 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udp --source 1.1.1.1 --destination 3.3.3.3 -m dscp \ ---dscp 5 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp --destination 1.1.1.1 --source 3.3.3.3 -m dscp \ ---dscp 5 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp --source 1.1.1.1 --destination 3.3.3.3 -m dscp \ ---dscp 5 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udp --source 2.2.2.2 --destination 3.3.3.3 -m dscp \ ---dscp 5 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp --destination 2.2.2.2 --source 3.3.3.3 -m dscp \ ---dscp 5 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp --source 2.2.2.2 --destination 3.3.3.3 -m dscp \ ---dscp 5 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udp --source 3.3.3.3 --destination 3.3.3.3 -m dscp \ ---dscp 5 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp --destination 3.3.3.3 --source 3.3.3.3 -m dscp \ ---dscp 5 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp --source 3.3.3.3 --destination 3.3.3.3 -m dscp \ ---dscp 5 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p sctp --source 1.1.1.1 --destination 1.1.1.1 -m dscp \ ---dscp 6 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p sctp --destination 1.1.1.1 --source 1.1.1.1 -m dscp \ ---dscp 6 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p sctp --source 1.1.1.1 --destination 1.1.1.1 -m dscp \ ---dscp 6 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p sctp --source 2.2.2.2 --destination 2.2.2.2 -m dscp \ ---dscp 6 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p sctp --destination 2.2.2.2 --source 2.2.2.2 -m dscp \ ---dscp 6 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p sctp --source 2.2.2.2 --destination 2.2.2.2 -m dscp \ ---dscp 6 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p sctp --source 3.3.3.3 --destination 3.3.3.3 -m dscp \ ---dscp 6 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p sctp --destination 3.3.3.3 --source 3.3.3.3 -m dscp \ ---dscp 6 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p sctp --source 3.3.3.3 --destination 3.3.3.3 -m dscp \ ---dscp 6 -m state --state NEW,ESTABLISHED -j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 1 \ +--sport 80 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 1 \ +--dport 80 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 1 \ +--sport 80 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 1 \ +--sport 90 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 1 \ +--dport 90 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 1 \ +--sport 90 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 1 \ +--sport 80 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 1 \ +--dport 80 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 1 \ +--sport 80 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 2 \ +--sport 80 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 2 \ +--dport 80 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 2 \ +--sport 80 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 2 \ +--sport 80 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 2 \ +--dport 80 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 2 \ +--sport 80 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 2 \ +--sport 80 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 2 \ +--dport 80 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 2 \ +--sport 80 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 2 \ +--sport 90 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 2 \ +--dport 90 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 2 \ +--sport 90 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 2 \ +--sport 90 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 2 \ +--dport 90 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 2 \ +--sport 90 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 2 \ +--sport 90 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 2 \ +--dport 90 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 2 \ +--sport 90 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p sctp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 3 \ +--sport 80 \ +--dport 1080 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p sctp \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 3 \ +--dport 80 \ +--sport 1080 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p sctp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 3 \ +--sport 80 \ +--dport 1080 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p sctp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 3 \ +--sport 80 \ +--dport 1080 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p sctp \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 3 \ +--dport 80 \ +--sport 1080 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p sctp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 3 \ +--sport 80 \ +--dport 1080 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p sctp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 3 \ +--sport 80 \ +--dport 1080 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p sctp \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 3 \ +--dport 80 \ +--sport 1080 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p sctp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 3 \ +--sport 80 \ +--dport 1080 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p sctp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 3 \ +--sport 90 \ +--dport 1090 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p sctp \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 3 \ +--dport 90 \ +--sport 1090 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p sctp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 3 \ +--sport 90 \ +--dport 1090 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p sctp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 3 \ +--sport 90 \ +--dport 1090 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p sctp \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 3 \ +--dport 90 \ +--sport 1090 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p sctp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 3 \ +--sport 90 \ +--dport 1090 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p sctp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 3 \ +--sport 90 \ +--dport 1090 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p sctp \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 3 \ +--dport 90 \ +--sport 1090 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p sctp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 3 \ +--sport 90 \ +--dport 1090 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p sctp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 3 \ +--sport 80 \ +--dport 1100 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p sctp \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 3 \ +--dport 80 \ +--sport 1100 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p sctp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 3 \ +--sport 80 \ +--dport 1100 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p sctp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 3 \ +--sport 80 \ +--dport 1100 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p sctp \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 3 \ +--dport 80 \ +--sport 1100 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p sctp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 3 \ +--sport 80 \ +--dport 1100 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p sctp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 3 \ +--sport 80 \ +--dport 1100 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p sctp \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 3 \ +--dport 80 \ +--sport 1100 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p sctp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 3 \ +--sport 80 \ +--dport 1100 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p sctp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 3 \ +--sport 80 \ +--dport 1110 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p sctp \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 3 \ +--dport 80 \ +--sport 1110 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p sctp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 3 \ +--sport 80 \ +--dport 1110 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p sctp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 3 \ +--sport 80 \ +--dport 1110 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p sctp \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 3 \ +--dport 80 \ +--sport 1110 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p sctp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 3 \ +--sport 80 \ +--dport 1110 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p sctp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 3 \ +--sport 80 \ +--dport 1110 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p sctp \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 3 \ +--dport 80 \ +--sport 1110 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p sctp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 3 \ +--sport 80 \ +--dport 1110 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1080 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--dport 80 \ +--sport 1080 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1080 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1080 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--dport 80 \ +--sport 1080 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1080 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1080 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--dport 80 \ +--sport 1080 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1080 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1080 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--dport 90 \ +--sport 1080 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1080 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1080 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--dport 90 \ +--sport 1080 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1080 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1080 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--dport 90 \ +--sport 1080 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1080 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1090 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--dport 80 \ +--sport 1090 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1090 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1090 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--dport 80 \ +--sport 1090 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1090 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1090 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--dport 80 \ +--sport 1090 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1090 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1090 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--dport 90 \ +--sport 1090 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1090 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1090 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--dport 90 \ +--sport 1090 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1090 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1090 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--dport 90 \ +--sport 1090 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1090 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1100 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--dport 80 \ +--sport 1100 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1100 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1100 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--dport 80 \ +--sport 1100 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1100 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1100 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--dport 80 \ +--sport 1100 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1100 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1100 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--dport 90 \ +--sport 1100 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1100 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1100 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--dport 90 \ +--sport 1100 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1100 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1100 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--dport 90 \ +--sport 1100 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1100 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1110 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--dport 80 \ +--sport 1110 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1110 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1110 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--dport 80 \ +--sport 1110 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1110 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1110 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--dport 80 \ +--sport 1110 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--sport 80 \ +--dport 1110 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1110 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--dport 90 \ +--sport 1110 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1110 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1110 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--dport 90 \ +--sport 1110 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1110 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1110 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--dport 90 \ +--sport 1110 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 4 \ +--sport 90 \ +--dport 1110 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udp \ +--source 1.1.1.1 \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +--destination 1.1.1.1 \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +--source 1.1.1.1 \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udp \ +--source 2.2.2.2 \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +--destination 2.2.2.2 \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +--source 2.2.2.2 \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udp \ +--source 3.3.3.3 \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +--destination 3.3.3.3 \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +--source 3.3.3.3 \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udp \ +--source 1.1.1.1 \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +--destination 1.1.1.1 \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +--source 1.1.1.1 \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udp \ +--source 2.2.2.2 \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +--destination 2.2.2.2 \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +--source 2.2.2.2 \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udp \ +--source 3.3.3.3 \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +--destination 3.3.3.3 \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +--source 3.3.3.3 \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udp \ +--source 1.1.1.1 \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +--destination 1.1.1.1 \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +--source 1.1.1.1 \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udp \ +--source 2.2.2.2 \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +--destination 2.2.2.2 \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +--source 2.2.2.2 \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udp \ +--source 3.3.3.3 \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +--destination 3.3.3.3 \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +--source 3.3.3.3 \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 5 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p sctp \ +--source 1.1.1.1 \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 6 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p sctp \ +--destination 1.1.1.1 \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 6 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p sctp \ +--source 1.1.1.1 \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 6 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p sctp \ +--source 2.2.2.2 \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 6 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p sctp \ +--destination 2.2.2.2 \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 6 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p sctp \ +--source 2.2.2.2 \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 6 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p sctp \ +--source 3.3.3.3 \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 6 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p sctp \ +--destination 3.3.3.3 \ +--source 3.3.3.3 \ +-m dscp \ +--dscp 6 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p sctp \ +--source 3.3.3.3 \ +--destination 3.3.3.3 \ +-m dscp \ +--dscp 6 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN diff --git a/tests/nwfilterxml2firewalldata/iter3-linux.args b/tests/nwfilterxml2firewalldata/iter3-linux.args index 575da79630..0b16577992 100644 --- a/tests/nwfilterxml2firewalldata/iter3-linux.args +++ b/tests/nwfilterxml2firewalldata/iter3-linux.args @@ -1,30 +1,153 @@ -iptables -A FJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 1 --sport 80 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 1.1.1.1 -m dscp --dscp 1 --dport 80 \ --m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 1 --sport 80 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 1 --sport 90 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --destination 1.1.1.1 -m dscp --dscp 1 --dport 90 \ --m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp --source 1.1.1.1 -m dscp --dscp 1 --sport 90 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udp --source 2.2.2.2 -m dscp --dscp 2 --sport 80 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp --destination 2.2.2.2 -m dscp --dscp 2 --dport 80 \ --m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp --source 2.2.2.2 -m dscp --dscp 2 --sport 80 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udp --source 2.2.2.2 -m dscp --dscp 2 --sport 90 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp --destination 2.2.2.2 -m dscp --dscp 2 --dport 90 \ --m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp --source 2.2.2.2 -m dscp --dscp 2 --sport 90 \ --m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p sctp --source 2.2.2.2 -m dscp --dscp 3 --sport 80 \ ---dport 1100 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p sctp --destination 2.2.2.2 -m dscp --dscp 3 \ ---dport 80 --sport 1100 -m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p sctp --source 2.2.2.2 -m dscp --dscp 3 --sport 80 \ ---dport 1100 -m state --state NEW,ESTABLISHED -j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 1 \ +--sport 80 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 1 \ +--dport 80 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 1 \ +--sport 80 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 1 \ +--sport 90 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--destination 1.1.1.1 \ +-m dscp \ +--dscp 1 \ +--dport 90 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--source 1.1.1.1 \ +-m dscp \ +--dscp 1 \ +--sport 90 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 2 \ +--sport 80 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 2 \ +--dport 80 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 2 \ +--sport 80 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 2 \ +--sport 90 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 2 \ +--dport 90 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 2 \ +--sport 90 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p sctp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 3 \ +--sport 80 \ +--dport 1100 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p sctp \ +--destination 2.2.2.2 \ +-m dscp \ +--dscp 3 \ +--dport 80 \ +--sport 1100 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p sctp \ +--source 2.2.2.2 \ +-m dscp \ +--dscp 3 \ +--sport 80 \ +--dport 1100 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN diff --git a/tests/nwfilterxml2firewalldata/mac-linux.args b/tests/nwfilterxml2firewalldata/mac-linux.args index a71107c0e2..0fd9dbccc0 100644 --- a/tests/nwfilterxml2firewalldata/mac-linux.args +++ b/tests/nwfilterxml2firewalldata/mac-linux.args @@ -1,8 +1,24 @@ -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --p 0x806 -j ACCEPT -ebtables -t nat -A libvirt-P-vnet0 -d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ --p 0x800 -j ACCEPT -ebtables -t nat -A libvirt-P-vnet0 -d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ --p 0x600 -j ACCEPT -ebtables -t nat -A libvirt-P-vnet0 -d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ --p 0xffff -j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-p 0x806 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ +-p 0x800 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ +-p 0x600 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ +-p 0xffff \ +-j ACCEPT diff --git a/tests/nwfilterxml2firewalldata/rarp-linux.args b/tests/nwfilterxml2firewalldata/rarp-linux.args index 89b0e8abd0..f5fd6433bd 100644 --- a/tests/nwfilterxml2firewalldata/rarp-linux.args +++ b/tests/nwfilterxml2firewalldata/rarp-linux.args @@ -1,12 +1,47 @@ -ebtables -t nat -N libvirt-J-vnet0 -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff -p 0x8035 --arp-htype 12 --arp-opcode 1 \ ---arp-ptype 0x22 --arp-mac-src 01:02:03:04:05:06 --arp-mac-dst 0a:0b:0c:0d:0e:0f \ +ebtables \ +-t nat \ +-N libvirt-J-vnet0 +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ +-p 0x8035 \ +--arp-htype 12 \ +--arp-opcode 1 \ +--arp-ptype 0x22 \ +--arp-mac-src 01:02:03:04:05:06 \ +--arp-mac-dst 0a:0b:0c:0d:0e:0f \ -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --p 0x8035 --arp-htype 255 --arp-opcode 1 --arp-ptype 0xff -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --p 0x8035 --arp-htype 256 --arp-opcode 11 --arp-ptype 0x100 -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --p 0x8035 --arp-htype 65535 --arp-opcode 65535 --arp-ptype 0xffff -j ACCEPT -ebtables -t nat -A PREROUTING -i vnet0 -j libvirt-J-vnet0 +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-p 0x8035 \ +--arp-htype 255 \ +--arp-opcode 1 \ +--arp-ptype 0xff \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-p 0x8035 \ +--arp-htype 256 \ +--arp-opcode 11 \ +--arp-ptype 0x100 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-p 0x8035 \ +--arp-htype 65535 \ +--arp-opcode 65535 \ +--arp-ptype 0xffff \ +-j ACCEPT +ebtables \ +-t nat \ +-A PREROUTING \ +-i vnet0 \ +-j libvirt-J-vnet0 diff --git a/tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args index 7e10419a70..959c4e8e0f 100644 --- a/tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args @@ -1,22 +1,101 @@ -ip6tables -A FJ-vnet0 -p sctp -m mac --mac-source 01:02:03:04:05:06 \ ---destination a:b:c::d:e:f/128 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED \ +ip6tables \ +-A FJ-vnet0 \ +-p sctp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ -j RETURN -ip6tables -A FP-vnet0 -p sctp --source a:b:c::d:e:f/128 -m dscp --dscp 2 \ --m state --state ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p sctp -m mac --mac-source 01:02:03:04:05:06 \ ---destination a:b:c::d:e:f/128 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED \ +ip6tables \ +-A FP-vnet0 \ +-p sctp \ +--source a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p sctp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p sctp \ +--destination a:b:c::/128 \ +-m dscp \ +--dscp 33 \ +--dport 20:21 \ +--sport 100:1111 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p sctp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source a:b:c::/128 \ +-m dscp \ +--dscp 33 \ +--sport 20:21 \ +--dport 100:1111 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p sctp \ +--destination a:b:c::/128 \ +-m dscp \ +--dscp 33 \ +--dport 20:21 \ +--sport 100:1111 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p sctp \ +--destination ::10.1.2.3/128 \ +-m dscp \ +--dscp 63 \ +--dport 255:256 \ +--sport 65535:65535 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p sctp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source ::10.1.2.3/128 \ +-m dscp \ +--dscp 63 \ +--sport 255:256 \ +--dport 65535:65535 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p sctp \ +--destination ::10.1.2.3/128 \ +-m dscp \ +--dscp 63 \ +--dport 255:256 \ +--sport 65535:65535 \ +-m state \ +--state ESTABLISHED \ -j RETURN -ip6tables -A FJ-vnet0 -p sctp --destination a:b:c::/128 -m dscp --dscp 33 \ ---dport 20:21 --sport 100:1111 -m state --state ESTABLISHED -j RETURN -ip6tables -A FP-vnet0 -p sctp -m mac --mac-source 01:02:03:04:05:06 \ ---source a:b:c::/128 -m dscp --dscp 33 --sport 20:21 --dport 100:1111 -m state \ ---state NEW,ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p sctp --destination a:b:c::/128 -m dscp --dscp 33 \ ---dport 20:21 --sport 100:1111 -m state --state ESTABLISHED -j RETURN -ip6tables -A FJ-vnet0 -p sctp --destination ::10.1.2.3/128 -m dscp --dscp 63 \ ---dport 255:256 --sport 65535:65535 -m state --state ESTABLISHED -j RETURN -ip6tables -A FP-vnet0 -p sctp -m mac --mac-source 01:02:03:04:05:06 \ ---source ::10.1.2.3/128 -m dscp --dscp 63 --sport 255:256 --dport 65535:65535 -m state \ ---state NEW,ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p sctp --destination ::10.1.2.3/128 -m dscp --dscp 63 \ ---dport 255:256 --sport 65535:65535 -m state --state ESTABLISHED -j RETURN diff --git a/tests/nwfilterxml2firewalldata/sctp-linux.args b/tests/nwfilterxml2firewalldata/sctp-linux.args index a7a2096593..671fc0480f 100644 --- a/tests/nwfilterxml2firewalldata/sctp-linux.args +++ b/tests/nwfilterxml2firewalldata/sctp-linux.args @@ -1,20 +1,101 @@ -iptables -A FJ-vnet0 -p sctp -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p sctp --source 10.1.2.3/32 -m dscp --dscp 2 -m state \ ---state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p sctp -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p sctp --destination 10.1.2.3/32 -m dscp --dscp 33 \ ---dport 20:21 --sport 100:1111 -m state --state ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p sctp -m mac --mac-source 01:02:03:04:05:06 \ ---source 10.1.2.3/32 -m dscp --dscp 33 --sport 20:21 --dport 100:1111 -m state \ ---state NEW,ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p sctp --destination 10.1.2.3/32 -m dscp --dscp 33 \ ---dport 20:21 --sport 100:1111 -m state --state ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p sctp --destination 10.1.2.3/32 -m dscp --dscp 63 \ ---dport 255:256 --sport 65535:65535 -m state --state ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p sctp -m mac --mac-source 01:02:03:04:05:06 \ ---source 10.1.2.3/32 -m dscp --dscp 63 --sport 255:256 --dport 65535:65535 -m state \ ---state NEW,ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p sctp --destination 10.1.2.3/32 -m dscp --dscp 63 \ ---dport 255:256 --sport 65535:65535 -m state --state ESTABLISHED -j RETURN +iptables \ +-A FJ-vnet0 \ +-p sctp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p sctp \ +--source 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p sctp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p sctp \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 33 \ +--dport 20:21 \ +--sport 100:1111 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p sctp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source 10.1.2.3/32 \ +-m dscp \ +--dscp 33 \ +--sport 20:21 \ +--dport 100:1111 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p sctp \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 33 \ +--dport 20:21 \ +--sport 100:1111 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p sctp \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 63 \ +--dport 255:256 \ +--sport 65535:65535 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p sctp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source 10.1.2.3/32 \ +-m dscp \ +--dscp 63 \ +--sport 255:256 \ +--dport 65535:65535 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p sctp \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 63 \ +--dport 255:256 \ +--sport 65535:65535 \ +-m state \ +--state ESTABLISHED \ +-j RETURN diff --git a/tests/nwfilterxml2firewalldata/stp-linux.args b/tests/nwfilterxml2firewalldata/stp-linux.args index 0132ef6131..e3114ac622 100644 --- a/tests/nwfilterxml2firewalldata/stp-linux.args +++ b/tests/nwfilterxml2firewalldata/stp-linux.args @@ -1,18 +1,58 @@ -ebtables -t nat -F J-vnet0-stp-xyz -ebtables -t nat -X J-vnet0-stp-xyz -ebtables -t nat -N J-vnet0-stp-xyz -ebtables -t nat -A libvirt-J-vnet0 -d 01:80:c2:00:00:00 -j J-vnet0-stp-xyz -ebtables -t nat -F P-vnet0-stp-xyz -ebtables -t nat -X P-vnet0-stp-xyz -ebtables -t nat -N P-vnet0-stp-xyz -ebtables -t nat -A libvirt-P-vnet0 -d 01:80:c2:00:00:00 -j P-vnet0-stp-xyz -ebtables -t nat -A P-vnet0-stp-xyz -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --d 01:80:c2:00:00:00 --stp-type 18 --stp-flags 68 -j CONTINUE -ebtables -t nat -A J-vnet0-stp-xyz -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --d 01:80:c2:00:00:00 --stp-root-pri 4660:9029 \ +ebtables \ +-t nat \ +-F J-vnet0-stp-xyz +ebtables \ +-t nat \ +-X J-vnet0-stp-xyz +ebtables \ +-t nat \ +-N J-vnet0-stp-xyz +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-d 01:80:c2:00:00:00 \ +-j J-vnet0-stp-xyz +ebtables \ +-t nat \ +-F P-vnet0-stp-xyz +ebtables \ +-t nat \ +-X P-vnet0-stp-xyz +ebtables \ +-t nat \ +-N P-vnet0-stp-xyz +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-d 01:80:c2:00:00:00 \ +-j P-vnet0-stp-xyz +ebtables \ +-t nat \ +-A P-vnet0-stp-xyz \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-d 01:80:c2:00:00:00 \ +--stp-type 18 \ +--stp-flags 68 \ +-j CONTINUE +ebtables \ +-t nat \ +-A J-vnet0-stp-xyz \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-d 01:80:c2:00:00:00 \ +--stp-root-pri 4660:9029 \ --stp-root-addr 06:05:04:03:02:01/ff:ff:ff:ff:ff:ff \ ---stp-root-cost 287454020:573785173 -j RETURN -ebtables -t nat -A P-vnet0-stp-xyz -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --d 01:80:c2:00:00:00 --stp-sender-prio 4660 --stp-sender-addr 06:05:04:03:02:01 \ ---stp-port 123:234 --stp-msg-age 5544:5555 --stp-max-age 7777:8888 \ ---stp-hello-time 12345:12346 --stp-forward-delay 54321:65432 -j DROP +--stp-root-cost 287454020:573785173 \ +-j RETURN +ebtables \ +-t nat \ +-A P-vnet0-stp-xyz \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-d 01:80:c2:00:00:00 \ +--stp-sender-prio 4660 \ +--stp-sender-addr 06:05:04:03:02:01 \ +--stp-port 123:234 \ +--stp-msg-age 5544:5555 \ +--stp-max-age 7777:8888 \ +--stp-hello-time 12345:12346 \ +--stp-forward-delay 54321:65432 \ +-j DROP diff --git a/tests/nwfilterxml2firewalldata/target-linux.args b/tests/nwfilterxml2firewalldata/target-linux.args index f51cf5d944..d219877716 100644 --- a/tests/nwfilterxml2firewalldata/target-linux.args +++ b/tests/nwfilterxml2firewalldata/target-linux.args @@ -1,75 +1,309 @@ -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --p 0x806 -j ACCEPT -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --p 0x806 -j DROP -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --p 0x806 -j DROP -ebtables -t nat -A libvirt-P-vnet0 -d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ --p 0x800 -j ACCEPT -ebtables -t nat -A libvirt-P-vnet0 -d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ --p 0x800 -j DROP -ebtables -t nat -A libvirt-P-vnet0 -d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ --p 0x800 -j DROP -iptables -A FJ-vnet0 -p all -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED -m comment \ ---comment 'accept rule -- dir out' -j RETURN -iptables -A FP-vnet0 -p all --source 10.1.2.3/32 -m dscp --dscp 2 -m state \ ---state ESTABLISHED -m comment --comment 'accept rule -- dir out' -j ACCEPT -iptables -A HJ-vnet0 -p all -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED -m comment \ ---comment 'accept rule -- dir out' -j RETURN -iptables -A FJ-vnet0 -p all -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m comment \ ---comment 'drop rule -- dir out' -j DROP -iptables -A FP-vnet0 -p all --source 10.1.2.3/32 -m dscp --dscp 2 -m comment \ ---comment 'drop rule -- dir out' -j DROP -iptables -A HJ-vnet0 -p all -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m comment \ ---comment 'drop rule -- dir out' -j DROP -iptables -A FJ-vnet0 -p all -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m comment \ ---comment 'reject rule -- dir out' -j REJECT -iptables -A FP-vnet0 -p all --source 10.1.2.3/32 -m dscp --dscp 2 \ --m comment --comment 'reject rule -- dir out' -j REJECT -iptables -A HJ-vnet0 -p all -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m comment \ ---comment 'reject rule -- dir out' -j REJECT -iptables -A FJ-vnet0 -p all --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m state --state ESTABLISHED -m comment --comment 'accept rule -- dir in' -j RETURN -iptables -A FP-vnet0 -p all -m mac --mac-source 01:02:03:04:05:06 \ ---source 10.1.2.3/22 -m dscp --dscp 33 -m state --state NEW,ESTABLISHED -m comment \ ---comment 'accept rule -- dir in' -j ACCEPT -iptables -A HJ-vnet0 -p all --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m state --state ESTABLISHED -m comment --comment 'accept rule -- dir in' -j RETURN -iptables -A FJ-vnet0 -p all --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m comment --comment 'drop rule -- dir in' -j DROP -iptables -A FP-vnet0 -p all -m mac --mac-source 01:02:03:04:05:06 \ ---source 10.1.2.3/22 -m dscp --dscp 33 -m comment --comment 'drop rule -- dir in' \ --j DROP -iptables -A HJ-vnet0 -p all --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m comment --comment 'drop rule -- dir in' -j DROP -iptables -A FJ-vnet0 -p all --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m comment --comment 'reject rule -- dir in' -j REJECT -iptables -A FP-vnet0 -p all -m mac --mac-source 01:02:03:04:05:06 \ ---source 10.1.2.3/22 -m dscp --dscp 33 -m comment --comment 'reject rule -- dir in' \ --j REJECT -iptables -A HJ-vnet0 -p all --destination 10.1.2.3/22 -m dscp --dscp 33 \ --m comment --comment 'reject rule -- dir in' -j REJECT -iptables -A FJ-vnet0 -p all -m comment --comment 'accept rule -- dir inout' \ --j RETURN -iptables -A FP-vnet0 -p all -m comment --comment 'accept rule -- dir inout' \ +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-p 0x806 \ -j ACCEPT -iptables -A HJ-vnet0 -p all -m comment --comment 'accept rule -- dir inout' \ +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-p 0x806 \ +-j DROP +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-p 0x806 \ +-j DROP +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ +-p 0x800 \ +-j ACCEPT +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ +-p 0x800 \ +-j DROP +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ +-p 0x800 \ +-j DROP +iptables \ +-A FJ-vnet0 \ +-p all \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-m comment \ +--comment 'accept rule \ +-- dir out' \ -j RETURN -iptables -A FJ-vnet0 -p all -m comment --comment 'drop rule -- dir inout' \ +iptables \ +-A FP-vnet0 \ +-p all \ +--source 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state ESTABLISHED \ +-m comment \ +--comment 'accept rule \ +-- dir out' \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p all \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-m comment \ +--comment 'accept rule \ +-- dir out' \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p all \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m comment \ +--comment 'drop rule \ +-- dir out' \ -j DROP -iptables -A FP-vnet0 -p all -m comment --comment 'drop rule -- dir inout' \ +iptables \ +-A FP-vnet0 \ +-p all \ +--source 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m comment \ +--comment 'drop rule \ +-- dir out' \ -j DROP -iptables -A HJ-vnet0 -p all -m comment --comment 'drop rule -- dir inout' \ +iptables \ +-A HJ-vnet0 \ +-p all \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m comment \ +--comment 'drop rule \ +-- dir out' \ -j DROP -iptables -A FJ-vnet0 -p all -m comment --comment 'reject rule -- dir inout' \ +iptables \ +-A FJ-vnet0 \ +-p all \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m comment \ +--comment 'reject rule \ +-- dir out' \ -j REJECT -iptables -A FP-vnet0 -p all -m comment --comment 'reject rule -- dir inout' \ +iptables \ +-A FP-vnet0 \ +-p all \ +--source 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m comment \ +--comment 'reject rule \ +-- dir out' \ -j REJECT -iptables -A HJ-vnet0 -p all -m comment --comment 'reject rule -- dir inout' \ +iptables \ +-A HJ-vnet0 \ +-p all \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m comment \ +--comment 'reject rule \ +-- dir out' \ +-j REJECT +iptables \ +-A FJ-vnet0 \ +-p all \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-m comment \ +--comment 'accept rule \ +-- dir in' \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p all \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state NEW,ESTABLISHED \ +-m comment \ +--comment 'accept rule \ +-- dir in' \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p all \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-m comment \ +--comment 'accept rule \ +-- dir in' \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p all \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m comment \ +--comment 'drop rule \ +-- dir in' \ +-j DROP +iptables \ +-A FP-vnet0 \ +-p all \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m comment \ +--comment 'drop rule \ +-- dir in' \ +-j DROP +iptables \ +-A HJ-vnet0 \ +-p all \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m comment \ +--comment 'drop rule \ +-- dir in' \ +-j DROP +iptables \ +-A FJ-vnet0 \ +-p all \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m comment \ +--comment 'reject rule \ +-- dir in' \ +-j REJECT +iptables \ +-A FP-vnet0 \ +-p all \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m comment \ +--comment 'reject rule \ +-- dir in' \ +-j REJECT +iptables \ +-A HJ-vnet0 \ +-p all \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m comment \ +--comment 'reject rule \ +-- dir in' \ +-j REJECT +iptables \ +-A FJ-vnet0 \ +-p all \ +-m comment \ +--comment 'accept rule \ +-- dir inout' \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p all \ +-m comment \ +--comment 'accept rule \ +-- dir inout' \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p all \ +-m comment \ +--comment 'accept rule \ +-- dir inout' \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p all \ +-m comment \ +--comment 'drop rule \ +-- dir inout' \ +-j DROP +iptables \ +-A FP-vnet0 \ +-p all \ +-m comment \ +--comment 'drop rule \ +-- dir inout' \ +-j DROP +iptables \ +-A HJ-vnet0 \ +-p all \ +-m comment \ +--comment 'drop rule \ +-- dir inout' \ +-j DROP +iptables \ +-A FJ-vnet0 \ +-p all \ +-m comment \ +--comment 'reject rule \ +-- dir inout' \ +-j REJECT +iptables \ +-A FP-vnet0 \ +-p all \ +-m comment \ +--comment 'reject rule \ +-- dir inout' \ +-j REJECT +iptables \ +-A HJ-vnet0 \ +-p all \ +-m comment \ +--comment 'reject rule \ +-- dir inout' \ -j REJECT diff --git a/tests/nwfilterxml2firewalldata/target2-linux.args b/tests/nwfilterxml2firewalldata/target2-linux.args index 196d7bebc3..cfa4f589d6 100644 --- a/tests/nwfilterxml2firewalldata/target2-linux.args +++ b/tests/nwfilterxml2firewalldata/target2-linux.args @@ -1,13 +1,60 @@ -iptables -A FP-vnet0 -p tcp --dport 22 -j ACCEPT -iptables -A FJ-vnet0 -p tcp --sport 22 -j RETURN -iptables -A HJ-vnet0 -p tcp --sport 22 -j RETURN -iptables -A FJ-vnet0 -p tcp --sport 80 -m state --state ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --dport 80 -m state --state NEW,ESTABLISHED \ +iptables \ +-A FP-vnet0 \ +-p tcp \ +--dport 22 \ -j ACCEPT -iptables -A HJ-vnet0 -p tcp --sport 80 -m state --state ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp -j REJECT -iptables -A FP-vnet0 -p tcp -j REJECT -iptables -A HJ-vnet0 -p tcp -j REJECT -iptables -A FJ-vnet0 -p all -j DROP -iptables -A FP-vnet0 -p all -j DROP -iptables -A HJ-vnet0 -p all -j DROP +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--sport 22 \ +-j RETURN +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--sport 22 \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--sport 80 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--dport 80 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--sport 80 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +-j REJECT +iptables \ +-A FP-vnet0 \ +-p tcp \ +-j REJECT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +-j REJECT +iptables \ +-A FJ-vnet0 \ +-p all \ +-j DROP +iptables \ +-A FP-vnet0 \ +-p all \ +-j DROP +iptables \ +-A HJ-vnet0 \ +-p all \ +-j DROP diff --git a/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args index a55f54641a..e6f8de3fca 100644 --- a/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args @@ -1,22 +1,101 @@ -ip6tables -A FJ-vnet0 -p tcp -m mac --mac-source 01:02:03:04:05:06 \ ---destination a:b:c::d:e:f/128 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED \ +ip6tables \ +-A FJ-vnet0 \ +-p tcp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ -j RETURN -ip6tables -A FP-vnet0 -p tcp --source a:b:c::d:e:f/128 -m dscp --dscp 2 \ --m state --state ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p tcp -m mac --mac-source 01:02:03:04:05:06 \ ---destination a:b:c::d:e:f/128 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED \ +ip6tables \ +-A FP-vnet0 \ +-p tcp \ +--source a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p tcp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p tcp \ +--destination a:b:c::/128 \ +-m dscp \ +--dscp 33 \ +--dport 20:21 \ +--sport 100:1111 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p tcp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source a:b:c::/128 \ +-m dscp \ +--dscp 33 \ +--sport 20:21 \ +--dport 100:1111 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p tcp \ +--destination a:b:c::/128 \ +-m dscp \ +--dscp 33 \ +--dport 20:21 \ +--sport 100:1111 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p tcp \ +--destination ::10.1.2.3/128 \ +-m dscp \ +--dscp 63 \ +--dport 255:256 \ +--sport 65535:65535 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p tcp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source ::10.1.2.3/128 \ +-m dscp \ +--dscp 63 \ +--sport 255:256 \ +--dport 65535:65535 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p tcp \ +--destination ::10.1.2.3/128 \ +-m dscp \ +--dscp 63 \ +--dport 255:256 \ +--sport 65535:65535 \ +-m state \ +--state ESTABLISHED \ -j RETURN -ip6tables -A FJ-vnet0 -p tcp --destination a:b:c::/128 -m dscp --dscp 33 \ ---dport 20:21 --sport 100:1111 -m state --state ESTABLISHED -j RETURN -ip6tables -A FP-vnet0 -p tcp -m mac --mac-source 01:02:03:04:05:06 \ ---source a:b:c::/128 -m dscp --dscp 33 --sport 20:21 --dport 100:1111 -m state \ ---state NEW,ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p tcp --destination a:b:c::/128 -m dscp --dscp 33 \ ---dport 20:21 --sport 100:1111 -m state --state ESTABLISHED -j RETURN -ip6tables -A FJ-vnet0 -p tcp --destination ::10.1.2.3/128 -m dscp --dscp 63 \ ---dport 255:256 --sport 65535:65535 -m state --state ESTABLISHED -j RETURN -ip6tables -A FP-vnet0 -p tcp -m mac --mac-source 01:02:03:04:05:06 \ ---source ::10.1.2.3/128 -m dscp --dscp 63 --sport 255:256 --dport 65535:65535 -m state \ ---state NEW,ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p tcp --destination ::10.1.2.3/128 -m dscp --dscp 63 \ ---dport 255:256 --sport 65535:65535 -m state --state ESTABLISHED -j RETURN diff --git a/tests/nwfilterxml2firewalldata/tcp-linux.args b/tests/nwfilterxml2firewalldata/tcp-linux.args index 1b5f5b2af9..195bfc01e6 100644 --- a/tests/nwfilterxml2firewalldata/tcp-linux.args +++ b/tests/nwfilterxml2firewalldata/tcp-linux.args @@ -1,22 +1,109 @@ -iptables -A FJ-vnet0 -p tcp -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p tcp --source 10.1.2.3/32 -m dscp --dscp 2 -m state \ ---state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p tcp -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p tcp --destination 10.1.2.3/32 -m dscp --dscp 33 \ ---dport 20:21 --sport 100:1111 -j RETURN -iptables -A FP-vnet0 -p tcp -m mac --mac-source 01:02:03:04:05:06 \ ---source 10.1.2.3/32 -m dscp --dscp 33 --sport 20:21 --dport 100:1111 -j ACCEPT -iptables -A HJ-vnet0 -p tcp --destination 10.1.2.3/32 -m dscp --dscp 33 \ ---dport 20:21 --sport 100:1111 -j RETURN -iptables -A FJ-vnet0 -p tcp --destination 10.1.2.3/32 -m dscp --dscp 63 \ ---dport 255:256 --sport 65535:65535 -j RETURN -iptables -A FP-vnet0 -p tcp -m mac --mac-source 01:02:03:04:05:06 \ ---source 10.1.2.3/32 -m dscp --dscp 63 --sport 255:256 --dport 65535:65535 -j ACCEPT -iptables -A HJ-vnet0 -p tcp --destination 10.1.2.3/32 -m dscp --dscp 63 \ ---dport 255:256 --sport 65535:65535 -j RETURN -iptables -A FP-vnet0 -p tcp --tcp-flags SYN ALL -j ACCEPT -iptables -A FP-vnet0 -p tcp --tcp-flags SYN SYN,ACK -j ACCEPT -iptables -A FP-vnet0 -p tcp --tcp-flags RST NONE -j ACCEPT -iptables -A FP-vnet0 -p tcp --tcp-flags PSH NONE -j ACCEPT +iptables \ +-A FJ-vnet0 \ +-p tcp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--source 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 33 \ +--dport 20:21 \ +--sport 100:1111 \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source 10.1.2.3/32 \ +-m dscp \ +--dscp 33 \ +--sport 20:21 \ +--dport 100:1111 \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 33 \ +--dport 20:21 \ +--sport 100:1111 \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p tcp \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 63 \ +--dport 255:256 \ +--sport 65535:65535 \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source 10.1.2.3/32 \ +-m dscp \ +--dscp 63 \ +--sport 255:256 \ +--dport 65535:65535 \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p tcp \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 63 \ +--dport 255:256 \ +--sport 65535:65535 \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p tcp \ +--tcp-flags SYN ALL \ +-j ACCEPT +iptables \ +-A FP-vnet0 \ +-p tcp \ +--tcp-flags SYN SYN,ACK \ +-j ACCEPT +iptables \ +-A FP-vnet0 \ +-p tcp \ +--tcp-flags RST NONE \ +-j ACCEPT +iptables \ +-A FP-vnet0 \ +-p tcp \ +--tcp-flags PSH NONE \ +-j ACCEPT diff --git a/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args index 1eb0ceaa4b..9183c08753 100644 --- a/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args @@ -1,22 +1,101 @@ -ip6tables -A FJ-vnet0 -p udp -m mac --mac-source 01:02:03:04:05:06 \ ---destination a:b:c::d:e:f/128 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED \ +ip6tables \ +-A FJ-vnet0 \ +-p udp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ -j RETURN -ip6tables -A FP-vnet0 -p udp --source a:b:c::d:e:f/128 -m dscp --dscp 2 \ --m state --state ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p udp -m mac --mac-source 01:02:03:04:05:06 \ ---destination a:b:c::d:e:f/128 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED \ +ip6tables \ +-A FP-vnet0 \ +-p udp \ +--source a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p udp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p udp \ +--destination ::a:b:c/128 \ +-m dscp \ +--dscp 33 \ +--dport 20:21 \ +--sport 100:1111 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p udp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source ::a:b:c/128 \ +-m dscp \ +--dscp 33 \ +--sport 20:21 \ +--dport 100:1111 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p udp \ +--destination ::a:b:c/128 \ +-m dscp \ +--dscp 33 \ +--dport 20:21 \ +--sport 100:1111 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p udp \ +--destination ::10.1.2.3/128 \ +-m dscp \ +--dscp 63 \ +--dport 255:256 \ +--sport 65535:65535 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p udp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source ::10.1.2.3/128 \ +-m dscp \ +--dscp 63 \ +--sport 255:256 \ +--dport 65535:65535 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p udp \ +--destination ::10.1.2.3/128 \ +-m dscp \ +--dscp 63 \ +--dport 255:256 \ +--sport 65535:65535 \ +-m state \ +--state ESTABLISHED \ -j RETURN -ip6tables -A FJ-vnet0 -p udp --destination ::a:b:c/128 -m dscp --dscp 33 \ ---dport 20:21 --sport 100:1111 -m state --state ESTABLISHED -j RETURN -ip6tables -A FP-vnet0 -p udp -m mac --mac-source 01:02:03:04:05:06 \ ---source ::a:b:c/128 -m dscp --dscp 33 --sport 20:21 --dport 100:1111 -m state \ ---state NEW,ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p udp --destination ::a:b:c/128 -m dscp --dscp 33 \ ---dport 20:21 --sport 100:1111 -m state --state ESTABLISHED -j RETURN -ip6tables -A FJ-vnet0 -p udp --destination ::10.1.2.3/128 -m dscp --dscp 63 \ ---dport 255:256 --sport 65535:65535 -m state --state ESTABLISHED -j RETURN -ip6tables -A FP-vnet0 -p udp -m mac --mac-source 01:02:03:04:05:06 \ ---source ::10.1.2.3/128 -m dscp --dscp 63 --sport 255:256 --dport 65535:65535 \ --m state --state NEW,ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p udp --destination ::10.1.2.3/128 -m dscp --dscp 63 \ ---dport 255:256 --sport 65535:65535 -m state --state ESTABLISHED -j RETURN diff --git a/tests/nwfilterxml2firewalldata/udp-linux.args b/tests/nwfilterxml2firewalldata/udp-linux.args index 78240e952b..910d648a8a 100644 --- a/tests/nwfilterxml2firewalldata/udp-linux.args +++ b/tests/nwfilterxml2firewalldata/udp-linux.args @@ -1,20 +1,101 @@ -iptables -A FJ-vnet0 -p udp -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp --source 10.1.2.3/32 -m dscp --dscp 2 -m state \ ---state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udp --destination 10.1.2.3/32 -m dscp --dscp 33 \ ---dport 20:21 --sport 100:1111 -m state --state ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp -m mac --mac-source 01:02:03:04:05:06 \ ---source 10.1.2.3/32 -m dscp --dscp 33 --sport 20:21 --dport 100:1111 -m state \ ---state NEW,ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp --destination 10.1.2.3/32 -m dscp --dscp 33 \ ---dport 20:21 --sport 100:1111 -m state --state ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udp --destination 10.1.2.3/32 -m dscp --dscp 63 \ ---dport 255:256 --sport 65535:65535 -m state --state ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udp -m mac --mac-source 01:02:03:04:05:06 \ ---source 10.1.2.3/32 -m dscp --dscp 63 --sport 255:256 --dport 65535:65535 -m state \ ---state NEW,ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udp --destination 10.1.2.3/32 -m dscp --dscp 63 \ ---dport 255:256 --sport 65535:65535 -m state --state ESTABLISHED -j RETURN +iptables \ +-A FJ-vnet0 \ +-p udp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +--source 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udp \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 33 \ +--dport 20:21 \ +--sport 100:1111 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source 10.1.2.3/32 \ +-m dscp \ +--dscp 33 \ +--sport 20:21 \ +--dport 100:1111 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 33 \ +--dport 20:21 \ +--sport 100:1111 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udp \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 63 \ +--dport 255:256 \ +--sport 65535:65535 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udp \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source 10.1.2.3/32 \ +-m dscp \ +--dscp 63 \ +--sport 255:256 \ +--dport 65535:65535 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udp \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 63 \ +--dport 255:256 \ +--sport 65535:65535 \ +-m state \ +--state ESTABLISHED \ +-j RETURN diff --git a/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args b/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args index 47a691590f..9eb38d7e6d 100644 --- a/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args @@ -1,20 +1,92 @@ -ip6tables -A FJ-vnet0 -p udplite -m mac --mac-source 01:02:03:04:05:06 \ ---source f:e:d::c:b:a/127 --destination a:b:c::d:e:f/128 -m dscp --dscp 2 -m state \ ---state NEW,ESTABLISHED -j RETURN -ip6tables -A FP-vnet0 -p udplite --destination f:e:d::c:b:a/127 \ ---source a:b:c::d:e:f/128 -m dscp --dscp 2 -m state --state ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p udplite -m mac --mac-source 01:02:03:04:05:06 \ ---source f:e:d::c:b:a/127 --destination a:b:c::d:e:f/128 -m dscp --dscp 2 -m state \ ---state NEW,ESTABLISHED -j RETURN -ip6tables -A FJ-vnet0 -p udplite --destination a:b:c::/128 -m dscp \ ---dscp 33 -m state --state ESTABLISHED -j RETURN -ip6tables -A FP-vnet0 -p udplite -m mac --mac-source 01:02:03:04:05:06 \ ---source a:b:c::/128 -m dscp --dscp 33 -m state --state NEW,ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p udplite --destination a:b:c::/128 -m dscp \ ---dscp 33 -m state --state ESTABLISHED -j RETURN -ip6tables -A FJ-vnet0 -p udplite --destination ::10.1.2.3/128 -m dscp \ ---dscp 33 -m state --state ESTABLISHED -j RETURN -ip6tables -A FP-vnet0 -p udplite -m mac --mac-source 01:02:03:04:05:06 \ ---source ::10.1.2.3/128 -m dscp --dscp 33 -m state --state NEW,ESTABLISHED -j ACCEPT -ip6tables -A HJ-vnet0 -p udplite --destination ::10.1.2.3/128 -m dscp \ ---dscp 33 -m state --state ESTABLISHED -j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p udplite \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source f:e:d::c:b:a/127 \ +--destination a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p udplite \ +--destination f:e:d::c:b:a/127 \ +--source a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p udplite \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source f:e:d::c:b:a/127 \ +--destination a:b:c::d:e:f/128 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p udplite \ +--destination a:b:c::/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p udplite \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source a:b:c::/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p udplite \ +--destination a:b:c::/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FJ-vnet0 \ +-p udplite \ +--destination ::10.1.2.3/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +ip6tables \ +-A FP-vnet0 \ +-p udplite \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source ::10.1.2.3/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +ip6tables \ +-A HJ-vnet0 \ +-p udplite \ +--destination ::10.1.2.3/128 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN diff --git a/tests/nwfilterxml2firewalldata/udplite-linux.args b/tests/nwfilterxml2firewalldata/udplite-linux.args index a49443e7d8..53bc667459 100644 --- a/tests/nwfilterxml2firewalldata/udplite-linux.args +++ b/tests/nwfilterxml2firewalldata/udplite-linux.args @@ -1,18 +1,89 @@ -iptables -A FJ-vnet0 -p udplite -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udplite --source 10.1.2.3/32 -m dscp --dscp 2 \ --m state --state ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udplite -m mac --mac-source 01:02:03:04:05:06 \ ---destination 10.1.2.3/32 -m dscp --dscp 2 -m state --state NEW,ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udplite --destination 10.1.2.3/22 -m dscp \ ---dscp 33 -m state --state ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udplite -m mac --mac-source 01:02:03:04:05:06 \ ---source 10.1.2.3/22 -m dscp --dscp 33 -m state --state NEW,ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udplite --destination 10.1.2.3/22 -m dscp \ ---dscp 33 -m state --state ESTABLISHED -j RETURN -iptables -A FJ-vnet0 -p udplite --destination 10.1.2.3/22 -m dscp \ ---dscp 33 -m state --state ESTABLISHED -j RETURN -iptables -A FP-vnet0 -p udplite -m mac --mac-source 01:02:03:04:05:06 \ ---source 10.1.2.3/22 -m dscp --dscp 33 -m state --state NEW,ESTABLISHED -j ACCEPT -iptables -A HJ-vnet0 -p udplite --destination 10.1.2.3/22 -m dscp \ ---dscp 33 -m state --state ESTABLISHED -j RETURN +iptables \ +-A FJ-vnet0 \ +-p udplite \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udplite \ +--source 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udplite \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--destination 10.1.2.3/32 \ +-m dscp \ +--dscp 2 \ +-m state \ +--state NEW,ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udplite \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udplite \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udplite \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FJ-vnet0 \ +-p udplite \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN +iptables \ +-A FP-vnet0 \ +-p udplite \ +-m mac \ +--mac-source 01:02:03:04:05:06 \ +--source 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state NEW,ESTABLISHED \ +-j ACCEPT +iptables \ +-A HJ-vnet0 \ +-p udplite \ +--destination 10.1.2.3/22 \ +-m dscp \ +--dscp 33 \ +-m state \ +--state ESTABLISHED \ +-j RETURN diff --git a/tests/nwfilterxml2firewalldata/vlan-linux.args b/tests/nwfilterxml2firewalldata/vlan-linux.args index f53fd69fcc..0a8204c4dc 100644 --- a/tests/nwfilterxml2firewalldata/vlan-linux.args +++ b/tests/nwfilterxml2firewalldata/vlan-linux.args @@ -1,14 +1,56 @@ -ebtables -t nat -A libvirt-J-vnet0 -d 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --s aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff -p 0x8100 --vlan-id 291 -j CONTINUE -ebtables -t nat -A libvirt-P-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff -p 0x8100 --vlan-id 291 -j CONTINUE -ebtables -t nat -A libvirt-J-vnet0 -d 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --s aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff -p 0x8100 --vlan-id 1234 -j RETURN -ebtables -t nat -A libvirt-P-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff -p 0x8100 --vlan-id 1234 -j RETURN -ebtables -t nat -A libvirt-P-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff -p 0x8100 --vlan-id 291 -j DROP -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff -p 0x8100 --vlan-encap 2054 -j DROP -ebtables -t nat -A libvirt-J-vnet0 -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ --d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff -p 0x8100 --vlan-encap 4660 -j ACCEPT +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-d 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-s aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ +-p 0x8100 \ +--vlan-id 291 \ +-j CONTINUE +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ +-p 0x8100 \ +--vlan-id 291 \ +-j CONTINUE +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-d 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-s aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ +-p 0x8100 \ +--vlan-id 1234 \ +-j RETURN +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ +-p 0x8100 \ +--vlan-id 1234 \ +-j RETURN +ebtables \ +-t nat \ +-A libvirt-P-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ +-p 0x8100 \ +--vlan-id 291 \ +-j DROP +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ +-p 0x8100 \ +--vlan-encap 2054 \ +-j DROP +ebtables \ +-t nat \ +-A libvirt-J-vnet0 \ +-s 01:02:03:04:05:06/ff:ff:ff:ff:ff:ff \ +-d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:ff \ +-p 0x8100 \ +--vlan-encap 4660 \ +-j ACCEPT diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args index d6d8aed4da..4cc4cd2bb1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args @@ -1,14 +1,31 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-aarch64 -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 -append \ -'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ --dtb /aarch64.dtb -device virtio-serial-device,id=virtio-serial0 -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 \ +-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 \ +-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ +-dtb /aarch64.dtb \ +-device virtio-serial-device,id=virtio-serial0 \ +-usb \ -drive file=/aarch64.raw,if=none,id=drive-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 \ --net user,vlan=0,name=hostnet0 -chardev pty,id=charconsole0 \ +-net user,vlan=0,name=hostnet0 \ +-chardev pty,id=charconsole0 \ -device virtconsole,chardev=charconsole0,id=console0 \ -device virtio-balloon-device,id=balloon0 \ -object rng-random,id=objrng0,filename=/dev/random \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args index 72e652607d..6adb0ff551 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-aarch64 -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 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 \ +-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 e61cd1e468..2d16c15bd4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args @@ -1,6 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-aarch64 -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 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 \ +-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 \ -net user,vlan=0,name=hostnet0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args index 3d8732fa30..48bcf3b9ba 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args @@ -1,7 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-aarch64 -S -machine virt,accel=tcg,gic-version=3 \ --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 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 \ +-S \ +-machine virt,accel=tcg,gic-version=3 \ +-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 \ -net user,vlan=0,name=hostnet0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args index e60e234df2..b27ae02230 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args @@ -1,10 +1,26 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-aarch64 -S -M virt -cpu host,aarch64=off -m 1024 -smp 1 \ --nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 \ +-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 \ +-boot c \ +-kernel /arm.kernel \ +-initrd /arm.initrd \ -append 'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \ --usb -drive file=/arm.raw,if=none,id=drive-virtio-disk0 \ +-usb \ +-drive file=/arm.raw,if=none,id=drive-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 \ --net user,vlan=0,name=hostnet0 -serial pty +-net user,vlan=0,name=hostnet0 \ +-serial pty diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args index 97209366ee..43cc290b70 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args @@ -1,16 +1,34 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-aarch64 -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 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 \ +-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 \ -append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ --dtb /aarch64.dtb -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \ +-dtb /aarch64.dtb \ +-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ --device virtio-serial-device,id=virtio-serial0 -usb \ +-device virtio-serial-device,id=virtio-serial0 \ +-usb \ -drive file=/aarch64.raw,if=none,id=drive-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 \ --net user,vlan=0,name=hostnet0 -serial pty -chardev pty,id=charconsole1 \ +-net user,vlan=0,name=hostnet0 \ +-serial pty \ +-chardev pty,id=charconsole1 \ -device virtconsole,chardev=charconsole1,id=console1 \ -device virtio-balloon-device,id=balloon0 \ -object rng-random,id=objrng0,filename=/dev/random \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args index 8cb57c5c8d..02add0bb85 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args @@ -1,7 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-aarch64 -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 -append console=ttyAMA0 \ --usb -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 \ +-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 \ +-append console=ttyAMA0 \ +-usb \ +-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -net user,vlan=0,name=hostnet0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args index d12e6e204b..8ddd3aa631 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args @@ -1,14 +1,32 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-aarch64 -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 -append \ -'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ --dtb /aarch64.dtb -device virtio-serial-device,id=virtio-serial0 -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 \ +-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 \ +-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ +-dtb /aarch64.dtb \ +-device virtio-serial-device,id=virtio-serial0 \ +-usb \ -drive file=/aarch64.raw,if=none,id=drive-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 \ --net user,vlan=0,name=hostnet0 -serial pty -chardev pty,id=charconsole1 \ +-net user,vlan=0,name=hostnet0 \ +-serial pty \ +-chardev pty,id=charconsole1 \ -device virtconsole,chardev=charconsole1,id=console1 \ -device virtio-balloon-device,id=balloon0 \ -object rng-random,id=objrng0,filename=/dev/random \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args index 3ae6e3434d..36d461fc2a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args @@ -1,15 +1,30 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-aarch64 -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 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 \ +-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 \ -append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ --dtb /aarch64.dtb -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \ +-dtb /aarch64.dtb \ +-device i82801b11-bridge,id=pci.1,bus=pcie.0,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 \ --usb -drive file=/aarch64.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,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 \ +-usb \ +-drive file=/aarch64.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,\ +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 \ -net user,vlan=0,name=hostnet0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args index a23fde4b3a..85d4097c97 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args @@ -1,8 +1,26 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-arm -S -M vexpress-a9 -m 1024 -smp 1 -nographic \ --nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ --boot c -kernel /arm.kernel -initrd /arm.initrd -append \ -'console=ttyAMA0,115200n8 rw root=/dev/mmcblk0p3 rootwait physmap.enabled=0' \ --dtb /arm.dtb -usb -drive file=/arm.raw,if=sd,index=0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-arm \ +-S \ +-M vexpress-a9 \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot c \ +-kernel /arm.kernel \ +-initrd /arm.initrd \ +-append 'console=ttyAMA0,\ +115200n8 rw root=/dev/mmcblk0p3 rootwait physmap.enabled=0' \ +-dtb /arm.dtb \ +-usb \ +-drive file=/arm.raw,if=sd,index=0 \ -net nic,macaddr=52:54:00:09:a4:37,vlan=0,model=lan9118,name=net0 \ --net user,vlan=0,name=hostnet0 -serial pty +-net user,vlan=0,name=hostnet0 \ +-serial pty diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args index 794dba2d90..a182f15cf6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-arm -S -M vexpress-a9 -m 1024 -smp 1 -nographic \ --nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ --boot c -kernel /arm.kernel -initrd /arm.initrd \ --append console=ttyAMA0,115200n8 -dtb /arm.dtb -usb +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-arm \ +-S \ +-M vexpress-a9 \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot c \ +-kernel /arm.kernel \ +-initrd /arm.initrd \ +-append console=ttyAMA0,115200n8 \ +-dtb /arm.dtb \ +-usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args index dba74e1af7..c2ea17b72a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args @@ -1,13 +1,31 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-arm -S -M vexpress-a9 -m 1024 -smp 1 -nographic \ --nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ --boot c -kernel /arm.kernel -initrd /arm.initrd -append \ -'console=ttyAMA0,115200n8 rw root=/dev/vda3 rootwait physmap.enabled=0' \ --dtb /arm.dtb -device virtio-serial-device,id=virtio-serial0 -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-arm \ +-S \ +-M vexpress-a9 \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot c \ +-kernel /arm.kernel \ +-initrd /arm.initrd \ +-append 'console=ttyAMA0,115200n8 rw root=/dev/vda3 rootwait physmap.enabled=0' \ +-dtb /arm.dtb \ +-device virtio-serial-device,id=virtio-serial0 \ +-usb \ -drive file=/arm.raw,if=none,id=drive-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 \ --net user,vlan=0,name=hostnet0 -serial pty -chardev pty,id=charconsole1 \ +-net user,vlan=0,name=hostnet0 \ +-serial pty \ +-chardev pty,id=charconsole1 \ -device virtconsole,chardev=charconsole1,id=console1 \ -device virtio-balloon-device,id=balloon0 \ -object rng-random,id=objrng0,filename=/dev/random \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args index c73022b3ad..818a2355df 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args @@ -1,13 +1,31 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-arm -S -M virt -m 1024 -smp 1 -nographic \ --nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ --boot c -kernel /arm.kernel -initrd /arm.initrd -append \ -'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \ --dtb /arm.dtb -device virtio-serial-device,id=virtio-serial0 -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-arm \ +-S \ +-M virt \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot c \ +-kernel /arm.kernel \ +-initrd /arm.initrd \ +-append 'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \ +-dtb /arm.dtb \ +-device virtio-serial-device,id=virtio-serial0 \ +-usb \ -drive file=/arm.raw,if=none,id=drive-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 \ --net user,vlan=0,name=hostnet0 -serial pty -chardev pty,id=charconsole1 \ +-net user,vlan=0,name=hostnet0 \ +-serial pty \ +-chardev pty,id=charconsole1 \ -device virtconsole,chardev=charconsole1,id=console1 \ -device virtio-balloon-device,id=balloon0 \ -object rng-random,id=objrng0,filename=/dev/random \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args index bca7f6b4ef..cfb358cf56 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args @@ -1,6 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -device virtio-balloon-pci,id=balloon0,bus=pci.0,\ -addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args index e31a27899d..5f825397a5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args @@ -1,6 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -device virtio-balloon-pci,id=balloon0,bus=pci.0,\ -addr=0x12 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args index e31a27899d..5f825397a5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args @@ -1,6 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -device virtio-balloon-pci,id=balloon0,bus=pci.0,\ -addr=0x12 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args index b51e8f3f85..fc02fbd5b8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args @@ -1,10 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ -drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \ -drive file=/usr/share/OVMF/OVMF_VARS.fd,if=pflash,format=raw,unit=1 \ --m 1024 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -boot c -usb \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot c \ +-usb \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --serial pty -device usb-tablet,id=input0 \ +-serial pty \ +-device usb-tablet,id=input0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.args b/tests/qemuxml2argvdata/qemuxml2argv-bios.args index e8ef7636bc..06cee20321 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.args @@ -1,7 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -bios /usr/share/seabios/bios.bin \ --m 1024 -smp 1 -nographic -nodefaults -device sga \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --usb -hda /dev/HostVG/QEMUGuest1 -serial pty \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-bios /usr/share/seabios/bios.bin \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-device sga \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-serial pty \ -device usb-tablet,id=input0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args index 2629c34207..65593ca645 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args @@ -1,10 +1,24 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 -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,cache=off,\ -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 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-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,cache=off,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 \ -drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-1,cache=off,\ 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 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args index ce7b5dad7e..48b9a01625 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args @@ -1,11 +1,25 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 -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,cache=off,\ -bps=5000,iops=6000 -device \ -ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-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,cache=off,bps=5000,\ +iops=6000 \ +-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,cache=off,\ -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 \ +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 virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args index 1e27394af5..ffb6c3ace4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \ -none -parallel none +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args index 1e27394af5..ffb6c3ace4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \ -none -parallel none +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args index f890f04aea..5fbc617aef 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args @@ -1,4 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot d -usb -cdrom /dev/cdrom -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot d \ +-usb \ +-cdrom /dev/cdrom \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args index ab10a57095..d3bfe8c032 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args @@ -1,4 +1,9 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -S \ -M pc \ @@ -20,16 +25,14 @@ id=virtio-disk1 \ -drive file=/dev/HostVG/hdb,if=none,id=drive-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 \ --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 \ -global isa-fdc.driveA=drive-fdc0-0-0 \ -global isa-fdc.bootindexA=4 \ -drive file=/dev/fd1,if=none,id=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,bootindex=2 \ +-device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x3,\ +bootindex=2 \ -net user,vlan=0,name=hostnet0 \ --device virtio-net-pci,vlan=1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,\ -addr=0x4 \ +-device virtio-net-pci,vlan=1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,addr=0x4 \ -net user,vlan=1,name=hostnet1 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args index 903d06680a..e4c60c20d1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args @@ -1,4 +1,9 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -S \ -M pc \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args index 464bfa97ab..c35ac7f57d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args @@ -1,10 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ -M pc-q35-2.4 \ --m 214 -smp 1 \ --nographic -nodefaults \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot a \ +-no-acpi \ +-boot a \ -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 \ -drive file=/tmp/firmware.img,if=none,id=drive-fdc0-0-0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args index 96c7d4dbef..5f6ed7f899 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot a -usb -hda /dev/HostVG/QEMUGuest1 -fda /tmp/firmware.img -net none \ --serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot a \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-fda /tmp/firmware.img \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args index 79049022ed..85a72db335 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args @@ -1,4 +1,9 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -S \ -M pc \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args index aa833010b0..033e21cd46 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args @@ -1,4 +1,9 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -S \ -M pc \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args index 272346c8d6..f0849924ac 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot order=d,menu=off -usb -cdrom /dev/cdrom -net none -serial none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot order=d,menu=off \ +-usb \ +-cdrom /dev/cdrom \ +-net none \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args index 6141259136..8c9b37905f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args @@ -1,4 +1,9 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -S \ -M pc \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args index b985dc8cf8..be059ff912 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args @@ -1,4 +1,9 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -S \ -M pc \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args index 6041e445d6..ff9aa339c2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot order=dcna,menu=on -usb -cdrom /dev/cdrom -net none -serial none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot order=dcna,menu=on \ +-usb \ +-cdrom /dev/cdrom \ +-net none \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args index f83c8fdd5e..74f198bd5d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot n -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \ -none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args index 398629c9bf..a2723422b5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args @@ -1,4 +1,9 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -S \ -M pc \ @@ -12,15 +17,14 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -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 \ -drive file=/root/boot.iso,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 \ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ id=virtio-disk0,bootindex=3 \ -drive file=/dev/null,if=none,id=drive-fdc0-0-1 \ -global isa-fdc.driveB=drive-fdc0-0-1 \ -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,bootindex=2 \ +-device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3,\ +bootindex=2 \ -net user,vlan=0,name=hostnet0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args index 19e12179a0..78dd818c21 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args @@ -1,4 +1,9 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -S \ -M pc \ @@ -21,16 +26,14 @@ id=virtio-disk1 \ -drive file=/dev/HostVG/hdb,if=none,id=drive-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 \ --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 \ -global isa-fdc.driveA=drive-fdc0-0-0 \ -global isa-fdc.bootindexA=4 \ -drive file=/dev/fd1,if=none,id=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,bootindex=2 \ +-device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x3,\ +bootindex=2 \ -net user,vlan=0,name=hostnet0 \ --device virtio-net-pci,vlan=1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,\ -addr=0x4 \ +-device virtio-net-pci,vlan=1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,addr=0x4 \ -net user,vlan=1,name=hostnet1 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args index 2f0627ba58..a96084e03a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args @@ -1,7 +1,16 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc-q35-2.4 \ --m 214 -smp 1 \ --nographic -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc-q35-2.4 \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args index eb1343071c..b9ef21825d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args @@ -1,8 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 -hda /dev/HostVG/QEMUGuest1 -chardev \ -pipe,id=charchannel0,path=/tmp/guestfwd -netdev user,\ -guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=user-channel0 -device \ -virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev pipe,id=charchannel0,path=/tmp/guestfwd \ +-netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=user-channel0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args index 87221a219d..8ccadbd36c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args @@ -1,8 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefconfig -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device \ -virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa -usb -hda \ -/dev/HostVG/QEMUGuest1 -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,tls-channel=main -device \ -virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=spice \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-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,\ +tls-channel=main \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args index e271521570..6be65d5a16 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args @@ -1,9 +1,25 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefconfig -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device \ -virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa -usb -hda \ -/dev/HostVG/QEMUGuest1 -chardev spicevmc,id=charchannel0,name=vdagent -device \ -virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0\ -,name=com.redhat.spice.0 -spice port=5903,tls-port=5904,addr=127.0.0.1,\ -x509-dir=/etc/pki/libvirt-spice,tls-channel=main -device \ -virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=spice \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev spicevmc,id=charchannel0,name=vdagent \ +-device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\ +id=channel0,name=com.redhat.spice.0 \ +-spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ +tls-channel=main \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args index 1806b20d38..c59c9aeee4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args @@ -1,22 +1,43 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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=16,vectors=4,bus=pci.0,addr=0x3 \ --device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa -device \ -virtio-serial-pci,id=virtio-serial2,bus=pci.0,addr=0x4 -usb -hda \ -/dev/HostVG/QEMUGuest1 -chardev pty,id=charchannel0 -device virtserialport,\ -bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,\ -name=org.linux-kvm.port.0 -chardev pty,id=charchannel1 -device virtserialport,\ -bus=virtio-serial1.0,nr=1,chardev=charchannel1,id=channel1,\ -name=org.linux-kvm.port.foo -chardev pty,id=charchannel2 -device \ -virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel2,id=channel2,\ -name=org.linux-kvm.port.bar -chardev pty,id=charchannel3 -device \ -virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel3,id=channel3,\ -name=org.linux-kvm.port.wizz -chardev pty,id=charchannel4 -device \ -virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,id=channel4,\ -name=org.linux-kvm.port.ooh -chardev pty,id=charchannel5 -device \ -virtserialport,bus=virtio-serial2.0,nr=1,chardev=charchannel5,id=channel5,\ -name=org.linux-kvm.port.lla -device virtio-balloon-pci,id=balloon0,\ -bus=pci.0,addr=0x5 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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=16,vectors=4,bus=pci.0,\ +addr=0x3 \ +-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ +-device virtio-serial-pci,id=virtio-serial2,bus=pci.0,addr=0x4 \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev pty,id=charchannel0 \ +-device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ +id=channel0,name=org.linux-kvm.port.0 \ +-chardev pty,id=charchannel1 \ +-device virtserialport,bus=virtio-serial1.0,nr=1,chardev=charchannel1,\ +id=channel1,name=org.linux-kvm.port.foo \ +-chardev pty,id=charchannel2 \ +-device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel2,\ +id=channel2,name=org.linux-kvm.port.bar \ +-chardev pty,id=charchannel3 \ +-device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel3,\ +id=channel3,name=org.linux-kvm.port.wizz \ +-chardev pty,id=charchannel4 \ +-device virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,\ +id=channel4,name=org.linux-kvm.port.ooh \ +-chardev pty,id=charchannel5 \ +-device virtserialport,bus=virtio-serial2.0,nr=1,chardev=charchannel5,\ +id=channel5,name=org.linux-kvm.port.lla \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args index 9aae58a422..c94ea99dd0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args @@ -4,14 +4,23 @@ HOME=/home/test \ USER=test \ LOGNAME=test \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 \ --nographic -nodefconfig -nodefaults \ +/usr/bin/qemu \ +-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,addr=0x3 \ +-no-acpi \ +-boot c \ +-device virtio-serial-pci,id=virtio-serial0,max_ports=4,vectors=4,bus=pci.0,\ +addr=0x3 \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0x4 \ --usb -hda /dev/HostVG/QEMUGuest1 \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ -chardev pty,id=charchannel0 \ -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ id=channel0,name=org.linux-kvm.port.0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args index f11039dcd4..410929e408 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args @@ -1,20 +1,42 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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\ -,addr=0x3 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ --usb -hda /dev/HostVG/QEMUGuest1 \ --chardev pty,id=charchannel0 -device virtserialport,bus=virtio-serial0.0,nr=2,\ -chardev=charchannel0,id=channel0,name=org.linux-kvm.port.0 \ --chardev pty,id=charchannel1 -device virtserialport,bus=virtio-serial0.0,nr=3,\ -chardev=charchannel1,id=channel1,name=org.linux-kvm.port.foo \ --chardev pty,id=charchannel2 -device virtserialport,bus=virtio-serial0.0,nr=1,\ -chardev=charchannel2,id=channel2,name=org.linux-kvm.port.bar \ --chardev pty,id=charchannel3 -device virtserialport,bus=virtio-serial1.0,nr=1,\ -chardev=charchannel3,id=channel3,name=org.linux-kvm.port.wizz \ --chardev pty,id=charchannel4 -device virtserialport,bus=virtio-serial1.0,nr=2,\ -chardev=charchannel4,id=channel4,name=org.linux-kvm.port.ooh \ --chardev pty,id=charchannel5 -device virtserialport,bus=virtio-serial1.0,nr=3,\ -chardev=charchannel5,id=channel5,name=org.linux-kvm.port.lla \ +-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,\ +addr=0x3 \ +-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev pty,id=charchannel0 \ +-device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel0,\ +id=channel0,name=org.linux-kvm.port.0 \ +-chardev pty,id=charchannel1 \ +-device virtserialport,bus=virtio-serial0.0,nr=3,chardev=charchannel1,\ +id=channel1,name=org.linux-kvm.port.foo \ +-chardev pty,id=charchannel2 \ +-device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel2,\ +id=channel2,name=org.linux-kvm.port.bar \ +-chardev pty,id=charchannel3 \ +-device virtserialport,bus=virtio-serial1.0,nr=1,chardev=charchannel3,\ +id=channel3,name=org.linux-kvm.port.wizz \ +-chardev pty,id=charchannel4 \ +-device virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,\ +id=channel4,name=org.linux-kvm.port.ooh \ +-chardev pty,id=charchannel5 \ +-device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel5,\ +id=channel5,name=org.linux-kvm.port.lla \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args index 7908445f03..0e2e69d28f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args @@ -1,5 +1,17 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ @@ -9,8 +21,9 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -usb \ -hda /dev/HostVG/QEMUGuest1 \ -chardev pty,id=charchannel0 \ --device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0 \ +-device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ +id=channel0 \ -chardev spicevmc,id=charchannel1,name=vdagent \ --device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,\ -name=com.redhat.spice.0 \ +-device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,\ +id=channel1,name=com.redhat.spice.0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args index 62bf14dc7c..674a846a4a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args @@ -1,10 +1,24 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-no-acpi \ +-boot c \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ --usb -hda /dev/HostVG/QEMUGuest1 \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ -chardev pty,id=charchannel0 \ -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\ id=channel0,name=org.linux-kvm.port.foo \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args index 289b9d700b..95b02ee3b2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args @@ -1,5 +1,17 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ @@ -8,13 +20,14 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \ -usb \ -hda /dev/HostVG/QEMUGuest1 \ --chardev socket,id=charchannel0,path=\ -/tmp/domain-QEMUGuest1/org.qemu.guest_agent.0,server,nowait \ --device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,\ -name=org.qemu.guest_agent.0 \ --chardev \ -socket,id=charchannel1,path=/tmp/domain-QEMUGuest1/unknown.sock,server,nowait \ --device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1 \ +-chardev socket,id=charchannel0,\ +path=/tmp/domain-QEMUGuest1/org.qemu.guest_agent.0,server,nowait \ +-device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ +id=channel0,name=org.qemu.guest_agent.0 \ +-chardev socket,id=charchannel1,path=/tmp/domain-QEMUGuest1/unknown.sock,server,\ +nowait \ +-device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,\ +id=channel1 \ -chardev socket,id=charchannel2,path=/tmp/domain-QEMUGuest1/ble,server,nowait \ --device virtserialport,bus=virtio-serial0.0,nr=3,chardev=charchannel2,id=channel2,\ -name=ble +-device virtserialport,bus=virtio-serial0.0,nr=3,chardev=charchannel2,\ +id=channel2,name=ble diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args index f2fab0fed9..2ff7df0ad7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args @@ -1,10 +1,25 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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-serial1,bus=pci.0,addr=0xa -usb -hda \ -/dev/HostVG/QEMUGuest1 -chardev pty,id=charchannel0 -device virtserialport,\ -bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,\ -name=org.linux-kvm.port.foo -device virtio-balloon-pci,id=balloon0,\ -bus=pci.0,addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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-serial1,bus=pci.0,addr=0xa \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev pty,id=charchannel0 \ +-device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\ +id=channel0,name=org.linux-kvm.port.foo \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args index c238a1332b..4f5c1e2478 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic \ --monitor unix:/tmp/test-monitor,server,nowait -rtc base=utc,driftfix=slew \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ --net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-rtc base=utc,driftfix=slew \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args index 8ad61f598e..a2bfc3ddc5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args @@ -1,4 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -TZ=Europe/Paris /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -rtc base=localtime -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +TZ=Europe/Paris \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-rtc base=localtime \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args index 5d11d9173d..283bc01318 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args @@ -1,5 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --rtc base=utc,driftfix=slew -no-kvm-pit-reinjection -no-hpet -no-acpi -boot c \ --usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-rtc base=utc,driftfix=slew \ +-no-kvm-pit-reinjection \ +-no-hpet \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args index ab9e9797bc..5632c20495 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic \ --monitor unix:/tmp/test-monitor,server,nowait -rtc base=2009-02-14T00:01:30 \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-rtc base=2009-02-14T00:01:30 \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args index d43a283890..32296d1540 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --localtime -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-localtime \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args index 1905875d06..916e05d9f3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/kvm -S -M pc \ --cpu qemu32,hv_time -m 214 -smp 6 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ -none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/kvm \ +-S \ +-M pc \ +-cpu qemu32,hv_time \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args index 9ed48c1339..cfb358cf56 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args @@ -1,6 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args index 3b7ebdaae7..06c3263cf0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -rtc \ -base=2009-02-15T09:49:06 -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ --net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-rtc base=2009-02-15T09:49:06 \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args index a5a57d6d7e..9fa4cb834d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial pty -parallel \ -none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial pty \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args index c97f1967d9..a849c3f6e0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args @@ -1,7 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 -hda /dev/HostVG/QEMUGuest1 -chardev \ -pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev pty,id=charserial0 \ +-device isa-serial,chardev=charserial0,id=serial0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args index a5a57d6d7e..9fa4cb834d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial pty -parallel \ -none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial pty \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args b/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args index e0699b185e..1d3698da43 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args @@ -1,9 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -s390-virtio -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 \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 -device \ -virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M s390-virtio \ +-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 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0 \ -chardev pty,id=charconsole0 \ -device sclpconsole,chardev=charconsole0,id=console0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args index ada1b07c31..063bb9503c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args @@ -1,12 +1,24 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -s390-ccw -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 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M s390-ccw \ +-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 \ -device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0001 \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ --device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\ -id=virtio-disk0,bootindex=1 \ +-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,\ +bootindex=1 \ -chardev pty,id=charconsole0 \ -device virtconsole,chardev=charconsole0,id=console0 \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args index 2c97f4516c..95363b9428 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args @@ -1,13 +1,30 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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,bus=pci.0,addr=0x3 -usb -hda \ -/dev/HostVG/QEMUGuest1 -chardev pty,id=charserial0 \ --device isa-serial,chardev=charserial0,id=serial0 -chardev pty,id=charconsole1 \ --device virtconsole,chardev=charconsole1,id=console1 -chardev \ -pty,id=charconsole2 -device virtconsole,chardev=charconsole2,id=console2 \ --chardev pty,id=charconsole3 -device virtconsole,chardev=charconsole3,\ -id=console3 -device virtio-balloon-pci,id=balloon0,\ -bus=pci.0,addr=0x4 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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,bus=pci.0,addr=0x3 \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev pty,id=charserial0 \ +-device isa-serial,chardev=charserial0,id=serial0 \ +-chardev pty,id=charconsole1 \ +-device virtconsole,chardev=charconsole1,id=console1 \ +-chardev pty,id=charconsole2 \ +-device virtconsole,chardev=charconsole2,id=console2 \ +-chardev pty,id=charconsole3 \ +-device virtconsole,chardev=charconsole3,id=console3 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args index b525c24240..127ae53603 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args @@ -1,8 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -s390-virtio -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 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M s390-virtio \ +-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 \ -device virtio-serial-s390,id=virtio-serial0 \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args index 3e5fd1c7a6..66305307e5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args @@ -1,9 +1,24 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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,bus=pci.0,addr=0x3 -usb -hda \ -/dev/HostVG/QEMUGuest1 -chardev pty,id=charconsole0 -device virtconsole,\ -chardev=charconsole0,id=console0 -device virtio-balloon-pci,id=balloon0,\ -bus=pci.0,addr=0x4 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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,bus=pci.0,addr=0x3 \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev pty,id=charconsole0 \ +-device virtconsole,chardev=charconsole0,id=console0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args b/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args index d68011dc5a..82f9e93f76 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args @@ -1,30 +1,40 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -QEMU_AUDIO_DRV=spice /usr/libexec/qemu-kvm -S -M rhel6.1.0 -enable-kvm -m \ -4096 -smp 4 -nodefaults -chardev \ -socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \ -chardev=charmonitor,id=monitor,mode=readline -boot order=cna,menu=off \ --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 \ -usb-ccid,id=ccid0 -drive \ -file=/tmp/fdr.img,if=none,id=drive-virtio-disk0,cache=off,aio=native \ --device \ -virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,id=virtio-disk0 \ --drive \ -file=/tmp/Fedora-17-x86_64-Live-Desktop.iso,if=none,media=cdrom,\ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=spice \ +/usr/libexec/qemu-kvm \ +-S \ +-M rhel6.1.0 \ +-enable-kvm \ +-m 4096 \ +-smp 4 \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-boot order=cna,menu=off \ +-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 usb-ccid,id=ccid0 \ +-drive file=/tmp/fdr.img,if=none,id=drive-virtio-disk0,cache=off,aio=native \ +-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\ +id=virtio-disk0 \ +-drive file=/tmp/Fedora-17-x86_64-Live-Desktop.iso,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 \ -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 -chardev \ -spicevmc,id=charsmartcard0,name=smartcard -device \ -ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \ --chardev pty,id=charserial0 -device \ -isa-serial,chardev=charserial0,id=serial0 -chardev \ -spicevmc,id=charchannel0,name=vdagent \ +-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 \ +-net user,vlan=0,name=hostnet0 \ +-chardev spicevmc,id=charsmartcard0,name=smartcard \ +-device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \ +-chardev pty,id=charserial0 \ +-device isa-serial,chardev=charserial0,id=serial0 \ +-chardev spicevmc,id=charchannel0,name=vdagent \ -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ id=channel0,name=com.redhat.spice.0 \ --device usb-tablet,id=input0 -spice \ -port=0,addr=0.0.0.0 -device \ -intel-hda,id=sound0,bus=pci.0,addr=0x4 -device \ -hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 -device \ -usb-host,hostbus=14,hostaddr=6,id=hostdev0 -device \ -virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 +-device usb-tablet,id=input0 \ +-spice port=0,addr=0.0.0.0 \ +-device intel-hda,id=sound0,bus=pci.0,addr=0x4 \ +-device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \ +-device usb-host,hostbus=14,hostaddr=6,id=hostdev0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args index d64cc83812..2318910371 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args @@ -1,4 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-kvm -S -M pc -cpu Haswell-noTSX -m 214 -smp 6 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ -none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-kvm \ +-S \ +-M pc \ +-cpu Haswell-noTSX \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args index f9bea6215b..9f1a090aba 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args @@ -1,4 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-kvm -S -M pc -cpu Haswell -m 214 -smp 6 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ -none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-kvm \ +-S \ +-M pc \ +-cpu Haswell \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args index a398ab8849..d11102af1b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args @@ -1,4 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-kvm -S -M pc -cpu Haswell,-rtm,-hle -m 214 -smp 6 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ -none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-kvm \ +-S \ +-M pc \ +-cpu Haswell,-rtm,-hle \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args index f9bea6215b..9f1a090aba 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args @@ -1,4 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-kvm -S -M pc -cpu Haswell -m 214 -smp 6 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ -none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-kvm \ +-S \ +-M pc \ +-cpu Haswell \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args index eed5c4d291..3d51800257 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args @@ -1,5 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --cpu qemu32,-kvm_pv_eoi -m 214 -smp 6 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-cpu qemu32,-kvm_pv_eoi \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot n \ +-usb \ +-net none \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args index 794a14a592..590babfd9a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args @@ -1,5 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --cpu qemu32,+kvm_pv_eoi -m 214 -smp 6 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-cpu qemu32,+kvm_pv_eoi \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot n \ +-usb \ +-net none \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args index 0a58616356..c90d81e8b0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-kvm -S -M pc \ --cpu qemu64,-svm,-lm,-nx,-syscall,-clflush,-pse36,-mca -m 214 -smp 6 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ -none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-kvm \ +-S \ +-M pc \ +-cpu qemu64,-svm,-lm,-nx,-syscall,-clflush,-pse36,-mca \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args index e46527b56e..e93bbe4c84 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-kvm -S -M pc \ --cpu core2duo,+lahf_lm,+3dnowext,+xtpr,+ds_cpl,+tm,+ht,+ds,-nx -m 214 -smp 6 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ -none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-kvm \ +-S \ +-M pc \ +-cpu core2duo,+lahf_lm,+3dnowext,+xtpr,+ds_cpl,+tm,+ht,+ds,-nx \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args index e46527b56e..e93bbe4c84 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-kvm -S -M pc \ --cpu core2duo,+lahf_lm,+3dnowext,+xtpr,+ds_cpl,+tm,+ht,+ds,-nx -m 214 -smp 6 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ -none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-kvm \ +-S \ +-M pc \ +-cpu core2duo,+lahf_lm,+3dnowext,+xtpr,+ds_cpl,+tm,+ht,+ds,-nx \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args index ead561f442..5f9d12e94e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args @@ -2,7 +2,8 @@ LC_ALL=C \ PATH=/bin \ HOME=/home/test \ USER=test \ -LOGNAME=test QEMU_AUDIO_DRV=none \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu-kvm \ -S \ -M pc \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args index 507fcf4da2..caaa29d335 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --enable-kvm -cpu host,-kvmclock -m 214 -smp 6 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ -none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-enable-kvm \ +-cpu host,-kvmclock \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args index fc0caba60b..8158ca107b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args @@ -2,12 +2,13 @@ LC_ALL=C \ PATH=/bin \ HOME=/home/test \ USER=test \ -LOGNAME=test QEMU_AUDIO_DRV=none \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -S \ -M pc \ --cpu Penryn,+xtpr,+tm2,+est,+vmx,+ds_cpl,+monitor,+pbe,+tm,+ht,+ss,+acpi,\ -+ds,+vme,-sse4.1 \ +-cpu Penryn,+xtpr,+tm2,+est,+vmx,+ds_cpl,+monitor,+pbe,+tm,+ht,+ss,+acpi,+ds,\ ++vme,-sse4.1 \ -m 214 \ -smp 6 \ -nographic \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args index 5d67d554d6..f4c6bb894f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args @@ -2,12 +2,13 @@ LC_ALL=C \ PATH=/bin \ HOME=/home/test \ USER=test \ -LOGNAME=test QEMU_AUDIO_DRV=none \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -S \ -M pc \ --cpu 'core2duo,vendor=Libvirt QEMU,+lahf_lm,+xtpr,+cx16,+tm2,+est,+vmx,\ -+ds_cpl,+pbe,+tm,+ht,+ss,+acpi,+ds' \ +-cpu 'core2duo,vendor=Libvirt QEMU,+lahf_lm,+xtpr,+cx16,+tm2,+est,+vmx,+ds_cpl,\ ++pbe,+tm,+ht,+ss,+acpi,+ds' \ -m 214 \ -smp 6 \ -nographic \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args index 2f82dac9e4..4b71a1c39e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args @@ -2,11 +2,13 @@ LC_ALL=C \ PATH=/bin \ HOME=/home/test \ USER=test \ -LOGNAME=test QEMU_AUDIO_DRV=none \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -S \ -M pc \ --cpu core2duo,+lahf_lm,+xtpr,+cx16,+tm2,+est,+vmx,+ds_cpl,+pbe,+tm,+ht,+ss,+acpi,+ds \ +-cpu core2duo,+lahf_lm,+xtpr,+cx16,+tm2,+est,+vmx,+ds_cpl,+pbe,+tm,+ht,+ss,+acpi,\ ++ds \ -m 214 \ -smp 6 \ -nographic \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args index 88a25bf432..2dc9a9629d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args @@ -3,8 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ LOGNAME=test \ -QEMU_AUD\ -IO_DRV=none \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -S \ -M pc \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args index a3fc48f974..2f103d0ab2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args @@ -2,7 +2,8 @@ LC_ALL=C \ PATH=/bin \ HOME=/home/test \ USER=test \ -LOGNAME=test QEMU_AUDIO_DRV=none \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -S \ -M pc \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args index e5a9f576e9..330fe12452 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --enable-kvm -cpu core2duo,-kvmclock -m 214 -smp 6 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ -none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-enable-kvm \ +-cpu core2duo,-kvmclock \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args index d8207e73ce..ddb51538cb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-kvm -S -M pc \ --cpu core2duo,+lahf_lm,+xtpr,+cx16,+tm2,+est,+vmx,+ds_cpl,+pbe,+tm,+ht,+ss,\ -+acpi,+ds -m 214 -smp 6 -nographic -monitor unix:/tmp/test-monitor,server,\ -nowait -no-acpi -boot n -usb -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-kvm \ +-S \ +-M pc \ +-cpu core2duo,+lahf_lm,+xtpr,+cx16,+tm2,+est,+vmx,+ds_cpl,+pbe,+tm,+ht,+ss,+acpi,\ ++ds \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args index 17ba2568fb..00e07fe8bd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-kvm -S -M pc \ --cpu core2duo,+lahf_lm,+xtpr,+cx16,+tm2,+est,+vmx,+ds_cpl,+pbe,+tm,+ht,+ss,\ -+acpi,+ds,-lm,-nx,-syscall -m 214 -smp 6 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net none -serial none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-kvm \ +-S \ +-M pc \ +-cpu core2duo,+lahf_lm,+xtpr,+cx16,+tm2,+est,+vmx,+ds_cpl,+pbe,+tm,+ht,+ss,+acpi,\ ++ds,-lm,-nx,-syscall \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args index 073e84b4d6..bc75a9afbe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --m 214 -smp 16 -numa node,nodeid=0,cpus=0-3,cpus=8-11,mem=107 \ --numa node,nodeid=1,cpus=4-7,cpus=12-15,mem=107 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net none -serial none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 16 \ +-numa node,nodeid=0,cpus=0-3,cpus=8-11,mem=107 \ +-numa node,nodeid=1,cpus=4-7,cpus=12-15,mem=107 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args index ca34f734fe..a4d1b64d2f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --m 214 -smp 16,sockets=2,cores=4,threads=2 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 16,sockets=2,cores=4,threads=2 \ -numa node,nodeid=0,cpus=0-7,mem=107 \ --numa node,nodeid=1,cpus=8-15,mem=107 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net none -serial none \ +-numa node,nodeid=1,cpus=8-15,mem=107 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args index 418fa4463a..450b3a4271 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --m 214 -smp 16 -numa node,nodeid=0,cpus=0-7,mem=107 \ --numa node,nodeid=1,cpus=8-15,mem=107 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net none -serial none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 16 \ +-numa node,nodeid=0,cpus=0-7,mem=107 \ +-numa node,nodeid=1,cpus=8-15,mem=107 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args index ca34f734fe..a4d1b64d2f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --m 214 -smp 16,sockets=2,cores=4,threads=2 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 16,sockets=2,cores=4,threads=2 \ -numa node,nodeid=0,cpus=0-7,mem=107 \ --numa node,nodeid=1,cpus=8-15,mem=107 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net none -serial none \ +-numa node,nodeid=1,cpus=8-15,mem=107 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args index c500ef72b1..51f843355a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-kvm -S -M pc \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-kvm \ +-S \ +-M pc \ -cpu core2duo,+lahf_lm,+3dnowext,+xtpr,+est,+vmx,+ds_cpl,+tm,+ht,+acpi,+ds,-nx \ --m 214 -smp 6 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot n -usb -net none -serial none -parallel none +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args index 732dd20bf5..20faf711fd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args @@ -1,5 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --m 214 -smp 6,sockets=3,cores=2,threads=1 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net none -serial none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 6,sockets=3,cores=2,threads=1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args index 5f9ca4404d..74365a92ea 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --cpu core2duo -m 214 -smp 6,sockets=1,cores=2,threads=3 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net none -serial none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-cpu core2duo \ +-m 214 \ +-smp 6,sockets=1,cores=2,threads=3 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args index d9fa7b51c7..fca529562b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args @@ -1,4 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --m 214 -smp 6 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot n -usb -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args index affe648089..7892f0f48e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args @@ -1,6 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-x86_64 -S -M pc-q35-2.3 -m 128 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-S \ +-M pc-q35-2.3 \ +-m 128 \ -smp 2,maxcpus=6,sockets=6,cores=1,threads=1 \ --object iothread,id=iothread1 -object iothread,id=iothread2 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi \ --boot c -net none -serial none -parallel none +-object iothread,id=iothread1 \ +-object iothread,id=iothread2 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args b/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args index bc6d24105f..d14c6ceed5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 2 -nographic \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 2 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune.args b/tests/qemuxml2argvdata/qemuxml2argv-cputune.args index bc6d24105f..d14c6ceed5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cputune.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 2 -nographic \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 2 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args b/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args index 102691f642..b620fb7191 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args @@ -1,4 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/kvm -S -machine pc,accel=kvm -m 4096 -smp 4 -nographic \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -net none \ --serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/kvm \ +-S \ +-machine pc,accel=kvm \ +-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-default-qemu-host-arch.args b/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args index 5bd404ced0..48d85e83d0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args @@ -1,4 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-x86_64 -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 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-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-aio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args index eacaf40e8a..3739a5fc68 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args @@ -1,7 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -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,\ -format=qcow2,cache=none,aio=native -drive file=/dev/HostVG/QEMUGuest2,if=ide,\ -media=cdrom,bus=1,unit=0,format=raw,aio=threads -net none -serial none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=qcow2,cache=none,\ +aio=native \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw,\ +aio=threads \ +-net none \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args index 79af23d1e3..6754fbef82 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ -drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args index 31ffe5933c..829252b564 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -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 \ -if=ide,media=cdrom,bus=1,unit=0 -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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 if=ide,media=cdrom,bus=1,unit=0 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args index 559459800e..1772275d1f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args @@ -1,7 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/kvm -S \ --M pc-1.2 -m 1024 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -boot d -usb \ --drive file=ftp://host.name:21/url/path/file.iso,if=none,media=cdrom,id=drive-ide0-1-0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/kvm \ +-S \ +-M pc-1.2 \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot d \ +-usb \ +-drive file=ftp://host.name:21/url/path/file.iso,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 virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args index 78dbff2984..c153842d2e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args @@ -1,8 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/kvm -S \ --M pc-1.2 -m 1024 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -boot d -usb \ --drive \ -file=ftps://host.name:990/url/path/file.iso,if=none,media=cdrom,id=drive-ide0-1-0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/kvm \ +-S \ +-M pc-1.2 \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot d \ +-usb \ +-drive file=ftps://host.name:990/url/path/file.iso,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 virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args index 6e3e2df0d5..f5c0bd5c77 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args @@ -1,7 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/kvm -S \ --M pc-1.2 -m 1024 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -boot d -usb \ --drive file=http://host.name:80/url/path/file.iso,if=none,media=cdrom,id=drive-ide0-1-0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/kvm \ +-S \ +-M pc-1.2 \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot d \ +-usb \ +-drive file=http://host.name:80/url/path/file.iso,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 virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args index affa794f54..0a01a9923a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args @@ -1,8 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/kvm -S \ --M pc-1.2 -m 1024 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -boot d -usb \ --drive \ -file=https://host.name:443/url/path/file.iso,if=none,media=cdrom,id=drive-ide0-1-0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/kvm \ +-S \ +-M pc-1.2 \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot d \ +-usb \ +-drive file=https://host.name:443/url/path/file.iso,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 virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args index bc0cb92236..60c875ab32 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args @@ -1,7 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/kvm -S \ --M pc-1.2 -m 1024 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -boot d -usb \ --drive file=tftp://host.name:69/url/path/file.iso,if=none,media=cdrom,id=drive-ide0-1-0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/kvm \ +-S \ +-M pc-1.2 \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot d \ +-usb \ +-drive file=tftp://host.name:69/url/path/file.iso,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 virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args index 9d7683bc85..a1242085c6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none \ --serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args index f102947c98..1f44b92efb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args @@ -1,11 +1,25 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot dc -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc-0.13 \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot dc \ +-usb \ -drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ id=virtio-disk0 \ --drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,\ -media=cdrom,id=drive-ide0-1-0 \ +-drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,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 \ -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 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args index 4868042a51..9f55c2ae63 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -cdrom /root/boot.iso -net none \ --serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-cdrom /root/boot.iso \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args index da83b18d1c..d5995dcdda 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args @@ -1,15 +1,30 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi \ --boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ --usb -drive file=/var/lib/libvirt/images/f14.img,if=none,\ -id=drive-virtio-disk0,copy-on-read=on \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc-0.13 \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot dc \ +-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ +-usb \ +-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,\ +copy-on-read=on \ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ id=virtio-disk0 \ --drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,\ -media=cdrom,id=drive-ide0-1-0 \ +-drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,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 virtio-net-pci,tx=bh,vlan=0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,\ addr=0x3 \ --net user,vlan=0,name=hostnet0 -serial pty \ +-net user,vlan=0,name=hostnet0 \ +-serial pty \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args index 7f54d77789..d52dcaabb5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot d -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 -drive \ -file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0 -net none -serial \ -none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot d \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args index b36ea95c42..2360f462ca 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -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/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0 -net none -serial \ -none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args index a0e1825a2f..12b8f68c8e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args @@ -1,6 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -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,\ -format=qcow2,cache=directsync -drive file=/dev/HostVG/QEMUGuest2,if=ide,\ -media=cdrom,bus=1,unit=0,format=raw -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=qcow2,\ +cache=directsync \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args index b088c8a2c9..051ae7632a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -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,\ -format=qcow2,cache=unsafe -drive file=/dev/HostVG/QEMUGuest2,if=ide,\ -media=cdrom,bus=1,unit=0,format=raw -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=qcow2,cache=unsafe \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args index cec72bc6a5..6438d099ae 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -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,\ -format=qcow2,cache=off -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,\ -bus=1,unit=0,format=raw -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=qcow2,cache=off \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args index c6542562eb..4c630b7ba8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -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,\ -format=qcow2,cache=on -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,\ -bus=1,unit=0,format=raw -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=qcow2,cache=on \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args index cec72bc6a5..6438d099ae 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -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,\ -format=qcow2,cache=off -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,\ -bus=1,unit=0,format=raw -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=qcow2,cache=off \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args index e3fe676d67..4f46dc9a47 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -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,\ -format=qcow2,cache=none -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,\ -bus=1,unit=0,format=raw -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=qcow2,cache=none \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args index 345a3f22e0..f85cf915d4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args @@ -1,6 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -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,\ -format=qcow2,cache=writeback -drive file=/dev/HostVG/QEMUGuest2,if=ide,\ -media=cdrom,bus=1,unit=0,format=raw -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=qcow2,\ +cache=writeback \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args index 14d483d901..4977174141 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args @@ -1,6 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -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,\ -format=qcow2,cache=writethrough -drive file=/dev/HostVG/QEMUGuest2,if=ide,\ -media=cdrom,bus=1,unit=0,format=raw -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=qcow2,\ +cache=writethrough \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args index f743b6bcda..1da91e4a0b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -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,\ -format=raw,copy-on-read=on -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=raw,\ +copy-on-read=on \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args index 2ff57f6296..ab612f91ee 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args @@ -1,11 +1,25 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot dc -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc-0.13 \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot dc \ +-usb \ -drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,\ discard=unmap \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ id=virtio-disk0 \ --drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,\ -media=cdrom,id=drive-ide0-1-0,discard=ignore \ +-drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,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 virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args index 84e48455b3..1ae20d8810 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args @@ -1,8 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ -monitor control,unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ -format=qcow2,cache=off,werror=enospc -drive \ -file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw -net \ -none -serial none -parallel none +-no-acpi \ +-boot c \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=qcow2,cache=off,\ +werror=enospc \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args index f577cc8f97..33192bf4bb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args @@ -1,8 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ -monitor control,unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ -format=qcow2,cache=off,werror=stop,rerror=stop -drive \ -file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw -net \ -none -serial none -parallel none +-no-acpi \ +-boot c \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=qcow2,cache=off,\ +werror=stop,rerror=stop \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args index 9514483a58..d82dd2f7cd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args @@ -1,8 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ -monitor control,unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ -format=qcow2,cache=off,werror=report,rerror=ignore -drive \ -file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw -net \ -none -serial none -parallel none +-no-acpi \ +-boot c \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=qcow2,cache=off,\ +werror=report,rerror=ignore \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args index e4cb98645e..165d2a840b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -drive file=fat:/var/somefiles,if=ide,bus=0,unit=0 -net none \ --serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=fat:/var/somefiles,if=ide,bus=0,unit=0 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args index 28e023403b..65fe181cf7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -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,\ -format=qcow2 -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,\ -unit=0,format=raw -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=qcow2 \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args index 4e772d1bb0..7e3a2642e3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args @@ -1,8 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ -drive file=gluster://example.org:6000/Volume1/Image,if=virtio,format=raw \ --drive 'file=gluster+unix:///Volume2/Image?socket=/path/to/sock,\ -if=virtio,format=raw' \ --net none -serial none -parallel none +-drive 'file=gluster+unix:///Volume2/Image?socket=/path/to/sock,if=virtio,\ +format=raw' \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args index 4c5e1bebe6..b69bf0dbe8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args @@ -1,9 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb \ --drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org\ -:6000/iqn.1992-01.com.example,if=virtio,format=raw \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ +6000/iqn.1992-01.com.example,if=virtio,format=raw \ -drive file=iscsi://example.org:6000/iqn.1992-01.com.example/1,if=virtio,\ format=raw \ --net none -serial none -parallel none +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args index 109f2f8127..43f68481f8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args @@ -1,7 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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,\ -id=drive-scsi0-0-0-0,format=raw -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=drive-scsi0-0-0-0,format=raw \ +-device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ +id=scsi0-0-0-0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args index 605f0d5704..80029bffe5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args @@ -1,9 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ -drive file=iscsi://example.org:6000/iqn.1992-01.com.example,if=virtio,\ format=raw \ -drive file=iscsi://example.org:6000/iqn.1992-01.com.example/1,if=virtio,\ format=raw \ --net none -serial none -parallel none +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args index 8e68f0afbb..0507b4058d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=raw \ -drive file=nbd:example.org:6000:exportname=bar,if=virtio,format=raw \ --net none -serial none -parallel none +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args index 400695f661..63aa0d5ec6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=raw \ --drive 'file=nbd://[::1]:6000/bar,if=virtio,format=raw' -net none \ --serial none -parallel none +-drive 'file=nbd://[::1]:6000/bar,if=virtio,format=raw' \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args index 6e77ab58a6..b46cef52cf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=raw \ --drive 'file=nbd://[::1]:6000,if=virtio,format=raw' -net none \ --serial none -parallel none +-drive 'file=nbd://[::1]:6000,if=virtio,format=raw' \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args index b7a8491923..53691efbb5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=raw \ -drive file=nbd:unix:/var/run/nbdsock:exportname=bar,if=virtio,format=raw \ --net none -serial none -parallel none +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args index 7ae45790e3..1b0cefe761 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=raw \ --drive file=nbd:example.org:6000,if=virtio,format=raw -net none -serial none \ +-drive file=nbd:example.org:6000,if=virtio,format=raw \ +-net none \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args index 07a13db476..580c62cadd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args @@ -1,11 +1,24 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -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,format=raw -drive \ -'file=rbd:pool/image:\ -id=myname:\ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=raw \ +-drive 'file=rbd:pool/image:id=myname:\ key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:\ -auth_supported=cephx\;none:\ -mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;\ -mon3.example.org\:6322,\ -if=virtio,format=raw' -net none -serial none -parallel none +auth_supported=cephx\;none:mon_host=mon1.example.org\:6321\;mon2.example.org\:\ +6322\;mon3.example.org\:6322,if=virtio,format=raw' \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args index 3acbf057a0..68d39d4c85 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args @@ -1,6 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -CEPH_ARGS=-m mon1.example.org:6321,mon2.example.org:6322,mon3.example.org:6322 \ -/usr/bin/qemu -S -M pc -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=rbd:pool/image,\ -if=virtio,format=raw -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +CEPH_ARGS=-m \ +mon1.example.org:6321,mon2.example.org:6322,mon3.example.org:6322 \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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=rbd:pool/image,if=virtio,format=raw \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args index b7435d2dff..1d378a8316 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args @@ -1,9 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -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,format=raw -drive \ -'file=rbd:pool/image:auth_supported=none:\ -mon_host=[\:\:1]\:6321\;example.org\:6789\;\ -[ffff\:1234\:567\:abc\:\:0f]\:6322\;\ -[2001\:db8\:\:ff00\:42\:8329]\:6322,\ -if=virtio,format=raw' -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=raw \ +-drive 'file=rbd:pool/image:auth_supported=none:mon_host=[\:\:1]\:\ +6321\;example.org\:6789\;[ffff\:1234\:567\:abc\:\:0f]\:6322\;[2001\:db8\:\:ff00\:\ +42\:8329]\:6322,if=virtio,format=raw' \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args index f634e8d451..f8699fa58e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args @@ -1,14 +1,27 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=raw \ --drive 'file=rbd:pool/image:auth_supported=none:\ -mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;\ -mon3.example.org\:6322,if=virtio,format=raw' \ +-drive 'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:\ +6321\;mon2.example.org\:6322\;mon3.example.org\:6322,if=virtio,format=raw' \ -drive file=rbd:pool/image@asdf:auth_supported=none,if=virtio,format=raw \ --drive 'file=rbd:pool/image@foo:auth_supported=none:\ -mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;\ -mon3.example.org\:6322,if=virtio,format=raw' \ --drive file=rbd:pool/image@foo:auth_supported=none:\ -conf=/blah/test.conf,if=virtio,format=raw \ --net none -serial none -parallel none +-drive 'file=rbd:pool/image@foo:auth_supported=none:mon_host=mon1.example.org\:\ +6321\;mon2.example.org\:6322\;mon3.example.org\:6322,if=virtio,format=raw' \ +-drive file=rbd:pool/image@foo:auth_supported=none:conf=/blah/test.conf,\ +if=virtio,format=raw \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args index 0b4b46065a..99f05cd241 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ -drive file=/dev/HostVG/QEMU,,Guest,,,,1,if=ide,bus=0,unit=0,format=raw \ -drive file=sheepdog:example.org:6000:image,,with,,commas,if=virtio,format=raw \ --net none -serial none -parallel none +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args index 64f0684339..1adf331e4f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args @@ -1,4 +1,9 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -S \ -M pc \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args index 8632300b99..788a3888b3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args @@ -1,9 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 -drive file=/dev/sr0,if=none,\ -media=cdrom,id=drive-ide0-1-0,readonly=on -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 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-drive file=/dev/sr0,if=none,media=cdrom,id=drive-ide0-1-0,readonly=on \ +-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 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args index e7d1465c6e..58a0fd296e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -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/sr0,if=ide,media=cdrom,bus=1,unit=0,readonly=on -net none -serial \ -none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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/sr0,if=ide,media=cdrom,bus=1,unit=0,readonly=on \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args index a049d5910b..ae1f114507 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args @@ -1,7 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -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,\ -format=qcow2,serial=XYZXYZXYZYXXYZYZYXYZY,cache=off -drive \ -file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw -net \ -none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=qcow2,\ +serial=XYZXYZXYZYXXYZYZYXYZY,cache=off \ +-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args index 6f6812184e..4d2e59241c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args @@ -1,6 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-ppc64 -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 \ --net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-ppc64 \ +-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 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args index 87d71e26af..b83a9fbb3c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -fda /dev/fd0 \ --net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-fda /dev/fd0 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args index 01d64ecd84..21f50081bf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args @@ -1,6 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-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 \ -drive file=/dev/fd0,if=none,id=drive-fdc0-0-0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args index 3f9df0b253..c95f467d2e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args @@ -1,5 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -fda /dev/fd0 -fdb \ -/tmp/firmware.img -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-fda /dev/fd0 \ +-fdb /tmp/firmware.img \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args index a43a0ac8c2..1a049c6712 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -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,\ -cyls=16383,heads=16,secs=63,trans=lba \ --net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,cyls=16383,heads=16,\ +secs=63,trans=lba \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args index 4fe04b3233..659fd45d87 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ -drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args index bd2fba4a54..951461c45e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args @@ -1,6 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -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,serial=WD-WMAP9A966149 \ --device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,wwn=0x5000c50015ea71ad \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-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,\ +serial=WD-WMAP9A966149 \ +-device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,\ +wwn=0x5000c50015ea71ad \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args index ac96b5f66c..4bd0501cc7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args @@ -1,14 +1,29 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi \ --boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ --usb -drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc-0.13 \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot dc \ +-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ +-usb \ +-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \ -device virtio-blk-pci,ioeventfd=on,scsi=off,bus=pci.0,addr=0x4,\ drive=drive-virtio-disk0,id=virtio-disk0 \ --drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,\ -media=cdrom,id=drive-ide0-1-0 \ +-drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,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 virtio-net-pci,tx=bh,ioeventfd=off,vlan=0,id=net0,\ -mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \ --net user,vlan=0,name=hostnet0 -serial pty \ +-device virtio-net-pci,tx=bh,ioeventfd=off,vlan=0,id=net0,mac=52:54:00:e5:48:58,\ +bus=pci.0,addr=0x3 \ +-net user,vlan=0,name=hostnet0 \ +-serial pty \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args index b987a3878f..8f23385e24 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb \ --hda /dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan.hdserver\ -:hydrar-desktop.win7vm-lun-0 -net none \ --serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan.hdserver:\ +hydrar-desktop.win7vm-lun-0 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args index f6a7d91c52..2eb5c44e51 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args @@ -1,5 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -hdb /dev/HostVG/QEMUGuest2 -hdc \ -/tmp/data.img -hdd /tmp/logs.img -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-hdb /dev/HostVG/QEMUGuest2 \ +-hdc /tmp/data.img \ +-hdd /tmp/logs.img \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args index aeacb2d2a3..5a37976171 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args @@ -1,4 +1,9 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -S \ -M pc \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args index 7ae610f814..547f9522b6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args @@ -1,7 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device ahci,id=sata0,\ -bus=pci.0,addr=0x3 -usb -drive file=/dev/HostVG/QEMUGuest1,if=none,\ -id=drive-sata0-0-0 -device ide-drive,bus=sata0.0,drive=drive-sata0-0-0,\ -id=sata0-0-0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-device ahci,id=sata0,bus=pci.0,addr=0x3 \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \ +-device ide-drive,bus=sata0.0,drive=drive-sata0-0-0,id=sata0-0-0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args index d37d42936a..2a67ec5513 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args @@ -1,9 +1,24 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device lsi,id=scsi0,\ -bus=pci.0,addr=0x3 -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 -drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0 -device \ -scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-device lsi,id=scsi0,bus=pci.0,addr=0x3 \ +-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 \ +-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0 \ +-device scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args index d37d42936a..2a67ec5513 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args @@ -1,9 +1,24 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device lsi,id=scsi0,\ -bus=pci.0,addr=0x3 -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 -drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0 -device \ -scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-device lsi,id=scsi0,bus=pci.0,addr=0x3 \ +-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 \ +-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0 \ +-device scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args index 87799b2f19..999abb06cd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args @@ -1,6 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ -device lsi,id=scsi2,bus=pci.0,addr=0x5 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args index aa6e63903f..7880a0796c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args @@ -1,6 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ -usb \ @@ -8,6 +22,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ id=scsi0-0-0-0,vendor=SEAGATE,product=ST3146707LC \ -drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi1-0-0 \ --device scsi-hd,bus=scsi1.0,scsi-id=0,drive=drive-scsi1-0-0,\ -id=scsi1-0-0,vendor=SEAGATE,product=ST3567807GD \ +-device scsi-hd,bus=scsi1.0,scsi-id=0,drive=drive-scsi1-0-0,id=scsi1-0-0,\ +vendor=SEAGATE,product=ST3567807GD \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args index f2e1a95522..d56a56c2b5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args @@ -1,6 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ -usb \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args index 163b91d483..16087bea68 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args @@ -1,14 +1,26 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-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 \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,if=none,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,id=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 \ -drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-1-1 \ --device scsi-block,bus=scsi0.0,channel=0,scsi-id=1,lun=1,\ -drive=drive-scsi0-0-1-1,id=scsi0-0-1-1 \ +-device scsi-block,bus=scsi0.0,channel=0,scsi-id=1,lun=1,drive=drive-scsi0-0-1-1,\ +id=scsi0-0-1-1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args index f20f25e40f..63eb48ded5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args @@ -1,10 +1,25 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device \ -megasas,id=scsi0,bus=pci.0,addr=0x3 -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 -drive file=/tmp/scsidisk.img,if=none,\ -id=drive-scsi0-0-4-0 -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,\ -drive=drive-scsi0-0-4-0,id=scsi0-0-4-0 -device virtio-balloon-pci,\ -id=balloon0,bus=pci.0,addr=0x4 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-device megasas,id=scsi0,bus=pci.0,addr=0x3 \ +-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 \ +-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-4-0 \ +-device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,drive=drive-scsi0-0-4-0,\ +id=scsi0-0-4-0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args index de53ece2f1..0065ae023a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args @@ -1,10 +1,25 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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=/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 -drive file=/tmp/scsidisk.img,if=none,\ -id=drive-scsi0-0-4-0 -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,\ -drive=drive-scsi0-0-4-0,id=scsi0-0-4-0 -device virtio-balloon-pci,\ -id=balloon0,bus=pci.0,addr=0x4 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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=/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 \ +-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-4-0 \ +-device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,drive=drive-scsi0-0-4-0,\ +id=scsi0-0-4-0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args index a353b06cb2..3f50270ab9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args @@ -1,11 +1,25 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device spapr-vscsi,\ -id=scsi0,reg=0x2000 -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-device spapr-vscsi,id=scsi0,reg=0x2000 \ +-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 \ -drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-3-0 \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=3,lun=0,\ -drive=drive-scsi0-0-3-0,id=scsi0-0-3-0 \ +-device scsi-disk,bus=scsi0.0,channel=0,scsi-id=3,lun=0,drive=drive-scsi0-0-3-0,\ +id=scsi0-0-3-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args index 4d648439a4..6948bb29a4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -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,serial=\ \ WD-WMAP9A966149' \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-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,\ +serial=\ \ WD-WMAP9A966149' \ -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 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args index 06b3fd9e1b..f00773ed9c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args @@ -1,8 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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,format=qcow2,cache=none \ -drive file=/dev/HostVG/QEMUGuest3,if=ide,bus=2,unit=0,format=qcow2,cache=none \ -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw \ --net none -serial none -parallel none +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args index 75562946b6..ad0a9789c4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args @@ -1,10 +1,26 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 \ -file=iscsi://iscsi.example.com:3260/demo-target/2,if=none,media=cdrom,id=drive-ide0-0-2 \ --device ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 -drive \ -file=/tmp/idedisk.img,if=none,id=drive-ide0-0-3 -device \ -ide-drive,bus=ide.0,unit=3,drive=drive-ide0-0-3,id=ide0-0-3 -device \ -virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 file=iscsi://iscsi.example.com:3260/demo-target/2,if=none,media=cdrom,\ +id=drive-ide0-0-2 \ +-device ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \ +-drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-3 \ +-device ide-drive,bus=ide.0,unit=3,drive=drive-ide0-0-3,id=ide0-0-3 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args index f930e467ca..e4ebe4456f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args @@ -1,10 +1,25 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 \ -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 -drive \ -file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2 -device \ -ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 -device \ -virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 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 \ +-drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2 \ +-device ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args index 793c597eea..e0bf4b6396 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args @@ -1,9 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 -drive file=/tmp/usbdisk.img,\ -if=none,id=drive-usb-disk0 -device usb-storage,drive=drive-usb-disk0,\ -id=usb-disk0,removable=on -device virtio-balloon-pci,id=balloon0,bus=pci.0,\ -addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-drive file=/tmp/usbdisk.img,if=none,id=drive-usb-disk0 \ +-device usb-storage,drive=drive-usb-disk0,id=usb-disk0,removable=on \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args index d2b80d733d..7f6626cb9b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args @@ -1,8 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 -drive file=/tmp/usbdisk.img,\ -if=none,id=drive-usb-disk0 -device usb-storage,drive=drive-usb-disk0,\ -id=usb-disk0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-drive file=/tmp/usbdisk.img,if=none,id=drive-usb-disk0 \ +-device usb-storage,drive=drive-usb-disk0,id=usb-disk0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args index af946de903..ebdba3e92a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -usbdevice disk:/tmp/usbdisk.img \ --net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-usbdevice disk:/tmp/usbdisk.img \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args index 12db9fbec1..9293017511 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args @@ -1,7 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M s390-ccw -m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M s390-ccw \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=0.0.0007,drive=drive-virtio-disk0,id=virtio-disk0 \ -drive file=/dev/HostVG/QEMUGuest4,if=none,id=drive-virtio-disk1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args index 970c7b778d..19a872d7b7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args @@ -1,7 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M s390-ccw -m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M s390-ccw \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 \ -drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-virtio-disk1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args index b4d760d35d..491e3ea97e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args @@ -1,6 +1,18 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M s390-virtio -m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M s390-virtio \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args index 7b4d24b754..0b39584509 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args @@ -1,12 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M s390-ccw -m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M s390-ccw \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -device virtio-scsi-ccw,id=scsi0,devno=fe.0.0001 \ -drive file=/dev/HostVG/QEMUGuest1,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 \ -drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-4-0 \ --device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,\ -drive=drive-scsi0-0-4-0,id=scsi0-0-4-0 \ +-device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,drive=drive-scsi0-0-4-0,\ +id=scsi0-0-4-0 \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a 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 2c757905b2..574bde456b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args @@ -1,9 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 8 -nographic -nodefconfig -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ -drive file=/dev/HostVG/QEMUGuest1,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,id=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 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args index 1c53189355..297ce540ad 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args @@ -1,9 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 8 -nographic -nodefconfig -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ -drive file=/dev/HostVG/QEMUGuest1,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,id=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 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args index 895f379926..08d70fb693 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args @@ -1,9 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 8 -nographic -nodefconfig -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ -drive file=/dev/HostVG/QEMUGuest1,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,id=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 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args index 4f03a793d1..104b8d731f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args @@ -1,9 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 8 -nographic -nodefconfig -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ -drive file=/dev/HostVG/QEMUGuest1,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,id=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 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args index 1318ae75d5..b2bd28b4a4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args @@ -1,7 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -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/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0 -drive \ -file=/tmp/data.img,if=virtio -drive file=/tmp/logs.img,if=virtio -net none \ --serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0 \ +-drive file=/tmp/data.img,if=virtio \ +-drive file=/tmp/logs.img,if=virtio \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args index ab4bc84775..1000e36f31 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args @@ -1,7 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -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/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0 -drive \ -file=/tmp/data.img,if=xen,index=0 -drive file=/tmp/logs.img,if=xen,index=6 \ --net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-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/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0 \ +-drive file=/tmp/data.img,if=xen,index=0 \ +-drive file=/tmp/logs.img,if=xen,index=6 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args index d4b108a1f6..576cd93eba 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args @@ -1,10 +1,27 @@ -LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin HOME=/root USER=root LOGNAME=root \ -/usr/bin/qemu -name encryptdisk -S -M pc-0.13 -m 1024 \ --smp 1,sockets=1,cores=1,threads=1 -uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \ --nographic -nodefconfig -nodefaults -chardev socket,id=monitor,\ -path=//var/lib/libvirt/qemu/encryptdisk.monitor,server,nowait -mon \ -chardev=monitor,mode=readline -rtc base=utc -no-acpi -boot c -usb -drive \ -file=/storage/guest_disks/encryptdisk,if=none,id=drive-virtio-disk0,boot=on,\ -format=qcow2 -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,\ -drive=drive-virtio-disk0,id=virtio-disk0 -device virtio-balloon-pci,\ -id=balloon0,bus=pci.0,addr=0x3 +LC_ALL=C \ +PATH=/sbin:/usr/sbin:/bin:/usr/bin \ +HOME=/root \ +USER=root \ +LOGNAME=root \ +/usr/bin/qemu \ +-name encryptdisk \ +-S \ +-M pc-0.13 \ +-m 1024 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-chardev socket,id=monitor,path=//var/lib/libvirt/qemu/encryptdisk.monitor,\ +server,nowait \ +-mon chardev=monitor,mode=readline \ +-rtc base=utc \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/storage/guest_disks/encryptdisk,if=none,id=drive-virtio-disk0,\ +boot=on,format=qcow2 \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ +id=virtio-disk0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args index 9bf25255af..3d51800257 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args @@ -1,5 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --cpu qemu32,-kvm_pv_eoi -m 214 -smp 6 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial \ -none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-cpu qemu32,-kvm_pv_eoi \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args index 63d09fba33..590babfd9a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args @@ -1,5 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --cpu qemu32,+kvm_pv_eoi -m 214 -smp 6 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial \ -none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-cpu qemu32,+kvm_pv_eoi \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args index 92383f01c5..03fdac368b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args @@ -1,14 +1,29 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi \ --boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ --usb -drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc-0.13 \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot dc \ +-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ +-usb \ +-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \ -device virtio-blk-pci,event_idx=on,scsi=off,bus=pci.0,addr=0x4,\ drive=drive-virtio-disk0,id=virtio-disk0 \ --drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,\ -media=cdrom,id=drive-ide0-1-0 \ +-drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,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 virtio-net-pci,event_idx=off,vlan=0,id=net0,mac=52:54:00:e5:48:58,\ bus=pci.0,addr=0x3 \ --net user,vlan=0,name=hostnet0 -serial pty \ +-net user,vlan=0,name=hostnet0 \ +-serial pty \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args index 196f61f945..347e3db929 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ --S -enable-fips -M pc -m 214 -smp 1 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial \ -none -parallel none +-S \ +-enable-fips \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args index 7b8c42ff23..2ccd40b5e5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot a -usb -drive file=fat:floppy:/var/somefiles,if=floppy,unit=0 -net \ -none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot a \ +-usb \ +-drive file=fat:floppy:/var/somefiles,if=floppy,unit=0 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args index 8d2f21a6a1..1680cd4c7a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args @@ -1,16 +1,30 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M s390-ccw-virtio -m 214 -smp 1 \ --nographic -nodefconfig -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 -device \ -virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 \ --fsdev local,security_model=passthrough,id=fsdev-fs0,\ -path=/export/to/guest -device virtio-9p-ccw,id=fs0,fsdev=fsdev-fs0,\ -mount_tag=/import/from/host,devno=fe.0.0001 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M s390-ccw-virtio \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 \ +-fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \ +-device virtio-9p-ccw,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,\ +devno=fe.0.0001 \ -fsdev local,security_model=mapped,writeout=immediate,id=fsdev-fs1,\ -path=/export/to/guest2 -device virtio-9p-ccw,id=fs1,fsdev=fsdev-fs1,\ -mount_tag=/import/from/host2,devno=fe.0.0002 \ --fsdev handle,writeout=immediate,id=fsdev-fs2,\ -path=/export/to/guest3 -device virtio-9p-ccw,id=fs2,fsdev=fsdev-fs2,\ -mount_tag=/import/from/host3,devno=fe.0.0003 \ +path=/export/to/guest2 \ +-device virtio-9p-ccw,id=fs1,fsdev=fsdev-fs1,mount_tag=/import/from/host2,\ +devno=fe.0.0002 \ +-fsdev handle,writeout=immediate,id=fsdev-fs2,path=/export/to/guest3 \ +-device virtio-9p-ccw,id=fs2,fsdev=fsdev-fs2,mount_tag=/import/from/host3,\ +devno=fe.0.0003 \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0004 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args index d943a5516e..43f7b5f67d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args @@ -1,14 +1,30 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -fsdev local,security_model=passthrough,id=fsdev-fs0,\ -path=/export/to/guest -device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,\ -mount_tag=/import/from/host,bus=pci.0,addr=0x3 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \ +-device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,\ +bus=pci.0,addr=0x3 \ -fsdev local,security_model=mapped,writeout=immediate,id=fsdev-fs1,\ -path=/export/to/guest2 -device virtio-9p-pci,id=fs1,fsdev=fsdev-fs1,\ -mount_tag=/import/from/host2,bus=pci.0,addr=0x4 \ --fsdev handle,writeout=immediate,id=fsdev-fs2,\ -path=/export/to/guest3 -device virtio-9p-pci,id=fs2,fsdev=fsdev-fs2,\ -mount_tag=/import/from/host3,bus=pci.0,addr=0x5 \ +path=/export/to/guest2 \ +-device virtio-9p-pci,id=fs1,fsdev=fsdev-fs1,mount_tag=/import/from/host2,\ +bus=pci.0,addr=0x4 \ +-fsdev handle,writeout=immediate,id=fsdev-fs2,path=/export/to/guest3 \ +-device virtio-9p-pci,id=fs2,fsdev=fsdev-fs2,mount_tag=/import/from/host3,\ +bus=pci.0,addr=0x5 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args index e45700b082..9821aa825d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args @@ -1,4 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -XAUTHORITY=/root/.Xauthority DISPLAY=:0.1 /usr/bin/qemu -S -M pc -m 214 -smp 1 \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -full-screen +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +XAUTHORITY=/root/.Xauthority \ +DISPLAY=:0.1 \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-full-screen diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args index 55494ad425..280832f3bc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args @@ -1,4 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -XAUTHORITY=/root/.Xauthority DISPLAY=:0.1 /usr/bin/qemu -S -M pc -m 214 -smp 1 \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -std-vga +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +XAUTHORITY=/root/.Xauthority \ +DISPLAY=:0.1 \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-std-vga diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args index 66f22bcbd6..698fc40b4c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args @@ -1,9 +1,24 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -spice port=5903,tls-port=5904,addr=127.0.0.1,\ -x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,\ -disable-agent-file-xfer -vga qxl -global qxl-vga.ram_size=67108864 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=spice \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ +tls-channel=main,plaintext-channel=inputs,disable-agent-file-xfer \ +-vga qxl \ +-global qxl-vga.ram_size=67108864 \ -global qxl-vga.vram_size=33554432 \ -device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args index a9525d6975..55e5d54562 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args @@ -1,11 +1,26 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefconfig -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=spice \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ --usb -hda /dev/HostVG/QEMUGuest1 -chardev spicevmc,id=charchannel0,\ -name=vdagent \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev spicevmc,id=charchannel0,name=vdagent \ -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,\ id=channel0,name=com.redhat.spice.0 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,agent-mouse=off,\ x509-dir=/etc/pki/libvirt-spice,tls-channel=main \ --vga cirrus -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +-vga cirrus \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args index e08ee20877..627df6428d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args @@ -1,11 +1,25 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -spice port=5903,tls-port=5904,addr=127.0.0.1,\ -x509-dir=/etc/pki/libvirt-spice,\ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=spice \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ image-compression=auto_glz,jpeg-wan-compression=auto,\ -zlib-glz-wan-compression=auto,\ -playback-compression=on,streaming-video=filter -vga \ -qxl -global qxl-vga.ram_size=67108864 -global qxl-vga.vram_size=33554432 \ +zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter \ +-vga qxl \ +-global qxl-vga.ram_size=67108864 \ +-global qxl-vga.vram_size=33554432 \ -device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args index ef499e6a60..59b671bf93 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args @@ -1,8 +1,24 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -spice port=5903,tls-port=5904,addr=127.0.0.1,\ -x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs -vga \ -qxl -global qxl-vga.ram_size=67108864 -global qxl-vga.vram_size=33554432 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=spice \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ +tls-channel=main,plaintext-channel=inputs \ +-vga qxl \ +-global qxl-vga.ram_size=67108864 \ +-global qxl-vga.vram_size=33554432 \ -device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args index 4f7f09b8e4..326256f488 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args @@ -1,9 +1,24 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -SASL_CONF_PATH=/root/.sasl2 QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +SASL_CONF_PATH=/root/.sasl2 \ +QEMU_AUDIO_DRV=spice \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ -spice port=5903,tls-port=5904,sasl,addr=127.0.0.1,\ x509-dir=/etc/pki/libvirt-spice,tls-channel=default \ --vga qxl -global qxl-vga.ram_size=67108864 -global qxl-vga.vram_size=33554432 \ +-vga qxl \ +-global qxl-vga.ram_size=67108864 \ +-global qxl-vga.vram_size=33554432 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args index 8b5d9ee25f..91e30ca15c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args @@ -1,17 +1,32 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-kvm -S -M pc -cpu core2duo,+lahf_lm,+xtpr,+cx16,+tm2,\ -+est,+vmx,+ds_cpl,+pbe,+tm,+ht,+ss,+acpi,+ds \ --m 1024 -smp 2 -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ --boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ --usb -drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=spice \ +/usr/bin/qemu-kvm \ +-S \ +-M pc \ +-cpu core2duo,+lahf_lm,+xtpr,+cx16,+tm2,+est,+vmx,+ds_cpl,+pbe,+tm,+ht,+ss,+acpi,\ ++ds \ +-m 1024 \ +-smp 2 \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot dc \ +-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ +-usb \ +-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0 \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ id=virtio-disk0 \ --drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,\ -media=cdrom,id=drive-ide0-1-0 \ +-drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,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 rtl8139,vlan=0,id=net0,mac=52:54:00:71:70:89,bus=pci.0,addr=0x7 \ --net tap,script=/etc/qemu-ifup,vlan=0,name=hostnet0 -serial pty \ +-net tap,script=/etc/qemu-ifup,vlan=0,name=hostnet0 \ +-serial pty \ -device usb-tablet,id=input0 \ --spice port=5900 -vga std \ +-spice port=5900 \ +-vga std \ -device AC97,id=sound0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args index 8a61e9611a..52ffe7b79d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args @@ -1,18 +1,30 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=spice \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nodefconfig \ +-nodefaults \ -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ --mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ -device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x4.0x7 \ --device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,\ -multifunction=on,addr=0x4 \ +-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,\ +addr=0x4 \ -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \ -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \ --spice port=5903,tls-port=5904,addr=127.0.0.1,\ -x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,\ -tls-channel=usbredir,\ +-spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ +tls-channel=main,plaintext-channel=inputs,tls-channel=usbredir,\ image-compression=auto_glz,jpeg-wan-compression=auto,\ -zlib-glz-wan-compression=auto,\ -playback-compression=on,streaming-video=filter,disable-copy-paste \ +zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,\ +disable-copy-paste \ -vga cirrus \ -chardev socket,id=charredir0,host=localhost,port=4000 \ -device usb-redir,chardev=charredir0,id=redir0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args index 97755c3939..5d8f5ad8c8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args @@ -1,13 +1,27 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -spice port=5903,tls-port=5904,addr=127.0.0.1,\ -x509-dir=/etc/pki/libvirt-spice,tls-channel=default,tls-channel=main,\ -plaintext-channel=inputs,\ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=spice \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ +tls-channel=default,tls-channel=main,plaintext-channel=inputs,\ image-compression=auto_glz,jpeg-wan-compression=auto,\ -zlib-glz-wan-compression=auto,\ -playback-compression=on,streaming-video=filter,disable-copy-paste,\ -disable-agent-file-xfer -vga qxl -global qxl-vga.ram_size=67108864 \ +zlib-glz-wan-compression=auto,playback-compression=on,streaming-video=filter,\ +disable-copy-paste,disable-agent-file-xfer \ +-vga qxl \ +-global qxl-vga.ram_size=67108864 \ -global qxl-vga.vram_size=33554432 \ -device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args index 34dc767e60..c253575ac1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args @@ -1,4 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ --net none -serial none -parallel none -vnc 127.0.0.1:59630,share=allow-exclusive +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-vnc 127.0.0.1:59630,share=allow-exclusive diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args index 239fde1dee..fa97ce5c59 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args @@ -1,6 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -SASL_CONF_PATH=/root/.sasl2 QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 \ --smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -vnc \ -127.0.0.1:3,sasl -vga cirrus +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +SASL_CONF_PATH=/root/.sasl2 \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-vnc 127.0.0.1:3,sasl \ +-vga cirrus diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args index 02cc31b6ff..dce34b82ad 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args @@ -1,4 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor unix:/tmp/test-monitor,server,\ -nowait -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none \ --parallel none -vnc unix:/tmp/foo.socket +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-vnc unix:/tmp/foo.socket diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args index c681b1baf9..9067ec0586 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -SASL_CONF_PATH=/root/.sasl2 QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 \ --smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -vnc \ -127.0.0.1:3,tls,x509verify=/etc/pki/libvirt-vnc,sasl +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +SASL_CONF_PATH=/root/.sasl2 \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-vnc 127.0.0.1:3,tls,x509verify=/etc/pki/libvirt-vnc,sasl diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args index a499e55658..eb71e247d3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args @@ -1,5 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --usb -net none -serial none -parallel none -vnc 127.0.0.1:0,websocket=5700 +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-net none \ +-serial none \ +-parallel none \ +-vnc 127.0.0.1:0,websocket=5700 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args index 5a3c03a6ff..c5341ccc7e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args @@ -1,4 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor unix:/tmp/test-monitor,server,\ -nowait -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none \ --parallel none -vnc '[2001:1:2:3:4:5:1234:1234]:3' +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-vnc '[2001:1:2:3:4:5:1234:1234]:3' diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args index 214b24667c..116eeeb7d0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest2 -device pci-assign,host=06:12.5,id=hostdev0,\ -bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest2 \ +-device pci-assign,host=06:12.5,id=hostdev0,bus=pci.0,addr=0x3 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args index 21e62151c7..7a172d3be8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest2 -net none -serial none -parallel \ -none -pcidevice host=06:12.5 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest2 \ +-net none \ +-serial none \ +-parallel none \ +-pcidevice host=06:12.5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args index ae33f079ad..25eada05c3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args @@ -1,11 +1,24 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi \ --device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ +-usb \ -drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=/dev/sg0,if=none,id=drive-hostdev0 \ --device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,\ -drive=drive-hostdev0,id=hostdev0,bootindex=1 \ +-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,drive=drive-hostdev0,\ +id=hostdev0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args index 6638dcee1c..967a07cb8c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args @@ -1,14 +1,27 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --device lsi,id=scsi0,bus=pci.0,addr=0x3 -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-device lsi,id=scsi0,bus=pci.0,addr=0x3 \ +-usb \ -drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org\ -:3260/iqn.1992-01.com.example,if=none,format=raw,id=drive-hostdev0 \ +-drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ +3260/iqn.1992-01.com.example,if=none,format=raw,id=drive-hostdev0 \ -device scsi-generic,bus=scsi0.0,scsi-id=4,drive=drive-hostdev0,id=hostdev0 \ --drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org\ -:3260/iqn.1992-01.com.example/1,if=none,format=raw,id=drive-hostdev1 \ +-drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ +3260/iqn.1992-01.com.example/1,if=none,format=raw,id=drive-hostdev1 \ -device scsi-generic,bus=scsi0.0,scsi-id=5,drive=drive-hostdev1,id=hostdev1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args index 2aebe9c2eb..a02c84c5c7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args @@ -1,12 +1,25 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --device lsi,id=scsi0,bus=pci.0,addr=0x3 -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-device lsi,id=scsi0,bus=pci.0,addr=0x3 \ +-usb \ -drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=iscsi://example.org:3260/iqn.1992-01.com.example,if=none,\ -format=raw,id=drive-hostdev0 \ +-drive file=iscsi://example.org:3260/iqn.1992-01.com.example,if=none,format=raw,\ +id=drive-hostdev0 \ -device scsi-generic,bus=scsi0.0,scsi-id=4,drive=drive-hostdev0,id=hostdev0 \ -drive file=iscsi://example.org:3260/iqn.1992-01.com.example/1,if=none,\ format=raw,id=drive-hostdev1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args index 4083a74303..85aa01b7b9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args @@ -1,9 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ -M pc \ --m 214 -smp 1 -nographic -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --device lsi,id=scsi0,bus=pci.0,addr=0x3 -usb \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-device lsi,id=scsi0,bus=pci.0,addr=0x3 \ +-usb \ -drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=/dev/sg0,if=none,id=drive-hostdev0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args index bdac202aeb..27a28bc49a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args @@ -1,11 +1,24 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-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=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=/dev/sg0,if=none,id=drive-hostdev0,readonly=on \ --device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,\ -drive=drive-hostdev0,id=hostdev0 \ +-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,drive=drive-hostdev0,\ +id=hostdev0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args index 7fd3a000d2..1b4064b07d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args @@ -1,16 +1,29 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-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=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org\ -:3260/iqn.1992-01.com.example,if=none,format=raw,id=drive-hostdev0 \ --device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=4,\ -drive=drive-hostdev0,id=hostdev0 \ --drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org\ -:3260/iqn.1992-01.com.example/1,if=none,format=raw,id=drive-hostdev1 \ --device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=5,\ -drive=drive-hostdev1,id=hostdev1 \ +-drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ +3260/iqn.1992-01.com.example,if=none,format=raw,id=drive-hostdev0 \ +-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=4,drive=drive-hostdev0,\ +id=hostdev0 \ +-drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ +3260/iqn.1992-01.com.example/1,if=none,format=raw,id=drive-hostdev1 \ +-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=5,drive=drive-hostdev1,\ +id=hostdev1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args index e4b6e9727e..50716bc217 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args @@ -1,16 +1,29 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-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=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=iscsi://example.org:3260/iqn.1992-01.com.example,if=none,\ -format=raw,id=drive-hostdev0 \ --device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=4,\ -drive=drive-hostdev0,id=hostdev0 \ +-drive file=iscsi://example.org:3260/iqn.1992-01.com.example,if=none,format=raw,\ +id=drive-hostdev0 \ +-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=4,drive=drive-hostdev0,\ +id=hostdev0 \ -drive file=iscsi://example.org:3260/iqn.1992-01.com.example/1,if=none,\ format=raw,id=drive-hostdev1 \ --device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=5,\ -drive=drive-hostdev1,id=hostdev1 \ +-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=5,drive=drive-hostdev1,\ +id=hostdev1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args index ada5c383a2..30c1d5b789 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args @@ -1,11 +1,24 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-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=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=/dev/sg0,if=none,id=drive-hostdev0 \ --device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,\ -drive=drive-hostdev0,id=hostdev0 \ +-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,drive=drive-hostdev0,\ +id=hostdev0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args index f2cc35daaa..a01ce79c32 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args @@ -1,7 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -usb -hda \ -/dev/HostVG/QEMUGuest1 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ -device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args index 4c73a51c6e..2dea04668d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -device usb-host,hostbus=14,hostaddr=6,id=hostdev0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-device usb-host,hostbus=14,hostaddr=6,id=hostdev0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args index 5ab16687ea..6bc727477a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \ -none -usbdevice host:14.6 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-usbdevice host:14.6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args index 2761543500..a6df1d8da5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest2 -device vfio-pci,host=55aa:20:0f.3,id=hostdev0,\ -bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest2 \ +-device vfio-pci,host=55aa:20:0f.3,id=hostdev0,bus=pci.0,addr=0x3 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args index 557b7332a5..044f8eb3d3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest2 -device vfio-pci,host=06:12.5,id=hostdev0,\ -bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest2 \ +-device vfio-pci,host=06:12.5,id=hostdev0,bus=pci.0,addr=0x3 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args b/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args index e78dff470a..e7e15b6b54 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args @@ -1,5 +1,16 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/libexec/qemu-kvm -S -M pc -m 4096 -smp 4 -nographic -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-kvm \ +-S \ +-M pc \ +-m 4096 \ +-smp 4 \ +-nographic \ +-nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args index 3496cf1a73..567abcdc34 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args @@ -1,4 +1,9 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-x86_64 \ -S \ -M pc-i440fx-2.3 \ @@ -8,7 +13,8 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \ -mem-path /dev/hugepages2M/libvirt/qemu \ -numa node,nodeid=0,cpus=0-1,mem=1024 \ -object memory-backend-file,id=memdimm0,prealloc=yes,\ -mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=1-3,policy=bind \ +mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=1-3,\ +policy=bind \ -device pc-dimm,node=0,memdev=memdimm0,id=dimm0 \ -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait \ @@ -18,22 +24,25 @@ mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=1-3,policy=bin -global PIIX4_PM.disable_s4=1 \ -boot c \ -device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x6.0x7 \ --device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x6 \ +-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,\ +addr=0x6 \ -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x6.0x1 \ -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x6.0x2 \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x5 \ -drive file=/var/lib/libvirt/images/fedora.qcow2,if=none,id=drive-virtio-disk0 \ --device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk0,id=virtio-disk0 \ +-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk0,\ +id=virtio-disk0 \ -drive if=none,media=cdrom,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -serial pty \ -chardev socket,id=charchannel0,\ -path=/var/lib/libvirt/qemu/channel/target/fedora.org.qemu.guest_agent.0,server,nowait \ --device virtserialport,bus=virtio-serial0.0,nr=1,\ -chardev=charchannel0,id=channel0,name=org.qemu.guest_agent.0 \ +path=/var/lib/libvirt/qemu/channel/target/fedora.org.qemu.guest_agent.0,server,\ +nowait \ +-device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ +id=channel0,name=org.qemu.guest_agent.0 \ -chardev spicevmc,id=charchannel1,name=vdagent \ --device virtserialport,bus=virtio-serial0.0,nr=2,\ -chardev=charchannel1,id=channel1,name=com.redhat.spice.0 \ +-device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,\ +id=channel1,name=com.redhat.spice.0 \ -device usb-tablet,id=input0 \ -spice port=0 \ -vga qxl \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args index 46ec751821..03f607ecb1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args @@ -1,5 +1,14 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 4096 -smp 4 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 4096 \ +-smp 4 \ -object memory-backend-file,id=ram-node0,prealloc=yes,\ mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=0-3,\ policy=bind \ @@ -13,8 +22,14 @@ mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=0-3,\ policy=bind \ -numa node,nodeid=2,cpus=2,memdev=ram-node2 \ -object memory-backend-file,id=ram-node3,prealloc=yes,\ -mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=3,\ -policy=bind \ +mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=3,policy=bind \ -numa node,nodeid=3,cpus=3,memdev=ram-node3 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args index 0488800b2c..77ff6d3460 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args @@ -1,10 +1,26 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 1024 -smp 2 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 1024 \ +-smp 2 \ -object memory-backend-file,id=ram-node0,prealloc=yes,\ mem-path=/dev/hugepages2M/libvirt/qemu,size=268435456 \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \ -object memory-backend-file,id=ram-node1,prealloc=yes,\ mem-path=/dev/hugepages2M/libvirt/qemu,size=805306368 \ -numa node,nodeid=1,cpus=1,memdev=ram-node1 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args index bf37a6907d..a6a5aa51af 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args @@ -1,9 +1,25 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 1024 -smp 2 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 1024 \ +-smp 2 \ -object memory-backend-ram,id=ram-node0,size=268435456 \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \ -object memory-backend-file,id=ram-node1,prealloc=yes,\ mem-path=/dev/hugepages1G/libvirt/qemu,size=805306368 \ -numa node,nodeid=1,cpus=1,memdev=ram-node1 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args index 0e0f35a966..49956a9731 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args @@ -1,7 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 1024 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 1024 \ -mem-prealloc \ -mem-path /dev/hugepages2M/libvirt/qemu \ --smp 2 -nographic \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +-smp 2 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args index a3a4e57326..3ec7d3be4a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args @@ -1,4 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 1024 -smp 2 -nographic \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 1024 \ +-smp 2 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args index a6e4d95fe0..b20156c410 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args @@ -1,20 +1,35 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 4096 -smp 4 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 4096 \ +-smp 4 \ -object memory-backend-file,id=ram-node0,prealloc=yes,\ mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=0-3,\ policy=bind \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \ -object memory-backend-file,id=ram-node1,prealloc=yes,\ -mem-path=/dev/hugepages2M/libvirt/qemu,share=yes,size=1073741824,\ -host-nodes=0-3,policy=bind \ +mem-path=/dev/hugepages2M/libvirt/qemu,share=yes,size=1073741824,host-nodes=0-3,\ +policy=bind \ -numa node,nodeid=1,cpus=1,memdev=ram-node1 \ -object memory-backend-file,id=ram-node2,prealloc=yes,\ -mem-path=/dev/hugepages1G/libvirt/qemu,share=no,size=1073741824,\ -host-nodes=0-3,policy=bind \ +mem-path=/dev/hugepages1G/libvirt/qemu,share=no,size=1073741824,host-nodes=0-3,\ +policy=bind \ -numa node,nodeid=2,cpus=2,memdev=ram-node2 \ -object memory-backend-file,id=ram-node3,prealloc=yes,\ -mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=3,\ -policy=bind \ +mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=3,policy=bind \ -numa node,nodeid=3,cpus=3,memdev=ram-node3 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args index 51c5d623a9..a3e38bbda7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args @@ -1,5 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -mem-prealloc -mem-path /dev/hugepages2M/libvirt/qemu -smp 1 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-mem-prealloc \ +-mem-path /dev/hugepages2M/libvirt/qemu \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args b/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args index 363fd2aa57..b951530dad 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args @@ -1,5 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ --S -M pc -cpu qemu32 -m 214 -smp 6 -nographic \ +-S \ +-M pc \ +-cpu qemu32 \ +-m 214 \ +-smp 6 \ +-nographic \ -monitor unix:/tmp/test-monitor,server,nowait \ --boot n -usb -net none -serial none -parallel none +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args b/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args index 91b3570786..da3906e1f6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args @@ -1,5 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --cpu qemu32,hv_relaxed,hv_vapic,hv_spinlocks=0x2fff -m 214 -smp 6 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-cpu qemu32,hv_relaxed,hv_vapic,hv_spinlocks=0x2fff \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot n \ +-usb \ +-net none \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args index 07ea0048da..52e3e7a738 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -device usb-mouse,id=input0,bus=usb.0,port=4 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-device usb-mouse,id=input0,bus=usb.0,port=4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args index 160079dc9e..cc462da237 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \ -none -usbdevice mouse +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-usbdevice mouse diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args index 0ab13cb03d..0482380c4f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \ -none -usbdevice tablet +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-usbdevice tablet diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args index d6c5c150ba..b5e1183f40 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args @@ -1,10 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M s390-ccw -m 214 -smp 1 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M s390-ccw \ +-m 214 \ +-smp 1 \ -object iothread,id=iothread1 \ -object iothread,id=iothread2 \ --nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,iothread=iothread1,devno=fe.0.0000,\ drive=drive-virtio-disk0,id=virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args index 4d271ed1ba..f069bdd063 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args @@ -1,17 +1,27 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 2 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 2 \ -object iothread,id=iothread1 \ -object iothread,id=iothread2 \ --nographic -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +-nographic \ +-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 \ --drive file=/var/lib/libvirt/images/iothrtest1.img,if=none,\ -id=drive-virtio-disk1 \ +-drive file=/var/lib/libvirt/images/iothrtest1.img,if=none,id=drive-virtio-disk1 \ -device virtio-blk-pci,iothread=iothread1,bus=pci.0,addr=0x4,\ drive=drive-virtio-disk1,id=virtio-disk1 \ --drive file=/var/lib/libvirt/images/iothrtest2.img,if=none,\ -id=drive-virtio-disk2 \ +-drive file=/var/lib/libvirt/images/iothrtest2.img,if=none,id=drive-virtio-disk2 \ -device virtio-blk-pci,iothread=iothread2,bus=pci.0,addr=0x3,\ drive=drive-virtio-disk2,id=virtio-disk2 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args index 444cd17f43..884a24ae8d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args @@ -1,10 +1,24 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 2 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 2 \ -object iothread,id=iothread5 \ -object iothread,id=iothread6 \ -object iothread,id=iothread1 \ -object iothread,id=iothread2 \ --nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args index 68998f67e5..b041f519b0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args @@ -1,8 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 2 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 2 \ -object iothread,id=iothread2 \ -object iothread,id=iothread4 \ --nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args index 4ef34cf346..0a2161dd7b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args @@ -1,8 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 2 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 2 \ -object iothread,id=iothread1 \ -object iothread,id=iothread2 \ --nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args index 363fd2aa57..b951530dad 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args @@ -1,5 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ --S -M pc -cpu qemu32 -m 214 -smp 6 -nographic \ +-S \ +-M pc \ +-cpu qemu32 \ +-m 214 \ +-smp 6 \ +-nographic \ -monitor unix:/tmp/test-monitor,server,nowait \ --boot n -usb -net none -serial none -parallel none +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args index b223951f32..13fe4705b1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args @@ -1,5 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --cpu qemu32,kvm=off -m 214 -smp 6 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-cpu qemu32,kvm=off \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot n \ +-usb \ +-net none \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args index ca5823f995..bf1f2960c7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 2 -nographic \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 2 \ +-nographic \ -monitor unix:/tmp/test-monitor,server,nowait \ --no-kvm-pit-reinjection -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ --net none -serial none -parallel none +-no-kvm-pit-reinjection \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args index f03840fb64..7f9d60a032 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 2 -nographic \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 2 \ +-nographic \ -monitor unix:/tmp/test-monitor,server,nowait \ --global kvm-pit.lost_tick_policy=discard -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +-global kvm-pit.lost_tick_policy=discard \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm.args index d438f0355e..3c84e7b7d7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvm.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm.args @@ -1,4 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/libexec/qemu-kvm -S -machine pc-1.0,accel=kvm -m 4096 \ --smp 4 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-kvm \ +-S \ +-machine pc-1.0,accel=kvm \ +-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-kvmclock+eoi-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args index b7082dd551..49fc4a1c9f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args @@ -1,5 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --cpu qemu32,-kvmclock,-kvm_pv_eoi -m 214 -smp 6 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial \ -none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-cpu qemu32,-kvmclock,-kvm_pv_eoi \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args index 260006a2ea..52b8c88c4f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/kvm -S -M pc \ --cpu qemu32,-kvmclock -m 214 -smp 6 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ -none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/kvm \ +-S \ +-M pc \ +-cpu qemu32,-kvmclock \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-lease.args b/tests/qemuxml2argvdata/qemuxml2argv-lease.args index 2a2cff040d..9f55c2ae63 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-lease.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-lease.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -cdrom /root/boot.iso -net none \ --serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-cdrom /root/boot.iso \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args index 4ef9fc0f6e..b769897dbb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args @@ -1,6 +1,17 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x -S \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-S \ -machine s390-ccw-virtio,accel=tcg,aes-key-wrap=off \ --m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args index 80caba7a76..bcab04abc4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args @@ -1,7 +1,18 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x -S \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-S \ -machine s390-ccw-virtio,accel=tcg,aes-key-wrap=off \ --m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args index 80caba7a76..bcab04abc4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args @@ -1,7 +1,18 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x -S \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-S \ -machine s390-ccw-virtio,accel=tcg,aes-key-wrap=off \ --m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args index 2b238d500b..619325827e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args @@ -1,6 +1,17 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x -S \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-S \ -machine s390-ccw-virtio,accel=tcg,aes-key-wrap=on \ --m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args index 6f6366b69b..3d89b12f73 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args @@ -1,7 +1,18 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x -S \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-S \ -machine s390-ccw-virtio,accel=tcg,aes-key-wrap=on \ --m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args index 6f6366b69b..3d89b12f73 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args @@ -1,7 +1,18 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x -S \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-S \ -machine s390-ccw-virtio,accel=tcg,aes-key-wrap=on \ --m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args index db9a1f28df..f13edadcd3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args @@ -1,4 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-x86_64 -S -M pc-0.11 -m 214 -smp 1 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-S \ +-M pc-0.11 \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args index 7f8400706c..2d25d5a2ce 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/kvm -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \ -none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/kvm \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args index b590f20684..a94639d68e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args @@ -1,6 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ --S -machine pc,accel=tcg,dump-guest-core=off -m 214 -smp 1 -nographic \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial \ -none -parallel none +-S \ +-machine pc,accel=tcg,dump-guest-core=off \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args index 7650266f9e..30c4e89083 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args @@ -1,6 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ --S -machine pc,accel=tcg,dump-guest-core=on -m 214 -smp 1 -nographic \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial \ -none -parallel none +-S \ +-machine pc,accel=tcg,dump-guest-core=on \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args index f38c9144ab..b705d9086c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args @@ -1,6 +1,17 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x -S \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-S \ -machine s390-ccw-virtio,accel=tcg,dea-key-wrap=off \ --m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args index e379f15302..d05cfd7986 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args @@ -1,7 +1,18 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x -S \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-S \ -machine s390-ccw-virtio,accel=tcg,dea-key-wrap=off \ --m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args index e379f15302..d05cfd7986 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args @@ -1,7 +1,18 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x -S \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-S \ -machine s390-ccw-virtio,accel=tcg,dea-key-wrap=off \ --m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args index f64e57f751..6c5627924b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args @@ -1,6 +1,17 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x -S \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-S \ -machine s390-ccw-virtio,accel=tcg,dea-key-wrap=on \ --m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args index 9c4b51325b..7fb7246cc1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args @@ -1,7 +1,18 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x -S \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-S \ -machine s390-ccw-virtio,accel=tcg,dea-key-wrap=on \ --m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args index 9c4b51325b..7fb7246cc1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args @@ -1,7 +1,18 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x -S \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-S \ -machine s390-ccw-virtio,accel=tcg,dea-key-wrap=on \ --m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args index 9264ec4451..03631a58f1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args @@ -1,6 +1,17 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x -S \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-S \ -machine s390-ccw-virtio,accel=tcg \ --m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -drive file=/dev/HostVG/QEMUGuest1,if=virtio,index=0,id=drive-virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args index f4bd156d02..3a72d9db72 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args @@ -1,7 +1,18 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x -S \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-S \ -machine s390-ccw-virtio,accel=tcg \ --m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args index f4bd156d02..3a72d9db72 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args @@ -1,7 +1,18 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x -S \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-S \ -machine s390-ccw-virtio,accel=tcg \ --m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args index 4f073c5c0b..6ffbf0e8d1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args @@ -1,6 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ --S -machine pc,accel=tcg,usb=off -m 214 -smp 1 -nographic \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial \ -none -parallel none +-S \ +-machine pc,accel=tcg,usb=off \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args index ea1a11f528..db28520c2a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args @@ -1,6 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ --S -machine pc,accel=tcg,vmport=off -m 214 -smp 1 -nographic \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial \ -none -parallel none +-S \ +-machine pc,accel=tcg,vmport=off \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-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 e99667542d..5c7ec7dd08 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args @@ -1,9 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m size=219136k,slots=16,maxmem=1099511627776k -smp 2 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ -device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ --nographic -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args index 17325d79bf..e3cd6dc0f2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args @@ -1,11 +1,25 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m size=219136k,slots=16,maxmem=1099511627776k -smp 2 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ -object memory-backend-file,id=memdimm1,prealloc=yes,\ mem-path=/dev/hugepages2M/libvirt/qemu,size=536870912,host-nodes=1-3,policy=bind \ -device pc-dimm,node=0,memdev=memdimm1,id=dimm1 \ --nographic -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args index 6c26586863..2a7bc006e8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ -m size=219136k,slots=16,maxmem=1099511627776k \ --smp 2 -numa node,nodeid=0,cpus=0-1,mem=214 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +-smp 2 \ +-numa node,nodeid=0,cpus=0-1,mem=214 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args b/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args index 8bef546466..ffb6c3ace4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial \ -none -parallel none +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memtune.args b/tests/qemuxml2argvdata/qemuxml2argv-memtune.args index 8bef546466..ffb6c3ace4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memtune.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-memtune.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial \ -none -parallel none +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-metadata.args b/tests/qemuxml2argvdata/qemuxml2argv-metadata.args index 8bef546466..ffb6c3ace4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-metadata.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-metadata.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial \ -none -parallel none +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args b/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args index 4659a65fde..199fca1d8b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args @@ -1,5 +1,14 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/kvm -S -M pc -m 14338 -smp 32 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/kvm \ +-S \ +-M pc \ +-m 14338 \ +-smp 32 \ -object memory-backend-ram,id=ram-node0,size=20482048,host-nodes=3,\ policy=preferred \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \ @@ -9,5 +18,12 @@ policy=bind \ -object memory-backend-ram,id=ram-node2,size=24578457600,host-nodes=1-2,\ host-nodes=5,host-nodes=7,policy=bind \ -numa node,nodeid=2,cpus=28,cpus=30-31,memdev=ram-node2 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -net none -serial none -parallel none -incoming stdio +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-net none \ +-serial none \ +-parallel none \ +-incoming stdio diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate.args b/tests/qemuxml2argvdata/qemuxml2argv-migrate.args index 9f7b6b7aff..116a1eec75 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-migrate.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \ -none -incoming tcp:10.0.0.1:5000 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-incoming tcp:10.0.0.1:5000 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args index f85aae97ff..f4928f7449 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args @@ -1,6 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \ -none -parallel none -msg timestamp=on +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args index 4ea75de929..068c4a8e33 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args @@ -1,6 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ --name QEMUGuest1 -S -M s390-virtio -m 214 -smp 1 -nographic \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi \ --boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial \ -none -parallel none +-name QEMUGuest1 \ +-S \ +-M s390-virtio \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal.args index 1e27394af5..ffb6c3ace4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-minimal.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \ -none -parallel none +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args index 082add6646..10ea8b3d55 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args @@ -1,4 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args index 418e1423ff..835c24346a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -global PIIX4_PM.disable_s3=1 -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ --net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-global PIIX4_PM.disable_s3=1 \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args index e5102f0677..1a2bc619c0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args @@ -1,5 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -global PIIX4_PM.disable_s3=1 -global PIIX4_PM.disable_s4=1 -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-global PIIX4_PM.disable_s3=1 \ +-global PIIX4_PM.disable_s4=1 \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args index 171defafbd..58cfef705a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -global PIIX4_PM.disable_s4=0 -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ --net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-global PIIX4_PM.disable_s4=0 \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args index e1c8ebe694..3ef9f5e934 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-reboot -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-reboot \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args index bb071c4817..f04944a578 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args index 5b757d124b..090d23dbca 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args @@ -1,4 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -realtime mlock=off \ --smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-realtime mlock=off \ +-smp 1 \ +-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-mlock-on.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args index 8dc82c9b5a..313c75811e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args @@ -1,4 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -realtime mlock=on \ --smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-realtime mlock=on \ +-smp 1 \ +-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-mlock-unsupported.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args index e998e7ffae..e8ba62e338 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args @@ -1,4 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 \ --smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-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-monitor-json.args b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args index 0d0b3a77a0..aa799c75cb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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=control -no-acpi -boot c -usb -hda /dev/hda1 -device \ -virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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=control \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/hda1 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args b/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args index ed4e98182a..e0e9c2d37d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args @@ -1,7 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -device lsi,id=scsi0,bus=pci.0,multifunction=off,addr=0x3 \ -device lsi,id=scsi1,bus=pci.0,multifunction=on,addr=0x4 \ -device lsi,id=scsi2,bus=pci.0,multifunction=on,addr=0x4.0x1 \ @@ -11,6 +24,7 @@ pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ -device lsi,id=scsi6,bus=pci.0,addr=0x4.0x5 \ -device lsi,id=scsi7,bus=pci.0,addr=0x4.0x6 \ -device lsi,id=scsi8,bus=pci.0,addr=0x4.0x7 \ --usb -drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0 \ +-usb \ +-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0 \ -device scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-client.args b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args index c21cc96499..8e641fc4c8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-client.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net nic,\ -macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 -net socket,\ -connect=192.168.0.1:5558,vlan=0 -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 \ +-net socket,connect=192.168.0.1:5558,vlan=0 \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args index 2cd18ae1bb..946bd7ae78 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net nic,\ -macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 -net tap,ifname=nic02,\ -script=/etc/qemu-ifup,vlan=0 -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 \ +-net tap,ifname=nic02,script=/etc/qemu-ifup,vlan=0 \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args index 6146e84772..d8e014ae2d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args @@ -1,8 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net nic,\ -macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139,name=net0 -net tap,\ -script=/etc/qemu-ifup,vlan=0,name=hostnet0 -net nic,macaddr=00:11:22:33:44:56,\ -vlan=1,model=e1000,name=net1 -net tap,script=/etc/qemu-ifup,vlan=1,name=hostnet1 \ --serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139,name=net0 \ +-net tap,script=/etc/qemu-ifup,vlan=0,name=hostnet0 \ +-net nic,macaddr=00:11:22:33:44:56,vlan=1,model=e1000,name=net1 \ +-net tap,script=/etc/qemu-ifup,vlan=1,name=hostnet1 \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args index 28a094b48c..3adcd6bdb1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net nic,\ -macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 -net tap,script=/etc/qemu-ifup,\ -vlan=0 -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 \ +-net tap,script=/etc/qemu-ifup,vlan=0 \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args index 5c8f0a70d5..198bec5fbd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --usb -hda /dev/HostVG/QEMUGuest1 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ -device pci-assign,host=2424:21:1c.6,id=hostdev0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args index 201c8eaee1..5e32f4e4fd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --usb -hda /dev/HostVG/QEMUGuest1 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ -device vfio-pci,host=0021:de:1f.1,id=hostdev0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args index 3a3963c706..172f7bfd4f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --usb -hda /dev/HostVG/QEMUGuest1 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ -device vfio-pci,host=03:07.1,id=hostdev0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args index 184811be70..f36fe39bbf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --usb -hda /dev/HostVG/QEMUGuest1 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ -device pci-assign,host=03:07.1,id=hostdev0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args index 75203db6d5..3708d2db0a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net nic,\ -macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 -net socket,mcast=192.0.0.1:5558,\ -vlan=0 -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 \ +-net socket,mcast=192.0.0.1:5558,vlan=0 \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args index 09195001e3..f2b184029a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net nic,\ -macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 -net socket,\ -listen=192.168.0.1:5558,vlan=0 -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 \ +-net socket,listen=192.168.0.1:5558,vlan=0 \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args b/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args index daf06c24ed..835658605d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ -net nic,macaddr=52:54:00:8c:b9:05,vlan=0,model=rtl8139 \ --net socket,udp=192.168.10.1:5555,localaddr=192.168.10.1:5556,\ -vlan=0 -serial none -parallel none +-net socket,udp=192.168.10.1:5555,localaddr=192.168.10.1:5556,vlan=0 \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user.args b/tests/qemuxml2argvdata/qemuxml2argv-net-user.args index 33cd8f410e..27670c0cb0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-user.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net nic,\ -macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 -net user,vlan=0 -serial none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139 \ +-net user,vlan=0 \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args index 8affb53b39..5b5002eec5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args @@ -1,16 +1,32 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ -chardev socket,id=charnet0,path=/tmp/vhost0.sock,server \ -netdev type=vhost-user,id=hostnet0,chardev=charnet0 \ --device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,addr=0x3 \ +-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,\ +addr=0x3 \ -chardev socket,id=charnet1,path=/tmp/vhost1.sock \ -netdev type=vhost-user,id=hostnet1,chardev=charnet1 \ --device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,addr=0x4 \ +-device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,\ +addr=0x4 \ -netdev socket,listen=:2015,id=hostnet2 \ -device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,addr=0x5 \ -chardev socket,id=charnet3,path=/tmp/vhost2.sock \ -netdev type=vhost-user,id=hostnet3,chardev=charnet3,queues=4 \ --device virtio-net-pci,mq=on,vectors=10,netdev=hostnet3,id=net3,mac=52:54:00:ee:96:6d,\ -bus=pci.0,addr=0x6 +-device virtio-net-pci,mq=on,vectors=10,netdev=hostnet3,id=net3,\ +mac=52:54:00:ee:96:6d,bus=pci.0,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args index ac43630979..0239c697ae 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args @@ -1,12 +1,28 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ -chardev socket,id=charnet0,path=/tmp/vhost0.sock,server \ -netdev type=vhost-user,id=hostnet0,chardev=charnet0 \ --device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,addr=0x3 \ +-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,\ +addr=0x3 \ -chardev socket,id=charnet1,path=/tmp/vhost1.sock \ -netdev type=vhost-user,id=hostnet1,chardev=charnet1 \ --device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,addr=0x4 \ +-device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,\ +addr=0x4 \ -netdev socket,listen=:2015,id=hostnet2 \ -device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args index a8d20fd412..f49c901985 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args @@ -1,7 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M s390-ccw -m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M s390-ccw \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -device virtio-net-ccw,vlan=0,id=net0,mac=00:11:22:33:44:55,devno=fe.0.0001 \ -net user,vlan=0,name=hostnet0 \ -device virtio-net-ccw,vlan=1,id=net1,mac=00:11:22:33:44:54,devno=fe.0.0000 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args index 73f2f5174c..dd381c49fa 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args @@ -1,7 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -device virtio-net-pci,tx=bh,vlan=0,id=net0,\ -mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 -net user,vlan=0,name=hostnet0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-device virtio-net-pci,tx=bh,vlan=0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,\ +addr=0x3 \ +-net user,vlan=0,name=hostnet0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args index 29cfaf7f71..b746a1ccf0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args @@ -1,10 +1,25 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ -hda /dev/HostVG/QEMUGuest7 \ --device virtio-net-pci,csum=off,gso=off,\ -host_tso4=off,host_tso6=off,host_ecn=off,host_ufo=off,mrg_rxbuf=off,\ -guest_csum=off,guest_tso4=off,guest_tso6=off,guest_ecn=off,guest_ufo=off,\ -vlan=0,id=net0,mac=00:22:44:66:88:aa,bus=pci.0,addr=0x3 \ +-device virtio-net-pci,csum=off,gso=off,host_tso4=off,host_tso6=off,host_ecn=off,\ +host_ufo=off,mrg_rxbuf=off,guest_csum=off,guest_tso4=off,guest_tso6=off,\ +guest_ecn=off,guest_ufo=off,vlan=0,id=net0,mac=00:22:44:66:88:aa,bus=pci.0,\ +addr=0x3 \ -net user,vlan=0,name=hostnet0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args index a71c7ab0e6..cf41a54ffa 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args @@ -1,7 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -netdev user,id=hostnet0 -device virtio-net-pci,\ -netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 -device \ -virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-netdev user,id=hostnet0 \ +-device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,\ +addr=0x3 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args index bed03d8ffa..4be6ed4ae7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args @@ -1,6 +1,18 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M s390-virtio -m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M s390-virtio \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -device virtio-net-s390,vlan=0,id=net0,mac=00:11:22:33:44:55 \ -net user,vlan=0,name=hostnet0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args index 0a116e99c7..4227b3b7d2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net nic,\ -macaddr=00:11:22:33:44:55,vlan=0,model=virtio -net user,vlan=0 -serial none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net nic,macaddr=00:11:22:33:44:55,vlan=0,model=virtio \ +-net user,vlan=0 \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args b/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args index da009b5743..da6ad0e4f1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args @@ -2,7 +2,8 @@ LC_ALL=C \ PATH=/bin \ HOME=/home/test \ USER=test \ -LOGNAME=test QEMU_AUDIO_DRV=none \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -S \ -M pc \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args index 51f90de31c..07eeee0c18 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \ -none -vga none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-vga none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics.args b/tests/qemuxml2argvdata/qemuxml2argv-nographics.args index 57fc6e3d2a..a1242085c6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-nographics.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \ -none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args index 9e05c71678..c672c4c694 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ --S -machine pc,accel=tcg,mem-merge=off -m 215 -smp 1 -nographic \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi \ --boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +-S \ +-machine pc,accel=tcg,mem-merge=off \ +-m 215 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args index dab2c12763..c92fb84bf6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 2 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 2 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args index dab2c12763..c92fb84bf6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 2 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 2 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args index dab2c12763..c92fb84bf6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 2 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 2 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args index dab2c12763..c92fb84bf6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 2 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 2 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad.args b/tests/qemuxml2argvdata/qemuxml2argv-numad.args index dab2c12763..c92fb84bf6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numad.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numad.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 2 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 2 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args index 1b440d97a4..c92fb84bf6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args @@ -1,4 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 2 -nographic \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 2 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args index 0b1b0f5055..58b953ba11 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/kvm -S -M pc -m 64 -smp 1 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/kvm \ +-S \ +-M pc \ +-m 64 \ +-smp 1 \ -numa node,nodeid=0,cpus=0,mem=64 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -net none -serial none -parallel none +-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-numatune-memnode-no-memory.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args index f9a35aca56..b0cd4f0b27 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args @@ -1,9 +1,24 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/kvm -S -M pc -m 64 -smp 2 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/kvm \ +-S \ +-M pc \ +-m 64 \ +-smp 2 \ -object memory-backend-ram,id=ram-node0,size=33554432,host-nodes=3,\ policy=preferred \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \ -object memory-backend-ram,id=ram-node1,size=33554432 \ -numa node,nodeid=1,cpus=1,memdev=ram-node1 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -net none -serial none -parallel none +-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-numatune-memnode.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args index 5dd7fcd2ef..aa0c0508a1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args @@ -1,13 +1,28 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/kvm -S -M pc -m 24105 -smp 32 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/kvm \ +-S \ +-M pc \ +-m 24105 \ +-smp 32 \ -object memory-backend-ram,id=ram-node0,size=20971520,host-nodes=3,\ policy=preferred \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \ -object memory-backend-ram,id=ram-node1,size=676331520,host-nodes=0-7,\ policy=bind \ -numa node,nodeid=1,cpus=1-27,cpus=29,memdev=ram-node1 \ --object memory-backend-ram,id=ram-node2,size=24578621440,\ -host-nodes=1-2,host-nodes=5,host-nodes=7,policy=bind \ +-object memory-backend-ram,id=ram-node2,size=24578621440,host-nodes=1-2,\ +host-nodes=5,host-nodes=7,policy=bind \ -numa node,nodeid=2,cpus=28,cpus=30-31,memdev=ram-node2 \ --nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -net none -serial none -parallel none +-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-numatune-memory.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args index dab2c12763..c92fb84bf6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 2 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 2 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args b/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args index 3cbd688b20..ba381e8add 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ -hda /dev/HostVG/QEMUGuest1 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -device pvpanic +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ +-device pvpanic diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic.args b/tests/qemuxml2argvdata/qemuxml2argv-panic.args index 8e07cba227..44c5b7024d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-panic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-panic.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ -hda /dev/HostVG/QEMUGuest1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -device pvpanic,ioport=1285 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args index fcfb7de86b..fb9aa159dc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args @@ -1,8 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 -hda /dev/HostVG/QEMUGuest1 \ --chardev parport,id=charparallel0,path=/dev/parport0 -device \ -isa-parallel,chardev=charparallel0,id=parallel0 -device \ -virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev parport,id=charparallel0,path=/dev/parport0 \ +-device isa-parallel,chardev=charparallel0,id=parallel0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args index f7a0d540f4..6910d06704 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args @@ -1,8 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 -hda /dev/HostVG/QEMUGuest1 -chardev \ -socket,id=charparallel0,host=127.0.0.1,port=9999,server,nowait -device \ -isa-parallel,chardev=charparallel0,id=parallel0 -device \ -virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev socket,id=charparallel0,host=127.0.0.1,port=9999,server,nowait \ +-device isa-parallel,chardev=charparallel0,id=parallel0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args index 4775b56462..1aed6fc1b5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \ -tcp:127.0.0.1:9999,server,nowait +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel tcp:127.0.0.1:9999,server,nowait diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args index 362cd086ca..4db7c7adb4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args @@ -1,6 +1,18 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/libexec/qemu-kvm -S -M pc-1.2 -m 2048 -smp 2 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-kvm \ +-S \ +-M pc-1.2 \ +-m 2048 \ +-smp 2 \ +-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 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x4 \ -device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.0,addr=0x5 \ @@ -8,5 +20,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -device pci-bridge,chassis_nr=5,id=pci.5,bus=pci.0,addr=0x7 \ -device pci-bridge,chassis_nr=6,id=pci.6,bus=pci.0,addr=0x8 \ -device pci-bridge,chassis_nr=7,id=pci.7,bus=pci.0,addr=0x9 \ --usb -cdrom /var/iso/f18kde.iso \ +-usb \ +-cdrom /var/iso/f18kde.iso \ -device virtio-balloon-pci,id=balloon0,bus=pci.7,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args index 3cc5be1e91..8f24221bda 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args @@ -1,6 +1,18 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/libexec/qemu-kvm -S -M pc-1.2 -m 2048 -smp 2 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-kvm \ +-S \ +-M pc-1.2 \ +-m 2048 \ +-smp 2 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot c \ -device pci-bridge,chassis_nr=8,id=pci.8,bus=pci.0,addr=0x3 \ -device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x4 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x5 \ @@ -9,5 +21,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -device pci-bridge,chassis_nr=5,id=pci.5,bus=pci.0,addr=0x8 \ -device pci-bridge,chassis_nr=6,id=pci.6,bus=pci.0,addr=0x9 \ -device pci-bridge,chassis_nr=7,id=pci.7,bus=pci.0,addr=0xa \ --usb -cdrom /var/iso/f18kde.iso \ +-usb \ +-cdrom /var/iso/f18kde.iso \ -device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args index fcd9692407..541c9b76ac 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args @@ -1,218 +1,336 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu-kvm \ --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 \ +-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 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x4 \ -device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.0,addr=0x5 \ --usb -drive file=/var/lib/libvirt/images/test.img,if=none,id=drive-virtio-disk0 \ --device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk0,id=virtio-disk0 \ +-usb \ +-drive file=/var/lib/libvirt/images/test.img,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk0,\ +id=virtio-disk0 \ -drive file=/var/lib/libvirt/images/disk-a-a.img,if=none,id=drive-virtio-disk26 \ --device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk26,id=virtio-disk26 \ +-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk26,\ +id=virtio-disk26 \ -drive file=/var/lib/libvirt/images/disk-a-b.img,if=none,id=drive-virtio-disk27 \ --device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk27,id=virtio-disk27 \ +-device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk27,\ +id=virtio-disk27 \ -drive file=/var/lib/libvirt/images/disk-a-c.img,if=none,id=drive-virtio-disk28 \ --device virtio-blk-pci,bus=pci.0,addr=0x9,drive=drive-virtio-disk28,id=virtio-disk28 \ +-device virtio-blk-pci,bus=pci.0,addr=0x9,drive=drive-virtio-disk28,\ +id=virtio-disk28 \ -drive file=/var/lib/libvirt/images/disk-a-d.img,if=none,id=drive-virtio-disk29 \ --device virtio-blk-pci,bus=pci.0,addr=0xa,drive=drive-virtio-disk29,id=virtio-disk29 \ +-device virtio-blk-pci,bus=pci.0,addr=0xa,drive=drive-virtio-disk29,\ +id=virtio-disk29 \ -drive file=/var/lib/libvirt/images/disk-b-a.img,if=none,id=drive-virtio-disk52 \ --device virtio-blk-pci,bus=pci.0,addr=0xb,drive=drive-virtio-disk52,id=virtio-disk52 \ +-device virtio-blk-pci,bus=pci.0,addr=0xb,drive=drive-virtio-disk52,\ +id=virtio-disk52 \ -drive file=/var/lib/libvirt/images/disk-b-b.img,if=none,id=drive-virtio-disk53 \ --device virtio-blk-pci,bus=pci.0,addr=0xc,drive=drive-virtio-disk53,id=virtio-disk53 \ +-device virtio-blk-pci,bus=pci.0,addr=0xc,drive=drive-virtio-disk53,\ +id=virtio-disk53 \ -drive file=/var/lib/libvirt/images/disk-b-c.img,if=none,id=drive-virtio-disk54 \ --device virtio-blk-pci,bus=pci.0,addr=0xd,drive=drive-virtio-disk54,id=virtio-disk54 \ +-device virtio-blk-pci,bus=pci.0,addr=0xd,drive=drive-virtio-disk54,\ +id=virtio-disk54 \ -drive file=/var/lib/libvirt/images/disk-b-d.img,if=none,id=drive-virtio-disk55 \ --device virtio-blk-pci,bus=pci.0,addr=0xe,drive=drive-virtio-disk55,id=virtio-disk55 \ +-device virtio-blk-pci,bus=pci.0,addr=0xe,drive=drive-virtio-disk55,\ +id=virtio-disk55 \ -drive file=/var/lib/libvirt/images/disk-c-a.img,if=none,id=drive-virtio-disk78 \ --device virtio-blk-pci,bus=pci.0,addr=0xf,drive=drive-virtio-disk78,id=virtio-disk78 \ +-device virtio-blk-pci,bus=pci.0,addr=0xf,drive=drive-virtio-disk78,\ +id=virtio-disk78 \ -drive file=/var/lib/libvirt/images/disk-c-b.img,if=none,id=drive-virtio-disk79 \ --device virtio-blk-pci,bus=pci.0,addr=0x10,drive=drive-virtio-disk79,id=virtio-disk79 \ +-device virtio-blk-pci,bus=pci.0,addr=0x10,drive=drive-virtio-disk79,\ +id=virtio-disk79 \ -drive file=/var/lib/libvirt/images/disk-c-c.img,if=none,id=drive-virtio-disk80 \ --device virtio-blk-pci,bus=pci.0,addr=0x11,drive=drive-virtio-disk80,id=virtio-disk80 \ +-device virtio-blk-pci,bus=pci.0,addr=0x11,drive=drive-virtio-disk80,\ +id=virtio-disk80 \ -drive file=/var/lib/libvirt/images/disk-c-d.img,if=none,id=drive-virtio-disk81 \ --device virtio-blk-pci,bus=pci.0,addr=0x12,drive=drive-virtio-disk81,id=virtio-disk81 \ +-device virtio-blk-pci,bus=pci.0,addr=0x12,drive=drive-virtio-disk81,\ +id=virtio-disk81 \ -drive file=/var/lib/libvirt/images/disk-d-a.img,if=none,id=drive-virtio-disk104 \ --device virtio-blk-pci,bus=pci.0,addr=0x13,drive=drive-virtio-disk104,id=virtio-disk104 \ +-device virtio-blk-pci,bus=pci.0,addr=0x13,drive=drive-virtio-disk104,\ +id=virtio-disk104 \ -drive file=/var/lib/libvirt/images/disk-d-b.img,if=none,id=drive-virtio-disk105 \ --device virtio-blk-pci,bus=pci.0,addr=0x14,drive=drive-virtio-disk105,id=virtio-disk105 \ +-device virtio-blk-pci,bus=pci.0,addr=0x14,drive=drive-virtio-disk105,\ +id=virtio-disk105 \ -drive file=/var/lib/libvirt/images/disk-d-c.img,if=none,id=drive-virtio-disk106 \ --device virtio-blk-pci,bus=pci.0,addr=0x15,drive=drive-virtio-disk106,id=virtio-disk106 \ +-device virtio-blk-pci,bus=pci.0,addr=0x15,drive=drive-virtio-disk106,\ +id=virtio-disk106 \ -drive file=/var/lib/libvirt/images/disk-d-d.img,if=none,id=drive-virtio-disk107 \ --device virtio-blk-pci,bus=pci.0,addr=0x16,drive=drive-virtio-disk107,id=virtio-disk107 \ +-device virtio-blk-pci,bus=pci.0,addr=0x16,drive=drive-virtio-disk107,\ +id=virtio-disk107 \ -drive file=/var/lib/libvirt/images/disk-e-a.img,if=none,id=drive-virtio-disk130 \ --device virtio-blk-pci,bus=pci.0,addr=0x17,drive=drive-virtio-disk130,id=virtio-disk130 \ +-device virtio-blk-pci,bus=pci.0,addr=0x17,drive=drive-virtio-disk130,\ +id=virtio-disk130 \ -drive file=/var/lib/libvirt/images/disk-e-b.img,if=none,id=drive-virtio-disk131 \ --device virtio-blk-pci,bus=pci.0,addr=0x18,drive=drive-virtio-disk131,id=virtio-disk131 \ +-device virtio-blk-pci,bus=pci.0,addr=0x18,drive=drive-virtio-disk131,\ +id=virtio-disk131 \ -drive file=/var/lib/libvirt/images/disk-e-c.img,if=none,id=drive-virtio-disk132 \ --device virtio-blk-pci,bus=pci.0,addr=0x19,drive=drive-virtio-disk132,id=virtio-disk132 \ +-device virtio-blk-pci,bus=pci.0,addr=0x19,drive=drive-virtio-disk132,\ +id=virtio-disk132 \ -drive file=/var/lib/libvirt/images/disk-e-d.img,if=none,id=drive-virtio-disk133 \ --device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=drive-virtio-disk133,id=virtio-disk133 \ +-device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=drive-virtio-disk133,\ +id=virtio-disk133 \ -drive file=/var/lib/libvirt/images/disk-f-a.img,if=none,id=drive-virtio-disk156 \ --device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=drive-virtio-disk156,id=virtio-disk156 \ +-device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=drive-virtio-disk156,\ +id=virtio-disk156 \ -drive file=/var/lib/libvirt/images/disk-f-b.img,if=none,id=drive-virtio-disk157 \ --device virtio-blk-pci,bus=pci.0,addr=0x1c,drive=drive-virtio-disk157,id=virtio-disk157 \ +-device virtio-blk-pci,bus=pci.0,addr=0x1c,drive=drive-virtio-disk157,\ +id=virtio-disk157 \ -drive file=/var/lib/libvirt/images/disk-f-c.img,if=none,id=drive-virtio-disk158 \ --device virtio-blk-pci,bus=pci.0,addr=0x1d,drive=drive-virtio-disk158,id=virtio-disk158 \ +-device virtio-blk-pci,bus=pci.0,addr=0x1d,drive=drive-virtio-disk158,\ +id=virtio-disk158 \ -drive file=/var/lib/libvirt/images/disk-f-d.img,if=none,id=drive-virtio-disk159 \ --device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=drive-virtio-disk159,id=virtio-disk159 \ +-device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=drive-virtio-disk159,\ +id=virtio-disk159 \ -drive file=/var/lib/libvirt/images/disk-g-a.img,if=none,id=drive-virtio-disk182 \ --device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk182,id=virtio-disk182 \ +-device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk182,\ +id=virtio-disk182 \ -drive file=/var/lib/libvirt/images/disk-g-b.img,if=none,id=drive-virtio-disk183 \ --device virtio-blk-pci,bus=pci.1,addr=0x1,drive=drive-virtio-disk183,id=virtio-disk183 \ +-device virtio-blk-pci,bus=pci.1,addr=0x1,drive=drive-virtio-disk183,\ +id=virtio-disk183 \ -drive file=/var/lib/libvirt/images/disk-g-c.img,if=none,id=drive-virtio-disk184 \ --device virtio-blk-pci,bus=pci.1,addr=0x2,drive=drive-virtio-disk184,id=virtio-disk184 \ +-device virtio-blk-pci,bus=pci.1,addr=0x2,drive=drive-virtio-disk184,\ +id=virtio-disk184 \ -drive file=/var/lib/libvirt/images/disk-g-d.img,if=none,id=drive-virtio-disk185 \ --device virtio-blk-pci,bus=pci.1,addr=0x3,drive=drive-virtio-disk185,id=virtio-disk185 \ +-device virtio-blk-pci,bus=pci.1,addr=0x3,drive=drive-virtio-disk185,\ +id=virtio-disk185 \ -drive file=/var/lib/libvirt/images/disk-h-a.img,if=none,id=drive-virtio-disk208 \ --device virtio-blk-pci,bus=pci.1,addr=0x4,drive=drive-virtio-disk208,id=virtio-disk208 \ +-device virtio-blk-pci,bus=pci.1,addr=0x4,drive=drive-virtio-disk208,\ +id=virtio-disk208 \ -drive file=/var/lib/libvirt/images/disk-h-b.img,if=none,id=drive-virtio-disk209 \ --device virtio-blk-pci,bus=pci.1,addr=0x5,drive=drive-virtio-disk209,id=virtio-disk209 \ +-device virtio-blk-pci,bus=pci.1,addr=0x5,drive=drive-virtio-disk209,\ +id=virtio-disk209 \ -drive file=/var/lib/libvirt/images/disk-h-c.img,if=none,id=drive-virtio-disk210 \ --device virtio-blk-pci,bus=pci.1,addr=0x6,drive=drive-virtio-disk210,id=virtio-disk210 \ +-device virtio-blk-pci,bus=pci.1,addr=0x6,drive=drive-virtio-disk210,\ +id=virtio-disk210 \ -drive file=/var/lib/libvirt/images/disk-h-d.img,if=none,id=drive-virtio-disk211 \ --device virtio-blk-pci,bus=pci.1,addr=0x7,drive=drive-virtio-disk211,id=virtio-disk211 \ +-device virtio-blk-pci,bus=pci.1,addr=0x7,drive=drive-virtio-disk211,\ +id=virtio-disk211 \ -drive file=/var/lib/libvirt/images/disk-i-a.img,if=none,id=drive-virtio-disk234 \ --device virtio-blk-pci,bus=pci.1,addr=0x8,drive=drive-virtio-disk234,id=virtio-disk234 \ +-device virtio-blk-pci,bus=pci.1,addr=0x8,drive=drive-virtio-disk234,\ +id=virtio-disk234 \ -drive file=/var/lib/libvirt/images/disk-i-b.img,if=none,id=drive-virtio-disk235 \ --device virtio-blk-pci,bus=pci.1,addr=0x9,drive=drive-virtio-disk235,id=virtio-disk235 \ +-device virtio-blk-pci,bus=pci.1,addr=0x9,drive=drive-virtio-disk235,\ +id=virtio-disk235 \ -drive file=/var/lib/libvirt/images/disk-i-c.img,if=none,id=drive-virtio-disk236 \ --device virtio-blk-pci,bus=pci.1,addr=0xa,drive=drive-virtio-disk236,id=virtio-disk236 \ +-device virtio-blk-pci,bus=pci.1,addr=0xa,drive=drive-virtio-disk236,\ +id=virtio-disk236 \ -drive file=/var/lib/libvirt/images/disk-i-d.img,if=none,id=drive-virtio-disk237 \ --device virtio-blk-pci,bus=pci.1,addr=0xb,drive=drive-virtio-disk237,id=virtio-disk237 \ +-device virtio-blk-pci,bus=pci.1,addr=0xb,drive=drive-virtio-disk237,\ +id=virtio-disk237 \ -drive file=/var/lib/libvirt/images/disk-j-a.img,if=none,id=drive-virtio-disk260 \ --device virtio-blk-pci,bus=pci.1,addr=0xc,drive=drive-virtio-disk260,id=virtio-disk260 \ +-device virtio-blk-pci,bus=pci.1,addr=0xc,drive=drive-virtio-disk260,\ +id=virtio-disk260 \ -drive file=/var/lib/libvirt/images/disk-j-b.img,if=none,id=drive-virtio-disk261 \ --device virtio-blk-pci,bus=pci.1,addr=0xd,drive=drive-virtio-disk261,id=virtio-disk261 \ +-device virtio-blk-pci,bus=pci.1,addr=0xd,drive=drive-virtio-disk261,\ +id=virtio-disk261 \ -drive file=/var/lib/libvirt/images/disk-j-c.img,if=none,id=drive-virtio-disk262 \ --device virtio-blk-pci,bus=pci.1,addr=0xe,drive=drive-virtio-disk262,id=virtio-disk262 \ +-device virtio-blk-pci,bus=pci.1,addr=0xe,drive=drive-virtio-disk262,\ +id=virtio-disk262 \ -drive file=/var/lib/libvirt/images/disk-j-d.img,if=none,id=drive-virtio-disk263 \ --device virtio-blk-pci,bus=pci.1,addr=0xf,drive=drive-virtio-disk263,id=virtio-disk263 \ +-device virtio-blk-pci,bus=pci.1,addr=0xf,drive=drive-virtio-disk263,\ +id=virtio-disk263 \ -drive file=/var/lib/libvirt/images/disk-k-a.img,if=none,id=drive-virtio-disk286 \ --device virtio-blk-pci,bus=pci.1,addr=0x10,drive=drive-virtio-disk286,id=virtio-disk286 \ +-device virtio-blk-pci,bus=pci.1,addr=0x10,drive=drive-virtio-disk286,\ +id=virtio-disk286 \ -drive file=/var/lib/libvirt/images/disk-k-b.img,if=none,id=drive-virtio-disk287 \ --device virtio-blk-pci,bus=pci.1,addr=0x11,drive=drive-virtio-disk287,id=virtio-disk287 \ +-device virtio-blk-pci,bus=pci.1,addr=0x11,drive=drive-virtio-disk287,\ +id=virtio-disk287 \ -drive file=/var/lib/libvirt/images/disk-k-c.img,if=none,id=drive-virtio-disk288 \ --device virtio-blk-pci,bus=pci.1,addr=0x12,drive=drive-virtio-disk288,id=virtio-disk288 \ +-device virtio-blk-pci,bus=pci.1,addr=0x12,drive=drive-virtio-disk288,\ +id=virtio-disk288 \ -drive file=/var/lib/libvirt/images/disk-k-d.img,if=none,id=drive-virtio-disk289 \ --device virtio-blk-pci,bus=pci.1,addr=0x13,drive=drive-virtio-disk289,id=virtio-disk289 \ +-device virtio-blk-pci,bus=pci.1,addr=0x13,drive=drive-virtio-disk289,\ +id=virtio-disk289 \ -drive file=/var/lib/libvirt/images/disk-l-a.img,if=none,id=drive-virtio-disk312 \ --device virtio-blk-pci,bus=pci.1,addr=0x14,drive=drive-virtio-disk312,id=virtio-disk312 \ +-device virtio-blk-pci,bus=pci.1,addr=0x14,drive=drive-virtio-disk312,\ +id=virtio-disk312 \ -drive file=/var/lib/libvirt/images/disk-l-b.img,if=none,id=drive-virtio-disk313 \ --device virtio-blk-pci,bus=pci.1,addr=0x15,drive=drive-virtio-disk313,id=virtio-disk313 \ +-device virtio-blk-pci,bus=pci.1,addr=0x15,drive=drive-virtio-disk313,\ +id=virtio-disk313 \ -drive file=/var/lib/libvirt/images/disk-l-c.img,if=none,id=drive-virtio-disk314 \ --device virtio-blk-pci,bus=pci.1,addr=0x16,drive=drive-virtio-disk314,id=virtio-disk314 \ +-device virtio-blk-pci,bus=pci.1,addr=0x16,drive=drive-virtio-disk314,\ +id=virtio-disk314 \ -drive file=/var/lib/libvirt/images/disk-l-d.img,if=none,id=drive-virtio-disk315 \ --device virtio-blk-pci,bus=pci.1,addr=0x17,drive=drive-virtio-disk315,id=virtio-disk315 \ +-device virtio-blk-pci,bus=pci.1,addr=0x17,drive=drive-virtio-disk315,\ +id=virtio-disk315 \ -drive file=/var/lib/libvirt/images/disk-m-a.img,if=none,id=drive-virtio-disk338 \ --device virtio-blk-pci,bus=pci.1,addr=0x18,drive=drive-virtio-disk338,id=virtio-disk338 \ +-device virtio-blk-pci,bus=pci.1,addr=0x18,drive=drive-virtio-disk338,\ +id=virtio-disk338 \ -drive file=/var/lib/libvirt/images/disk-m-b.img,if=none,id=drive-virtio-disk339 \ --device virtio-blk-pci,bus=pci.1,addr=0x19,drive=drive-virtio-disk339,id=virtio-disk339 \ +-device virtio-blk-pci,bus=pci.1,addr=0x19,drive=drive-virtio-disk339,\ +id=virtio-disk339 \ -drive file=/var/lib/libvirt/images/disk-m-c.img,if=none,id=drive-virtio-disk340 \ --device virtio-blk-pci,bus=pci.1,addr=0x1a,drive=drive-virtio-disk340,id=virtio-disk340 \ +-device virtio-blk-pci,bus=pci.1,addr=0x1a,drive=drive-virtio-disk340,\ +id=virtio-disk340 \ -drive file=/var/lib/libvirt/images/disk-m-d.img,if=none,id=drive-virtio-disk341 \ --device virtio-blk-pci,bus=pci.1,addr=0x1b,drive=drive-virtio-disk341,id=virtio-disk341 \ +-device virtio-blk-pci,bus=pci.1,addr=0x1b,drive=drive-virtio-disk341,\ +id=virtio-disk341 \ -drive file=/var/lib/libvirt/images/disk-n-a.img,if=none,id=drive-virtio-disk364 \ --device virtio-blk-pci,bus=pci.1,addr=0x1c,drive=drive-virtio-disk364,id=virtio-disk364 \ +-device virtio-blk-pci,bus=pci.1,addr=0x1c,drive=drive-virtio-disk364,\ +id=virtio-disk364 \ -drive file=/var/lib/libvirt/images/disk-n-b.img,if=none,id=drive-virtio-disk365 \ --device virtio-blk-pci,bus=pci.1,addr=0x1d,drive=drive-virtio-disk365,id=virtio-disk365 \ +-device virtio-blk-pci,bus=pci.1,addr=0x1d,drive=drive-virtio-disk365,\ +id=virtio-disk365 \ -drive file=/var/lib/libvirt/images/disk-n-c.img,if=none,id=drive-virtio-disk366 \ --device virtio-blk-pci,bus=pci.1,addr=0x1e,drive=drive-virtio-disk366,id=virtio-disk366 \ +-device virtio-blk-pci,bus=pci.1,addr=0x1e,drive=drive-virtio-disk366,\ +id=virtio-disk366 \ -drive file=/var/lib/libvirt/images/disk-n-d.img,if=none,id=drive-virtio-disk367 \ --device virtio-blk-pci,bus=pci.1,addr=0x1f,drive=drive-virtio-disk367,id=virtio-disk367 \ +-device virtio-blk-pci,bus=pci.1,addr=0x1f,drive=drive-virtio-disk367,\ +id=virtio-disk367 \ -drive file=/var/lib/libvirt/images/disk-o-a.img,if=none,id=drive-virtio-disk390 \ --device virtio-blk-pci,bus=pci.2,addr=0x1,drive=drive-virtio-disk390,id=virtio-disk390 \ +-device virtio-blk-pci,bus=pci.2,addr=0x1,drive=drive-virtio-disk390,\ +id=virtio-disk390 \ -drive file=/var/lib/libvirt/images/disk-o-b.img,if=none,id=drive-virtio-disk391 \ --device virtio-blk-pci,bus=pci.2,addr=0x2,drive=drive-virtio-disk391,id=virtio-disk391 \ +-device virtio-blk-pci,bus=pci.2,addr=0x2,drive=drive-virtio-disk391,\ +id=virtio-disk391 \ -drive file=/var/lib/libvirt/images/disk-o-c.img,if=none,id=drive-virtio-disk392 \ --device virtio-blk-pci,bus=pci.2,addr=0x3,drive=drive-virtio-disk392,id=virtio-disk392 \ +-device virtio-blk-pci,bus=pci.2,addr=0x3,drive=drive-virtio-disk392,\ +id=virtio-disk392 \ -drive file=/var/lib/libvirt/images/disk-o-d.img,if=none,id=drive-virtio-disk393 \ --device virtio-blk-pci,bus=pci.2,addr=0x4,drive=drive-virtio-disk393,id=virtio-disk393 \ +-device virtio-blk-pci,bus=pci.2,addr=0x4,drive=drive-virtio-disk393,\ +id=virtio-disk393 \ -drive file=/var/lib/libvirt/images/disk-p-a.img,if=none,id=drive-virtio-disk416 \ --device virtio-blk-pci,bus=pci.2,addr=0x5,drive=drive-virtio-disk416,id=virtio-disk416 \ +-device virtio-blk-pci,bus=pci.2,addr=0x5,drive=drive-virtio-disk416,\ +id=virtio-disk416 \ -drive file=/var/lib/libvirt/images/disk-p-b.img,if=none,id=drive-virtio-disk417 \ --device virtio-blk-pci,bus=pci.2,addr=0x6,drive=drive-virtio-disk417,id=virtio-disk417 \ +-device virtio-blk-pci,bus=pci.2,addr=0x6,drive=drive-virtio-disk417,\ +id=virtio-disk417 \ -drive file=/var/lib/libvirt/images/disk-p-c.img,if=none,id=drive-virtio-disk418 \ --device virtio-blk-pci,bus=pci.2,addr=0x7,drive=drive-virtio-disk418,id=virtio-disk418 \ +-device virtio-blk-pci,bus=pci.2,addr=0x7,drive=drive-virtio-disk418,\ +id=virtio-disk418 \ -drive file=/var/lib/libvirt/images/disk-p-d.img,if=none,id=drive-virtio-disk419 \ --device virtio-blk-pci,bus=pci.2,addr=0x8,drive=drive-virtio-disk419,id=virtio-disk419 \ +-device virtio-blk-pci,bus=pci.2,addr=0x8,drive=drive-virtio-disk419,\ +id=virtio-disk419 \ -drive file=/var/lib/libvirt/images/disk-q-a.img,if=none,id=drive-virtio-disk442 \ --device virtio-blk-pci,bus=pci.2,addr=0x9,drive=drive-virtio-disk442,id=virtio-disk442 \ +-device virtio-blk-pci,bus=pci.2,addr=0x9,drive=drive-virtio-disk442,\ +id=virtio-disk442 \ -drive file=/var/lib/libvirt/images/disk-q-b.img,if=none,id=drive-virtio-disk443 \ --device virtio-blk-pci,bus=pci.2,addr=0xa,drive=drive-virtio-disk443,id=virtio-disk443 \ +-device virtio-blk-pci,bus=pci.2,addr=0xa,drive=drive-virtio-disk443,\ +id=virtio-disk443 \ -drive file=/var/lib/libvirt/images/disk-q-c.img,if=none,id=drive-virtio-disk444 \ --device virtio-blk-pci,bus=pci.2,addr=0xb,drive=drive-virtio-disk444,id=virtio-disk444 \ +-device virtio-blk-pci,bus=pci.2,addr=0xb,drive=drive-virtio-disk444,\ +id=virtio-disk444 \ -drive file=/var/lib/libvirt/images/disk-q-d.img,if=none,id=drive-virtio-disk445 \ --device virtio-blk-pci,bus=pci.2,addr=0xc,drive=drive-virtio-disk445,id=virtio-disk445 \ +-device virtio-blk-pci,bus=pci.2,addr=0xc,drive=drive-virtio-disk445,\ +id=virtio-disk445 \ -drive file=/var/lib/libvirt/images/disk-r-a.img,if=none,id=drive-virtio-disk468 \ --device virtio-blk-pci,bus=pci.2,addr=0xd,drive=drive-virtio-disk468,id=virtio-disk468 \ +-device virtio-blk-pci,bus=pci.2,addr=0xd,drive=drive-virtio-disk468,\ +id=virtio-disk468 \ -drive file=/var/lib/libvirt/images/disk-r-b.img,if=none,id=drive-virtio-disk469 \ --device virtio-blk-pci,bus=pci.2,addr=0xe,drive=drive-virtio-disk469,id=virtio-disk469 \ +-device virtio-blk-pci,bus=pci.2,addr=0xe,drive=drive-virtio-disk469,\ +id=virtio-disk469 \ -drive file=/var/lib/libvirt/images/disk-r-c.img,if=none,id=drive-virtio-disk470 \ --device virtio-blk-pci,bus=pci.2,addr=0xf,drive=drive-virtio-disk470,id=virtio-disk470 \ +-device virtio-blk-pci,bus=pci.2,addr=0xf,drive=drive-virtio-disk470,\ +id=virtio-disk470 \ -drive file=/var/lib/libvirt/images/disk-r-d.img,if=none,id=drive-virtio-disk471 \ --device virtio-blk-pci,bus=pci.2,addr=0x10,drive=drive-virtio-disk471,id=virtio-disk471 \ +-device virtio-blk-pci,bus=pci.2,addr=0x10,drive=drive-virtio-disk471,\ +id=virtio-disk471 \ -drive file=/var/lib/libvirt/images/disk-s-a.img,if=none,id=drive-virtio-disk494 \ --device virtio-blk-pci,bus=pci.2,addr=0x11,drive=drive-virtio-disk494,id=virtio-disk494 \ +-device virtio-blk-pci,bus=pci.2,addr=0x11,drive=drive-virtio-disk494,\ +id=virtio-disk494 \ -drive file=/var/lib/libvirt/images/disk-s-b.img,if=none,id=drive-virtio-disk495 \ --device virtio-blk-pci,bus=pci.2,addr=0x12,drive=drive-virtio-disk495,id=virtio-disk495 \ +-device virtio-blk-pci,bus=pci.2,addr=0x12,drive=drive-virtio-disk495,\ +id=virtio-disk495 \ -drive file=/var/lib/libvirt/images/disk-s-c.img,if=none,id=drive-virtio-disk496 \ --device virtio-blk-pci,bus=pci.2,addr=0x13,drive=drive-virtio-disk496,id=virtio-disk496 \ +-device virtio-blk-pci,bus=pci.2,addr=0x13,drive=drive-virtio-disk496,\ +id=virtio-disk496 \ -drive file=/var/lib/libvirt/images/disk-s-d.img,if=none,id=drive-virtio-disk497 \ --device virtio-blk-pci,bus=pci.2,addr=0x14,drive=drive-virtio-disk497,id=virtio-disk497 \ +-device virtio-blk-pci,bus=pci.2,addr=0x14,drive=drive-virtio-disk497,\ +id=virtio-disk497 \ -drive file=/var/lib/libvirt/images/disk-t-a.img,if=none,id=drive-virtio-disk520 \ --device virtio-blk-pci,bus=pci.2,addr=0x15,drive=drive-virtio-disk520,id=virtio-disk520 \ +-device virtio-blk-pci,bus=pci.2,addr=0x15,drive=drive-virtio-disk520,\ +id=virtio-disk520 \ -drive file=/var/lib/libvirt/images/disk-t-b.img,if=none,id=drive-virtio-disk521 \ --device virtio-blk-pci,bus=pci.2,addr=0x16,drive=drive-virtio-disk521,id=virtio-disk521 \ +-device virtio-blk-pci,bus=pci.2,addr=0x16,drive=drive-virtio-disk521,\ +id=virtio-disk521 \ -drive file=/var/lib/libvirt/images/disk-t-c.img,if=none,id=drive-virtio-disk522 \ --device virtio-blk-pci,bus=pci.2,addr=0x17,drive=drive-virtio-disk522,id=virtio-disk522 \ +-device virtio-blk-pci,bus=pci.2,addr=0x17,drive=drive-virtio-disk522,\ +id=virtio-disk522 \ -drive file=/var/lib/libvirt/images/disk-t-d.img,if=none,id=drive-virtio-disk523 \ --device virtio-blk-pci,bus=pci.2,addr=0x18,drive=drive-virtio-disk523,id=virtio-disk523 \ +-device virtio-blk-pci,bus=pci.2,addr=0x18,drive=drive-virtio-disk523,\ +id=virtio-disk523 \ -drive file=/var/lib/libvirt/images/disk-u-a.img,if=none,id=drive-virtio-disk546 \ --device virtio-blk-pci,bus=pci.2,addr=0x19,drive=drive-virtio-disk546,id=virtio-disk546 \ +-device virtio-blk-pci,bus=pci.2,addr=0x19,drive=drive-virtio-disk546,\ +id=virtio-disk546 \ -drive file=/var/lib/libvirt/images/disk-u-b.img,if=none,id=drive-virtio-disk547 \ --device virtio-blk-pci,bus=pci.2,addr=0x1a,drive=drive-virtio-disk547,id=virtio-disk547 \ +-device virtio-blk-pci,bus=pci.2,addr=0x1a,drive=drive-virtio-disk547,\ +id=virtio-disk547 \ -drive file=/var/lib/libvirt/images/disk-u-c.img,if=none,id=drive-virtio-disk548 \ --device virtio-blk-pci,bus=pci.2,addr=0x1b,drive=drive-virtio-disk548,id=virtio-disk548 \ +-device virtio-blk-pci,bus=pci.2,addr=0x1b,drive=drive-virtio-disk548,\ +id=virtio-disk548 \ -drive file=/var/lib/libvirt/images/disk-u-d.img,if=none,id=drive-virtio-disk549 \ --device virtio-blk-pci,bus=pci.2,addr=0x1c,drive=drive-virtio-disk549,id=virtio-disk549 \ +-device virtio-blk-pci,bus=pci.2,addr=0x1c,drive=drive-virtio-disk549,\ +id=virtio-disk549 \ -drive file=/var/lib/libvirt/images/disk-v-a.img,if=none,id=drive-virtio-disk572 \ --device virtio-blk-pci,bus=pci.2,addr=0x1d,drive=drive-virtio-disk572,id=virtio-disk572 \ +-device virtio-blk-pci,bus=pci.2,addr=0x1d,drive=drive-virtio-disk572,\ +id=virtio-disk572 \ -drive file=/var/lib/libvirt/images/disk-v-b.img,if=none,id=drive-virtio-disk573 \ --device virtio-blk-pci,bus=pci.2,addr=0x1e,drive=drive-virtio-disk573,id=virtio-disk573 \ +-device virtio-blk-pci,bus=pci.2,addr=0x1e,drive=drive-virtio-disk573,\ +id=virtio-disk573 \ -drive file=/var/lib/libvirt/images/disk-v-c.img,if=none,id=drive-virtio-disk574 \ --device virtio-blk-pci,bus=pci.2,addr=0x1f,drive=drive-virtio-disk574,id=virtio-disk574 \ +-device virtio-blk-pci,bus=pci.2,addr=0x1f,drive=drive-virtio-disk574,\ +id=virtio-disk574 \ -drive file=/var/lib/libvirt/images/disk-v-d.img,if=none,id=drive-virtio-disk575 \ --device virtio-blk-pci,bus=pci.3,addr=0x1,drive=drive-virtio-disk575,id=virtio-disk575 \ +-device virtio-blk-pci,bus=pci.3,addr=0x1,drive=drive-virtio-disk575,\ +id=virtio-disk575 \ -drive file=/var/lib/libvirt/images/disk-w-a.img,if=none,id=drive-virtio-disk598 \ --device virtio-blk-pci,bus=pci.3,addr=0x2,drive=drive-virtio-disk598,id=virtio-disk598 \ +-device virtio-blk-pci,bus=pci.3,addr=0x2,drive=drive-virtio-disk598,\ +id=virtio-disk598 \ -drive file=/var/lib/libvirt/images/disk-w-b.img,if=none,id=drive-virtio-disk599 \ --device virtio-blk-pci,bus=pci.3,addr=0x3,drive=drive-virtio-disk599,id=virtio-disk599 \ +-device virtio-blk-pci,bus=pci.3,addr=0x3,drive=drive-virtio-disk599,\ +id=virtio-disk599 \ -drive file=/var/lib/libvirt/images/disk-w-c.img,if=none,id=drive-virtio-disk600 \ --device virtio-blk-pci,bus=pci.3,addr=0x4,drive=drive-virtio-disk600,id=virtio-disk600 \ +-device virtio-blk-pci,bus=pci.3,addr=0x4,drive=drive-virtio-disk600,\ +id=virtio-disk600 \ -drive file=/var/lib/libvirt/images/disk-w-d.img,if=none,id=drive-virtio-disk601 \ --device virtio-blk-pci,bus=pci.3,addr=0x5,drive=drive-virtio-disk601,id=virtio-disk601 \ +-device virtio-blk-pci,bus=pci.3,addr=0x5,drive=drive-virtio-disk601,\ +id=virtio-disk601 \ -drive file=/var/lib/libvirt/images/disk-x-a.img,if=none,id=drive-virtio-disk624 \ --device virtio-blk-pci,bus=pci.3,addr=0x6,drive=drive-virtio-disk624,id=virtio-disk624 \ +-device virtio-blk-pci,bus=pci.3,addr=0x6,drive=drive-virtio-disk624,\ +id=virtio-disk624 \ -drive file=/var/lib/libvirt/images/disk-x-b.img,if=none,id=drive-virtio-disk625 \ --device virtio-blk-pci,bus=pci.3,addr=0x7,drive=drive-virtio-disk625,id=virtio-disk625 \ +-device virtio-blk-pci,bus=pci.3,addr=0x7,drive=drive-virtio-disk625,\ +id=virtio-disk625 \ -drive file=/var/lib/libvirt/images/disk-x-c.img,if=none,id=drive-virtio-disk626 \ --device virtio-blk-pci,bus=pci.3,addr=0x8,drive=drive-virtio-disk626,id=virtio-disk626 \ +-device virtio-blk-pci,bus=pci.3,addr=0x8,drive=drive-virtio-disk626,\ +id=virtio-disk626 \ -drive file=/var/lib/libvirt/images/disk-x-d.img,if=none,id=drive-virtio-disk627 \ --device virtio-blk-pci,bus=pci.3,addr=0x9,drive=drive-virtio-disk627,id=virtio-disk627 \ +-device virtio-blk-pci,bus=pci.3,addr=0x9,drive=drive-virtio-disk627,\ +id=virtio-disk627 \ -drive file=/var/lib/libvirt/images/disk-y-a.img,if=none,id=drive-virtio-disk650 \ --device virtio-blk-pci,bus=pci.3,addr=0xa,drive=drive-virtio-disk650,id=virtio-disk650 \ +-device virtio-blk-pci,bus=pci.3,addr=0xa,drive=drive-virtio-disk650,\ +id=virtio-disk650 \ -drive file=/var/lib/libvirt/images/disk-y-b.img,if=none,id=drive-virtio-disk651 \ --device virtio-blk-pci,bus=pci.3,addr=0xb,drive=drive-virtio-disk651,id=virtio-disk651 \ +-device virtio-blk-pci,bus=pci.3,addr=0xb,drive=drive-virtio-disk651,\ +id=virtio-disk651 \ -drive file=/var/lib/libvirt/images/disk-y-c.img,if=none,id=drive-virtio-disk652 \ --device virtio-blk-pci,bus=pci.3,addr=0xc,drive=drive-virtio-disk652,id=virtio-disk652 \ +-device virtio-blk-pci,bus=pci.3,addr=0xc,drive=drive-virtio-disk652,\ +id=virtio-disk652 \ -drive file=/var/lib/libvirt/images/disk-y-d.img,if=none,id=drive-virtio-disk653 \ --device virtio-blk-pci,bus=pci.3,addr=0xd,drive=drive-virtio-disk653,id=virtio-disk653 \ +-device virtio-blk-pci,bus=pci.3,addr=0xd,drive=drive-virtio-disk653,\ +id=virtio-disk653 \ -drive file=/var/lib/libvirt/images/disk-z-a.img,if=none,id=drive-virtio-disk676 \ --device virtio-blk-pci,bus=pci.3,addr=0xe,drive=drive-virtio-disk676,id=virtio-disk676 \ +-device virtio-blk-pci,bus=pci.3,addr=0xe,drive=drive-virtio-disk676,\ +id=virtio-disk676 \ -drive file=/var/lib/libvirt/images/disk-z-b.img,if=none,id=drive-virtio-disk677 \ --device virtio-blk-pci,bus=pci.3,addr=0xf,drive=drive-virtio-disk677,id=virtio-disk677 \ +-device virtio-blk-pci,bus=pci.3,addr=0xf,drive=drive-virtio-disk677,\ +id=virtio-disk677 \ -drive file=/var/lib/libvirt/images/disk-z-c.img,if=none,id=drive-virtio-disk678 \ --device virtio-blk-pci,bus=pci.3,addr=0x10,drive=drive-virtio-disk678,id=virtio-disk678 \ +-device virtio-blk-pci,bus=pci.3,addr=0x10,drive=drive-virtio-disk678,\ +id=virtio-disk678 \ -drive file=/var/lib/libvirt/images/disk-z-d.img,if=none,id=drive-virtio-disk679 \ --device virtio-blk-pci,bus=pci.3,addr=0x11,drive=drive-virtio-disk679,id=virtio-disk679 +-device virtio-blk-pci,bus=pci.3,addr=0x11,drive=drive-virtio-disk679,\ +id=virtio-disk679 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args index 0f33065425..d16e84cb69 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args @@ -1,63 +1,103 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/libexec/qemu-kvm \ --S -M pc-1.2 -m 2048 -smp 2 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -boot c \ --usb -drive file=/var/iso/f18kde.iso,if=none,media=cdrom,id=drive-ide0-1-0 \ +-S \ +-M pc-1.2 \ +-m 2048 \ +-smp 2 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot c \ +-usb \ +-drive file=/var/iso/f18kde.iso,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 \ -drive file=/var/lib/libvirt/images/test.img,if=none,id=drive-virtio-disk0 \ --device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0 \ +-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ +id=virtio-disk0 \ -drive file=/var/lib/libvirt/images/test1.img,if=none,id=drive-virtio-disk1 \ --device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ +id=virtio-disk1 \ -drive file=/var/lib/libvirt/images/disk-a-a.img,if=none,id=drive-virtio-disk26 \ --device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk26,id=virtio-disk26 \ +-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk26,\ +id=virtio-disk26 \ -drive file=/var/lib/libvirt/images/disk-a-b.img,if=none,id=drive-virtio-disk27 \ --device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk27,id=virtio-disk27 \ +-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk27,\ +id=virtio-disk27 \ -drive file=/var/lib/libvirt/images/disk-a-c.img,if=none,id=drive-virtio-disk28 \ --device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk28,id=virtio-disk28 \ +-device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk28,\ +id=virtio-disk28 \ -drive file=/var/lib/libvirt/images/disk-a-d.img,if=none,id=drive-virtio-disk29 \ --device virtio-blk-pci,bus=pci.0,addr=0x9,drive=drive-virtio-disk29,id=virtio-disk29 \ +-device virtio-blk-pci,bus=pci.0,addr=0x9,drive=drive-virtio-disk29,\ +id=virtio-disk29 \ -drive file=/var/lib/libvirt/images/disk-b-a.img,if=none,id=drive-virtio-disk52 \ --device virtio-blk-pci,bus=pci.0,addr=0xa,drive=drive-virtio-disk52,id=virtio-disk52 \ +-device virtio-blk-pci,bus=pci.0,addr=0xa,drive=drive-virtio-disk52,\ +id=virtio-disk52 \ -drive file=/var/lib/libvirt/images/disk-b-b.img,if=none,id=drive-virtio-disk53 \ --device virtio-blk-pci,bus=pci.0,addr=0xb,drive=drive-virtio-disk53,id=virtio-disk53 \ +-device virtio-blk-pci,bus=pci.0,addr=0xb,drive=drive-virtio-disk53,\ +id=virtio-disk53 \ -drive file=/var/lib/libvirt/images/disk-b-c.img,if=none,id=drive-virtio-disk54 \ --device virtio-blk-pci,bus=pci.0,addr=0xc,drive=drive-virtio-disk54,id=virtio-disk54 \ +-device virtio-blk-pci,bus=pci.0,addr=0xc,drive=drive-virtio-disk54,\ +id=virtio-disk54 \ -drive file=/var/lib/libvirt/images/disk-b-d.img,if=none,id=drive-virtio-disk55 \ --device virtio-blk-pci,bus=pci.0,addr=0xd,drive=drive-virtio-disk55,id=virtio-disk55 \ +-device virtio-blk-pci,bus=pci.0,addr=0xd,drive=drive-virtio-disk55,\ +id=virtio-disk55 \ -drive file=/var/lib/libvirt/images/disk-c-a.img,if=none,id=drive-virtio-disk78 \ --device virtio-blk-pci,bus=pci.0,addr=0xe,drive=drive-virtio-disk78,id=virtio-disk78 \ +-device virtio-blk-pci,bus=pci.0,addr=0xe,drive=drive-virtio-disk78,\ +id=virtio-disk78 \ -drive file=/var/lib/libvirt/images/disk-c-b.img,if=none,id=drive-virtio-disk79 \ --device virtio-blk-pci,bus=pci.0,addr=0xf,drive=drive-virtio-disk79,id=virtio-disk79 \ +-device virtio-blk-pci,bus=pci.0,addr=0xf,drive=drive-virtio-disk79,\ +id=virtio-disk79 \ -drive file=/var/lib/libvirt/images/disk-c-c.img,if=none,id=drive-virtio-disk80 \ --device virtio-blk-pci,bus=pci.0,addr=0x10,drive=drive-virtio-disk80,id=virtio-disk80 \ +-device virtio-blk-pci,bus=pci.0,addr=0x10,drive=drive-virtio-disk80,\ +id=virtio-disk80 \ -drive file=/var/lib/libvirt/images/disk-c-d.img,if=none,id=drive-virtio-disk81 \ --device virtio-blk-pci,bus=pci.0,addr=0x11,drive=drive-virtio-disk81,id=virtio-disk81 \ +-device virtio-blk-pci,bus=pci.0,addr=0x11,drive=drive-virtio-disk81,\ +id=virtio-disk81 \ -drive file=/var/lib/libvirt/images/disk-d-a.img,if=none,id=drive-virtio-disk104 \ --device virtio-blk-pci,bus=pci.0,addr=0x12,drive=drive-virtio-disk104,id=virtio-disk104 \ +-device virtio-blk-pci,bus=pci.0,addr=0x12,drive=drive-virtio-disk104,\ +id=virtio-disk104 \ -drive file=/var/lib/libvirt/images/disk-d-b.img,if=none,id=drive-virtio-disk105 \ --device virtio-blk-pci,bus=pci.0,addr=0x13,drive=drive-virtio-disk105,id=virtio-disk105 \ +-device virtio-blk-pci,bus=pci.0,addr=0x13,drive=drive-virtio-disk105,\ +id=virtio-disk105 \ -drive file=/var/lib/libvirt/images/disk-d-c.img,if=none,id=drive-virtio-disk106 \ --device virtio-blk-pci,bus=pci.0,addr=0x14,drive=drive-virtio-disk106,id=virtio-disk106 \ +-device virtio-blk-pci,bus=pci.0,addr=0x14,drive=drive-virtio-disk106,\ +id=virtio-disk106 \ -drive file=/var/lib/libvirt/images/disk-d-d.img,if=none,id=drive-virtio-disk107 \ --device virtio-blk-pci,bus=pci.0,addr=0x15,drive=drive-virtio-disk107,id=virtio-disk107 \ +-device virtio-blk-pci,bus=pci.0,addr=0x15,drive=drive-virtio-disk107,\ +id=virtio-disk107 \ -drive file=/var/lib/libvirt/images/disk-e-a.img,if=none,id=drive-virtio-disk130 \ --device virtio-blk-pci,bus=pci.0,addr=0x16,drive=drive-virtio-disk130,id=virtio-disk130 \ +-device virtio-blk-pci,bus=pci.0,addr=0x16,drive=drive-virtio-disk130,\ +id=virtio-disk130 \ -drive file=/var/lib/libvirt/images/disk-e-b.img,if=none,id=drive-virtio-disk131 \ --device virtio-blk-pci,bus=pci.0,addr=0x17,drive=drive-virtio-disk131,id=virtio-disk131 \ +-device virtio-blk-pci,bus=pci.0,addr=0x17,drive=drive-virtio-disk131,\ +id=virtio-disk131 \ -drive file=/var/lib/libvirt/images/disk-e-c.img,if=none,id=drive-virtio-disk132 \ --device virtio-blk-pci,bus=pci.0,addr=0x18,drive=drive-virtio-disk132,id=virtio-disk132 \ +-device virtio-blk-pci,bus=pci.0,addr=0x18,drive=drive-virtio-disk132,\ +id=virtio-disk132 \ -drive file=/var/lib/libvirt/images/disk-e-d.img,if=none,id=drive-virtio-disk133 \ --device virtio-blk-pci,bus=pci.0,addr=0x19,drive=drive-virtio-disk133,id=virtio-disk133 \ +-device virtio-blk-pci,bus=pci.0,addr=0x19,drive=drive-virtio-disk133,\ +id=virtio-disk133 \ -drive file=/var/lib/libvirt/images/disk-f-a.img,if=none,id=drive-virtio-disk156 \ --device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=drive-virtio-disk156,id=virtio-disk156 \ +-device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=drive-virtio-disk156,\ +id=virtio-disk156 \ -drive file=/var/lib/libvirt/images/disk-f-b.img,if=none,id=drive-virtio-disk157 \ --device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=drive-virtio-disk157,id=virtio-disk157 \ +-device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=drive-virtio-disk157,\ +id=virtio-disk157 \ -drive file=/var/lib/libvirt/images/disk-f-c.img,if=none,id=drive-virtio-disk158 \ --device virtio-blk-pci,bus=pci.0,addr=0x1c,drive=drive-virtio-disk158,id=virtio-disk158 \ +-device virtio-blk-pci,bus=pci.0,addr=0x1c,drive=drive-virtio-disk158,\ +id=virtio-disk158 \ -drive file=/var/lib/libvirt/images/disk-f-d.img,if=none,id=drive-virtio-disk159 \ --device virtio-blk-pci,bus=pci.0,addr=0x1d,drive=drive-virtio-disk159,id=virtio-disk159 \ +-device virtio-blk-pci,bus=pci.0,addr=0x1d,drive=drive-virtio-disk159,\ +id=virtio-disk159 \ -drive file=/var/lib/libvirt/images/disk-g-a.img,if=none,id=drive-virtio-disk182 \ --device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=drive-virtio-disk182,id=virtio-disk182 \ +-device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=drive-virtio-disk182,\ +id=virtio-disk182 \ -drive file=/var/lib/libvirt/images/disk-g-b.img,if=none,id=drive-virtio-disk183 \ --device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk183,id=virtio-disk183 \ +-device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk183,\ +id=virtio-disk183 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args index c850613f01..732403d2ca 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args @@ -1,12 +1,28 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest2 \ --device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x3,rombar=1 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest2 \ +-device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x3,\ +rombar=1 \ -net user,vlan=0,name=hostnet0 \ -device virtio-net-pci,vlan=1,id=net1,mac=52:54:00:24:a5:9e,bus=pci.0,addr=0x4,\ -romfile=/etc/fake/bootrom.bin -net user,vlan=1,name=hostnet1 \ +romfile=/etc/fake/bootrom.bin \ +-net user,vlan=1,name=hostnet1 \ -device pci-assign,host=06:12.5,id=hostdev0,bus=pci.0,addr=0x5,rombar=0 \ -device pci-assign,host=06:12.6,id=hostdev1,bus=pci.0,addr=0x6,rombar=1,\ romfile=/etc/fake/bootrom.bin \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args index 36cb067f0e..273f72c9bb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args @@ -1,7 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ --hda /dev/HostVG/QEMUGuest1 -chardev tty,id=charserial0,path=/dev/ttyS2 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev tty,id=charserial0,path=/dev/ttyS2 \ -device pci-serial,chardev=charserial0,id=serial0,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args index 5e4891c1cc..06de4d0b5e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args @@ -1,10 +1,25 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/libexec/qemu-kvm -S -M q35 -m 2048 -smp 2 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-kvm \ +-S \ +-M q35 \ +-m 2048 \ +-smp 2 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -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 ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \ -device ioh3420,port=0x1a,chassis=40,id=pci.4,bus=pcie.0,addr=0x3 \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \ -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ --vga qxl -global qxl-vga.ram_size=67108864 -global qxl-vga.vram_size=33554432 +-vga qxl \ +-global qxl-vga.ram_size=67108864 \ +-global qxl-vga.vram_size=33554432 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args index 48c21cd85f..c471a3d20e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args @@ -1,6 +1,18 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/libexec/qemu-kvm \ --S -M q35 -m 2048 -smp 2 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-S \ +-M q35 \ +-m 2048 \ +-smp 2 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -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 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args index fefefa25c3..76cc58d418 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args @@ -1,6 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/libexec/qemu-kvm -S -M q35 -m 2048 -smp 2 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-kvm \ +-S \ +-M q35 \ +-m 2048 \ +-smp 2 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -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 ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \ @@ -15,4 +28,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -device xio3130-downstream,port=0x6,chassis=12,id=pci.12,bus=pci.4,addr=0x6 \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \ -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ --vga qxl -global qxl-vga.ram_size=67108864 -global qxl-vga.vram_size=33554432 +-vga qxl \ +-global qxl-vga.ram_size=67108864 \ +-global qxl-vga.vram_size=33554432 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args index c08cd4a3c3..2d149aef4f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args @@ -1,6 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/libexec/qemu-kvm -S -M q35 -m 2048 -smp 2 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-kvm \ +-S \ +-M q35 \ +-m 2048 \ +-smp 2 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -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 ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \ @@ -9,4 +22,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -device x3130-upstream,id=pci.6,bus=pci.4,addr=0x0 \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \ -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ --vga qxl -global qxl-vga.ram_size=67108864 -global qxl-vga.vram_size=33554432 +-vga qxl \ +-global qxl-vga.ram_size=67108864 \ +-global qxl-vga.vram_size=33554432 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args index 0343354a45..696c9036fd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args @@ -1,4 +1,18 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/libexec/qemu-kvm -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 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-kvm \ +-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 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args index cd2cccab80..b9de927011 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args @@ -1,9 +1,24 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/libexec/qemu-kvm -S -M q35 -m 2048 -smp 2 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi \ --boot c -global q35-pcihost.pci-hole64-size=1048576K \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-kvm \ +-S \ +-M q35 \ +-m 2048 \ +-smp 2 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-global q35-pcihost.pci-hole64-size=1048576K \ -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 \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \ -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ --vga qxl -global qxl-vga.ram_size=67108864 -global qxl-vga.vram_size=33554432 +-vga qxl \ +-global qxl-vga.ram_size=67108864 \ +-global qxl-vga.vram_size=33554432 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args index 35fbf8fd15..2961ba702c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args @@ -1,5 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/libexec/qemu-kvm -S -M pc-1.2 -m 2048 -smp 2 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi \ --boot c -global i440FX-pcihost.pci-hole64-size=1048576K -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-kvm \ +-S \ +-M pc-1.2 \ +-m 2048 \ +-smp 2 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-global i440FX-pcihost.pci-hole64-size=1048576K \ +-usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args index 4f6fe4fcba..f8e10cae30 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args @@ -1,5 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --cpu qemu32,pmu=off -m 214 -smp 6 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-cpu qemu32,pmu=off \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot n \ +-usb \ +-net none \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args index f28b654095..5ea1909738 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args @@ -1,5 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --cpu qemu32,pmu=on -m 214 -smp 6 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-cpu qemu32,pmu=on \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot n \ +-usb \ +-net none \ +-serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args b/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args index 5d6dc45f11..ada24a9f1e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args @@ -1,6 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-ppc -S -M ppce500 -m 256 -smp 1 -nographic \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --kernel /media/ram/uImage -initrd /media/ram/ramdisk \ --append 'root=/dev/ram rw console=ttyS0,115200' -dtb /media/ram/test.dtb \ --usb -net none -serial pty -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-ppc \ +-S \ +-M ppce500 \ +-m 256 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-kernel /media/ram/uImage \ +-initrd /media/ram/ramdisk \ +-append 'root=/dev/ram rw console=ttyS0,115200' \ +-dtb /media/ram/test.dtb \ +-usb \ +-net none \ +-serial pty \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args b/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args index a23ae41c71..424a7b3c7d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args @@ -1,7 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-ppc -S -M ppce500 -m 256 -smp 1 -nographic -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-ppc \ +-S \ +-M ppce500 \ +-m 256 \ +-smp 1 \ +-nographic \ +-nodefaults \ -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ --mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \ --kernel /media/ram/uImage -initrd /media/ram/ramdisk \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-kernel /media/ram/uImage \ +-initrd /media/ram/ramdisk \ -append 'root=/dev/ram rw console=ttyS0,115200' \ --usb -serial pty -device virtio-balloon-pci,id=balloon0,bus=pci,addr=0x2 +-usb \ +-serial pty \ +-device virtio-balloon-pci,id=balloon0,bus=pci,addr=0x2 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args index 30e4b43a64..81e91e1088 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-ppc64 -S -M pseries -m 512 -smp 1 -nographic \ --nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-ppc64 \ +-S \ +-M pseries \ +-m 512 \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ -chardev pty,id=charserial0 \ -device spapr-vty,chardev=charserial0,reg=0x30000000 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args index 305e924381..b5185fbce8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args @@ -1,8 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -QEMU_AUDIO_DRV=none /usr/bin/qemu-system-ppc64 -S -M pseries \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-ppc64 \ +-S \ +-M pseries \ -cpu host,compat=power7 \ --m 256 -smp 4 -nographic -nodefconfig -nodefaults \ +-m 256 \ +-smp 4 \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ -chardev pty,id=charserial0 \ -device spapr-vty,chardev=charserial0,reg=0x30000000 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args index 992729442a..e26a036cbc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args @@ -1,7 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -QEMU_AUDIO_DRV=none /usr/bin/qemu-system-ppc64 -S -M pseries -cpu POWER7_v2.3 \ --m 512 -smp 1 -nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-ppc64 \ +-S \ +-M pseries \ +-cpu POWER7_v2.3 \ +-m 512 \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ -chardev pty,id=charserial0 \ -device spapr-vty,chardev=charserial0,reg=0x30000000 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args index f4f8d5e0bf..81e91e1088 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -QEMU_AUDIO_DRV=none /usr/bin/qemu-system-ppc64 -S -M pseries \ --m 512 -smp 1 -nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-ppc64 \ +-S \ +-M pseries \ +-m 512 \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ -chardev pty,id=charserial0 \ -device spapr-vty,chardev=charserial0,reg=0x30000000 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.args index 5fc0938c9f..6f3c267731 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.args @@ -1,5 +1,17 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ --S -M pseries -m 512 -smp 1 \ --no-acpi -boot c -usb \ --boot c -hda /dev/HostVG/QEMUGuest1 -cdrom /root/boot.iso +-S \ +-M pseries \ +-m 512 \ +-smp 1 \ +-no-acpi \ +-boot c \ +-usb \ +-boot c \ +-hda /dev/HostVG/QEMUGuest1 \ +-cdrom /root/boot.iso diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args index 7c6d610672..66660f7595 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args @@ -1,6 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ --S -M pseries -m 512 -smp 1 -nographic \ +-S \ +-M pseries \ +-m 512 \ +-smp 1 \ +-nographic \ -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -net none -serial none -parallel none \ +-no-acpi \ +-boot c \ +-usb \ +-net none \ +-serial none \ +-parallel none \ -global spapr-nvram.reg=0x4000 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args index 30e4b43a64..81e91e1088 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-ppc64 -S -M pseries -m 512 -smp 1 -nographic \ --nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-ppc64 \ +-S \ +-M pseries \ +-m 512 \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ -chardev pty,id=charserial0 \ -device spapr-vty,chardev=charserial0,reg=0x30000000 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args index 30e4b43a64..81e91e1088 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-ppc64 -S -M pseries -m 512 -smp 1 -nographic \ --nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-ppc64 \ +-S \ +-M pseries \ +-m 512 \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ -chardev pty,id=charserial0 \ -device spapr-vty,chardev=charserial0,reg=0x30000000 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args index eac7c56b9d..b3082aae1e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-ppc64 -S -M pseries -m 512 -smp 1 \ --nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-ppc64 \ +-S \ +-M pseries \ +-m 512 \ +-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 pci-ohci,id=usb,bus=pci,addr=0x1 -chardev pty,id=charserial0 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-device pci-ohci,id=usb,bus=pci,addr=0x1 \ +-chardev pty,id=charserial0 \ -device spapr-vty,chardev=charserial0,reg=0x30000000 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args index 373c72a95b..2e4c372962 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args @@ -1,8 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-ppc64 -S -M pseries -m 512 -smp 1 \ --nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-ppc64 \ +-S \ +-M pseries \ +-m 512 \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ -device pci-ohci,id=usb,bus=pci,addr=0x1 \ -chardev pty,id=charserial0 \ -device spapr-vty,chardev=charserial0,reg=0x30000000 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args index 88f3afda21..3752ca39d8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args @@ -1,8 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-ppc64 -S -M pseries -m 512 -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 piix3-usb-uhci,id=usb,bus=pci,addr=0x1 \ --device pci-ohci,id=usb1,bus=pci,addr=0x2 -chardev \ -pty,id=charserial0 -device spapr-vty,chardev=charserial0,reg=0x30000000 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-ppc64 \ +-S \ +-M pseries \ +-m 512 \ +-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 piix3-usb-uhci,id=usb,bus=pci,addr=0x1 \ +-device pci-ohci,id=usb1,bus=pci,addr=0x2 \ +-chardev pty,id=charserial0 \ +-device spapr-vty,chardev=charserial0,reg=0x30000000 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args index c62cc9a99b..e332520e46 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args @@ -1,13 +1,27 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ --S -M pseries -m 512 -smp 1 -nographic -nodefconfig -nodefaults \ +-S \ +-M pseries \ +-m 512 \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ -device spapr-vscsi,id=scsi0,reg=0x2000 \ -device spapr-vscsi,id=scsi1,reg=0x30000000 \ --usb -drive file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0-0 \ --device scsi-disk,bus=scsi1.0,channel=0,scsi-id=0,lun=0,\ -drive=drive-scsi1-0-0-0,id=scsi1-0-0-0 \ +-usb \ +-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0-0 \ +-device scsi-disk,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,\ +id=scsi1-0-0-0 \ -chardev pty,id=charserial0 \ -device spapr-vty,chardev=charserial0,reg=0x20000000 \ -chardev pty,id=charserial1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args index f7c3af0451..8ba3da77ef 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args @@ -1,13 +1,27 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ --S -M pseries -m 512 -smp 1 -nographic -nodefconfig -nodefaults \ +-S \ +-M pseries \ +-m 512 \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ -device spapr-vscsi,id=scsi0,reg=0x2000 \ -device spapr-vscsi,id=scsi1,reg=0x3000 \ --usb -drive file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0-0 \ --device scsi-disk,bus=scsi1.0,channel=0,scsi-id=0,lun=0,\ -drive=drive-scsi1-0-0-0,id=scsi1-0-0-0 \ +-usb \ +-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0-0 \ +-device scsi-disk,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,\ +id=scsi1-0-0-0 \ -chardev pty,id=charserial0 \ -device spapr-vty,chardev=charserial0,reg=0x30000000 \ -chardev pty,id=charserial1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args index 80047f9660..3a864201ef 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args @@ -1,5 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --cpu qemu32,-kvm_pv_unhalt -m 214 -smp 6 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial \ -none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-cpu qemu32,-kvm_pv_unhalt \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args index 70db1730c5..753f4d4cd5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args @@ -1,5 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --cpu qemu32,+kvm_pv_unhalt -m 214 -smp 6 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial \ -none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-cpu qemu32,+kvm_pv_unhalt \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot n \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-q35.args index e42022d4df..c9efffaaf2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35.args @@ -1,8 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/libexec/qemu-kvm -S -M q35 -m 2048 -smp 2 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-kvm \ +-S \ +-M q35 \ +-m 2048 \ +-smp 2 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ -device pci-bridge,chassis_nr=56,id=pci.2,bus=pci.1,addr=0x1 \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \ -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ --vga qxl -global qxl-vga.ram_size=67108864 -global qxl-vga.vram_size=33554432 +-vga qxl \ +-global qxl-vga.ram_size=67108864 \ +-global qxl-vga.vram_size=33554432 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args index 7606c1af5d..2fa8e3839b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \ -none -unknown parameter +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-unknown parameter diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args index 8d42a3295f..a208c80d95 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args @@ -1,5 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -NS=ns BAR='' /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -unknown \ -parameter +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +NS=ns \ +BAR='' \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-unknown parameter diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args index 394e9f9ef4..889858a566 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args @@ -1,4 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --m 214 -smp 6 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot order=n,reboot-timeout=-1 -usb -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot order=n,reboot-timeout=-1 \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args index 1bbd3aeb7f..b5d0453ee1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args @@ -1,4 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --m 214 -smp 6 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot order=n,reboot-timeout=128 -usb -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 6 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot order=n,reboot-timeout=128 \ +-usb \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args index 458c015d3b..7cd88641a1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 213 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \ -none -incoming stdio +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 213 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-incoming stdio diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args index 4999c32038..8778d5c56a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \ -none -incoming fd:7 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-incoming fd:7 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args index ade277c6f6..1d5de00357 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \ -none -incoming exec:cat +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-incoming exec:cat diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args index e939be45f4..4479d3370e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args @@ -1,10 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x -S -M s390-virtio -m 214 -smp 1 -nographic \ --nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-S \ +-M s390-virtio \ +-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 \ --device virtio-serial-s390,id=virtio-serial0 -drive \ -file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-device virtio-serial-s390,id=virtio-serial0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ -chardev pty,id=charconsole0 \ -device virtconsole,chardev=charconsole0,id=console0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args index 51fcfa652e..4479d3370e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args @@ -1,8 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x -S -M s390-virtio -m 214 -smp 1 \ --nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-S \ +-M s390-virtio \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ -device virtio-serial-s390,id=virtio-serial0 \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args index d8912340ae..ffb6c3ace4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args @@ -1,4 +1,21 @@ -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 \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +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 \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args index 8bef546466..ffb6c3ace4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial \ -none -parallel none +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args index e731d83fb9..ffb6c3ace4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ -hda /dev/HostVG/QEMUGuest1 \ --net none -serial none -parallel none +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args index 397df232e2..df3e9e09e3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args @@ -1,7 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ -hda /dev/HostVG/QEMUGuest1 \ --hdb /dev/HostVG/QEMUGuest2 -net none -serial \ -none -parallel none +-hdb /dev/HostVG/QEMUGuest2 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args index 8bef546466..ffb6c3ace4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial \ -none -parallel none +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args index 8bef546466..ffb6c3ace4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial \ -none -parallel none +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args index 8bef546466..ffb6c3ace4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial \ -none -parallel none +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args index e731d83fb9..ffb6c3ace4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ -hda /dev/HostVG/QEMUGuest1 \ --net none -serial none -parallel none +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args index dc5bc2b5d9..ffb6c3ace4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 \ --monitor unix:/tmp/test-monitor,\ -server,nowait -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \ -none -parallel none +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args index 1c34dc1255..ffb6c3ace4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /dev/HostVG/QEMUGuest1 -net none -serial \ -none -parallel none +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args index 9d5de02ae6..a7ebe3fca4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args @@ -1,7 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 -hda /dev/HostVG/QEMUGuest1 -chardev \ -tty,id=charserial0,path=/dev/ttyS2 -device isa-serial,chardev=charserial0,\ -id=serial0,iobase=0x3f8,irq=0x4 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev tty,id=charserial0,path=/dev/ttyS2 \ +-device isa-serial,chardev=charserial0,id=serial0,iobase=0x3f8,irq=0x4 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args index 45487df8e0..8383c6e0f1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args @@ -1,7 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 -hda /dev/HostVG/QEMUGuest1 -chardev \ -tty,id=charserial0,path=/dev/ttyS2 -device isa-serial,chardev=charserial0,\ -id=serial0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev tty,id=charserial0,path=/dev/ttyS2 \ +-device isa-serial,chardev=charserial0,id=serial0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args index 0eb67a84a8..f34e75a06d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial /dev/ttyS2 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial /dev/ttyS2 \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args index ff5aeda510..33830a9c1d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args @@ -1,8 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 -hda /dev/HostVG/QEMUGuest1 -chardev \ -file,id=charserial0,path=/tmp/serial.log -device isa-serial,\ -chardev=charserial0,id=serial0 -device virtio-balloon-pci,id=balloon0,\ -bus=pci.0,addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev file,id=charserial0,path=/tmp/serial.log \ +-device isa-serial,chardev=charserial0,id=serial0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args index 847c56f16f..bc1b2f6344 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \ -file:/tmp/serial.log -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial file:/tmp/serial.log \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args index 87304c35f8..99e1eceeba 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args @@ -1,9 +1,25 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 -hda /dev/HostVG/QEMUGuest1 -chardev \ -pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -chardev \ -file,id=charserial1,path=/tmp/serial.log -device isa-serial,\ -chardev=charserial1,id=serial1 -device virtio-balloon-pci,id=balloon0,\ -bus=pci.0,addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev pty,id=charserial0 \ +-device isa-serial,chardev=charserial0,id=serial0 \ +-chardev file,id=charserial1,path=/tmp/serial.log \ +-device isa-serial,chardev=charserial1,id=serial1 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args index d73091ba87..ef29c3b3a5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial pty -serial \ -file:/tmp/serial.log -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial pty \ +-serial file:/tmp/serial.log \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args index c97f1967d9..a849c3f6e0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args @@ -1,7 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 -hda /dev/HostVG/QEMUGuest1 -chardev \ -pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev pty,id=charserial0 \ +-device isa-serial,chardev=charserial0,id=serial0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args index a5a57d6d7e..9fa4cb834d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial pty -parallel \ -none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial pty \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args index 1e27394af5..ffb6c3ace4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +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 -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ --usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \ -none -parallel none +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args index a806d63cbc..b65acf687b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args @@ -1,13 +1,26 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=spice \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nodefconfig \ +-nodefaults \ -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline \ --no-acpi -boot c -usb \ +-no-acpi \ +-boot c \ +-usb \ -hda /dev/HostVG/QEMUGuest1 \ -chardev spiceport,id=charserial0,name=org.qemu.console.serial.0 \ -device isa-serial,chardev=charserial0,id=serial0 \ -device usb-tablet,id=input0 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice \ --device \ -qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \ +-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,\ +addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args index 37856821d5..dcb04b23a3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args @@ -1,8 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 -hda /dev/HostVG/QEMUGuest1 -chardev \ -socket,id=charserial0,host=127.0.0.1,port=9999 -device isa-serial,\ -chardev=charserial0,id=serial0 -device virtio-balloon-pci,id=balloon0,\ -bus=pci.0,addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev socket,id=charserial0,host=127.0.0.1,port=9999 \ +-device isa-serial,chardev=charserial0,id=serial0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args index 80613442a1..ab1a87b1a2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args @@ -1,8 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 -hda /dev/HostVG/QEMUGuest1 -chardev \ -socket,id=charserial0,host=127.0.0.1,port=9999,telnet,server,nowait -device \ -isa-serial,chardev=charserial0,id=serial0 -device virtio-balloon-pci,\ -id=balloon0,bus=pci.0,addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev socket,id=charserial0,host=127.0.0.1,port=9999,telnet,server,nowait \ +-device isa-serial,chardev=charserial0,id=serial0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args index b23df344be..3c751d7e79 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \ -telnet:127.0.0.1:9999,server,nowait -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial telnet:127.0.0.1:9999,server,nowait \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args index 747c850b87..75ed31d254 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \ -tcp:127.0.0.1:9999 -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial tcp:127.0.0.1:9999 \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args index c1539a98c4..75ce9122a2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args @@ -1,10 +1,26 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 -hda /dev/HostVG/QEMUGuest1 -chardev \ -udp,id=charserial0,host=127.0.0.1,port=9998,localaddr=127.0.0.1,localport=9999 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev udp,id=charserial0,host=127.0.0.1,port=9998,localaddr=127.0.0.1,\ +localport=9999 \ -device isa-serial,chardev=charserial0,id=serial0 \ -chardev udp,id=charserial1,host=,port=9999,localaddr=,localport=0 \ --device isa-serial,chardev=charserial1,id=serial1 -device \ -virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +-device isa-serial,chardev=charserial1,id=serial1 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args index cd61fa536d..df355c7ea6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \ -udp:127.0.0.1:9998@127.0.0.1:9999 -serial udp::9999@:0 -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial udp:127.0.0.1:9998@127.0.0.1:9999 \ +-serial udp::9999@:0 \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args index 7634f424bb..d1cb5433b2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args @@ -1,8 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 -hda /dev/HostVG/QEMUGuest1 -chardev \ -socket,id=charserial0,path=/tmp/serial.sock -device isa-serial,\ -chardev=charserial0,id=serial0 -device virtio-balloon-pci,id=balloon0,\ -bus=pci.0,addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev socket,id=charserial0,path=/tmp/serial.sock \ +-device isa-serial,chardev=charserial0,id=serial0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args index 512dead436..7ea3e6a2ae 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial \ -unix:/tmp/serial.sock -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial unix:/tmp/serial.sock \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args index a075627386..6dbca3ee27 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args @@ -1,7 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 -hda /dev/HostVG/QEMUGuest1 -chardev \ -vc,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-hda /dev/HostVG/QEMUGuest1 \ +-chardev vc,id=charserial0 \ +-device isa-serial,chardev=charserial0,id=serial0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args index afb01770b4..324df17756 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial vc -parallel \ -none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial vc \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem.args b/tests/qemuxml2argvdata/qemuxml2argv-shmem.args index 08cd5ac458..fb1f3024e8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-shmem.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-shmem.args @@ -1,6 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ -device ivshmem,shm=shmem0,id=shmem0,bus=pci.0,addr=0x3 \ -device ivshmem,size=128m,shm=shmem1,id=shmem1,bus=pci.0,addr=0x5 \ -device ivshmem,size=256m,shm=shmem2,id=shmem2,bus=pci.0,addr=0x4 \ @@ -8,12 +22,12 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -chardev socket,id=charshmem3,path=/var/lib/libvirt/shmem-shmem3-sock \ -device ivshmem,size=1024m,chardev=charshmem4,id=shmem4,bus=pci.0,addr=0x7 \ -chardev socket,id=charshmem4,path=/tmp/shmem4-sock \ --device ivshmem,size=2048m,chardev=charshmem5,id=shmem5,\ -msi=on,ioeventfd=off,bus=pci.0,addr=0x8 \ +-device ivshmem,size=2048m,chardev=charshmem5,id=shmem5,msi=on,ioeventfd=off,\ +bus=pci.0,addr=0x8 \ -chardev socket,id=charshmem5,path=/tmp/shmem5-sock \ --device ivshmem,size=4096m,chardev=charshmem6,id=shmem6,\ -msi=on,vectors=16,bus=pci.0,addr=0x9 \ +-device ivshmem,size=4096m,chardev=charshmem6,id=shmem6,msi=on,vectors=16,\ +bus=pci.0,addr=0x9 \ -chardev socket,id=charshmem6,path=/tmp/shmem6-sock \ --device ivshmem,size=8192m,chardev=charshmem7,id=shmem7,\ -msi=on,vectors=32,ioeventfd=on,bus=pci.0,addr=0xa \ +-device ivshmem,size=8192m,chardev=charshmem7,id=shmem7,msi=on,vectors=32,\ +ioeventfd=on,bus=pci.0,addr=0xa \ -chardev socket,id=charshmem7,path=/tmp/shmem7-sock diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args index 5e5886755b..a5be66954a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args @@ -1,8 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 \ -usb-ccid,id=ccid0 -usb -device \ -ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 usb-ccid,id=ccid0 \ +-usb \ +-device ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args index 33d3b0810a..b699d236aa 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args @@ -1,9 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 \ -usb-ccid,id=ccid0 -usb -device \ -ccid-card-emulated,backend=certificates,cert1=cert1,cert2=cert2,cert3=cert3\ -,db=/etc/pki/nssdb,id=smartcard0,bus=ccid0.0 -device \ -virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 usb-ccid,id=ccid0 \ +-usb \ +-device ccid-card-emulated,backend=certificates,cert1=cert1,cert2=cert2,\ +cert3=cert3,db=/etc/pki/nssdb,id=smartcard0,bus=ccid0.0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args index 5e5886755b..a5be66954a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args @@ -1,8 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 \ -usb-ccid,id=ccid0 -usb -device \ -ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 usb-ccid,id=ccid0 \ +-usb \ +-device ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args index eed319c4d0..90d14e94a6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args @@ -1,8 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 \ -usb-ccid,id=ccid0 -usb -chardev spicevmc,id=charsmartcard0,name=smartcard \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 usb-ccid,id=ccid0 \ +-usb \ +-chardev spicevmc,id=charsmartcard0,name=smartcard \ -device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args index c35097789a..962c682b73 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args @@ -1,9 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -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 \ -usb-ccid,id=ccid0 -usb -chardev \ -socket,id=charsmartcard0,host=127.0.0.1,port=2001,server,nowait \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 usb-ccid,id=ccid0 \ +-usb \ +-chardev socket,id=charsmartcard0,host=127.0.0.1,port=2001,server,nowait \ -device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args index 209cf2089c..5c5d9c1011 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args @@ -1,10 +1,26 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -smbios 'type=0,vendor=LENOVO,version=6FET82WW (3.12 )' \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-smbios 'type=0,vendor=LENOVO,version=6FET82WW (3.12 )' \ -smbios 'type=1,manufacturer=Fedora,product=Virt-Manager,version=0.8.2-3.fc14,\ serial=32dfcb37-5af1-552b-357c-be8c3aa38310,\ uuid=c7a5fdbd-edaf-9455-926a-d65c16db1809,sku=1234567890,family=Red Hat' \ -smbios 'type=2,manufacturer=Hewlett-Packard,product=0B4Ch,version=D,\ serial=CZC1065993,asset=CZC1065993,location=Upside down' \ --nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smp.args b/tests/qemuxml2argvdata/qemuxml2argv-smp.args index c7727fccf6..2c849c002f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smp.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smp.args @@ -1,5 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1,maxcpus=2,sockets=2,cores=1,threads=1 -nographic -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1,maxcpus=2,sockets=2,cores=1,threads=1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args index 3e2b293cd3..0bf0fd4e7b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args @@ -1,16 +1,33 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -soundhw pcspk -device ES1370,id=sound1,bus=pci.0,\ -addr=0x3 -device sb16,id=sound2 -device AC97,id=sound3,bus=pci.0,addr=0x4 \ --device intel-hda,id=sound4,bus=pci.0,addr=0x5 -device hda-duplex,\ -id=sound4-codec0,bus=sound4.0,cad=0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-soundhw pcspk \ +-device ES1370,id=sound1,bus=pci.0,addr=0x3 \ +-device sb16,id=sound2 \ +-device AC97,id=sound3,bus=pci.0,addr=0x4 \ +-device intel-hda,id=sound4,bus=pci.0,addr=0x5 \ +-device hda-duplex,id=sound4-codec0,bus=sound4.0,cad=0 \ -device intel-hda,id=sound5,bus=pci.0,addr=0x6 \ -device hda-micro,id=sound5-codec0,bus=sound5.0,cad=0 \ -device hda-duplex,id=sound5-codec1,bus=sound5.0,cad=1 \ --device ich9-intel-hda,id=sound6,bus=pci.0,addr=0x7 -device hda-duplex,\ -id=sound6-codec0,bus=sound6.0,cad=0 \ +-device ich9-intel-hda,id=sound6,bus=pci.0,addr=0x7 \ +-device hda-duplex,id=sound6-codec0,bus=sound6.0,cad=0 \ -device ich9-intel-hda,id=sound7,bus=pci.0,addr=0x8 \ -device hda-micro,id=sound7-codec0,bus=sound7.0,cad=0 \ -device hda-duplex,id=sound7-codec1,bus=sound7.0,cad=1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.args b/tests/qemuxml2argvdata/qemuxml2argv-sound.args index 1aa74869c5..b5ce69c427 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \ -none -soundhw pcspk,es1370,sb16,ac97 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-soundhw pcspk,es1370,sb16,ac97 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args index fe2d4e4211..323eeb61c2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args @@ -1,6 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc-0.12 -m 2048 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc-0.12 \ +-m 2048 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-boot c \ +-usb \ -tpmdev passthrough,id=tpm-tpm0,path=/dev/tpm0,\ cancel-path=/sys/class/misc/tpm0/device/cancel \ -device tpm-tis,tpmdev=tpm-tpm0,id=tpm0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args index 2fd8513420..482da72fdc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args @@ -1,6 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args index 3768dfa9e2..37e43846f1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ -device usb-hub,id=hub0,bus=usb.0,port=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args index 9f97df16f5..fb79c57e08 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args @@ -1,10 +1,24 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ -device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x4.0x7 \ --device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \ +-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,\ +addr=0x4 \ -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \ -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args index d66d89ef37..eb26548c69 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args @@ -1,18 +1,34 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ -device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x3.0x7 \ --device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x3 \ +-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,\ +addr=0x3 \ -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x3.0x2 \ -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x3.0x1 \ -device ich9-usb-ehci1,id=usb1,bus=pci.0,addr=0x4.0x7 \ --device ich9-usb-uhci1,masterbus=usb1.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \ +-device ich9-usb-uhci1,masterbus=usb1.0,firstport=0,bus=pci.0,multifunction=on,\ +addr=0x4 \ -device ich9-usb-uhci3,masterbus=usb1.0,firstport=4,bus=pci.0,addr=0x4.0x2 \ -device ich9-usb-uhci2,masterbus=usb1.0,firstport=2,bus=pci.0,addr=0x4.0x1 \ -device ich9-usb-ehci1,id=usb2,bus=pci.0,addr=0x5.0x7 \ --device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.0,multifunction=on,addr=0x5 \ +-device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.0,multifunction=on,\ +addr=0x5 \ -device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.0,addr=0x5.0x2 \ -device ich9-usb-uhci2,masterbus=usb2.0,firstport=2,bus=pci.0,addr=0x5.0x1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args index 9ce8d31468..77c6b92781 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args @@ -1,6 +1,19 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args index ae836503c0..c3fadd78c0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args @@ -1,7 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args index 5d538485dc..0464ed0325 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args @@ -1,8 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ -device usb-hub,id=hub0,bus=usb.0,port=1 \ -device usb-hub,id=hub1,bus=usb.0,port=1.2 \ -device usb-mouse,id=input0,bus=usb.0,port=1.1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args index eadfdab1cb..f7336fa982 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args @@ -1,10 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc \ --m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ -device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x4.0x7 \ --device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \ +-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,\ +addr=0x4 \ -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \ -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \ -chardev socket,id=charredir0,host=localhost,port=4000 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args index 463e9ded2c..50418c3bc6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args @@ -1,14 +1,28 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 -chardev spicevmc,id=charredir0,name=usbredir \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ +-chardev spicevmc,id=charredir0,name=usbredir \ -device 'usb-redir,chardev=charredir0,id=redir0,\ -filter=0x08:0x15E1:0x2007:0x0109:1|0x08:0x15E1:0x2007:0x0940:1|\ --1:-1:-1:-1:0,bus=usb.0,port=4' \ +filter=0x08:0x15E1:0x2007:0x0109:1|0x08:0x15E1:0x2007:0x0940:1|-1:-1:-1:-1:0,\ +bus=usb.0,port=4' \ -chardev spicevmc,id=charredir1,name=usbredir \ -device 'usb-redir,chardev=charredir1,id=redir1,\ -filter=0x08:0x15E1:0x2007:0x0109:1|0x08:0x15E1:0x2007:0x0940:1|\ --1:-1:-1:-1:0,bus=usb.0,port=5' \ +filter=0x08:0x15E1:0x2007:0x0109:1|0x08:0x15E1:0x2007:0x0940:1|-1:-1:-1:-1:0,\ +bus=usb.0,port=5' \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args index a672e7cb85..e874e4638a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args @@ -1,11 +1,24 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ -device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x4.0x7 \ --device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,\ -multifunction=on,addr=0x4 \ +-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,\ +addr=0x4 \ -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \ -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \ -chardev spicevmc,id=charredir0,name=usbredir \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args index 46e83b98a1..0315b2c7b7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args @@ -1,11 +1,24 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ -device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x4.0x7 \ --device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,\ -multifunction=on,addr=0x4 \ +-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,\ +addr=0x4 \ -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \ -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \ -chardev socket,id=charredir0,host=localhost,port=4000 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args b/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args index e8efba8244..d6777066e8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args @@ -1,15 +1,30 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-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 \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -device ich9-usb-ehci1,id=usb1,bus=pci.0,addr=0x4.0x7 \ --device ich9-usb-uhci1,masterbus=usb1.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \ +-device ich9-usb-uhci1,masterbus=usb1.0,firstport=0,bus=pci.0,multifunction=on,\ +addr=0x4 \ -device ich9-usb-uhci2,masterbus=usb1.0,firstport=2,bus=pci.0,addr=0x4.0x1 \ -device ich9-usb-uhci3,masterbus=usb1.0,firstport=4,bus=pci.0,addr=0x4.0x2 \ -device ich9-usb-ehci1,id=usb2,bus=pci.0,addr=0x5.0x7 \ --device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.0,multifunction=on,addr=0x5 \ +-device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.0,multifunction=on,\ +addr=0x5 \ -device ich9-usb-uhci2,masterbus=usb2.0,firstport=2,bus=pci.0,addr=0x5.0x1 \ -device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.0,addr=0x5.0x2 \ -device usb-hub,id=hub0,bus=usb1.0,port=1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args index 4abd7c2225..d62ef95d47 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args @@ -1,9 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc-0.15 -m 1024 -smp 1 -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc-0.15 \ +-m 1024 \ +-smp 1 \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ -usb \ --hda /var/lib/libvirt/images/QEMUGuest1 -vnc 127.0.0.1:-5900 \ --device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x3 \ +-hda /var/lib/libvirt/images/QEMUGuest1 \ +-vnc 127.0.0.1:-5900 \ +-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,\ +addr=0x3 \ -device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \ -device qxl,id=video2,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x5 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args index 92e343fa0f..e0642e6a86 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 1024 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ -hda /var/lib/libvirt/images/QEMUGuest1 \ --device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=16\ -,bus=pci.0,addr=0x2 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=16,\ +bus=pci.0,addr=0x2 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args index c9eb53578b..6250cb5a41 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args @@ -1,6 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 1024 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ -hda /var/lib/libvirt/images/QEMUGuest1 \ --device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0\ -,addr=0x2 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,\ +addr=0x2 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args index a6ac6d8fe3..14df37ae9d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 1024 -smp 1 -nographic \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /var/lib/libvirt/images/QEMUGuest1 -net none -serial none -parallel none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 1024 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /var/lib/libvirt/images/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ -vga qxl diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args index 51fc5246fb..3dd55bce89 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args @@ -1,8 +1,23 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 1024 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ -hda /var/lib/libvirt/images/QEMUGuest1 \ --device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=16\ -,bus=pci.0,addr=0x2 -device qxl,id=video1,ram_size=67108864,vram_size=67108864\ -,vgamem_mb=16,bus=pci.0,addr=0x4 \ +-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=16,\ +bus=pci.0,addr=0x2 \ +-device qxl,id=video1,ram_size=67108864,vram_size=67108864,vgamem_mb=16,\ +bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args index 208408e5ee..388c346560 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args @@ -1,7 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 1024 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ -hda /var/lib/libvirt/images/QEMUGuest1 \ --device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0\ -,addr=0x2 -device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0\ -,addr=0x4 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,\ +addr=0x2 \ +-device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args index 81e4aec937..0c343939b4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args @@ -1,6 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 1024 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ -hda /var/lib/libvirt/images/QEMUGuest1 \ -device VGA,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args index f822280108..58a2107d45 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args @@ -1,6 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 1024 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ -hda /var/lib/libvirt/images/QEMUGuest1 \ -device VGA,id=video0,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args index 7b5f15149a..c0f92740c2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args @@ -1,5 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 1024 -smp 1 -nographic \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ --hda /var/lib/libvirt/images/QEMUGuest1 -net none -serial none -parallel none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 1024 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /var/lib/libvirt/images/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ -vga std diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args index 8e5eb50053..5b879cb47d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args @@ -1,13 +1,28 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi \ --boot dc -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ --usb -drive file=/dev/sdfake,if=none,id=drive-virtio-disk0 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc-0.13 \ +-m 1024 \ +-smp 1 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot dc \ +-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ +-usb \ +-drive file=/dev/sdfake,if=none,id=drive-virtio-disk0 \ -device virtio-blk-pci,scsi=on,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ id=virtio-disk0 \ -drive file=/dev/sdfake2,if=none,id=drive-virtio-disk1 \ -device virtio-blk-pci,scsi=on,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,\ id=virtio-disk1 \ -device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \ --net user,vlan=0,name=hostnet0 -serial pty \ +-net user,vlan=0,name=hostnet0 \ +-serial pty \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args index 3a04ed15bc..2823c119e4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args @@ -1,12 +1,24 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -s390-ccw -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 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M s390-ccw \ +-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 \ -device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0001 \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ --device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\ -id=virtio-disk0,bootindex=1 \ +-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,\ +bootindex=1 \ -chardev pty,id=charconsole0 \ -device virtconsole,chardev=charconsole0,id=console0 \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args index 84aa5cdb10..42a8eeab5c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args @@ -1,7 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ --S -M pc -m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-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 \ -object rng-random,id=objrng0,filename=/dev/random \ -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x7 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args index c6d8e2b3b4..9ed0b033c5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args @@ -1,7 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-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 \ -chardev socket,id=charrng0,host=1.2.3.4,port=1234 \ -object rng-egd,id=objrng0,chardev=charrng0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args index 7fdf1ef568..d582cfe37f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args @@ -1,7 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S \ --M pc -m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-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 \ -object rng-random,id=objrng0,filename=/dev/random \ -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x7 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args index 7fca0987b6..19e9694f91 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args @@ -1,7 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ --S -M pc -m 214 -smp 1 -nographic -nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-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 \ -object rng-random,id=objrng0,filename=/dev/hwrng \ --device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=123,period=1234,bus=pci.0,addr=0x4 +-device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=123,period=1234,bus=pci.0,\ +addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args index f41652598b..6c74805b73 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args @@ -1,6 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ -unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -device ib700,id=watchdog0 -watchdog-action \ -poweroff -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-device ib700,id=watchdog0 \ +-watchdog-action poweroff \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args index 56d74e5229..d9b7e1d269 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args @@ -1,8 +1,21 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -s390-virtio -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 \ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M s390-virtio \ +-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 \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ --device diag288,id=watchdog0 -watchdog-action inject-nmi +-device diag288,id=watchdog0 \ +-watchdog-action inject-nmi diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args index a4817e7c49..740fc58d5e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args @@ -1,5 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \ -none -watchdog ib700 -watchdog-action pause +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-watchdog ib700 \ +-watchdog-action pause diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args index 0f60512ca9..8184206aef 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args @@ -1,5 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \ -none -watchdog ib700 -watchdog-action inject-nmi +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-watchdog ib700 \ +-watchdog-action inject-nmi diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args index 91290bbff8..277195d3d8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args @@ -1,5 +1,22 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M \ -pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel \ -none -watchdog ib700 -watchdog-action poweroff +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none \ +-watchdog ib700 \ +-watchdog-action poweroff diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args index dac865140a..5284d379ef 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args @@ -1,4 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ -unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none ARGUMENT +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none ARGUMENT diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args index dac865140a..5284d379ef 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args @@ -1,4 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ -unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none ARGUMENT +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none ARGUMENT diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args index dac865140a..5284d379ef 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args @@ -1,4 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ -unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none ARGUMENT +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none ARGUMENT diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args index dac865140a..5284d379ef 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args @@ -1,4 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ -unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none ARGUMENT +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none ARGUMENT diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args index dac865140a..5284d379ef 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args @@ -1,4 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ -unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none ARGUMENT +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none ARGUMENT diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args index dac865140a..5284d379ef 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args @@ -1,4 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ -unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none ARGUMENT +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none ARGUMENT diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args index ce2bf40978..ca1bd041d2 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args @@ -1,4 +1,20 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \ -unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait -no-acpi -boot c -usb -hda \ -/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-nographic \ +-monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-hda /dev/HostVG/QEMUGuest1 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/test-wrap-argv.pl b/tests/test-wrap-argv.pl new file mode 100644 index 0000000000..a81cf439a8 --- /dev/null +++ b/tests/test-wrap-argv.pl @@ -0,0 +1,128 @@ +#!/usr/bin/perl +# +# Copyright (C) 2015 Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see +# . +# +# This script is intended to be passed a list of .args files, used +# to store command line ARGV for the test suites. It will reformat +# them such that there is at most one '-param value' on each line +# of the file. Parameter values that are longer than 80 chars will +# also be split. +# + + +foreach my $file (@ARGV) { + &rewrap($file); +} + +sub rewrap { + my $file = shift; + + # Read the original file + open FILE, "<", $file or die "cannot read $file: $!"; + my @lines; + while () { + # If there is a trailing '\' then kill the new line + if (/\\$/) { + chomp; + $_ =~ s/\\$//; + } + + push @lines, $_; + } + + # Skip empty files + return unless @lines; + + # Kill the last new line in the file + chomp @lines[$#lines]; + close FILE; + + # Reconstruct the master data by joining all lines + # and then split again based on the real desired + # newlines + @lines = split /\n/, join('', @lines); + + # Now each @lines represents a single command, we + # can process them + foreach my $line (@lines) { + my @bits = split / /, join('', $line); + + # @bits contains env vars, then the command line + # and then the arguments + my @env; + my $cmd; + my @args; + + if ($bits[0] !~ /=/) { + $cmd = shift @bits; + } + + foreach my $bit (@bits) { + # If no command is defined yet, we must still + # have env vars + if (!defined $cmd) { + # Look for leading / to indicate command name + if ($bit =~ m,^/,) { + $cmd = $bit; + } else { + push @env, $bit; + } + } else { + # If there's a leading '-' then this is a new + # parameter, otherwise its a value for the prev + # parameter. + if ($bit =~ m,^-,) { + push @args, $bit; + } else { + $args[$#args] .= " " . $bit; + } + } + } + + # Print env + command first + print join(" \\\n", @env, $cmd), " \\\n"; + # We might have to split line argument values... + for (my $i = 0; $i <= $#args; $i++) { + my $arg = $args[$i]; + while (length($arg) > 80) { + my $split = rindex $arg, ",", 80; + if ($split == -1) { + $split = rindex $arg, ":", 80; + } + if ($split == -1) { + $split = rindex $arg, " ", 80; + } + if ($split == -1) { + warn "$file: cannot find nice place to split '$arg' below 80 chars\n"; + $split = 79; + } + $split++; + + my $head = substr $arg, 0, $split; + $arg = substr $arg, $split; + + print $head, "\\\n"; + } + print $arg; + if ($i != $#args) { + print " \\\n"; + } else { + print "\n"; + } + } + } +}