diff mbox series

[PULL,05/14] qapi: add unplug primary event

Message ID 20191029225932.14585-6-mst@redhat.com (mailing list archive)
State New, archived
Headers show
Series [PULL,01/14] qdev/qbus: add hidden device support | expand

Commit Message

Michael S. Tsirkin Oct. 29, 2019, 11 p.m. UTC
From: Jens Freimann <jfreimann@redhat.com>

This event is emitted when we sent a request to unplug a
failover primary device from the Guest OS and it includes the
device id of the primary device.

Signed-off-by: Jens Freimann <jfreimann@redhat.com>
Message-Id: <20191029114905.6856-6-jfreimann@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Markus Armbruster <armbru@redhat.com>
---
 qapi/migration.json | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

Comments

Eric Blake June 29, 2020, 4:05 p.m. UTC | #1
On 10/29/19 6:00 PM, Michael S. Tsirkin wrote:
> From: Jens Freimann <jfreimann@redhat.com>
> 
> This event is emitted when we sent a request to unplug a
> failover primary device from the Guest OS and it includes the
> device id of the primary device.
> 
> Signed-off-by: Jens Freimann <jfreimann@redhat.com>
> Message-Id: <20191029114905.6856-6-jfreimann@redhat.com>
> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> Acked-by: Markus Armbruster <armbru@redhat.com>
> ---
>   qapi/migration.json | 19 +++++++++++++++++++
>   1 file changed, 19 insertions(+)
> 

> +##
> +# @UNPLUG_PRIMARY:
> +#
> +# Emitted from source side of a migration when migration state is
> +# WAIT_UNPLUG. Device was unplugged by guest operating system.
> +# Device resources in QEMU are kept on standby to be able to re-plug it in case
> +# of migration failure.
> +#
> +# @device-id: QEMU device id of the unplugged device
> +#
> +# Since: 4.2

s/4.2/5.1/

I'm not sure if the pull request will be respun for other reasons; if 
not, fixing this in a followup patch may be the way to go.
Eric Blake June 29, 2020, 4:07 p.m. UTC | #2
On 6/29/20 11:05 AM, Eric Blake wrote:
> On 10/29/19 6:00 PM, Michael S. Tsirkin wrote:
>> From: Jens Freimann <jfreimann@redhat.com>
>>
>> This event is emitted when we sent a request to unplug a
>> failover primary device from the Guest OS and it includes the
>> device id of the primary device.
>>
>> Signed-off-by: Jens Freimann <jfreimann@redhat.com>
>> Message-Id: <20191029114905.6856-6-jfreimann@redhat.com>
>> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>> Acked-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>   qapi/migration.json | 19 +++++++++++++++++++
>>   1 file changed, 19 insertions(+)
>>
> 
>> +##
>> +# @UNPLUG_PRIMARY:
>> +#
>> +# Emitted from source side of a migration when migration state is
>> +# WAIT_UNPLUG. Device was unplugged by guest operating system.
>> +# Device resources in QEMU are kept on standby to be able to re-plug 
>> it in case
>> +# of migration failure.
>> +#
>> +# @device-id: QEMU device id of the unplugged device
>> +#
>> +# Since: 4.2
> 
> s/4.2/5.1/
> 
> I'm not sure if the pull request will be respun for other reasons; if 
> not, fixing this in a followup patch may be the way to go.

Sorry, my bad for not checking the dates.  The thread moved to the top 
of my queue due to the belated report of a Coverity incident; but I now 
see that this really was included in the tree during 4.2.
diff mbox series

Patch

diff --git a/qapi/migration.json b/qapi/migration.json
index 82feb5bd39..e9e7a97c03 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -1448,3 +1448,22 @@ 
 # Since: 3.0
 ##
 { 'command': 'migrate-pause', 'allow-oob': true }
+
+##
+# @UNPLUG_PRIMARY:
+#
+# Emitted from source side of a migration when migration state is
+# WAIT_UNPLUG. Device was unplugged by guest operating system.
+# Device resources in QEMU are kept on standby to be able to re-plug it in case
+# of migration failure.
+#
+# @device-id: QEMU device id of the unplugged device
+#
+# Since: 4.2
+#
+# Example:
+#   {"event": "UNPLUG_PRIMARY", "data": {"device-id": "hostdev0"} }
+#
+##
+{ 'event': 'UNPLUG_PRIMARY',
+  'data': { 'device-id': 'str' } }