aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@redhat.com>2009-11-10 12:56:11 +0100
committerDaniel Veillard <veillard@redhat.com>2009-11-10 17:48:12 +0100
commit52147a0452990580be1ae3b52ae749ea44441b51 (patch)
tree5359a5bc4beb45b9aac1f9ff64c51fff82ed16a9 /src/node_device/node_device_hal.c
parentAllow timeouts waiting for QEMU job lock (diff)
downloadlibvirt-52147a0452990580be1ae3b52ae749ea44441b51.tar.gz
libvirt-52147a0452990580be1ae3b52ae749ea44441b51.tar.bz2
libvirt-52147a0452990580be1ae3b52ae749ea44441b51.zip
Various fixes following a code review
* src/libvirt.c src/lxc/lxc_conf.c src/lxc/lxc_container.c src/lxc/lxc_controller.c src/node_device/node_device_hal.c src/openvz/openvz_conf.c src/qemu/qemu_driver.c src/qemu/qemu_monitor_text.c src/remote/remote_driver.c src/storage/storage_backend_disk.c src/storage/storage_driver.c src/util/logging.c src/xen/sexpr.c src/xen/xend_internal.c src/xen/xm_internal.c: Steve Grubb <sgrubb@redhat.com> sent a code review and those are the fixes correcting the problems
Diffstat (limited to 'src/node_device/node_device_hal.c')
-rw-r--r--src/node_device/node_device_hal.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
index fe8d11669..818c7d69d 100644
--- a/src/node_device/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -364,7 +364,7 @@ static int gather_capabilities(LibHalContext *ctx, const char *udi,
{
char *bus_name = NULL;
virNodeDevCapsDefPtr caps = NULL;
- char **hal_cap_names;
+ char **hal_cap_names = NULL;
int rv, i;
if (STREQ(udi, "/org/freedesktop/Hal/devices/computer")) {
@@ -778,11 +778,6 @@ static int halDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED)
virNodeDeviceObjListFree(&driverState->devs);
if (hal_ctx)
(void)libhal_ctx_free(hal_ctx);
- if (udi) {
- for (i = 0; i < num_devs; i++)
- VIR_FREE(udi[i]);
- VIR_FREE(udi);
- }
nodeDeviceUnlock(driverState);
VIR_FREE(driverState);