提交 8662b34f 编写于 作者: J Jiri Denemark

qemu: Probe for migrtability support in CPU expansion

Signed-off-by: NJiri Denemark <jdenemar@redhat.com>
Reviewed-by: NMichal Privoznik <mprivozn@redhat.com>
上级 2bfa2fea
...@@ -585,6 +585,7 @@ VIR_ENUM_IMPL(virQEMUCaps, ...@@ -585,6 +585,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 370 */ /* 370 */
"cpu.migratable", "cpu.migratable",
"query-cpu-model-expansion.migratable",
); );
...@@ -5041,9 +5042,18 @@ virQEMUCapsInitProcessCaps(virQEMUCapsPtr qemuCaps) ...@@ -5041,9 +5042,18 @@ virQEMUCapsInitProcessCaps(virQEMUCapsPtr qemuCaps)
virQEMUCapsClear(qemuCaps, QEMU_CAPS_DEVICE_NVDIMM); virQEMUCapsClear(qemuCaps, QEMU_CAPS_DEVICE_NVDIMM);
if (ARCH_IS_X86(qemuCaps->arch) && if (ARCH_IS_X86(qemuCaps->arch) &&
virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) {
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_CACHE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_CACHE);
/* Old x86 QEMU supported migratable:false property in
* query-cpu-model-expansion arguments even though it was not properly
* advertised as a CPU property.
*/
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_MIGRATABLE) ||
qemuCaps->version < 2012000)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE);
}
if (ARCH_IS_S390(qemuCaps->arch)) { if (ARCH_IS_S390(qemuCaps->arch)) {
/* Legacy assurance for QEMU_CAPS_CCW */ /* Legacy assurance for QEMU_CAPS_CCW */
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCW) && if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCW) &&
......
...@@ -566,6 +566,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ ...@@ -566,6 +566,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
/* 370 */ /* 370 */
QEMU_CAPS_CPU_MIGRATABLE, /* -cpu ...,migratable=on|off */ QEMU_CAPS_CPU_MIGRATABLE, /* -cpu ...,migratable=on|off */
QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE, /* query-cpu-model-expansion supports migratable:false */
QEMU_CAPS_LAST /* this must always be the last item */ QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags; } virQEMUCapsFlags;
......
...@@ -185,6 +185,7 @@ ...@@ -185,6 +185,7 @@
<flag name='i8042'/> <flag name='i8042'/>
<flag name='tcg'/> <flag name='tcg'/>
<flag name='pvscsi'/> <flag name='pvscsi'/>
<flag name='query-cpu-model-expansion.migratable'/>
<version>2010000</version> <version>2010000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>43100287</microcodeVersion> <microcodeVersion>43100287</microcodeVersion>
......
...@@ -191,6 +191,7 @@ ...@@ -191,6 +191,7 @@
<flag name='i8042'/> <flag name='i8042'/>
<flag name='tcg'/> <flag name='tcg'/>
<flag name='pvscsi'/> <flag name='pvscsi'/>
<flag name='query-cpu-model-expansion.migratable'/>
<version>2011000</version> <version>2011000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>43100288</microcodeVersion> <microcodeVersion>43100288</microcodeVersion>
......
...@@ -201,6 +201,7 @@ ...@@ -201,6 +201,7 @@
<flag name='tcg'/> <flag name='tcg'/>
<flag name='pvscsi'/> <flag name='pvscsi'/>
<flag name='cpu.migratable'/> <flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<version>2011090</version> <version>2011090</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>43100289</microcodeVersion> <microcodeVersion>43100289</microcodeVersion>
......
...@@ -179,6 +179,7 @@ ...@@ -179,6 +179,7 @@
<flag name='i8042'/> <flag name='i8042'/>
<flag name='tcg'/> <flag name='tcg'/>
<flag name='pvscsi'/> <flag name='pvscsi'/>
<flag name='query-cpu-model-expansion.migratable'/>
<version>2009000</version> <version>2009000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>43100247</microcodeVersion> <microcodeVersion>43100247</microcodeVersion>
......
...@@ -207,6 +207,7 @@ ...@@ -207,6 +207,7 @@
<flag name='tcg'/> <flag name='tcg'/>
<flag name='pvscsi'/> <flag name='pvscsi'/>
<flag name='cpu.migratable'/> <flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<version>3000000</version> <version>3000000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>43100239</microcodeVersion> <microcodeVersion>43100239</microcodeVersion>
......
...@@ -210,6 +210,7 @@ ...@@ -210,6 +210,7 @@
<flag name='tcg'/> <flag name='tcg'/>
<flag name='pvscsi'/> <flag name='pvscsi'/>
<flag name='cpu.migratable'/> <flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<version>3000092</version> <version>3000092</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>43100240</microcodeVersion> <microcodeVersion>43100240</microcodeVersion>
......
...@@ -215,6 +215,7 @@ ...@@ -215,6 +215,7 @@
<flag name='tcg'/> <flag name='tcg'/>
<flag name='pvscsi'/> <flag name='pvscsi'/>
<flag name='cpu.migratable'/> <flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<version>4000000</version> <version>4000000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>43100240</microcodeVersion> <microcodeVersion>43100240</microcodeVersion>
......
...@@ -221,6 +221,7 @@ ...@@ -221,6 +221,7 @@
<flag name='tcg'/> <flag name='tcg'/>
<flag name='pvscsi'/> <flag name='pvscsi'/>
<flag name='cpu.migratable'/> <flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<version>4001000</version> <version>4001000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>43100241</microcodeVersion> <microcodeVersion>43100241</microcodeVersion>
......
...@@ -229,6 +229,7 @@ ...@@ -229,6 +229,7 @@
<flag name='tcg'/> <flag name='tcg'/>
<flag name='pvscsi'/> <flag name='pvscsi'/>
<flag name='cpu.migratable'/> <flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<version>4002000</version> <version>4002000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>43100242</microcodeVersion> <microcodeVersion>43100242</microcodeVersion>
......
...@@ -235,6 +235,7 @@ ...@@ -235,6 +235,7 @@
<flag name='virtio-blk-pci.scsi.default.disabled'/> <flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/> <flag name='pvscsi'/>
<flag name='cpu.migratable'/> <flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<version>5000000</version> <version>5000000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>43100241</microcodeVersion> <microcodeVersion>43100241</microcodeVersion>
......
...@@ -235,6 +235,7 @@ ...@@ -235,6 +235,7 @@
<flag name='virtio-blk-pci.scsi.default.disabled'/> <flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/> <flag name='pvscsi'/>
<flag name='cpu.migratable'/> <flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<version>5000050</version> <version>5000050</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>43100242</microcodeVersion> <microcodeVersion>43100242</microcodeVersion>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册