openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virtio-serial-bus: use bh for unthrottling 

Instead of calling flush_queued_data when unthrottling, schedule
a bh. That way we can return immediately to the caller, and the
flush uses the same call path as a have_data for callbackee.

No migration change is required because bh are called from vm_stop.

Signed-off-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
This commit is contained in:
Alon Levy 2011-04-29 14:25:06 +03:00 committed by Amit Shah
parent aa29141d84
commit 199646d815
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,6 +285,13 @@ size_t virtio_serial_guest_ready(VirtIOSerialPort *port)
return 0; return 0;
} }
static void flush_queued_data_bh(void *opaque)
{
VirtIOSerialPort *port = opaque;
flush_queued_data(port);
}
void virtio_serial_throttle_port(VirtIOSerialPort *port, bool throttle) void virtio_serial_throttle_port(VirtIOSerialPort *port, bool throttle)
{ {
if (!port) { if (!port) {
@ -295,8 +302,7 @@ void virtio_serial_throttle_port(VirtIOSerialPort *port, bool throttle)
if (throttle) { if (throttle) {
return; return;
} }
qemu_bh_schedule(port->bh);
flush_queued_data(port);
} }
/* Guest wants to notify us of some event */ /* Guest wants to notify us of some event */
@ -726,6 +732,7 @@ static int virtser_port_qdev_init(DeviceState *qdev, DeviceInfo *base)
bool plugging_port0; bool plugging_port0;
port->vser = bus->vser; port->vser = bus->vser;
port->bh = qemu_bh_new(flush_queued_data_bh, port);
/* /*
* Is the first console port we're seeing? If so, put it up at * Is the first console port we're seeing? If so, put it up at
@ -792,6 +799,7 @@ static int virtser_port_qdev_exit(DeviceState *qdev)
VirtIOSerialPort *port = DO_UPCAST(VirtIOSerialPort, dev, qdev); VirtIOSerialPort *port = DO_UPCAST(VirtIOSerialPort, dev, qdev);
VirtIOSerial *vser = port->vser; VirtIOSerial *vser = port->vser;
qemu_bh_delete(port->bh);
remove_port(port->vser, port->id); remove_port(port->vser, port->id);
QTAILQ_REMOVE(&vser->ports, port, next); QTAILQ_REMOVE(&vser->ports, port, next);

5
hw/virtio-serial.h
View File

@ -119,6 +119,11 @@ struct VirtIOSerialPort {
uint32_t iov_idx; uint32_t iov_idx;
uint64_t iov_offset; uint64_t iov_offset;
/*
* When unthrottling we use a bottom-half to call flush_queued_data.
*/
QEMUBH *bh;
/* Identify if this is a port that binds with hvc in the guest */ /* Identify if this is a port that binds with hvc in the guest */
uint8_t is_console; uint8_t is_console;