- Devel - libvirt List Archives

[libvirt] [PATCH 00/10] Fix multiple OOM problems
by Daniel P. Berrange 24 Sep '13

24 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Running out long ignored OOM injection tests identified a number of problems. This series fixes those that I have found so far, but more are to follow. I'm also rewriting the OOM injection code to make it much, much, much faster to run. Daniel P. Berrange (10): Fix crash on OOM when parsing disk security label Fix crash on OOM in parsing CPU mask in domain XML Fix crash if OOM occurs when creating virConnectPtr Fix crash on OOM in qemuDomainCCWAddressSetCreate() Fix crash on OOM in qemuAddRBDHost Fix allocation of arglist in qemuStringToArgvEnv Fix error checking of qemuParseKeywords return status Fix missing OOM check in qemuParseCommandLine when splitting strings Fix reporting of errors in OOM injection code Don't ignore allocation failure in virCommandAddEnvPassCommon src/conf/domain_conf.c | 5 ++-- src/datatypes.c | 10 +++++--- src/qemu/qemu_command.c | 59 ++++++++++++++++++++++++-------------------- src/qemu/qemu_command.h | 1 + src/qemu/qemu_monitor_json.c | 4 +-- src/util/viralloc.c | 18 ++++++++++++-- src/util/vircommand.c | 5 +++- 7 files changed, 63 insertions(+), 39 deletions(-) -- 1.8.3.1

2 20

[libvirt] [PATCH v4 0/7] cpu: add function to get the models for an arch
by Giuseppe Scrivano 23 Sep '13

23 Sep '13

This series adds a new API "virConnectGetCPUModelNames" that allows to retrieve the list of CPU models known by the hypervisor for a specific architecture. This new function is mainly needed by virt-manager to not read directly the cpu_map.xml file (it could also be different when accessing a remote daemon). *v4 main changes - cpuGetModels translates the arch name to the driver name. - virConnectGetCPUModelNames handles models==NULL, and - amended all the changes reported for v3 *v3 main changes - virConnectGetCPUModelNames returns the number of models instead of 0 on success. - Use VIR_INSERT_ELEMENT instead of VIR_EXPAND_N. - Fix a potential memory leak in the python bindings. - Move virsh changes to a separate commit. - Remove API documentation from libvirt.h. *v2 main changes - set a hard limit for the number of CPU models that is possible to fetch from a remote server. - Use VIR_EXPAND_N instead of VIR_REALLOC_N. - s|1.1.2|1.1.3| Giuseppe Scrivano (7): libvirt: add new public API virConnectGetCPUModelNames cpu: add function to get the models for an arch virConnectGetCPUModelNames: implement the remote protocol virConnectGetCPUModelNames: add the support for qemu virConnectGetCPUModelNames: add the support for the test protocol virsh: add function to get the CPU models for an arch python: add bindings for virConnectGetCPUModelNames daemon/remote.c | 52 ++++++++++++++++++++++++++ include/libvirt/libvirt.h.in | 4 ++ python/generator.py | 1 + python/libvirt-override-api.xml | 7 ++++ python/libvirt-override.c | 52 ++++++++++++++++++++++++++ python/libvirt-override.py | 11 ++++++ src/cpu/cpu.c | 82 ++++++++++++++++++++++++++++++++++++++++- src/cpu/cpu.h | 5 ++- src/driver.h | 7 ++++ src/libvirt.c | 51 +++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 5 +++ src/qemu/qemu_driver.c | 14 +++++++ src/remote/remote_driver.c | 63 +++++++++++++++++++++++++++++++ src/remote/remote_protocol.x | 22 ++++++++++- src/remote_protocol-structs | 13 +++++++ src/test/test_driver.c | 11 ++++++ tools/virsh-host.c | 54 +++++++++++++++++++++++++++ tools/virsh.pod | 5 +++ 19 files changed, 457 insertions(+), 3 deletions(-) -- 1.8.3.1

2 14

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

23 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 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

1 1

[libvirt] [PATCH 0/3] Followup fix for CVE-2013-4311
by Daniel P. Berrange 23 Sep '13

23 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The initial fix for CVE-2013-4311 had a flaw which affected the ACL code only. The first patch fixes that flaw, the next two add a test suite for the code in question. Daniel P. Berrange (3): Fix typo in identity code which is pre-requisite for CVE-2013-4311 Add a virNetSocketNewConnectSockFD method Add test case for virNetServerClient object identity code cfg.mk | 2 +- src/libvirt_private.syms | 1 + src/rpc/virnetserverclient.c | 2 +- src/rpc/virnetsocket.c | 18 +++++ src/rpc/virnetsocket.h | 2 + tests/Makefile.am | 14 +++- tests/virnetserverclientmock.c | 64 +++++++++++++++++ tests/virnetserverclienttest.c | 159 +++++++++++++++++++++++++++++++++++++++++ 8 files changed, 259 insertions(+), 3 deletions(-) create mode 100644 tests/virnetserverclientmock.c create mode 100644 tests/virnetserverclienttest.c -- 1.8.3.1

2 7

[libvirt] [PATCH] build: ensure 'make check' sees up-to-date config.h
by Eric Blake 23 Sep '13

23 Sep '13

