| Message ID | 20210825004835.472919-6-danielhb413@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | DEVICE_UNPLUG_GUEST_ERROR QAPI event | expand |
On Tue, Aug 24, 2021 at 09:48:33PM -0300, Daniel Henrique Barboza wrote: > At this moment we only provide one event to report a hotunplug error, > MEM_UNPLUG_ERROR. As of Linux kernel 5.12 and QEMU 6.0.0, the pseries > machine is now able to report unplug errors for other device types, such > as CPUs. > > Instead of creating a (device_type)_UNPLUG_ERROR for each new device, > create a generic DEVICE_UNPLUG_GUEST_ERROR event that can be used by all > guest side unplug errors in the future. This event has a similar API as > the existing DEVICE_DELETED event, always providing the QOM path of the > device and dev->id if there's any. > > With this new generic event, MEM_UNPLUG_ERROR is now marked as deprecated. > > Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> > --- > docs/about/deprecated.rst | 10 ++++++++++ > qapi/machine.json | 7 ++++++- > qapi/qdev.json | 28 +++++++++++++++++++++++++++- > stubs/qdev.c | 7 +++++++ > 4 files changed, 50 insertions(+), 2 deletions(-) Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > > diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst > index 6d438f1c8d..1a8ffc9381 100644 > --- a/docs/about/deprecated.rst > +++ b/docs/about/deprecated.rst > @@ -204,6 +204,16 @@ The ``I7200`` guest CPU relies on the nanoMIPS ISA, which is deprecated > (the ISA has never been upstreamed to a compiler toolchain). Therefore > this CPU is also deprecated. > > + > +QEMU API (QAPI) events > +---------------------- > + > +``MEM_UNPLUG_ERROR`` (since 6.2) > +'''''''''''''''''''''''''''''''''''''''''''''''''''''''' > + > +Use the more generic event ``DEVICE_UNPLUG_GUEST_ERROR`` instead. > + > + > System emulator machines > ------------------------ > > diff --git a/qapi/machine.json b/qapi/machine.json > index 157712f006..cd397f1ee4 100644 > --- a/qapi/machine.json > +++ b/qapi/machine.json > @@ -1271,6 +1271,10 @@ > # > # @msg: Informative message > # > +# Features: > +# @deprecated: This event is deprecated. Use @DEVICE_UNPLUG_GUEST_ERROR > +# instead. > +# > # Since: 2.4 > # > # Example: > @@ -1283,7 +1287,8 @@ > # > ## > { 'event': 'MEM_UNPLUG_ERROR', > - 'data': { 'device': 'str', 'msg': 'str' } } > + 'data': { 'device': 'str', 'msg': 'str' }, > + 'features': ['deprecated'] } > > ## > # @SMPConfiguration: > diff --git a/qapi/qdev.json b/qapi/qdev.json > index 0e9cb2ae88..8b1a1dd43b 100644 > --- a/qapi/qdev.json > +++ b/qapi/qdev.json > @@ -84,7 +84,9 @@ > # This command merely requests that the guest begin the hot removal > # process. Completion of the device removal process is signaled with a > # DEVICE_DELETED event. Guest reset will automatically complete removal > -# for all devices. > +# for all devices. If a guest-side error in the hot removal process is > +# detected, the device will not be removed and a DEVICE_UNPLUG_GUEST_ERROR > +# event is sent. Some errors cannot be detected. > # > # Since: 0.14 > # > @@ -124,3 +126,27 @@ > ## > { 'event': 'DEVICE_DELETED', > 'data': { '*device': 'str', 'path': 'str' } } > + > +## > +# @DEVICE_UNPLUG_GUEST_ERROR: > +# > +# Emitted when a device hot unplug fails due to an internal guest > +# error. > +# > +# @device: the device's ID if it has one > +# > +# @path: the device's QOM path > +# > +# Since: 6.2 > +# > +# Example: > +# > +# <- { "event": "DEVICE_UNPLUG_GUEST_ERROR" > +# "data": { "device": "core1", > +# "path": "/machine/peripheral/core1" }, > +# }, > +# "timestamp": { "seconds": 1615570772, "microseconds": 202844 } } > +# > +## > +{ 'event': 'DEVICE_UNPLUG_GUEST_ERROR', > + 'data': { '*device': 'str', 'path': 'str' } } > diff --git a/stubs/qdev.c b/stubs/qdev.c > index 92e6143134..28d6d531e6 100644 > --- a/stubs/qdev.c > +++ b/stubs/qdev.c > @@ -21,3 +21,10 @@ void qapi_event_send_device_deleted(bool has_device, > { > /* Nothing to do. */ > } > + > +void qapi_event_send_device_unplug_guest_error(bool has_device, > + const char *device, > + const char *path > +{ > + /* Nothing to do. */ > +}
On Tue, 24 Aug 2021 21:48:33 -0300 Daniel Henrique Barboza <danielhb413@gmail.com> wrote: > At this moment we only provide one event to report a hotunplug error, > MEM_UNPLUG_ERROR. As of Linux kernel 5.12 and QEMU 6.0.0, the pseries > machine is now able to report unplug errors for other device types, such > as CPUs. > > Instead of creating a (device_type)_UNPLUG_ERROR for each new device, > create a generic DEVICE_UNPLUG_GUEST_ERROR event that can be used by all > guest side unplug errors in the future. This event has a similar API as > the existing DEVICE_DELETED event, always providing the QOM path of the > device and dev->id if there's any. > > With this new generic event, MEM_UNPLUG_ERROR is now marked as deprecated. > > Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > docs/about/deprecated.rst | 10 ++++++++++ > qapi/machine.json | 7 ++++++- > qapi/qdev.json | 28 +++++++++++++++++++++++++++- > stubs/qdev.c | 7 +++++++ > 4 files changed, 50 insertions(+), 2 deletions(-) > > diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst > index 6d438f1c8d..1a8ffc9381 100644 > --- a/docs/about/deprecated.rst > +++ b/docs/about/deprecated.rst > @@ -204,6 +204,16 @@ The ``I7200`` guest CPU relies on the nanoMIPS ISA, which is deprecated > (the ISA has never been upstreamed to a compiler toolchain). Therefore > this CPU is also deprecated. > > + > +QEMU API (QAPI) events > +---------------------- > + > +``MEM_UNPLUG_ERROR`` (since 6.2) > +'''''''''''''''''''''''''''''''''''''''''''''''''''''''' > + > +Use the more generic event ``DEVICE_UNPLUG_GUEST_ERROR`` instead. > + > + > System emulator machines > ------------------------ > > diff --git a/qapi/machine.json b/qapi/machine.json > index 157712f006..cd397f1ee4 100644 > --- a/qapi/machine.json > +++ b/qapi/machine.json > @@ -1271,6 +1271,10 @@ > # > # @msg: Informative message > # > +# Features: > +# @deprecated: This event is deprecated. Use @DEVICE_UNPLUG_GUEST_ERROR > +# instead. > +# > # Since: 2.4 > # > # Example: > @@ -1283,7 +1287,8 @@ > # > ## > { 'event': 'MEM_UNPLUG_ERROR', > - 'data': { 'device': 'str', 'msg': 'str' } } > + 'data': { 'device': 'str', 'msg': 'str' }, > + 'features': ['deprecated'] } > > ## > # @SMPConfiguration: > diff --git a/qapi/qdev.json b/qapi/qdev.json > index 0e9cb2ae88..8b1a1dd43b 100644 > --- a/qapi/qdev.json > +++ b/qapi/qdev.json > @@ -84,7 +84,9 @@ > # This command merely requests that the guest begin the hot removal > # process. Completion of the device removal process is signaled with a > # DEVICE_DELETED event. Guest reset will automatically complete removal > -# for all devices. > +# for all devices. If a guest-side error in the hot removal process is > +# detected, the device will not be removed and a DEVICE_UNPLUG_GUEST_ERROR > +# event is sent. Some errors cannot be detected. > # > # Since: 0.14 > # > @@ -124,3 +126,27 @@ > ## > { 'event': 'DEVICE_DELETED', > 'data': { '*device': 'str', 'path': 'str' } } > + > +## > +# @DEVICE_UNPLUG_GUEST_ERROR: > +# > +# Emitted when a device hot unplug fails due to an internal guest > +# error. > +# > +# @device: the device's ID if it has one > +# > +# @path: the device's QOM path > +# > +# Since: 6.2 > +# > +# Example: > +# > +# <- { "event": "DEVICE_UNPLUG_GUEST_ERROR" > +# "data": { "device": "core1", > +# "path": "/machine/peripheral/core1" }, > +# }, > +# "timestamp": { "seconds": 1615570772, "microseconds": 202844 } } > +# > +## > +{ 'event': 'DEVICE_UNPLUG_GUEST_ERROR', > + 'data': { '*device': 'str', 'path': 'str' } } > diff --git a/stubs/qdev.c b/stubs/qdev.c > index 92e6143134..28d6d531e6 100644 > --- a/stubs/qdev.c > +++ b/stubs/qdev.c > @@ -21,3 +21,10 @@ void qapi_event_send_device_deleted(bool has_device, > { > /* Nothing to do. */ > } > + > +void qapi_event_send_device_unplug_guest_error(bool has_device, > + const char *device, > + const char *path > +{ > + /* Nothing to do. */ > +}
Daniel Henrique Barboza <danielhb413@gmail.com> writes: > At this moment we only provide one event to report a hotunplug error, > MEM_UNPLUG_ERROR. As of Linux kernel 5.12 and QEMU 6.0.0, the pseries > machine is now able to report unplug errors for other device types, such > as CPUs. > > Instead of creating a (device_type)_UNPLUG_ERROR for each new device, > create a generic DEVICE_UNPLUG_GUEST_ERROR event that can be used by all > guest side unplug errors in the future. This event has a similar API as > the existing DEVICE_DELETED event, always providing the QOM path of the > device and dev->id if there's any. > > With this new generic event, MEM_UNPLUG_ERROR is now marked as deprecated. > > Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> > --- [...] > diff --git a/qapi/qdev.json b/qapi/qdev.json > index 0e9cb2ae88..8b1a1dd43b 100644 > --- a/qapi/qdev.json > +++ b/qapi/qdev.json > @@ -84,7 +84,9 @@ > # This command merely requests that the guest begin the hot removal > # process. Completion of the device removal process is signaled with a > # DEVICE_DELETED event. Guest reset will automatically complete removal > -# for all devices. > +# for all devices. If a guest-side error in the hot removal process is > +# detected, the device will not be removed and a DEVICE_UNPLUG_GUEST_ERROR > +# event is sent. Some errors cannot be detected. > # > # Since: 0.14 > # > @@ -124,3 +126,27 @@ > ## > { 'event': 'DEVICE_DELETED', > 'data': { '*device': 'str', 'path': 'str' } } > + > +## > +# @DEVICE_UNPLUG_GUEST_ERROR: > +# > +# Emitted when a device hot unplug fails due to an internal guest > +# error. Suggest to scratch "internal". > +# > +# @device: the device's ID if it has one > +# > +# @path: the device's QOM path > +# > +# Since: 6.2 > +# > +# Example: > +# > +# <- { "event": "DEVICE_UNPLUG_GUEST_ERROR" > +# "data": { "device": "core1", > +# "path": "/machine/peripheral/core1" }, > +# }, > +# "timestamp": { "seconds": 1615570772, "microseconds": 202844 } } > +# > +## > +{ 'event': 'DEVICE_UNPLUG_GUEST_ERROR', > + 'data': { '*device': 'str', 'path': 'str' } } [...]
On Wed, Sep 01, 2021 at 03:19:26PM +0200, Markus Armbruster wrote: > Daniel Henrique Barboza <danielhb413@gmail.com> writes: > > > At this moment we only provide one event to report a hotunplug error, > > MEM_UNPLUG_ERROR. As of Linux kernel 5.12 and QEMU 6.0.0, the pseries > > machine is now able to report unplug errors for other device types, such > > as CPUs. > > > > Instead of creating a (device_type)_UNPLUG_ERROR for each new device, > > create a generic DEVICE_UNPLUG_GUEST_ERROR event that can be used by all > > guest side unplug errors in the future. This event has a similar API as > > the existing DEVICE_DELETED event, always providing the QOM path of the > > device and dev->id if there's any. > > > > With this new generic event, MEM_UNPLUG_ERROR is now marked as deprecated. > > > > Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> > > --- > > [...] > > > diff --git a/qapi/qdev.json b/qapi/qdev.json > > index 0e9cb2ae88..8b1a1dd43b 100644 > > --- a/qapi/qdev.json > > +++ b/qapi/qdev.json > > @@ -84,7 +84,9 @@ > > # This command merely requests that the guest begin the hot removal > > # process. Completion of the device removal process is signaled with a > > # DEVICE_DELETED event. Guest reset will automatically complete removal > > -# for all devices. > > +# for all devices. If a guest-side error in the hot removal process is > > +# detected, the device will not be removed and a DEVICE_UNPLUG_GUEST_ERROR > > +# event is sent. Some errors cannot be detected. > > # > > # Since: 0.14 > > # > > @@ -124,3 +126,27 @@ > > ## > > { 'event': 'DEVICE_DELETED', > > 'data': { '*device': 'str', 'path': 'str' } } > > + > > +## > > +# @DEVICE_UNPLUG_GUEST_ERROR: > > +# > > +# Emitted when a device hot unplug fails due to an internal guest > > +# error. > > Suggest to scratch "internal". I'd suggest s/internal guest/guest reported/. "guest error" is a bit vague, this doesn't neccessarily indicate a bug in the guest. The key point is that we're reporting this event because the guest performed some explicit action to tell us something went wrong with the plug attempt. > > > +# > > +# @device: the device's ID if it has one > > +# > > +# @path: the device's QOM path > > +# > > +# Since: 6.2 > > +# > > +# Example: > > +# > > +# <- { "event": "DEVICE_UNPLUG_GUEST_ERROR" > > +# "data": { "device": "core1", > > +# "path": "/machine/peripheral/core1" }, > > +# }, > > +# "timestamp": { "seconds": 1615570772, "microseconds": 202844 } } > > +# > > +## > > +{ 'event': 'DEVICE_UNPLUG_GUEST_ERROR', > > + 'data': { '*device': 'str', 'path': 'str' } } > > [...] >
David Gibson <david@gibson.dropbear.id.au> writes: > On Wed, Sep 01, 2021 at 03:19:26PM +0200, Markus Armbruster wrote: >> Daniel Henrique Barboza <danielhb413@gmail.com> writes: >> >> > At this moment we only provide one event to report a hotunplug error, >> > MEM_UNPLUG_ERROR. As of Linux kernel 5.12 and QEMU 6.0.0, the pseries >> > machine is now able to report unplug errors for other device types, such >> > as CPUs. >> > >> > Instead of creating a (device_type)_UNPLUG_ERROR for each new device, >> > create a generic DEVICE_UNPLUG_GUEST_ERROR event that can be used by all >> > guest side unplug errors in the future. This event has a similar API as >> > the existing DEVICE_DELETED event, always providing the QOM path of the >> > device and dev->id if there's any. >> > >> > With this new generic event, MEM_UNPLUG_ERROR is now marked as deprecated. >> > >> > Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> >> > --- >> >> [...] >> >> > diff --git a/qapi/qdev.json b/qapi/qdev.json >> > index 0e9cb2ae88..8b1a1dd43b 100644 >> > --- a/qapi/qdev.json >> > +++ b/qapi/qdev.json >> > @@ -84,7 +84,9 @@ >> > # This command merely requests that the guest begin the hot removal >> > # process. Completion of the device removal process is signaled with a >> > # DEVICE_DELETED event. Guest reset will automatically complete removal >> > -# for all devices. >> > +# for all devices. If a guest-side error in the hot removal process is >> > +# detected, the device will not be removed and a DEVICE_UNPLUG_GUEST_ERROR >> > +# event is sent. Some errors cannot be detected. >> > # >> > # Since: 0.14 >> > # >> > @@ -124,3 +126,27 @@ >> > ## >> > { 'event': 'DEVICE_DELETED', >> > 'data': { '*device': 'str', 'path': 'str' } } >> > + >> > +## >> > +# @DEVICE_UNPLUG_GUEST_ERROR: >> > +# >> > +# Emitted when a device hot unplug fails due to an internal guest >> > +# error. >> >> Suggest to scratch "internal". > > I'd suggest s/internal guest/guest reported/. "guest error" is a bit > vague, this doesn't neccessarily indicate a bug in the guest. The key > point is that we're reporting this event because the guest performed > some explicit action to tell us something went wrong with the plug > attempt. Yes, that's better. [...]
On 9/4/21 8:49 AM, Markus Armbruster wrote: > David Gibson <david@gibson.dropbear.id.au> writes: > >> On Wed, Sep 01, 2021 at 03:19:26PM +0200, Markus Armbruster wrote: >>> Daniel Henrique Barboza <danielhb413@gmail.com> writes: >>> >>>> At this moment we only provide one event to report a hotunplug error, >>>> MEM_UNPLUG_ERROR. As of Linux kernel 5.12 and QEMU 6.0.0, the pseries >>>> machine is now able to report unplug errors for other device types, such >>>> as CPUs. >>>> >>>> Instead of creating a (device_type)_UNPLUG_ERROR for each new device, >>>> create a generic DEVICE_UNPLUG_GUEST_ERROR event that can be used by all >>>> guest side unplug errors in the future. This event has a similar API as >>>> the existing DEVICE_DELETED event, always providing the QOM path of the >>>> device and dev->id if there's any. >>>> >>>> With this new generic event, MEM_UNPLUG_ERROR is now marked as deprecated. >>>> >>>> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> >>>> --- >>> >>> [...] >>> >>>> diff --git a/qapi/qdev.json b/qapi/qdev.json >>>> index 0e9cb2ae88..8b1a1dd43b 100644 >>>> --- a/qapi/qdev.json >>>> +++ b/qapi/qdev.json >>>> @@ -84,7 +84,9 @@ >>>> # This command merely requests that the guest begin the hot removal >>>> # process. Completion of the device removal process is signaled with a >>>> # DEVICE_DELETED event. Guest reset will automatically complete removal >>>> -# for all devices. >>>> +# for all devices. If a guest-side error in the hot removal process is >>>> +# detected, the device will not be removed and a DEVICE_UNPLUG_GUEST_ERROR >>>> +# event is sent. Some errors cannot be detected. >>>> # >>>> # Since: 0.14 >>>> # >>>> @@ -124,3 +126,27 @@ >>>> ## >>>> { 'event': 'DEVICE_DELETED', >>>> 'data': { '*device': 'str', 'path': 'str' } } >>>> + >>>> +## >>>> +# @DEVICE_UNPLUG_GUEST_ERROR: >>>> +# >>>> +# Emitted when a device hot unplug fails due to an internal guest >>>> +# error. >>> >>> Suggest to scratch "internal". >> >> I'd suggest s/internal guest/guest reported/. "guest error" is a bit >> vague, this doesn't neccessarily indicate a bug in the guest. The key >> point is that we're reporting this event because the guest performed >> some explicit action to tell us something went wrong with the plug >> attempt. > > Yes, that's better. I agree. David, let me know if you need another spin with this change. Thanks, Daniel > > [...] >
On Mon, Sep 06, 2021 at 09:40:47AM -0300, Daniel Henrique Barboza wrote: > > > On 9/4/21 8:49 AM, Markus Armbruster wrote: > > David Gibson <david@gibson.dropbear.id.au> writes: > > > > > On Wed, Sep 01, 2021 at 03:19:26PM +0200, Markus Armbruster wrote: > > > > Daniel Henrique Barboza <danielhb413@gmail.com> writes: > > > > > > > > > At this moment we only provide one event to report a hotunplug error, > > > > > MEM_UNPLUG_ERROR. As of Linux kernel 5.12 and QEMU 6.0.0, the pseries > > > > > machine is now able to report unplug errors for other device types, such > > > > > as CPUs. > > > > > > > > > > Instead of creating a (device_type)_UNPLUG_ERROR for each new device, > > > > > create a generic DEVICE_UNPLUG_GUEST_ERROR event that can be used by all > > > > > guest side unplug errors in the future. This event has a similar API as > > > > > the existing DEVICE_DELETED event, always providing the QOM path of the > > > > > device and dev->id if there's any. > > > > > > > > > > With this new generic event, MEM_UNPLUG_ERROR is now marked as deprecated. > > > > > > > > > > Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> > > > > > --- > > > > > > > > [...] > > > > > > > > > diff --git a/qapi/qdev.json b/qapi/qdev.json > > > > > index 0e9cb2ae88..8b1a1dd43b 100644 > > > > > --- a/qapi/qdev.json > > > > > +++ b/qapi/qdev.json > > > > > @@ -84,7 +84,9 @@ > > > > > # This command merely requests that the guest begin the hot removal > > > > > # process. Completion of the device removal process is signaled with a > > > > > # DEVICE_DELETED event. Guest reset will automatically complete removal > > > > > -# for all devices. > > > > > +# for all devices. If a guest-side error in the hot removal process is > > > > > +# detected, the device will not be removed and a DEVICE_UNPLUG_GUEST_ERROR > > > > > +# event is sent. Some errors cannot be detected. > > > > > # > > > > > # Since: 0.14 > > > > > # > > > > > @@ -124,3 +126,27 @@ > > > > > ## > > > > > { 'event': 'DEVICE_DELETED', > > > > > 'data': { '*device': 'str', 'path': 'str' } } > > > > > + > > > > > +## > > > > > +# @DEVICE_UNPLUG_GUEST_ERROR: > > > > > +# > > > > > +# Emitted when a device hot unplug fails due to an internal guest > > > > > +# error. > > > > > > > > Suggest to scratch "internal". > > > > > > I'd suggest s/internal guest/guest reported/. "guest error" is a bit > > > vague, this doesn't neccessarily indicate a bug in the guest. The key > > > point is that we're reporting this event because the guest performed > > > some explicit action to tell us something went wrong with the plug > > > attempt. > > > > Yes, that's better. > > > I agree. David, let me know if you need another spin with this > change. Yes please. I'm afraid I kind of lost track of the last posting.
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 6d438f1c8d..1a8ffc9381 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -204,6 +204,16 @@ The ``I7200`` guest CPU relies on the nanoMIPS ISA, which is deprecated (the ISA has never been upstreamed to a compiler toolchain). Therefore this CPU is also deprecated. + +QEMU API (QAPI) events +---------------------- + +``MEM_UNPLUG_ERROR`` (since 6.2) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Use the more generic event ``DEVICE_UNPLUG_GUEST_ERROR`` instead. + + System emulator machines ------------------------ diff --git a/qapi/machine.json b/qapi/machine.json index 157712f006..cd397f1ee4 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1271,6 +1271,10 @@ # # @msg: Informative message # +# Features: +# @deprecated: This event is deprecated. Use @DEVICE_UNPLUG_GUEST_ERROR +# instead. +# # Since: 2.4 # # Example: @@ -1283,7 +1287,8 @@ # ## { 'event': 'MEM_UNPLUG_ERROR', - 'data': { 'device': 'str', 'msg': 'str' } } + 'data': { 'device': 'str', 'msg': 'str' }, + 'features': ['deprecated'] } ## # @SMPConfiguration: diff --git a/qapi/qdev.json b/qapi/qdev.json index 0e9cb2ae88..8b1a1dd43b 100644 --- a/qapi/qdev.json +++ b/qapi/qdev.json @@ -84,7 +84,9 @@ # This command merely requests that the guest begin the hot removal # process. Completion of the device removal process is signaled with a # DEVICE_DELETED event. Guest reset will automatically complete removal -# for all devices. +# for all devices. If a guest-side error in the hot removal process is +# detected, the device will not be removed and a DEVICE_UNPLUG_GUEST_ERROR +# event is sent. Some errors cannot be detected. # # Since: 0.14 # @@ -124,3 +126,27 @@ ## { 'event': 'DEVICE_DELETED', 'data': { '*device': 'str', 'path': 'str' } } + +## +# @DEVICE_UNPLUG_GUEST_ERROR: +# +# Emitted when a device hot unplug fails due to an internal guest +# error. +# +# @device: the device's ID if it has one +# +# @path: the device's QOM path +# +# Since: 6.2 +# +# Example: +# +# <- { "event": "DEVICE_UNPLUG_GUEST_ERROR" +# "data": { "device": "core1", +# "path": "/machine/peripheral/core1" }, +# }, +# "timestamp": { "seconds": 1615570772, "microseconds": 202844 } } +# +## +{ 'event': 'DEVICE_UNPLUG_GUEST_ERROR', + 'data': { '*device': 'str', 'path': 'str' } } diff --git a/stubs/qdev.c b/stubs/qdev.c index 92e6143134..28d6d531e6 100644 --- a/stubs/qdev.c +++ b/stubs/qdev.c @@ -21,3 +21,10 @@ void qapi_event_send_device_deleted(bool has_device, { /* Nothing to do. */ } + +void qapi_event_send_device_unplug_guest_error(bool has_device, + const char *device, + const char *path +{ + /* Nothing to do. */ +}
At this moment we only provide one event to report a hotunplug error, MEM_UNPLUG_ERROR. As of Linux kernel 5.12 and QEMU 6.0.0, the pseries machine is now able to report unplug errors for other device types, such as CPUs. Instead of creating a (device_type)_UNPLUG_ERROR for each new device, create a generic DEVICE_UNPLUG_GUEST_ERROR event that can be used by all guest side unplug errors in the future. This event has a similar API as the existing DEVICE_DELETED event, always providing the QOM path of the device and dev->id if there's any. With this new generic event, MEM_UNPLUG_ERROR is now marked as deprecated. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- docs/about/deprecated.rst | 10 ++++++++++ qapi/machine.json | 7 ++++++- qapi/qdev.json | 28 +++++++++++++++++++++++++++- stubs/qdev.c | 7 +++++++ 4 files changed, 50 insertions(+), 2 deletions(-)