mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtio-serial-bus: fix guest_connected init before driver init

Browse Source 
guest_connected should be false before guest driver initialization, and
true after, both for multiport aware and non multiport aware drivers.

Don't set it before the guest_features are available; instead use
set_status which is called by io to VIRTIO_PCI_STATUS with
VIRTIO_CONFIG_S_DRIVER_OK by even older non multiport drivers.

[Amit: Add comment, tweak summary, only set guest_connected and not
       reset it as a side-effect.]

Signed-off-by: Alon Levy <alevy@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
This commit is contained in:
Alon Levy 2012-04-23 18:23:10 +03:00 committed by Amit Shah
parent 3c30dd5a68
commit 62a9fbf7fd
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/virtio-serial-bus.c
View File

@ -528,6 +528,26 @@ static void set_config(VirtIODevice *vdev, const uint8_t *config_data)
memcpy(&config, config_data, sizeof(config)); memcpy(&config, config_data, sizeof(config));
} }
static void set_status(VirtIODevice *vdev, uint8_t status)
{
VirtIOSerial *vser;
VirtIOSerialPort *port;
vser = DO_UPCAST(VirtIOSerial, vdev, vdev);
port = find_port_by_id(vser, 0);
if (port && !use_multiport(port->vser)
&& (status & VIRTIO_CONFIG_S_DRIVER_OK)) {
/*
* Non-multiport guests won't be able to tell us guest
* open/close status. Such guests can only have a port at id
* 0, so set guest_connected for such ports as soon as guest
* is up.
*/
port->guest_connected = true;
}
}
static void virtio_serial_save(QEMUFile *f, void *opaque) static void virtio_serial_save(QEMUFile *f, void *opaque)
{ {
VirtIOSerial *s = opaque; VirtIOSerial *s = opaque;
@ -798,14 +818,6 @@ static int virtser_port_qdev_init(DeviceState *qdev)
return ret; return ret;
} }
if (!use_multiport(port->vser)) {
/*
* Allow writes to guest in this case; we have no way of
* knowing if a guest port is connected.
*/
port->guest_connected = true;
}
port->elem.out_num = 0; port->elem.out_num = 0;
QTAILQ_INSERT_TAIL(&port->vser->ports, port, next); QTAILQ_INSERT_TAIL(&port->vser->ports, port, next);
@ -905,6 +917,7 @@ VirtIODevice *virtio_serial_init(DeviceState *dev, virtio_serial_conf *conf)
vser->vdev.get_features = get_features; vser->vdev.get_features = get_features;
vser->vdev.get_config = get_config; vser->vdev.get_config = get_config;
vser->vdev.set_config = set_config; vser->vdev.set_config = set_config;
vser->vdev.set_status = set_status;
vser->qdev = dev; vser->qdev = dev;