@@ -166,3 +166,178 @@
{ 'event': 'DEVICE_UNPLUG_GUEST_ERROR',
'data': { '*device': { 'type': 'str', 'features': [ 'deprecated' ] },
'path': 'str' } }
+
+##
+# @LedActivity:
+#
+# Three-state led indicator state.
+#
+# @on: Indicator is on.
+#
+# @blink: Indicator is blinking.
+#
+# @off: Indicator is off.
+#
+# Since: 8.0
+##
+{ 'enum': 'LedActivity',
+ 'data': [ 'on', 'blink', 'off' ] }
+
+##
+# @HotplugSHPCSlotState:
+#
+# Standard Hot-Plug Controller slot state.
+#
+# @power-only: Slot is powered on but neither clock nor bus are connected.
+#
+# @enabled: Slot is powered on, clock and bus are connected, the card is
+# fully functional from a hardware standpoint.
+#
+# @disabled: Slot is disabled, card us safe to be removed.
+#
+# Since: 8.0
+##
+{ 'enum': 'HotplugSHPCSlotState',
+ 'data': [ 'power-only', 'enabled', 'disabled' ] }
+
+##
+# @HotplugBaseState:
+#
+# Base structure for SHPC and PCIe-native hotplug.
+#
+# @power-led: Power indicator. When power indicator is on the device is
+# ready and accepted by guest. Off status means that device
+# is safe to remove and blinking is an intermediate state of
+# hot-plug or hot-unplug.
+#
+# @attention-led: Attention indicator. Off status means normal operation,
+# On signals about operational problem, Blinking is for
+# locating the slot.
+#
+# Since: 8.0
+##
+{ 'struct': 'HotplugBaseState',
+ 'data': { '*power-led': 'LedActivity',
+ '*attention-led': 'LedActivity' } }
+
+##
+# @HotplugSHPCState:
+#
+# Standard Hot Plug Controller state.
+#
+# @slot-state: The slot state field of Slot Status.
+#
+# Since: 8.0
+##
+{ 'struct': 'HotplugSHPCState',
+ 'base': 'HotplugBaseState',
+ 'data': { '*slot-state': 'HotplugSHPCSlotState' } }
+
+##
+# @HotplugPCIeNativeState:
+#
+# PCIe Native hotplug slot state.
+#
+# @power-on: PCIe Power Controller Control of Slot Control Register.
+# True means Power On (Power Controller Control bit is 0),
+# False means Power Off (Power Controller Control bit is 1).
+#
+# Since: 8.0
+##
+{ 'struct': 'HotplugPCIeNativeState',
+ 'base': 'HotplugBaseState',
+ 'data': { '*power-on': 'bool' } }
+
+##
+# @HotplugType:
+#
+# Type of hotplug controller / provider.
+#
+# @shpc: Standard Hot Plug Controller
+#
+# @pcie-native: PCIe Native hotplug
+#
+# Since: 8.0
+##
+{ 'enum': 'HotplugType',
+ 'data': ['shpc', 'pcie-native'] }
+
+##
+# @HotplugState:
+#
+# Generic hotplug slot state.
+#
+# @type: type of the hotplug (shpc or pcie-native)
+#
+# Single: 8.0
+##
+{ 'union': 'HotplugState',
+ 'base': { 'type': 'HotplugType' },
+ 'discriminator': 'type',
+ 'data': { 'shpc': 'HotplugSHPCState',
+ 'pcie-native': 'HotplugPCIeNativeState' } }
+
+##
+# @HotplugBase:
+#
+# @bus: The QOM path of the parent bus where device is hotplugged.
+#
+# @addr: The bus address for hotplugged device if applicable.
+#
+# @child: the hotplugged device's QOM path. The field absent if
+# there is no device at the moment.
+#
+# Since: 8.0
+##
+{ 'struct': 'HotplugBase',
+ 'data': { 'bus': 'str',
+ '*addr': 'str',
+ '*child': 'str' } }
+
+##
+# @HotplugEvent:
+#
+# @changed: The hotplug controller states being changed. The state
+# fields that are not changed are not included into @changed.
+#
+# Since: 8.0
+##
+{ 'struct': 'HotplugEvent',
+ 'base': 'HotplugBase',
+ 'data': { 'changed': 'HotplugState' } }
+
+##
+# @HotplugInfo:
+#
+# @state: Current hotplug controller state. All applicable fields are
+# included into @state.
+#
+# Since: 8.0
+##
+{ 'struct': 'HotplugInfo',
+ 'base': 'HotplugBase',
+ 'data': { 'state': 'HotplugState' } }
+
+##
+# @HOTPLUG_STATE:
+#
+# Emitted whenever the state of hotplug controller changes.
+# Only changed values are included into event. Any change of any field
+# of the state trigger the event. Several fields are included into one
+# event if they are changed simultaneously.
+#
+# Since: 8.0
+##
+{ 'event': 'HOTPLUG_STATE',
+ 'data': 'HotplugEvent' }
+
+##
+# @query-hotplug:
+#
+# Query the state of hotplug controller.
+#
+# Since: 8.0
+##
+{ 'command': 'query-hotplug',
+ 'data': { 'id': 'str' },
+ 'returns': 'HotplugInfo' }
@@ -13,6 +13,7 @@
#define HOTPLUG_H
#include "qom/object.h"
+#include "qapi/qapi-types-qdev.h"
#define TYPE_HOTPLUG_HANDLER "hotplug-handler"
@@ -58,6 +59,8 @@ struct HotplugHandlerClass {
hotplug_fn plug;
hotplug_fn unplug_request;
hotplug_fn unplug;
+ HotplugInfo *(*get_hotplug_state)(HotplugHandler *plug_handler,
+ DeviceState *plugged_dev, Error **errp);
};
/**
@@ -94,4 +97,13 @@ void hotplug_handler_unplug_request(HotplugHandler *plug_handler,
void hotplug_handler_unplug(HotplugHandler *plug_handler,
DeviceState *plugged_dev,
Error **errp);
+
+/**
+ * hotplug_handler_get_hotplug_state:
+ *
+ * Calls #HotplugHandlerClass.get_hotplug_state callback of @plug_handler.
+ */
+HotplugInfo *hotplug_handler_get_hotplug_state(HotplugHandler *plug_handler,
+ DeviceState *plugged_dev,
+ Error **errp);
#endif
@@ -7,6 +7,9 @@
/* PCI includes legacy ISA access. */
#include "hw/isa/isa.h"
+#include "qapi/qapi-types-qdev.h"
+#include "qapi/qapi-events-qdev.h"
+
extern bool pci_available;
/* PCI bus */
@@ -126,6 +126,8 @@ void pci_bridge_dev_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
Error **errp);
void pci_bridge_dev_unplug_request_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp);
+HotplugInfo *pci_bridge_dev_get_hotplug_state(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp);
/*
* before qdev initialization(qdev_init()), this function sets bus_name and
@@ -146,4 +146,6 @@ void pcie_cap_slot_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
Error **errp);
void pcie_cap_slot_unplug_request_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp);
+HotplugInfo *pcie_cap_slot_get_hotplug_state(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp);
#endif /* QEMU_PCIE_H */
@@ -51,6 +51,8 @@ void shpc_device_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
Error **errp);
void shpc_device_unplug_request_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp);
+HotplugInfo *shpc_get_hotplug_state(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp);
extern VMStateInfo shpc_vmstate_info;
#define SHPC_VMSTATE(_field, _type, _test) \
@@ -1,6 +1,8 @@
#ifndef MONITOR_QDEV_H
#define MONITOR_QDEV_H
+#include "qapi/qapi-types-qdev.h"
+
/*** monitor commands ***/
void hmp_info_qtree(Monitor *mon, const QDict *qdict);
@@ -36,4 +38,7 @@ DeviceState *qdev_device_add_from_qdict(const QDict *opts,
*/
const char *qdev_set_id(DeviceState *dev, char *id, Error **errp);
+void qdev_hotplug_state_event(DeviceState *bus, const char *addr,
+ DeviceState *child, HotplugState *changed_state);
+
#endif
@@ -57,6 +57,19 @@ void hotplug_handler_unplug(HotplugHandler *plug_handler,
}
}
+HotplugInfo *hotplug_handler_get_hotplug_state(HotplugHandler *plug_handler,
+ DeviceState *plugged_dev,
+ Error **errp)
+{
+ HotplugHandlerClass *hdc = HOTPLUG_HANDLER_GET_CLASS(plug_handler);
+
+ if (hdc->get_hotplug_state) {
+ return hdc->get_hotplug_state(plug_handler, plugged_dev, errp);
+ }
+
+ return NULL;
+}
+
static const TypeInfo hotplug_handler_info = {
.name = TYPE_HOTPLUG_HANDLER,
.parent = TYPE_INTERFACE,
@@ -241,6 +241,19 @@ void pci_bridge_dev_unplug_request_cb(HotplugHandler *hotplug_dev,
shpc_device_unplug_request_cb(hotplug_dev, dev, errp);
}
+HotplugInfo *pci_bridge_dev_get_hotplug_state(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ PCIDevice *pci_hotplug_dev = PCI_DEVICE(hotplug_dev);
+
+ if (!shpc_present(pci_hotplug_dev)) {
+ error_setg(errp, "standard hotplug controller has been disabled for "
+ "this %s", object_get_typename(OBJECT(hotplug_dev)));
+ return NULL;
+ }
+ return shpc_get_hotplug_state(hotplug_dev, dev, errp);
+}
+
static void pci_bridge_dev_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
@@ -261,6 +274,7 @@ static void pci_bridge_dev_class_init(ObjectClass *klass, void *data)
hc->plug = pci_bridge_dev_plug_cb;
hc->unplug = pci_bridge_dev_unplug_cb;
hc->unplug_request = pci_bridge_dev_unplug_request_cb;
+ hc->get_hotplug_state = pci_bridge_dev_get_hotplug_state;
}
static const TypeInfo pci_bridge_dev_info = {
@@ -157,6 +157,7 @@ static void pcie_pci_bridge_class_init(ObjectClass *klass, void *data)
hc->plug = pci_bridge_dev_plug_cb;
hc->unplug = pci_bridge_dev_unplug_cb;
hc->unplug_request = pci_bridge_dev_unplug_request_cb;
+ hc->get_hotplug_state = pci_bridge_dev_get_hotplug_state;
}
static const TypeInfo pcie_pci_bridge_info = {
@@ -19,6 +19,8 @@
*/
#include "qemu/osdep.h"
+
+#include "monitor/qdev.h"
#include "qapi/error.h"
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pcie.h"
@@ -45,6 +47,23 @@ static bool pcie_sltctl_powered_off(uint16_t sltctl)
&& (sltctl & PCI_EXP_SLTCTL_PIC) == PCI_EXP_SLTCTL_PWR_IND_OFF;
}
+static LedActivity pcie_led_state_to_qapi(uint16_t value)
+{
+ switch (value) {
+ case PCI_EXP_SLTCTL_PWR_IND_ON:
+ case PCI_EXP_SLTCTL_ATTN_IND_ON:
+ return LED_ACTIVITY_ON;
+ case PCI_EXP_SLTCTL_PWR_IND_BLINK:
+ case PCI_EXP_SLTCTL_ATTN_IND_BLINK:
+ return LED_ACTIVITY_BLINK;
+ case PCI_EXP_SLTCTL_PWR_IND_OFF:
+ case PCI_EXP_SLTCTL_ATTN_IND_OFF:
+ return LED_ACTIVITY_OFF;
+ default:
+ abort();
+ }
+}
+
/***************************************************************************
* pci express capability helper functions
*/
@@ -728,9 +747,17 @@ void pcie_cap_slot_write_config(PCIDevice *dev,
uint16_t old_slt_ctl, uint16_t old_slt_sta,
uint32_t addr, uint32_t val, int len)
{
+ PCIBus *sec_bus = pci_bridge_get_sec_bus(PCI_BRIDGE(dev));
uint32_t pos = dev->exp.exp_cap;
uint8_t *exp_cap = dev->config + pos;
uint16_t sltsta = pci_get_word(exp_cap + PCI_EXP_SLTSTA);
+ uint16_t power_led, attn_led, pcc, old_power_led, old_attn_led, old_pcc;
+ DeviceState *child_dev =
+ DEVICE(pci_find_the_only_child(sec_bus, pci_bus_num(sec_bus), NULL));
+ HotplugState changed_state = {
+ .type = HOTPLUG_TYPE_PCIE_NATIVE,
+ };
+ HotplugPCIeNativeState *cs = &changed_state.u.pcie_native;
if (ranges_overlap(addr, len, pos + PCI_EXP_SLTSTA, 2)) {
/*
@@ -768,6 +795,27 @@ void pcie_cap_slot_write_config(PCIDevice *dev,
sltsta);
}
+ power_led = val & PCI_EXP_SLTCTL_PIC;
+ old_power_led = old_slt_ctl & PCI_EXP_SLTCTL_PIC;
+ cs->has_power_led = power_led != old_power_led;
+ cs->power_led = cs->has_power_led ? pcie_led_state_to_qapi(power_led) : 0;
+
+ attn_led = val & PCI_EXP_SLTCTL_AIC;
+ old_attn_led = old_slt_ctl & PCI_EXP_SLTCTL_AIC;
+ cs->has_attention_led = attn_led != old_attn_led;
+ cs->attention_led =
+ cs->has_attention_led ? pcie_led_state_to_qapi(attn_led) : 0;
+
+ pcc = val & PCI_EXP_SLTCTL_PCC;
+ old_pcc = old_slt_ctl & PCI_EXP_SLTCTL_PCC;
+ cs->has_power_on = pcc != old_pcc;
+ cs->power_on = cs->has_power_on ? pcc == PCI_EXP_SLTCTL_PWR_ON : false;
+
+
+ if (cs->has_power_led || cs->has_attention_led || cs->has_power_on) {
+ qdev_hotplug_state_event(DEVICE(dev), NULL, child_dev, &changed_state);
+ }
+
/*
* If the slot is populated, power indicator is off and power
* controller is off, it is safe to detach the devices.
@@ -1100,3 +1148,34 @@ void pcie_acs_reset(PCIDevice *dev)
pci_set_word(dev->config + dev->exp.acs_cap + PCI_ACS_CTRL, 0);
}
}
+
+HotplugInfo *pcie_cap_slot_get_hotplug_state(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ PCIDevice *hotplug_pdev = PCI_DEVICE(hotplug_dev);
+ DeviceState *hotplug_ds = DEVICE(hotplug_pdev);
+ uint8_t *exp_cap = hotplug_pdev->config + hotplug_pdev->exp.exp_cap;
+ uint16_t sltctl = pci_get_word(exp_cap + PCI_EXP_SLTCTL);
+ uint16_t power_led = sltctl & PCI_EXP_SLTCTL_PIC;
+ uint16_t attn_led = sltctl & PCI_EXP_SLTCTL_AIC;
+ uint16_t pcc = sltctl & PCI_EXP_SLTCTL_PCC;
+ HotplugInfo *res = g_new(HotplugInfo, 1);
+
+ *res = (HotplugInfo) {
+ .bus = g_strdup(hotplug_ds->canonical_path),
+ .child = g_strdup(dev->canonical_path),
+ .state = g_new(HotplugState, 1),
+ };
+
+ *res->state = (HotplugState) {
+ .type = HOTPLUG_TYPE_PCIE_NATIVE,
+ .u.pcie_native.has_power_led = true,
+ .u.pcie_native.power_led = pcie_led_state_to_qapi(power_led),
+ .u.pcie_native.has_attention_led = true,
+ .u.pcie_native.attention_led = pcie_led_state_to_qapi(attn_led),
+ .u.pcie_native.has_power_on = true,
+ .u.pcie_native.power_on = pcc == PCI_EXP_SLTCTL_PWR_ON,
+ };
+
+ return res;
+}
@@ -188,6 +188,7 @@ static void pcie_slot_class_init(ObjectClass *oc, void *data)
hc->plug = pcie_cap_slot_plug_cb;
hc->unplug = pcie_cap_slot_unplug_cb;
hc->unplug_request = pcie_cap_slot_unplug_request_cb;
+ hc->get_hotplug_state = pcie_cap_slot_get_hotplug_state;
}
static const TypeInfo pcie_slot_type_info = {
@@ -8,6 +8,9 @@
#include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
#include "hw/pci/msi.h"
+#include "qapi/qapi-types-qdev.h"
+#include "qapi/qapi-events-qdev.h"
+#include "monitor/qdev.h"
/* TODO: model power only and disabled slot states. */
/* TODO: handle SERR and wakeups */
@@ -123,6 +126,39 @@
#define SHPC_PCI_TO_IDX(pci_slot) ((pci_slot) - 1)
#define SHPC_IDX_TO_PHYSICAL(slot) ((slot) + 1)
+static char *shpc_idx_to_pci_addr(int slot)
+{
+ return g_strdup_printf("%d", SHPC_IDX_TO_PCI(slot));
+}
+
+static LedActivity shpc_led_state_to_qapi(uint8_t value)
+{
+ switch (value) {
+ case SHPC_LED_ON:
+ return LED_ACTIVITY_ON;
+ case SHPC_LED_BLINK:
+ return LED_ACTIVITY_BLINK;
+ case SHPC_LED_OFF:
+ return LED_ACTIVITY_OFF;
+ default:
+ abort();
+ }
+}
+
+static HotplugSHPCSlotState shpc_slot_state_to_qapi(uint8_t value)
+{
+ switch (value) {
+ case SHPC_STATE_PWRONLY:
+ return HOTPLUGSHPC_SLOT_STATE_POWER_ONLY;
+ case SHPC_STATE_ENABLED:
+ return HOTPLUGSHPC_SLOT_STATE_ENABLED;
+ case SHPC_STATE_DISABLED:
+ return HOTPLUGSHPC_SLOT_STATE_DISABLED;
+ default:
+ abort();
+ }
+}
+
static uint8_t shpc_get_status(SHPCDevice *shpc, int slot, uint16_t msk)
{
uint8_t *status = shpc->config + SHPC_SLOT_STATUS(slot);
@@ -268,9 +304,16 @@ static void shpc_slot_command(PCIDevice *d, uint8_t target,
{
SHPCDevice *shpc = d->shpc;
int slot = SHPC_LOGICAL_TO_IDX(target);
+ int pci_slot = SHPC_IDX_TO_PCI(slot);
uint8_t old_state = shpc_get_status(shpc, slot, SHPC_SLOT_STATE_MASK);
uint8_t old_power = shpc_get_status(shpc, slot, SHPC_SLOT_PWR_LED_MASK);
uint8_t old_attn = shpc_get_status(shpc, slot, SHPC_SLOT_ATTN_LED_MASK);
+ HotplugState changed_state = {
+ .type = HOTPLUG_TYPE_SHPC,
+ };
+ HotplugSHPCState *cs = &changed_state.u.shpc;
+ DeviceState *child_dev =
+ DEVICE(shpc->sec_bus->devices[PCI_DEVFN(pci_slot, 0)]);
if (target < SHPC_CMD_TRGT_MIN || slot >= shpc->nslots) {
shpc_invalid_command(shpc);
@@ -284,24 +327,34 @@ static void shpc_slot_command(PCIDevice *d, uint8_t target,
if (power == SHPC_LED_NO) {
power = old_power;
- } else {
- /* TODO: send event to monitor */
+ } else if (power != old_power) {
+ cs->has_power_led = true;
+ cs->power_led = shpc_led_state_to_qapi(power);
shpc_set_status(shpc, slot, power, SHPC_SLOT_PWR_LED_MASK);
}
if (attn == SHPC_LED_NO) {
attn = old_attn;
- } else {
- /* TODO: send event to monitor */
+ } else if (attn != old_attn) {
+ cs->has_attention_led = true;
+ cs->attention_led = shpc_led_state_to_qapi(attn);
shpc_set_status(shpc, slot, attn, SHPC_SLOT_ATTN_LED_MASK);
}
if (state == SHPC_STATE_NO) {
state = old_state;
- } else {
+ } else if (state != old_state) {
+ cs->has_slot_state = true;
+ cs->slot_state = shpc_slot_state_to_qapi(state);
shpc_set_status(shpc, slot, state, SHPC_SLOT_STATE_MASK);
}
+ if (cs->has_power_led || cs->has_attention_led || cs->has_slot_state) {
+ g_autofree char *addr = shpc_idx_to_pci_addr(slot);
+
+ qdev_hotplug_state_event(DEVICE(d), addr, child_dev, &changed_state);
+ }
+
if (!shpc_slot_is_off(old_state, old_power, old_attn) &&
shpc_slot_is_off(state, power, attn))
{
@@ -713,6 +766,45 @@ void shpc_cap_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l)
shpc_cap_update_dword(d);
}
+HotplugInfo *shpc_get_hotplug_state(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ PCIDevice *pci_hotplug_dev = PCI_DEVICE(hotplug_dev);
+ DeviceState *hotplug_ds = DEVICE(pci_hotplug_dev);
+ SHPCDevice *shpc = pci_hotplug_dev->shpc;
+ int slot;
+ uint8_t state, power, attn;
+ HotplugInfo *res;
+
+ if (!shpc_device_get_slot(PCI_DEVICE(dev), &slot, shpc, errp)) {
+ return NULL;
+ }
+
+ state = shpc_get_status(shpc, slot, SHPC_SLOT_STATE_MASK);
+ power = shpc_get_status(shpc, slot, SHPC_SLOT_PWR_LED_MASK);
+ attn = shpc_get_status(shpc, slot, SHPC_SLOT_ATTN_LED_MASK);
+
+ res = g_new(HotplugInfo, 1);
+ *res = (HotplugInfo) {
+ .bus = g_strdup(hotplug_ds->canonical_path),
+ .addr = shpc_idx_to_pci_addr(slot),
+ .child = g_strdup(dev->canonical_path),
+ .state = g_new(HotplugState, 1),
+ };
+
+ *res->state = (HotplugState) {
+ .type = HOTPLUG_TYPE_SHPC,
+ .u.shpc.has_power_led = true,
+ .u.shpc.power_led = shpc_led_state_to_qapi(power),
+ .u.shpc.has_attention_led = true,
+ .u.shpc.attention_led = shpc_led_state_to_qapi(attn),
+ .u.shpc.has_slot_state = true,
+ .u.shpc.slot_state = shpc_slot_state_to_qapi(state),
+ };
+
+ return res;
+}
+
static int shpc_save(QEMUFile *f, void *pv, size_t size,
const VMStateField *field, JSONWriter *vmdesc)
{
@@ -25,6 +25,7 @@
#include "sysemu/arch_init.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-qdev.h"
+#include "qapi/qapi-events-qdev.h"
#include "qapi/qmp/dispatch.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
@@ -956,6 +957,36 @@ void qmp_device_del(const char *id, Error **errp)
}
}
+HotplugInfo *qmp_query_hotplug(const char *id, Error **errp)
+{
+ DeviceState *dev = find_device_state(id, errp);
+ HotplugHandler *hotplug_ctrl;
+
+ if (!dev) {
+ return NULL;
+ }
+
+ if (dev->parent_bus && !qbus_is_hotpluggable(dev->parent_bus)) {
+ error_setg(errp, QERR_BUS_NO_HOTPLUG, dev->parent_bus->name);
+ return NULL;
+ }
+
+ if (!DEVICE_GET_CLASS(dev)->hotpluggable) {
+ error_setg(errp, QERR_DEVICE_NO_HOTPLUG,
+ object_get_typename(OBJECT(dev)));
+ return NULL;
+ }
+
+ hotplug_ctrl = qdev_get_hotplug_handler(dev);
+ /*
+ * hotpluggable device MUST have HotplugHandler, if it doesn't
+ * then something is very wrong with it.
+ */
+ g_assert(hotplug_ctrl);
+
+ return hotplug_handler_get_hotplug_state(hotplug_ctrl, dev, errp);
+}
+
void hmp_device_add(Monitor *mon, const QDict *qdict)
{
Error *err = NULL;
@@ -1146,3 +1177,11 @@ bool qmp_command_available(const QmpCommand *cmd, Error **errp)
}
return true;
}
+
+void qdev_hotplug_state_event(DeviceState *bus, const char *addr,
+ DeviceState *child, HotplugState *changed_state)
+{
+ qapi_event_send_hotplug_state(bus->canonical_path,
+ addr, child ? child->canonical_path : NULL,
+ changed_state);
+}
For PCIe and SHPC hotplug it's important to track led indicators, especially the power led. Add an event that helps. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> --- qapi/qdev.json | 175 ++++++++++++++++++++++++++++++++ include/hw/hotplug.h | 12 +++ include/hw/pci/pci.h | 3 + include/hw/pci/pci_bridge.h | 2 + include/hw/pci/pcie.h | 2 + include/hw/pci/shpc.h | 2 + include/monitor/qdev.h | 5 + hw/core/hotplug.c | 13 +++ hw/pci-bridge/pci_bridge_dev.c | 14 +++ hw/pci-bridge/pcie_pci_bridge.c | 1 + hw/pci/pcie.c | 79 ++++++++++++++ hw/pci/pcie_port.c | 1 + hw/pci/shpc.c | 102 ++++++++++++++++++- softmmu/qdev-monitor.c | 39 +++++++ 14 files changed, 445 insertions(+), 5 deletions(-)