mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 23:33:54 -06:00
x86 and machine queue, 2017-06-05
-----BEGIN PGP SIGNATURE----- iQIcBAABCAAGBQJZNam5AAoJECgHk2+YTcWmiNAP/1yGqibhujtVTviYpbHbVOBx wsHkeNOqb1WUXw0bfGw8RfGTlcuoBaeL7r88iwFL8G303g2OPiS1H/tcRuT7gfG0 YV3xdpGYMDFBu1JMV2VSnCqWXfa92EbPJ0vRLjxTD/heLmekVA7TUdiZVBf+S7hK fQLWqzZboV7RFDm6OUBQOxjCU8/WJ7ggShQJhItzBJTIZJA2C2iiO07v+U04Cwku Z0eoiwXTMnjDhvKLh8AE5jO3KLCrxGT6u9u9szXMwUtQUDX14X2U5PFCAB89mhUZ bYW3rRvpsU9eDMQVUo92Lej0e+47T0Mb4R7F9vjWsHwTI+VgcO+K0DXlYru0uKOJ XLoZVtGls3nRuJIDrMsICCkuveulGZs98YlVcjGjzdfJ748P6FpEQmL9v6WiExHi G8lu0tP2nW4n1DU+1p4EMQcKWueKuN/p7OhCWGGFvNDeGSvm1e8//TITmbtMZ2/E PizmCW5YQSGPOGg7fq4C3RhLfkQj4gsESe1lHdWsgSOZd9KYmJWg256BNInroky+ zb8XYts7/i2ogKtj8c9YV8jwvbiHjAYVcO4mr9GNFERO1FSdPbNKuVm2IldChLIt trI4vngvTIygTcURA7s+cOXFRAnznHrHYl+QH9XQJqI2Ay/+3nGYY+/EYFpCc0EW l2f/b2ZChRU/UlchdleG =0C6J -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging x86 and machine queue, 2017-06-05 # gpg: Signature made Mon 05 Jun 2017 19:58:01 BST # gpg: using RSA key 0x2807936F984DC5A6 # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/x86-and-machine-pull-request: scripts: Test script to look for -device crashes qemu.py: Add QEMUMachine.exitcode() method qemu.py: Don't set _popen=None on error/shutdown spapr: cleanup spapr_fixup_cpu_numa_dt() usage numa: move numa_node from CPUState into target specific classes numa: make hmp 'info numa' fetch numa nodes from qmp_query_cpus() result numa: make sure that all cpus have has_node_id set if numa is enabled numa: move default mapping init to machine numa: consolidate cpu_preplug fixups/checks for pc/arm/spapr pc: Use "min-[x]level" on compat_props Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
a65afaae0f
20 changed files with 774 additions and 138 deletions
|
@ -566,75 +566,75 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
|
|||
.value = "off",\
|
||||
},{\
|
||||
.driver = "qemu64" "-" TYPE_X86_CPU,\
|
||||
.property = "level",\
|
||||
.property = "min-level",\
|
||||
.value = stringify(4),\
|
||||
},{\
|
||||
.driver = "kvm64" "-" TYPE_X86_CPU,\
|
||||
.property = "level",\
|
||||
.property = "min-level",\
|
||||
.value = stringify(5),\
|
||||
},{\
|
||||
.driver = "pentium3" "-" TYPE_X86_CPU,\
|
||||
.property = "level",\
|
||||
.property = "min-level",\
|
||||
.value = stringify(2),\
|
||||
},{\
|
||||
.driver = "n270" "-" TYPE_X86_CPU,\
|
||||
.property = "level",\
|
||||
.property = "min-level",\
|
||||
.value = stringify(5),\
|
||||
},{\
|
||||
.driver = "Conroe" "-" TYPE_X86_CPU,\
|
||||
.property = "level",\
|
||||
.property = "min-level",\
|
||||
.value = stringify(4),\
|
||||
},{\
|
||||
.driver = "Penryn" "-" TYPE_X86_CPU,\
|
||||
.property = "level",\
|
||||
.property = "min-level",\
|
||||
.value = stringify(4),\
|
||||
},{\
|
||||
.driver = "Nehalem" "-" TYPE_X86_CPU,\
|
||||
.property = "level",\
|
||||
.property = "min-level",\
|
||||
.value = stringify(4),\
|
||||
},{\
|
||||
.driver = "n270" "-" TYPE_X86_CPU,\
|
||||
.property = "xlevel",\
|
||||
.property = "min-xlevel",\
|
||||
.value = stringify(0x8000000a),\
|
||||
},{\
|
||||
.driver = "Penryn" "-" TYPE_X86_CPU,\
|
||||
.property = "xlevel",\
|
||||
.property = "min-xlevel",\
|
||||
.value = stringify(0x8000000a),\
|
||||
},{\
|
||||
.driver = "Conroe" "-" TYPE_X86_CPU,\
|
||||
.property = "xlevel",\
|
||||
.property = "min-xlevel",\
|
||||
.value = stringify(0x8000000a),\
|
||||
},{\
|
||||
.driver = "Nehalem" "-" TYPE_X86_CPU,\
|
||||
.property = "xlevel",\
|
||||
.property = "min-xlevel",\
|
||||
.value = stringify(0x8000000a),\
|
||||
},{\
|
||||
.driver = "Westmere" "-" TYPE_X86_CPU,\
|
||||
.property = "xlevel",\
|
||||
.property = "min-xlevel",\
|
||||
.value = stringify(0x8000000a),\
|
||||
},{\
|
||||
.driver = "SandyBridge" "-" TYPE_X86_CPU,\
|
||||
.property = "xlevel",\
|
||||
.property = "min-xlevel",\
|
||||
.value = stringify(0x8000000a),\
|
||||
},{\
|
||||
.driver = "IvyBridge" "-" TYPE_X86_CPU,\
|
||||
.property = "xlevel",\
|
||||
.property = "min-xlevel",\
|
||||
.value = stringify(0x8000000a),\
|
||||
},{\
|
||||
.driver = "Haswell" "-" TYPE_X86_CPU,\
|
||||
.property = "xlevel",\
|
||||
.property = "min-xlevel",\
|
||||
.value = stringify(0x8000000a),\
|
||||
},{\
|
||||
.driver = "Haswell-noTSX" "-" TYPE_X86_CPU,\
|
||||
.property = "xlevel",\
|
||||
.property = "min-xlevel",\
|
||||
.value = stringify(0x8000000a),\
|
||||
},{\
|
||||
.driver = "Broadwell" "-" TYPE_X86_CPU,\
|
||||
.property = "xlevel",\
|
||||
.property = "min-xlevel",\
|
||||
.value = stringify(0x8000000a),\
|
||||
},{\
|
||||
.driver = "Broadwell-noTSX" "-" TYPE_X86_CPU,\
|
||||
.property = "xlevel",\
|
||||
.property = "min-xlevel",\
|
||||
.value = stringify(0x8000000a),\
|
||||
},{\
|
||||
.driver = TYPE_X86_CPU,\
|
||||
|
@ -860,7 +860,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
|
|||
.value = stringify(2),\
|
||||
},{\
|
||||
.driver = "Conroe-" TYPE_X86_CPU,\
|
||||
.property = "level",\
|
||||
.property = "min-level",\
|
||||
.value = stringify(2),\
|
||||
},{\
|
||||
.driver = "Penryn-" TYPE_X86_CPU,\
|
||||
|
@ -868,7 +868,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
|
|||
.value = stringify(2),\
|
||||
},{\
|
||||
.driver = "Penryn-" TYPE_X86_CPU,\
|
||||
.property = "level",\
|
||||
.property = "min-level",\
|
||||
.value = stringify(2),\
|
||||
},{\
|
||||
.driver = "Nehalem-" TYPE_X86_CPU,\
|
||||
|
@ -876,7 +876,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
|
|||
.value = stringify(2),\
|
||||
},{\
|
||||
.driver = "Nehalem-" TYPE_X86_CPU,\
|
||||
.property = "level",\
|
||||
.property = "min-level",\
|
||||
.value = stringify(2),\
|
||||
},{\
|
||||
.driver = "virtio-net-pci",\
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue