提交 5870f95a 编写于 作者: J John Ferlan

qemu: Add dump completed event to the capabilities

Add the DUMP_COMPLETED check to the capabilities. This is the
mechanism used to determine whether the dump-guest-memory command
can support the "-detach" option and thus be able to wait on the
event and allow for a query of the progress of the dump.
Reviewed-by: NJiri Denemark <jdenemar@redhat.com>
上级 3f99bb06
...@@ -458,6 +458,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, ...@@ -458,6 +458,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
/* 280 */ /* 280 */
"pl011", "pl011",
"machine.pseries.max-cpu-compat", "machine.pseries.max-cpu-compat",
"dump-completed",
); );
...@@ -1593,6 +1594,7 @@ struct virQEMUCapsStringFlags virQEMUCapsEvents[] = { ...@@ -1593,6 +1594,7 @@ struct virQEMUCapsStringFlags virQEMUCapsEvents[] = {
{ "VSERPORT_CHANGE", QEMU_CAPS_VSERPORT_CHANGE }, { "VSERPORT_CHANGE", QEMU_CAPS_VSERPORT_CHANGE },
{ "DEVICE_TRAY_MOVED", QEMU_CAPS_DEVICE_TRAY_MOVED }, { "DEVICE_TRAY_MOVED", QEMU_CAPS_DEVICE_TRAY_MOVED },
{ "BLOCK_WRITE_THRESHOLD", QEMU_CAPS_BLOCK_WRITE_THRESHOLD }, { "BLOCK_WRITE_THRESHOLD", QEMU_CAPS_BLOCK_WRITE_THRESHOLD },
{ "DUMP_COMPLETED", QEMU_CAPS_DUMP_COMPLETED },
}; };
struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
......
...@@ -443,6 +443,7 @@ typedef enum { ...@@ -443,6 +443,7 @@ typedef enum {
/* 280 */ /* 280 */
QEMU_CAPS_DEVICE_PL011, /* -device pl011 (not user-instantiable) */ QEMU_CAPS_DEVICE_PL011, /* -device pl011 (not user-instantiable) */
QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT, /* -machine pseries,max-cpu-compat= */ QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT, /* -machine pseries,max-cpu-compat= */
QEMU_CAPS_DUMP_COMPLETED, /* DUMP_COMPLETED event */
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='iscsi.password-secret'/> <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='pl011'/> <flag name='pl011'/>
<flag name='dump-completed'/>
<version>2010000</version> <version>2010000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>304138</microcodeVersion> <microcodeVersion>304138</microcodeVersion>
......
...@@ -185,6 +185,7 @@ ...@@ -185,6 +185,7 @@
<flag name='iscsi.password-secret'/> <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='pl011'/> <flag name='pl011'/>
<flag name='dump-completed'/>
<version>2010000</version> <version>2010000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>304138</microcodeVersion> <microcodeVersion>304138</microcodeVersion>
......
...@@ -184,6 +184,7 @@ ...@@ -184,6 +184,7 @@
<flag name='iscsi.password-secret'/> <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='machine.pseries.max-cpu-compat'/> <flag name='machine.pseries.max-cpu-compat'/>
<flag name='dump-completed'/>
<version>2010000</version> <version>2010000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>383421</microcodeVersion> <microcodeVersion>383421</microcodeVersion>
......
...@@ -145,6 +145,7 @@ ...@@ -145,6 +145,7 @@
<flag name='numa.dist'/> <flag name='numa.dist'/>
<flag name='disk-share-rw'/> <flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/> <flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>
<version>2010000</version> <version>2010000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>304153</microcodeVersion> <microcodeVersion>304153</microcodeVersion>
......
...@@ -228,6 +228,7 @@ ...@@ -228,6 +228,7 @@
<flag name='disk-share-rw'/> <flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/> <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='dump-completed'/>
<version>2010000</version> <version>2010000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>345185</microcodeVersion> <microcodeVersion>345185</microcodeVersion>
......
...@@ -174,6 +174,7 @@ ...@@ -174,6 +174,7 @@
<flag name='virtio-gpu.max_outputs'/> <flag name='virtio-gpu.max_outputs'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='pl011'/> <flag name='pl011'/>
<flag name='dump-completed'/>
<version>2006000</version> <version>2006000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>228838</microcodeVersion> <microcodeVersion>228838</microcodeVersion>
......
...@@ -174,6 +174,7 @@ ...@@ -174,6 +174,7 @@
<flag name='virtio-gpu.max_outputs'/> <flag name='virtio-gpu.max_outputs'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='pl011'/> <flag name='pl011'/>
<flag name='dump-completed'/>
<version>2006000</version> <version>2006000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>228838</microcodeVersion> <microcodeVersion>228838</microcodeVersion>
......
...@@ -169,6 +169,7 @@ ...@@ -169,6 +169,7 @@
<flag name='virtio-gpu.max_outputs'/> <flag name='virtio-gpu.max_outputs'/>
<flag name='spapr-vty'/> <flag name='spapr-vty'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='dump-completed'/>
<version>2006000</version> <version>2006000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>263602</microcodeVersion> <microcodeVersion>263602</microcodeVersion>
......
...@@ -205,6 +205,7 @@ ...@@ -205,6 +205,7 @@
<flag name='chardev-reconnect'/> <flag name='chardev-reconnect'/>
<flag name='virtio-gpu.max_outputs'/> <flag name='virtio-gpu.max_outputs'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='dump-completed'/>
<version>2006000</version> <version>2006000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>227579</microcodeVersion> <microcodeVersion>227579</microcodeVersion>
......
...@@ -136,6 +136,7 @@ ...@@ -136,6 +136,7 @@
<flag name='virtio-gpu.max_outputs'/> <flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/> <flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/> <flag name='sclplmconsole'/>
<flag name='dump-completed'/>
<version>2007000</version> <version>2007000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>217559</microcodeVersion> <microcodeVersion>217559</microcodeVersion>
......
...@@ -209,6 +209,7 @@ ...@@ -209,6 +209,7 @@
<flag name='virtio-gpu.max_outputs'/> <flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/> <flag name='virtio-blk.num-queues'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='dump-completed'/>
<version>2007000</version> <version>2007000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>239276</microcodeVersion> <microcodeVersion>239276</microcodeVersion>
......
...@@ -138,6 +138,7 @@ ...@@ -138,6 +138,7 @@
<flag name='virtio-gpu.max_outputs'/> <flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/> <flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/> <flag name='sclplmconsole'/>
<flag name='dump-completed'/>
<version>2007093</version> <version>2007093</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>242460</microcodeVersion> <microcodeVersion>242460</microcodeVersion>
......
...@@ -211,6 +211,7 @@ ...@@ -211,6 +211,7 @@
<flag name='virtio-gpu.max_outputs'/> <flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/> <flag name='virtio-blk.num-queues'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='dump-completed'/>
<version>2008000</version> <version>2008000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>255931</microcodeVersion> <microcodeVersion>255931</microcodeVersion>
......
...@@ -177,6 +177,7 @@ ...@@ -177,6 +177,7 @@
<flag name='disk-share-rw'/> <flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/> <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='dump-completed'/>
<version>2009000</version> <version>2009000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>347135</microcodeVersion> <microcodeVersion>347135</microcodeVersion>
......
...@@ -141,6 +141,7 @@ ...@@ -141,6 +141,7 @@
<flag name='sclplmconsole'/> <flag name='sclplmconsole'/>
<flag name='disk-share-rw'/> <flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/> <flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>
<version>2009000</version> <version>2009000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>265878</microcodeVersion> <microcodeVersion>265878</microcodeVersion>
......
...@@ -224,6 +224,7 @@ ...@@ -224,6 +224,7 @@
<flag name='disk-share-rw'/> <flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/> <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/> <flag name='isa-serial'/>
<flag name='dump-completed'/>
<version>2009000</version> <version>2009000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>321194</microcodeVersion> <microcodeVersion>321194</microcodeVersion>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册