Nehal J. Wani reported on IRC a rather interesting build failure: In file included from util/virnetdevbridge.c:53:0: /usr/include/linux/in6.h:30:8: error: redefinition of 'struct in6_addr' struct in6_addr { ^ I traced it to the fact that he ran 'git pull; make check' across commit e62e0094. What happened is that the configure changes result in a new variable that was set to be defined on his system, but config.h was not regenerated to contain the value of that variable. Running 'make' instead of 'make check' cleaned up the problem. A bit more investigation, and I see that in Makefile.am, automake sticks rules that rebuild config.h as part of 'make all', and that we also had a dependency 'check-local: all'; BUT the rule for check-local is run only at the point when the top-level directory is visited. Automake documents that SUBDIRS should contain an explicit '.' at the point the top-level should be visited (defaulting to last, if it doesn't appear). Sure enough, with this patch, 'make check' now does the top-level 'all' rules, which regenerates 'config.h' BEFORE compiling any code that might depend on changed content of that file. * Makefile.am (SUBDIRS): Put '.' first, not last. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Tough to argue the build-breaker rule on this one, since a fresh checkout doesn't hit it (only a 'make check' without a 'make', across an incremental build that happened to need new configure substitutions). So I'll wait for a review for my one-liner. Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4e24ecf..66cb677 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ LCOV = lcov GENHTML = genhtml -SUBDIRS = gnulib/lib include src daemon tools docs gnulib/tests \ +SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \ python tests po examples/domain-events/events-c examples/hellolibvirt \ examples/dominfo examples/domsuspend examples/python examples/apparmor \ examples/xml/nwfilter examples/openauth examples/systemtap -- 1.7.1

2 4

Re: [libvirt] [PATCH 6/6] qemu: Add support for emulated CPU features
by Eduardo Habkost 23 Sep '13

23 Sep '13

(CCing qemu-devel and libvir-list) On Sun, Sep 22, 2013 at 04:44:55PM +0200, Borislav Petkov wrote: > From: Borislav Petkov <bp(a)suse.de> > > Add support for the KVM_GET_EMULATED_CPUID ioctl and leave feature bits > enabled, when requested by userspace, if kvm emulates them. > > Signed-off-by: Borislav Petkov <bp(a)suse.de> This will break some assumptions about the semantics of "-cpu host", that today means "enable every single feature that can be enabled in the host". This, in turn, breaks the assumption that "-cpu host" can be used by libvirt to get information about all CPU features supported by the host. So, I have two questions: 1) Should "-cpu host" enable GET_EMULATED_CPUID features? (I believe the answer is "no"); 2) If not, we need a new mechanism to let libvirt know which features can be enabled on a host (in a way that would allow libvirt to easily calculate the set of possible destination hosts to which a VM can be migrated, before deciding to migrate it). This interface is getting complex enough for me to consider simply asking libvirt developers to call GET_EMULATED_CPUID and GET_SUPPORTED_CPUID directly, instead of asking QEMU for information. But if libvirt does that, it needs a way to know if it's running a QEMU version that supports GET_EMULATED_CPUID, or an old version that supports only GET_SUPPORTED_CPUID. Another alternative is to simply let libvirt ignore GET_EMULATED_CPUID by now, and treat GET_EMULATED_CPUID features as not supported by the host. But then it will break the use cases that prompted the creation of GET_EMULATED_CPUID in the first place. > --- > include/sysemu/kvm.h | 4 ++++ > linux-headers/linux/kvm.h | 4 ++++ > target-i386/cpu.c | 7 +++++++ > target-i386/kvm.c | 38 ++++++++++++++++++++++++++++++++++---- > 4 files changed, 49 insertions(+), 4 deletions(-) > > diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h > index 9bbe3db1464e..8eda1ada848a 100644 > --- a/include/sysemu/kvm.h > +++ b/include/sysemu/kvm.h > @@ -265,6 +265,10 @@ int kvm_check_extension(KVMState *s, unsigned int extension); > > uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function, > uint32_t index, int reg); > + > +uint32_t kvm_arch_get_emulated_cpuid(KVMState *env, uint32_t function, > + uint32_t index, int reg); > + > void kvm_cpu_synchronize_state(CPUState *cpu); > > /* generic hooks - to be moved/refactored once there are more users */ > diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h > index c614070662e1..edc8f2db1f8d 100644 > --- a/linux-headers/linux/kvm.h > +++ b/linux-headers/linux/kvm.h > @@ -541,6 +541,7 @@ struct kvm_ppc_smmu_info { > #define KVM_TRACE_ENABLE __KVM_DEPRECATED_MAIN_W_0x06 > #define KVM_TRACE_PAUSE __KVM_DEPRECATED_MAIN_0x07 > #define KVM_TRACE_DISABLE __KVM_DEPRECATED_MAIN_0x08 > +#define KVM_GET_EMULATED_CPUID _IOWR(KVMIO, 0x09, struct kvm_cpuid2) > > /* > * Extension capability list. > @@ -666,6 +667,9 @@ struct kvm_ppc_smmu_info { > #define KVM_CAP_IRQ_MPIC 90 > #define KVM_CAP_PPC_RTAS 91 > #define KVM_CAP_IRQ_XICS 92 > +#define KVM_CAP_ARM_EL1_32BIT 93 > +#define KVM_CAP_SPAPR_MULTITCE 94 > +#define KVM_CAP_EXT_EMUL_CPUID 95 > > #ifdef KVM_CAP_IRQ_ROUTING > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index c36345e426d7..5406348ceb4a 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1850,7 +1850,14 @@ static void filter_features_for_kvm(X86CPU *cpu) > wi->cpuid_ecx, > wi->cpuid_reg); > uint32_t requested_features = env->features[w]; > + > + uint32_t emul_features = kvm_arch_get_emulated_cpuid(s, wi->cpuid_eax, > + wi->cpuid_ecx, > + wi->cpuid_reg); > + > env->features[w] &= host_feat; > + env->features[w] |= (requested_features & emul_features); > + I find the above logic confusing: you remove a few bits just to re-add them later. Isn't easier and simpler to simply do: env->features[w] &= (host_feat | emul_features); ? > cpu->filtered_features[w] = requested_features & ~env->features[w]; > } > } > diff --git a/target-i386/kvm.c b/target-i386/kvm.c > index 749aa09a21a6..7f598f01bda5 100644 > --- a/target-i386/kvm.c > +++ b/target-i386/kvm.c > @@ -80,7 +80,7 @@ bool kvm_allows_irq0_override(void) > return !kvm_irqchip_in_kernel() || kvm_has_gsi_routing(); > } > > -static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int max) > +static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int ioctl, int max) > { > struct kvm_cpuid2 *cpuid; > int r, size; > @@ -88,7 +88,7 @@ static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int max) > size = sizeof(*cpuid) + max * sizeof(*cpuid->entries); > cpuid = (struct kvm_cpuid2 *)g_malloc0(size); > cpuid->nent = max; > - r = kvm_ioctl(s, KVM_GET_SUPPORTED_CPUID, cpuid); > + r = kvm_ioctl(s, ioctl, cpuid); > if (r == 0 && cpuid->nent >= max) { > r = -E2BIG; > } > @@ -97,7 +97,10 @@ static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int max) > g_free(cpuid); > return NULL; > } else { > - fprintf(stderr, "KVM_GET_SUPPORTED_CPUID failed: %s\n", > + fprintf(stderr, "%s failed: %s\n", > + (ioctl == (int)KVM_GET_SUPPORTED_CPUID > + ? "KVM_GET_SUPPORTED_CPUID" > + : "KVM_GET_EMULATED_CPUID"), > strerror(-r)); > exit(1); > } > @@ -112,7 +115,17 @@ static struct kvm_cpuid2 *get_supported_cpuid(KVMState *s) > { > struct kvm_cpuid2 *cpuid; > int max = 1; > - while ((cpuid = try_get_cpuid(s, max)) == NULL) { > + while ((cpuid = try_get_cpuid(s, KVM_GET_SUPPORTED_CPUID, max)) == NULL) { > + max *= 2; > + } > + return cpuid; > +} > + > +static struct kvm_cpuid2 *get_emulated_cpuid(KVMState *s) > +{ > + struct kvm_cpuid2 *cpuid; > + int max = 1; > + while ((cpuid = try_get_cpuid(s, KVM_GET_EMULATED_CPUID, max)) == NULL) { > max *= 2; > } > return cpuid; > @@ -241,6 +254,23 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function, > return ret; > } > > +uint32_t kvm_arch_get_emulated_cpuid(KVMState *s, uint32_t function, > + uint32_t index, int reg) > +{ > + struct kvm_cpuid2 *cpuid __attribute__((unused)); > + > + if (!kvm_check_extension(s, KVM_CAP_EXT_EMUL_CPUID)) > + return 0; > + > + cpuid = get_emulated_cpuid(s); > + > + struct kvm_cpuid_entry2 *entry = cpuid_find_entry(cpuid, function, index); > + if (entry) > + return cpuid_entry_get_reg(entry, reg); > + > + return 0; > +} > + > typedef struct HWPoisonPage { > ram_addr_t ram_addr; > QLIST_ENTRY(HWPoisonPage) list; > -- > 1.8.4 > > -- > To unsubscribe from this list: send the line "unsubscribe kvm" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Eduardo

1 0

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

23 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. --- src/vmware/vmware_conf.c | 23 ++++++++++++++++++++--- src/vmware/vmware_driver.c | 20 ++++++++++++++++++-- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 261a4f6..d7ea8c4 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -257,10 +257,25 @@ 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; + } cmd = virCommandNewArgList(bin, "-v", NULL); virCommandSetOutputBuffer(cmd, &outbuf); @@ -276,6 +291,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

2 4

[libvirt] Libvirt ESX: Image file not getting copied to ESX server
by varun bhatnagar 23 Sep '13

23 Sep '13

Hi, I am trying to start a node using libvirt on ESX hypervisor. Before starting I am performing the following steps: 1) vol-create datastore1 /local/new_volume.xml (Creating a volume in pool) 2) define /local/esxdomain.xml (Defining a node) 3) start MyNode (Starting a node) I tried to get the status of my node and it is showing *running *but I am not able to ping my node (as it is in network). I later got the console of my node and found out that my node is not even getting started. It says "Operating System Not Found". I guess this is because my vmdk image file is not getting copied and the first command is just placing two files .vmdk and *-flat.vmdk (these are dummy files I guess). But it is not placing my original .vmdk files. How to place the original vmdk file in datastore. If I place it using scp command then libvirt pops out a message saying "Could not start domain: GenericVmConfigFault". How to resolve this error. I am pasting my xml files below. Any help is appreciated... :) *new_volume.xml:* *<volume> <name>test/MyNode.vmdk</name> <allocation>0</allocation> <capacity unit='G'>3</capacity> <target> <path>/local/vmdk/MyNode.vmdk</path> <format type='vmdk'/> </target> </volume>* *esxdomain.xml: * *<domain type='vmware'> <name>test</name> <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] test/MyNode.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:0f:01:01'/> <source bridge='VM Network'/> </interface> <interface type='bridge'> <mac address='00:50:56:0f:01:02'/> <source bridge='dummyPortGroup1'/> </interface> <interface type='bridge'> <mac address='00:50:56:0f:01:03'/> <source bridge='dummyPortGroup2'/> </interface> </devices> </domain>* Regards, Varun

