ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio-serial: switch exit callback to VirtioDeviceClass 

This ensures hot-unplug is handled properly by the proxy, and avoids
leaking bus_name which is freed by virtio_device_exit.

Cc: qemu-stable@nongnu.org
Acked-by: Andreas Faerber <afaerber@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-09-20 14:05:56 +02:00
parent 40dfc16f5f
commit 0e86c13fe2
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/char/virtio-serial-bus.c
View File

@ -987,12 +987,11 @@ static const TypeInfo virtio_serial_port_type_info = {
.class_init = virtio_serial_port_class_init, .class_init = virtio_serial_port_class_init,
}; };
static int virtio_serial_device_exit(DeviceState *dev) static void virtio_serial_device_exit(VirtIODevice *vdev)
{ {
VirtIOSerial *vser = VIRTIO_SERIAL(dev); VirtIOSerial *vser = VIRTIO_SERIAL(vdev);
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
unregister_savevm(dev, "virtio-console", vser); unregister_savevm(DEVICE(vdev), "virtio-console", vser);
g_free(vser->ivqs); g_free(vser->ivqs);
g_free(vser->ovqs); g_free(vser->ovqs);
@ -1004,7 +1003,6 @@ static int virtio_serial_device_exit(DeviceState *dev)
g_free(vser->post_load); g_free(vser->post_load);
} }
virtio_cleanup(vdev); virtio_cleanup(vdev);
return 0;
} }
static Property virtio_serial_properties[] = { static Property virtio_serial_properties[] = {
@ -1016,10 +1014,10 @@ static void virtio_serial_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass); VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
dc->exit = virtio_serial_device_exit;
dc->props = virtio_serial_properties; dc->props = virtio_serial_properties;
set_bit(DEVICE_CATEGORY_INPUT, dc->categories); set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
vdc->init = virtio_serial_device_init; vdc->init = virtio_serial_device_init;
vdc->exit = virtio_serial_device_exit;
vdc->get_features = get_features; vdc->get_features = get_features;
vdc->get_config = get_config; vdc->get_config = get_config;
vdc->set_config = set_config; vdc->set_config = set_config;