diff options
| author | Markus Armbruster <armbru@redhat.com> | 2014-06-06 18:43:30 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-06-19 16:41:53 +0300 |
| commit | 80e0090a44388d8924f548e49f7390c1e1585761 (patch) | |
| tree | 15bba61eb0e8a124dd105ac210807eb462080e42 | |
| parent | 9e28840658824f52f03f5a69661fd4b22987feeb (diff) | |
virtio: Drop superfluous conditionals around g_strdup()
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>
| -rw-r--r-- | hw/net/virtio-net.c | 7 | ||||
| -rw-r--r-- | hw/virtio/virtio.c | 6 |
2 files changed, 2 insertions, 11 deletions
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index dd28a5a0a4..0a34a8b908 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1510,13 +1510,8 @@ void virtio_net_set_netclient_name(VirtIONet *n, const char *name, assert(type != NULL); g_free(n->netclient_name); - n->netclient_name = NULL; g_free(n->netclient_type); - n->netclient_type = NULL; - - if (name != NULL) { - n->netclient_name = g_strdup(name); - } + n->netclient_name = g_strdup(name); n->netclient_type = g_strdup(type); } diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 3b938c8783..a3082d569d 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -1165,11 +1165,7 @@ EventNotifier *virtio_queue_get_host_notifier(VirtQueue *vq) void virtio_device_set_child_bus_name(VirtIODevice *vdev, char *bus_name) { g_free(vdev->bus_name); - vdev->bus_name = NULL; - - if (bus_name) { - vdev->bus_name = g_strdup(bus_name); - } + vdev->bus_name = g_strdup(bus_name); } static void virtio_device_realize(DeviceState *dev, Error **errp) |