[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/5] virtio-serial: Plug memory leak on qdev exit()
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 1/5] virtio-serial: Plug memory leak on qdev exit() |
Date: |
Wed, 25 May 2011 14:21:10 +0200 |
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 <address@hidden>
---
hw/virtio-serial-bus.c | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c
index f10d48f..adbcf6a 100644
--- a/hw/virtio-serial-bus.c
+++ b/hw/virtio-serial-bus.c
@@ -39,7 +39,7 @@ struct VirtIOSerial {
/* Arrays of ivqs and ovqs: one per port */
VirtQueue **ivqs, **ovqs;
- VirtIOSerialBus *bus;
+ VirtIOSerialBus bus;
DeviceState *qdev;
@@ -325,7 +325,7 @@ static void handle_control_message(VirtIOSerial *vser, void
*buf, size_t len)
case VIRTIO_CONSOLE_DEVICE_READY:
if (!cpkt.value) {
error_report("virtio-serial-bus: Guest failure in adding device
%s\n",
- vser->bus->qbus.name);
+ vser->bus.qbus.name);
break;
}
/*
@@ -340,7 +340,7 @@ static void handle_control_message(VirtIOSerial *vser, void
*buf, size_t len)
case VIRTIO_CONSOLE_PORT_READY:
if (!cpkt.value) {
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;
}
/*
@@ -467,7 +467,7 @@ static uint32_t get_features(VirtIODevice *vdev, uint32_t
features)
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);
}
return features;
@@ -644,16 +644,6 @@ static struct BusInfo virtser_bus_info = {
.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)
{
VirtIOSerialPort *port = DO_UPCAST(VirtIOSerialPort, dev, qdev);
@@ -835,11 +825,12 @@ VirtIODevice *virtio_serial_init(DeviceState *dev,
virtio_serial_conf *conf)
vser = DO_UPCAST(VirtIOSerial, vdev, vdev);
/* Spawn a new virtio-serial bus on which the ports will ride as devices */
- vser->bus = virtser_bus_new(dev);
- vser->bus->vser = vser;
+ qbus_create_inplace(&vser->bus.qbus, &virtser_bus_info, dev, NULL);
+ vser->bus.qbus.allow_hotplug = 1;
+ vser->bus.vser = vser;
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->ovqs = qemu_malloc(conf->max_virtserial_ports * sizeof(VirtQueue *));
@@ -859,7 +850,7 @@ VirtIODevice *virtio_serial_init(DeviceState *dev,
virtio_serial_conf *conf)
/* control queue: guest to host */
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 */
vser->ivqs[i] = virtio_add_queue(vdev, 128, handle_input);
/* Add a per-per queue for guest to host transfers */
--
1.7.2.3
- [Qemu-devel] [PATCH 0/5] virtio-serial: Fixes and cleanups, Markus Armbruster, 2011/05/25
- Re: [Qemu-devel] [PATCH 0/5] virtio-serial: Fixes and cleanups, Amit Shah, 2011/05/25
- [Qemu-devel] [PATCH 3/5] virtio-serial: Drop useless property is_console, Markus Armbruster, 2011/05/25
- [Qemu-devel] [PATCH 5/5] virtio-console: Simplify init callbacks, Markus Armbruster, 2011/05/25
- [Qemu-devel] [PATCH 2/5] virtio-serial: Clean up virtconsole detection, Markus Armbruster, 2011/05/25
- [Qemu-devel] [PATCH 1/5] virtio-serial: Plug memory leak on qdev exit(),
Markus Armbruster <=
- [Qemu-devel] [PATCH 4/5] virtio-serial: Drop redundant VirtIOSerialPort member info, Markus Armbruster, 2011/05/25