- Devel - libvirt List Archives

[libvirt] [PATCH] conf: Don't deref NULL actual network in virDomainNetGetActualHostdev()
by Peter Krempa 05 Sep '13

05 Sep '13

In commit 991270db99690 I've used virDomainNetGetActualHostdev() to get the actual hostdev from a network when removing the network from the list to avoid leaving the hostdev in the list. I didn't notice that this function doesn't check if the actual network is allocated and dereferences it. This crashes the daemon when cleaning up a domain object in early startup phases when the actual network definition isn't allocated. When the actual definition isn't present, the hostdev that might correspond to it won't be present anyways so it's safe to return NULL. Thanks to Cole Robinson for noticing this problem. --- src/conf/domain_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cef4cf9..276c6ba 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17875,6 +17875,7 @@ virDomainNetGetActualHostdev(virDomainNetDefPtr iface) if (iface->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) return &iface->data.hostdev.def; if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK && + iface->data.network.actual && iface->data.network.actual->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) { return &iface->data.network.actual->data.hostdev.def; } -- 1.8.3.2

2 2

[libvirt] [PATCH] libxl: Unconditionally call virSysinfoRead() on driver init
by Jim Fehlig 05 Sep '13

05 Sep '13

No need to check if priviledged when reading hostsysinfo, since that check was already done in libxlDriverShouldLoad(). The libxl driver fails to load if not priviledged. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 426167c..e2a6d44 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -873,8 +873,7 @@ libxlStateInitialize(bool privileged, } /* read the host sysinfo */ - if (privileged) - libxl_driver->hostsysinfo = virSysinfoRead(); + libxl_driver->hostsysinfo = virSysinfoRead(); libxl_driver->domainEventState = virDomainEventStateNew(); if (!libxl_driver->domainEventState) -- 1.8.1.4

2 2

[libvirt] [PATCH] virsh: fix build on mingw, which lacks termios stuff
by Eric Blake 05 Sep '13

05 Sep '13

