- Devel - libvirt List Archives

[libvirt] Build failed in Jenkins: libvirt-syntax-check #1531
by Jenkins CI 29 Sep '13

29 Sep '13

See <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/1531/> ------------------------------------------ Started by upstream project "libvirt-build" build number 1700 Building on master in workspace <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/ws/> [workspace] $ /bin/sh -xe /tmp/hudson4053703831105800586.sh + make syntax-check GEN bracket-spacing-check GFDL_version 0.48 GFDL_version TAB_in_indentation src/vmware/vmware_driver.c:163: break; src/vmware/vmware_driver.c:164: } maint.mk: indent with space, not TAB, in C, sh, html, py, syms and RNG schemas make: *** [sc_TAB_in_indentation] Error 1 Build step 'Execute shell' marked build as failure

2 2

[libvirt] [PATCHv3 1/2] VMware: Support more than 2 driver backends
by Doug Goldstein 29 Sep '13

29 Sep '13

Currently the VMware version check code only supports two types of VMware backends, Workstation and Player. But in the near future we will have an additional one so we need to support more. Additionally, we discover and cache the path to the vmrun binary so we should use that path when using the cooresponding binary from the VMware VIX SDK. --- change from v2: * No change change from v1: * Added default case so we don't potentially pass NULL to virCommand --- src/vmware/vmware_conf.c | 28 +++++++++++++++++++++++++--- src/vmware/vmware_driver.c | 20 ++++++++++++++++++-- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 261a4f6..c11c92d 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -257,10 +257,30 @@ vmwareExtractVersion(struct vmware_driver *driver) { unsigned long version = 0; int ret = -1; - virCommandPtr cmd; + virCommandPtr cmd = NULL; char * outbuf = NULL; - const char * bin = (driver->type == VMWARE_DRIVER_PLAYER) ? - "vmplayer" : "vmware"; + char *bin = NULL; + char *vmwarePath = NULL; + + if ((vmwarePath = mdir_name(driver->vmrun)) == NULL) + goto cleanup; + + switch (driver->type) { + case VMWARE_DRIVER_PLAYER: + if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmplayer")) + goto cleanup; + break; + + case VMWARE_DRIVER_WORKSTATION: + if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmware")) + goto cleanup; + break; + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("invalid driver type for version detection")); + goto cleanup; + } cmd = virCommandNewArgList(bin, "-v", NULL); virCommandSetOutputBuffer(cmd, &outbuf); @@ -276,6 +296,8 @@ vmwareExtractVersion(struct vmware_driver *driver) cleanup: virCommandFree(cmd); VIR_FREE(outbuf); + VIR_FREE(bin); + VIR_FREE(vmwarePath); return ret; } diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 4e56971..01d65ed 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -93,6 +93,7 @@ vmwareConnectOpen(virConnectPtr conn, { struct vmware_driver *driver; size_t i; + char *tmp; virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -144,8 +145,23 @@ vmwareConnectOpen(virConnectPtr conn, if (virMutexInit(&driver->lock) < 0) goto cleanup; - driver->type = STRNEQ(conn->uri->scheme, "vmwareplayer") ? - VMWARE_DRIVER_WORKSTATION : VMWARE_DRIVER_PLAYER; + if ((tmp = STRSKIP(conn->uri->scheme, "vmware")) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to parse URI " + "scheme '%s'"), conn->uri->scheme); + goto cleanup; + } + + driver->type = -1; + for (i = 0; i < VMWARE_DRIVER_LAST; i++) { + if (STREQ(tmp, vmwareDriverTypeToString(i))) + driver->type = i; + } + + if (driver->type == -1) { + virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to find valid " + "requested VMware backend '%s'"), tmp); + goto cleanup; + } if (!(driver->domains = virDomainObjListNew())) goto cleanup; -- 1.8.1.5

4 7

[libvirt] [PATCH] build: fix build --without-lxc
by Eric Blake 28 Sep '13

28 Sep '13

'make distcheck' fails from a directory configured --without-lxc: GEN virt-login-shell.1 Can't write-open ../../tools/virt-login-shell.1: Permission denied at /usr/bin/pod2man line 69. * tools/Makefile.am (EXTRA_DIST): Ship pre-built man page. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. tools/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 0193140..1d9892c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -84,7 +84,9 @@ dist_man1_MANS = \ virsh.1 if WITH_LXC dist_man1_MANS += virt-login-shell.1 -endif WITH_LXC +else ! WITH_LXC +EXTRA_DIST += virt-login-shell.1 +endif ! WITH_LXC if WITH_SANLOCK dist_man8_MANS = virt-sanlock-cleanup.8 endif WITH_SANLOCK -- 1.8.3.1

1 1

[libvirt] [PATCH] build: tweak vpath builds of net_rpc
by Eric Blake 27 Sep '13

27 Sep '13

