@@ -532,12 +532,13 @@ static void set_config(VirtIODevice *vdev, const uint8_t *config_data)
memcpy(&config, config_data, sizeof(config));
}
-static void guest_reset(VirtIOSerial *vser)
+static int virtser_bus_reset(BusState *qbus)
{
+ VirtIOSerialBus *bus = DO_UPCAST(VirtIOSerialBus, qbus, qbus);
VirtIOSerialPort *port;
VirtIOSerialPortClass *vsc;
- QTAILQ_FOREACH(port, &vser->ports, next) {
+ QTAILQ_FOREACH(port, &bus->vser->ports, next) {
vsc = VIRTIO_SERIAL_PORT_GET_CLASS(port);
if (port->guest_connected) {
port->guest_connected = false;
@@ -546,6 +547,7 @@ static void guest_reset(VirtIOSerial *vser)
vsc->guest_close(port);
}
}
+ return 0;
}
static void set_status(VirtIODevice *vdev, uint8_t status)
@@ -566,17 +568,6 @@ static void set_status(VirtIODevice *vdev, uint8_t status)
*/
port->guest_connected = true;
}
- if (!(status & VIRTIO_CONFIG_S_DRIVER_OK)) {
- guest_reset(vser);
- }
-}
-
-static void vser_reset(VirtIODevice *vdev)
-{
- VirtIOSerial *vser;
-
- vser = DO_UPCAST(VirtIOSerial, vdev, vdev);
- guest_reset(vser);
}
static void virtio_serial_save(QEMUFile *f, void *opaque)
@@ -766,6 +757,7 @@ static void virtser_bus_class_init(ObjectClass *klass, void *data)
{
BusClass *k = BUS_CLASS(klass);
k->print_dev = virtser_bus_dev_print;
+ k->reset = virtser_bus_reset;
}
static const TypeInfo virtser_bus_info = {
@@ -985,7 +977,6 @@ VirtIODevice *virtio_serial_init(DeviceState *dev, virtio_serial_conf *conf)
vser->vdev.get_config = get_config;
vser->vdev.set_config = set_config;
vser->vdev.set_status = set_status;
- vser->vdev.reset = vser_reset;
vser->qdev = dev;
Implement guest_reset as a bus-level reset callback. Then, the qdev and virtio core will call it when needed every time the device is reset or the status field is set to 0. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- hw/virtio-serial-bus.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)