From 6a1a8cc7af5741a4221e1c5bc80c41390d896ff5 Mon Sep 17 00:00:00 2001 From: KONRAD Frederic Date: Wed, 24 Apr 2013 10:21:22 +0200 Subject: [PATCH] virtio: cleanup: init and exit function. This clean the init and the exit functions and rename virtio_common_cleanup to virtio_cleanup. Signed-off-by: KONRAD Frederic Message-id: 1366791683-5350-7-git-send-email-fred.konrad@greensocs.com Signed-off-by: Anthony Liguori --- hw/block/virtio-blk.c | 4 ++-- hw/char/virtio-serial-bus.c | 2 +- hw/net/virtio-net.c | 2 +- hw/scsi/virtio-scsi.c | 2 +- hw/virtio/virtio-balloon.c | 4 ++-- hw/virtio/virtio-rng.c | 2 +- hw/virtio/virtio.c | 17 +---------------- include/hw/virtio/virtio.h | 6 +----- 8 files changed, 10 insertions(+), 29 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index efad690239..cf12469b50 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -661,7 +661,7 @@ static int virtio_blk_device_init(VirtIODevice *vdev) s->vq = virtio_add_queue(vdev, 128, virtio_blk_handle_output); #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE if (!virtio_blk_data_plane_create(vdev, blk, &s->dataplane)) { - virtio_common_cleanup(vdev); + virtio_cleanup(vdev); return -1; } #endif @@ -689,7 +689,7 @@ static int virtio_blk_device_exit(DeviceState *dev) qemu_del_vm_change_state_handler(s->change); unregister_savevm(dev, "virtio-blk", s); blockdev_mark_auto_del(s->bs); - virtio_common_cleanup(vdev); + virtio_cleanup(vdev); return 0; } diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index 6a5b8b670c..3787ad2e1d 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -1001,7 +1001,7 @@ static int virtio_serial_device_exit(DeviceState *dev) qemu_free_timer(vser->post_load->timer); g_free(vser->post_load); } - virtio_common_cleanup(vdev); + virtio_cleanup(vdev); return 0; } diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 0a0d51609c..2aea5a10c4 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1374,7 +1374,7 @@ static int virtio_net_device_exit(DeviceState *qdev) g_free(n->vqs); qemu_del_nic(n->nic); - virtio_common_cleanup(vdev); + virtio_cleanup(vdev); return 0; } diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 630e459b02..84b3ac795d 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -640,7 +640,7 @@ int virtio_scsi_common_exit(VirtIOSCSICommon *vs) VirtIODevice *vdev = VIRTIO_DEVICE(vs); g_free(vs->cmd_vqs); - virtio_common_cleanup(vdev); + virtio_cleanup(vdev); return 0; } diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 95fb3b06be..d669756a7f 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -348,7 +348,7 @@ static int virtio_balloon_device_init(VirtIODevice *vdev) virtio_balloon_stat, s); if (ret < 0) { - virtio_common_cleanup(VIRTIO_DEVICE(s)); + virtio_cleanup(VIRTIO_DEVICE(s)); return -1; } @@ -377,7 +377,7 @@ static int virtio_balloon_device_exit(DeviceState *qdev) balloon_stats_destroy_timer(s); qemu_remove_balloon_handler(s); unregister_savevm(qdev, "virtio-balloon", s); - virtio_common_cleanup(vdev); + virtio_cleanup(vdev); return 0; } diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 82d7a7436a..cb787c792d 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -192,7 +192,7 @@ static int virtio_rng_device_exit(DeviceState *qdev) qemu_del_timer(vrng->rate_limit_timer); qemu_free_timer(vrng->rate_limit_timer); unregister_savevm(qdev, "virtio-rng", vrng); - virtio_common_cleanup(vdev); + virtio_cleanup(vdev); return 0; } diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index e66dab114a..0f88c251c1 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -910,19 +910,13 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f) return 0; } -void virtio_common_cleanup(VirtIODevice *vdev) +void virtio_cleanup(VirtIODevice *vdev) { qemu_del_vm_change_state_handler(vdev->vmstate); g_free(vdev->config); g_free(vdev->vq); } -void virtio_cleanup(VirtIODevice *vdev) -{ - virtio_common_cleanup(vdev); - g_free(vdev); -} - static void virtio_vmstate_change(void *opaque, int running, RunState state) { VirtIODevice *vdev = opaque; @@ -972,15 +966,6 @@ void virtio_init(VirtIODevice *vdev, const char *name, vdev); } -VirtIODevice *virtio_common_init(const char *name, uint16_t device_id, - size_t config_size, size_t struct_size) -{ - VirtIODevice *vdev; - vdev = g_malloc0(struct_size); - virtio_init(vdev, name, device_id, config_size); - return vdev; -} - hwaddr virtio_queue_get_desc_addr(VirtIODevice *vdev, int n) { return vdev->vq[n].vring.desc; diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index e72e348818..0f240c7e8d 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -147,7 +147,7 @@ typedef struct VirtioDeviceClass { void virtio_init(VirtIODevice *vdev, const char *name, uint16_t device_id, size_t config_size); -void virtio_common_cleanup(VirtIODevice *vdev); +void virtio_cleanup(VirtIODevice *vdev); VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size, void (*handle_output)(VirtIODevice *, @@ -176,8 +176,6 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f); int virtio_load(VirtIODevice *vdev, QEMUFile *f); -void virtio_cleanup(VirtIODevice *vdev); - void virtio_notify_config(VirtIODevice *vdev); void virtio_queue_set_notification(VirtQueue *vq, int enable); @@ -188,8 +186,6 @@ int virtio_queue_empty(VirtQueue *vq); /* Host binding interface. */ -VirtIODevice *virtio_common_init(const char *name, uint16_t device_id, - size_t config_size, size_t struct_size); uint32_t virtio_config_readb(VirtIODevice *vdev, uint32_t addr); uint32_t virtio_config_readw(VirtIODevice *vdev, uint32_t addr); uint32_t virtio_config_readl(VirtIODevice *vdev, uint32_t addr);