Another case missed by commits 716c7bb and 6973e02. * src/Makefile.am (VIR_NET_RPC_GENERATED): Drop $(srcdir). (libvirt_net_rpc_la_SOURCES): List generated files more compactly. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. src/Makefile.am | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 2b4549e..8632b18 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2194,19 +2194,18 @@ EXTRA_DIST += \ rpc/virkeepaliveprotocol.x VIR_NET_RPC_GENERATED = \ - $(srcdir)/rpc/virnetprotocol.h \ - $(srcdir)/rpc/virnetprotocol.c \ - $(srcdir)/rpc/virkeepaliveprotocol.h \ - $(srcdir)/rpc/virkeepaliveprotocol.c + rpc/virnetprotocol.h \ + rpc/virnetprotocol.c \ + rpc/virkeepaliveprotocol.h \ + rpc/virkeepaliveprotocol.c BUILT_SOURCES += $(VIR_NET_RPC_GENERATED) libvirt_net_rpc_la_SOURCES = \ rpc/virnetmessage.h rpc/virnetmessage.c \ - rpc/virnetprotocol.h rpc/virnetprotocol.c \ rpc/virnetsocket.h rpc/virnetsocket.c \ - rpc/virkeepaliveprotocol.h rpc/virkeepaliveprotocol.c \ - rpc/virkeepalive.h rpc/virkeepalive.c + rpc/virkeepalive.h rpc/virkeepalive.c \ + $(VIR_NET_RPC_GENERATED) if WITH_SSH2 libvirt_net_rpc_la_SOURCES += \ rpc/virnetsshsession.h rpc/virnetsshsession.c -- 1.8.3.1

1 0

[libvirt] [PATCHv2 0/4] Improve passthrough of early errors from qemu log
by Peter Krempa 27 Sep '13

27 Sep '13

Version 2 fixed according to review feedback of Jan. Peter Krempa (4): qemu_process: Make qemuProcessReadLog() more versatile and reusable qemu: monitor: Add infrastructure to access VM logs for better err msgs qemu: monitor: Produce better errors on monitor hangup qemu: Wire up better early error reporting src/qemu/qemu_monitor.c | 93 +++++++++++++++++++++++++++++++++++++++++++++---- src/qemu/qemu_monitor.h | 2 ++ src/qemu/qemu_process.c | 54 +++++++++++++++++++--------- src/qemu/qemu_process.h | 2 ++ 4 files changed, 129 insertions(+), 22 deletions(-) -- 1.8.3.2

3 7

Re: [libvirt] [PATCH] virsh: Fix domdisplay when domain only uses TLS
by Martin Kletzander 27 Sep '13

27 Sep '13

