From 1582699fb9f748f9f91b015ef311f93bf5a95f5d Mon Sep 17 00:00:00 2001

From: Paolo Bonzini <pbonzini@redhat.com>

Date: Fri, 20 Sep 2013 16:57:56 +0200

Subject: [PATCH] virtio-net: switch exit callback to VirtioDeviceClass

This ensures hot-unplug is handled properly by the proxy.

Cc: qemu-stable@nongnu.org

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

---

 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 aa1880c..46a4d8c 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;