1 0

[libvirt] [PATCH] docs: Load libvirt_access*.xml from build dir
by Jiri Denemark 23 Sep '13

23 Sep '13

The xml files are generated in build directory and thus docs/newapi.xsl was not able to find them in a VPATH build. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- docs/Makefile.am | 1 + docs/newapi.xsl | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index c6a3ead..faf2a32 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -242,6 +242,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in $(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \ $(XSLTPROC) --nonet -o $(srcdir)/ \ + --stringparam builddir $(abs_top_builddir) \ $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi && \ if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \ if $(XMLCATALOG) '$(XML_CATALOG_FILE)' "-//W3C//DTD XHTML 1.0 Strict//EN" \ diff --git a/docs/newapi.xsl b/docs/newapi.xsl index 606d244..b1728ee 100644 --- a/docs/newapi.xsl +++ b/docs/newapi.xsl @@ -25,18 +25,20 @@  <xsl:key name="symbols" match="/api/symbols/*" use="@name"/> + <xsl:param name="builddir" select=".."/> +  <xsl:variable name="htmldir">html</xsl:variable> <xsl:variable name="href_base">../</xsl:variable> <xsl:variable name="acls"> - <xsl:copy-of select="document('../src/libvirt_access.xml')/aclinfo/api"/> + <xsl:copy-of select="document('{$builddir}/src/libvirt_access.xml')/aclinfo/api"/> </xsl:variable> <xsl:variable name="qemuacls"> - <xsl:copy-of select="document('../src/libvirt_access_qemu.xml')/aclinfo/api"/> + <xsl:copy-of select="document('{$builddir}/src/libvirt_access_qemu.xml')/aclinfo/api"/> </xsl:variable> <xsl:variable name="lxcacls"> - <xsl:copy-of select="document('../src/libvirt_access_lxc.xml')/aclinfo/api"/> + <xsl:copy-of select="document('{$builddir}/src/libvirt_access_lxc.xml')/aclinfo/api"/> </xsl:variable> <xsl:template name="aclinfo"> -- 1.8.3.2

3 6

[libvirt] Libvirt not able to attach console to VM on ESX hypervisor
by varun bhatnagar 23 Sep '13

23 Sep '13

Hi, I have started a virtual machine on my ESXi server. I was trying to attach a console to it but when I executed the command I got a message saying that *"Attaching a console is not supported in the current hypervisor." *Is there any way (patch or something) through which I can attach a console to my VM. The ESX version is 5.1 and I am using latest version of libvirt. Regards, Varun

4 4

[libvirt] [PATCH]LXC: Check the existence of dir before resolving symlinks
by Chen Hanxiao 23 Sep '13

23 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If dir does not exist, raise a proper error in logs and don't let virFileResolveAllLinks throw itself's exceptions in logs, which may be misleading. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index a979452..c60f5d8 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1696,6 +1696,7 @@ static int lxcContainerResolveSymlinks(virDomainDefPtr vmDef) { char *newroot; size_t i; + char ebuf[1024]; VIR_DEBUG("Resolving symlinks"); @@ -1703,6 +1704,13 @@ static int lxcContainerResolveSymlinks(virDomainDefPtr vmDef) virDomainFSDefPtr fs = vmDef->fss[i]; if (!fs->src) continue; + + if (access(fs->src, F_OK)) { + VIR_DEBUG("Failed to access '%s': %s", fs->src, + virStrerror(errno, ebuf, sizeof(ebuf))); + return -1; + } + VIR_DEBUG("Resolving '%s'", fs->src); if (virFileResolveAllLinks(fs->src, &newroot) < 0) { VIR_DEBUG("Failed to resolve symlink at %s", fs->src); -- 1.8.2.1

2 1

[libvirt] [PATCH]LXC: follow the unit style of /proc/meminfo
by Chen Hanxiao 23 Sep '13

23 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If we start libvirt_lxc with fuse complied, we could see an isolate /proc/meminfo based on fuse. Part of this were modified based on container's mem cgroup, with the unit style of "KB"; rest of them were copied from /proc/meminfo, with another unit style of "kB". It looks a little strange. We should keep pace with the style of kernel function meminfo_proc_show, and change all "KB" to "kB". Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_fuse.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index e672b0f..9d12832 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -165,43 +165,43 @@ static int lxcProcReadMeminfo(char *hostpath, virDomainDefPtr def, if (STREQ(line, "MemTotal") && (def->mem.hard_limit || def->mem.max_balloon)) - virBufferAsprintf(new_meminfo, "MemTotal: %8llu KB\n", + virBufferAsprintf(new_meminfo, "MemTotal: %8llu kB\n", meminfo.memtotal); else if (STREQ(line, "MemFree") && (def->mem.hard_limit || def->mem.max_balloon)) - virBufferAsprintf(new_meminfo, "MemFree: %8llu KB\n", + virBufferAsprintf(new_meminfo, "MemFree: %8llu kB\n", (meminfo.memtotal - meminfo.memusage)); else if (STREQ(line, "Buffers")) - virBufferAsprintf(new_meminfo, "Buffers: %8d KB\n", 0); + virBufferAsprintf(new_meminfo, "Buffers: %8d kB\n", 0); else if (STREQ(line, "Cached")) - virBufferAsprintf(new_meminfo, "Cached: %8llu KB\n", + virBufferAsprintf(new_meminfo, "Cached: %8llu kB\n", meminfo.cached); else if (STREQ(line, "Active")) - virBufferAsprintf(new_meminfo, "Active: %8llu KB\n", + virBufferAsprintf(new_meminfo, "Active: %8llu kB\n", (meminfo.active_anon + meminfo.active_file)); else if (STREQ(line, "Inactive")) - virBufferAsprintf(new_meminfo, "Inactive: %8llu KB\n", + virBufferAsprintf(new_meminfo, "Inactive: %8llu kB\n", (meminfo.inactive_anon + meminfo.inactive_file)); else if (STREQ(line, "Active(anon)")) - virBufferAsprintf(new_meminfo, "Active(anon): %8llu KB\n", + virBufferAsprintf(new_meminfo, "Active(anon): %8llu kB\n", meminfo.active_anon); else if (STREQ(line, "Inactive(anon)")) - virBufferAsprintf(new_meminfo, "Inactive(anon): %8llu KB\n", + virBufferAsprintf(new_meminfo, "Inactive(anon): %8llu kB\n", meminfo.inactive_anon); else if (STREQ(line, "Active(file)")) - virBufferAsprintf(new_meminfo, "Active(file): %8llu KB\n", + virBufferAsprintf(new_meminfo, "Active(file): %8llu kB\n", meminfo.active_file); else if (STREQ(line, "Inactive(file)")) - virBufferAsprintf(new_meminfo, "Inactive(file): %8llu KB\n", + virBufferAsprintf(new_meminfo, "Inactive(file): %8llu kB\n", meminfo.inactive_file); else if (STREQ(line, "Unevictable")) - virBufferAsprintf(new_meminfo, "Unevictable: %8llu KB\n", + virBufferAsprintf(new_meminfo, "Unevictable: %8llu kB\n", meminfo.unevictable); else if (STREQ(line, "SwapTotal") && def->mem.swap_hard_limit) - virBufferAsprintf(new_meminfo, "SwapTotal: %8llu KB\n", + virBufferAsprintf(new_meminfo, "SwapTotal: %8llu kB\n", (meminfo.swaptotal - meminfo.memtotal)); else if (STREQ(line, "SwapFree") && def->mem.swap_hard_limit) - virBufferAsprintf(new_meminfo, "SwapFree: %8llu KB\n", + virBufferAsprintf(new_meminfo, "SwapFree: %8llu kB\n", (meminfo.swaptotal - meminfo.memtotal - meminfo.swapusage + meminfo.memusage)); else { -- 1.8.2.1

3 2

[libvirt] [PATCH 0/5] Change preference of default PCI passthrough type
by Peter Krempa 23 Sep '13

23 Sep '13

Change the default type to VFIO if available. Please note that the majority of the code here is only compile tested as I don't have appropriate hardware to test it. Peter Krempa (5): qemu: hostdev: Refactor PCI passhrough handling qemu: hostdev: Add checks if PCI passthrough is availabe in the host qemu: hotplug: Verify that the selected pci passhtrough option is present qemu: Check if PCI passhtrough is available in the host when starting qemu: Prefer VFIO for PCI device passthrough docs/formatdomain.html.in | 9 ++- src/conf/domain_conf.h | 2 +- src/qemu/qemu_command.c | 27 +++++--- src/qemu/qemu_hostdev.c | 76 ++++++++++++++++++++++ src/qemu/qemu_hostdev.h | 3 + src/qemu/qemu_hotplug.c | 63 +++++++++++++++--- src/qemu/qemu_process.c | 57 ++++++++++++++++ .../qemuxml2argv-hostdev-pci-address-device.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-net-hostdev.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args | 4 +- 10 files changed, 216 insertions(+), 29 deletions(-) -- 1.8.3.2

3 11

[libvirt] [PATCH] virsh: Add missing "async" option in virsh-domain.c opts_block_commit.
by Simone Gotti 23 Sep '13

23 Sep '13

After commit 8aecd351266a66efa59b7f7be77bf66693d99ce0 it'll detect that a required option is not defined and it will assert and exit with: virsh.c:1364: vshCommandOpt: Assertion `valid->name' failed. --- tools/virsh-domain.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 49cd154..856e888 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1544,6 +1544,10 @@ static const vshCmdOptDef opts_block_commit[] = { .type = VSH_OT_INT, .help = N_("with --wait, abort if copy exceeds timeout (in seconds)") }, + {.name = "async", + .type = VSH_OT_BOOL, + .help = N_("with --wait, don't wait for cancel to finish") + }, {.name = NULL} }; -- 1.8.3.1

2 3

[libvirt] [PATCH] conf: Do better job when comparing features ABI compatibility
by Peter Krempa 23 Sep '13

23 Sep '13

The ABI compatibility check for domain features didn't check the expanded HyperV and APIC EOI values, thus possibly allowing change in guest ABI. Add the check and use typecasted switch statement to warn developers when adding a new HyperV feature. --- src/conf/domain_conf.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 67 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c4b6464..8953579 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13354,6 +13354,72 @@ virDomainRedirFilterDefCheckABIStability(virDomainRedirFilterDefPtr src, return true; } + +static bool +virDomainDefFeaturesCheckABIStability(virDomainDefPtr src, + virDomainDefPtr dst) +{ + size_t i; + + /* basic check */ + if (src->features != dst->features) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain features %d does not match source %d"), + dst->features, src->features); + return false; + } + + /* APIC EOI */ + if (src->apic_eoi != dst->apic_eoi) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("State of APIC EOI differs: " + "source: '%s', destination: '%s'"), + virDomainFeatureStateTypeToString(src->apic_eoi), + virDomainFeatureStateTypeToString(dst->apic_eoi)); + return false; + } + + /* hyperv */ + if (src->features & (1 << VIR_DOMAIN_FEATURE_HYPERV)) { + for (i = 0; i < VIR_DOMAIN_HYPERV_LAST; i++) { + switch ((enum virDomainHyperv) i) { + case VIR_DOMAIN_HYPERV_RELAXED: + case VIR_DOMAIN_HYPERV_VAPIC: + if (src->hyperv_features[i] != dst->hyperv_features[i]) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("State of HyperV enlightenment " + "feature '%s' differs: " + "source: '%s', destination: '%s'"), + virDomainHypervTypeToString(i), + virDomainFeatureStateTypeToString(src->hyperv_features[i]), + virDomainFeatureStateTypeToString(dst->hyperv_features[i])); + return false; + } + + break; + + case VIR_DOMAIN_HYPERV_SPINLOCKS: + /* spinlock count matters! */ + if (src->hyperv_spinlocks != dst->hyperv_spinlocks) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("HyperV spinlock retry count differs: " + "source: '%u', destination: '%u'"), + src->hyperv_spinlocks, + dst->hyperv_spinlocks); + return false; + } + break; + + case VIR_DOMAIN_HYPERV_LAST: + break; + } + } + } + + return true; +} + + /* This compares two configurations and looks for any differences * which will affect the guest ABI. This is primarily to allow * validation of custom XML config passed in during migration @@ -13455,12 +13521,8 @@ virDomainDefCheckABIStability(virDomainDefPtr src, return false; } - if (src->features != dst->features) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain features %d does not match source %d"), - dst->features, src->features); + if (!virDomainDefFeaturesCheckABIStability(src, dst)) return false; - } if (src->clock.ntimers != dst->clock.ntimers) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", -- 1.8.3.2

2 2

[libvirt] [v4 0/5] virsh: More intelligent auto-completion
by Tomas Meszaros 22 Sep '13

22 Sep '13

This series implements advanced auto-completion for virsh. Using custom option completers (examples in 3/5, 4/5 and 5/5), it is possible to further complete any option with defined completer function. Option completer function should return list of completed names for each desired option. Using C99 initialization, it is easy to enable specific completer for any option. For example, when we want domain completer for "start --domain" option, we write vshDomainCompleter() and along with desired flags, initialize targeted opts struct. static const vshCmdOptDef opts_start[] = { {.name = "domain", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, .help = N_("name of the inactive domain"), .completer = vshDomainCompleter, .completer_flags = VIR_CONNECT_LIST_DOMAINS_INACTIVE | VIR_CONNECT_LIST_DOMAINS_PERSISTENT }, Auto-completion itself then works like this: virsh # start --domain <TAB> domain1 domain2 domainN virsh # vol-key <TAB> --help --pool --vol vol1 vol2 --- v4: * rewritten to use only option completers v3: https://www.redhat.com/archives/libvir-list/2013-August/msg01294.html v2: https://www.redhat.com/archives/libvir-list/2013-August/msg00992.html v1: https://www.redhat.com/archives/libvir-list/2013-August/msg00371.html Tomas Meszaros (5): virsh: Add vshCmdCompleter and vshOptCompleter virsh: Improve readline generators and readline completion virsh: Add vshDomainCompleter virsh: Add vshSuspendTargetCompleter virsh: Add vshRebootShutdownModeCompleter tools/virsh-domain-monitor.c | 52 +++++-- tools/virsh-domain.c | 310 +++++++++++++++++++++++++++++--------- tools/virsh-snapshot.c | 50 +++++-- tools/virsh.c | 350 +++++++++++++++++++++++++++++++++++++++---- tools/virsh.h | 8 + 5 files changed, 648 insertions(+), 122 deletions(-) -- 1.8.3.1

2 8

Re: [libvirt] [Users] Starting VM Error
by Dan Kenigsberg 22 Sep '13

22 Sep '13

On Sun, Sep 15, 2013 at 01:59:29PM +0200, Gianluca Cecchi wrote: > On Sun, Sep 15, 2013 at 1:50 PM, Gianluca Cecchi wrote: > > and > > [root@tekkaman ~]# chgrp kvm /var/lib/libvirt/images/testvm.img > [root@tekkaman ~]# ll /var/lib/libvirt/images/testvm.img > -rw-rw----. 1 vdsm kvm 197120 Sep 15 12:24 /var/lib/libvirt/images/testvm.img > > [root@tekkaman ~]# virsh undefine testvm2 > Please enter your authentication name: virshuser > Please enter your password: > Domain testvm2 has been undefined > > [root@tekkaman ~]# virsh define /tmp/testvm2.xml > Please enter your authentication name: virshuser > Please enter your password: > Domain testvm2 defined from /tmp/testvm2.xml > > [root@tekkaman ~]# virsh start testvm2 > Please enter your authentication name: virshuser > Please enter your password: > error: Failed to start domain testvm2 > error: internal error Process exited while reading console log output: > char device redirected to /dev/pts/2 > qemu-kvm: -drive > file=/var/lib/libvirt/images//testvm.img,if=none,id=drive-virtio-disk0,format=qcow2: > could not open disk image /var/lib/libvirt/images//testvm.img: > Permission denied Gianluca, due to all the twists of this thread, I no longer recall which libvirt version you are using. Would you remind us? All signs show that it starts up qemu without setting its auxiliary group properly (Assuming that your # groups qemu qemu : qemu kvm is just as mine) I've added libvir-list so the fine folks there could check why qemu cannot read/write files group-owned by kvm. Dan.

3 5

[libvirt] ANNOUNCE: libvirt 0.10.2.8 maintenance release
by Cole Robinson 20 Sep '13

20 Sep '13

libvirt 0.10.2.8 maintenance release is now available. This is libvirt 0.10.2 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.10.2.8.tar.gz Changes in this version: * virsh: fix change-media bug on disk block type * libvirt: lxc: don't mkdir when selinux is disabled * Fix crash in remoteDispatchDomainMemoryStats (CVE-2013-4296) * Add support for using 3-arg pkcheck syntax for process (CVE-2013-4311) * Include process start time when doing polkit checks * win32: Pretend that close-on-exec works * virDomainDefParseXML: set the argument of virBitmapFree to NULL after calling virBitmapFree * security: provide supplemental groups even when parsing label (CVE-2013-4291) * virbitmap: Refactor virBitmapParse to avoid access beyond bounds of array * bitmap: add virBitmapCountBits For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] [PATCH] qemu: use "ide" as device name for implicit SATA controller on Q35
by Laine Stump 20 Sep '13

20 Sep '13

This resolves https://bugzilla.redhat.com/show_bug.cgi?id=1008903 The Q35 machinetype has an implicit SATA controller at 00:1F.2 which isn't given the "expected" id of ahci0 by qemu when it's created. The original suggested solution to this problem was to not specify any controller for the disks that use the default controller and just specify "unit=n" instead; qemu should then use the first ide or sata controller for the disk. Unfortunately, this "solution" is ignorant of the fact that in the case of SATA disks, the "unit" attribute in the disk XML is actually *not* being used for the unit, but is instead used to specify the "bus" number; each SATA controller has 6 buses, and each bus only allows a single unit. This makes it nonsensical to specify unit='n' where n is anything other than 0. It also means that the only way to connect more than a single device to the implicit SATA controller is to explicitly give the bus names, which happen to be "ide.$n", where $n can be replaced by the disk's "unit" number. --- src/qemu/qemu_command.c | 15 ++++++--------- tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4628dac..e6239c9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4383,18 +4383,15 @@ qemuBuildDriveDevStr(virDomainDefPtr def, if (qemuDomainMachineIsQ35(def) && disk->info.addr.drive.controller == 0) { /* Q35 machines have an implicit ahci (sata) controller at - * 00:1F.2 which has no "id" associated with it. For this - * reason, we can't refer to it as "ahci0". Instead, we - * don't give an id, which qemu interprets as "use the - * first ahci controller". We then need to specify the - * unit with "unit=%d" rather than adding it onto the bus - * arg. + * 00:1F.2 which for some reason is hardcoded with the id + * "ide" instead of the seemingly more reasonable "ahci0" + * or "sata0". */ - virBufferAsprintf(&opt, ",unit=%d", disk->info.addr.drive.unit); + virBufferAsprintf(&opt, ",bus=ide.%d", disk->info.addr.drive.unit); } else { /* All other ahci controllers have been created by - * libvirt, so they *do* have an id, and we can identify - * them that way. + * libvirt, and we gave them the id "ahci${n}" where ${n} + * is the controller number. So we identify them that way. */ virBufferAsprintf(&opt, ",bus=ahci%d.%d", disk->info.addr.drive.controller, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args index e10ccb1..175c0dc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args @@ -5,5 +5,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x2 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \ --device ide-drive,unit=0,drive=drive-sata0-0-0,id=sata0-0-0 \ +-device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ -vga qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-q35.args index 4461eba..6bd5f4c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35.args @@ -4,5 +4,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x2 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \ --device ide-drive,unit=0,drive=drive-sata0-0-0,id=sata0-0-0 \ +-device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ -vga qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 -- 1.8.3.1

5 7

[libvirt] [PATCH] build: Generate libvirt_access*.xml in source dir
by Jiri Denemark 20 Sep '13

20 Sep '13

Technically, these files should be generated in build dir but since docs/newapi.xsl style sheet is expecting them to be in source dir, it's much easier to put them there than trying to convince newapi.xsl to look elsewhere. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 1388c5f..c456d48 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -863,9 +863,9 @@ ACCESS_DRIVER_SYM_FILES = \ libvirt_access_lxc.syms ACCESS_DRIVER_API_FILES = \ - libvirt_access.xml \ - libvirt_access_qemu.xml \ - libvirt_access_lxc.xml + $(srcdir)/libvirt_access.xml \ + $(srcdir)/libvirt_access_qemu.xml \ + $(srcdir)/libvirt_access_lxc.xml ACCESS_DRIVER_SOURCES = \ access/viraccessperm.h access/viraccessperm.c \ @@ -1554,15 +1554,15 @@ libvirt_access_lxc.syms: $(srcdir)/rpc/gendispatch.pl \ $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclsym \ lxc LXC $(LXC_PROTOCOL) > $@ -libvirt_access.xml: $(srcdir)/rpc/gendispatch.pl \ +$(srcdir)/libvirt_access.xml: $(srcdir)/rpc/gendispatch.pl \ $(REMOTE_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclapi \ remote REMOTE $(REMOTE_PROTOCOL) > $@ -libvirt_access_qemu.xml: $(srcdir)/rpc/gendispatch.pl \ +$(srcdir)/libvirt_access_qemu.xml: $(srcdir)/rpc/gendispatch.pl \ $(QEMU_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclapi \ qemu QEMU $(QEMU_PROTOCOL) > $@ -libvirt_access_lxc.xml: $(srcdir)/rpc/gendispatch.pl \ +$(srcdir)/libvirt_access_lxc.xml: $(srcdir)/rpc/gendispatch.pl \ $(LXC_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=aclapi \ lxc LXC $(LXC_PROTOCOL) > $@ -- 1.8.3.2

3 4

[libvirt] storage pool that contains thin LVs
by Dusty Mabe 20 Sep '13

20 Sep '13

Hey guys, Just looking at https://bugzilla.redhat.com/show_bug.cgi?id=924672 and looks like all we need to do is ignore thin pools and thin pool data devices. With some trivial testing this seems to work fine (i.e. failed before and works now). diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index a1a37a1..0154256 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -85,6 +85,10 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, if (attrs[4] != 'a') return 0; + /* Skip thin pools(t) and thin pool data(T) */ + if (attrs[0] == 't' || attrs[0] == 'T') + return 0; + /* See if we're only looking for a specific volume */ if (data != NULL) { vol = data; I'm sure the fix isn't this trivial but i can finish it up and submit an official patch (through git) if this is close. Dusty

3 3

[libvirt] [PATCH] Don't dereference NULL in qemumonitorjsontest
by Ján Tomko 20 Sep '13

20 Sep '13

In case of an error, qemuMonitorTestNewSimple returns NULL. Error out instead of dereferencing it. Found by Coverity, reported by John Ferlan. --- Pushed as trivial. tests/qemumonitorjsontest.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index b451e8e..0fb8d65 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -960,6 +960,9 @@ testQemuMonitorJSONCPU(const void *data) bool running = false; virDomainPausedReason reason = 0; + if (!test) + return -1; + if (qemuMonitorTestAddItem(test, "stop", "{\"return\": {}}") < 0 || qemuMonitorTestAddItem(test, "query-status", "{\"return\": {" @@ -1016,6 +1019,9 @@ testQemuMonitorJSONSimpleFunc(const void *opaque) const char *reply = data->reply; int ret = -1; + if (!test) + return -1; + if (!reply) reply = "{\"return\":{}}"; -- 1.8.1.5

2 1

[libvirt] [PATCH 0/2] qemumonitorjsontest improvements
by Michal Privoznik 20 Sep '13

20 Sep '13

Just a couple of tests. Michal Privoznik (2): qemumonitorjsontest: Test CPU state handling code qemumonitorjsontest: Introduce DO_TEST_SIMPLE tests/qemumonitorjsontest.c | 103 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) -- 1.8.1.5

3 6

[libvirt] [PATCH] Add checking of dbus_message_iter_append_basic return value
by Daniel P. Berrange 20 Sep '13

20 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Coverity complains that the test suite did not check the return value of dbus_message_iter_append_basic() as we did in most other places. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- tests/virsystemdmock.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/tests/virsystemdmock.c b/tests/virsystemdmock.c index 59b312d..b8fc031 100644 --- a/tests/virsystemdmock.c +++ b/tests/virsystemdmock.c @@ -82,10 +82,8 @@ DBusMessage *dbus_connection_send_with_reply_and_block(DBusConnection *connectio dbus_message_iter_init_append(reply, &iter); if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, - &error_message)) { - dbus_message_unref(reply); - return NULL; - } + &error_message)) + goto error; } else { reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); } @@ -98,19 +96,25 @@ DBusMessage *dbus_connection_send_with_reply_and_block(DBusConnection *connectio dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &sub); - dbus_message_iter_append_basic(&sub, + if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, - &svc1); - if (!getenv("FAIL_NO_SERVICE")) - dbus_message_iter_append_basic(&sub, - DBUS_TYPE_STRING, - &svc2); + &svc1)) + goto error; + if (!getenv("FAIL_NO_SERVICE") && + !dbus_message_iter_append_basic(&sub, + DBUS_TYPE_STRING, + &svc2)) + goto error; dbus_message_iter_close_container(&iter, &sub); } else { reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); } return reply; + + error: + dbus_message_unref(reply); + return NULL; } #else -- 1.8.3.1

