[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/11] virtio-net: switch exit callback to VirtioDev
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 07/11] virtio-net: switch exit callback to VirtioDeviceClass |
Date: |
Fri, 20 Sep 2013 16:57:56 +0200 |
This ensures hot-unplug is handled properly by the proxy.
Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/net/virtio-net.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index dd41008..40f9f61 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -1568,16 +1568,15 @@ static int virtio_net_device_init(VirtIODevice *vdev)
return 0;
}
-static int virtio_net_device_exit(DeviceState *qdev)
+static void virtio_net_device_exit(VirtIODevice *vdev)
{
- VirtIONet *n = VIRTIO_NET(qdev);
- VirtIODevice *vdev = VIRTIO_DEVICE(qdev);
+ VirtIONet *n = VIRTIO_NET(vdev);
int i;
/* This will stop vhost backend if appropriate. */
virtio_net_set_status(vdev, 0);
- unregister_savevm(qdev, "virtio-net", n);
+ unregister_savevm(DEVICE(vdev), "virtio-net", n);
if (n->netclient_name) {
g_free(n->netclient_name);
@@ -1608,8 +1607,6 @@ static int virtio_net_device_exit(DeviceState *qdev)
g_free(n->vqs);
qemu_del_nic(n->nic);
virtio_cleanup(vdev);
-
- return 0;
}
static void virtio_net_instance_init(Object *obj)
@@ -1636,10 +1633,10 @@ static void virtio_net_class_init(ObjectClass *klass,
void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
- dc->exit = virtio_net_device_exit;
dc->props = virtio_net_properties;
set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
vdc->init = virtio_net_device_init;
+ vdc->exit = virtio_net_device_exit;
vdc->get_config = virtio_net_get_config;
vdc->set_config = virtio_net_set_config;
vdc->get_features = virtio_net_get_features;
--
1.8.3.1
- [Qemu-devel] [PATCH 00/11] virtio: cleanup and fix hot-unplug, Paolo Bonzini, 2013/09/20
- [Qemu-devel] [PATCH 01/11] virtio-bus: remove vdev field, Paolo Bonzini, 2013/09/20
- [Qemu-devel] [PATCH 02/11] virtio-pci: remove vdev field, Paolo Bonzini, 2013/09/20
- [Qemu-devel] [PATCH 03/11] virtio-ccw: remove vdev field, Paolo Bonzini, 2013/09/20
- [Qemu-devel] [PATCH 04/11] virtio-bus: cleanup plug/unplug interface, Paolo Bonzini, 2013/09/20
- [Qemu-devel] [PATCH 05/11] virtio-blk: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/09/20
- [Qemu-devel] [PATCH 06/11] virtio-serial: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/09/20
- [Qemu-devel] [PATCH 07/11] virtio-net: switch exit callback to VirtioDeviceClass,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 08/11] virtio-scsi: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/09/20
- [Qemu-devel] [PATCH 09/11] virtio-balloon: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/09/20
- [Qemu-devel] [PATCH 10/11] virtio-rng: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/09/20
- [Qemu-devel] [PATCH 11/11] virtio-pci: add device_unplugged callback, Paolo Bonzini, 2013/09/20
- Re: [Qemu-devel] [PATCH 00/11] virtio: cleanup and fix hot-unplug, Michael S. Tsirkin, 2013/09/21