Recent patches to fix handling of Ctrl-C when interacting with ssh are not portable to mingw, which lacks termios handling. The simplest solution is to just compile that code out, and if someone ever appears that has a serious interest in getting virsh fully functional even with ssh connections, they can provide patches at that time. * tools/virsh.h (_vshControl): Make termattr conditional. * tools/virsh.c (vshTTYIsInterruptCharacter) (vshTTYDisableInterrupt, vshTTYRestore, cfmakeraw, vshTTYMakeRaw) (main): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule, for ./autobuild.sh tools/virsh.c | 25 ++++++++++++++++++------- tools/virsh.h | 2 ++ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 37e9716..bf2fbf8 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2213,20 +2213,23 @@ vshPrintExtra(vshControl *ctl, const char *format, ...) bool -vshTTYIsInterruptCharacter(vshControl *ctl, - const char chr) +vshTTYIsInterruptCharacter(vshControl *ctl ATTRIBUTE_UNUSED, + const char chr ATTRIBUTE_UNUSED) { +#ifndef WIN32 if (ctl->istty && ctl->termattr.c_cc[VINTR] == chr) return true; +#endif return false; } int -vshTTYDisableInterrupt(vshControl *ctl) +vshTTYDisableInterrupt(vshControl *ctl ATTRIBUTE_UNUSED) { +#ifndef WIN32 struct termios termset = ctl->termattr; if (!ctl->istty) @@ -2241,25 +2244,28 @@ vshTTYDisableInterrupt(vshControl *ctl) if (tcsetattr(STDIN_FILENO, TCSANOW, &termset) < 0) return -1; +#endif return 0; } int -vshTTYRestore(vshControl *ctl) +vshTTYRestore(vshControl *ctl ATTRIBUTE_UNUSED) { +#ifndef WIN32 if (!ctl->istty) return 0; if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &ctl->termattr) < 0) return -1; +#endif return 0; } -#ifndef HAVE_CFMAKERAW +#if !defined(WIN32) && !defined(HAVE_CFMAKERAW) /* provide fallback in case cfmakeraw isn't available */ static void cfmakeraw(struct termios *attr) @@ -2271,12 +2277,14 @@ cfmakeraw(struct termios *attr) attr->c_cflag &= ~(CSIZE | PARENB); attr->c_cflag |= CS8; } -#endif /* !HAVE_CFMAKERAW */ +#endif /* !WIN32 && !HAVE_CFMAKERAW */ int -vshTTYMakeRaw(vshControl *ctl, bool report_errors) +vshTTYMakeRaw(vshControl *ctl ATTRIBUTE_UNUSED, + bool report_errors ATTRIBUTE_UNUSED) { +#ifndef WIN32 struct termios rawattr = ctl->termattr; char ebuf[1024]; @@ -2297,6 +2305,7 @@ vshTTYMakeRaw(vshControl *ctl, bool report_errors) virStrerror(errno, ebuf, sizeof(ebuf))); return -1; } +#endif return 0; } @@ -3249,8 +3258,10 @@ main(int argc, char **argv) if (isatty(STDIN_FILENO)) { ctl->istty = true; +#ifndef WIN32 if (tcgetattr(STDIN_FILENO, &ctl->termattr) < 0) ctl->istty = false; +#endif } if (virMutexInit(&ctl->lock) < 0) { diff --git a/tools/virsh.h b/tools/virsh.h index 8afe13f..b5e2715 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -242,7 +242,9 @@ struct _vshControl { const char *escapeChar; /* String representation of console escape character */ +# ifndef WIN32 struct termios termattr; /* settings of the tty terminal */ +# endif bool istty; /* is the terminal a tty */ }; -- 1.8.3.1

1 0

[libvirt] [PATCH 0/3] Fix and clean up multiple issues in virsh console handling
by Peter Krempa 05 Sep '13

05 Sep '13

This series has to be applied on top of "virsh: Handle interrupting of jobs manually". Peter Krempa (3): tools: rename console.[ch] to virsh-console.[ch] and fix coding style virsh: Rename vshMakeStdinRaw to vshTTYMakeRaw and move it to virsh.c virsh-console: Avoid using signal() in multithreaded application cfg.mk | 2 +- po/POTFILES.in | 2 +- tools/Makefile.am | 2 +- tools/{console.c => virsh-console.c} | 153 +++++++++++++++-------------------- tools/{console.h => virsh-console.h} | 11 ++- tools/virsh-domain.c | 4 +- tools/virsh.c | 50 +++++++++++- tools/virsh.h | 1 + 8 files changed, 123 insertions(+), 102 deletions(-) rename tools/{console.c => virsh-console.c} (76%) rename tools/{console.h => virsh-console.h} (81%) -- 1.8.3.2

4 10

[libvirt] [PATCH 00/12] Various libxl driver improvements
by Jim Fehlig 05 Sep '13

05 Sep '13

This series contains several improvements for the libxl driver. Patches 1 and 2 are primarily code movement, putting code in files that are more consistent with other drivers. Patches 3 through 12 improve locking of the libxlDriverPrivate struct, similar to the work done in the QEMU and LXC drivers Obviously post-1.1.2 material, but would be nice to get it in soon thereafter for testing throughout the 1.1.3 cycle... Jim Fehlig (12): libxl: Move detection of autoballoon to libxl_conf libxl: Introduce libxl_domain.[ch] libxl: Earlier detection of not running on Xen libxl: Add libxl_version_info to libxlDriverPrivate libxl: libxl: Use per-domain ctx in libxlMakeDomCreateInfo libxl: User per-domain ctx in libxlDomainGetInfo libxl: Introduce libxlDriverConfig object libxl: Use atomic ops for driver->nactive libxl: Add comments to libxlDriverPrivate fields libxl: Move driver lock/unlock to libxl_conf libxl: Remove unnecessary driver locking libxl: Add libxlDomObjFromDomain po/POTFILES.in | 1 + src/Makefile.am | 1 + src/libxl/libxl_conf.c | 149 +++++- src/libxl/libxl_conf.h | 87 +-- src/libxl/libxl_domain.c | 469 ++++++++++++++++ src/libxl/libxl_domain.h | 61 +++ src/libxl/libxl_driver.c | 1329 ++++++++++------------------------------------ 7 files changed, 1010 insertions(+), 1087 deletions(-) create mode 100644 src/libxl/libxl_domain.c create mode 100644 src/libxl/libxl_domain.h -- 1.8.1.4

5 49

[libvirt] Create ESXi vmknic using libvirt xml
by varun bhatnagar 05 Sep '13

05 Sep '13

Hi, I am using libvirt on ESX hypervisor. Iam trying to create "vmknic" using virsh but all my attempts are failing. Can anyone help me in achieving this? Where can I find the xml template for this? or is there any wiki link which I can follow to achieve this? Regards, Varun

1 0

[libvirt] [PATCH] virGet{User, Group}Ent() don't say success on fail
by Doug Goldstein 05 Sep '13

05 Sep '13

When virGetUserEnt() and virGetGroupEnt() fail due to the uid or gid not existing on the machine they'll print a message like: $ virsh -c vbox:///session list error: failed to connect to the hypervisor error: Failed to find user record for uid '32655': Success The success at the end is a bit confusing. This changes it to: $ virsh -c vbox:///session list error: failed to connect to the hypervisor error: Failed to find user record for uid '32655' --- src/util/virutil.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index 34f5998..39d4717 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -692,11 +692,16 @@ virGetUserEnt(uid_t uid, char **name, gid_t *group, char **dir) if (VIR_RESIZE_N(strbuf, strbuflen, strbuflen, strbuflen) < 0) goto cleanup; } - if (rc != 0 || pw == NULL) { + if (rc != 0) { virReportSystemError(rc, _("Failed to find user record for uid '%u'"), (unsigned int) uid); goto cleanup; + } else if (pw == NULL) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Failed to find user record for uid '%u'"), + (unsigned int) uid); + goto cleanup; } if (name && VIR_STRDUP(*name, pw->pw_name) < 0) @@ -746,9 +751,16 @@ static char *virGetGroupEnt(gid_t gid) } } if (rc != 0 || gr == NULL) { - virReportSystemError(rc, - _("Failed to find group record for gid '%u'"), - (unsigned int) gid); + if (rc != 0) { + virReportSystemError(rc, + _("Failed to find group record for gid '%u'"), + (unsigned int) gid); + } else { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Failed to find group record for gid '%u'"), + (unsigned int) gid); + } + VIR_FREE(strbuf); return NULL; } -- 1.8.1.5

2 1

[libvirt] [PATCH] Ensure 'arch' is always set in cpuArchNodeData
by Daniel P. Berrange 05 Sep '13

05 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The s390, ppc and arm CPU drivers never set the 'arch' field in their impl of cpuArchNodeData. This leads to error messages being reported from cpuDataFree later, due to trying to use VIR_ARCH_NONE. #0 virRaiseErrorFull (filename=filename@entry=0x76f94434 "cpu/cpu.c", funcname=funcname@entry=0x76f942dc <__FUNCTION__.18096> "cpuGetSubDriver", linenr=linenr@entry=58, domain=domain@entry=31, code=code@entry=1, level=level@entry=VIR_ERR_ERROR, str1=0x76f70e18 "internal error: %s", str2=str2@entry=0x7155f2ec "undefined hardware architecture", str3=str3@entry=0x0, int1=int1@entry=-1, int2=int2@entry=-1, fmt=0x76f70e18 "internal error: %s") at util/virerror.c:646 #1 0x76e682ea in virReportErrorHelper (domcode=domcode@entry=31, errorcode=errorcode@entry=1, filename=0x76f94434 "cpu/cpu.c", funcname=0x76f942dc <__FUNCTION__.18096> "cpuGetSubDriver", linenr=linenr@entry=58, fmt=0x76f7e7e4 "%s") at util/virerror.c:1292 #2 0x76ed82d4 in cpuGetSubDriver (arch=<optimized out>) at cpu/cpu.c:57 #3 cpuGetSubDriver (arch=VIR_ARCH_NONE) at cpu/cpu.c:51 #4 0x76ed8818 in cpuDataFree (data=data@entry=0x70c22d78) at cpu/cpu.c:216 #5 0x716aaec0 in virQEMUCapsInitCPU (arch=VIR_ARCH_ARMV7L, caps=0x70c29a08) at qemu/qemu_capabilities.c:867 Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/cpu/cpu.c | 2 +- src/cpu/cpu.h | 2 +- src/cpu/cpu_arm.c | 8 ++++++-- src/cpu/cpu_powerpc.c | 12 +++++------- src/cpu/cpu_s390.c | 4 +++- src/cpu/cpu_x86.c | 4 ++-- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 023ce26..50c2de3 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -244,7 +244,7 @@ cpuNodeData(virArch arch) return NULL; } - return driver->nodeData(); + return driver->nodeData(arch); } diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 7f1d4bd..69f6fae 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -70,7 +70,7 @@ typedef void (*cpuArchDataFree) (virCPUDataPtr data); typedef virCPUDataPtr -(*cpuArchNodeData) (void); +(*cpuArchNodeData) (virArch arch); typedef virCPUCompareResult (*cpuArchGuestData) (virCPUDefPtr host, diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index d1b2a99..06c5dc0 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -31,11 +31,15 @@ static const virArch archs[] = { VIR_ARCH_ARMV7L }; static virCPUDataPtr -ArmNodeData(void) +ArmNodeData(virArch arch) { virCPUDataPtr data; - ignore_value(VIR_ALLOC(data)); + if (VIR_ALLOC(data) < 0) + return NULL; + + data->arch = arch; + return data; } diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c index 647a8a1..35cb949 100644 --- a/src/cpu/cpu_powerpc.c +++ b/src/cpu/cpu_powerpc.c @@ -353,21 +353,23 @@ ppcDataFree(virCPUDataPtr data) VIR_FREE(data); } -#if defined(__powerpc__) || defined(__powerpc64__) static virCPUDataPtr -ppcNodeData(void) +ppcNodeData(virArch arch) { virCPUDataPtr cpuData; if (VIR_ALLOC(cpuData) < 0) return NULL; + cpuData->arch = arch; + +#if defined(__powerpc__) || defined(__powerpc64__) asm("mfpvr %0" : "=r" (cpuData->data.ppc.pvr)); +#endif return cpuData; } -#endif static int ppcUpdate(virCPUDefPtr guest ATTRIBUTE_UNUSED, @@ -474,11 +476,7 @@ struct cpuArchDriver cpuDriverPowerPC = { .decode = ppcDecode, .encode = NULL, .free = ppcDataFree, -#if defined(__powerpc__) || defined(__powerpc64__) .nodeData = ppcNodeData, -#else - .nodeData = NULL, -#endif .guestData = NULL, .baseline = ppcBaseline, .update = ppcUpdate, diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c index d997e06..de33e4a 100644 --- a/src/cpu/cpu_s390.c +++ b/src/cpu/cpu_s390.c @@ -32,13 +32,15 @@ static const virArch archs[] = { VIR_ARCH_S390, VIR_ARCH_S390X }; static virCPUDataPtr -s390NodeData(void) +s390NodeData(virArch arch) { virCPUDataPtr data; if (VIR_ALLOC(data) < 0) return NULL; + data->arch = arch; + return data; } diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 41ce21f..3d5e16f 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1675,7 +1675,7 @@ cpuidSet(uint32_t base, struct cpuX86cpuid **set) static virCPUDataPtr -x86NodeData(void) +x86NodeData(virArch arch) { virCPUDataPtr cpuData = NULL; struct cpuX86Data *data; @@ -1692,7 +1692,7 @@ x86NodeData(void) goto error; data->extended_len = ret; - if (!(cpuData = x86MakeCPUData(virArchFromHost(), &data))) + if (!(cpuData = x86MakeCPUData(arch, &data))) goto error; return cpuData; -- 1.8.3.1

2 1

[libvirt] [PATCH] build: enforce makefile conditional style
by Eric Blake 04 Sep '13

04 Sep '13

Automake has builtin support to prevent botched conditional nesting, but only if you use: if FOO else !FOO endif !FOO An example error message when using the wrong name: daemon/Makefile.am:378: error: else reminder (LIBVIRT_INIT_SCRIPT_SYSTEMD_TRUE) incompatible with current conditional: LIBVIRT_INIT_SCRIPT_SYSTEMD_FALSE daemon/Makefile.am:381: error: endif reminder (LIBVIRT_INIT_SCRIPT_SYSTEMD_TRUE) incompatible with current conditional: LIBVIRT_INIT_SCRIPT_SYSTEMD_FALSE As our makefiles tend to have quite a bit of nested conditionals, it's better to take advantage of the benefits of the build system double-checking that our conditionals are well-nested, but that requires a syntax check to enforce our usage stye. Alas, unlike C preprocessor and spec files, we can't use indentation to make it easier to see how deeply nesting goes. * cfg.mk (sc_makefile_conditionals): New rule. * daemon/Makefile.am: Enforce the style. * gnulib/tests/Makefile.am: Likewise. * python/Makefile.am: Likewise. * src/Makefile.am: Likewise. * tests/Makefile.am: Likewise. * tools/Makefile.am: Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- cfg.mk | 8 ++ daemon/Makefile.am | 64 +++++----- gnulib/tests/Makefile.am | 2 +- python/Makefile.am | 4 +- src/Makefile.am | 326 +++++++++++++++++++++++------------------------ tests/Makefile.am | 130 +++++++++---------- tools/Makefile.am | 14 +- 7 files changed, 278 insertions(+), 270 deletions(-) diff --git a/cfg.mk b/cfg.mk index f153e31..b839667 100644 --- a/cfg.mk +++ b/cfg.mk @@ -692,6 +692,14 @@ sc_spec_indentation: echo '$(ME): skipping test $@: cppi not installed' 1>&2; \ fi +# Nested conditionals are easier to understand if we enforce that endifs +# can be paired back to the if +sc_makefile_conditionals: + @prohibit='(else|endif)($$| *#)' \ + in_vc_files='Makefile\.am' \ + halt='match "if FOO" with "endif FOO" in Makefiles' \ + $(_sc_search_regexp) + # Long lines can be harder to diff; too long, and git send-email chokes. # For now, only enforce line length on files where we have intentionally # fixed things and don't want to regress. diff --git a/daemon/Makefile.am b/daemon/Makefile.am index e34868b..90689f8 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -142,7 +142,7 @@ libvirtd_LDADD = \ if WITH_DTRACE_PROBES libvirtd_LDADD += ../src/libvirt_probes.lo -endif +endif WITH_DTRACE_PROBES libvirtd_LDADD += \ ../src/libvirt-lxc.la \ @@ -153,53 +153,53 @@ if WITH_QEMU libvirtd_LDADD += ../src/libvirt_driver_qemu.la if WITH_DTRACE_PROBES libvirtd_LDADD += ../src/libvirt_qemu_probes.lo -endif -endif +endif WITH_DTRACE_PROBES +endif WITH_QEMU if WITH_LXC libvirtd_LDADD += ../src/libvirt_driver_lxc.la -endif +endif WITH_LXC if WITH_XEN libvirtd_LDADD += ../src/libvirt_driver_xen.la -endif +endif WITH_XEN if WITH_LIBXL libvirtd_LDADD += ../src/libvirt_driver_libxl.la -endif +endif WITH_LIBXL if WITH_UML libvirtd_LDADD += ../src/libvirt_driver_uml.la -endif +endif WITH_UML if WITH_VBOX libvirtd_LDADD += ../src/libvirt_driver_vbox.la -endif +endif WITH_VBOX if WITH_STORAGE libvirtd_LDADD += ../src/libvirt_driver_storage.la -endif +endif WITH_STORAGE if WITH_NETWORK libvirtd_LDADD += ../src/libvirt_driver_network.la -endif +endif WITH_NETWORK if WITH_INTERFACE libvirtd_LDADD += ../src/libvirt_driver_interface.la -endif +endif WITH_INTERFACE if WITH_NODE_DEVICES libvirtd_LDADD += ../src/libvirt_driver_nodedev.la -endif +endif WITH_NODE_DEVICES if WITH_SECRETS libvirtd_LDADD += ../src/libvirt_driver_secret.la -endif +endif WITH_SECRETS if WITH_NWFILTER libvirtd_LDADD += ../src/libvirt_driver_nwfilter.la -endif -endif +endif WITH_NWFILTER +endif ! WITH_DRIVER_MODULES libvirtd_LDADD += ../src/libvirt.la @@ -207,11 +207,11 @@ if WITH_POLKIT if WITH_POLKIT0 policydir = $(datadir)/PolicyKit/policy policyauth = auth_admin_keep_session -else +else ! WITH_POLKIT0 policydir = $(datadir)/polkit-1/actions policyauth = auth_admin_keep -endif -endif +endif ! WITH_POLKIT0 +endif WITH_POLKIT libvirtd.policy: libvirtd.policy.in $(top_builddir)/config.status $(AM_V_GEN) sed \ @@ -243,10 +243,10 @@ install-data-polkit:: uninstall-data-polkit:: rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy rmdir $(DESTDIR)$(policydir) || : -else +else ! WITH_POLKIT install-data-polkit:: uninstall-data-polkit:: -endif +endif ! WITH_POLKIT remote.c: $(DAEMON_GENERATED) remote.h: $(DAEMON_GENERATED) @@ -323,10 +323,10 @@ install-sysctl: uninstall-sysctl: rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/libvirtd.conf rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || : -else +else ! WITH_SYSCTL install-sysctl: uninstall-sysctl: -endif +endif ! WITH_SYSCTL if LIBVIRT_INIT_SCRIPT_RED_HAT @@ -340,10 +340,10 @@ install-init-redhat: install-sysconfig libvirtd.init uninstall-init-redhat: uninstall-sysconfig rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || : -else +else ! LIBVIRT_INIT_SCRIPT_RED_HAT install-init-redhat: uninstall-init-redhat: -endif # LIBVIRT_INIT_SCRIPT_RED_HAT +endif ! LIBVIRT_INIT_SCRIPT_RED_HAT if LIBVIRT_INIT_SCRIPT_UPSTART @@ -356,10 +356,10 @@ install-init-upstart: install-sysconfig uninstall-init-upstart: uninstall-sysconfig rm -f $(DESTDIR)$(sysconfdir)/event.d/libvirtd rmdir $(DESTDIR)$(sysconfdir)/event.d || : -else +else ! LIBVIRT_INIT_SCRIPT_UPSTART install-init-upstart: uninstall-init-upstart: -endif # LIBVIRT_INIT_SCRIPT_UPSTART +endif ! LIBVIRT_INIT_SCRIPT_UPSTART if LIBVIRT_INIT_SCRIPT_SYSTEMD @@ -375,10 +375,10 @@ install-init-systemd: install-sysconfig libvirtd.service uninstall-init-systemd: uninstall-sysconfig rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.service rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : -else +else ! LIBVIRT_INIT_SCRIPT_SYSTEMD install-init-systemd: uninstall-init-systemd: -endif # LIBVIRT_INIT_SCRIPT_SYSTEMD +endif ! LIBVIRT_INIT_SCRIPT_SYSTEMD libvirtd.init: libvirtd.init.in $(top_builddir)/config.status $(AM_V_GEN)sed \ @@ -415,10 +415,10 @@ check-augeas: test_libvirtd.aug # are used by nearly every other library. libvirtd_LDADD += ../gnulib/lib/libgnu.la $(LIBSOCKET) -else # WITH_LIBVIRTD +else ! WITH_LIBVIRTD install-data-local: install-data-sasl uninstall-local:: uninstall-data-sasl -endif # WITH_LIBVIRTD +endif ! WITH_LIBVIRTD POD2MAN = pod2man -c "Virtualization Support" \ -r "$(PACKAGE)-$(VERSION)" -s 8 @@ -438,10 +438,10 @@ install-data-sasl: uninstall-data-sasl: rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || : -else +else ! WITH_SASL install-data-sasl: uninstall-data-sasl: -endif +endif ! WITH_SASL CLEANFILES += $(BUILT_SOURCES) $(man8_MANS) diff --git a/gnulib/tests/Makefile.am b/gnulib/tests/Makefile.am index 74d71e9..df4af59 100644 --- a/gnulib/tests/Makefile.am +++ b/gnulib/tests/Makefile.am @@ -26,7 +26,7 @@ if WITH_EXPENSIVE_TESTS ## Automake requires that at least one conditional call out all tests to ## be run, for those tests to be shipped in the tarball TESTS = $(GNULIB_TESTS) -endif +endif WITH_EXPENSIVE_TESTS ## However, we want to change the set of tests based on the make environment, ## where the default was set at configure time. Use GNU make constructs to ## hide our actions from Automake, so we don't get it too confused. diff --git a/python/Makefile.am b/python/Makefile.am index 3f967a9..f327300 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -162,9 +162,9 @@ uninstall-local: CLEANFILES= $(GENERATED) $(QEMU_GENERATED) $(LXC_GENERATED) $(GENERATE).stamp \ *.pyc -else +else ! WITH_PYTHON all: -endif +endif ! WITH_PYTHON dummy: diff --git a/src/Makefile.am b/src/Makefile.am index 83f514a..9b336fd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -51,14 +51,14 @@ THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD) SECDRIVER_LIBS = if WITH_SECDRIVER_SELINUX SECDRIVER_LIBS += $(SELINUX_LIBS) -endif +endif WITH_SECDRIVER_SELINUX if WITH_SECDRIVER_APPARMOR SECDRIVER_LIBS += $(APPARMOR_LIBS) -endif +endif WITH_SECDRIVER_APPARMOR if WITH_NETWORK UUID=$(shell uuidgen 2>/dev/null) -endif +endif WITH_NETWORK lib_LTLIBRARIES = libvirt.la libvirt-qemu.la libvirt-lxc.la @@ -414,9 +414,9 @@ if WITH_LINUX check-symfile: libvirt.syms libvirt.la $(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl libvirt.syms \ .libs/libvirt.so -else +else ! WITH_LINUX check-symfile: -endif +endif ! WITH_LINUX check-symsorting: $(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl \ $(srcdir) $(SYM_FILES) @@ -445,7 +445,7 @@ else !WITH_REMOTE # The $(PROTOCOL_STRUCTS) files must live in git, because they cannot be # re-generated when configured --without-remote. check-protocol: -endif +endif !WITH_REMOTE EXTRA_DIST += $(PROTOCOL_STRUCTS) check-drivername: @@ -531,7 +531,7 @@ XEN_DRIVER_SOURCES = \ xen/xs_internal.c xen/xs_internal.h if WITH_XEN_INOTIFY XEN_DRIVER_SOURCES += xen/xen_inotify.c xen/xen_inotify.h -endif +endif WITH_XEN_INOTIFY LXC_MONITOR_PROTOCOL_GENERATED = \ $(srcdir)/lxc/lxc_monitor_protocol.h \ @@ -750,12 +750,12 @@ INTERFACE_DRIVER_SOURCES += \ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c -endif +endif WITH_NETCF if WITH_UDEV INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_udev.c -endif -endif +endif WITH_UDEV +endif WITH_INTERFACE SECRET_DRIVER_SOURCES = \ secret/secret_driver.h secret/secret_driver.c @@ -928,7 +928,7 @@ libvirt_la_BUILT_LIBADD += libvirt_vmx.la libvirt_vmx_la_CFLAGS = \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) libvirt_vmx_la_SOURCES = $(VMX_SOURCES) -endif +endif WITH_VMX if WITH_XENXS noinst_LTLIBRARIES += libvirt_xenxs.la @@ -936,7 +936,7 @@ libvirt_la_BUILT_LIBADD += libvirt_xenxs.la libvirt_xenxs_la_CFLAGS = \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) libvirt_xenxs_la_SOURCES = $(XENXS_SOURCES) -endif +endif WITH_XENXS noinst_LTLIBRARIES += libvirt_driver.la @@ -964,7 +964,7 @@ libvirt_la_BUILT_LIBADD += libvirt_driver_test.la libvirt_driver_test_la_CFLAGS = \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) libvirt_driver_test_la_SOURCES = $(TEST_DRIVER_SOURCES) -endif +endif WITH_TEST if WITH_REMOTE noinst_LTLIBRARIES += libvirt_driver_remote.la @@ -1002,11 +1002,11 @@ if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_xen.la libvirt_driver_xen_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_xen_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) -else +else ! WITH_DRIVER_MODULES noinst_LTLIBRARIES += libvirt_driver_xen.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_xen.la -endif +endif ! WITH_DRIVER_MODULES libvirt_driver_xen_impl_la_CFLAGS = \ $(XEN_CFLAGS) \ @@ -1017,7 +1017,7 @@ libvirt_driver_xen_impl_la_CFLAGS = \ libvirt_driver_xen_impl_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS) libvirt_driver_xen_impl_la_SOURCES = $(XEN_DRIVER_SOURCES) -endif +endif WITH_XEN if WITH_PHYP noinst_LTLIBRARIES += libvirt_driver_phyp.la @@ -1026,7 +1026,7 @@ libvirt_driver_phyp_la_LIBADD = $(SSH2_LIBS) libvirt_driver_phyp_la_CFLAGS = $(SSH2_CFLAGS) \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) libvirt_driver_phyp_la_SOURCES = $(PHYP_DRIVER_SOURCES) -endif +endif WITH_PHYP if WITH_OPENVZ noinst_LTLIBRARIES += libvirt_driver_openvz.la @@ -1034,7 +1034,7 @@ libvirt_la_BUILT_LIBADD += libvirt_driver_openvz.la libvirt_driver_openvz_la_CFLAGS = \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) libvirt_driver_openvz_la_SOURCES = $(OPENVZ_DRIVER_SOURCES) -endif +endif WITH_OPENVZ if WITH_VMWARE noinst_LTLIBRARIES += libvirt_driver_vmware.la @@ -1042,7 +1042,7 @@ libvirt_la_BUILT_LIBADD += libvirt_driver_vmware.la libvirt_driver_vmware_la_CFLAGS = \ -I$(top_srcdir)/src/conf -I$(top_srcdir)/src/vmx $(AM_CFLAGS) libvirt_driver_vmware_la_SOURCES = $(VMWARE_DRIVER_SOURCES) -endif +endif WITH_VMWARE if WITH_VBOX noinst_LTLIBRARIES += libvirt_driver_vbox_impl.la @@ -1052,12 +1052,12 @@ if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_vbox.la libvirt_driver_vbox_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) -else +else ! WITH_DRIVER_MODULES noinst_LTLIBRARIES += libvirt_driver_vbox.la # GPLv2-only license requries that it be linked into # libvirtd and *not* libvirt.so #libvirt_la_BUILT_LIBADD += libvirt_driver_vbox.la -endif +endif ! WITH_DRIVER_MODULES libvirt_driver_vbox_impl_la_CFLAGS = \ -I$(top_srcdir)/src/conf \ @@ -1065,7 +1065,7 @@ libvirt_driver_vbox_impl_la_CFLAGS = \ libvirt_driver_vbox_impl_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_vbox_impl_la_LIBADD = $(DLOPEN_LIBS) $(MSCOM_LIBS) libvirt_driver_vbox_impl_la_SOURCES = $(VBOX_DRIVER_SOURCES) -endif +endif WITH_VBOX if WITH_XENAPI noinst_LTLIBRARIES += libvirt_driver_xenapi.la @@ -1075,7 +1075,7 @@ libvirt_driver_xenapi_la_CFLAGS = $(LIBXENSERVER_CFLAGS) $(CURL_CFLAGS) \ libvirt_driver_xenapi_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_xenapi_la_LIBADD = $(LIBXENSERVER_LIBS) $(CURL_LIBS) libvirt_driver_xenapi_la_SOURCES = $(XENAPI_DRIVER_SOURCES) -endif +endif WITH_XENAPI if WITH_LIBXL noinst_LTLIBRARIES += libvirt_driver_libxl_impl.la @@ -1085,11 +1085,11 @@ if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_libxl.la libvirt_driver_libxl_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_libxl_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) -else +else ! WITH_DRIVER_MODULES noinst_LTLIBRARIES += libvirt_driver_libxl.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_libxl.la -endif +endif ! WITH_DRIVER_MODULES libvirt_driver_libxl_impl_la_CFLAGS = \ $(LIBXL_CFLAGS) \ @@ -1100,7 +1100,7 @@ libvirt_driver_libxl_impl_la_CFLAGS = \ libvirt_driver_libxl_impl_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_libxl_impl_la_LIBADD = $(LIBXL_LIBS) libvirt_xenxs.la libvirt_driver_libxl_impl_la_SOURCES = $(LIBXL_DRIVER_SOURCES) -endif +endif WITH_LIBXL if WITH_QEMU noinst_LTLIBRARIES += libvirt_driver_qemu_impl.la @@ -1110,11 +1110,11 @@ if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_qemu.la libvirt_driver_qemu_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_qemu_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) -else +else ! WITH_DRIVER_MODULES noinst_LTLIBRARIES += libvirt_driver_qemu.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_qemu.la -endif +endif ! WITH_DRIVER_MODULES libvirt_driver_qemu_impl_la_CFLAGS = \ $(GNUTLS_CFLAGS) \ @@ -1136,7 +1136,7 @@ augeas_DATA += qemu/libvirtd_qemu.aug augeastest_DATA += test_libvirtd_qemu.aug CLEANFILES += test_libvirtd_qemu.aug -endif +endif WITH_QEMU EXTRA_DIST += qemu/qemu.conf qemu/libvirtd_qemu.aug \ qemu/test_libvirtd_qemu.aug.in qemu/THREADS.txt @@ -1149,11 +1149,11 @@ if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_lxc.la libvirt_driver_lxc_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_lxc_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) -else +else ! WITH_DRIVER_MODULES noinst_LTLIBRARIES += libvirt_driver_lxc.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_lxc.la -endif +endif ! WITH_DRIVER_MODULES libvirt_driver_lxc_impl_la_CFLAGS = \ $(LIBNL_CFLAGS) \ @@ -1165,7 +1165,7 @@ libvirt_driver_lxc_impl_la_LIBADD = $(CAPNG_LIBS) $(LIBNL_LIBS) $(FUSE_LIBS) if WITH_BLKID libvirt_driver_lxc_impl_la_CFLAGS += $(BLKID_CFLAGS) libvirt_driver_lxc_impl_la_LIBADD += $(BLKID_LIBS) -endif +endif WITH_BLKID libvirt_driver_lxc_impl_la_LIBADD += $(SECDRIVER_LIBS) libvirt_driver_lxc_impl_la_SOURCES = $(LXC_DRIVER_SOURCES) @@ -1175,7 +1175,7 @@ augeas_DATA += lxc/libvirtd_lxc.aug augeastest_DATA += test_libvirtd_lxc.aug CLEANFILES += test_libvirtd_lxc.aug -endif +endif WITH_LXC EXTRA_DIST += lxc/lxc.conf lxc/libvirtd_lxc.aug lxc/test_libvirtd_lxc.aug.in if WITH_UML @@ -1186,11 +1186,11 @@ if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_uml.la libvirt_driver_uml_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_uml_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) -else +else ! WITH_DRIVER_MODULES noinst_LTLIBRARIES += libvirt_driver_uml.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_uml.la -endif +endif ! WITH_DRIVER_MODULES libvirt_driver_uml_impl_la_CFLAGS = \ -I$(top_srcdir)/src/access \ @@ -1199,7 +1199,7 @@ libvirt_driver_uml_impl_la_CFLAGS = \ libvirt_driver_uml_impl_la_LDFLAGS = $(AM_LDFLAGS) # libvirt_driver_uml_impl_la_LIBADD = libvirt_driver_uml_impl_la_SOURCES = $(UML_DRIVER_SOURCES) -endif +endif WITH_UML BUILT_SOURCES += $(ESX_DRIVER_GENERATED) @@ -1227,7 +1227,7 @@ libvirt_driver_esx_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_esx_la_LIBADD = $(CURL_LIBS) libvirt_driver_esx_la_SOURCES = $(ESX_DRIVER_SOURCES) libvirt_driver_esx_la_DEPENDENCIES = $(ESX_DRIVER_GENERATED) -endif +endif WITH_ESX BUILT_SOURCES += $(HYPERV_DRIVER_GENERATED) @@ -1254,7 +1254,7 @@ libvirt_driver_hyperv_la_CFLAGS = $(OPENWSMAN_CFLAGS) \ libvirt_driver_hyperv_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_hyperv_la_LIBADD = $(OPENWSMAN_LIBS) libvirt_driver_hyperv_la_SOURCES = $(HYPERV_DRIVER_SOURCES) -endif +endif WITH_HYPERV if WITH_PARALLELS noinst_LTLIBRARIES += libvirt_driver_parallels.la @@ -1262,7 +1262,7 @@ libvirt_la_BUILT_LIBADD += libvirt_driver_parallels.la libvirt_driver_parallels_la_CFLAGS = \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) libvirt_driver_parallels_la_SOURCES = $(PARALLELS_DRIVER_SOURCES) -endif +endif WITH_PARALLELS if WITH_NETWORK noinst_LTLIBRARIES += libvirt_driver_network_impl.la @@ -1275,11 +1275,11 @@ libvirt_driver_network_la_LIBADD += ../gnulib/lib/libgnu.la \ $(DBUS_LIBS) \ $(NULL) libvirt_driver_network_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) -else +else ! WITH_DRIVER_MODULES noinst_LTLIBRARIES += libvirt_driver_network.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_network.la -endif +endif ! WITH_DRIVER_MODULES libvirt_driver_network_impl_la_CFLAGS = \ $(LIBNL_CFLAGS) \ @@ -1289,18 +1289,18 @@ libvirt_driver_network_impl_la_CFLAGS = \ $(AM_CFLAGS) libvirt_driver_network_impl_la_SOURCES = $(NETWORK_DRIVER_SOURCES) libvirt_driver_network_impl_la_LIBADD = $(DBUS_LIBS) -endif +endif WITH_NETWORK EXTRA_DIST += network/default.xml if WITH_INTERFACE if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_interface.la -else +else ! WITH_DRIVER_MODULES noinst_LTLIBRARIES += libvirt_driver_interface.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_interface.la -endif +endif ! WITH_DRIVER_MODULES libvirt_driver_interface_la_CFLAGS = \ -I$(top_srcdir)/src/access \ -I$(top_srcdir)/src/conf \ @@ -1310,27 +1310,27 @@ libvirt_driver_interface_la_LIBADD = if WITH_NETCF libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) -else +else ! WITH_NETCF if WITH_UDEV libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) -endif -endif +endif WITH_UDEV +endif ! WITH_NETCF if WITH_DRIVER_MODULES libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_interface_la_LDFLAGS += -module -avoid-version -endif +endif WITH_DRIVER_MODULES libvirt_driver_interface_la_SOURCES = $(INTERFACE_DRIVER_SOURCES) -endif +endif WITH_INTERFACE if WITH_SECRETS if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_secret.la -else +else ! WITH_DRIVER_MODULES noinst_LTLIBRARIES += libvirt_driver_secret.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_secret.la -endif +endif ! WITH_DRIVER_MODULES libvirt_driver_secret_la_CFLAGS = \ -I$(top_srcdir)/src/access \ -I$(top_srcdir)/src/conf \ @@ -1338,9 +1338,9 @@ libvirt_driver_secret_la_CFLAGS = \ if WITH_DRIVER_MODULES libvirt_driver_secret_la_LIBADD = ../gnulib/lib/libgnu.la libvirt_driver_secret_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) -endif +endif WITH_DRIVER_MODULES libvirt_driver_secret_la_SOURCES = $(SECRET_DRIVER_SOURCES) -endif +endif WITH_SECRETS # Needed to keep automake quiet about conditionals libvirt_driver_storage_impl_la_SOURCES = @@ -1354,7 +1354,7 @@ libvirt_driver_storage_impl_la_LIBADD += $(SECDRIVER_LIBS) if WITH_BLKID libvirt_driver_storage_impl_la_CFLAGS += $(BLKID_CFLAGS) libvirt_driver_storage_impl_la_LIBADD += $(BLKID_LIBS) -endif +endif WITH_BLKID if WITH_STORAGE noinst_LTLIBRARIES += libvirt_driver_storage_impl.la libvirt_driver_storage_la_SOURCES = @@ -1363,55 +1363,55 @@ if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_storage.la libvirt_driver_storage_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_storage_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) -else +else ! WITH_DRIVER_MODULES noinst_LTLIBRARIES += libvirt_driver_storage.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_storage.la -endif +endif ! WITH_DRIVER_MODULES libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_SOURCES) libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_FS_SOURCES) -endif +endif WITH_STORAGE if WITH_STORAGE_LVM libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_LVM_SOURCES) -endif +endif WITH_STORAGE_LVM if WITH_STORAGE_ISCSI libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_ISCSI_SOURCES) -endif +endif WITH_STORAGE_ISCSI if WITH_STORAGE_SCSI libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_SCSI_SOURCES) -endif +endif WITH_STORAGE_SCSI if WITH_STORAGE_MPATH libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_MPATH_SOURCES) libvirt_driver_storage_impl_la_CFLAGS += $(DEVMAPPER_CFLAGS) libvirt_driver_storage_impl_la_LIBADD += $(DEVMAPPER_LIBS) -endif +endif WITH_STORAGE_MPATH if WITH_STORAGE_DISK libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_DISK_SOURCES) -endif +endif WITH_STORAGE_DISK if WITH_STORAGE_RBD libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_RBD_SOURCES) libvirt_driver_storage_impl_la_LIBADD += $(LIBRBD_LIBS) -endif +endif WITH_STORAGE_RBD if WITH_STORAGE_SHEEPDOG libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_SHEEPDOG_SOURCES) -endif +endif WITH_STORAGE_SHEEPDOG if WITH_NODE_DEVICES # Needed to keep automake quiet about conditionals if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_nodedev.la -else +else ! WITH_DRIVER_MODULES noinst_LTLIBRARIES += libvirt_driver_nodedev.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_nodedev.la -endif +endif ! WITH_DRIVER_MODULES libvirt_driver_nodedev_la_SOURCES = $(NODE_DEVICE_DRIVER_SOURCES) libvirt_driver_nodedev_la_CFLAGS = \ @@ -1426,29 +1426,29 @@ if WITH_HAL libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_HAL_SOURCES) libvirt_driver_nodedev_la_CFLAGS += $(HAL_CFLAGS) libvirt_driver_nodedev_la_LIBADD += $(HAL_LIBS) -endif +endif WITH_HAL if WITH_UDEV libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_UDEV_SOURCES) libvirt_driver_nodedev_la_CFLAGS += $(UDEV_CFLAGS) $(PCIACCESS_CFLAGS) libvirt_driver_nodedev_la_LIBADD += $(UDEV_LIBS) $(PCIACCESS_LIBS) -endif -endif +endif WITH_UDEV +endif WITH_LIBVIRTD if WITH_DRIVER_MODULES libvirt_driver_nodedev_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_nodedev_la_LDFLAGS += -module -avoid-version -endif -endif +endif WITH_DRIVER_MODULES +endif WITH_NODE_DEVICES if WITH_NWFILTER if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_nwfilter.la -else +else ! WITH_DRIVER_MODULES noinst_LTLIBRARIES += libvirt_driver_nwfilter.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_nwfilter.la -endif +endif ! WITH_DRIVER_MODULES libvirt_driver_nwfilter_la_CFLAGS = \ $(LIBPCAP_CFLAGS) \ $(LIBNL_CFLAGS) \ @@ -1461,9 +1461,9 @@ libvirt_driver_nwfilter_la_LIBADD = $(LIBPCAP_LIBS) $(LIBNL_LIBS) $(DBUS_LIBS) if WITH_DRIVER_MODULES libvirt_driver_nwfilter_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_nwfilter_la_LDFLAGS += -module -avoid-version -endif +endif WITH_DRIVER_MODULES libvirt_driver_nwfilter_la_SOURCES = $(NWFILTER_DRIVER_SOURCES) -endif +endif WITH_NWFILTER libvirt_security_manager_la_SOURCES = $(SECURITY_DRIVER_SOURCES) @@ -1476,11 +1476,11 @@ libvirt_security_manager_la_LIBADD = $(SECDRIVER_LIBS) if WITH_SECDRIVER_SELINUX libvirt_security_manager_la_SOURCES += $(SECURITY_DRIVER_SELINUX_SOURCES) libvirt_security_manager_la_CFLAGS += $(SELINUX_CFLAGS) -endif +endif WITH_SECDRIVER_SELINUX if WITH_SECDRIVER_APPARMOR libvirt_security_manager_la_SOURCES += $(SECURITY_DRIVER_APPARMOR_SOURCES) libvirt_security_manager_la_CFLAGS += $(APPARMOR_CFLAGS) -endif +endif WITH_SECDRIVER_APPARMOR libvirt_driver_access_la_SOURCES = \ $(ACCESS_DRIVER_SOURCES) $(ACCESS_DRIVER_GENERATED) @@ -1505,9 +1505,9 @@ $(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ CLEANFILES += $(ACCESS_DRIVER_POLKIT_POLICY) BUILT_SOURCES += $(ACCESS_DRIVER_POLKIT_POLICY) -else +else ! WITH_POLKIT1 EXTRA_DIST += $(ACCESS_DRIVER_POLKIT_SOURCES) -endif +endif ! WITH_POLKIT1 BUILT_SOURCES += $(ACCESS_DRIVER_GENERATED) $(ACCESS_DRIVER_API_FILES) @@ -1631,9 +1631,9 @@ check-augeas-qemu: test_libvirtd_qemu.aug $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ '$(AUGPARSE)' -I $(srcdir)/qemu test_libvirtd_qemu.aug; \ fi -else +else ! WITH_QEMU check-augeas-qemu: -endif +endif ! WITH_QEMU if WITH_LXC test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \ @@ -1644,9 +1644,9 @@ check-augeas-lxc: test_libvirtd_lxc.aug $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ '$(AUGPARSE)' -I $(srcdir)/lxc test_libvirtd_lxc.aug; \ fi -else +else ! WITH_LXC check-augeas-lxc: -endif +endif ! WITH_LXC if WITH_SANLOCK test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \ @@ -1657,9 +1657,9 @@ check-augeas-sanlock: test_libvirt_sanlock.aug $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_sanlock.aug; \ fi -else +else ! WITH_SANLOCK check-augeas-sanlock: -endif +endif ! WITH_SANLOCK test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \ locking/qemu-lockd.conf $(AUG_GENTEST) @@ -1700,69 +1700,69 @@ check-augeas-virtlockd: test_virtlockd.aug if WITH_DRIVER_MODULES USED_SYM_FILES += $(srcdir)/libvirt_driver_modules.syms -else +else ! WITH_DRIVER_MODULES SYM_FILES += $(srcdir)/libvirt_driver_modules.syms -endif +endif ! WITH_DRIVER_MODULES if WITH_LINUX USED_SYM_FILES += $(srcdir)/libvirt_linux.syms -else +else ! WITH_LINUX SYM_FILES += $(srcdir)/libvirt_linux.syms -endif +endif ! WITH_LINUX if WITH_ESX USED_SYM_FILES += $(srcdir)/libvirt_esx.syms -else +else ! WITH_ESX SYM_FILES += $(srcdir)/libvirt_esx.syms -endif +endif ! WITH_ESX if WITH_LIBVIRTD USED_SYM_FILES += $(srcdir)/libvirt_daemon.syms -else +else ! WITH_LIBVIRTD SYM_FILES += $(srcdir)/libvirt_daemon.syms -endif +endif ! WITH_LIBVIRTD if WITH_OPENVZ USED_SYM_FILES += $(srcdir)/libvirt_openvz.syms -else +else ! WITH_OPENVZ SYM_FILES += $(srcdir)/libvirt_openvz.syms -endif +endif ! WITH_OPENVZ if WITH_VMX USED_SYM_FILES += $(srcdir)/libvirt_vmx.syms -else +else ! WITH_VMX SYM_FILES += $(srcdir)/libvirt_vmx.syms -endif +endif ! WITH_VMX if WITH_XENXS USED_SYM_FILES += $(srcdir)/libvirt_xenxs.syms -else +else ! WITH_XENXS SYM_FILES += $(srcdir)/libvirt_xenxs.syms -endif +endif ! WITH_XENXS if WITH_SASL USED_SYM_FILES += $(srcdir)/libvirt_sasl.syms -else +else ! WITH_SASL SYM_FILES += $(srcdir)/libvirt_sasl.syms -endif +endif ! WITH_SASL if WITH_GNUTLS USED_SYM_FILES += $(srcdir)/libvirt_gnutls.syms -else +else ! WITH_GNUTLS SYM_FILES += $(srcdir)/libvirt_gnutls.syms -endif +endif ! WITH_GNUTLS if WITH_SSH2 USED_SYM_FILES += $(srcdir)/libvirt_libssh2.syms -else +else ! WITH_SSH2 SYM_FILES += $(srcdir)/libvirt_libssh2.syms -endif +endif ! WITH_SSH2 if WITH_ATOMIC_OPS_PTHREAD USED_SYM_FILES += $(srcdir)/libvirt_atomic.syms -else +else ! WITH_ATOMIC_OPS_PTHREAD SYM_FILES += $(srcdir)/libvirt_atomic.syms -endif +endif ! WITH_ATOMIC_OPS_PTHREAD EXTRA_DIST += \ libvirt_public.syms \ @@ -1842,7 +1842,7 @@ nodist_libvirt_driver_remote_la_SOURCES = libvirt_probes.h endif WITH_REMOTE if WITH_DRIVER_MODULES DTRACE2SYSTEMTAP_FLAGS = --with-modules -endif +endif WITH_DRIVER_MODULES BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp @@ -1850,7 +1850,7 @@ if WITH_QEMU libvirt_driver_qemu_la_LIBADD += libvirt_qemu_probes.lo nodist_libvirt_driver_qemu_la_SOURCES = libvirt_qemu_probes.h BUILT_SOURCES += libvirt_qemu_probes.h -endif +endif WITH_QEMU tapsetdir = $(datadir)/systemtap/tapset tapset_DATA = libvirt_probes.stp libvirt_qemu_probes.stp libvirt_functions.stp @@ -1892,7 +1892,7 @@ CLEANFILES += libvirt_probes.h libvirt_probes.o libvirt_probes.lo \ libvirt_qemu_probes.lo\ libvirt_functions.stp libvirt_probes.stp \ libvirt_qemu_probes.stp -endif +endif WITH_DTRACE_PROBES EXTRA_DIST += libvirt_probes.d libvirt_qemu_probes.d @@ -1940,12 +1940,12 @@ augeastest_DATA += test_libvirt_lockd.aug CLEANFILES += test_libvirt_lockd.aug if WITH_DTRACE_PROBES lockd_la_LIBADD += libvirt_probes.lo -endif +endif WITH_DTRACE_PROBES if WITH_QEMU nodist_conf_DATA += locking/qemu-lockd.conf BUILT_SOURCES += locking/qemu-lockd.conf DISTCLEANFILES += locking/qemu-lockd.conf -endif +endif WITH_QEMU locking/%-lockd.conf: $(srcdir)/locking/lockd.conf $(AM_V_GEN)$(MKDIR_P) locking ; \ @@ -1979,12 +1979,12 @@ virtlockd_LDADD = \ $(NULL) if WITH_DTRACE_PROBES virtlockd_LDADD += libvirt_probes.lo -endif +endif WITH_DTRACE_PROBES -else +else ! WITH_LIBVIRTD EXTRA_DIST += $(LOCK_DAEMON_SOURCES) \ $(LOCK_DRIVER_LOCKD_SOURCES) -endif +endif ! WITH_LIBVIRTD EXTRA_DIST += locking/virtlockd.sysconf \ locking/lockd.conf \ @@ -2015,14 +2015,14 @@ uninstall-init:: uninstall-sysconfig BUILT_SOURCES += virtlockd.init DISTCLEANFILES += virtlockd.init -else +else ! LIBVIRT_INIT_SCRIPT_RED_HAT install-init:: uninstall-init:: -endif -else +endif ! LIBVIRT_INIT_SCRIPT_RED_HAT +else ! WITH_LIBVIRTD install-init:: uninstall-init:: -endif +endif ! WITH_LIBVIRTD virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status $(AM_V_GEN)sed \ @@ -2089,14 +2089,14 @@ uninstall-systemd: uninstall-sysconfig rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.service \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.socket rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : -else +else ! LIBVIRT_INIT_SCRIPT_SYSTEMD install-systemd: uninstall-systemd: -endif -else +endif ! LIBVIRT_INIT_SCRIPT_SYSTEMD +else ! WITH_LIBVIRTD install-systemd: uninstall-systemd: -endif +endif ! WITH_LIBVIRTD virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.status $(AM_V_GEN)sed \ @@ -2131,10 +2131,10 @@ if WITH_QEMU nodist_conf_DATA += locking/qemu-sanlock.conf BUILT_SOURCES += locking/qemu-sanlock.conf DISTCLEANFILES += locking/qemu-sanlock.conf -endif -else +endif WITH_QEMU +else ! WITH_SANLOCK EXTRA_DIST += $(LOCK_DRIVER_SANLOCK_SOURCES) -endif +endif ! WITH_SANLOCK EXTRA_DIST += locking/sanlock.conf \ locking/libvirt_sanlock.aug \ locking/test_libvirt_sanlock.aug.in @@ -2169,24 +2169,24 @@ libvirt_net_rpc_la_SOURCES = \ if WITH_SSH2 libvirt_net_rpc_la_SOURCES += \ rpc/virnetsshsession.h rpc/virnetsshsession.c -else +else ! WITH_SSH2 EXTRA_DIST += \ rpc/virnetsshsession.h rpc/virnetsshsession.c -endif +endif ! WITH_SSH2 if WITH_GNUTLS libvirt_net_rpc_la_SOURCES += \ rpc/virnettlscontext.h rpc/virnettlscontext.c -else +else ! WITH_GNUTLS EXTRA_DIST += \ rpc/virnettlscontext.h rpc/virnettlscontext.c -endif +endif ! WITH_GNUTLS if WITH_SASL libvirt_net_rpc_la_SOURCES += \ rpc/virnetsaslcontext.h rpc/virnetsaslcontext.c -else +else ! WITH_SASL EXTRA_DIST += \ rpc/virnetsaslcontext.h rpc/virnetsaslcontext.c -endif +endif ! WITH_SASL libvirt_net_rpc_la_CFLAGS = \ $(GNUTLS_CFLAGS) \ $(SASL_CFLAGS) \ @@ -2253,13 +2253,13 @@ libvirt_iohelper_LDADD = \ ../gnulib/lib/libgnu.la if WITH_DTRACE_PROBES libvirt_iohelper_LDADD += libvirt_probes.lo -endif +endif WITH_DTRACE_PROBES libvirt_iohelper_CFLAGS = \ $(AM_CFLAGS) \ $(PIE_CFLAGS) \ $(NULL) -endif +endif WITH_LIBVIRTD if WITH_STORAGE_DISK if WITH_LIBVIRTD @@ -2276,15 +2276,15 @@ libvirt_parthelper_LDADD = \ ../gnulib/lib/libgnu.la if WITH_DTRACE_PROBES libvirt_parthelper_LDADD += libvirt_probes.lo -endif +endif WITH_DTRACE_PROBES libvirt_parthelper_CFLAGS = \ $(LIBPARTED_CFLAGS) \ $(AM_CFLAGS) \ $(PIE_CFLAGS) \ $(NULL) -endif -endif +endif WITH_LIBVIRTD +endif WITH_STORAGE_DISK EXTRA_DIST += $(STORAGE_HELPER_DISK_SOURCES) @@ -2302,7 +2302,7 @@ libvirt_sanlock_helper_LDFLAGS = \ $(PIE_LDFLAGS) \ $(NULL) libvirt_sanlock_helper_LDADD = libvirt.la -endif +endif WITH_SANLOCK if WITH_LXC if WITH_LIBVIRTD @@ -2326,7 +2326,7 @@ libvirt_lxc_LDADD = \ ../gnulib/lib/libgnu.la if WITH_DTRACE_PROBES libvirt_lxc_LDADD += libvirt_probes.lo -endif +endif WITH_DTRACE_PROBES libvirt_lxc_LDADD += $(SECDRIVER_LIBS) libvirt_lxc_CFLAGS = \ -I$(top_srcdir)/src/conf \ @@ -2338,15 +2338,15 @@ libvirt_lxc_CFLAGS = \ if WITH_BLKID libvirt_lxc_CFLAGS += $(BLKID_CFLAGS) libvirt_lxc_LDADD += $(BLKID_LIBS) -endif +endif WITH_BLKID if WITH_SECDRIVER_SELINUX libvirt_lxc_CFLAGS += $(SELINUX_CFLAGS) -endif +endif WITH_SECDRIVER_SELINUX if WITH_SECDRIVER_APPARMOR libvirt_lxc_CFLAGS += $(APPARMOR_CFLAGS) -endif -endif -endif +endif WITH_SECDRIVER_APPARMOR +endif WITH_LIBVIRTD +endif WITH_LXC EXTRA_DIST += $(LXC_CONTROLLER_SOURCES) if WITH_SECDRIVER_APPARMOR @@ -2365,15 +2365,15 @@ virt_aa_helper_LDADD = \ ../gnulib/lib/libgnu.la if WITH_DTRACE_PROBES virt_aa_helper_LDADD += libvirt_probes.lo -endif +endif WITH_DTRACE_PROBES virt_aa_helper_CFLAGS = \ -I$(top_srcdir)/src/conf \ -I$(top_srcdir)/src/security \ $(AM_CFLAGS) \ $(PIE_CFLAGS) \ $(NULL) -endif -endif +endif WITH_LIBVIRTD +endif WITH_SECDRIVER_APPARMOR EXTRA_DIST += $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES) install-data-local: install-init install-systemd @@ -2381,37 +2381,37 @@ if WITH_LIBVIRTD $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lockd" -endif +endif WITH_LIBVIRTD $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/images" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" if WITH_SANLOCK $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" -endif +endif WITH_SANLOCK if WITH_QEMU $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu/channel/target" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/qemu" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/qemu" -endif +endif WITH_QEMU if WITH_LXC $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" -endif +endif WITH_LXC if WITH_LIBXL $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/libxl" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" -endif +endif WITH_LIBXL if WITH_UML $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/uml" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/uml" -endif +endif WITH_UML if WITH_XEN $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" -endif +endif WITH_XEN if WITH_NETWORK $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/network" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/dnsmasq" @@ -2429,43 +2429,43 @@ if WITH_NETWORK test -e $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml || \ ln -s ../default.xml \ $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml -endif +endif WITH_NETWORK uninstall-local:: uninstall-init uninstall-systemd if WITH_LIBVIRTD rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" ||: rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lockd" ||: -endif +endif WITH_LIBVIRTD rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/images" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" ||: if WITH_SANLOCK rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||: -endif +endif WITH_SANLOCK if WITH_QEMU rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu" ||: rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/qemu" ||: rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu" ||: rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/qemu" ||: -endif +endif WITH_QEMU if WITH_LXC rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" ||: rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" ||: -endif +endif WITH_LXC if WITH_LIBXL rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" ||: rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/libxl" ||: rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" ||: -endif +endif WITH_LIBXL if WITH_UML rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/uml" ||: rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/uml" ||: -endif +endif WITH_UML if WITH_XEN rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" ||: -endif +endif WITH_XEN if WITH_NETWORK rm -f $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml rm -f $(DESTDIR)$(confdir)/qemu/networks/default.xml @@ -2473,7 +2473,7 @@ if WITH_NETWORK rmdir "$(DESTDIR)$(confdir)/qemu/networks" || : rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/network" ||: rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/network" ||: -endif +endif WITH_NETWORK rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt" ||: CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s diff --git a/tests/Makefile.am b/tests/Makefile.am index c800179..1d38f76 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -41,12 +41,12 @@ AM_CFLAGS = \ if WITH_DRIVER_MODULES INCLUDES += \ -DTEST_DRIVER_DIR=\"$(top_builddir)/src/.libs\" -endif +endif WITH_DRIVER_MODULES PROBES_O = if WITH_DTRACE_PROBES PROBES_O += ../src/libvirt_probes.lo -endif +endif WITH_DTRACE_PROBES LDADDS = \ $(WARN_CFLAGS) \ @@ -135,24 +135,24 @@ test_programs = virshtest sockettest \ if WITH_DBUS test_programs += virdbustest \ virsystemdtest -endif +endif WITH_DBUS if WITH_GNUTLS test_programs += virnettlscontexttest virnettlssessiontest -endif +endif WITH_GNUTLS if WITH_SECDRIVER_SELINUX if WITH_ATTR test_programs += securityselinuxtest if WITH_QEMU test_programs += securityselinuxlabeltest -endif -endif -endif +endif WITH_QEMU +endif WITH_ATTR +endif WITH_SECDRIVER_SELINUX if WITH_DRIVER_MODULES test_programs += virdrivermoduletest -endif +endif WITH_DRIVER_MODULES # This is a fake SSH we use from virnetsockettest ssh_SOURCES = ssh.c @@ -161,53 +161,53 @@ ssh_LDADD = $(COVERAGE_LDFLAGS) if WITH_XEN test_programs += xml2sexprtest sexpr2xmltest \ xmconfigtest xencapstest statstest reconnect -endif +endif WITH_XEN if WITH_QEMU test_programs += qemuxml2argvtest qemuxml2xmltest qemuxmlnstest \ qemuargv2xmltest qemuhelptest domainsnapshotxml2xmltest \ qemumonitortest qemumonitorjsontest qemuhotplugtest \ qemuagenttest -endif +endif WITH_QEMU if WITH_LXC test_programs += lxcxml2xmltest -endif +endif WITH_LXC if WITH_OPENVZ test_programs += openvzutilstest -endif +endif WITH_OPENVZ if WITH_ESX test_programs += esxutilstest -endif +endif WITH_ESX if WITH_VMX test_programs += vmx2xmltest xml2vmxtest -endif +endif WITH_VMX if WITH_CIL test_programs += object-locking -endif +endif WITH_CIL if WITH_YAJL test_programs += jsontest -endif +endif WITH_YAJL test_programs += networkxml2xmltest networkxml2xmlupdatetest if WITH_NETWORK test_programs += networkxml2conftest -endif +endif WITH_NETWORK if WITH_STORAGE_SHEEPDOG test_programs += storagebackendsheepdogtest -endif +endif WITH_STORAGE_SHEEPDOG test_programs += nwfilterxml2xmltest if WITH_STORAGE test_programs += storagevolxml2argvtest -endif +endif WITH_STORAGE test_programs += storagevolxml2xmltest storagepoolxml2xmltest @@ -251,7 +251,7 @@ test_scripts += \ test_programs += \ eventtest \ libvirtdconftest -else +else ! WITH_LIBVIRTD EXTRA_DIST += \ test_conf.sh \ cpuset \ @@ -269,13 +269,13 @@ EXTRA_DIST += \ virsh-synopsis \ virsh-undefine \ $(NULL) -endif +endif ! WITH_LIBVIRTD if WITH_SECDRIVER_APPARMOR test_scripts += virt-aa-helper-test -else +else ! WITH_SECDRIVER_APPARMOR EXTRA_DIST += virt-aa-helper-test -endif +endif ! WITH_SECDRIVER_APPARMOR EXTRA_DIST += $(test_scripts) @@ -285,19 +285,19 @@ test_libraries = libshunload.la \ $(NULL) if WITH_QEMU test_libraries += libqemumonitortestutils.la -endif +endif WITH_QEMU if WITH_DBUS test_libraries += virsystemdmock.la -endif +endif WITH_DBUS if WITH_TESTS noinst_PROGRAMS = $(test_programs) $(test_helpers) noinst_LTLIBRARIES = $(test_libraries) -else +else ! WITH_TESTS check_PROGRAMS = $(test_programs) $(test_helpers) check_LTLIBRARIES = $(test_libraries) -endif +endif ! WITH_TESTS TESTS = $(test_programs) \ $(test_scripts) @@ -369,11 +369,11 @@ statstest_SOURCES = \ statstest.c testutils.h testutils.c statstest_LDADD = $(xen_LDADDS) -else +else ! WITH_XEN EXTRA_DIST += xml2sexprtest.c sexpr2xmltest.c xmconfigtest.c \ xencapstest.c reconnect.c \ testutilsxen.c testutilsxen.h -endif +endif ! WITH_XEN QEMUMONITORTESTUTILS_SOURCES = \ qemumonitortestutils.c \ @@ -387,10 +387,10 @@ libqemumonitortestutils_la_SOURCES = $(QEMUMONITORTESTUTILS_SOURCES) qemu_LDADDS = ../src/libvirt_driver_qemu_impl.la if WITH_NETWORK qemu_LDADDS += ../src/libvirt_driver_network_impl.la -endif +endif WITH_NETWORK if WITH_DTRACE_PROBES qemu_LDADDS += ../src/libvirt_qemu_probes.lo -endif +endif WITH_DTRACE_PROBES qemu_LDADDS += $(LDADDS) qemuxml2argvtest_SOURCES = \ @@ -444,39 +444,39 @@ domainsnapshotxml2xmltest_SOURCES = \ domainsnapshotxml2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h domainsnapshotxml2xmltest_LDADD = $(qemu_LDADDS) -else +else ! WITH_QEMU EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c \ qemuxmlnstest.c qemuhelptest.c domainsnapshotxml2xmltest.c \ qemumonitortest.c testutilsqemu.c testutilsqemu.h \ qemumonitorjsontest.c qemuhotplugtest.c \ qemuagenttest.c \ $(QEMUMONITORTESTUTILS_SOURCES) -endif +endif ! WITH_QEMU if WITH_LXC lxc_LDADDS = ../src/libvirt_driver_lxc_impl.la if WITH_NETWORK lxc_LDADDS += ../src/libvirt_driver_network_impl.la -endif +endif WITH_NETWORK lxc_LDADDS += $(LDADDS) lxcxml2xmltest_SOURCES = \ lxcxml2xmltest.c testutilslxc.c testutilslxc.h \ testutils.c testutils.h lxcxml2xmltest_LDADD = $(lxc_LDADDS) -else +else ! WITH_LXC EXTRA_DIST += lxcxml2xmltest.c testutilslxc.c testutilslxc.h -endif +endif ! WITH_LXC if WITH_OPENVZ openvzutilstest_SOURCES = \ openvzutilstest.c \ testutils.c testutils.h openvzutilstest_LDADD = $(LDADDS) -else +else ! WITH_OPENVZ EXTRA_DIST += openvzutilstest.c -endif +endif ! WITH_OPENVZ EXTRA_DIST += openvzutilstest.conf if WITH_ESX @@ -484,9 +484,9 @@ esxutilstest_SOURCES = \ esxutilstest.c \ testutils.c testutils.h esxutilstest_LDADD = $(LDADDS) -else +else ! WITH_ESX EXTRA_DIST += esxutilstest.c -endif +endif ! WITH_ESX if WITH_VMX vmx2xmltest_SOURCES = \ @@ -498,9 +498,9 @@ xml2vmxtest_SOURCES = \ xml2vmxtest.c \ testutils.c testutils.h xml2vmxtest_LDADD = $(LDADDS) -else +else ! WITH_VMX EXTRA_DIST += vmx2xmltest.c xml2vmxtest.c -endif +endif ! WITH_VMX networkxml2xmltest_SOURCES = \ networkxml2xmltest.c \ @@ -517,9 +517,9 @@ networkxml2conftest_SOURCES = \ networkxml2conftest.c \ testutils.c testutils.h networkxml2conftest_LDADD = ../src/libvirt_driver_network_impl.la $(LDADDS) -else +else ! WITH_NETWORK EXTRA_DIST += networkxml2conftest.c -endif +endif ! WITH_NETWORK if WITH_STORAGE_SHEEPDOG storagebackendsheepdogtest_SOURCES = \ @@ -527,9 +527,9 @@ storagebackendsheepdogtest_SOURCES = \ testutils.c testutils.h storagebackendsheepdogtest_LDADD = \ ../src/libvirt_driver_storage_impl.la $(LDADDS) -else +else ! WITH_STORAGE_SHEEPDOG EXTRA_DIST += storagebackendsheepdogtest.c -endif +endif ! WITH_STORAGE_SHEEPDOG nwfilterxml2xmltest_SOURCES = \ nwfilterxml2xmltest.c \ @@ -542,9 +542,9 @@ storagevolxml2argvtest_SOURCES = \ testutils.c testutils.h storagevolxml2argvtest_LDADD = \ ../src/libvirt_driver_storage_impl.la $(LDADDS) -else +else ! WITH_STORAGE EXTRA_DIST += storagevolxml2argvtest.c -endif +endif ! WITH_STORAGE storagevolxml2xmltest_SOURCES = \ storagevolxml2xmltest.c \ @@ -598,9 +598,9 @@ libvirtdconftest_SOURCES = \ libvirtdconftest.c testutils.h testutils.c \ ../daemon/libvirtd-config.c libvirtdconftest_LDADD = $(LDADDS) -else +else ! WITH_LIBVIRTD EXTRA_DIST += libvirtdconftest.c -endif +endif ! WITH_LIBVIRTD virnetmessagetest_SOURCES = \ virnetmessagetest.c testutils.h testutils.c @@ -627,15 +627,15 @@ virnettlscontexttest_SOURCES += pkix_asn1_tab.c virnettlscontexttest_LDADD += -ltasn1 virnettlssessiontest_SOURCES += pkix_asn1_tab.c virnettlssessiontest_LDADD += -ltasn1 -else +else ! HAVE_LIBTASN1 EXTRA_DIST += pkix_asn1_tab.c -endif -else +endif ! HAVE_LIBTASN1 +else ! WITH_GNUTLS EXTRA_DIST += \ virnettlscontexttest.c virnettlssessiontest.c \ virnettlshelpers.h virnettlshelpers.c \ testutils.h testutils.c pkix_asn1_tab.c -endif +endif ! WITH_GNUTLS virtimetest_SOURCES = \ virtimetest.c testutils.h testutils.c @@ -698,9 +698,9 @@ virsystemdmock_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) virsystemdmock_la_LDFLAGS = -module -avoid-version \ -rpath /evil/libtool/hack/to/force/shared/lib/creation -else +else ! WITH_DBUS EXTRA_DIST += virdbustest.c virsystemdtest.c virsystemdmock.c -endif +endif ! WITH_DBUS viruritest_SOURCES = \ viruritest.c testutils.h testutils.c @@ -722,9 +722,9 @@ if WITH_SECDRIVER_SELINUX if WITH_ATTR if WITH_TESTS noinst_LTLIBRARIES += libsecurityselinuxhelper.la -else +else ! WITH_TESTS check_LTLIBRARIES += libsecurityselinuxhelper.la -endif +endif ! WITH_TESTS libsecurityselinuxhelper_la_SOURCES = \ securityselinuxhelper.c @@ -744,9 +744,9 @@ securityselinuxlabeltest_SOURCES = \ securityselinuxlabeltest_LDADD = $(qemu_LDADDS) $(SELINUX_LIBS) securityselinuxlabeltest_DEPENDENCIES = libsecurityselinuxhelper.la \ ../src/libvirt.la -endif -endif -endif +endif WITH_QEMU +endif WITH_ATTR +endif WITH_SECDRIVER_SELINUX EXTRA_DIST += securityselinuxtest.c securityselinuxlabeltest.c \ securityselinuxhelper.c @@ -782,13 +782,13 @@ if WITH_DRIVER_MODULES virdrivermoduletest_SOURCES = \ virdrivermoduletest.c testutils.h testutils.c virdrivermoduletest_LDADD = $(LDADDS) -endif +endif WITH_DRIVER_MODULES if WITH_LIBVIRTD eventtest_SOURCES = \ eventtest.c testutils.h testutils.c eventtest_LDADD = -lrt $(LDADDS) -endif +endif WITH_LIBVIRTD libshunload_la_SOURCES = shunloadhelper.c libshunload_la_LIBADD = ../src/libvirt.la @@ -830,9 +830,9 @@ object-locking: object-locking.cmx object-locking-files.txt object-locking-files.txt: find $(top_builddir)/src/ -name '*.i' > $@ -else +else ! WITH_CIL EXTRA_DIST += object-locking.ml -endif +endif ! WITH_CIL CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.cmi *.cmx \ object-locking-files.txt diff --git a/tools/Makefile.am b/tools/Makefile.am index d9532dd..0193140 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -69,7 +69,7 @@ libexec_SCRIPTS = libvirt-guests.sh if WITH_SANLOCK sbin_SCRIPTS = virt-sanlock-cleanup DISTCLEANFILES += virt-sanlock-cleanup -endif +endif WITH_SANLOCK if WITH_LXC conf_DATA += virt-login-shell.conf @@ -87,7 +87,7 @@ dist_man1_MANS += virt-login-shell.1 endif WITH_LXC if WITH_SANLOCK dist_man8_MANS = virt-sanlock-cleanup.8 -endif +endif WITH_SANLOCK virt-xml-validate: virt-xml-validate.in Makefile $(AM_V_GEN)sed -e 's|[@]schemadir@|$(pkgdatadir)/schemas|g' \ @@ -229,7 +229,7 @@ virsh_win_icon.$(OBJEXT): virsh_win_icon.rc $(AM_V_GEN)$(WINDRES) \ --input-format rc --input $< \ --output-format coff --output $@ -endif +endif WITH_WIN_ICON virt-login-shell.1: virt-login-shell.pod $(top_srcdir)/configure.ac $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ \ @@ -270,10 +270,10 @@ if LIBVIRT_INIT_SCRIPT_RED_HAT BUILT_SOURCES += libvirt-guests.init install-init: install-sysconfig install-initscript uninstall-init: uninstall-sysconfig uninstall-initscript -else +else ! LIBVIRT_INIT_SCRIPT_RED_HAT install-init: uninstall-init: -endif # LIBVIRT_INIT_SCRIPT_RED_HAT +endif ! LIBVIRT_INIT_SCRIPT_RED_HAT libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status $(AM_V_GEN)sed \ @@ -311,10 +311,10 @@ uninstall-systemd: uninstall-sysconfig BUILT_SOURCES += libvirt-guests.service -else +else ! LIBVIRT_INIT_SCRIPT_SYSTEMD install-systemd: uninstall-systemd: -endif # LIBVIRT_INIT_SCRIPT_SYSTEMD +endif ! LIBVIRT_INIT_SCRIPT_SYSTEMD libvirt-guests.service: libvirt-guests.service.in $(top_builddir)/config.status $(AM_V_GEN)sed \ -- 1.8.3.1

2 2

[libvirt] [PATCH] conf: Remove the actual hostdev when removing a network
by Peter Krempa 04 Sep '13

04 Sep '13

Commit 50348e6edfa reused the code to remove the hostdev portion of a network definition on multiple places but forgot to take into account that sometimes the "actual" network is passed and in some cases the parent of that. This patch uses the virDomainNetGetActualHostdev() helper to acquire the correct pointer all the time while removing the hostdev portion from the list. --- src/conf/domain_conf.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e412f28..cef4cf9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10002,14 +10002,14 @@ void virDomainNetRemoveHostdev(virDomainDefPtr def, virDomainNetDefPtr net) { - if (net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) { - /* hostdev net devices are normally also be in the hostdevs - * array, but might have already been removed by the time we - * get here. - */ - virDomainHostdevDefPtr hostdev = &net->data.hostdev.def; - size_t i; + /* hostdev net devices are normally also be in the hostdevs + * array, but might have already been removed by the time we + * get here. + */ + virDomainHostdevDefPtr hostdev = virDomainNetGetActualHostdev(net); + size_t i; + if (hostdev) { for (i = 0; i < def->nhostdevs; i++) { if (def->hostdevs[i] == hostdev) { virDomainHostdevRemove(def, i); -- 1.8.3.2

3 4

[libvirt] [ottlik@fzi.de: [Qemu-devel] [PATCH RFC] Do not set SO_REUSEADDR on Windows]
by Daniel P. Berrange 04 Sep '13

04 Sep '13

----- Forwarded message from Sebastian Ottlik <ottlik(a)fzi.de> ----- > > This patchset disabels all use of SO_REUSEADDR on Windows. On Windows systems > the default behavior is equivalent to SO_REUSEADDR on other operating > systems. SO_REUSEADDR can still be set but results in undesired bahvior > instead. It may even lead to situations were system behavior is > unspecified. More information on this can be found at: > http://msdn.microsoft.com/en-us/library/windows/desktop/ms740621.aspx ----- End forwarded message ----- Read that doc and cry. In summary - On UNIX, SO_REUSEADDR allows an application to re-bind to a socket while it is in the CLOSE_WAIT state. - On Windows, you can always bind to a socket in CLOSE_WAIT state and AFAIK you can't disable this behaviour. Setting SO_REUSEADDR lets you bind to a socket when in *any* state. So if code originating on Linux is blindly setting SO_REUSEADDR it is almost certainly broken on Windows. Windows' interpretation of SO_REUSEADDR is somewhat closer to the new Linux v3.9 flag SO_REUSEPORT http://freeprogrammersblog.vhex.net/post/linux-39-introdued-new-way-of-writ… https://lwn.net/Articles/542629/ but the behaviour of SO_REUSEADDR is undefined on Windows for non-multicast sockets, while Linux explicitly says it'll round-robin accept() calls, so they're still not a perfect match. So without a way to 100% map the different semantics I don't think its practical for gnulib to save us from this madness and so we'll just want to #ifndef WIN32 the use of SO_REUSEADDR in Libvirt Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] virFileNBDDeviceAssociate: Avoid use of uninitialized variable
by Michal Privoznik 04 Sep '13

04 Sep '13

The @qemunbd variable can be used uninitialized. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushing under trivial and build breaker rules. src/util/virfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 2b07ac9..7af0843 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -732,7 +732,7 @@ int virFileNBDDeviceAssociate(const char *file, char **dev) { char *nbddev; - char *qemunbd; + char *qemunbd = NULL; virCommandPtr cmd = NULL; int ret = -1; const char *fmtstr = NULL; -- 1.8.1.5

2 1

[libvirt] [PATCH] Fix: Syle issues (daemon/remote.c)
by Nehal J Wani 04 Sep '13

04 Sep '13

Fix for argument layouts of various functions in daemon/remote.c. Refer: https://www.redhat.com/archives/libvir-list/2013-September/msg00057.html --- daemon/remote.c | 117 ++++++++++++++++++++++++++------------------------------ 1 file changed, 55 insertions(+), 62 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 6ace7af..2aff7c1 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -3852,13 +3852,13 @@ cleanup: return rv; } -static int remoteDispatchDomainGetDiskErrors( - virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr, - remote_domain_get_disk_errors_args *args, - remote_domain_get_disk_errors_ret *ret) +static int +remoteDispatchDomainGetDiskErrors(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + remote_domain_get_disk_errors_args *args, + remote_domain_get_disk_errors_ret *ret) { int rv = -1; virDomainPtr dom = NULL; @@ -4674,13 +4674,12 @@ cleanup: } static int -remoteDispatchDomainMigrateBegin3Params( - virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr, - remote_domain_migrate_begin3_params_args *args, - remote_domain_migrate_begin3_params_ret *ret) +remoteDispatchDomainMigrateBegin3Params(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client ATTRIBUTE_UNUSED, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + remote_domain_migrate_begin3_params_args *args, + remote_domain_migrate_begin3_params_ret *ret) { char *xml = NULL; virDomainPtr dom = NULL; @@ -4733,13 +4732,12 @@ cleanup: } static int -remoteDispatchDomainMigratePrepare3Params( - virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr, - remote_domain_migrate_prepare3_params_args *args, - remote_domain_migrate_prepare3_params_ret *ret) +remoteDispatchDomainMigratePrepare3Params(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client ATTRIBUTE_UNUSED, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + remote_domain_migrate_prepare3_params_args *args, + remote_domain_migrate_prepare3_params_ret *ret) { virTypedParameterPtr params = NULL; int nparams = 0; @@ -4794,13 +4792,12 @@ cleanup: } static int -remoteDispatchDomainMigratePrepareTunnel3Params( - virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client, - virNetMessagePtr msg, - virNetMessageErrorPtr rerr, - remote_domain_migrate_prepare_tunnel3_params_args *args, - remote_domain_migrate_prepare_tunnel3_params_ret *ret) +remoteDispatchDomainMigratePrepareTunnel3Params(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client, + virNetMessagePtr msg, + virNetMessageErrorPtr rerr, + remote_domain_migrate_prepare_tunnel3_params_args *args, + remote_domain_migrate_prepare_tunnel3_params_ret *ret) { virTypedParameterPtr params = NULL; int nparams = 0; @@ -4865,13 +4862,12 @@ cleanup: static int -remoteDispatchDomainMigratePerform3Params( - virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr, - remote_domain_migrate_perform3_params_args *args, - remote_domain_migrate_perform3_params_ret *ret) +remoteDispatchDomainMigratePerform3Params(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client ATTRIBUTE_UNUSED, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + remote_domain_migrate_perform3_params_args *args, + remote_domain_migrate_perform3_params_ret *ret) { virTypedParameterPtr params = NULL; int nparams = 0; @@ -4928,13 +4924,12 @@ cleanup: static int -remoteDispatchDomainMigrateFinish3Params( - virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr, - remote_domain_migrate_finish3_params_args *args, - remote_domain_migrate_finish3_params_ret *ret) +remoteDispatchDomainMigrateFinish3Params(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client ATTRIBUTE_UNUSED, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + remote_domain_migrate_finish3_params_args *args, + remote_domain_migrate_finish3_params_ret *ret) { virTypedParameterPtr params = NULL; int nparams = 0; @@ -4990,12 +4985,11 @@ cleanup: static int -remoteDispatchDomainMigrateConfirm3Params( - virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr, - remote_domain_migrate_confirm3_params_args *args) +remoteDispatchDomainMigrateConfirm3Params(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client ATTRIBUTE_UNUSED, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + remote_domain_migrate_confirm3_params_args *args) { virTypedParameterPtr params = NULL; int nparams = 0; @@ -5042,13 +5036,13 @@ cleanup: } -static int remoteDispatchDomainCreateXMLWithFiles( - virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr, - remote_domain_create_xml_with_files_args *args, - remote_domain_create_xml_with_files_ret *ret) +static int +remoteDispatchDomainCreateXMLWithFiles(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + remote_domain_create_xml_with_files_args *args, + remote_domain_create_xml_with_files_ret *ret) { int rv = -1; virDomainPtr dom = NULL; @@ -5092,13 +5086,12 @@ cleanup: } -static int remoteDispatchDomainCreateWithFiles( - virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr, - remote_domain_create_with_files_args *args, - remote_domain_create_with_files_ret *ret) +static int remoteDispatchDomainCreateWithFiles(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + remote_domain_create_with_files_args *args, + remote_domain_create_with_files_ret *ret) { int rv = -1; virDomainPtr dom = NULL; -- 1.7.11.7

2 1

[libvirt] [PATCH] qemu: Make domain renaming work during migration
by Jiri Denemark 04 Sep '13

04 Sep '13

https://bugzilla.redhat.com/show_bug.cgi?id=999352 Since commit v1.0.5-56-g449e6b1 (Pull parsing of migration xml up into QEMU driver APIs) any attempt to rename a domain during migration fails with the following error message: internal error Incoming cookie data had unexpected name DOM vs DOM2 This is because migration cookies always use the original domain name and the mentioned commit failed to propagate the name back to qemuMigrationPrepareAny. --- src/qemu/qemu_driver.c | 36 ++++++++++++++++++++++++------------ src/qemu/qemu_migration.c | 31 +++++++++++++++++++------------ src/qemu/qemu_migration.h | 5 ++++- 3 files changed, 47 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ed29373..52ca906 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9973,6 +9973,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, { virQEMUDriverPtr driver = dconn->privateData; virDomainDefPtr def = NULL; + char *origname = NULL; int ret = -1; virCheckFlags(QEMU_MIGRATION_FLAGS, -1); @@ -9990,7 +9991,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, goto cleanup; } - if (!(def = qemuMigrationPrepareDef(driver, dom_xml, dname))) + if (!(def = qemuMigrationPrepareDef(driver, dom_xml, dname, &origname))) goto cleanup; if (virDomainMigratePrepareTunnelEnsureACL(dconn, def) < 0) @@ -9998,9 +9999,10 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, ret = qemuMigrationPrepareTunnel(driver, dconn, NULL, 0, NULL, NULL, /* No cookies in v2 */ - st, &def, flags); + st, &def, origname, flags); cleanup: + VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -10022,6 +10024,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, { virQEMUDriverPtr driver = dconn->privateData; virDomainDefPtr def = NULL; + char *origname = NULL; int ret = -1; virCheckFlags(QEMU_MIGRATION_FLAGS, -1); @@ -10043,7 +10046,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, goto cleanup; } - if (!(def = qemuMigrationPrepareDef(driver, dom_xml, dname))) + if (!(def = qemuMigrationPrepareDef(driver, dom_xml, dname, &origname))) goto cleanup; if (virDomainMigratePrepare2EnsureACL(dconn, def) < 0) @@ -10056,9 +10059,10 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, ret = qemuMigrationPrepareDirect(driver, dconn, NULL, 0, NULL, NULL, /* No cookies */ uri_in, uri_out, - &def, flags); + &def, origname, flags); cleanup: + VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -10235,6 +10239,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, { virQEMUDriverPtr driver = dconn->privateData; virDomainDefPtr def = NULL; + char *origname = NULL; int ret = -1; virCheckFlags(QEMU_MIGRATION_FLAGS, -1); @@ -10249,7 +10254,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, goto cleanup; } - if (!(def = qemuMigrationPrepareDef(driver, dom_xml, dname))) + if (!(def = qemuMigrationPrepareDef(driver, dom_xml, dname, &origname))) goto cleanup; if (virDomainMigratePrepare3EnsureACL(dconn, def) < 0) @@ -10259,9 +10264,10 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, cookiein, cookieinlen, cookieout, cookieoutlen, uri_in, uri_out, - &def, flags); + &def, origname, flags); cleanup: + VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -10282,6 +10288,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, const char *dom_xml = NULL; const char *dname = NULL; const char *uri_in = NULL; + char *origname = NULL; int ret = -1; virCheckFlags(QEMU_MIGRATION_FLAGS, -1); @@ -10309,7 +10316,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, goto cleanup; } - if (!(def = qemuMigrationPrepareDef(driver, dom_xml, dname))) + if (!(def = qemuMigrationPrepareDef(driver, dom_xml, dname, &origname))) goto cleanup; if (virDomainMigratePrepare3ParamsEnsureACL(dconn, def) < 0) @@ -10319,9 +10326,10 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, cookiein, cookieinlen, cookieout, cookieoutlen, uri_in, uri_out, - &def, flags); + &def, origname, flags); cleanup: + VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -10341,6 +10349,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, { virQEMUDriverPtr driver = dconn->privateData; virDomainDefPtr def = NULL; + char *origname = NULL; int ret = -1; virCheckFlags(QEMU_MIGRATION_FLAGS, -1); @@ -10351,7 +10360,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, goto cleanup; } - if (!(def = qemuMigrationPrepareDef(driver, dom_xml, dname))) + if (!(def = qemuMigrationPrepareDef(driver, dom_xml, dname, &origname))) goto cleanup; if (virDomainMigratePrepareTunnel3EnsureACL(dconn, def) < 0) @@ -10360,9 +10369,10 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, ret = qemuMigrationPrepareTunnel(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, - st, &def, flags); + st, &def, origname, flags); cleanup: + VIR_FREE(origname); virDomainDefFree(def); return ret; } @@ -10382,6 +10392,7 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr dconn, virDomainDefPtr def = NULL; const char *dom_xml = NULL; const char *dname = NULL; + char *origname = NULL; int ret = -1; virCheckFlags(QEMU_MIGRATION_FLAGS, -1); @@ -10402,7 +10413,7 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr dconn, goto cleanup; } - if (!(def = qemuMigrationPrepareDef(driver, dom_xml, dname))) + if (!(def = qemuMigrationPrepareDef(driver, dom_xml, dname, &origname))) goto cleanup; if (virDomainMigratePrepareTunnel3ParamsEnsureACL(dconn, def) < 0) @@ -10411,9 +10422,10 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr dconn, ret = qemuMigrationPrepareTunnel(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, - st, &def, flags); + st, &def, origname, flags); cleanup: + VIR_FREE(origname); virDomainDefFree(def); return ret; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b905459..3177756 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2160,6 +2160,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, char **cookieout, int *cookieoutlen, virDomainDefPtr *def, + const char *origname, virStreamPtr st, unsigned int port, unsigned long flags) @@ -2172,7 +2173,6 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, unsigned long long now; qemuMigrationCookiePtr mig = NULL; bool tunnel = !!st; - char *origname = NULL; char *xmlout = NULL; unsigned int cookieFlags; virCapsPtr caps = NULL; @@ -2297,8 +2297,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, *def = NULL; priv = vm->privateData; - priv->origname = origname; - origname = NULL; + if (VIR_STRDUP(priv->origname, origname) < 0) + goto cleanup; if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, QEMU_MIGRATION_COOKIE_LOCKSTATE | @@ -2412,7 +2412,6 @@ done: cleanup: VIR_FREE(migrateFrom); - VIR_FREE(origname); VIR_FREE(xmlout); VIR_FORCE_CLOSE(dataFD[0]); VIR_FORCE_CLOSE(dataFD[1]); @@ -2457,15 +2456,16 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, int *cookieoutlen, virStreamPtr st, virDomainDefPtr *def, + const char *origname, unsigned long flags) { int ret; VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, st=%p, def=%p, " - "flags=%lx", + "origname=%s, flags=%lx", driver, dconn, NULLSTR(cookiein), cookieinlen, - cookieout, cookieoutlen, st, *def, flags); + cookieout, cookieoutlen, st, *def, origname, flags); if (st == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2474,7 +2474,7 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, } ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, - cookieout, cookieoutlen, def, + cookieout, cookieoutlen, def, origname, st, 0, flags); return ret; } @@ -2490,6 +2490,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, const char *uri_in, char **uri_out, virDomainDefPtr *def, + const char *origname, unsigned long flags) { static int port = 0; @@ -2502,10 +2503,10 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, uri_in=%s, uri_out=%p, " - "def=%p, flags=%lx", + "def=%p, origname=%s, flags=%lx", driver, dconn, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, NULLSTR(uri_in), uri_out, - *def, flags); + *def, origname, flags); *uri_out = NULL; @@ -2594,7 +2595,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, VIR_DEBUG("Generated uri_out=%s", *uri_out); ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, - cookieout, cookieoutlen, def, + cookieout, cookieoutlen, def, origname, NULL, this_port, flags); cleanup: virURIFree(uri); @@ -2608,10 +2609,12 @@ cleanup: virDomainDefPtr qemuMigrationPrepareDef(virQEMUDriverPtr driver, const char *dom_xml, - const char *dname) + const char *dname, + char **origname) { virCapsPtr caps = NULL; virDomainDefPtr def; + char *name = NULL; if (!dom_xml) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2628,7 +2631,7 @@ qemuMigrationPrepareDef(virQEMUDriverPtr driver, goto cleanup; if (dname) { - VIR_FREE(def->name); + name = def->name; if (VIR_STRDUP(def->name, dname) < 0) { virDomainDefFree(def); def = NULL; @@ -2637,6 +2640,10 @@ qemuMigrationPrepareDef(virQEMUDriverPtr driver, cleanup: virObjectUnref(caps); + if (def && origname) + *origname = name; + else + VIR_FREE(name); return def; } diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 0f6c5f7..4af5aed 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -100,7 +100,8 @@ char *qemuMigrationBegin(virConnectPtr conn, virDomainDefPtr qemuMigrationPrepareDef(virQEMUDriverPtr driver, const char *dom_xml, - const char *dname); + const char *dname, + char **origname); int qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, virConnectPtr dconn, @@ -110,6 +111,7 @@ int qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, int *cookieoutlen, virStreamPtr st, virDomainDefPtr *def, + const char *origname, unsigned long flags); int qemuMigrationPrepareDirect(virQEMUDriverPtr driver, @@ -121,6 +123,7 @@ int qemuMigrationPrepareDirect(virQEMUDriverPtr driver, const char *uri_in, char **uri_out, virDomainDefPtr *def, + const char *origname, unsigned long flags); int qemuMigrationPerform(virQEMUDriverPtr driver, -- 1.8.3.2

2 2

[libvirt] [PATCH] AppArmorSetSecurityImageLabel: Avoid use of uninitialized variable
by Michal Privoznik 04 Sep '13

04 Sep '13

The @profile_name variable can be used uninitialized. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushing under trivial and build breaker rules. src/security/security_apparmor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index eb80d23..adc9918 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -683,7 +683,7 @@ AppArmorSetSecurityImageLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, virDomainDiskDefPtr disk) { int rc = -1; - char *profile_name; + char *profile_name = NULL; const virSecurityLabelDefPtr secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_APPARMOR_NAME); -- 1.8.1.5

1 0

[libvirt] [PATCH] libxl: Use standard format for source file copyright notice
by Jim Fehlig 04 Sep '13

04 Sep '13

Change source file copyright notice to prevailing libvirt style. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Pushing under the trivial rule. src/libxl/libxl_conf.c | 9 +++++---- src/libxl/libxl_conf.h | 9 +++++---- src/libxl/libxl_driver.c | 11 ++++++----- src/libxl/libxl_driver.h | 7 ++++--- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 34f6bc1..fcb278b 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1,6 +1,8 @@ -/*---------------------------------------------------------------------------*/ -/* Copyright (C) 2012 Red Hat, Inc. - * Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +/* + * libxl_conf.c: libxl configuration management + * + * Copyright (C) 2012 Red Hat, Inc. + * Copyright (c) 2011-2013 SUSE LINUX Products GmbH, Nuernberg, Germany. * Copyright (C) 2011 Univention GmbH. * * This library is free software; you can redistribute it and/or @@ -21,7 +23,6 @@ * Jim Fehlig <jfehlig(a)novell.com> * Markus Groß <gross(a)univention.de> */ -/*---------------------------------------------------------------------------*/ #include <config.h> diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 174a759..8ba0ee4 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -1,6 +1,8 @@ -/*---------------------------------------------------------------------------*/ -/* Copyright (C) 2011-2013 SUSE LINUX Products GmbH, Nuernberg, Germany. - * Copyright (C) 2011 Univention GmbH. +/* + * libxl_conf.h: libxl configuration management + * + * Copyright (C) 2011-2013 SUSE LINUX Products GmbH, Nuernberg, Germany. + * Copyright (C) 2011 Univention GmbH. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,7 +22,6 @@ * Jim Fehlig <jfehlig(a)novell.com> * Markus Groß <gross(a)univention.de> */ -/*---------------------------------------------------------------------------*/ #ifndef LIBXL_CONF_H # define LIBXL_CONF_H diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 2200e9e..69b992b 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1,7 +1,9 @@ -/*---------------------------------------------------------------------------*/ -/* Copyright (C) 2006-2013 Red Hat, Inc. - * Copyright (C) 2011-2013 SUSE LINUX Products GmbH, Nuernberg, Germany. - * Copyright (C) 2011 Univention GmbH. +/* + * libxl_driver.c: core driver methods for managing libxenlight domains + * + * Copyright (C) 2006-2013 Red Hat, Inc. + * Copyright (C) 2011-2013 SUSE LINUX Products GmbH, Nuernberg, Germany. + * Copyright (C) 2011 Univention GmbH. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,7 +24,6 @@ * Markus Groß <gross(a)univention.de> * Daniel P. Berrange <berrange(a)redhat.com> */ -/*---------------------------------------------------------------------------*/ #include <config.h> diff --git a/src/libxl/libxl_driver.h b/src/libxl/libxl_driver.h index fba6c5a..a33d60c 100644 --- a/src/libxl/libxl_driver.h +++ b/src/libxl/libxl_driver.h @@ -1,5 +1,7 @@ -/*---------------------------------------------------------------------------*/ -/* Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +/* + * libxl_driver.h: core driver methods for managing libxenlight domains + * + * Copyright (c) 2011-2013 SUSE LINUX Products GmbH, Nuernberg, Germany. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,7 +20,6 @@ * Authors: * Jim Fehlig <jfehlig(a)novell.com> */ -/*---------------------------------------------------------------------------*/ #ifndef LIBXL_DRIVER_H # define LIBXL_DRIVER_H -- 1.8.1.4

1 0

[libvirt] [libvirt-users] Is virsh blockcommit supported? Thanks a lot
by Guozhonghua 04 Sep '13

04 Sep '13

Hi, I have another question, when I do the blockcommit command and get the result " Top image as the active layer is currently unsupported ", is it being developed? root@cvk-31:/vms/images# virsh blockcommit Vmtest /vms/images/Vmtest1;echo $? error: internal error unable to execute QEMU command 'block-commit': Top image as the active layer is currently unsupported 1 But as I specified the commit file which is not the current image file, it will be work, such as below: root@cvk-31:/vms/images# qemu-img info --backing-chain /vms/images/Vmtest1 image: /vms/images/Vmtest1 file format: qcow2 virtual size: 9.8G (10485760000 bytes) disk size: 18M cluster_size: 65536 backing file: /vms/images/Vmtest1_base_1 backing file format: qcow2 image: /vms/images/Vmtest1_base_1 file format: qcow2 virtual size: 9.8G (10485760000 bytes) disk size: 196K cluster_size: 65536 backing file: /vms/images/Vmtest1_base backing file format: qcow2 image: /vms/images/Vmtest1_base file format: qcow2 virtual size: 9.8G (10485760000 bytes) disk size: 3.4G cluster_size: 2097152 root@cvk-31:/vms/images# virsh blockcommit Vmtest /vms/images/Vmtest1 --base /vms/images/Vmtest1_base --top /vms/images/Vmtest1_base_1 --wait --verbose;echo $? Block Commit: [100 %] Commit complete 0 ------------------------------------------------------------------------------------------------------------------------------------- 本邮件及其附件含有杭州华三通信技术有限公司的保密信息，仅限于发送给上面地址中列出的个人或群组。禁止任何其他人以任何形式使用（包括但不限于全部或部分地泄露、复制、或散发）本邮件中的信息。如果您错收了本邮件，请您立即电话或邮件通知发件人并删除本邮件！ This e-mail and its attachments contain confidential information from H3C, which is intended only for the person or entity whose address is listed above. Any use of the information contained herein in any way (including, but not limited to, total or partial disclosure, reproduction, or dissemination) by persons other than the intended recipient(s) is prohibited. If you receive this e-mail in error, please notify the sender by phone or email immediately and delete it!

2 2

[libvirt] [PATCH] build: fix typo that broke 'make dist'
by Eric Blake 04 Sep '13

04 Sep '13

Otherwise, 'make dist' fails: make[3]: Entering directory `/home/eblake/libvirt-tmp/build3/examples/python' make[3]: *** No rule to make target `topoology.py', needed by `distdir'. Stop. make[3]: Leaving directory `/home/eblake/libvirt-tmp/build3/examples/python' * examples/python/Makefile.am (EXTRA_DIST): Spell topology right. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. examples/python/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/python/Makefile.am b/examples/python/Makefile.am index d5d867c..7823c20 100644 --- a/examples/python/Makefile.am +++ b/examples/python/Makefile.am @@ -17,5 +17,5 @@ EXTRA_DIST= \ README \ consolecallback.py \ - topoology.py \ + topology.py \ dominfo.py domrestore.py domsave.py domstart.py esxlist.py -- 1.8.3.1

1 0

[libvirt] [PATCH 0/2] Handle a couple of new Coverity warnings
by John Ferlan 04 Sep '13

04 Sep '13

Coverity 6.6.1 was recently made available - installed it and a couple more RESOURCE_LEAK's were found in error paths. John Ferlan (2): esx_vi: Resolve Coverity RESOURCE_LEAK in error path esx_driver: Resolve Coverity RESOURCE_LEAK on error paths src/esx/esx_driver.c | 10 +++++----- src/esx/esx_vi.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) -- 1.8.3.1

2 5

[libvirt] [PATCH] test_virtlockd.aug.in: Use the correct file
by Michal Privoznik 04 Sep '13

04 Sep '13

The test should refer to Virtlockd.lns, which is the name of the module + lens in virtlockd.aug. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/locking/test_virtlockd.aug.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locking/test_virtlockd.aug.in b/src/locking/test_virtlockd.aug.in index dcd47c3..799818e 100644 --- a/src/locking/test_virtlockd.aug.in +++ b/src/locking/test_virtlockd.aug.in @@ -5,7 +5,7 @@ log_outputs=\"3:syslog:libvirtd\" log_buffer_size = 64 " - test Libvirtd.lns get conf = + test Virtlockd.lns get conf = { "log_level" = "3" } { "log_filters" = "3:remote 4:event" } { "log_outputs" = "3:syslog:libvirtd" } -- 1.8.1.5

4 3

[libvirt] [PATCH] Stop free'ing 'const char *' strings
by Daniel P. Berrange 04 Sep '13

04 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The VIR_FREE() macro will cast away any const-ness. This masked a number of places where we passed a 'const char *' string to VIR_FREE. Fortunately in all of these cases, the variable was not in fact const data, but a heap allocated string. Fix all the variable declarations to reflect this. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/conf/domain_conf.c | 30 +++++++++++++++--------------- src/conf/netdev_vlan_conf.c | 4 ++-- src/conf/nwfilter_conf.c | 3 ++- src/node_device/node_device_udev.c | 2 +- src/nwfilter/nwfilter_gentech_driver.c | 2 +- src/qemu/qemu_command.c | 33 +++++++++++++++++++-------------- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 4 ++-- src/rpc/virnetsshsession.c | 34 +++++++++++++++++++++------------- src/storage/storage_backend.c | 2 +- src/storage/storage_driver.c | 2 +- src/util/vircommand.c | 9 ++++----- src/util/virlog.c | 4 ++-- tools/virsh-domain.c | 19 ++++++++++--------- 14 files changed, 82 insertions(+), 68 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f8fbf79..678f8ca 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6745,9 +6745,9 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def, { int ret = -1; unsigned int port; - const char *targetType = virXMLPropString(cur, "type"); - const char *addrStr = NULL; - const char *portStr = NULL; + char *targetType = virXMLPropString(cur, "type"); + char *addrStr = NULL; + char *portStr = NULL; if ((def->targetType = virDomainChrTargetTypeFromString(def, def->deviceType, @@ -8161,7 +8161,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { if (xmlStrEqual(cur->name, BAD_CAST "channel")) { - const char *name, *mode; + char *name, *mode; int nameval, modeval; name = virXMLPropString(cur, "name"); mode = virXMLPropString(cur, "mode"); @@ -8195,7 +8195,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, def->data.spice.channels[nameval] = modeval; } else if (xmlStrEqual(cur->name, BAD_CAST "image")) { - const char *compression = virXMLPropString(cur, "compression"); + char *compression = virXMLPropString(cur, "compression"); int compressionVal; if (!compression) { @@ -8216,7 +8216,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, def->data.spice.image = compressionVal; } else if (xmlStrEqual(cur->name, BAD_CAST "jpeg")) { - const char *compression = virXMLPropString(cur, "compression"); + char *compression = virXMLPropString(cur, "compression"); int compressionVal; if (!compression) { @@ -8237,7 +8237,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, def->data.spice.jpeg = compressionVal; } else if (xmlStrEqual(cur->name, BAD_CAST "zlib")) { - const char *compression = virXMLPropString(cur, "compression"); + char *compression = virXMLPropString(cur, "compression"); int compressionVal; if (!compression) { @@ -8258,7 +8258,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, def->data.spice.zlib = compressionVal; } else if (xmlStrEqual(cur->name, BAD_CAST "playback")) { - const char *compression = virXMLPropString(cur, "compression"); + char *compression = virXMLPropString(cur, "compression"); int compressionVal; if (!compression) { @@ -8279,7 +8279,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, def->data.spice.playback = compressionVal; } else if (xmlStrEqual(cur->name, BAD_CAST "streaming")) { - const char *mode = virXMLPropString(cur, "mode"); + char *mode = virXMLPropString(cur, "mode"); int modeVal; if (!mode) { @@ -8299,7 +8299,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, def->data.spice.streaming = modeVal; } else if (xmlStrEqual(cur->name, BAD_CAST "clipboard")) { - const char *copypaste = virXMLPropString(cur, "copypaste"); + char *copypaste = virXMLPropString(cur, "copypaste"); int copypasteVal; if (!copypaste) { @@ -8319,7 +8319,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, def->data.spice.copypaste = copypasteVal; } else if (xmlStrEqual(cur->name, BAD_CAST "mouse")) { - const char *mode = virXMLPropString(cur, "mode"); + char *mode = virXMLPropString(cur, "mode"); int modeVal; if (!mode) { @@ -8511,9 +8511,9 @@ virDomainRNGDefParseXML(const xmlNodePtr node, xmlXPathContextPtr ctxt, unsigned int flags) { - const char *model = NULL; - const char *backend = NULL; - const char *type = NULL; + char *model = NULL; + char *backend = NULL; + char *type = NULL; virDomainRNGDefPtr def; xmlNodePtr save = ctxt->node; xmlNodePtr *backends = NULL; @@ -15197,7 +15197,7 @@ virDomainChrDefFormat(virBufferPtr buf, return -1; } - const char *addr = virSocketAddrFormat(def->target.addr); + char *addr = virSocketAddrFormat(def->target.addr); if (addr == NULL) return -1; diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index 60d9eb8..24e1000 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -36,8 +36,8 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr de { int ret = -1; xmlNodePtr save = ctxt->node; - const char *trunk = NULL; - const char *nativeMode = NULL; + char *trunk = NULL; + char *nativeMode = NULL; xmlNodePtr *tagNodes = NULL; int nTags; size_t i; diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index a3901d3..00e74eb 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2432,7 +2432,8 @@ static const char * virNWFilterIsAllowedChain(const char *chainname) { enum virNWFilterChainSuffixType i; - const char *name, *msg; + const char *name; + char *msg; virBuffer buf = VIR_BUFFER_INITIALIZER; bool printed = false; diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 67fcc58..785c2fa 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -367,7 +367,7 @@ udevLogFunction(struct udev *udev ATTRIBUTE_UNUSED, va_list args) { virBuffer buf = VIR_BUFFER_INITIALIZER; - const char *format = NULL; + char *format = NULL; virBufferAdd(&buf, fmt, -1); virBufferTrim(&buf, "\n", -1); diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index ee9195b..382d73f 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -499,7 +499,7 @@ virNWFilterDetermineMissingVarsRec(virNWFilterDefPtr filter, for (j = 0; j < rule->nVarAccess; j++) { if (!virNWFilterVarAccessIsAvailable(rule->varAccess[j], vars)) { - const char *varAccess; + char *varAccess; virBuffer buf = VIR_BUFFER_INITIALIZER; virNWFilterVarAccessPrint(rule->varAccess[j], &buf); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f8fccea..754d95a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6050,7 +6050,8 @@ static char *qemuBuildTPMBackendStr(const virDomainDefPtr def, const virDomainTPMDefPtr tpm = def->tpm; virBuffer buf = VIR_BUFFER_INITIALIZER; const char *type = virDomainTPMBackendTypeToString(tpm->type); - const char *cancel_path, *tpmdev; + char *cancel_path; + const char *tpmdev; virBufferAsprintf(&buf, "%s,id=tpm-%s", type, tpm->info.alias); @@ -7667,7 +7668,7 @@ qemuBuildCommandLine(virConnectPtr conn, } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_RTC)) { - const char *rtcopt; + char *rtcopt; virCommandAddArg(cmd, "-rtc"); if (!(rtcopt = qemuBuildClockArgStr(&def->clock))) goto error; @@ -9529,8 +9530,8 @@ qemuBuildChrDeviceStr(char **deviceStr, * on space */ static int qemuStringToArgvEnv(const char *args, - const char ***retenv, - const char ***retargv) + char ***retenv, + char ***retargv) { char **arglist = NULL; int argcount = 0; @@ -9539,8 +9540,8 @@ static int qemuStringToArgvEnv(const char *args, size_t i; const char *curr = args; const char *start; - const char **progenv = NULL; - const char **progargv = NULL; + char **progenv = NULL; + char **progargv = NULL; /* Iterate over string, splitting on sequences of ' ' */ while (curr && *curr != '\0') { @@ -11738,15 +11739,17 @@ virDomainDefPtr qemuParseCommandLineString(virCapsPtr qemuCaps, virDomainChrSourceDefPtr *monConfig, bool *monJSON) { - const char **progenv = NULL; - const char **progargv = NULL; + char **progenv = NULL; + char **progargv = NULL; virDomainDefPtr def = NULL; size_t i; if (qemuStringToArgvEnv(args, &progenv, &progargv) < 0) goto cleanup; - def = qemuParseCommandLine(qemuCaps, xmlopt, progenv, progargv, + def = qemuParseCommandLine(qemuCaps, xmlopt, + (const char **)progenv, + (const char **)progargv, pidfile, monConfig, monJSON); cleanup: @@ -11764,7 +11767,7 @@ cleanup: static int qemuParseProcFileStrings(int pid_value, const char *name, - const char ***list) + char ***list) { char *path = NULL; int ret = -1; @@ -11800,7 +11803,7 @@ static int qemuParseProcFileStrings(int pid_value, str[nstr-1] = NULL; ret = nstr-1; - *list = (const char **) str; + *list = str; cleanup: if (ret < 0) { @@ -11821,8 +11824,8 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr qemuCaps, bool *monJSON) { virDomainDefPtr def = NULL; - const char **progargv = NULL; - const char **progenv = NULL; + char **progargv = NULL; + char **progenv = NULL; char *exepath = NULL; char *emulator; size_t i; @@ -11834,7 +11837,9 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr qemuCaps, qemuParseProcFileStrings(pid, "environ", &progenv) < 0) goto cleanup; - if (!(def = qemuParseCommandLine(qemuCaps, xmlopt, progenv, progargv, + if (!(def = qemuParseCommandLine(qemuCaps, xmlopt, + (const char **)progenv, + (const char **)progargv, pidfile, monConfig, monJSON))) goto cleanup; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7f4d17d..b71fa4e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1355,7 +1355,7 @@ qemuDomainDefCopy(virQEMUDriverPtr driver, virBuffer buf = VIR_BUFFER_INITIALIZER; virDomainDefPtr ret = NULL; virCapsPtr caps = NULL; - const char *xml = NULL; + char *xml = NULL; if (qemuDomainDefFormatBuf(driver, src, flags, &buf) < 0) goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ed29373..fa70e74 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14646,7 +14646,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, virDomainDefPtr persistentDef = NULL; virDomainBlockIoTuneInfo info; virDomainBlockIoTuneInfo *oldinfo; - const char *device = NULL; + char *device = NULL; int ret = -1; size_t i; int idx = -1; @@ -14824,7 +14824,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, qemuDomainObjPrivatePtr priv; virDomainDefPtr persistentDef = NULL; virDomainBlockIoTuneInfo reply; - const char *device = NULL; + char *device = NULL; int ret = -1; size_t i; virCapsPtr caps = NULL; diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 816c54e..f544d69 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -268,8 +268,9 @@ virNetSSHKbIntCb(const char *name ATTRIBUTE_UNUSED, cleanup: if (askcred) { for (i = 0; i < num_prompts; i++) { + char *prompt = (char *)askcred[i].prompt; VIR_FREE(askcred[i].result); - VIR_FREE(askcred[i].prompt); + VIR_FREE(prompt); } } @@ -291,6 +292,8 @@ virNetSSHCheckHostKey(virNetSSHSessionPtr sess) int ret; const char *key; const char *keyhash; + char *keyhashstr; + char *tmp; int keyType; size_t keyLength; char *errmsg; @@ -364,7 +367,7 @@ virNetSSHCheckHostKey(virNetSSHSessionPtr sess) * Sadly, there's no constant to describe the hash length, so * we have to use a *MAGIC* constant. */ for (i = 0; i < 16; i++) - virBufferAsprintf(&buff, "%02hhX:", keyhash[i]); + virBufferAsprintf(&buff, "%02hhX:", keyhash[i]); virBufferTrim(&buff, ":", 1); if (virBufferError(&buff) != 0) { @@ -372,16 +375,16 @@ virNetSSHCheckHostKey(virNetSSHSessionPtr sess) return -1; } - keyhash = virBufferContentAndReset(&buff); + keyhashstr = virBufferContentAndReset(&buff); askKey.type = VIR_CRED_ECHOPROMPT; if (virAsprintf((char **)&askKey.prompt, _("Accept SSH host key with hash '%s' for " "host '%s:%d' (%s/%s)?"), - keyhash, + keyhashstr, sess->hostname, sess->port, "y", "n") < 0) { - VIR_FREE(keyhash); + VIR_FREE(keyhashstr); return -1; } @@ -389,23 +392,25 @@ virNetSSHCheckHostKey(virNetSSHSessionPtr sess) virReportError(VIR_ERR_SSH, "%s", _("failed to retrieve decision to accept " "host key")); - VIR_FREE(askKey.prompt); - VIR_FREE(keyhash); + tmp = (char*)askKey.prompt; + VIR_FREE(tmp); + VIR_FREE(keyhashstr); return -1; } - VIR_FREE(askKey.prompt); + tmp = (char*)askKey.prompt; + VIR_FREE(tmp); if (!askKey.result || STRCASENEQ(askKey.result, "y")) { virReportError(VIR_ERR_SSH, _("SSH host key for '%s' (%s) was not accepted"), - sess->hostname, keyhash); - VIR_FREE(keyhash); + sess->hostname, keyhashstr); + VIR_FREE(keyhashstr); VIR_FREE(askKey.result); return -1; } - VIR_FREE(keyhash); + VIR_FREE(keyhashstr); VIR_FREE(askKey.result); } @@ -590,6 +595,7 @@ virNetSSHAuthenticatePrivkey(virNetSSHSessionPtr sess, size_t i; char *errmsg; int ret; + char *tmp; /* try open the key with no password */ if ((ret = libssh2_userauth_publickey_fromfile(sess->session, @@ -644,11 +650,13 @@ virNetSSHAuthenticatePrivkey(virNetSSHSessionPtr sess, virReportError(VIR_ERR_SSH, "%s", _("failed to retrieve private key passphrase: " "callback has failed")); - VIR_FREE(retr_passphrase.prompt); + tmp = (char *)retr_passphrase.prompt; + VIR_FREE(tmp); return -1; } - VIR_FREE(retr_passphrase.prompt); + tmp = (char *)retr_passphrase.prompt; + VIR_FREE(tmp); ret = libssh2_userauth_publickey_fromfile(sess->session, priv->username, diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 4ebe11b..ed893f0 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -931,7 +931,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn, unsigned int flags) { int ret = -1; - const char *create_tool; + char *create_tool; int imgformat; virCommandPtr cmd; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 323be9e..6c39284 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1450,7 +1450,7 @@ storageVolLookupByPath(virConnectPtr conn, virStoragePoolObjLock(driver->pools.objs[i]); if (virStoragePoolObjIsActive(driver->pools.objs[i])) { virStorageVolDefPtr vol; - const char *stable_path; + char *stable_path; stable_path = virStorageBackendStablePath(driver->pools.objs[i], cleanpath, diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 00ff69a..95331a6 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -405,6 +405,7 @@ virExec(virCommandPtr cmd) int childout = -1; int childerr = -1; int tmpfd; + char *binarystr = NULL; const char *binary = NULL; int forkRet, ret; struct sigaction waxon, waxoff; @@ -412,7 +413,7 @@ virExec(virCommandPtr cmd) int ngroups; if (cmd->args[0][0] != '/') { - if (!(binary = virFindFileInPath(cmd->args[0]))) { + if (!(binary = binarystr = virFindFileInPath(cmd->args[0]))) { virReportSystemError(ENOENT, _("Cannot find '%s' in path"), cmd->args[0]); @@ -506,8 +507,7 @@ virExec(virCommandPtr cmd) cmd->pid = pid; - if (binary != cmd->args[0]) - VIR_FREE(binary); + VIR_FREE(binarystr); VIR_FREE(groups); return 0; @@ -713,8 +713,7 @@ virExec(virCommandPtr cmd) should never jump here on error */ VIR_FREE(groups); - if (binary != cmd->args[0]) - VIR_FREE(binary); + VIR_FREE(binarystr); /* NB we don't virReportError() on any failures here because the code which jumped here already raised diff --git a/src/util/virlog.c b/src/util/virlog.c index 047a131..7ee5117 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -94,7 +94,7 @@ static regex_t *virLogRegex = NULL; * based on a matching pattern (currently a substring) */ struct _virLogFilter { - const char *match; + char *match; virLogPriority priority; unsigned int flags; }; @@ -115,7 +115,7 @@ struct _virLogOutput { virLogCloseFunc c; virLogPriority priority; virLogDestination dest; - const char *name; + char *name; }; typedef struct _virLogOutput virLogOutput; typedef virLogOutput *virLogOutputPtr; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 568d61d..ad15912 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2346,8 +2346,8 @@ cmdDomIfSetLink(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; const char *iface; const char *state; - const char *value; - const char *desc; + char *value; + char *desc; virMacAddr macaddr; const char *element; const char *attr; @@ -6167,7 +6167,7 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) bool ret = false; char *buffer; char *result = NULL; - const char **list = NULL; + char **list = NULL; unsigned int flags = 0; int count = 0; @@ -6224,7 +6224,8 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) list[i] = vshStrdup(ctl, (const char *)xmlBufferContent(xml_buf)); } - result = virConnectBaselineCPU(ctl->conn, list, count, flags); + result = virConnectBaselineCPU(ctl->conn, + (const char **)list, count, flags); if (result) { vshPrint(ctl, "%s", result); @@ -6379,7 +6380,7 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) params[pos].value.ul / 1000000000, params[pos].value.ul % 1000000000); } else { - const char *s = vshGetTypedParamValue(ctl, &params[pos]); + char *s = vshGetTypedParamValue(ctl, &params[pos]); vshPrint(ctl, _("%s\n"), s); VIR_FREE(s); } @@ -9855,8 +9856,8 @@ vshPrepareDiskXML(xmlNodePtr disk_node, { xmlNodePtr cur = NULL; xmlBufferPtr xml_buf = NULL; - const char *disk_type = NULL; - const char *device_type = NULL; + char *disk_type = NULL; + char *device_type = NULL; xmlNodePtr new_node = NULL; char *ret = NULL; @@ -10192,9 +10193,9 @@ cmdChangeMedia(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom = NULL; const char *source = NULL; const char *path = NULL; - const char *doc = NULL; + char *doc = NULL; xmlNodePtr disk_node = NULL; - const char *disk_xml = NULL; + char *disk_xml = NULL; bool ret = false; int prepare_type = 0; const char *action = NULL; -- 1.8.3.1

3 3

[libvirt] [PATCH] Stop calling virAllocN directly from ESX code
by Daniel P. Berrange 04 Sep '13

04 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The ESX code has a method esxVI_Alloc which would call virAllocN directly, instead of using the VIR_ALLOC_N macro. Remove this method and make the callers just use VIR_ALLOC as is normal practice. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/esx/esx_vi.c | 25 ++++++++----------------- src/esx/esx_vi.h | 3 --- src/esx/esx_vi_types.c | 11 +++++++---- 3 files changed, 15 insertions(+), 24 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 1187bf3..255d0f4 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -51,8 +51,14 @@ int \ esxVI_##_type##_Alloc(esxVI_##_type **ptrptr) \ { \ - return esxVI_Alloc((void **)ptrptr, sizeof(esxVI_##_type), \ - __FILE__, __FUNCTION__, __LINE__); \ + if (ptrptr == NULL || *ptrptr != NULL) { \ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); \ + return -1; \ + } \ + \ + if (VIR_ALLOC(*ptrptr) < 0) \ + return -1; \ + return 0; \ } @@ -1736,21 +1742,6 @@ esxVI_List_Deserialize(xmlNodePtr node, esxVI_List **list, */ int -esxVI_Alloc(void **ptrptr, size_t size, const char *file, - const char *function, size_t linenr) -{ - if (ptrptr == NULL || *ptrptr != NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); - return -1; - } - - return virAllocN(ptrptr, size, 1, true, VIR_FROM_THIS, - file, function, linenr); -} - - - -int esxVI_BuildSelectSet(esxVI_SelectionSpec **selectSet, const char *name, const char *type, const char *path, const char *selectSetNames) diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index c1612e2..aeee953 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -330,9 +330,6 @@ int esxVI_List_Deserialize(xmlNodePtr node, esxVI_List **list, * - 'get' functions get information from a local object */ -int esxVI_Alloc(void **ptrptr, size_t size, const char *file, - const char *function, size_t linenr); - int esxVI_BuildSelectSet (esxVI_SelectionSpec **selectSet, const char *name, const char *type, const char *path, const char *selectSetNames); diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 14caeeb..03df444 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -43,10 +43,13 @@ int \ esxVI_##__type##_Alloc(esxVI_##__type **ptrptr) \ { \ - if (esxVI_Alloc((void **)ptrptr, sizeof(esxVI_##__type), \ - __FILE__, __FUNCTION__, __LINE__) < 0) { \ - return -1; \ - } \ + if (ptrptr == NULL || *ptrptr != NULL) { \ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); \ + return -1; \ + } \ + \ + if (VIR_ALLOC(*ptrptr) < 0) \ + return -1; \ \ (*ptrptr)->_type = esxVI_Type_##__type; \ \ -- 1.8.3.1

2 1

[libvirt] [PATCH] Add missing 'libvirt_lxc_api' variable in pkg-config file
by Daniel P. Berrange 04 Sep '13

04 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The 'libvirt_lxc_api' variable is intended to allow apps to query the location of the API XML file for libvirt_lxc.so Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt.pc.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.pc.in b/libvirt.pc.in index 616575d..d456a88 100644 --- a/libvirt.pc.in +++ b/libvirt.pc.in @@ -6,6 +6,7 @@ datarootdir=@datarootdir@ libvirt_api=@datadir@/libvirt/api/libvirt-api.xml libvirt_qemu_api=@datadir@/libvirt/api/libvirt-qemu-api.xml +libvirt_lxc_api=@datadir@/libvirt/api/libvirt-lxc-api.xml Name: libvirt Version: @VERSION@ -- 1.8.3.1

2 1

[libvirt] [PATCH] Don't call VIR_ALLOC on def->uuid in parallels storage driver
by Daniel P. Berrange 04 Sep '13

04 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The 'uuid' field in virDomainDefPtr is not a pointer, it is a fixed length array. Calling VIR_ALLOC on it is thus wrong and leaks memory. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/parallels/parallels_storage.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c index 3e254ce..44246a7 100644 --- a/src/parallels/parallels_storage.c +++ b/src/parallels/parallels_storage.c @@ -173,9 +173,6 @@ parallelsPoolCreateByPath(virConnectPtr conn, const char *path) if (!(def->name = parallelsMakePoolName(conn, path))) goto error; - if (VIR_ALLOC_N(def->uuid, VIR_UUID_BUFLEN)) - goto error; - if (virUUIDGenerate(def->uuid)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Can't generate UUID")); -- 1.8.3.1

2 1

[libvirt] [PATCH 0/5]qemu: add usb-bot scsi controller support
by Guannan Ren 04 Sep '13

04 Sep '13

BZ:https://bugzilla.redhat.com/show_bug.cgi?id=917702 qemu patch:http://lists.gnu.org/archive/html/qemu-devel/2013-01/msg02200.html These patch aims to add usb-bot SCSI controller support for libvirt. As usb-storage libvirt already supported, usb-bot only supports one SCSI target with SCSI ID 0. The difference is that usb-storage creates SCSI HBA and additionaly either a scsi-disk or a scsi-generic device, usb-bot only creates the SCSI HBA. we can attach a SCSI device to it with another -device. usb-bot supports a single target and a number of luns. The limit is 15 luns (0~15 LUN ID) and they must be contiguous(using lun 0 and 2 without 1 doesn't work). Athought usb-bot is a SCSI controller it needs to be attached to a exsiting USB controller for work. So it has to use address of usb type. Libvirt XML: <devices> ... <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/var/lib/libvirt/images/disk.qcow2'/> <target dev='sdc' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <controller type='usb' index='0'/> <controller type='scsi' index='0' model='usb-bot'> <address type='usb' bus='0' port='1'/> </controller> ... </devices> The QEMU commandline: qemu ${other_vm_args} \ -device piix3-usb-uhci,id=usb \ -device usb-bot,id=scsi0,bus=usb.0,port=1 \ -drive file=/var/lib/libvirt/images/disk.qcow2,if=none,id=drive-scsi0-0-0-0,format=raw \ -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 As the usb-storage creates scsi disk automatically which doesn't let you set scsi-disk properties such as vendor, product, wwn, channel, scsi-id and lun. So QEMU guys prefer usb-bot to usb-storage. So this is the first part of the whole work. Next step will replace usb-storage with usb-bot when disk in xml uses usb bus like <disk ...> <...> <target bus='usb'> </disk> Guannan Ren(5) qemu: add usb-bot qemu cap flag qemu: add usb-bot model scsi controller support qemu: add usb-bot support from disks points of view qemu: refactor out function to build scsi device qemu commandline tests: add xml2argv test for usb-bot scsi controller docs/formatdomain.html.in | 4 +-- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- src/conf/domain_conf.h | 5 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 124 ++++++++++++++++++++++++++++++++++++++++++------------------------------- src/vmx/vmx.c | 3 +- tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-usbbot.args | 10 ++++++ tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-usbbot.xml | 33 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 12 files changed, 242 insertions(+), 57 deletions(-)

5 13

[libvirt] [PATCH] Fix crash in virDomainGetVcpuPinInfo python wrapper
by Daniel P. Berrange 03 Sep '13

03 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> It is possible to jump to the cleanup block before the cpumaps variable gets initialized. This will result in a VIR_FREE of an uninitializer pointer Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- python/libvirt-override.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index d16b9a2..cc76c47 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -1769,7 +1769,7 @@ libvirt_virDomainGetVcpuPinInfo(PyObject *self ATTRIBUTE_UNUSED, virDomainPtr domain; PyObject *pyobj_domain, *pycpumaps = NULL; virDomainInfo dominfo; - unsigned char *cpumaps; + unsigned char *cpumaps = NULL; size_t cpumaplen, vcpu, pcpu; unsigned int flags; int i_retval, cpunum; -- 1.8.3.1

2 1

[libvirt] [PATCH] build: only create virt-login-shell for lxc builds
by Eric Blake 03 Sep '13

03 Sep '13

I noticed from an ./autobuild.sh run that we were installing a virt-login-shell.exe binary when cross-building for mingw, even though such a binary is necessarily worthless since the code depends on lxc which is a Linux-only concept. * tools/Makefile.am (conf_DATA, bin_PROGRAMS, dist_man1_MANS): Make virt-login-shell installation conditional. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'm debating about pushing this under the build-breaker rule. tools/Makefile.am | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 74fae2d..4a3338f 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -60,10 +60,10 @@ EXTRA_DIST = \ DISTCLEANFILES = confdir = $(sysconfdir)/libvirt -conf_DATA = virt-login-shell.conf +conf_DATA = bin_SCRIPTS = virt-xml-validate virt-pki-validate -bin_PROGRAMS = virsh virt-host-validate virt-login-shell +bin_PROGRAMS = virsh virt-host-validate libexec_SCRIPTS = libvirt-guests.sh if WITH_SANLOCK @@ -71,12 +71,20 @@ sbin_SCRIPTS = virt-sanlock-cleanup DISTCLEANFILES += virt-sanlock-cleanup endif +if WITH_LXC +conf_DATA += virt-login-shell.conf +bin_PROGRAMS += virt-login-shell +endif WITH_LXC + + dist_man1_MANS = \ virt-host-validate.1 \ virt-pki-validate.1 \ virt-xml-validate.1 \ - virt-login-shell.1 \ virsh.1 +if WITH_LXC +dist_man1_MANS += virt-login-shell.1 +endif WITH_LXC if WITH_SANLOCK dist_man8_MANS = virt-sanlock-cleanup.8 endif -- 1.8.3.1

3 4

Re: [libvirt] [PATCHv3 2/6] virsh: Add vshCmdCompleter and vshOptCompleter
by Eric Blake 03 Sep '13

03 Sep '13

[re-adding the list, which was accidentally omitted] On 08/28/2013 05:26 AM, Tomas Meszaros wrote: >> Per-option completions make sense. For example, 'virsh vol-key --pool >> <TAB>' wants to use a pool completer, while 'virsh vol-key --vol <TAB>' >> wants to use a volume completer; furthermore, 'virsh vol-key <TAB>' >> should be the combination of the option completer (showing --vol and >> --pool) AND the volume completer filtered to names not starting with '-' >> (since virsh has the semantics that arguments are positional, where the >> option '--vol' is implied if the argument that appears in that position >> does not resemble an option). > > So If I get it right, you are suggesting that it should work like this: > > virsh # vol-key <TAB> > vol1 vol2 pool1 pool2 > > as you said, combination of --vol and --pool completers. No, it should work like this: virsh# vol-key <TAB> vol1 vol2 --vol --pool the combination of all (non-option) completions for the current available mandatory option (volume completer), and of all possible options that still make sense at this point in the command line. Likewise: virsh# vol-key vol <TAB> pool1 pool2 --pool virsh# vol-key -<TAB> --vol --pool virsh# vol-key v<TAB> vol1 vol2 virsh# vol-key --pool <TAB> pool1 pool2 virsh# vol-key --pool pool1 <TAB> vol1 vol2 --vol and so forth. > > > I was initially thinking that completion should work like this: > > virsh # vol-key <TAB> > vol1 vol2 > > It is completing <vol> first becasue <vol> is only mandatory argument > for this command. It is a mandatory option, but mandatory options need not come first. Remember, our option parser allows mandatory options to occur positionally without an option name, OR to be interleaved in any other order by including the option string. > > > Only if someone type: > > virsh # vol-key --pool <TAB> > pool1 pool2 > > then call --pool completer. This is correct - once an option is awaiting an argument, then the option completer must return nothing at that point in time. But if you look at it as the union of two completers - the set of options that are still valid in the current context, and the set of strings that are valid assuming positional semantics of the current option, you will always get the right answer, without needing a per-command completer (just per-option completers). -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 2

[libvirt] [PATCH] examples: Add script to parse topology from capabilities output
by Peter Krempa 03 Sep '13

03 Sep '13

Add a demo script originally written by Amador Pahim to parse topology of the host from data provided in the capabilities XML. --- examples/python/topology.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100755 examples/python/topology.py diff --git a/examples/python/topology.py b/examples/python/topology.py new file mode 100755 index 0000000..1b678bc --- /dev/null +++ b/examples/python/topology.py @@ -0,0 +1,45 @@ +#!/usr/bin/env python +# Parse topology information from the capabilities XML and use +# them to calculate host topology +# +# Authors: +# Amador Pahim <apahim(a)redhat.com> +# Peter Krempa <pkrempa(a)redhat.com> + +import libvirt +import sys +from xml.dom import minidom + +try: + conn = libvirt.openReadOnly(None) +except libvirt.libvirtError: + print 'Failed to connect to the hypervisor' + sys.exit(1) + +try: + capsXML = conn.getCapabilities() +except libvirt.libvirtError: + print 'Failed to request capabilities' + sys.exit(1) + +caps = minidom.parseString(capsXML) +host = caps.getElementsByTagName('host')[0] +cells = host.getElementsByTagName('cells')[0] +total_cpus = cells.getElementsByTagName('cpu').length + +socketIds = [] +siblingsIds = [] + +socketIds = [ proc.getAttribute('socket_id') + for proc in cells.getElementsByTagName('cpu') + if proc.getAttribute('socket_id') not in socketIds ] + +siblingsIds = [ proc.getAttribute('siblings') + for proc in cells.getElementsByTagName('cpu') + if proc.getAttribute('siblings') not in siblingsIds ] + +print "Host topology" +print "NUMA nodes:", cells.getAttribute('num') +print " Sockets:",len(set(socketIds)) +print " Cores:",len(set(siblingsIds)) +print " Threads:",total_cpus -- 1.8.3.2

2 2

[libvirt] RFC: Splitting python binding out into a separate repo & ading to PyPi
by Daniel P. Berrange 03 Sep '13

03 Sep '13

As everyone knows, we have historically always shipped the python binding as part of the libvirt primary tar.gz distribution. In some ways that has simplified life for people, since we know they'll always have a libvirt python that matches their libvirt C library. At the same time though, this policy of ours is causing increasing amounts of pain for a number of our downstream users. In OpenStack, in particular, their development and test environments aim to be able to not rely on any system installed python packages. They use a virtualenv and pip to install all python deps from PyPi (equivalent of Perl's CPAN in Python world). This approach works for everything except the libvirt Python code which is not available standalone on PyPi. This is causing so much pain that people have suggested taking the libvirt python code we ship and just uploading it to PyPi themselves[1]. This would obviously be a somewhat hostile action to take, but the way we distribute libvirt python is forcing OpenStack to consider such things. In RHEL world too, bundling of libvirt + its python binding is causing pain with the fairly recent concept of "software collections"[2]. This allows users to install multiple versions of languages like Python, Perl, etc on the same box in parallel. To use libvirt python with thse alternate python installs though, requires that they recompile the entire libvirt distribution just to get the Python binding. This is obviously not an approach that works for most people, particularly if they're looking to populate their software collection using 'pip' rather than RPM. Looking on google there are a number of other people asking for libvirt python as a separate module, eg on Stackoverflow[3]. I don't think these issues are going to go away, in fact I think they will likely become more pressing, until the point where some 3rd party takes the step of providing libvirt python bindings themselves. I don't think we want to let ourselves drift into the situation where we loose control over releasing libvirt python bindings. IMHO we should / must listen to our users here before it is too late. We can still release libvirt python at the same time as normal libvirt releases, and require that people update the bindings whenever adding new APIs (if the generator doesn't cope with them). We should simply distribute python as a separate tar.gz, as we do for all other languages, and upload it to PyPi, as well as libvirt.org FTP when doing a release. Obviously there will be some work to separate things out, but I don't see that being insurmountable, since all other language bindings manage to be separate, even when doing code generation. We'd also want to change to use distutils, rather than autoconf, since that's what the python world wants. Regards, Daniel [1] http://lists.openstack.org/pipermail/openstack-dev/2013-August/013187.html [2] https://access.redhat.com/site/documentation/en-US/Red_Hat_Developer_Toolse… [3] http://stackoverflow.com/questions/14924460/is-there-any-way-to-install-lib… -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

9 17

[libvirt] Is it a problem that after virEventRegisterDefaultImpl we have handlers leaked
by Wangyufei (A) 03 Sep '13

03 Sep '13

Hello, When I ran programme event-test compiled from event-test.c, I found a problem that, after virEventRegisterDefaultImpl I do virConnectOpenAuth and virConnectClose, there will be handlers of socket and pipe opened by virConnectOpenAuth leaked after virConnectClose. So I did some analysis, and I found the fact following: In the condition that we only have one connection here int virNetSocketAddIOCallback(virNetSocketPtr sock, int events, virNetSocketIOFunc func, void *opaque, virFreeCallback ff) { int ret = -1; virObjectRef(sock); //Here we add sock refers once, then we will get refers equal 2 after virObjectLock(sock); if (sock->watch > 0) { VIR_DEBUG("Watch already registered on socket %p", sock); goto cleanup; } if ((sock->watch = virEventAddHandle(sock->fd, //If we have called virEventRegisterDefaultImpl, then here we'll get a sock watch non negative and will not go to cleanup. events, virNetSocketEventHandle, sock, virNetSocketEventFree)) < 0) { VIR_DEBUG("Failed to register watch on socket %p", sock); goto cleanup; } sock->func = func; sock->opaque = opaque; sock->ff = ff; ret = 0; cleanup: virObjectUnlock(sock); if (ret != 0) virObjectUnref(sock); //If we haven't called virEventRegisterDefaultImpl, we'll be here after virEventAddHandle, and sock refers will decrease to 1 return ret; } Condition with virEventRegisterDefaultImpl, we'll do unrefer action in two places: 1. virEventRunDefaultImpl ->virEventPollRunOnce ->virEventRunDefaultImpl ->virEventPollRunOnce ->virEventPollCleanupHandles -> virNetSocketEventFree -> virObjectUnref 2. virConnectClose ->virObjectUnref ->virConnectDispose ->remoteConnectClose ->doRemoteClose ->virNetClientClose ->virNetClientCloseInternal -> virNetClientIOEventLoopPassTheBuck -> virNetClientCloseLocked -> virObjectUnref When event dealing loop is alive, everything work fine, we'll get sock refers 2 after virConnectOpenAuth and unrefer twice in two places above after virConnectClose. But If some accidents happened like we quit event dealing loop or virEventRunDefaultImpl suspended, then sock refers will never be zero, and handlers will never be freed. In a particular condition we have two threads, thread one doing event dealing loop, thread two doing something like virConnectOpenAuth and virConnectClose ceaselessly, then we'll get a big trouble that handlers available will be ate up soon. I consider to add something like virEventDeregisterDefaultImpl to set addHandleImpl and his buddy NULL. Apparently it is far away from fixing it completely. At last I have two questions here: 1. Is it a problem that after virEventRegisterDefaultImpl we have handlers leaked? 2. If it is a problem, is there anybody any good idea to help me out? Best Regards, -WangYufei

2 4

[libvirt] [PATCH] Add forwarders attribute to <dns /> element.
by Diego Woitasen 03 Sep '13

03 Sep '13

Useful to set custom forwarders instead of using the contents of /etc/resolv.conf. It helps me to setup dnsmasq as local nameserver to resolv VM domain names from domain 0, when domain option is used. Signed-off-by: Diego Woitasen <diego.woitasen(a)vhgroup.net> --- src/conf/network_conf.c | 34 +++++++++++++++++++++- src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 8 +++++ .../nat-network-dns-forwarders.conf | 15 ++++++++++ .../nat-network-dns-forwarders.xml | 9 ++++++ tests/networkxml2conftest.c | 1 + 6 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 tests/networkxml2confdata/nat-network-dns-forwarders.conf create mode 100644 tests/networkxml2confdata/nat-network-dns-forwarders.xml diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index d54f2aa..99f12d2 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -175,6 +175,12 @@ virNetworkDNSSrvDefClear(virNetworkDNSSrvDefPtr def) static void virNetworkDNSDefClear(virNetworkDNSDefPtr def) { + if (def->forwarders) { + size_t i; + for (i = 0; def->forwarders[i] != NULL; i++) + VIR_FREE(def->forwarders[i]); + VIR_FREE(def->forwarders); + } if (def->txts) { while (def->ntxts) virNetworkDNSTxtDefClear(&def->txts[--def->ntxts]); @@ -1038,6 +1044,7 @@ virNetworkDNSDefParseXML(const char *networkName, xmlNodePtr *srvNodes = NULL; xmlNodePtr *txtNodes = NULL; char *forwardPlainNames = NULL; + char *forwarders = NULL; int nhosts, nsrvs, ntxts; size_t i; int ret = -1; @@ -1058,6 +1065,20 @@ virNetworkDNSDefParseXML(const char *networkName, } } + forwarders = virXPathString("string(./@forwarders)", ctxt); + if (forwarders) { + def->forwarders = virStringSplit(forwarders, ",", 0); + for (i = 0; def->forwarders[i] != NULL; i++) { + if (virSocketAddrParse(NULL, def->forwarders[i], AF_UNSPEC) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid forwarder IP address '%s' " + "in network '%s'"), + def->forwarders[i], networkName); + goto cleanup; + } + } + } + nhosts = virXPathNodeSet("./host", ctxt, &hostNodes); if (nhosts < 0) { virReportError(VIR_ERR_XML_ERROR, @@ -1120,6 +1141,7 @@ virNetworkDNSDefParseXML(const char *networkName, ret = 0; cleanup: + VIR_FREE(forwarders); VIR_FREE(forwardPlainNames); VIR_FREE(hostNodes); VIR_FREE(srvNodes); @@ -2267,12 +2289,22 @@ virNetworkDNSDefFormat(virBufferPtr buf, int result = 0; size_t i, j; - if (!(def->forwardPlainNames || def->nhosts || def->nsrvs || def->ntxts)) + if (!(def->forwardPlainNames || def->forwarders || def->nhosts || + def->nsrvs || def->ntxts)) goto out; virBufferAddLit(buf, "<dns"); if (def->forwardPlainNames) { virBufferAddLit(buf, " forwardPlainNames='yes'"); + if (!(def->forwarders || def->nhosts || def->nsrvs || def->ntxts)) { + virBufferAddLit(buf, "/>\n"); + goto out; + } + } + + if (def->forwarders) { + char *forwarders = virStringJoin((const char **)def->forwarders, ","); + virBufferAsprintf(buf, " forwarders='%s'", forwarders); if (!(def->nhosts || def->nsrvs || def->ntxts)) { virBufferAddLit(buf, "/>\n"); goto out; diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index c28bfae..3bedc2f 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -122,6 +122,7 @@ struct _virNetworkDNSDef { virNetworkDNSHostDefPtr hosts; size_t nsrvs; virNetworkDNSSrvDefPtr srvs; + char **forwarders; }; typedef struct _virNetworkIpDef virNetworkIpDef; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 3a8be90..c167254 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -708,6 +708,14 @@ networkDnsmasqConfContents(virNetworkObjPtr network, if (!network->def->dns.forwardPlainNames) virBufferAddLit(&configbuf, "domain-needed\n"); + if (network->def->dns.forwarders) { + virBufferAddLit(&configbuf, "no-resolv\n"); + for (i=0; network->def->dns.forwarders[i] != NULL; i++) { + virBufferAsprintf(&configbuf, "server=%s\n", + network->def->dns.forwarders[i]); + } + } + if (network->def->domain) { virBufferAsprintf(&configbuf, "domain=%s\n" diff --git a/tests/networkxml2confdata/nat-network-dns-forwarders.conf b/tests/networkxml2confdata/nat-network-dns-forwarders.conf new file mode 100644 index 0000000..ea6a54a --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-forwarders.conf @@ -0,0 +1,15 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## or other application using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain-needed +no-resolv +server=8.8.8.8 +local=// +except-interface=lo +bind-dynamic +interface=virbr0 +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-forwarders.xml b/tests/networkxml2confdata/nat-network-dns-forwarders.xml new file mode 100644 index 0000000..7955cc7 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-forwarders.xml @@ -0,0 +1,9 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> + <forward dev='eth0' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0' /> + <dns forwarders='8.8.8.8'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + </ip> +</network> diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 5825af3..ad50e88 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -145,6 +145,7 @@ mymain(void) DO_TEST("nat-network-dns-srv-record", full); DO_TEST("nat-network-dns-hosts", full); DO_TEST("nat-network-dns-forward-plain", full); + DO_TEST("nat-network-dns-forwarders", full); DO_TEST("dhcp6-network", dhcpv6); DO_TEST("dhcp6-nat-network", dhcpv6); DO_TEST("dhcp6host-routed-network", dhcpv6); -- 1.8.1.2

3 6

[libvirt] [PATCH] Fix leaks in python bindings
by Ján Tomko 03 Sep '13

03 Sep '13

https://bugzilla.redhat.com/show_bug.cgi?id=1003828 --- python/libvirt-lxc-override.c | 1 + python/libvirt-qemu-override.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/python/libvirt-lxc-override.c b/python/libvirt-lxc-override.c index fa7e963..f76ff4b 100644 --- a/python/libvirt-lxc-override.c +++ b/python/libvirt-lxc-override.c @@ -92,6 +92,7 @@ libvirt_lxc_virDomainLxcOpenNamespace(PyObject *self ATTRIBUTE_UNUSED, goto error; } } + VIR_FREE(fdlist); return py_retval; error: diff --git a/python/libvirt-qemu-override.c b/python/libvirt-qemu-override.c index 8f1ce5e..6249031 100644 --- a/python/libvirt-qemu-override.c +++ b/python/libvirt-qemu-override.c @@ -21,6 +21,7 @@ #include <libvirt/virterror.h> #include "typewrappers.h" #include "libvirt-qemu.h" +#include "viralloc.h" #ifndef __CYGWIN__ extern void initlibvirtmod_qemu(void); @@ -79,6 +80,7 @@ libvirt_qemu_virDomainQemuMonitorCommand(PyObject *self ATTRIBUTE_UNUSED, return VIR_PY_NONE; py_retval = PyString_FromString(result); + VIR_FREE(result); return py_retval; } @@ -108,6 +110,7 @@ libvirt_qemu_virDomainQemuAgentCommand(PyObject *self ATTRIBUTE_UNUSED, PyObject return VIR_PY_NONE; py_retval = PyString_FromString(result); + VIR_FREE(result); return py_retval; } /************************************************************************ -- 1.8.1.5

2 2

[libvirt] [PATCH] qemu: Handle huge number of queues correctly
by Michal Privoznik 03 Sep '13

03 Sep '13

Currently, kernel supports up to 8 queues for a multiqueue tap device. However, if user tries to enter a huge number (e.g. one million) the tap allocation fails, as expected. But what is not expected is the log full of warnings: warning : virFileClose:83 : Tried to close invalid fd 0 The problem is, upon error we iterate over an array of FDs (handlers to queues) and VIR_FORCE_CLOSE() over each item. However, the array is pre-filled with zeros. Hence, we repeatedly close stdin. Ouch. But there's more. The queues allocation is done in virNetDevTapCreate() which cleans up the FDs in case of error. Then, its caller, the virNetDevTapCreateInBridgePort() iterates over the FD array and tries to close them too. And so does qemuNetworkIfaceConnect() and qemuBuildInterfaceCommandLine(). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 10 +++++++--- src/util/virnetdevtap.c | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f8fccea..73a13b3 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -405,7 +405,7 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, cleanup: if (ret < 0) { size_t i; - for (i = 0; i < *tapfdSize; i++) + for (i = 0; i < *tapfdSize && tapfd[i] >= 0; i++) VIR_FORCE_CLOSE(tapfd[i]); if (template_ifname) VIR_FREE(net->ifname); @@ -7241,6 +7241,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, VIR_ALLOC_N(tapfdName, tapfdSize) < 0) goto cleanup; + memset(tapfd, -1, tapfdSize * sizeof(tapfd[0])); + if (qemuNetworkIfaceConnect(def, conn, driver, net, qemuCaps, tapfd, &tapfdSize) < 0) goto cleanup; @@ -7268,6 +7270,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, VIR_ALLOC_N(vhostfdName, vhostfdSize)) goto cleanup; + memset(vhostfd, -1, vhostfdSize * sizeof(vhostfd[0])); + if (qemuOpenVhostNet(def, net, qemuCaps, vhostfd, &vhostfdSize) < 0) goto cleanup; } @@ -7329,13 +7333,13 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, cleanup: if (ret < 0) virDomainConfNWFilterTeardown(net); - for (i = 0; tapfd && i < tapfdSize; i++) { + for (i = 0; tapfd && i < tapfdSize && tapfd[i] >= 0; i++) { if (ret < 0) VIR_FORCE_CLOSE(tapfd[i]); if (tapfdName) VIR_FREE(tapfdName[i]); } - for (i = 0; vhostfd && i < vhostfdSize; i++) { + for (i = 0; vhostfd && i < vhostfdSize && vhostfd[i] >= 0; i++) { if (ret < 0) VIR_FORCE_CLOSE(vhostfd[i]); if (vhostfdName) diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 42e8dfe..dc2c224 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -498,8 +498,8 @@ int virNetDevTapCreateInBridgePort(const char *brname, return 0; error: - while (tapfdSize) - VIR_FORCE_CLOSE(tapfd[--tapfdSize]); + while (tapfdSize && tapfd[--tapfdSize] >= 0) + VIR_FORCE_CLOSE(tapfd[tapfdSize]); return -1; } -- 1.8.1.5

2 1

[libvirt] [PATCH v2] kvm: warn if num cpus is greater than num recommended
by Andrew Jones 03 Sep '13

03 Sep '13

The comment in kvm_max_vcpus() states that it's using the recommended procedure from the kernel API documentation to get the max number of vcpus that kvm supports. It is, but by always returning the maximum number supported. The maximum number should only be used for development purposes. qemu should check KVM_CAP_NR_VCPUS for the recommended number of vcpus. This patch adds a warning if a user specifies a number of cpus between the recommended and max. v2: Incorporate tests for max_cpus, which specifies the maximum number of hotpluggable cpus. An additional note is that the message for the fail case was slightly changed, 'exceeds max cpus' to 'exceeds the maximum cpus'. If this is unacceptable change for users like libvirt, then I'll need to spin a v3. Signed-off-by: Andrew Jones <drjones(a)redhat.com> --- kvm-all.c | 69 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index a2d49786365e3..021f5f47e53da 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1322,24 +1322,20 @@ static int kvm_irqchip_create(KVMState *s) return 0; } -static int kvm_max_vcpus(KVMState *s) +/* Find number of supported CPUs using the recommended + * procedure from the kernel API documentation to cope with + * older kernels that may be missing capabilities. + */ +static int kvm_recommended_vcpus(KVMState *s) { - int ret; - - /* Find number of supported CPUs using the recommended - * procedure from the kernel API documentation to cope with - * older kernels that may be missing capabilities. - */ - ret = kvm_check_extension(s, KVM_CAP_MAX_VCPUS); - if (ret) { - return ret; - } - ret = kvm_check_extension(s, KVM_CAP_NR_VCPUS); - if (ret) { - return ret; - } + int ret = kvm_check_extension(s, KVM_CAP_NR_VCPUS); + return (ret) ? ret : 4; +} - return 4; +static int kvm_max_vcpus(KVMState *s) +{ + int ret = kvm_check_extension(s, KVM_CAP_MAX_VCPUS); + return (ret) ? ret : kvm_recommended_vcpus(s); } int kvm_init(void) @@ -1347,11 +1343,19 @@ int kvm_init(void) static const char upgrade_note[] = "Please upgrade to at least kernel 2.6.29 or recent kvm-kmod\n" "(see http://sourceforge.net/projects/kvm).\n"; + struct { + const char *name; + int num; + } num_cpus[] = { + { "SMP", smp_cpus }, + { "hotpluggable", max_cpus }, + { NULL, } + }, *nc = num_cpus; + int soft_vcpus_limit, hard_vcpus_limit; KVMState *s; const KVMCapabilityInfo *missing_cap; int ret; int i; - int max_vcpus; s = g_malloc0(sizeof(KVMState)); @@ -1392,19 +1396,26 @@ int kvm_init(void) goto err; } - max_vcpus = kvm_max_vcpus(s); - if (smp_cpus > max_vcpus) { - ret = -EINVAL; - fprintf(stderr, "Number of SMP cpus requested (%d) exceeds max cpus " - "supported by KVM (%d)\n", smp_cpus, max_vcpus); - goto err; - } + /* check the vcpu limits */ + soft_vcpus_limit = kvm_recommended_vcpus(s); + hard_vcpus_limit = kvm_max_vcpus(s); - if (max_cpus > max_vcpus) { - ret = -EINVAL; - fprintf(stderr, "Number of hotpluggable cpus requested (%d) exceeds max cpus " - "supported by KVM (%d)\n", max_cpus, max_vcpus); - goto err; + while (nc->name) { + if (nc->num > soft_vcpus_limit) { + fprintf(stderr, + "Warning: Number of %s cpus requested (%d) exceeds " + "the recommended cpus supported by KVM (%d)\n", + nc->name, nc->num, soft_vcpus_limit); + + if (nc->num > hard_vcpus_limit) { + ret = -EINVAL; + fprintf(stderr, "Number of %s cpus requested (%d) exceeds " + "the maximum cpus supported by KVM (%d)\n", + nc->name, nc->num, hard_vcpus_limit); + goto err; + } + } + nc++; } s->vmfd = kvm_ioctl(s, KVM_CREATE_VM, 0); -- 1.8.1.4

4 6

[libvirt] [PATCH] Drop ChangeLog generation
by Cole Robinson 03 Sep '13

03 Sep '13

Fedora is perpetually low on space for its live cd, and a bug was filed asking libvirt to drop the rather large ChangeLog from the RPM: https://bugzilla.redhat.com/show_bug.cgi?id=977099 Really though, what's the point of a static ChangeLog these days? git has won, and is far more useful for querying log info than a large static blob. This patch drops the ChangeLog generation. In its place there's now a small stub file pointing to the online git log. Additionally, the RPM was installing the ChangeLog and other doc bits twice, once with the daemon and once with the client. Drop the docs from the daemon package, it requires the client anyways. --- I clipped the removal of ChangeLog-old since it exceeded mail size for the list. .gitignore | 1 - ChangeLog | 8 + ChangeLog-old | 16699 ------------------------------------------------------ Makefile.am | 15 +- bootstrap.conf | 4 +- cfg.mk | 2 +- libvirt.spec.in | 4 +- 7 files changed, 13 insertions(+), 16720 deletions(-) create mode 100644 ChangeLog delete mode 100644 ChangeLog-old diff --git a/.gitignore b/.gitignore index 8a94748..07594f4 100644 --- a/.gitignore +++ b/.gitignore @@ -28,7 +28,6 @@ .sc-start-sc_* /ABOUT-NLS /AUTHORS -/ChangeLog /GNUmakefile /INSTALL /NEWS diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..13c0fa4 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,8 @@ +The git repository log is the canonical changelog. It can be viewed online +at: + +http://libvirt.org/git/?p=libvirt.git;a=log + +The historical ChangeLog from pre-git times is at: + +http://libvirt.org/git/?p=libvirt.git;a=blob;f=ChangeLog-old;h=b5d44d5dced1382e62b43db7e16614231aeb15dd;hb=HEAD diff --git a/Makefile.am b/Makefile.am index 4e24ecf..92ba1d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,7 +31,6 @@ XML_EXAMPLES = \ test/*.xml storage/*.xml))) EXTRA_DIST = \ - ChangeLog-old \ libvirt.spec libvirt.spec.in \ mingw-libvirt.spec.in \ libvirt.pc.in \ @@ -95,19 +94,7 @@ MAINTAINERCLEANFILES = .git-module-status # disable this check distuninstallcheck: -dist-hook: gen-ChangeLog gen-AUTHORS - -# Generate the ChangeLog file (with all entries since the switch to git) -# and insert it into the directory we're about to use to create a tarball. -gen_start_date = 2009-07-04 -.PHONY: gen-ChangeLog -gen-ChangeLog: - $(AM_V_GEN)if test -d .git; then \ - $(top_srcdir)/build-aux/gitlog-to-changelog \ - --since=$(gen_start_date) > $(distdir)/cl-t; \ - rm -f $(distdir)/ChangeLog; \ - mv $(distdir)/cl-t $(distdir)/ChangeLog; \ - fi +dist-hook: gen-AUTHORS .PHONY: gen-AUTHORS gen-AUTHORS: diff --git a/bootstrap.conf b/bootstrap.conf index 68c4a89..63f79c9 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -228,8 +228,8 @@ if `(${PYTHON_CONFIG-python-config} --version; PYTHON_CONFIG=true fi -# Automake requires that ChangeLog and AUTHORS exist. -touch AUTHORS ChangeLog || exit 1 +# Automake requires that AUTHORS exists. +touch AUTHORS || exit 1 # Override bootstrap's list - we don't use mdate-sh or texinfo.tex. gnulib_extra_files=" diff --git a/cfg.mk b/cfg.mk index 9a9616c..d223e48 100644 --- a/cfg.mk +++ b/cfg.mk @@ -874,7 +874,7 @@ ifeq (0,$(MAKELEVEL)) _clean_requested = $(filter %clean,$(MAKECMDGOALS)) ifeq (1,$(_update_required)$(_clean_requested)) $(info INFO: gnulib update required; running ./autogen.sh first) - $(shell touch $(srcdir)/AUTHORS $(srcdir)/ChangeLog) + $(shell touch $(srcdir)/AUTHORS) maint.mk Makefile: _autogen endif endif diff --git a/libvirt.spec.in b/libvirt.spec.in index 85881ae..dd9702e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1413,7 +1413,6 @@ of recent versions of Linux (and other OSes). --enable-expensive-tests \ %{init_scripts} make %{?_smp_mflags} -gzip -9 ChangeLog %install rm -fr %{buildroot} @@ -1739,7 +1738,6 @@ fi %files daemon %defattr(-, root, root) -%doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ %if %{with_network} @@ -2011,7 +2009,7 @@ fi %files client -f %{name}.lang %defattr(-, root, root) -%doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO +%doc AUTHORS ChangeLog NEWS README COPYING COPYING.LESSER TODO %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf %config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf -- 1.8.3.1

2 1

[libvirt] [PATCH 0/3] virsh: Handle interrupting of jobs manually
by Peter Krempa 03 Sep '13

03 Sep '13

Using Ctrl+C to abort migration has a side effect of killing ssh transports used to execute the migration. Add manual handling to avoid this issue. Peter Krempa (3): virsh-domain: rename print_job_progress to vshPrintJobProgress virsh: Remember terminal state when starting and add helpers virsh-domain: Avoid killing ssh transport tunnels when cancelling job tools/virsh-domain.c | 65 +++++++++++++++++++++++++++++++++------------------- tools/virsh.c | 54 +++++++++++++++++++++++++++++++++++++++++++ tools/virsh.h | 9 ++++++++ 3 files changed, 105 insertions(+), 23 deletions(-) -- 1.8.3.2

3 8

[libvirt] Is virsh blockcommit supported? Thanks a lot
by Guozhonghua 03 Sep '13

03 Sep '13

I had test the command virsh blockcommit, but it failed, with the libvirt version 1.1.0, and qemu version 1.6.0. Is this feature being developing? Thanks root@cvk-31:/vms/images# virsh -v 1.1.0 root@cvk-31:/vms/images# qemu-img -V qemu-img version 1.6.0, Copyright (c) 2004-2008 Fabrice Bellard usage: qemu-img command [command options] root@cvk-31:/vms/images# virsh blockcommit Vmtest /vms/images/Vmtest1 --base /vms/image s/Vmtest1_base --top /vms/images/Vmtest1_base_1 --wait --verbose ;echo $? error: invalid argument: top '/vms/images/Vmtest1_base_1' in chain for '/vms/images/Vmtest1' has no backing file 1 root@cvk-31:/vms/images# qemu-img info /vms/images/Vmtest1_base_1 image: /vms/images/Vmtest1_base_1 file format: qcow2 virtual size: 9.8G (10485760000 bytes) disk size: 6.0M cluster_size: 2097152 backing file: /vms/images/Vmtest1_base root@cvk-31:/vms/images# qemu-img info --backing-chain /vms/images/Vmtest1 image: /vms/images/Vmtest1 file format: qcow2 virtual size: 9.8G (10485760000 bytes) disk size: 140M cluster_size: 2097152 backing file: /vms/images/Vmtest1_base_1 image: /vms/images/Vmtest1_base_1 file format: qcow2 virtual size: 9.8G (10485760000 bytes) disk size: 6.0M cluster_size: 2097152 backing file: /vms/images/Vmtest1_base image: /vms/images/Vmtest1_base file format: qcow2 virtual size: 9.8G (10485760000 bytes) disk size: 3.4G cluster_size: 2097152 root@cvk-31:/vms/images# virsh blockcommit Vmtest /vms/images/Vmtest1 --base /vms/image s/Vmtest1_base --wait --verbose ;echo $? error: invalid argument: could not find base '/vms/images/Vmtest1_base' below '/vms/images/Vmtest1' in chain for '/vms/images/Vmtest1' 1 root@cvk-31:/vms/images# ls -al /vms/images/Vmtest1_base -rw------- 1 root root 3705667584 Aug 23 10:19 /vms/images/Vmtest1_base root@cvk-31:/vms/images# qemu-img info /vms/images/Vmtest1_base image: /vms/images/Vmtest1_base file format: qcow2 virtual size: 9.8G (10485760000 bytes) disk size: 3.4G cluster_size: 2097152 ------------------------------------------------------------------------------------------------------------------------------------- ???????????????????????????????????????? ???????????????????????????????????????? ???????????????????????????????????????? ??? This e-mail and its attachments contain confidential information from H3C, which is intended only for the person or entity whose address is listed above. Any use of the information contained herein in any way (including, but not limited to, total or partial disclosure, reproduction, or dissemination) by persons other than the intended recipient(s) is prohibited. If you receive this e-mail in error, please notify the sender by phone or email immediately and delete it!

1 0

[libvirt] [PATCHv3 0/4] VMX: CD-ROM handling improvements
by Doug Goldstein 03 Sep '13

03 Sep '13

A user came into #virt the other day and was trying to get libvirtd to work with VMWare Fusion 5, which is basically the Mac OS X version of VMWare Workstation. In helping him out I noticed a few limitations of our VMX parser so I've added support through this patchset. However I came across the fact that we only support 2 types of CD-ROMs instead of the 3 types that VMWare has lead to adding support for a <driver> element to CD-ROM drives. v3: * Dropped 'auto detect' support from series as it needs more work based on feedback * Added patch to combine virVMXFormatHardDisk and virVMXFormatCDROM into one function. * Converted to <disk type='block' device='lun'> instead of adding a <driver> element to better match the behavior available via QEMU. v2: * Added additional test cases and fixed issues that arose from those Doug Goldstein (4): VMX: Create virVMXFormatDisk() from HD and CD-ROM VMX: Add cdrom-raw dev type from VMWare Fusion VMX: Add a VMWare Fusion 5 configuration for tests VMX: Some serial ports are not actually connected docs/formatdomain.html.in | 3 +- src/libvirt_vmx.syms | 3 +- src/vmx/vmx.c | 216 ++++++++------------- src/vmx/vmx.h | 5 +- tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.vmx | 5 + tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml | 24 +++ .../vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.vmx | 6 + .../vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml | 24 +++ tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx | 88 +++++++++ tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml | 38 ++++ tests/vmx2xmltest.c | 4 + tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-device.vmx | 13 ++ tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-device.xml | 14 ++ .../xml2vmxdata/xml2vmx-cdrom-scsi-raw-device.vmx | 14 ++ .../xml2vmxdata/xml2vmx-cdrom-scsi-raw-device.xml | 14 ++ tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx | 30 +++ tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml | 40 ++++ tests/xml2vmxtest.c | 4 + 18 files changed, 400 insertions(+), 145 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-device.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-device.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-raw-device.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-raw-device.xml create mode 100644 tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml -- 1.8.1.5

3 14

[libvirt] [PATCH 1/2] Fix AM_LDFLAGS typo
by Guido Günther 03 Sep '13

03 Sep '13

--- This should probably go into 1.1.2 src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 636bcbc..19dfb81 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1455,7 +1455,7 @@ libvirt_driver_nwfilter_la_CFLAGS = \ -I$(top_srcdir)/src/access \ -I$(top_srcdir)/src/conf \ $(AM_CFLAGS) -libvirt_driver_nwfilter_la_LDFLAGS = $(LD_AMFLAGS) +libvirt_driver_nwfilter_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_nwfilter_la_LIBADD = $(LIBPCAP_LIBS) $(LIBNL_LIBS) $(DBUS_LIBS) if WITH_DRIVER_MODULES libvirt_driver_nwfilter_la_LIBADD += ../gnulib/lib/libgnu.la -- 1.8.4.rc3

2 2

[libvirt] How to add uplink in esx virtual switch using libvirt
by varun bhatnagar 03 Sep '13

03 Sep '13

Hi, I have an ESXi server, on top of it I have created one VM whose IP address is 192.168.79.1. I want to connect to the VM on ESXi server from my host machine but I am not able to do it. I have created a network "networkforSC" and I have pasted my xml file content below but I am not able to add any uplink (how to add it?) . Below is the xml file of my node as well as the network which I am creating on my ESXi server *<domain type='vmware'>* *<name>testNode</name>* *<uuid>50115e16-9bdc-49d7-f171-53c4d7f91710</uuid>* *<memory>1048576</memory>* *<currentMemory>1048576</currentMemory>* *<vcpu>1</vcpu>* *<console>/dev/console</console>* *<os>* *<type arch='x86_64'>hvm</type>* *</os>* *<devices>* *<disk type='file' device='disk'>* *<source file='[datastore1] testNode/testNode.vmdk'/>* *<target dev='sda' bus='scsi'/>* *<address type='drive' controller='0' bus='0' unit='0'/>* *</disk>* *<controller type='scsi' index='0' model='lsilogic'/>* ** *<interface type='bridge'>* *<mac address='00:50:56:25:48:c7'/>* *<source bridge='VM Network'/>* *</interface>* *<interface type='bridge'>* *<source bridge='test'/>* *</interface>* *</devices>* *</domain>* ########################################## Network File: *<network>* *<name>networkforSC</name>* *<portgroup name='test'>* *</portgroup>* *</network>* I have checked the network which got created on the server. As I have not attached any uplink (vmnic0) I can not see it (I want to attach it). #esxcli network vswitch standard list * * *networkforSC* *Name: networkforSC* *Class: etherswitch* *Num Ports: 128* *Used Ports: 2* *Configured Ports: 128* *MTU: 1500* *CDP Status: listen* *Beacon Enabled: false* *Beacon Threshold: 3* *Beacon Required By:* *Uplinks:* *Portgroups: test* Can anyone please help me out in adding the uplink and also can anyone tell me whether I am going in a right direction so that I could ping my virtual machine created on ESXi server. Regards, Varun

1 0

[libvirt] [PATCH] Add forwarders attribute to <dns /> element.
by Diego Woitasen 02 Sep '13

02 Sep '13

Useful to set custom forwarders instead of using the contents of /etc/resolv.conf. It helps me to setup dnsmasq as local nameserver to resolv VM domain names from domain 0, when domain option is used. Signed-off-by: Diego Woitasen <diego.woitasen(a)vhgroup.net> --- docs/formatnetwork.html.in | 8 ++++ docs/schemas/network.rng | 5 +++ src/conf/network_conf.c | 43 ++++++++++++++++++++-- src/conf/network_conf.h | 2 + src/network/bridge_driver.c | 8 ++++ .../nat-network-dns-forwarders.conf | 16 ++++++++ .../nat-network-dns-forwarders.xml | 12 ++++++ tests/networkxml2conftest.c | 1 + 8 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 tests/networkxml2confdata/nat-network-dns-forwarders.conf create mode 100644 tests/networkxml2confdata/nat-network-dns-forwarders.xml diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index e1482db..4dd809a 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -631,6 +631,8 @@ <domain name="example.com"/> <dns> <txt name="example" value="example value" /> + <forwarders addr="8.8.8.8" /> + <forwarders addr="8.8.4.4" /> <srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/> <host ip='192.168.122.2'> <hostname>myhost</hostname> @@ -685,6 +687,12 @@ Currently supported sub-elements of <code><dns></code> are: <dl> + <dt><code>forwarders</code></dt> + <dd>A <code>dns</code> element can have 0 or more <code>forwarders</code> elements. + Each forwarders element defines an IP address to be used as forwarder + in DNS server configuration. The addr attribute is required and defines the + IP address of every forwarder. <span class="since">Since N/A</span> + </dd> <dt><code>txt</code></dt> <dd>A <code>dns</code> element can have 0 or more <code>txt</code> elements. Each txt element defines a DNS TXT record and has two attributes, both diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index ab183f1..e0c2b51 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -217,6 +217,11 @@ </attribute> </optional> <zeroOrMore> + <element name="forwarders"> + <attribute name="addr"><ref name="ipAddr"/></attribute> + </element> + </zeroOrMore> + <zeroOrMore> <element name="txt"> <attribute name="name"><ref name="dnsName"/></attribute> <attribute name="value"><text/></attribute> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index d54f2aa..1c1aa64 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -175,6 +175,11 @@ virNetworkDNSSrvDefClear(virNetworkDNSSrvDefPtr def) static void virNetworkDNSDefClear(virNetworkDNSDefPtr def) { + if (def->forwarders) { + while (def->nfwds) + VIR_FREE(def->forwarders[--def->nfwds]); + VIR_FREE(def->forwarders); + } if (def->txts) { while (def->ntxts) virNetworkDNSTxtDefClear(&def->txts[--def->ntxts]); @@ -1037,8 +1042,9 @@ virNetworkDNSDefParseXML(const char *networkName, xmlNodePtr *hostNodes = NULL; xmlNodePtr *srvNodes = NULL; xmlNodePtr *txtNodes = NULL; + xmlNodePtr *fwdNodes = NULL; char *forwardPlainNames = NULL; - int nhosts, nsrvs, ntxts; + int nfwds, nhosts, nsrvs, ntxts; size_t i; int ret = -1; xmlNodePtr save = ctxt->node; @@ -1058,6 +1064,30 @@ virNetworkDNSDefParseXML(const char *networkName, } } + nfwds = virXPathNodeSet("./forwarders", ctxt, &fwdNodes); + if (nfwds < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("invalid <forwarders> element found in <dns> of network %s"), + networkName); + goto cleanup; + } + if (nfwds > 0) { + if (VIR_ALLOC_N(def->forwarders, nfwds) < 0) + goto cleanup; + + for (i = 0; i < nfwds; i++) { + def->forwarders[i] = virXMLPropString(fwdNodes[i], "addr"); + if (virSocketAddrParse(NULL, def->forwarders[i], AF_UNSPEC) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid forwarder IP address '%s' " + "in network '%s'"), + def->forwarders[i], networkName); + goto cleanup; + } + def->nfwds++; + } + } + nhosts = virXPathNodeSet("./host", ctxt, &hostNodes); if (nhosts < 0) { virReportError(VIR_ERR_XML_ERROR, @@ -1121,6 +1151,7 @@ virNetworkDNSDefParseXML(const char *networkName, ret = 0; cleanup: VIR_FREE(forwardPlainNames); + VIR_FREE(fwdNodes); VIR_FREE(hostNodes); VIR_FREE(srvNodes); VIR_FREE(txtNodes); @@ -2267,13 +2298,14 @@ virNetworkDNSDefFormat(virBufferPtr buf, int result = 0; size_t i, j; - if (!(def->forwardPlainNames || def->nhosts || def->nsrvs || def->ntxts)) + if (!(def->forwardPlainNames || def->forwarders || def->nhosts || + def->nsrvs || def->ntxts)) goto out; virBufferAddLit(buf, "<dns"); if (def->forwardPlainNames) { virBufferAddLit(buf, " forwardPlainNames='yes'"); - if (!(def->nhosts || def->nsrvs || def->ntxts)) { + if (!(def->forwarders || def->nhosts || def->nsrvs || def->ntxts)) { virBufferAddLit(buf, "/>\n"); goto out; } @@ -2282,6 +2314,11 @@ virNetworkDNSDefFormat(virBufferPtr buf, virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); + for (i = 0; i < def->nfwds; i++) { + virBufferAsprintf(buf, "<forwarders addr='%s' />\n", + def->forwarders[i]); + } + for (i = 0; i < def->ntxts; i++) { virBufferAsprintf(buf, "<txt name='%s' value='%s'/>\n", def->txts[i].name, diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index c28bfae..b425986 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -122,6 +122,8 @@ struct _virNetworkDNSDef { virNetworkDNSHostDefPtr hosts; size_t nsrvs; virNetworkDNSSrvDefPtr srvs; + size_t nfwds; + char **forwarders; }; typedef struct _virNetworkIpDef virNetworkIpDef; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 3a8be90..a2cfb35 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -708,6 +708,14 @@ networkDnsmasqConfContents(virNetworkObjPtr network, if (!network->def->dns.forwardPlainNames) virBufferAddLit(&configbuf, "domain-needed\n"); + if (network->def->dns.forwarders) { + virBufferAddLit(&configbuf, "no-resolv\n"); + for (i=0; i < network->def->dns.nfwds; i++) { + virBufferAsprintf(&configbuf, "server=%s\n", + network->def->dns.forwarders[i]); + } + } + if (network->def->domain) { virBufferAsprintf(&configbuf, "domain=%s\n" diff --git a/tests/networkxml2confdata/nat-network-dns-forwarders.conf b/tests/networkxml2confdata/nat-network-dns-forwarders.conf new file mode 100644 index 0000000..ebca289 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-forwarders.conf @@ -0,0 +1,16 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## or other application using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain-needed +no-resolv +server=8.8.8.8 +server=8.8.4.4 +local=// +except-interface=lo +bind-dynamic +interface=virbr0 +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-forwarders.xml b/tests/networkxml2confdata/nat-network-dns-forwarders.xml new file mode 100644 index 0000000..9cd2667 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-forwarders.xml @@ -0,0 +1,12 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> + <forward dev='eth0' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0' /> + <dns> + <forwarders addr='8.8.8.8' /> + <forwarders addr='8.8.4.4' /> + </dns> + <ip address='192.168.122.1' netmask='255.255.255.0'> + </ip> +</network> diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 5825af3..ad50e88 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -145,6 +145,7 @@ mymain(void) DO_TEST("nat-network-dns-srv-record", full); DO_TEST("nat-network-dns-hosts", full); DO_TEST("nat-network-dns-forward-plain", full); + DO_TEST("nat-network-dns-forwarders", full); DO_TEST("dhcp6-network", dhcpv6); DO_TEST("dhcp6-nat-network", dhcpv6); DO_TEST("dhcp6host-routed-network", dhcpv6); -- 1.8.1.2

1 0

[libvirt] [PATCHv2 0/2] Support setting the 'removable' flag for USB disks
by Fred A. Kemp 02 Sep '13

02 Sep '13

From: "Fred A. Kemp" <anonym(a)riseup.net> The commit message of patch #2 explains the purpose of this patch set. A review would be greatly appreciated! Note that I've only added the new capability for usb-storage.removable to the qemu help tests of qemu(-kvm) version 1.2.0, since that's what I had easily available to get the output of `-device usb-storage,?` from. I hope that's not an issue, otherwise, is there a way to obtain these outputs without having to hunt down and install all supported versions? Previous submissions of this patch set to this list: http://www.redhat.com/archives/libvir-list/2013-March/msg01051.html http://www.redhat.com/archives/libvir-list/2013-May/msg02039.html https://www.redhat.com/archives/libvir-list/2013-July/msg01635.html https://www.redhat.com/archives/libvir-list/2013-August/msg00581.html Fred A. Kemp (2): qemu: Add capability flag for usb-storage qemu: Support setting the 'removable' flag for USB disks docs/formatdomain.html.in | 8 +++-- docs/schemas/domaincommon.rng | 8 +++++ src/conf/domain_conf.c | 31 ++++++++++++++++++-- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 10 +++++++ src/qemu/qemu_capabilities.h | 2 ++ src/qemu/qemu_command.c | 24 +++++++++++++++ tests/qemuhelpdata/qemu-1.2.0-device | 11 +++++++ tests/qemuhelpdata/qemu-kvm-1.2.0-device | 11 +++++++ tests/qemuhelptest.c | 20 +++++++++---- .../qemuxml2argv-disk-usb-device-removable.args | 8 +++++ .../qemuxml2argv-disk-usb-device-removable.xml | 27 +++++++++++++++++ tests/qemuxml2argvtest.c | 6 +++- 13 files changed, 155 insertions(+), 12 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.xml -- 1.7.10.4

4 8

[libvirt] [PATCH 2/2] Pass AM_LDFLAGS to driver modules too
by Guido Günther 02 Sep '13

02 Sep '13

This gives us a RO got, otherwise Debian's lintian complains: W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_qemu.so W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_storage.so W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_uml.so W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_vbox.so W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_xen.so W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_nwfilter.so W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_storage.so W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_uml.so W: libvirt-sanlock: hardening-no-relro usr/lib/libvirt/lock-driver/sanlock.so --- src/Makefile.am | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 19dfb81..097682c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1000,7 +1000,7 @@ libvirt_driver_xen_la_LIBADD = libvirt_driver_xen_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_xen.la libvirt_driver_xen_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_xen_la_LDFLAGS = -module -avoid-version +libvirt_driver_xen_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) else noinst_LTLIBRARIES += libvirt_driver_xen.la # Stateful, so linked to daemon instead @@ -1050,7 +1050,7 @@ libvirt_driver_vbox_la_LIBADD = libvirt_driver_vbox_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_vbox.la libvirt_driver_vbox_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version +libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) else noinst_LTLIBRARIES += libvirt_driver_vbox.la # GPLv2-only license requries that it be linked into @@ -1083,7 +1083,7 @@ libvirt_driver_libxl_la_LIBADD = libvirt_driver_libxl_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_libxl.la libvirt_driver_libxl_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_libxl_la_LDFLAGS = -module -avoid-version +libvirt_driver_libxl_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) else noinst_LTLIBRARIES += libvirt_driver_libxl.la # Stateful, so linked to daemon instead @@ -1108,7 +1108,7 @@ libvirt_driver_qemu_la_LIBADD = libvirt_driver_qemu_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_qemu.la libvirt_driver_qemu_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_qemu_la_LDFLAGS = -module -avoid-version +libvirt_driver_qemu_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) else noinst_LTLIBRARIES += libvirt_driver_qemu.la # Stateful, so linked to daemon instead @@ -1184,7 +1184,7 @@ libvirt_driver_uml_la_LIBADD = libvirt_driver_uml_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_uml.la libvirt_driver_uml_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_uml_la_LDFLAGS = -module -avoid-version +libvirt_driver_uml_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) else noinst_LTLIBRARIES += libvirt_driver_uml.la # Stateful, so linked to daemon instead @@ -1361,7 +1361,7 @@ libvirt_driver_storage_la_LIBADD = libvirt_driver_storage_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_storage.la libvirt_driver_storage_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_storage_la_LDFLAGS = -module -avoid-version +libvirt_driver_storage_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) else noinst_LTLIBRARIES += libvirt_driver_storage.la # Stateful, so linked to daemon instead @@ -2114,7 +2114,7 @@ if WITH_SANLOCK lockdriver_LTLIBRARIES += sanlock.la sanlock_la_SOURCES = $(LOCK_DRIVER_SANLOCK_SOURCES) sanlock_la_CFLAGS = -I$(top_srcdir)/src/conf $(AM_CFLAGS) -sanlock_la_LDFLAGS = -module -avoid-version +sanlock_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) sanlock_la_LIBADD = -lsanlock_client \ ../gnulib/lib/libgnu.la -- 1.8.4.rc3

2 1

[libvirt] [PATCH 1/3] CPU: Implement guestData for PPC CPU driver
by Li Zhang 02 Sep '13

02 Sep '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> On Power platform, Power7+ can support Power7 guest. It needs to define XML configuration to specify guest's CPU model. For exmaple: <cpu match='exact'> <model>POWER7+_v2.1</model> <vendor>IBM</vendor> </cpu> Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/cpu/cpu_powerpc.c | 166 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 164 insertions(+), 2 deletions(-) diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c index 647a8a1..84fa3f7 100644 --- a/src/cpu/cpu_powerpc.c +++ b/src/cpu/cpu_powerpc.c @@ -99,6 +99,23 @@ ppcModelFindPVR(const struct ppc_map *map, return NULL; } +static struct ppc_model * +ppcModelCopy(const struct ppc_model *model) +{ + struct ppc_model *copy; + + if (VIR_ALLOC(copy) < 0 || + VIR_STRDUP(copy->name, model->name) < 0) { + ppcModelFree(copy); + return NULL; + } + + copy->data.pvr = model->data.pvr; + copy->vendor = model->vendor; + + return copy; +} + static struct ppc_vendor * ppcVendorFind(const struct ppc_map *map, const char *name) @@ -126,6 +143,29 @@ ppcVendorFree(struct ppc_vendor *vendor) VIR_FREE(vendor); } +static struct ppc_model * +ppcModelFromCPU(const virCPUDefPtr cpu, + const struct ppc_map *map) +{ + struct ppc_model *model = NULL; + + if ((model = ppcModelFind(map, cpu->model)) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown CPU model %s"), cpu->model); + goto error; + } + + if ((model = ppcModelCopy(model)) == NULL) + goto error; + + return model; + +error: + ppcModelFree(model); + return NULL; +} + + static int ppcVendorLoad(xmlXPathContextPtr ctxt, struct ppc_map *map) @@ -288,6 +328,112 @@ error: return NULL; } +static virCPUDataPtr +ppcMakeCPUData(virArch arch, struct cpuPPCData *data) +{ + virCPUDataPtr cpuData; + + if (VIR_ALLOC(cpuData) < 0) + return NULL; + + cpuData->arch = arch; + cpuData->data.ppc = *data; + data = NULL; + + return cpuData; +} + +static virCPUCompareResult +ppcCompute(virCPUDefPtr host, + const virCPUDefPtr cpu, + virCPUDataPtr *guestData, + char **message) + +{ + struct ppc_map *map = NULL; + struct ppc_model *host_model = NULL; + struct ppc_model *guest_model = NULL; + + int ret = 0; + virArch arch; + size_t i; + + if (cpu->arch != VIR_ARCH_NONE) { + bool found = false; + + for (i = 0; i < ARRAY_CARDINALITY(archs); i++) { + if (archs[i] == cpu->arch) { + found = true; + break; + } + } + + if (!found) { + VIR_DEBUG("CPU arch %s does not match host arch", + virArchToString(cpu->arch)); + if (message && + virAsprintf(message, + _("CPU arch %s does not match host arch"), + virArchToString(cpu->arch)) < 0) + goto error; + return VIR_CPU_COMPARE_INCOMPATIBLE; + } + arch = cpu->arch; + } else { + arch = host->arch; + } + + if (cpu->vendor && + (!host->vendor || STRNEQ(cpu->vendor, host->vendor))) { + VIR_DEBUG("host CPU vendor does not match required CPU vendor %s", + cpu->vendor); + if (message && + virAsprintf(message, + _("host CPU vendor does not match required " + "CPU vendor %s"), + cpu->vendor) < 0) + goto error; + return VIR_CPU_COMPARE_INCOMPATIBLE; + } + + if (!(map = ppcLoadMap()) || + !(host_model = ppcModelFromCPU(host, map)) || + !(guest_model = ppcModelFromCPU(cpu, map))) + goto error; + + if (guestData != NULL) { + if (cpu->type == VIR_CPU_TYPE_GUEST && + cpu->match == VIR_CPU_MATCH_STRICT && + STRNEQ(guest_model->name, host_model->name)) { + VIR_DEBUG("host CPU model does not match required CPU model %s", + guest_model->name); + if (message && + virAsprintf(message, + _("host CPU model does not match required " + "CPU model %s"), + guest_model->name) < 0) + goto error; + return VIR_CPU_COMPARE_INCOMPATIBLE; + } + + if (!(*guestData = ppcMakeCPUData(arch, &guest_model->data))) + goto error; + } + + ret = VIR_CPU_COMPARE_IDENTICAL; + +out: + ppcMapFree(map); + ppcModelFree(host_model); + ppcModelFree(guest_model); + return ret; + +error: + ret = VIR_CPU_COMPARE_ERROR; + goto out; + +} + static virCPUCompareResult ppcCompare(virCPUDefPtr host, virCPUDefPtr cpu) @@ -369,6 +515,15 @@ ppcNodeData(void) } #endif +static virCPUCompareResult +ppcGuestData(virCPUDefPtr host, + virCPUDefPtr guest, + virCPUDataPtr *data, + char **message) +{ + return ppcCompute(host, guest, data, message); +} + static int ppcUpdate(virCPUDefPtr guest ATTRIBUTE_UNUSED, const virCPUDefPtr host ATTRIBUTE_UNUSED) @@ -466,6 +621,13 @@ error: goto cleanup; } +static int +ppcHasFeature(const virCPUDataPtr data ATTRIBUTE_UNUSED, + const char *name ATTRIBUTE_UNUSED) +{ + return 0; +} + struct cpuArchDriver cpuDriverPowerPC = { .name = "ppc64", .arch = archs, @@ -479,8 +641,8 @@ struct cpuArchDriver cpuDriverPowerPC = { #else .nodeData = NULL, #endif - .guestData = NULL, + .guestData = ppcGuestData, .baseline = ppcBaseline, .update = ppcUpdate, - .hasFeature = NULL, + .hasFeature = ppcHasFeature, }; -- 1.8.1.4

2 5

[libvirt] Release of libvirt-1.1.2
by Daniel Veillard 02 Sep '13

02 Sep '13

As scheduled I have pushed the tarballs and rpms of the new release at the usual place: ftp://libvirt.org/libvirt/ This is a medium sized release with less than 300 commits, with a inclination toward code improvements and bugs fixes, in particular fixes for 4 CVEs. It may be a good idea to upgrade ! Features: - various improvements to libxl driver (Jim Fehlig, Bamvor Jian Zhang) - systemd integration improvements (Daniel P. Berrange, Mooli Tayer) - Add flag to BaselineCPU API to return detailed CPU features (Don Dugger) - Introduce a virt-login-shell binary (Dan Walsh) - conf: add startupPolicy attribute for harddisk (Guannan Ren) Security: - provide supplemental groups even when parsing label (CVE-2013-4291) (Eric Blake) - Add bounds checking on virDomainMigrate*Params RPC calls (CVE-2013-4292) (Daniel P. Berrange) - CVE-2013-5651 virbitmap: Refactor virBitmapParse to avoid access beyond bounds of array (Peter Krempa) - CVE-2013-4239 xen: fix memory corruption in legacy driver (Jim Fehlig) Documentation: - Reformat <disk> attribute description in formatdomain (John Ferlan) - Update iSCSI storage pool example (John Ferlan) - Update formatsecrets to include more examples of each type (John Ferlan) - Update the formatdomain disk examples (John Ferlan) - Clean 09adfdc62de2b up (Michal Privoznik) - virt-pki-validate: add --help/--version option (Eric Blake) - virt-xml-validate: add --help/--version option (Eric Blake) - Discourage users to set hard_limit (Michal Privoznik) - Update polkit examples to use 'lookup' method (Daniel P. Berrange) - fix usb node device sub-element names (Xuesong Zhang) - virt-login-shell: improve error message grammar (Ruben Kerkhof) - storage pool permission copy-paste fix (Philipp Hahn) - mention VIR_TEST_RANGE (Eric Blake) - Document use of systemd socket activation (Daniel P. Berrange) - Remove leftovers from hyperv spinlocks documentation (Ján Tomko) - Fix typo in domain name in polkit acl example (Daniel P. Berrange) - Add documentation for access control system (Daniel P. Berrange) - Add an example config file for virtlockd (Daniel P. Berrange) - Add a man page for virtlockd daemon (Daniel P. Berrange) - Add info about access control checks into API reference (Daniel P. Berrange) - Fix minor typos in messages and docs (Yuri Chornoivan) Portability: - build: fix virtlockd file distribution (Eric Blake) - build: shipped files must not depend on BUILT_SOURCES (Eric Blake) - build: only create virt-login-shell for lxc builds (Eric Blake) - qemu: Only setup vhost if virtType == "kvm" (Cole Robinson) - Process virtlockd.conf instead of libvirtd.conf (Guido Günther) - Change way we fake dbus method calls (Daniel P. Berrange) - random: don't mix RAND_MAX with random_r (Eric Blake) - tests: skip schema validation tests if xmllint is missing (Eric Blake) - Check for --no-copy-dt-needed linker flag (Guido Günther) - Simplify RELRO_LDFLAGS (Guido Günther) - tests: fix building without xattr support (Claudio Bley) - nwfilter: Don't fail to start if DBus isn't available (Peter Krempa) - virsystemd: Don't fail to start VM if DBus isn't available or compiled in (Peter Krempa) - tools: Make sure to distribute conf_DATA, fix RPM build (Cole Robinson) - Directly link against needed libraries (Guido Günther) - Directly link against needed libraries (Guido Günther) - build: avoid -lgcrypt with newer gnutls (Eric Blake) - build: more workarounds for if_bridge.h (Eric Blake) - tests: avoid too-large constants (Eric Blake) - tests: work with older dbus (Eric Blake) - build: fix compilation of virt-login-shell.c (Jim Fehlig) - maint: the compiler is not always named gcc (Eric Blake) - build: fix qemuagenttest build with -O0 in fedora 19. (Jincheng Miao) - spec: RHEL-7 does not have sanlock on i686 (Jiri Denemark) - spec: Disable libssh2 support for RHEL (Peter Krempa) Bug Fixes: - qemu_hotplug: Resolve DEADCODE coverity error (John Ferlan) - Fix memory leak in cmdAttachDisk (Hongwei Bi) - python: Fix a PyList usage mistake (Guan Qiang) - qemu: Remove hostdev entry when freeing the depending network entry (Peter Krempa) - virsh: detect programming errors with option parsing (Eric Blake) - virt-sanlock-cleanup; Fix augtool usage (Jiri Denemark) - virsh: Fix debugging (Martin Kletzander) - virsh: free the caps list properly if one of them is invalid (Ján Tomko) - virsh: free the formatting string when listing pool details (Ján Tomko) - virsh: free the list from ListAll APIs even for 0 items (Ján Tomko) - virsh: free messages after logging them to a file (Ján Tomko) - Test network update XML parsing (Ján Tomko) - Always specify qcow2 compat level on qemu-img command line (Ján Tomko) - virsh: fix return value error of cpu-stats (Guannan Ren) - Don't free NULL network in cmdNetworkUpdate (Ján Tomko) - schema: Allow dots in device aliases (Jiri Denemark) - qemu: Don't update count of vCPUs if hot-plug fails silently (Peter Krempa) - tests: Add URI precedence checking (Martin Kletzander) - Fix URI connect precedence (Martin Kletzander) - libxl: fix libvirtd crash when reconnecting domains (Jim Fehlig) - migration: do not restore labels on failed migration (Eric Blake) - storage: Fix the use-after-free memory bug (Osier Yang) - storage: Fix coverity warning (Osier Yang) - qemu_conf: Fix broken logic for adding passthrough iscsi lun (Osier Yang) - libxl: Resolve possible NULL dereference (John Ferlan) - virsh: Don't leak list of volumes when undefining domain with storage (Peter Krempa) - virbitmaptest: Shut coverity up in case of broken test (Peter Krempa) - storage: Update pool metadata after adding/removing/resizing volume (Osier Yang) - virbitmaptest: Add test for out of bounds condition (Peter Krempa) - virsh-domain: Fix memleak in cmdCPUBaseline (Peter Krempa) - libxl: unref DomainObjPrivate on error path (Jim Fehlig) - virsh-domain: Fix memleak in cmdUndefine with storage (Peter Krempa) - Fix qemuProcessReadLog with non-zero offset (Ján Tomko) - network: permit upstream forwarding of unqualified DNS names (Laine Stump) - virsh-domain: Flip logic in cmdSetvcpus (Peter Krempa) - Don't crash in qemuBuildDeviceAddressStr (Guido Günther) - libxl: fix libvirtd segfault (Jim Fehlig) - Make check for /dev/loop device names stricter to avoid /dev/loop-control (Daniel P. Berrange) - libxl: fix node ranges in libxlNodeGetCellsFreeMemory() (Dario Faggioli) - Fix double-free and broken logic in virt-login-shell (Daniel P. Berrange) - virnettlscontext: Resolve Coverity warnings (UNINIT) (John Ferlan) - remote: Fix a segfault in remoteDomainCreateWithFlags (Alex Jia) - qemu: Allow hotplug of multiple SCSI devices (Eric Farman) - Fix validation of CA certificate chains (Daniel P. Berrange) - Reverse logic allowing partial DHCP host XML (Ján Tomko) - xen: Use internal interfaces in xenDomainUsedCpus (Stefan Bader) - qemu_migration: Don't error on tunelled migration with --copy-storage (Michal Privoznik) - build: fix missing max_queued_clients in augeas test file for libvirtd.conf (Laine Stump) - Fix crashing upgrading from older libvirts with running guests (Daniel P. Berrange) - Avoid crash if NULL is passed for filename/funcname in logging (Daniel P. Berrange) - qemumonitortestutils: Don't skip va_end() on error path (Peter Krempa) - tests: Coverity found new NULL_RETURNS (John Ferlan) - Configuring systemd to restart libvirt on failure (Mooli Tayer) - xen: Avoid double free of virDomainDef in xenDaemonCreateXML (Stefan Bader) Improvements: - build: fix 'make distcheck' out of the box (Eric Blake) - virsh-domain: rename print_job_progress to vshPrintJobProgress (Peter Krempa) - Prohibit unbounded arrays in XDR protocols (Daniel P. Berrange) - Add bounds checking on virConnectListAllSecrets RPC call (Daniel P. Berrange) - Add bounds checking on virConnectListAllNWFilters RPC call (Daniel P. Berrange) - Add bounds checking on virConnectListAllNodeDevices RPC call (Daniel P. Berrange) - Add bounds checking on virConnectListAllInterfaces RPC call (Daniel P. Berrange) - Add bounds checking on virConnectListAllNetworks RPC call (Daniel P. Berrange) - Add bounds checking on virStoragePoolListAllVolumes RPC call (Daniel P. Berrange) - Add bounds checking on virConnectListAllStoragePools RPC call (Daniel P. Berrange) - Add bounds checking on virConnectListAllDomains RPC call (Daniel P. Berrange) - Add bounds checking on virDomain{SnapshotListAllChildren,ListAllSnapshots} RPC calls (Daniel P. Berrange) - Add bounds checking on virDomainGetJobStats RPC call (Daniel P. Berrange) - autogen.sh: Correctly detect .git as a file (Michal Privoznik) - bridge_driver: Introduce networkObjFromNetwork (Michal Privoznik) - virsh-pool.c: Don't jump over variable declaration (Michal Privoznik) - Remove the space before the slash in network XML (Ján Tomko) - Build QEMU command line for pcihole64 (Ján Tomko) - Add pcihole64 element to root PCI controllers (Ján Tomko) - Allow controller XML parsing to use XPath context (Ján Tomko) - Move virDomainParseScaledValue earlier (Ján Tomko) - Add ftp protocol support for cdrom disk (Aline Manera) - Add http protocol support for cdrom disk (Aline Manera) - virsh: C99 style for info_domfstrim and opts_lxc_enter_namespace (Tomas Meszaros) - qemuDomainAttachHostPciDevice: Fall back to mem balloon if there's no hard_limit (Michal Privoznik) - qemuhotplugtest: Add tests for virtio SCSI disk hotplug (Jiri Denemark) - qemuhotplugtest: Add tests for USB disk hotplug (Jiri Denemark) - qemuhotplugtest: Add tests for async virtio disk detach (Jiri Denemark) - qemuhotplugtest: Add support for DEVICE_DELETED event (Jiri Denemark) - qemu: Let tests override waiting time for device unplug (Jiri Denemark) - qemu: Export qemuProcessHandleDeviceDeleted for tests (Jiri Denemark) - tests: Add support for passing driver to qemu monitor (Jiri Denemark) - tests: Add support for passing vm to qemu monitor (Jiri Denemark) - qemuhotplugtest: Add tests for virtio disk hotplug (Jiri Denemark) - qemuxml2argvtest: Add XML for testing device hotplug (Jiri Denemark) - qemuhotplugtest: Define QMP_OK for the most common reply (Jiri Denemark) - qemuhotplugtest: Compare domain XML after device hotplug (Jiri Denemark) - qemuhotplugtest: Generate better output (Jiri Denemark) - qemu: Move qemuDomainDetachDeviceDiskLive to qemu_hotplug.c (Jiri Denemark) - qemu: Move qemuDomainAttachDeviceDiskLive to qemu_hotplug.c (Jiri Denemark) - qemu: Avoid using global qemu_driver in event handlers (Jiri Denemark) - qemu: Typedef monitor callbacks (Jiri Denemark) - python: simplify complicated conditional assignment (Claudio Bley) - Test for object identity when checking for None in Python (Claudio Bley) - qemuagenttest.c: Missing documentation (Timeout) (Nehal J Wani) - python: Use RELRO_LDFLAGS and NO_INDIRECT_LDFLAGS (Guido Günther) - Set security label on FD for virDomainOpenGraphics (Daniel P. Berrange) - qemuBuildNicDevStr: Add mq=on for multiqueue networking (Michal Privoznik) - virBitmapParse: Fix behavior in case of error and fix up callers (Peter Krempa) - VMX: Improve disk parse error for unknown values (Doug Goldstein) - bridge driver: implement networkEnableIpForwarding for BSD (Roman Bogorodskiy) - BSD: implement virNetDev(Set|Clear)IPv4Address (Roman Bogorodskiy) - Test handling of non-existent x509 certs (Daniel P. Berrange) - Report secret usage error message similarly (John Ferlan) - virsh: Print cephx and iscsi usage (John Ferlan) - selinux: enhance test to cover nfs label failure (Eric Blake) - selinux: distinguish failure to label from request to avoid label (Eric Blake) - virsh-pool: Improve error message in cmdPoolList (Peter Krempa) - virsh: modify vshStringToArray to duplicate the elements too (Peter Krempa) - qemuBuildCommandLine: Fall back to mem balloon if there's no hard_limit (Michal Privoznik) - qemuSetupMemoryCgroup: Handle hard_limit properly (Michal Privoznik) - virt-xml-validate: add missing schemas (Eric Blake) - libxl: implement NUMA capabilities reporting (Jim Fehlig) - virdbus: Add virDBusHasSystemBus() (Peter Krempa) - Make max_clients in virtlockd configurable (David Weber) - snapshot_conf: Allow parsing an XML node (Cole Robinson) - test: Unify object XML parsing (Cole Robinson) - test: Simplify args passed to testDomainStartState (Cole Robinson) - test: Split object parsing into their own functions (Cole Robinson) - maint: slightly reduce configure size (Eric Blake) - libxl: refactor capabilities code (Jim Fehlig) - virbitmaptest: Fix function header formatting (Peter Krempa) - maint: update gnulib submodule (Eric Blake) - maint: fix typo for 'switch' (Eric Blake) - examples: support crash events in event-test.py (Giuseppe Scrivano) - cpu: Add Power7+ and Power8 CPU definition in map.xml (Li Zhang) - Ensure that /dev exists in the container root filesystem (Daniel P. Berrange) - Properly handle -h / -V for --help/--version aliases in virtlockd/libvirtd (Daniel P. Berrange) - Address missed feedback from review of virt-login-shell (Daniel P. Berrange) - Honour root prefix in lxcContainerMountFSBlockAuto (Daniel P. Berrange) - tests: Fix parallel runs of TLS test suites (Martin Kletzander) - cgroup macros refactoring, part 5 (Roman Bogorodskiy) - cgroup macros refactoring, part 4 (Roman Bogorodskiy) - cgroup macros refactoring, part 3 (Roman Bogorodskiy) - cgroup macros refactoring, part 2 (Roman Bogorodskiy) - cgroup macros refactoring, part 1 (Roman Bogorodskiy) - cgroup: functional sort (Eric Blake) - cgroup: topological sort (Eric Blake) - cgroup: use consistent formatting (Eric Blake) - Add missing ATTRIBUTE_UNUSED (Guido Günther) - virsh: nicer abort of blockcopy (Eric Blake) - tests: Skip virsh-all test as expensive (Peter Krempa) - qemuagenttest: Test timeout of agent commands (Peter Krempa) - tests: add helper to determine when to skip expensive tests (Eric Blake) - build: add configure option to disable gnulib tests (Eric Blake) - qemuagenttest: Test arbitrary command passthrough (Peter Krempa) - Record the where the auto-generated data comes from (Daniel P. Berrange) - tests: test negative number through dbus (Eric Blake) - libxl: Create per-domain log file (Jim Fehlig) - Fix parallel runs of TLS test suites (Daniel P. Berrange) - configure: fix formatting of missing pkg-config modules error (Giuseppe Scrivano) - Ensure securityfs is mounted readonly in container (Dan Walsh) - Change data passed into TLS test cases (Daniel P. Berrange) - Avoid re-generating certs every time (Daniel P. Berrange) - Split TLS test into two separate tests (Daniel P. Berrange) - maint: avoid C99 loop declaration (Eric Blake) - qemu: support to drop disk with 'optional' startupPolicy (Guannan Ren) - nwfilter: Use -m conntrack rather than -m state (Stefan Berger) - virGetGroupList: always include the primary group (Guido Günther) - qemu: improve error reporting during PCI address validation (Laine Stump) - qemu: enable using implicit sata controller in q35 machines (Laine Stump) - qemu: properly set/use device alias for pci controllers (Laine Stump) - qemu: fix handling of default/implicit devices for q35 (Laine Stump) - qemu: add dmi-to-pci-bridge controller (Laine Stump) - qemu: add pcie-root controller (Laine Stump) - qemu: enable auto-allocate of all PCI addresses (Laine Stump) - Introduce max_queued_clients (Michal Privoznik) - RPC: Don't accept client if it would overcommit max_clients (Michal Privoznik) - qemu: eliminate almost-duplicate code in qemu_command.c (Laine Stump) - qemu: rename some functions in qemu_command.c (Laine Stump) - conf: add default USB controller in qemu post-parse callback (Laine Stump) - spec: Explicitly claim ownership of channel subdir (Jiri Denemark) - Ensure LXC/QEMU APIs set the filename for errors (Daniel P. Berrange) - Remove reference to python/tests from RPM %doc (Daniel P. Berrange) - qemuagenttest: Check invalid response in shutdown test (Peter Krempa) - qemuagenttest: Fix checking of shutdown mode (Peter Krempa) - bridge driver: extract platform specifics (Roman Bogorodskiy) - valgrind: Adjust filter for _dl_allocate_tls (John Ferlan) - maint: use modern autoconf idioms (Eric Blake) - qemu: check presence of each disk and its backing file as well (Guannan Ren) - qemu: add helper functions for diskchain checking (Guannan Ren) - qemu: refactor qemuDomainCheckDiskPresence for only disk presence check (Guannan Ren) - Enable support for systemd-machined in cgroups creation (Daniel P. Berrange) - Cope with races while killing processes (Daniel P. Berrange) - Add support for systemd cgroup mount (Daniel P. Berrange) - Add APIs for formatting systemd slice/scope names (Daniel P. Berrange) - qemuagenttest: Add tests for CPU plug functions and helpers (Peter Krempa) - qemuagenttest: Introduce testing of shutdown commands (Peter Krempa) - qemuagenttest: Add testing of agent suspend modes (Peter Krempa) - qemuagenttest: Test the filesystem trimming (Peter Krempa) - tests: Add qemuagenttest (Peter Krempa) - qemumonitortestutils: Add the ability to check arguments of commands (Peter Krempa) - qemumonitortestutils: Improve error reporting from mock qemu monitor (Peter Krempa) - qemumonitortestutils: Add instrumentation for guest agent testing (Peter Krempa) - qemumonitortestutils: Split lines on \n instead of \r\n (Peter Krempa) - qemumonitortestutils: Refactor the test helpers to allow reuse (Peter Krempa) - qemumonitortestutils: Split up creation of the test to allow reuse (Peter Krempa) - qemumonitortestutils: Don't crash on non fully initialized test (Peter Krempa) - qemumonitortestutils: remove multiline function calls (Peter Krempa) - qemumonitortestutils: Use VIR_DELETE_ELEMENT and VIR_APPEND_ELEMENT (Peter Krempa) - qemumonitortestutils: Use consistent header style and line spacing (Peter Krempa) - qemu_agent: Remove obvious comments (Peter Krempa) - qemu_agent: Move updater function for VCPU hotplug into qemu_agent.c (Peter Krempa) - qemu_agent: Output newline at the end of the sync JSON message (Peter Krempa) - conf: Export virDomainChrSourceDefClear() (Peter Krempa) - add console support in libxl (Bamvor Jian Zhang) - util: add virGetUserDirectoryByUID (Dan Walsh) - maint: fix typo for SENTINEL (Eric Blake) - spec: Don't mix commands with macro definitions (Jiri Denemark) - spec: Use --enable-werror on RHEL (Jiri Denemark) - tests: Put a mock library at the start of LD_PRELOAD (Jiri Denemark) - Support apparmor in RPM spec (Daniel P. Berrange) - Delete obsolete / unused python test files (Daniel P. Berrange) Cleanups: - qemu_hotplug: Fix whitespace around addition in argument (Peter Krempa) - qemu: Drop qemuDomainMemoryLimit (Michal Privoznik) - maint: avoid bootstrap warning (Eric Blake) - libxl: remove unnecessary curly braces (Jim Fehlig) - virtio-rng: Remove double space in error message (Peter Krempa) - Don't mark parentIndex with ATTRIBUTE_UNUSED (Ján Tomko) Thanks everybody who contributed to this release in some ways, ideas, bug reports, patches or reviews ! Including localization updates, we now have a dozen of languague with complete or near complate translations :-) Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] Entering freeze for libvirt-1.1.2
by Daniel Veillard 02 Sep '13

02 Sep '13

I am a day late but I finally tagged the release candidate 1 of 1.1.2 in git and push the tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ so the plan is to have an rc2 candidate on friday and if everything looks good push the final release 1.1.2 on Monday. Please give it a try especially for potential portability issues, thanks in advance ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

9 21

[libvirt] [PATCH] qemu_hotplug: Resolve DEADCODE coverity error
by John Ferlan 02 Sep '13

02 Sep '13

Remove unused 'cgroup' variable in qemuDomainAttachDeviceDiskLive() to resolve coverity DEADCODE complaint --- Refactoring of qemuDomainAttachDeviceDiskLive() in the following patch: https://www.redhat.com/archives/libvir-list/2013-August/msg00079.html seemed to wake up Coverity and it complained about deadcode as a result of 'cgroup' only ever been NULL thus the check for it to be non-NULL in order to call qemuTeardownDiskCgroup() would not be able to occur. The code actually hadn't changed, but for some reason coverity now found it. Followed example in qemuDomainChangeDiskMediaLive() and just removed the 'cgroup' variable. src/qemu/qemu_hotplug.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9c655ff..6cdee44 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -683,7 +683,6 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, virDomainDiskDefPtr orig_disk = NULL; virDomainDeviceDefPtr dev_copy = NULL; virDomainDiskDefPtr tmp = NULL; - virCgroupPtr cgroup = NULL; virCapsPtr caps = NULL; int ret = -1; @@ -773,10 +772,10 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, break; } - if (ret != 0 && cgroup) { - if (qemuTeardownDiskCgroup(vm, disk) < 0) - VIR_WARN("Failed to teardown cgroup for disk path %s", - NULLSTR(disk->src)); + if (ret != 0 && + qemuTeardownDiskCgroup(vm, disk) < 0) { + VIR_WARN("Failed to teardown cgroup for disk path %s", + NULLSTR(disk->src)); } end: -- 1.8.3.1

2 2

[libvirt] [PATCH] Fix memory leak in cmdAttachDisk
by hwbi 01 Sep '13

01 Sep '13

When virBufferError is ok in cmdAttachDisk,the latter should 'goto cleanup',instead of returning a false to prevent memory leaking. --- tools/virsh-domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3fd57fd..568d61d 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -661,7 +661,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) if (virBufferError(&buf)) { vshPrint(ctl, "%s", _("Failed to allocate XML buffer")); - return false; + goto cleanup; } xml = virBufferContentAndReset(&buf); -- 1.7.1

3 3

[libvirt] [PATCH] random: don't mix RAND_MAX with random_r
by Eric Blake 31 Aug '13

31 Aug '13

FreeBSD 10 recently changed their definition of RAND_MAX, to try and cover the fact that their evenly distributed results really are a smaller range than a full power of 2. As a result, I did some investigation, and learned: 1. POSIX requires random() to be evenly distributed across exactly 31 bits. glibc also guarantees this for rand(), but the two are unrelated, and POSIX only associates RAND_MAX with rand(). Avoiding RAND_MAX altogether thus avoids a build failure on FreeBSD 10. 2. Concatenating random bits from a PRNG will NOT provide uniform coverage over the larger value UNLESS the period of the original PRNG is at least as large as the number of bits being concatenated. Simple example: suppose that RAND_MAX were 1 with a period of 2**1 (which means that the PRNG merely alternates between 0 and 1). Concatenating two successive rand() calls would then invariably result in 01 or 10, which is a rather non-uniform distribution (00 and 11 are impossible) and an even worse period (2**0, since our second attempt will get the same number as our first attempt). But a RAND_MAX of 1 with a period of 2**2 (alternating between 0, 1, 1, 0) provides sane coverage of all four values, if properly tempered. (Back-to-back calls would still only see half the values if we don't do some tempering). We therefore want to guarantee a period of at least 2**64, preferably larger (as a tempering factor); POSIX only makes this guarantee for random() with 256 bytes of info. * src/util/virrandom.c (virRandomBits): Use constants that are accurate for the PRNG we are using, not an unrelated PRNG. (randomState): Ensure the period of our PRNG exceeds our usage. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I debated pushing this under the build-breaker rule, but would like to get feedback from an actual FreeBSD build first if possible. src/util/virrandom.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/util/virrandom.c b/src/util/virrandom.c index c233732..37d1a82 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Red Hat, Inc. + * Copyright (C) 2012-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -36,7 +36,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE -static char randomState[128]; +static char randomState[256]; static struct random_data randomData; static virMutex randomLock; @@ -70,9 +70,20 @@ virRandomOnceInit(void) VIR_ONCE_GLOBAL_INIT(virRandom) -/* The algorithm of virRandomBits requires that RAND_MAX == 2^n-1 for - * some n; gnulib's random_r meets this property. */ -verify(((RAND_MAX + 1U) & RAND_MAX) == 0); +/* The algorithm of virRandomBits relies on gnulib's guarantee that + * random_r() matches the POSIX requirements on random() of being + * evenly distributed among exactly [0, 2**31) (that is, we always get + * exactly 31 bits). While this happens to be the value of RAND_MAX + * on glibc, note that POSIX only requires RAND_MAX to be tied to the + * weaker rand(), so there are platforms where RAND_MAX is smaller + * than the range of random_r(). For the results to be evenly + * distributed among up to 64 bits, we also rely on the period of + * random_r() to be at least 2**64, which POSIX only guarantees for + * random() if you use 256 bytes of state. */ +enum { + RANDOM_BITS_PER_ITER = 31, + RANDOM_BITS_MASK = (1U << RANDOM_BITS_PER_ITER) - 1, +}; /** * virRandomBits: @@ -85,7 +96,6 @@ verify(((RAND_MAX + 1U) & RAND_MAX) == 0); */ uint64_t virRandomBits(int nbits) { - int bits_per_iter = count_one_bits(RAND_MAX); uint64_t ret = 0; int32_t bits; @@ -98,10 +108,10 @@ uint64_t virRandomBits(int nbits) virMutexLock(&randomLock); - while (nbits > bits_per_iter) { + while (nbits > RANDOM_BITS_PER_ITER) { random_r(&randomData, &bits); - ret = (ret << bits_per_iter) | (bits & RAND_MAX); - nbits -= bits_per_iter; + ret = (ret << RANDOM_BITS_PER_ITER) | (bits & RANDOM_BITS_MASK); + nbits -= RANDOM_BITS_PER_ITER; } random_r(&randomData, &bits); -- 1.8.3.1

3 4