[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 036/103] virtio: Drop superfluous conditionals around
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 036/103] virtio: Drop superfluous conditionals around g_free() |
Date: |
Tue, 17 Jun 2014 20:38:19 +0300 |
From: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
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)
--
MST
- [Qemu-devel] [PULL 096/103] qmp: clean out whitespace, (continued)
- [Qemu-devel] [PULL 096/103] qmp: clean out whitespace, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 048/103] Add G_IO_HUP handler for socket chardev, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 063/103] NUMA: check if the total numa memory size is equal to ram_size, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 064/103] NUMA: Add numa_info structure to contain numa nodes info, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 099/103] qmp: add query-memory-devices command, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 100/103] acpi: introduce TYPE_ACPI_DEVICE_IF interface, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 062/103] NUMA: move numa related code to new file numa.c, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 097/103] pc: acpi: do not hardcode preprocessor, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 098/103] numa: handle mmaped memory allocation failure correctly, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 102/103] qmp: add query-acpi-ospm-status command, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 036/103] virtio: Drop superfluous conditionals around g_free(),
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 088/103] qmp: add query-memdev, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 034/103] acpi: update generated files, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 060/103] libqemustub: add stubs to be able to use qemu-char.c, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 068/103] qmp: improve error reporting for -object and object-add, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 035/103] acpi-test: update expected tables, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 086/103] hostmem: add property to map memory with MAP_SHARED, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 046/103] Add chardev API qemu_chr_fe_set_msgfds, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 087/103] hostmem: add properties for NUMA memory policy, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 103/103] qmp: add ACPI_DEVICE_OST event handling, Michael S. Tsirkin, 2014/06/17
- [Qemu-devel] [PULL 101/103] acpi: implement ospm_status() method for PIIX4/ICH9_LPC devices, Michael S. Tsirkin, 2014/06/17