* [Qemu-devel] [PATCH 1/2] virtio: Drop superfluous conditionals around g_free()
2014-06-06 16:43 [Qemu-devel] [PATCH 0/2] virtio: Drop some superfluous conditionals Markus Armbruster
@ 2014-06-06 16:43 ` Markus Armbruster
2014-06-06 16:43 ` [Qemu-devel] [PATCH 2/2] virtio: Drop superfluous conditionals around g_strdup() Markus Armbruster
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Markus Armbruster @ 2014-06-06 16:43 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, mst
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/9pfs/virtio-9p.c | 4 +---
hw/net/virtio-net.c | 24 ++++++++----------------
hw/virtio/vhost.c | 8 ++------
hw/virtio/virtio.c | 12 ++++--------
4 files changed, 15 insertions(+), 33 deletions(-)
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index 9aa6725..5861a5b 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -299,9 +299,7 @@ static int v9fs_xattr_fid_clunk(V9fsPDU *pdu, V9fsFidState *fidp)
free_out:
v9fs_string_free(&fidp->fs.xattr.name);
free_value:
- if (fidp->fs.xattr.value) {
- g_free(fidp->fs.xattr.value);
- }
+ g_free(fidp->fs.xattr.value);
return retval;
}
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 940a7cf..dd28a5a 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -1509,14 +1509,10 @@ void virtio_net_set_netclient_name(VirtIONet *n, const char *name,
*/
assert(type != NULL);
- if (n->netclient_name) {
- g_free(n->netclient_name);
- n->netclient_name = NULL;
- }
- if (n->netclient_type) {
- g_free(n->netclient_type);
- n->netclient_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);
@@ -1616,14 +1612,10 @@ static void virtio_net_device_unrealize(DeviceState *dev, Error **errp)
unregister_savevm(dev, "virtio-net", n);
- if (n->netclient_name) {
- g_free(n->netclient_name);
- n->netclient_name = NULL;
- }
- if (n->netclient_type) {
- g_free(n->netclient_type);
- n->netclient_type = NULL;
- }
+ g_free(n->netclient_name);
+ n->netclient_name = NULL;
+ g_free(n->netclient_type);
+ n->netclient_type = NULL;
g_free(n->mac_table.macs);
g_free(n->vlans);
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 9e336ad..d2bd1f7 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -297,9 +297,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;
}
@@ -603,9 +601,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 3557c17..c8e36a5 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)
--
1.9.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Qemu-devel] [PATCH 2/2] virtio: Drop superfluous conditionals around g_strdup()
2014-06-06 16:43 [Qemu-devel] [PATCH 0/2] virtio: Drop some superfluous conditionals Markus Armbruster
2014-06-06 16:43 ` [Qemu-devel] [PATCH 1/2] virtio: Drop superfluous conditionals around g_free() Markus Armbruster
@ 2014-06-06 16:43 ` Markus Armbruster
2014-06-06 16:56 ` [Qemu-devel] [PATCH 0/2] virtio: Drop some superfluous conditionals Eric Blake
2014-06-08 15:18 ` Michael S. Tsirkin
3 siblings, 0 replies; 5+ messages in thread
From: Markus Armbruster @ 2014-06-06 16:43 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, mst
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
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)
--
1.9.3
^ permalink raw reply related [flat|nested] 5+ messages in thread