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

virtio-serial: Plug memory leak on qdev exit()

Browse Source 
virtio_serial_init() allocates the VirtIOSerialBus dynamically, but
virtio_serial_exit() doesn't free it.

Fix by getting rid of the allocation.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
This commit is contained in:
Markus Armbruster 2011-05-25 14:21:10 +02:00 committed by Amit Shah
parent 199646d815
commit 5e52e5f903
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ struct VirtIOSerial {
/* Arrays of ivqs and ovqs: one per port */ /* Arrays of ivqs and ovqs: one per port */
VirtQueue **ivqs, **ovqs; VirtQueue **ivqs, **ovqs;
VirtIOSerialBus *bus; VirtIOSerialBus bus;
DeviceState *qdev; DeviceState *qdev;
@ -331,7 +331,7 @@ static void handle_control_message(VirtIOSerial *vser, void *buf, size_t len)
case VIRTIO_CONSOLE_DEVICE_READY: case VIRTIO_CONSOLE_DEVICE_READY:
if (!cpkt.value) { if (!cpkt.value) {
error_report("virtio-serial-bus: Guest failure in adding device %s\n", error_report("virtio-serial-bus: Guest failure in adding device %s\n",
vser->bus->qbus.name); vser->bus.qbus.name);
break; break;
} }
/* /*
@ -346,7 +346,7 @@ static void handle_control_message(VirtIOSerial *vser, void *buf, size_t len)
case VIRTIO_CONSOLE_PORT_READY: case VIRTIO_CONSOLE_PORT_READY:
if (!cpkt.value) { if (!cpkt.value) {
error_report("virtio-serial-bus: Guest failure in adding port %u for device %s\n", error_report("virtio-serial-bus: Guest failure in adding port %u for device %s\n",
port->id, vser->bus->qbus.name); port->id, vser->bus.qbus.name);
break; break;
} }
/* /*
@ -473,7 +473,7 @@ static uint32_t get_features(VirtIODevice *vdev, uint32_t features)
vser = DO_UPCAST(VirtIOSerial, vdev, vdev); vser = DO_UPCAST(VirtIOSerial, vdev, vdev);
if (vser->bus->max_nr_ports > 1) { if (vser->bus.max_nr_ports > 1) {
features |= (1 << VIRTIO_CONSOLE_F_MULTIPORT); features |= (1 << VIRTIO_CONSOLE_F_MULTIPORT);
} }
return features; return features;
@ -650,16 +650,6 @@ static struct BusInfo virtser_bus_info = {
.print_dev = virtser_bus_dev_print, .print_dev = virtser_bus_dev_print,
}; };
static VirtIOSerialBus *virtser_bus_new(DeviceState *dev)
{
VirtIOSerialBus *bus;
bus = FROM_QBUS(VirtIOSerialBus, qbus_create(&virtser_bus_info, dev, NULL));
bus->qbus.allow_hotplug = 1;
return bus;
}
static void virtser_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent) static void virtser_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent)
{ {
VirtIOSerialPort *port = DO_UPCAST(VirtIOSerialPort, dev, qdev); VirtIOSerialPort *port = DO_UPCAST(VirtIOSerialPort, dev, qdev);
@ -843,11 +833,12 @@ VirtIODevice *virtio_serial_init(DeviceState *dev, virtio_serial_conf *conf)
vser = DO_UPCAST(VirtIOSerial, vdev, vdev); vser = DO_UPCAST(VirtIOSerial, vdev, vdev);
/* Spawn a new virtio-serial bus on which the ports will ride as devices */ /* Spawn a new virtio-serial bus on which the ports will ride as devices */
vser->bus = virtser_bus_new(dev); qbus_create_inplace(&vser->bus.qbus, &virtser_bus_info, dev, NULL);
vser->bus->vser = vser; vser->bus.qbus.allow_hotplug = 1;
vser->bus.vser = vser;
QTAILQ_INIT(&vser->ports); QTAILQ_INIT(&vser->ports);
vser->bus->max_nr_ports = conf->max_virtserial_ports; vser->bus.max_nr_ports = conf->max_virtserial_ports;
vser->ivqs = qemu_malloc(conf->max_virtserial_ports * sizeof(VirtQueue *)); vser->ivqs = qemu_malloc(conf->max_virtserial_ports * sizeof(VirtQueue *));
vser->ovqs = qemu_malloc(conf->max_virtserial_ports * sizeof(VirtQueue *)); vser->ovqs = qemu_malloc(conf->max_virtserial_ports * sizeof(VirtQueue *));
@ -867,7 +858,7 @@ VirtIODevice *virtio_serial_init(DeviceState *dev, virtio_serial_conf *conf)
/* control queue: guest to host */ /* control queue: guest to host */
vser->c_ovq = virtio_add_queue(vdev, 32, control_out); vser->c_ovq = virtio_add_queue(vdev, 32, control_out);
for (i = 1; i < vser->bus->max_nr_ports; i++) { for (i = 1; i < vser->bus.max_nr_ports; i++) {
/* Add a per-port queue for host to guest transfers */ /* Add a per-port queue for host to guest transfers */
vser->ivqs[i] = virtio_add_queue(vdev, 128, handle_input); vser->ivqs[i] = virtio_add_queue(vdev, 128, handle_input);
/* Add a per-per queue for guest to host transfers */ /* Add a per-per queue for guest to host transfers */