diff --git a/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd b/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd index ff5d635f..414d222e 100644 --- a/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd +++ b/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd @@ -21,8 +21,8 @@ -numa 'node,nodeid=0,cpus=0,memdev=ram-node0' \ -object 'memory-backend-ram,id=ram-node1,size=256M' \ -numa 'node,nodeid=1,cpus=1,memdev=ram-node1' \ - -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ + -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ diff --git a/test/cfg2cmd/spice-usb3.conf.cmd b/test/cfg2cmd/spice-usb3.conf.cmd index 680fa649..627c0777 100644 --- a/test/cfg2cmd/spice-usb3.conf.cmd +++ b/test/cfg2cmd/spice-usb3.conf.cmd @@ -14,18 +14,18 @@ -vnc unix:/var/run/qemu-server/8006.vnc,password \ -cpu kvm64,+lahf_lm,+sep,+kvm_pv_unhalt,+kvm_pv_eoi,enforce \ -m 768 \ - -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ + -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ -device 'vmgenid,guid=c773c261-d800-4348-9f5d-167fadd53cf8' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'nec-usb-xhci,id=xhci,bus=pci.1,addr=0x1b' \ -chardev 'spicevmc,id=usbredirchardev1,name=usbredir' \ -device 'usb-redir,chardev=usbredirchardev1,id=usbredirdev1,bus=xhci.0' \ -device 'qxl-vga,id=vga,bus=pci.0,addr=0x2' \ - -spice 'tls-port=61000,addr=127.0.0.1,tls-ciphers=HIGH,seamless-migration=on' \ -device 'virtio-serial,id=spice,bus=pci.0,addr=0x9' \ -chardev 'spicevmc,id=vdagent,name=vdagent' \ -device 'virtserialport,chardev=vdagent,name=com.redhat.spice.0' \ + -spice 'tls-port=61000,addr=127.0.0.1,tls-ciphers=HIGH,seamless-migration=on' \ -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3' \ -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ -netdev 'type=tap,id=net0,ifname=tap8006i0,script=/var/lib/qemu-server/pve-bridge,downscript=/var/lib/qemu-server/pve-bridgedown,vhost=on' \ diff --git a/test/run_config2command_tests.pl b/test/run_config2command_tests.pl index 6f2fe28a..9b0b3bb3 100755 --- a/test/run_config2command_tests.pl +++ b/test/run_config2command_tests.pl @@ -203,8 +203,8 @@ sub do_test($) { if (-f $cmd_fn) { my $cmdline_expected = file_get_contents($cmd_fn); - my $cmd_expected = [ sort split /\s*\\?\n\s*/, $cmdline_expected ]; - my $cmd = [ sort split /\s*\\?\n\s*/, $cmdline ]; + my $cmd_expected = [ split /\s*\\?\n\s*/, $cmdline_expected ]; + my $cmd = [ split /\s*\\?\n\s*/, $cmdline ]; # comment out for easier debugging #file_set_contents("$cmd_fn.tmp", $cmdline);