2 1

[libvirt] [PATCH 0/3] VMware: Driver updates for future work
by Doug Goldstein 20 Sep '13

20 Sep '13

While some of these patches seem unncessary (e.g. vmrun lookup/caching) my end goal is to add VMware Fusion support to libvirt. Rationale for patch 1: In libvirt we prefer enums and using some of the standardized APIs for enum/str handling. Rationale for patch 2: VMware Fusion command line utilities will never be in PATH on a Mac OS X machine and nor is it correct to tell the user to have it in your path. The tools live in /Applications/VMware Fusion.app/ or /Library/Application Support/VMware Fusion.app/ and app bundles should not appear in your path. In the future it will allow us to add these pathes in the list of paths to search for. We can also improve the Windows user experience and populate the Windows path in here as well since most users don't have the VMware install dir in their PATH. Rationale for patch 3: Testing is good. VMware Fusion has a slightly different string format for the version so the code will need to change this allows us to add tests. I personally don't own a copy of VMware Workstation or VMware Fusion, so if anyone does please send me (or submit patches) of additional version numbers so that we can improve our test coverage. Doug Goldstein (3): VMware: Convert driver type defines to enum VMware: Store vmrun binary's path in the driver VMware: Make version parsing testable and add tests .gitignore | 1 + src/Makefile.am | 6 ++ src/libvirt_vmware.syms | 12 ++++ src/vmware/vmware_conf.c | 61 ++++++++++++----- src/vmware/vmware_conf.h | 15 ++++- src/vmware/vmware_driver.c | 63 +++++++++++------- tests/Makefile.am | 14 ++++ tests/vmwareverdata/workstation-7.0.0.txt | 1 + tests/vmwarevertest.c | 105 ++++++++++++++++++++++++++++++ 9 files changed, 233 insertions(+), 45 deletions(-) create mode 100644 src/libvirt_vmware.syms create mode 100644 tests/vmwareverdata/workstation-7.0.0.txt create mode 100644 tests/vmwarevertest.c -- 1.8.1.5

2 6