On Fri, Sep 27, 2013 at 05:43:50PM +0200, Christophe Fergeau wrote: > Hey Martin, > > Your reply wasn't sent to the mailing list, I'm assuming this was > unintentional. > Yes, sorry, that happened to me with 2 ACKs today :-( > On Fri, Sep 27, 2013 at 12:08:27PM +0200, Martin Kletzander wrote: > > On Wed, Sep 25, 2013 at 05:59:54PM +0200, Christophe Fergeau wrote: > > > It's possible to create a domain which will only use a TLS port > > > and will not have a non-TLS port set by using: > > > <graphics type='spice' autoport='yes' defaultMode='secure'/> > > > In such a setup, the 'graphics' node for the running domain will be: > > > <graphics type='spice' tlsPort='5900' > > > autoport='yes' listen='127.0.0.1' > > > defaultMode='secure'> > > > > > > However, cmdDomDisplay loops over all the 'graphics' node, and it > > > ignores nodes which don't have a 'port' attribute. This means > > > 'virsh domdisplay' will only return an empty string for domains > > > as the one above. > > > > > > This commit looks for both 'port' and 'tlsPort' before deciding > > > to ignore a graphics node. It also makes sure 'port' is not printed > > > when it's not set. > > > This makes 'virsh domdisplay' return > > > 'spice://127.0.0.1?tls-port=5900' for domains using only a TLS > > > port. > > > > > > Signed-off-by: Christophe Fergeau <cfergeau(a)redhat.com> > > > --- > > > tools/virsh-domain.c | 28 ++++++++++++++++------------ > > > 1 file changed, 16 insertions(+), 12 deletions(-) > > > > > > > ACK and OK for this release. > > Thanks, I've pushed this to master. > > This patch would also be a good candidate for the stable branch, is there > some process to follow to get it in there? > IIRC, either let Cole know or, if you have the rights, feel free to just back-port it when it is a bug (which this is). Martin

1 0

[libvirt] [PATCH v2] fchosttest: Run the test only under linux
by Michal Privoznik 27 Sep '13

27 Sep '13

Currently, we have functions to handle fc_host implemented just for linux. On all other platforms an error is thrown. It makes no sense to run the test on those platforms then. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/Makefile.am | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 1a7ff4b..17a2a72 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -129,9 +129,12 @@ test_programs = virshtest sockettest \ virportallocatortest \ sysinfotest \ virstoragetest \ - fchosttest \ $(NULL) +if WITH_LINUX +test_programs += fchosttest +endif WITH_LINUX + if WITH_LIBVIRTD test_programs += fdstreamtest endif WITH_LIBVIRTD @@ -845,10 +848,15 @@ fdstreamtest_SOURCES = \ fdstreamtest.c testutils.h testutils.c fdstreamtest_LDADD = $(LDADDS) +if WITH_LINUX fchosttest_SOURCES = \ fchosttest.c testutils.h testutils.c fchosttest_LDADD = $(LDADDS) +else ! WITH_LINUX +EXTRA_DIST += fchosttest.c +endif ! WITH_LINUX + if WITH_CIL CILOPTFLAGS = CILOPTINCS = -- 1.8.1.5

2 1

[libvirt] [PATCH] Makefile.am: Always include rule to make org.libvirt.api.policy
by Michal Privoznik 27 Sep '13

27 Sep '13

When running 'make dist' on a system without policykit, we currently fail. This is because $(srcdir)/access/org.libvirt.api.policy is in EXTRA_DIST, however, the rule to generate the file is conditional whether we build with polkit or not. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 09311b7..2b4549e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1519,6 +1519,10 @@ libvirt_driver_access_la_LIBADD = EXTRA_DIST += access/genpolkit.pl +$(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ + $(srcdir)/access/genpolkit.pl Makefile.am + $(AM_V_GEN)$(PERL) $(srcdir)/access/genpolkit.pl < $< > $@ || rm -f $@ + if WITH_POLKIT1 libvirt_driver_access_la_SOURCES += $(ACCESS_DRIVER_POLKIT_SOURCES) @@ -1527,10 +1531,6 @@ if WITH_LIBVIRTD polkitaction_DATA = $(ACCESS_DRIVER_POLKIT_POLICY) endif WITH_LIBVIRTD -$(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ - $(srcdir)/access/genpolkit.pl Makefile.am - $(AM_V_GEN)$(PERL) $(srcdir)/access/genpolkit.pl < $< > $@ || rm -f $@ - CLEANFILES += $(ACCESS_DRIVER_POLKIT_POLICY) BUILT_SOURCES += $(ACCESS_DRIVER_POLKIT_POLICY) else ! WITH_POLKIT1 -- 1.8.1.5

2 1

[libvirt] [PATCH 1/3] BSD: Ensure UNIX socket credentials are valid
by Doug Goldstein 27 Sep '13

27 Sep '13

Ensure that the socket credentials we got back on BSD are valid before using them. --- src/rpc/virnetsocket.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index b311aae..49c6ddc 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1166,6 +1166,18 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, return -1; } + if (cr.cr_version != XUCRED_VERSION) { + virReportError(VIR_ERR_SYSTEM_ERROR, "%s", + _("Failed to get valid client socket identity")); + return -1; + } + + if (cr.cr_ngroups == 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, "%s", + _("Failed to get valid client socket identity groups")); + return -1; + } + *pid = -1; *uid = cr.cr_uid; *gid = cr.cr_gid; -- 1.8.1.5

2 7

[libvirt] [PATCH 00/17] Many OOM fixes
by Daniel P. Berrange 27 Sep '13

27 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This series fixes a large number of problems in OOM codepaths. These are primarily memory leaks, but there's one crash in Xen parsing code and a few places which silently ignore failure leading to corrupt or malformed output. Daniel P. Berrange (17): Fix leak in virDomainVcpuPinDefArrayFree Avoid leak if virDomainSoundCodecDefParseXML return error Fix leak in virDomainVcpuPinDefParseXML parsing cpumask Fix leak in virDomainDefParseXML parsing vcpupin Fix leak of address string in qemuDomainPCIAddressGetNextSlot Avoid leak in qemuParseRBDString on failure of qemuAddRBDHost Fix failure to honour OOM status in qemuParseNBDString Fix leak on OOM in qemuBuildCommandLine dealing with sound card Fix leak in qemuParseCommandLineDisk on OOM Fix missing jump to error cleanup in qemuParseCommandLineDisk Fix leak in qemuStringToArgvEnv upon OOM Fix leak in qemuParseCommandLine on OOM Fix leak of command line args in qemuParseCommandLine Fix leak of char device in xenParseXM Fix crash on OOM in xenParseXM handling consoles Fix broken formatting on OOM in xenFormatXM Fix leak of serial value in xenFormatXM on OOM src/conf/domain_conf.c | 16 +++++++++----- src/qemu/qemu_command.c | 56 ++++++++++++++++++++++++++++--------------------- src/qemu/qemu_conf.c | 18 ++++++++++++++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_domain.c | 15 +------------ src/xenxs/xen_xm.c | 12 +++++++---- 6 files changed, 72 insertions(+), 47 deletions(-) -- 1.8.3.1

3 36