diff options
| author | Markus Armbruster <armbru@redhat.com> | 2014-06-06 18:43:29 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-06-19 16:41:53 +0300 |
| commit | 9e28840658824f52f03f5a69661fd4b22987feeb (patch) | |
| tree | 4cefb8b99804075ef465404803db6a0b5d38e3f4 /hw/virtio | |
| parent | 63122df2315564253b14d2abec1d854570488f83 (diff) | |
virtio: Drop superfluous conditionals around g_free()
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'hw/virtio')
| -rw-r--r-- | hw/virtio/vhost.c | 8 | ||||
| -rw-r--r-- | hw/virtio/virtio.c | 12 |
2 files changed, 6 insertions, 14 deletions
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index f62cfaf38e..9e6023af36 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -295,9 +295,7 @@ static inline void vhost_dev_log_resize(struct vhost_dev* dev, uint64_t size) if (dev->log_size) { vhost_log_sync_range(dev, 0, dev->log_size * VHOST_LOG_CHUNK - 1); } - if (dev->log) { - g_free(dev->log); - } + g_free(dev->log); dev->log = log; dev->log_size = size; } @@ -601,9 +599,7 @@ static int vhost_migration_log(MemoryListener *listener, int enable) if (r < 0) { return r; } - if (dev->log) { - g_free(dev->log); - } + g_free(dev->log); dev->log = NULL; dev->log_size = 0; } else { diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index a07ae8ad91..3b938c8783 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -1164,10 +1164,8 @@ EventNotifier *virtio_queue_get_host_notifier(VirtQueue *vq) void virtio_device_set_child_bus_name(VirtIODevice *vdev, char *bus_name) { - if (vdev->bus_name) { - g_free(vdev->bus_name); - vdev->bus_name = NULL; - } + g_free(vdev->bus_name); + vdev->bus_name = NULL; if (bus_name) { vdev->bus_name = g_strdup(bus_name); @@ -1206,10 +1204,8 @@ static void virtio_device_unrealize(DeviceState *dev, Error **errp) } } - if (vdev->bus_name) { - g_free(vdev->bus_name); - vdev->bus_name = NULL; - } + g_free(vdev->bus_name); + vdev->bus_name = NULL; } static void virtio_device_class_init(ObjectClass *klass, void *data) |