On 9/30/19 12:58 PM, Stefan Reiter wrote: > The new flag resolving outputs flags in sorted order for consistency, > adapt the test cases to not break. > > Only the order is changed, not which flags are present.
I'd like to have this change paired with the commit which triggers it, to not break building/tests in between. > > Signed-off-by: Stefan Reiter <s.rei...@proxmox.com> > --- > test/cfg2cmd/i440fx-win10-hostpci.conf.cmd | 2 +- > test/cfg2cmd/minimal-defaults.conf.cmd | 2 +- > test/cfg2cmd/q35-linux-hostpci.conf.cmd | 2 +- > test/cfg2cmd/q35-win10-hostpci.conf.cmd | 2 +- > test/cfg2cmd/simple1.conf.cmd | 2 +- > test/cfg2cmd/spice-usb3.conf.cmd | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd > b/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd > index ff5d635..2a9174d 100644 > --- a/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd > +++ b/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd > @@ -15,7 +15,7 @@ > -boot > 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' > \ > -vnc unix:/var/run/qemu-server/8006.vnc,password \ > -no-hpet \ > - -cpu > 'kvm64,+lahf_lm,+sep,+kvm_pv_unhalt,+kvm_pv_eoi,hv_spinlocks=0x1fff,hv_vapic,hv_time,hv_reset,hv_vpindex,hv_runtime,hv_relaxed,hv_synic,hv_stimer,hv_ipi,enforce' > \ > + -cpu > 'kvm64,enforce,hv_ipi,hv_relaxed,hv_reset,hv_runtime,hv_spinlocks=0x1fff,hv_stimer,hv_synic,hv_time,hv_vapic,hv_vpindex,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep' > \ > -m 512 \ > -object 'memory-backend-ram,id=ram-node0,size=256M' \ > -numa 'node,nodeid=0,cpus=0,memdev=ram-node0' \ > diff --git a/test/cfg2cmd/minimal-defaults.conf.cmd > b/test/cfg2cmd/minimal-defaults.conf.cmd > index 5abebe9..444050b 100644 > --- a/test/cfg2cmd/minimal-defaults.conf.cmd > +++ b/test/cfg2cmd/minimal-defaults.conf.cmd > @@ -12,7 +12,7 @@ > -nodefaults \ > -boot > 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' > \ > -vnc unix:/var/run/qemu-server/8006.vnc,password \ > - -cpu kvm64,+lahf_lm,+sep,+kvm_pv_unhalt,+kvm_pv_eoi,enforce \ > + -cpu kvm64,enforce,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep \ > -m 512 \ > -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' \ > diff --git a/test/cfg2cmd/q35-linux-hostpci.conf.cmd > b/test/cfg2cmd/q35-linux-hostpci.conf.cmd > index 21fb18b..2072295 100644 > --- a/test/cfg2cmd/q35-linux-hostpci.conf.cmd > +++ b/test/cfg2cmd/q35-linux-hostpci.conf.cmd > @@ -14,7 +14,7 @@ > -nodefaults \ > -boot > 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' > \ > -vnc unix:/var/run/qemu-server/8006.vnc,password \ > - -cpu kvm64,+lahf_lm,+sep,+kvm_pv_unhalt,+kvm_pv_eoi,enforce \ > + -cpu kvm64,enforce,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep \ > -m 512 \ > -object 'memory-backend-ram,id=ram-node0,size=256M' \ > -numa 'node,nodeid=0,cpus=0,memdev=ram-node0' \ > diff --git a/test/cfg2cmd/q35-win10-hostpci.conf.cmd > b/test/cfg2cmd/q35-win10-hostpci.conf.cmd > index f2c08ca..81e43d4 100644 > --- a/test/cfg2cmd/q35-win10-hostpci.conf.cmd > +++ b/test/cfg2cmd/q35-win10-hostpci.conf.cmd > @@ -15,7 +15,7 @@ > -boot > 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' > \ > -vnc unix:/var/run/qemu-server/8006.vnc,password \ > -no-hpet \ > - -cpu > 'kvm64,+lahf_lm,+sep,+kvm_pv_unhalt,+kvm_pv_eoi,hv_spinlocks=0x1fff,hv_vapic,hv_time,hv_reset,hv_vpindex,hv_runtime,hv_relaxed,hv_synic,hv_stimer,hv_ipi,enforce' > \ > + -cpu > 'kvm64,enforce,hv_ipi,hv_relaxed,hv_reset,hv_runtime,hv_spinlocks=0x1fff,hv_stimer,hv_synic,hv_time,hv_vapic,hv_vpindex,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep' > \ > -m 512 \ > -object 'memory-backend-ram,id=ram-node0,size=256M' \ > -numa 'node,nodeid=0,cpus=0,memdev=ram-node0' \ > diff --git a/test/cfg2cmd/simple1.conf.cmd b/test/cfg2cmd/simple1.conf.cmd > index b5c06cf..3485064 100644 > --- a/test/cfg2cmd/simple1.conf.cmd > +++ b/test/cfg2cmd/simple1.conf.cmd > @@ -12,7 +12,7 @@ > -nodefaults \ > -boot > 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' > \ > -vnc unix:/var/run/qemu-server/8006.vnc,password \ > - -cpu kvm64,+lahf_lm,+sep,+kvm_pv_unhalt,+kvm_pv_eoi,enforce \ > + -cpu kvm64,enforce,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep \ > -m 768 \ > -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' \ > diff --git a/test/cfg2cmd/spice-usb3.conf.cmd > b/test/cfg2cmd/spice-usb3.conf.cmd > index 680fa64..66b4e8d 100644 > --- a/test/cfg2cmd/spice-usb3.conf.cmd > +++ b/test/cfg2cmd/spice-usb3.conf.cmd > @@ -12,7 +12,7 @@ > -nodefaults \ > -boot > 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' > \ > -vnc unix:/var/run/qemu-server/8006.vnc,password \ > - -cpu kvm64,+lahf_lm,+sep,+kvm_pv_unhalt,+kvm_pv_eoi,enforce \ > + -cpu kvm64,enforce,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep \ > -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' \ > _______________________________________________ pve-devel mailing list pve-devel@pve.proxmox.com https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
