- Devel - libvirt List Archives

[libvirt] address 3 more dead stores
by Jim Meyering 04 Sep '09

04 Sep '09

These changes fix two dead stores and add a comment suggesting why *not* to remove the third one. >From 41c778fdbaef9abf52bc4c3e278d3389d8198c34 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 10:55:55 +0200 Subject: [PATCH 1/3] interface_conf.c: remove a dead-store and declaration * src/interface_conf.c (virInterfaceDefParseDhcp): Remove unused "old". --- src/interface_conf.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/interface_conf.c b/src/interface_conf.c index a74d17e..96e0710 100644 --- a/src/interface_conf.c +++ b/src/interface_conf.c @@ -228,11 +228,9 @@ static int virInterfaceDefParseDhcp(virConnectPtr conn, virInterfaceDefPtr def, xmlNodePtr dhcp, xmlXPathContextPtr ctxt) { char *tmp; - xmlNodePtr old; int ret = 0; def->proto.dhcp = 1; - old = ctxt->node; ctxt->node = dhcp; /* Not much to do in the current version */ tmp = virXPathString(conn, "string(./@peerdns)", ctxt); -- 1.6.4.2.409.g85dc3 >From 10037ca58c8d93e427c480082704e7dd52424525 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 11:01:00 +0200 Subject: [PATCH 2/3] hash.c: remove a dead store * src/hash.c (virHashFree): Remove useless assignment to inside_table. --- src/hash.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/hash.c b/src/hash.c index 9308c0c..45c5747 100644 --- a/src/hash.c +++ b/src/hash.c @@ -231,7 +231,6 @@ virHashFree(virHashTablePtr table, virHashDeallocator f) inside_table = 0; iter = next; } - inside_table = 0; } VIR_FREE(table->table); } -- 1.6.4.2.409.g85dc3 >From 3b16e6d50d364a5307284a78a7b23d8631146663 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 11:20:23 +0200 Subject: [PATCH 3/3] qemu_conf.c: add a comment suggesting why we leave a dead-store * src/qemu_conf.c (qemuBuildHostNetStr): Do not remove the type_sep=',' dead store, since not having it would be a problem if we ever add a new attribute=VAL option. --- src/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 2c4a37d..6ffca2f 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -1269,7 +1269,7 @@ qemuBuildHostNetStr(virConnectPtr conn, if (net->hostnet_name) { virBufferVSprintf(&buf, "%cname=%s", type_sep, net->hostnet_name); - type_sep = ','; + type_sep = ','; /* dead-store, but leave it, in case... */ } if (virBufferError(&buf)) { virReportOOMError(conn); -- 1.6.4.2.409.g85dc3

2 1

[libvirt] [PATCH 7/7] VMware ESX: Check the result of virUUIDParse() in esxUtil_GetConfigUUID()
by Matthias Bolte 04 Sep '09

04 Sep '09

* src/esx/esx_util.c: let esxUtil_GetConfigUUID() report an error if virUUIDParse() fails

2 1

[libvirt] [PATCH 4/7] VMware ESX: Simplify SOAP request and response handling
by Matthias Bolte 04 Sep '09

04 Sep '09

* src/esx/esx_vi.[ch]: convert esxVI_RemoteRequest_Execute() to a simpler esxVI_Context_Execute() version, remove esxVI_RemoteRequest and convert esxVI_RemoteResponse to esxVI_Response * src/esx/esx_vi_methods.c: update and simplify callers to use esxVI_Context_Execute() instead of esxVI_RemoteRequest_Execute()

2 1

[libvirt] [PATCH 3/7] VMware ESX: Use virXPathNode*() to simplify XPath handling
by Matthias Bolte 04 Sep '09

04 Sep '09

* src/esx/esx_vi.[ch]: use virXPathNode*() in esxVI_RemoteRequest_Execute() and remove esxVI_RemoteResponse_DeserializeXPathObject*() * src/esx/esx_vi_methods.c: update callers to use the new syntax of esxVI_RemoteRequest_Execute()

2 1

[libvirt] [PATCH 2/7] VMware ESX: Make esxVI_GetVirtualMachineIdentity() more robust
by Matthias Bolte 04 Sep '09

04 Sep '09

Check the config status before requesting config subelements * src/esx/esx_driver.c: add configStatus to the requested properties to check it in esxVI_GetVirtualMachineIdentity() * src/esx/esx_vi.[ch]: add esxVI_GetManagedEntityStatus() and use it in esxVI_GetVirtualMachineIdentity() * src/esx/esx_vi_types.[ch]: add VI type esxVI_ManagedEntityStatus

2 1

[libvirt] [PATCH] Fix more OOM handling bugs
by Daniel P. Berrange 04 Sep '09

04 Sep '09

* src/qemu_conf.c: Fix leak of values upon OOM * src/xend_internal.c: Fix missing check for OOM failure * tests/qemuargv2xmltest.c, tests/qemuxml2argvtest.c: Free stateDir upon exit to avoid leak --- src/qemu_conf.c | 21 ++++++++++++++++++--- src/xend_internal.c | 6 ++++++ tests/qemuargv2xmltest.c | 1 + tests/qemuxml2argvtest.c | 1 + 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 22f5edd..ad41104 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -1722,6 +1722,8 @@ int qemudBuildCommandLine(virConnectPtr conn, continue; } + ADD_ARG_SPACE; + if (idx < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("unsupported disk type '%s'"), disk->dst); @@ -1773,7 +1775,10 @@ int qemudBuildCommandLine(virConnectPtr conn, optstr = virBufferContentAndReset(&opt); - ADD_ARG_LIT("-drive"); + if ((qargv[qargc++] = strdup("-drive")) == NULL) { + VIR_FREE(optstr); + goto no_memory; + } ADD_ARG(optstr); } } else { @@ -1829,6 +1834,7 @@ int qemudBuildCommandLine(virConnectPtr conn, net->vlan = i; + ADD_ARG_SPACE; if ((qemuCmdFlags & QEMUD_CMD_FLAG_NET_NAME) && qemuAssignNetNames(def, net) < 0) goto no_memory; @@ -1836,9 +1842,14 @@ int qemudBuildCommandLine(virConnectPtr conn, if (qemuBuildNicStr(conn, net, NULL, ',', net->vlan, &nic) < 0) goto error; - ADD_ARG_LIT("-net"); + if ((qargv[qargc++] = strdup("-net")) == NULL) { + VIR_FREE(nic); + goto no_memory; + } ADD_ARG(nic); + + ADD_ARG_SPACE; if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK || net->type == VIR_DOMAIN_NET_TYPE_BRIDGE) { int tapfd = qemudNetworkIfaceConnect(conn, driver, net, qemuCmdFlags); @@ -1862,7 +1873,10 @@ int qemudBuildCommandLine(virConnectPtr conn, goto error; } - ADD_ARG_LIT("-net"); + if ((qargv[qargc++] = strdup("-net")) == NULL) { + VIR_FREE(host); + goto no_memory; + } ADD_ARG(host); VIR_FREE(tapfd_name); @@ -2230,6 +2244,7 @@ static int qemuStringToArgvEnv(const char *args, goto no_memory; for (i = 0 ; i < envend ; i++) { progenv[i] = arglist[i]; + arglist[i] = NULL; } progenv[i] = NULL; } diff --git a/src/xend_internal.c b/src/xend_internal.c index 99847b0..20ddb89 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -5212,6 +5212,9 @@ xenDaemonFormatSxprChr(virConnectPtr conn, break; } + if (virBufferError(buf)) + return -1; + return 0; } @@ -5535,6 +5538,9 @@ xenDaemonFormatSxprSound(virConnectPtr conn, virBufferVSprintf(buf, "%s%s", i ? "," : "", str); } + if (virBufferError(buf)) + return -1; + return 0; } diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 7861520..4a92280 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -223,6 +223,7 @@ mymain(int argc, char **argv) DO_TEST_FULL("restore-v2", QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC, "exec:cat"); DO_TEST_FULL("migrate", QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP, "tcp:10.0.0.1:5000"); + free(driver.stateDir); virCapabilitiesFree(driver.caps); return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6f25e7d..2f91288 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -270,6 +270,7 @@ mymain(int argc, char **argv) DO_TEST_FULL("restore-v2", QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC, "exec:cat"); DO_TEST_FULL("migrate", QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP, "tcp:10.0.0.1:5000"); + free(driver.stateDir); virCapabilitiesFree(driver.caps); return(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); -- 1.6.2.5

2 1

[libvirt] [PATCH] Fix logging buffer overrun read
by Daniel P. Berrange 04 Sep '09

04 Sep '09

* src/logging.c: Fix buffer offset in logging read --- src/logging.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/logging.c b/src/logging.c index e46e2be..07c2b0e 100644 --- a/src/logging.c +++ b/src/logging.c @@ -240,7 +240,7 @@ static void virLogStr(const char *str, int len) { tmp = LOG_BUFFER_SIZE - virLogEnd; memcpy(&virLogBuffer[virLogEnd], str, tmp); virLogBuffer[LOG_BUFFER_SIZE] = 0; - memcpy(&virLogBuffer[0], &str[len], len - tmp); + memcpy(&virLogBuffer[0], &str[tmp], len - tmp); virLogEnd = len - tmp; } else { memcpy(&virLogBuffer[virLogEnd], str, len); -- 1.6.2.5

3 2

[libvirt] [PATCH] uml_conf.c: don't return an uninitialized pointer
by Jim Meyering 04 Sep '09

04 Sep '09

Another "real" bug: >From 6697607bf0b023ffb692576b31d652d10719b08a Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 3 Sep 2009 12:05:52 +0200 Subject: [PATCH] uml_conf.c: don't return an uninitialized pointer * src/uml_conf.c (umlBuildCommandLineChr): Initialize "ret" also in the final switch cases. --- src/uml_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/uml_conf.c b/src/uml_conf.c index 838fedd..2e9c25c 100644 --- a/src/uml_conf.c +++ b/src/uml_conf.c @@ -331,6 +331,7 @@ umlBuildCommandLineChr(virConnectPtr conn, default: umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("unsupported chr device type %d"), def->type); + ret = NULL; break; } -- 1.6.4.2.395.ge3d52

3 9

[libvirt] three more clang-inspired dead-store-fixing patches
by Jim Meyering 04 Sep '09

04 Sep '09

>From a2d03c987bb724283207dbeef873178c08a6c4c5 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 3 Sep 2009 18:14:48 +0200 Subject: [PATCH 1/3] storage_backend_logical.c: appease clang: remove useless increment * src/storage_backend_logical.c (virStorageBackendLogicalBuildPool): Don't increment "n" when we won't use the result. --- src/storage_backend_logical.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/storage_backend_logical.c b/src/storage_backend_logical.c index bc40dd7..43117e8 100644 --- a/src/storage_backend_logical.c +++ b/src/storage_backend_logical.c @@ -437,7 +437,7 @@ virStorageBackendLogicalBuildPool(virConnectPtr conn, goto cleanup; } - vgargv[n++] = NULL; + vgargv[n] = NULL; /* Now create the volume group itself */ if (virRun(conn, vgargv, NULL) < 0) -- 1.6.4.2.395.ge3d52 >From b72ed1ba5d5e6444f000fd9be706a51a90dd2292 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 3 Sep 2009 18:23:51 +0200 Subject: [PATCH 2/3] openvz_conf.c: Remove dead store to copy_fd * src/openvz_conf.c (openvz_copyfile): Remove unused assignment. --- src/openvz_conf.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/openvz_conf.c b/src/openvz_conf.c index 41c6684..2f0471c 100644 --- a/src/openvz_conf.c +++ b/src/openvz_conf.c @@ -692,7 +692,6 @@ openvz_copyfile(char* from_path, char* to_path) fd = -1; if (close(copy_fd) < 0) goto error; - copy_fd = -1; return 0; -- 1.6.4.2.395.ge3d52 >From a8d2eca13635578084e3c2cc2093562d9a8fcfed Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 3 Sep 2009 18:25:03 +0200 Subject: [PATCH 3/3] eventtest.c: detect write failure and avoid dead stores * tests/eventtest.c (mymain): Exit nonzero upon write failure. This also avoids several dead stores of the form ret = safewrite... --- tests/eventtest.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/eventtest.c b/tests/eventtest.c index d25381d..ef37ff1 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -248,7 +248,6 @@ resetAll(void) static int mymain(int argc, char **argv) { - int ret = 0; char *progname; int i; pthread_t eventThread; @@ -304,7 +303,8 @@ mymain(int argc, char **argv) /* First time, is easy - just try triggering one of our * registered handles */ startJob("Simple write", &test); - ret = safewrite(handles[1].pipeFD[1], &one, 1); + if (safewrite(handles[1].pipeFD[1], &one, 1) != 1) + return EXIT_FAILURE; if (finishJob(1, -1) != EXIT_SUCCESS) return EXIT_FAILURE; @@ -314,7 +314,8 @@ mymain(int argc, char **argv) * try triggering another handle */ virEventRemoveHandleImpl(handles[0].watch); startJob("Deleted before poll", &test); - ret = safewrite(handles[1].pipeFD[1], &one, 1); + if (safewrite(handles[1].pipeFD[1], &one, 1) != 1) + return EXIT_FAILURE; if (finishJob(1, -1) != EXIT_SUCCESS) return EXIT_FAILURE; @@ -346,8 +347,9 @@ mymain(int argc, char **argv) * about */ startJob("Deleted during dispatch", &test); handles[2].delete = handles[3].watch; - ret = safewrite(handles[2].pipeFD[1], &one, 1); - ret = safewrite(handles[3].pipeFD[1], &one, 1); + if (safewrite(handles[2].pipeFD[1], &one, 1) != 1 + || safewrite(handles[3].pipeFD[1], &one, 1) != 1) + return EXIT_FAILURE; if (finishJob(2, -1) != EXIT_SUCCESS) return EXIT_FAILURE; @@ -356,7 +358,8 @@ mymain(int argc, char **argv) /* Extreme fun, lets delete ourselves during dispatch */ startJob("Deleted during dispatch", &test); handles[2].delete = handles[2].watch; - ret = safewrite(handles[2].pipeFD[1], &one, 1); + if (safewrite(handles[2].pipeFD[1], &one, 1) != 1) + return EXIT_FAILURE; if (finishJob(2, -1) != EXIT_SUCCESS) return EXIT_FAILURE; -- 1.6.4.2.395.ge3d52

2 2

[libvirt] [PATCH] Added Storage Volume support to VIrtualBox
by Pritesh Kothari 04 Sep '09

04 Sep '09

Hi All, I have added support for Storage Volumes in VirtualBox, the patch for the same is attached here. (needs the "little bit cleanup" patch previously posted) Regards, Pritesh

2 1