|
@@ -2453,9 +2453,9 @@ static void vmbus_unrealize(BusState *bus)
|
|
qemu_mutex_destroy(&vmbus->rx_queue_lock);
|
|
qemu_mutex_destroy(&vmbus->rx_queue_lock);
|
|
}
|
|
}
|
|
|
|
|
|
-static void vmbus_reset(BusState *bus)
|
|
|
|
|
|
+static void vmbus_reset_hold(Object *obj)
|
|
{
|
|
{
|
|
- vmbus_deinit(VMBUS(bus));
|
|
|
|
|
|
+ vmbus_deinit(VMBUS(obj));
|
|
}
|
|
}
|
|
|
|
|
|
static char *vmbus_get_dev_path(DeviceState *dev)
|
|
static char *vmbus_get_dev_path(DeviceState *dev)
|
|
@@ -2476,12 +2476,13 @@ static char *vmbus_get_fw_dev_path(DeviceState *dev)
|
|
static void vmbus_class_init(ObjectClass *klass, void *data)
|
|
static void vmbus_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
{
|
|
BusClass *k = BUS_CLASS(klass);
|
|
BusClass *k = BUS_CLASS(klass);
|
|
|
|
+ ResettableClass *rc = RESETTABLE_CLASS(klass);
|
|
|
|
|
|
k->get_dev_path = vmbus_get_dev_path;
|
|
k->get_dev_path = vmbus_get_dev_path;
|
|
k->get_fw_dev_path = vmbus_get_fw_dev_path;
|
|
k->get_fw_dev_path = vmbus_get_fw_dev_path;
|
|
k->realize = vmbus_realize;
|
|
k->realize = vmbus_realize;
|
|
k->unrealize = vmbus_unrealize;
|
|
k->unrealize = vmbus_unrealize;
|
|
- k->reset = vmbus_reset;
|
|
|
|
|
|
+ rc->phases.hold = vmbus_reset_hold;
|
|
}
|
|
}
|
|
|
|
|
|
static int vmbus_pre_load(void *opaque)
|
|
static int vmbus_pre_load(void *opaque)
|