May 2010 - Devel - libvirt List Archives

[libvirt] [PATCH] dnsmasq.c: Fix OOM error reporting
by Matthias Bolte 03 May '10

03 May '10

Also do some indentation clean up. --- src/util/dnsmasq.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index 1cb5f21..2d57884 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -84,12 +84,12 @@ hostsfileAdd(dnsmasqHostsfile *hostsfile, if (name) { if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s,%s", - mac, ip, name) < 0) { + mac, ip, name) < 0) { goto alloc_error; } } else { if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s", - mac, ip) < 0) { + mac, ip) < 0) { goto alloc_error; } } @@ -99,9 +99,8 @@ hostsfileAdd(dnsmasqHostsfile *hostsfile, return 0; alloc_error: - virReportSystemError(ENOMEM, - _("Failed to add dhcp host entry: mac=%s, ip=%s, name=%s\n"), - mac, ip, (name ? name : "(null)")); + virReportOOMError(); + return -1; } @@ -112,20 +111,23 @@ hostsfileNew(const char *name, int err; dnsmasqHostsfile *hostsfile; - if (VIR_ALLOC(hostsfile) < 0) + if (VIR_ALLOC(hostsfile) < 0) { + virReportOOMError(); return NULL; + } hostsfile->hosts = NULL; hostsfile->nhosts = 0; if (virAsprintf(&hostsfile->path, "%s/%s.%s", config_dir, name, - DNSMASQ_HOSTSFILE_SUFFIX) < 0) { + DNSMASQ_HOSTSFILE_SUFFIX) < 0) { + virReportOOMError(); goto error; } if ((err = virFileMakePath(config_dir))) { virReportSystemError(err, _("cannot create config directory '%s'"), - config_dir); + config_dir); goto error; } @@ -201,11 +203,11 @@ static int hostsfileSave(dnsmasqHostsfile *hostsfile) { int err = hostsfileWrite(hostsfile->path, hostsfile->hosts, - hostsfile->nhosts); + hostsfile->nhosts); if (err < 0) { virReportSystemError(err, _("cannot write config file '%s'"), - hostsfile->path); + hostsfile->path); return -1; } @@ -220,7 +222,7 @@ hostsfileDelete(dnsmasqHostsfile *hostsfile) if (unlink(hostsfile->path) < 0) { virReportSystemError(errno, _("cannot remove config file '%s'"), - hostsfile->path); + hostsfile->path); return -1; } @@ -240,8 +242,10 @@ dnsmasqContextNew(const char *network_name, { dnsmasqContext *ctx; - if (VIR_ALLOC(ctx) < 0) + if (VIR_ALLOC(ctx) < 0) { + virReportOOMError(); return NULL; + } if (!(ctx->hostsfile = hostsfileNew(network_name, config_dir))) goto error; -- 1.7.0.4

2 2

[libvirt] [PATCH] mingw: Fix symbol export
by Matthias Bolte 03 May '10

03 May '10

In commit 98fb83ce25f46e0236706fa6e0943032d921935f I changed the version script handling. But it seems that I didn't test this properly and broke it. The .def file is passed to the compiler directly, but it should get passed to the linker instead. Set VERSION_SCRIPT_FLAGS to -Wl, to pass the .def file correctly to the linker. This fixes the undefined symbol errors while linking virsh. --- configure.ac | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index f25e173..6ee5b90 100644 --- a/configure.ac +++ b/configure.ac @@ -78,7 +78,6 @@ AM_PROG_LD VERSION_SCRIPT_FLAGS=-Wl,--version-script= `$LD --help 2>&1 | grep -- --version-script >/dev/null` || \ VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," -AC_SUBST(VERSION_SCRIPT_FLAGS) LIBVIRT_COMPILE_WARNINGS([maximum]) @@ -1824,10 +1823,11 @@ case "$host" in # from libvirt.syms and passes libvirt.def instead of libvirt.syms to the linker LIBVIRT_SYMBOL_FILE=libvirt.def # mingw's ld has the --version-script parameter, but it requires a .def file - # instead to work properly, therefore clear --version-script here + # instead to work properly, therefore clear --version-script here and use + # -Wl, to pass the .def file to the linker # cygwin's ld has the --version-script parameter too, but for some reason # it's working there as expected - VERSION_SCRIPT_FLAGS= + VERSION_SCRIPT_FLAGS="-Wl," ;; esac AC_SUBST([CYGWIN_EXTRA_LDFLAGS]) @@ -1836,6 +1836,7 @@ AC_SUBST([CYGWIN_EXTRA_PYTHON_LIBADD]) AC_SUBST([MINGW_EXTRA_LDFLAGS]) AC_SUBST([WIN32_EXTRA_CFLAGS]) AC_SUBST([LIBVIRT_SYMBOL_FILE]) +AC_SUBST([VERSION_SCRIPT_FLAGS]) dnl Look for windres to build a Windows icon resource. -- 1.7.0.4

2 2

[libvirt] [PATCH] Fix memory leaks in cmdInterfaceEdit and cmdNWFilterEdit.
by Laine Stump 03 May '10

03 May '10

This applies a fix to thos functions similar to that made to cmdEdit in 270895063d1cf86ab42fa220a8d090c24d58dbc0, thus fnixing a memory leak - if tmp is unlinked and NULLed early in the function, the memory used by tmp is never freed. Since we will always unlink tmp prior to freeing its memory at the end of the function, just remove the earlier code and let cleanup: do the cleanup. --- tools/virsh.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index eb11a78..fb66a72 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -3248,9 +3248,6 @@ cmdInterfaceEdit (vshControl *ctl, const vshCmd *cmd) doc_edited = editReadBackFile (ctl, tmp); if (!doc_edited) goto cleanup; - unlink (tmp); - tmp = NULL; - /* Compare original XML with edited. Has it changed at all? */ if (STREQ (doc, doc_edited)) { vshPrint (ctl, _("Interface %s XML configuration not changed.\n"), @@ -4193,9 +4190,6 @@ cmdNWFilterEdit (vshControl *ctl, const vshCmd *cmd) doc_edited = editReadBackFile (ctl, tmp); if (!doc_edited) goto cleanup; - unlink (tmp); - tmp = NULL; - /* Compare original XML with edited. Has it changed at all? */ if (STREQ (doc, doc_edited)) { vshPrint (ctl, _("Network filter %s XML configuration not changed.\n"), -- 1.6.6.1

3 3

[libvirt] [PATCH] lxc: Fix failure on starting a domain that has multiple network interfaces
by Ryota Ozaki 03 May '10

03 May '10

[Error message] error: Failed to start domain lxc_test1 error: internal error Failed to create veth device pair: 512 The reason of the failure is that lxc driver unexpectedly re-uses an auto-assigned veth name and tries to create the created veth again. The failure will happen when a domain has multiple network interfaces and the names of those are not specified in XML. The patch fixes the problem by resetting buffers of veth names in every iteration of creating veth. * src/lxc/lxc_driver.c: prevent re-using auto-assigned veth name Reported by Kumar L Srikanth-B22348. --- src/lxc/lxc_driver.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 409b1cf..554bf66 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -786,14 +786,15 @@ static int lxcSetupInterfaces(virConnectPtr conn, { int rc = -1, i; char *bridge = NULL; - char parentVeth[PATH_MAX] = ""; - char containerVeth[PATH_MAX] = ""; brControl *brctl = NULL; if (brInit(&brctl) != 0) return -1; for (i = 0 ; i < def->nnets ; i++) { + char parentVeth[PATH_MAX] = ""; + char containerVeth[PATH_MAX] = ""; + switch (def->nets[i]->type) { case VIR_DOMAIN_NET_TYPE_NETWORK: { -- 1.6.5.2

2 1

[libvirt] Creating multiple network interfaces in libvirt Domain.
by Kumar L Srikanth-B22348 01 May '10

01 May '10

Hi, I want to create a Domain with two interfaces. I am using LXC hypervisor in the libvirt. My domain XML is shown below: <domain type='lxc' id='1'> <name>srikanth_vm2</name> <memory>500000</memory> <os> <type>exe</type> <init>/bin/sh</init> </os> <vcpu>1</vcpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/libexec/libvirt_lxc</emulator> <filesystem type='mount'> <source dir='/root/lxc/fedora1'/> <target dir='/'/> </filesystem> <interface type='network'> <source network='default'/> </interface> <interface type='network'> <source network='default'/> </interface> <console type='pty' /> </devices> </domain> I am able to define the Domain. But, I am not able to start the Domain. While starting the domain, I am getting the following error: error: Failed to start domain srikanth_vm2 error: internal error Failed to create veth device pair: 512 Can you please let me know where I am going wrong? Regards, Srikanth.

2 2

[libvirt] [PATCH] Fix a virsh edit memory leak
by Chris Lalancette 01 May '10

01 May '10

When running virsh edit, we are unlinking and setting the tmp variable to NULL before going to the end of the function, meaning that we never free tmp. Since the exit to the function will always unlink and free tmp, just remove this bit of code and let it get done at the end. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- tools/virsh.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 04b47a1..ab099da 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -8066,9 +8066,6 @@ cmdEdit (vshControl *ctl, const vshCmd *cmd) doc_edited = editReadBackFile (ctl, tmp); if (!doc_edited) goto cleanup; - unlink (tmp); - tmp = NULL; - /* Compare original XML with edited. Has it changed at all? */ if (STREQ (doc, doc_edited)) { vshPrint (ctl, _("Domain %s XML configuration not changed.\n"), -- 1.6.6.1

3 2