Merge remote-tracking branch 'amit/master' into staging
* amit/master: virtio-serial-bus: Unset guest_connected at reset and driver reset virtio-serial-bus: fix guest_connected init before driver init
This commit is contained in:
commit
d6a6922f3b
|
@ -528,6 +528,53 @@ 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 guest_reset(VirtIOSerial *vser)
|
||||||
|
{
|
||||||
|
VirtIOSerialPort *port;
|
||||||
|
VirtIOSerialPortClass *vsc;
|
||||||
|
|
||||||
|
QTAILQ_FOREACH(port, &vser->ports, next) {
|
||||||
|
vsc = VIRTIO_SERIAL_PORT_GET_CLASS(port);
|
||||||
|
if (port->guest_connected) {
|
||||||
|
port->guest_connected = false;
|
||||||
|
|
||||||
|
if (vsc->guest_close)
|
||||||
|
vsc->guest_close(port);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
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)
|
static void virtio_serial_save(QEMUFile *f, void *opaque)
|
||||||
{
|
{
|
||||||
VirtIOSerial *s = opaque;
|
VirtIOSerial *s = opaque;
|
||||||
|
@ -798,14 +845,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 +944,8 @@ 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->vdev.reset = vser_reset;
|
||||||
|
|
||||||
vser->qdev = dev;
|
vser->qdev = dev;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue