From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56381) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwxKi-0004yP-Do for qemu-devel@nongnu.org; Tue, 17 Jun 2014 13:38:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwxKa-0003cW-Ga for qemu-devel@nongnu.org; Tue, 17 Jun 2014 13:38:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30187) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwxKa-0003cD-8u for qemu-devel@nongnu.org; Tue, 17 Jun 2014 13:38:00 -0400 Date: Tue, 17 Jun 2014 20:38:22 +0300 From: "Michael S. Tsirkin" Message-ID: <1403021756-15960-38-git-send-email-mst@redhat.com> References: <1403021756-15960-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1403021756-15960-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 037/103] virtio: Drop superfluous conditionals around g_strdup() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Markus Armbruster , Anthony Liguori From: Markus Armbruster Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Eric Blake --- hw/net/virtio-net.c | 7 +------ 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 dd28a5a..0a34a8b 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 c8e36a5..53f014f 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) -- MST