- Devel - libvirt List Archives

[libvirt] [PATCH] lxc: completely rework reference counting
by Katerina Koukiou 24 May '16

24 May '16

This patch follows the pattern used in qemu driver regarding reference counting. It changes lxcDomObjFromDomain() to ref the domain (using virDomainObjListFindByUUIDRef()) and adds virDomainObjEndAPI() which should be the only function in which the return value of virObjectUnref() is checked. This makes all reference counting deterministic and makes the code a bit clearer. Signed-off-by: Katerina Koukiou <k.koukiou(a)gmail.com> --- src/lxc/lxc_domain.c | 16 +--- src/lxc/lxc_domain.h | 5 +- src/lxc/lxc_driver.c | 216 +++++++++++++++++++-------------------------------- 3 files changed, 85 insertions(+), 152 deletions(-) diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index bca2bb2..6fd5423 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -80,7 +80,7 @@ virLXCDomainObjFreeJob(virLXCDomainObjPrivatePtr priv) * in any way * * Upon successful return, the object will have its ref count increased, - * successful calls must be followed by EndJob eventually + * Successful calls must be followed by EndJob eventually */ int virLXCDomainObjBeginJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED, @@ -95,8 +95,6 @@ virLXCDomainObjBeginJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED, return -1; then = now + LXC_JOB_WAIT_TIME; - virObjectRef(obj); - while (priv->job.active) { VIR_DEBUG("Wait normal job condition for starting job: %s", virLXCDomainJobTypeToString(job)); @@ -126,23 +124,17 @@ virLXCDomainObjBeginJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED, else virReportSystemError(errno, "%s", _("cannot acquire job mutex")); - - virObjectUnref(obj); return -1; } /* - * obj must be locked before calling + * obj must be locked and have a reference before calling * * To be called after completing the work associated with the * earlier virLXCDomainBeginJob() call - * - * Returns true if the remaining reference count on obj is - * non-zero, false if the reference count has dropped to zero - * and obj is disposed. */ -bool +void virLXCDomainObjEndJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr obj) { @@ -154,8 +146,6 @@ virLXCDomainObjEndJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED, virLXCDomainObjResetJob(priv); virCondSignal(&priv->job.cond); - - return virObjectUnref(obj); } diff --git a/src/lxc/lxc_domain.h b/src/lxc/lxc_domain.h index e82c719..5c4f31e 100644 --- a/src/lxc/lxc_domain.h +++ b/src/lxc/lxc_domain.h @@ -102,10 +102,9 @@ virLXCDomainObjBeginJob(virLXCDriverPtr driver, enum virLXCDomainJob job) ATTRIBUTE_RETURN_CHECK; -bool +void virLXCDomainObjEndJob(virLXCDriverPtr driver, - virDomainObjPtr obj) - ATTRIBUTE_RETURN_CHECK; + virDomainObjPtr obj); #endif /* __LXC_DOMAIN_H__ */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 143089d..4aef78d 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -126,11 +126,11 @@ static virNWFilterCallbackDriver lxcCallbackDriver = { * lxcDomObjFromDomain: * @domain: Domain pointer that has to be looked up * - * This function looks up @domain and returns the appropriate - * virDomainObjPtr. + * This function looks up @domain and returns the appropriate virDomainObjPtr + * that has to be released by calling virDomainObjEndAPI. * - * Returns the domain object which is locked on success, NULL - * otherwise. + * Returns the domain object with incremented reference counter which is locked + * on success, NULL otherwise. */ static virDomainObjPtr lxcDomObjFromDomain(virDomainPtr domain) @@ -139,7 +139,7 @@ lxcDomObjFromDomain(virDomainPtr domain) virLXCDriverPtr driver = domain->conn->privateData; char uuidstr[VIR_UUID_STRING_BUFLEN]; - vm = virDomainObjListFindByUUID(driver->domains, domain->uuid); + vm = virDomainObjListFindByUUIDRef(driver->domains, domain->uuid); if (!vm) { virUUIDFormat(domain->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, @@ -283,7 +283,7 @@ static virDomainPtr lxcDomainLookupByUUID(virConnectPtr conn, virDomainObjPtr vm; virDomainPtr dom = NULL; - vm = virDomainObjListFindByUUID(driver->domains, uuid); + vm = virDomainObjListFindByUUIDRef(driver->domains, uuid); if (!vm) { char uuidstr[VIR_UUID_STRING_BUFLEN]; @@ -301,8 +301,7 @@ static virDomainPtr lxcDomainLookupByUUID(virConnectPtr conn, dom->id = vm->def->id; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return dom; } @@ -347,8 +346,7 @@ static int lxcDomainIsActive(virDomainPtr dom) ret = virDomainObjIsActive(obj); cleanup: - if (obj) - virObjectUnlock(obj); + virDomainObjEndAPI(&obj); return ret; } @@ -367,8 +365,7 @@ static int lxcDomainIsPersistent(virDomainPtr dom) ret = obj->persistent; cleanup: - if (obj) - virObjectUnlock(obj); + virDomainObjEndAPI(&obj); return ret; } @@ -386,8 +383,7 @@ static int lxcDomainIsUpdated(virDomainPtr dom) ret = obj->updated; cleanup: - if (obj) - virObjectUnlock(obj); + virDomainObjEndAPI(&obj); return ret; } @@ -492,13 +488,14 @@ lxcDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags) driver->xmlopt, 0, &oldDef))) goto cleanup; + + virObjectRef(vm); def = NULL; vm->persistent = 1; if (virDomainSaveConfig(cfg->configDir, driver->caps, vm->newDef ? vm->newDef : vm->def) < 0) { virDomainObjListRemove(driver->domains, vm); - vm = NULL; goto cleanup; } @@ -515,8 +512,7 @@ lxcDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags) cleanup: virDomainDefFree(def); virDomainDefFree(oldDef); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); if (event) virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(caps); @@ -566,14 +562,12 @@ static int lxcDomainUndefineFlags(virDomainPtr dom, vm->persistent = 0; } else { virDomainObjListRemove(driver->domains, vm); - vm = NULL; } ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); if (event) virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); @@ -628,8 +622,7 @@ static int lxcDomainGetInfo(virDomainPtr dom, ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -654,8 +647,7 @@ lxcDomainGetState(virDomainPtr dom, ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -674,8 +666,7 @@ static char *lxcDomainGetOSType(virDomainPtr dom) goto cleanup; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -695,8 +686,7 @@ lxcDomainGetMaxMemory(virDomainPtr dom) ret = virDomainDefGetMemoryActual(vm->def); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -790,12 +780,10 @@ static int lxcDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, ret = 0; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); virObjectUnref(cfg); return ret; @@ -940,12 +928,10 @@ lxcDomainSetMemoryParameters(virDomainPtr dom, ret = 0; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); virObjectUnref(cfg); return ret; @@ -1042,8 +1028,7 @@ lxcDomainGetMemoryParameters(virDomainPtr dom, ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); return ret; } @@ -1069,8 +1054,7 @@ static char *lxcDomainGetXMLDesc(virDomainPtr dom, virDomainDefFormatConvertXMLFlags(flags)); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -1166,12 +1150,10 @@ static int lxcDomainCreateWithFiles(virDomainPtr dom, } endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); if (event) virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); @@ -1301,13 +1283,11 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, dom->id = vm->def->id; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: virDomainDefFree(def); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); if (event) virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(caps); @@ -1390,8 +1370,7 @@ static int lxcDomainGetSecurityLabel(virDomainPtr dom, virSecurityLabelPtr secla ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -1568,12 +1547,10 @@ lxcDomainDestroyFlags(virDomainPtr dom, } endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); if (event) virObjectEventStateQueue(driver->domainEventState, event); return ret; @@ -1907,8 +1884,7 @@ static char *lxcDomainGetSchedulerType(virDomainPtr dom, ignore_value(VIR_STRDUP(ret, "posix")); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -2089,13 +2065,11 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom, ret = 0; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: virDomainDefFree(vmdef); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); virObjectUnref(cfg); return ret; @@ -2206,8 +2180,7 @@ lxcDomainGetSchedulerParametersFlags(virDomainPtr dom, ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); return ret; } @@ -2461,12 +2434,10 @@ lxcDomainBlockStats(virDomainPtr dom, &stats->wr_req); endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -2594,12 +2565,10 @@ lxcDomainBlockStatsFlags(virDomainPtr dom, *nparams = tmp; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -2809,12 +2778,10 @@ lxcDomainSetBlkioParameters(virDomainPtr dom, } endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); virObjectUnref(cfg); return ret; @@ -3209,8 +3176,7 @@ lxcDomainGetBlkioParameters(virDomainPtr dom, ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); return ret; } @@ -3258,12 +3224,10 @@ lxcDomainInterfaceStats(virDomainPtr dom, _("Invalid path, '%s' is not a known interface"), path); endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } #else @@ -3293,8 +3257,7 @@ static int lxcDomainGetAutostart(virDomainPtr dom, ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -3365,13 +3328,12 @@ static int lxcDomainSetAutostart(virDomainPtr dom, ret = 0; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); + cleanup: VIR_FREE(configFile); VIR_FREE(autostartLink); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; } @@ -3503,13 +3465,12 @@ static int lxcDomainSuspend(virDomainPtr dom) ret = 0; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); + cleanup: if (event) virObjectEventStateQueue(driver->domainEventState, event); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; } @@ -3559,13 +3520,12 @@ static int lxcDomainResume(virDomainPtr dom) ret = 0; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); + cleanup: if (event) virObjectEventStateQueue(driver->domainEventState, event); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; } @@ -3630,8 +3590,7 @@ lxcDomainOpenConsole(virDomainPtr dom, ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -3707,12 +3666,10 @@ lxcDomainSendProcessSignal(virDomainPtr dom, ret = 0; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -3814,12 +3771,10 @@ lxcDomainShutdownFlags(virDomainPtr dom, ret = 0; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -3899,12 +3854,10 @@ lxcDomainReboot(virDomainPtr dom, ret = 0; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -5208,15 +5161,14 @@ static int lxcDomainAttachDeviceFlags(virDomainPtr dom, } endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); + cleanup: virDomainDefFree(vmdef); if (dev != dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); virObjectUnref(cfg); return ret; @@ -5314,15 +5266,14 @@ static int lxcDomainUpdateDeviceFlags(virDomainPtr dom, } } endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); + cleanup: virDomainDefFree(vmdef); if (dev != dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); virObjectUnref(cfg); return ret; @@ -5419,15 +5370,14 @@ static int lxcDomainDetachDeviceFlags(virDomainPtr dom, } endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); + cleanup: virDomainDefFree(vmdef); if (dev != dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); virObjectUnref(cfg); return ret; @@ -5484,12 +5434,10 @@ static int lxcDomainLxcOpenNamespace(virDomainPtr dom, ret = nfds; endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -5586,11 +5534,10 @@ lxcDomainMemoryStats(virDomainPtr dom, } endjob: - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); + cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -5738,12 +5685,10 @@ lxcDomainSetMetadata(virDomainPtr dom, driver->xmlopt, cfg->stateDir, cfg->configDir, flags); - if (!virLXCDomainObjEndJob(driver, vm)) - vm = NULL; + virLXCDomainObjEndJob(driver, vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); virObjectUnref(cfg); return ret; @@ -5773,7 +5718,7 @@ lxcDomainGetMetadata(virDomainPtr dom, ret = virDomainObjGetMetadata(vm, type, uri, caps, driver->xmlopt, flags); cleanup: - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(caps); return ret; } @@ -5820,7 +5765,7 @@ lxcDomainGetCPUStats(virDomainPtr dom, ret = virCgroupGetPercpuStats(priv->cgroup, params, nparams, start_cpu, ncpus, NULL); cleanup: - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -5881,8 +5826,7 @@ lxcDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } -- 2.7.4

2 1

[libvirt] [PATCH] lxc: use job functions in lxcDomainLxcOpenNamespace & lxcDomainSendProcessSignal
by Katerina Koukiou 24 May '16

24 May '16

Use the recently added job functions in lxcDomainLxcOpenNamespace, lxcDomainSendProcessSignal. Signed-off-by: Katerina Koukiou <k.koukiou(a)gmail.com> --- src/lxc/lxc_driver.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 7cdea2c..143089d 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3642,6 +3642,7 @@ lxcDomainSendProcessSignal(virDomainPtr dom, unsigned int signum, unsigned int flags) { + virLXCDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm = NULL; virLXCDomainObjPrivatePtr priv; pid_t victim; @@ -3664,10 +3665,13 @@ lxcDomainSendProcessSignal(virDomainPtr dom, if (virDomainSendProcessSignalEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_MODIFY) < 0) + goto cleanup; + if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); - goto cleanup; + goto endjob; } /* @@ -3680,13 +3684,13 @@ lxcDomainSendProcessSignal(virDomainPtr dom, if (pid_value != 1) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("Only the init process may be killed")); - goto cleanup; + goto endjob; } if (!priv->initpid) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Init pid is not yet available")); - goto cleanup; + goto endjob; } victim = priv->initpid; @@ -3697,11 +3701,15 @@ lxcDomainSendProcessSignal(virDomainPtr dom, virReportSystemError(errno, _("Unable to send %d signal to process %d"), signum, victim); - goto cleanup; + goto endjob; } ret = 0; + endjob: + if (!virLXCDomainObjEndJob(driver, vm)) + vm = NULL; + cleanup: if (vm) virObjectUnlock(vm); @@ -5438,6 +5446,7 @@ static int lxcDomainLxcOpenNamespace(virDomainPtr dom, int **fdlist, unsigned int flags) { + virLXCDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm; virLXCDomainObjPrivatePtr priv; int ret = -1; @@ -5454,22 +5463,30 @@ static int lxcDomainLxcOpenNamespace(virDomainPtr dom, if (virDomainLxcOpenNamespaceEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_QUERY) < 0) + goto cleanup; + if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Domain is not running")); - goto cleanup; + goto endjob; } if (!priv->initpid) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Init pid is not yet available")); - goto cleanup; + goto endjob; } if (virProcessGetNamespaces(priv->initpid, &nfds, fdlist) < 0) - goto cleanup; + goto endjob; ret = nfds; + + endjob: + if (!virLXCDomainObjEndJob(driver, vm)) + vm = NULL; + cleanup: if (vm) virObjectUnlock(vm); -- 2.7.4

2 1

[libvirt] [PATCH v3 00/13] PCI Multifunction device hotplug support
by Shivaprasad G Bhat 24 May '16

24 May '16

V2 was posted here. http://www.redhat.com/archives/libvir-list/2016-May/msg01384.html Changes from V2: -Squashed the original patch 1 with the patch which actually enables multifunction hotplug as suggested. -As suggested, introduced the virDomainDeviceDefParseMany for parsing. -Retained the patch which validates the function address before releasing. I feel this should be retained as originally checks used to happen for slots. -Changed the assign address logic to simply decrementally assign function numbers to the devices in the list. The CONNECT_TYPE flags are yet to be explored. -Split the original patch 8 into multiple simpler patches for easier reading. The original motivation was to help introduce test cases for multifunction hotplug which is not possible for functions static in qemu_driver.c. So, moved the functions to qemu_domain.c and qemu_hotplug.c. Hopefully, the movements helps adding good number of test cases. V1 was posted here. http://www.redhat.com/archives/libvir-list/2016-May/msg01178.html Changes from V1 Fixed couple of issues in address validation and assignment. Added Rollback of the hotplug if anything fails in between. Removed Patch 6 completely as it exposed way too many bugs. Changed the approach a bit by introducing 2 new patches which take care of hostdevice preparation and help reverting. Todo: 1) Hardening the hotplug checks to disallow multifunction cards hotplug as though they are single function cards. 2) Documentation update. 3) Test cases. This is easier now with the helper functions moved out of qemu_driver.c 4) Should the events be delayed till all the functions are hotplugged/unplugged? Something can fail and the revert may not be possible Or the guest may refuse to free the device. If we show events for those which got free, the rest of them may never be freed and also that may not be usable by guest if the function 0 is not part of it. Need to think more on this. Any suggestions ? --- Shivaprasad G Bhat (13): Release address in function granularity than slot Validate address in virDomainPCIAddressReleaseAddr Introduce PCI Multifunction device parser Introduce virDomainPCIMultifunctionDeviceAddressAssign Separate the hostdevice preparation and checks to a new funtion Move the qemu[*]DomainDeviceConfig to qemu_domain.c Move qemuDomain[*]Live functions to qemu_hotplug.c Introduce qemuDomain*DeviceLiveInternal Introduce qemuDomain*DeviceConfigInternal Move the virDomainDefCompatibleDevice checks a level down Move the detach of PCI device to the beginnging of live hotplug Pass virDomainDeviceDefListPtr to hotplug functions Enable PCI Multifunction hotplug/unplug src/conf/domain_addr.c | 153 ++++++- src/conf/domain_addr.h | 4 src/conf/domain_conf.c | 123 +++++- src/conf/domain_conf.h | 19 + src/libvirt_private.syms | 5 src/qemu/qemu_domain.c | 460 +++++++++++++++++++++ src/qemu/qemu_domain.h | 17 + src/qemu/qemu_domain_address.c | 2 src/qemu/qemu_driver.c | 882 ++++++---------------------------------- src/qemu/qemu_hotplug.c | 625 ++++++++++++++++++++++++---- src/qemu/qemu_hotplug.h | 24 + 11 files changed, 1421 insertions(+), 893 deletions(-) -- Signature

2 17

[libvirt] [PATCH 00/10] update caps data for our tests
by Pavel Hrdina 24 May '16

24 May '16

To get replies from qemu the tests/qemucapsprobe tool was used with following QEMUs: qemu-1.2.2 and qemu-1.3.1 on Fedora18 qemu-1.4.2 and qemu-1.5.3 on Fedora19 qemu-1.6.0 on Fedora20 qemu-2.1.1 on Fedora21 qemu-2.4.0 and qemu-2.5.0 on Fedora23 qemu-2.6.0 on Fedora24 To get as much as possible dependencies I've used "yum-builddeb qemu", uninstalled "xen" packages and if it was missing installed "spice" packages. Pavel Hrdina (10): qemucapstest: update caps for qemu-1.2.2 qemucapstest: update caps for qemu-1.3.1 qemucapstest: update caps for qemu-1.4.2 qemucapstest: update caps for qemu-1.5.3 qemucapstest: update caps for qemu-1.6.0 qemucapstest: update caps for qemu-2.1.1 qemucapstest: update caps for qemu-2.4.0 qemucapstest: update caps for qemu-2.5.0 qemucapstest: update caps for qemu-2.6.0 qemucapstest: remove data for qemu-1.6.50 tests/domaincapsschemadata/qemu_1.6.0.x86_64.xml | 78 + tests/domaincapsschemadata/qemu_1.6.50.x86_64.xml | 78 - tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml | 2 +- tests/domaincapstest.c | 2 +- .../qemucapabilitiesdata/caps_1.2.2.x86_64.replies | 3483 ++++++------- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 2 - .../qemucapabilitiesdata/caps_1.3.1.x86_64.replies | 3943 ++++++++------- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 5 +- .../qemucapabilitiesdata/caps_1.4.2.x86_64.replies | 4050 +++++++-------- tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 5 +- .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 5245 ++++++++++---------- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 4 + .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 5244 +++++++++---------- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 5 +- .../caps_1.6.50.x86_64.replies | 2848 ----------- tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml | 199 - .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 665 +-- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 2 - .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 411 +- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 1587 +++--- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 14 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 1877 ++++--- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 33 +- tests/qemucapabilitiestest.c | 1 - 25 files changed, 13934 insertions(+), 15850 deletions(-) create mode 100644 tests/domaincapsschemadata/qemu_1.6.0.x86_64.xml delete mode 100644 tests/domaincapsschemadata/qemu_1.6.50.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.50.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml -- 2.8.2

2 21

[libvirt] [PATCH] nwfilter: fix lock order deadlock
by Maxim Nestratov 24 May '16

24 May '16

Below is backtraces of two deadlocked threads: thread #1: virDomainConfVMNWFilterTeardown virNWFilterTeardownFilter lock updateMutex <------------ _virNWFilterTeardownFilter try to lock interface <---------- thread #2: learnIPAddressThread lock interface <------- virNWFilterInstantiateFilterLate try to lock updateMutex <---------- The problem is fixed by unlocking interface before calling virNWFilterInstantiateFilterLate to avoid updateMutex and interface ordering deadlocks. Otherwise we are going to instantiate the filter while holding interface lock, which will try to lock updateMutex, and if some other thread instantiating a filter in parallel is holding updateMutex and is trying to lock interface, both will deadlock. Also it is safe to unlock interface before virNWFilterInstantiateFilterLate because learnIPAddressThread stopped capturing packets and applied necessary rules on the interface, while instantiating a new filter doesn't require a locked interface. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/nwfilter/nwfilter_learnipaddr.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 1adbadb..cfd92d9 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -611,6 +611,16 @@ learnIPAddressThread(void *arg) sa.data.inet4.sin_addr.s_addr = vmaddr; char *inetaddr; + /* It is necessary to unlock interface here to avoid updateMutex and + * interface ordering deadlocks. Otherwise we are going to + * instantiate the filter, which will try to lock updateMutex, and + * some other thread instantiating a filter in parallel is holding + * updateMutex and is trying to lock interface, both will deadlock. + * Also it is safe to unlock interface here because we stopped + * capturing and applied necessary rules on the interface, while + * instantiating a new filter doesn't require a locked interface.*/ + virNWFilterUnlockIface(req->ifname); + if ((inetaddr = virSocketAddrFormat(&sa)) != NULL) { if (virNWFilterIPAddrMapAddIPAddr(req->ifname, inetaddr) < 0) { VIR_ERROR(_("Failed to add IP address %s to IP address " @@ -636,11 +646,11 @@ learnIPAddressThread(void *arg) req->ifname, req->ifindex); techdriver->applyDropAllRules(req->ifname); + virNWFilterUnlockIface(req->ifname); } VIR_DEBUG("pcap thread terminating for interface %s", req->ifname); - virNWFilterUnlockIface(req->ifname); err_no_lock: virNWFilterDeregisterLearnReq(req->ifindex); -- 2.4.3

5 10

[libvirt] [PATCH] maint: fix syntax-check sc_prohibit_int_ijk exclude rule
by Pavel Hrdina 24 May '16

24 May '16

This fixes the "include/" path, we need to create a regex for the whole path because we are matching the whole line. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- I'm surprised that it even worked so far. I've noticed this after system update few days ago. cfg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfg.mk b/cfg.mk index c19f615..f688cbb 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1259,7 +1259,7 @@ exclude_file_name_regexp--sc_prohibit_include_public_headers_brackets = \ ^(tools/|examples/|include/libvirt/(virterror|libvirt(-(admin|qemu|lxc))?)\.h$$) exclude_file_name_regexp--sc_prohibit_int_ijk = \ - ^(src/remote_protocol-structs|src/remote/remote_protocol.x|cfg.mk|include/|src/admin_protocol-structs|src/admin/admin_protocol.x)$ + ^(src/remote_protocol-structs|src/remote/remote_protocol.x|cfg.mk|include/libvirt/libvirt.+|src/admin_protocol-structs|src/admin/admin_protocol.x)$$ exclude_file_name_regexp--sc_prohibit_getenv = \ ^tests/.*\.[ch]$$ -- 2.8.3

2 2

[libvirt] [PATCH 0/2] some build fixes
by Pavel Hrdina 24 May '16

24 May '16

Pavel Hrdina (2): qemuxml2argvtest: skip test that depends on gnutls_cipher_encrypt() makefile: fix build on systems where gnutls is not in /usr/include src/Makefile.am | 2 +- tests/qemuxml2argvtest.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) -- 2.8.2

2 7

[libvirt] [PATCH 0/2] Set PCI_PHYSICAL_FUNCTION flag more carefully
by Andrea Bolognani 24 May '16

24 May '16

If you're running libvirt master on a remote host, and connect to it using virt-manager, the remote daemon will crash. The same will happen if you run 'virsh nodedev-dumpxml' for a PCI device that happens *not* to be a virtual function. The first patch fixes the crash. The second one fixes something that could potentially cause trouble down the line, and also makes the code a tiny bit nicer. Andrea Bolognani (2): nodedev: sysfs: Set PCI_PHYSICAL_FUNCTION flag more carefully conf: nodedev: Set PCI_PHYSICAL_FUNCTION flag more carefully src/conf/node_device_conf.c | 4 ++-- src/node_device/node_device_linux_sysfs.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) -- 2.5.5

2 4

Re: [libvirt] [PATCH V2 2/4] libxl: support hotplug USB host device
by Jim Fehlig 24 May '16

24 May '16

On 05/23/2016 12:51 AM, Chun Yan Liu wrote: > > Yes, I think it's OK. And another place needs to be updated, since now it's > not only pci device, but also could be usb device, so the error message > should be updated. > if (virDomainHostdevFind(vmdef, hostdev, &found) >= 0) { > - pcisrc = &hostdev->source.subsys.u.pci; > virReportError(VIR_ERR_OPERATION_FAILED, > - _("target pci device %.4x:%.2x:%.2x.%.1x\ > - already exists"), > - pcisrc->addr.domain, pcisrc->addr.bus, > - pcisrc->addr.slot, pcisrc->addr.function); > + _("device already exists in domain configuration")); > return -1; > } Nice catch. I've squashed in the below diff, changing the error code and message to match the qemu driver. Regards, Jim diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 5b6f87a..4d7124d 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3293,7 +3293,6 @@ libxlDomainAttachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) virDomainNetDefPtr net; virDomainHostdevDefPtr hostdev; virDomainHostdevDefPtr found; - virDomainHostdevSubsysPCIPtr pcisrc; char mac[VIR_MAC_STRING_BUFLEN]; switch (dev->type) { @@ -3336,12 +3335,8 @@ libxlDomainAttachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) } if (virDomainHostdevFind(vmdef, hostdev, &found) >= 0) { - pcisrc = &hostdev->source.subsys.u.pci; - virReportError(VIR_ERR_OPERATION_FAILED, - _("target pci device %.4x:%.2x:%.2x.%.1x\ - already exists"), - pcisrc->addr.domain, pcisrc->addr.bus, - pcisrc->addr.slot, pcisrc->addr.function); + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("device is already in the domain configuration")); return -1; }

2 1

[libvirt] [PATCH v2 0/8] Replace VIR_ERROR with standard vir*Error in state driver init
by Jovanka Gulicoska 23 May '16

23 May '16

Replace VIR_ERROR logging macros for error reporting in driver startup routines with vir*Error function. Link to task: http://wiki.libvirt.org/page/BiteSizedTasks#Replace_VIR_ERROR_with_standard… Jovanka Gulicoska (8): uml: Replace VIR_ERROR with standard vir*Error in state driver init xen: Replace VIR_ERROR with standard vir*Error in state driver init bhyve: Replace VIR_ERROR with standard vir*Error in state driver init libxl: Replace VIR_ERROR with standard vir*Error in state driver init node_device: Replace VIR_ERROR with standard vir*Error in state driver init nwfilter: Replace VIR_ERROR with standard vir*Error in state driver init qemu: Replace VIR_ERROR with standard vir*Error in state driver init storage: Replace VIR_ERROR with standard vir*Error in state driver init src/bhyve/bhyve_driver.c | 4 +-- src/libxl/libxl_driver.c | 6 ++--- src/node_device/node_device_hal.c | 24 ++++++++++------- src/node_device/node_device_udev.c | 45 +++++++++++++++++++------------ src/nwfilter/nwfilter_driver.c | 5 ++-- src/qemu/qemu_driver.c | 55 ++++++++++++++++++++++++-------------- src/storage/storage_driver.c | 32 +++++++++++++--------- src/uml/uml_driver.c | 20 +++++++------- src/xen/xen_driver.c | 5 ++-- 9 files changed, 119 insertions(+), 77 deletions(-) -- 2.5.5

2 13

[libvirt] [PATCH] vz: add error code for case if vm is already stopped
by Mikhail Feoktistov 23 May '16

23 May '16

If try to stop VM or container which is already stopped than Virtuozzo 7 returns code PRL_ERR_INVALID_ACTION_REQUESTED. Error code PRL_ERR_DISP_VM_IS_NOT_STARTED is used in Virtuozzo 6 --- src/vz/vz_sdk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index a396d41..7eb78ca 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2050,6 +2050,7 @@ prlsdkDomainChangeStateLocked(vzDriverPtr driver, switch (pret) { case PRL_ERR_DISP_VM_IS_NOT_STARTED: case PRL_ERR_DISP_VM_IS_NOT_STOPPED: + case PRL_ERR_INVALID_ACTION_REQUESTED: virerr = VIR_ERR_OPERATION_INVALID; break; default: -- 1.8.3.1

2 1

[libvirt] [PATCH] qemu: don't refuse to undefine a guest with NVRAM file
by Daniel P. Berrange 23 May '16

23 May '16

The undefine operation should always be allowed to succeed regardless of whether any NVRAM file exists. ie we should not force the application to use the VIR_DOMAIN_UNDEFINE_NVRAM flag. It is valid for the app to decide it wants the NVRAM file left on disk, in the same way that disk images are left on disk at undefine. --- src/qemu/qemu_driver.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bec05d4..302bf48 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6985,19 +6985,13 @@ qemuDomainUndefineFlags(virDomainPtr dom, if (!virDomainObjIsActive(vm) && vm->def->os.loader && vm->def->os.loader->nvram && - virFileExists(vm->def->os.loader->nvram)) { - if (!(flags & VIR_DOMAIN_UNDEFINE_NVRAM)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot delete inactive domain with nvram")); - goto cleanup; - } - - if (unlink(vm->def->os.loader->nvram) < 0) { - virReportSystemError(errno, - _("failed to remove nvram: %s"), - vm->def->os.loader->nvram); - goto cleanup; - } + virFileExists(vm->def->os.loader->nvram) && + (flags & VIR_DOMAIN_UNDEFINE_NVRAM) && + (unlink(vm->def->os.loader->nvram) < 0)) { + virReportSystemError(errno, + _("failed to remove nvram: %s"), + vm->def->os.loader->nvram); + goto cleanup; } if (virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm) < 0) -- 2.1.0

6 17

Re: [libvirt] [PATCH] Oracle VirtualBox 5 support or libvirt
by Eric Blake 23 May '16

23 May '16

[the moderation queue rejected your message for being too large] On 12/31/1969 05:00 PM, wrote: > --- > src/Makefile.am | 1 + > src/vbox/vbox_CAPI_v5_0.h | 25550 ++++++++++++++++++++++++++++++++++++++++ That's an awfully large patch, particularly if it is mostly generated. Can you resend, with the patch as a compressed attachment, so that it can make it through the moderation queue? Is it something that can logically be broken to smaller pieces, or is it really an all-or-none addition of the new huge file? > src/vbox/vbox_V5_0.c | 13 + > src/vbox/vbox_common.h | 2 + > src/vbox/vbox_storage.c | 2 + > src/vbox/vbox_tmpl.c | 290 +- > src/vbox/vbox_uniformed_api.h | 1 + > 7 files changed, 25752 insertions(+), 107 deletions(-) > create mode 100644 src/vbox/vbox_CAPI_v5_0.h > create mode 100644 src/vbox/vbox_V5_0.c > > diff --git a/src/Makefile.am b/src/Makefile.am > index 314f6df..4a7b85f 100644 > --- a/src/Makefile.am > +++ b/src/Makefile.am > @@ -783,6 +783,7 @@ VBOX_DRIVER_SOURCES = \ > vbox/vbox_V4_2_20.c vbox/vbox_CAPI_v4_2_20.h \ > vbox/vbox_V4_3.c vbox/vbox_CAPI_v4_3.h \ > vbox/vbox_V4_3_4.c vbox/vbox_CAPI_v4_3_4.h \ > + vbox/vbox_V5_0.c vbox/vbox_CAPI_v5_0.h \ > vbox/vbox_common.c vbox/vbox_common.h \ > vbox/vbox_uniformed_api.h \ > vbox/vbox_get_driver.h \ > diff --git a/src/vbox/vbox_CAPI_v5_0.h b/src/vbox/vbox_CAPI_v5_0.h > new file mode 100644 > index 0000000..b296733 > --- /dev/null > +++ b/src/vbox/vbox_CAPI_v5_0.h > @@ -0,0 +1,25550 @@ > +/* > + * Libvirt notice: this file is derived from the VirtualBox SDK, with > + * libvirt edits (fixing preprocessor indentation by cppi); do not > + * regenerate in the context of libvirt. > + */ > +/* > + * DO NOT EDIT! This is a generated file. > + * > + * Header file which provides C declarations for VirtualBox Main API > + * (COM interfaces), generated from XIDL (XML interface definition). > + * On Windows (which uses COM instead of XPCOM) the native C support > + * is used, and most of this file is not used. > + * > + * Source : src/VBox/Main/idl/VirtualBox.xidl > + * Generator : src/VBox/Main/cbinding/capiidl.xsl > + * > + * This file contains portions from the following Mozilla XPCOM files: > + * xpcom/include/xpcom/nsID.h > + * xpcom/include/nsIException.h > + * xpcom/include/nsprpub/prtypes.h > + * xpcom/include/xpcom/nsISupportsBase.h > + * > + * These files were originally triple-licensed (MPL/GPL2/LGPL2.1). Oracle > + * elects to distribute this derived work under the LGPL2.1 only. > + */ > + > +/* > + * Copyright (C) 2008-2015 Oracle Corporation > + * > + * This file is part of a free software library; you can redistribute > + * it and/or modify it under the terms of the GNU Lesser General > + * Public License version 2.1 as published by the Free Software > + * Foundation and shipped in the "COPYING.LESSER" file with this library. > + * The library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY of any kind. > + * > + * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if > + * any license choice other than GPL or LGPL is available it will > + * apply instead, Oracle elects to use only the Lesser General Public > + * License version 2.1 (LGPLv2) at this time for any software where > + * a choice of LGPL license versions is made available with the > + * language indicating that LGPLv2 or any later version may be used, > + * or where a choice of which version of the LGPL is applied is > + * otherwise unspecified. > + */ Bummer that the license is restrictive against GPLv3, but no worse than any of the other files in the same directory, so not your problem. > height, bitsPerPixel, > xOrigin, yOrigin); > -#endif /* VBOX_API_VERSION >= 4003000 */ > +#else /*VBOX_API_VERSION >= 5000000 */ > + PRUint32 gms; > + > + return display->vtbl->GetScreenResolution(display, screenId, width, > + height, bitsPerPixel, > + xOrigin, yOrigin, &gms); > +#endif /* VBOX_API_VERSION >= 5000000 */ > + > } > > static nsresult > @@ -4357,10 +4433,10 @@ _displayTakeScreenShotPNGToArray(IDisplay *display ATTRIBUTE_UNUSED, > PRUint32 *screenDataSize ATTRIBUTE_UNUSED, > PRUint8** screenData ATTRIBUTE_UNUSED) > { > -#if VBOX_API_VERSION < 4000000 > +#if VBOX_API_VERSION < 4000000 || VBOX_API_VERSION >= 5000000 > vboxUnsupported(); > return 0; > -#else /* VBOX_API_VERSION >= 4000000 */ > +#else /* VBOX_API_VERSION >= 4000000 && VBOX_API_VERSION < 5000000 */ > return display->vtbl->TakeScreenShotPNGToArray(display, screenId, width, > height, screenDataSize, > screenData); > diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h > index a469968..74e9ac0 100644 > --- a/src/vbox/vbox_uniformed_api.h > +++ b/src/vbox/vbox_uniformed_api.h > @@ -628,5 +628,6 @@ void vbox42InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); > void vbox42_20InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); > void vbox43InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); > void vbox43_4InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); > +void vbox50InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); > > #endif /* VBOX_UNIFORMED_API_H */ >

1 0

[libvirt] [PATCH v2 00/32] Introduce sparse streams
by Michal Privoznik 23 May '16

23 May '16

v2 of: https://www.redhat.com/archives/libvir-list/2016-April/msg01869.html diff to v1: - Reworked public API side of the feature. Event approach is no longer used. Instead I've implemented synchronous APIs as Dan suggested. You can find the code at my github repo too: https://github.com/zippy2/libvirt/tree/sparse_streams2 BTW: here is a measurement I made: homer libvirt.git # time ./tools/virsh -c qemu+tcp://lisa/system vol-download /mnt/cdrom/dummy.img /tmp/dummy.img real 3m9.178s user 0m32.978s sys 1m7.758s homer libvirt.git # time ./tools/virsh -c qemu+tcp://lisa/system vol-download --sparse /mnt/cdrom/dummy.img /tmp/dummy.img real 0m1.409s user 0m0.017s sys 0m1.042s masina libvirt.git # ls -lhs /tmp/dummy.img 4.0K -rw-r--r-- 1 root root 21G May 23 17:53 /tmp/dummy.img Michal Privoznik (32): Introduce virStreamRecvFlags Implement virStreamRecvFlags to some drivers Introduce virStreamSkip Introduce virStreamHoleSize Introduce VIR_STREAM_RECV_STOP_AT_HOLE flag Introduce virStreamSparseRecvAll Introduce virStreamSparseSendAll Introduce virStreamInData virNetClientStreamNew: Track origin stream Track if stream is skippable RPC: Introduce virNetStreamSkip Introduce VIR_NET_STREAM_SKIP message type Teach wireshark plugin about VIR_NET_STREAM_SKIP daemon: Introduce virNetServerProgramSendStreamSkip virnetclientstream: Introduce virNetClientStreamSendSkip daemon: Implement VIR_NET_STREAM_SKIP handling virnetclientstream: Introduce virNetClientStreamHandleSkip remote_driver: Implement virStreamSkip virNetClientStreamRecvPacket: Introduce @flags argument Introduce virNetClientStreamHoleSize remote: Implement virStreamHoleSize virNetClientStream: Wire up VIR_NET_STREAM_SKIP remote_driver: Implement VIR_STREAM_RECV_STOP_AT_HOLE daemonStreamHandleRead: Wire up seekable stream fdstream: Implement seek gendispatch: Introduce @sparseflag for our calls Introduce virStorageVol{Download,Upload}Flags virsh: Implement sparse stream to vol-download virsh: Implement sparse stream to vol-upload daemon: Don't call virStreamInData so often fdstream: Suppress use of IO helper for sparse streams storage: Enable sparse streams for virStorageVol{Download,Upload} daemon/remote.c | 2 +- daemon/stream.c | 147 +++++++++++- daemon/stream.h | 3 +- include/libvirt/libvirt-storage.h | 9 + include/libvirt/libvirt-stream.h | 86 ++++++- src/driver-stream.h | 23 ++ src/esx/esx_stream.c | 16 +- src/fdstream.c | 117 ++++++++- src/libvirt-storage.c | 4 +- src/libvirt-stream.c | 454 +++++++++++++++++++++++++++++++++++ src/libvirt_internal.h | 3 + src/libvirt_private.syms | 1 + src/libvirt_public.syms | 10 + src/libvirt_remote.syms | 3 + src/remote/remote_driver.c | 89 ++++++- src/remote/remote_protocol.x | 2 + src/rpc/gendispatch.pl | 21 +- src/rpc/virnetclient.c | 1 + src/rpc/virnetclientstream.c | 203 +++++++++++++++- src/rpc/virnetclientstream.h | 17 +- src/rpc/virnetprotocol.x | 16 +- src/rpc/virnetserverprogram.c | 33 +++ src/rpc/virnetserverprogram.h | 7 + src/storage/storage_backend.c | 6 +- src/storage/storage_driver.c | 4 +- src/virnetprotocol-structs | 4 + tools/virsh-volume.c | 49 ++-- tools/virsh.c | 93 +++++++ tools/virsh.h | 17 ++ tools/virsh.pod | 6 +- tools/wireshark/src/packet-libvirt.c | 40 +++ tools/wireshark/src/packet-libvirt.h | 2 + 32 files changed, 1419 insertions(+), 69 deletions(-) -- 2.8.3

1 32

[libvirt] [PATCH 0/2] Fix a couple of recently found coverity issues
by John Ferlan 23 May '16

23 May '16

John Ferlan (2): qemu: Remove dead code lxc: Fix lxcDomainDestroyFlags endjob processing src/lxc/lxc_driver.c | 8 ++++---- src/qemu/qemu_domain_address.c | 14 +++++--------- 2 files changed, 9 insertions(+), 13 deletions(-) -- 2.5.5

3 4

[libvirt] [PATCH v2 0/8] PCI Multifunction device hotplug support
by Shivaprasad G Bhat 23 May '16

23 May '16

V1 was posted here. http://www.redhat.com/archives/libvir-list/2016-May/msg01178.html Changes from V1 Fixed couple of issues in address validation and assignment. Added Rollback of the hotplug if anything fails in between. Removed Patch 6 completely as it exposed way too many bugs. Changed the approach a bit by introducing 2 new patches which take care of hostdevice preparation and help reverting. Todo: 1) Hardening the hotplug checks to disallow multifunction cards hotplug as though they are single function cards. 2) Documentation update. 3) Test cases. 4) Should the events be delayed till all the functions are hotplugged/unplugged? Something can fail and the revert may not be possible Or the guest may refuse to free the device. If we show events for those which got free, the rest of them may never be freed and also that may not be usable by guest if the function 0 is not part of it. Need to think more on this. Any suggestions ? --- Shivaprasad G Bhat (8): Revert "prevent hot unplugging multi function PCI device" Release address in function granularity than slot Validate address in virDomainPCIAddressReleaseAddr Introduce PCI Multifunction device parser Introduce virDomainPCIMultifunctionDeviceAddressAssign Separate the hostdevice preparation and checks to a new funtion Move the detach of PCI device to the beginnging of live hotplug Enable PCI Multifunction hotplug/unplug src/conf/domain_addr.c | 239 ++++++++++++++++++++++++++++-- src/conf/domain_addr.h | 4 src/conf/domain_conf.c | 236 +++++++++++++++++++++++++++++ src/conf/domain_conf.h | 22 +++ src/libvirt_private.syms | 5 + src/qemu/qemu_domain_address.c | 2 src/qemu/qemu_driver.c | 321 ++++++++++++++++++++++++++++++++-------- src/qemu/qemu_hotplug.c | 161 ++++++++------------ src/qemu/qemu_hotplug.h | 5 + 9 files changed, 818 insertions(+), 177 deletions(-) -- Signature

4 24

[libvirt] [PATCH] storage: do not clear vols before volume upload
by Ján Tomko 23 May '16

23 May '16

Commit 5e54361c added virStoragePoolObjClearVols before refreshPool to prevent duplicate volume entries. However it is not needed here because we're not refreshing the pool yet, just checking for the existence of the refresh callback. The actual refresh is done via virStorageVolFDStreamCloseCb in virStorageVolPoolRefreshThread, which already calls virStoragePoolObjClearVols. --- src/storage/storage_driver.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index ce31e38..eb5f688 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2353,15 +2353,14 @@ storageVolUpload(virStorageVolPtr obj, /* If we have a refreshPool, use the callback routine in order to * refresh the pool after the volume upload stream closes. This way * we make sure the volume and pool data are refreshed without user * interaction and we can just lookup the backend in the callback * routine in order to call the refresh API. */ - virStoragePoolObjClearVols(pool); if (backend->refreshPool) { if (VIR_ALLOC(cbdata) < 0 || VIR_STRDUP(cbdata->pool_name, pool->def->name) < 0) goto cleanup; if (vol->target.type == VIR_STORAGE_VOL_PLOOP && VIR_STRDUP(cbdata->vol_path, vol->target.path) < 0) goto cleanup; -- 2.7.3

2 2

[libvirt] [PATCH 0/9] Deprecate more unused QEMU_CAPS
by Ján Tomko 23 May '16

23 May '16

Cleaning up after QEMU_CAPS_DEVICE I noticed QEMU_CAPS_DRIVE_READONLY depends on it and QEMU_CAPS_PCIDEVICE did not really matter. Ján Tomko (9): qemu_command: assume QEMU_CAPS_DEVICE qemu: assume QEMU_CAPS_DEVICE almost everywhere tests: remove disk-drive-fat test tests: remove <readonly/> from IDE disks tests: always assume QEMU_CAPS_DRIVE_READONLY qemu: always assume QEMU_CAPS_DRIVE_READONLY Deprecate QEMU_CAPS_DRIVE_READONLY Deprecate QEMU_CAPS_DEVICE Deprecate QEMU_CAPS_PCIDEVICE src/qemu/qemu_capabilities.c | 46 +-- src/qemu/qemu_capabilities.h | 6 +- src/qemu/qemu_command.c | 425 ++++++--------------- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_domain.c | 6 +- src/qemu/qemu_domain.h | 1 - src/qemu/qemu_hostdev.c | 4 +- src/qemu/qemu_hotplug.c | 61 +-- src/qemu/qemu_process.c | 8 +- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 2 - tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 2 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 2 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 2 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 2 - tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml | 2 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 2 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 2 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 - .../caps_2.6.0-gicv2.aarch64.xml | 2 - .../caps_2.6.0-gicv3.aarch64.xml | 2 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 2 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 - tests/qemuhelptest.c | 45 +-- tests/qemuhotplugtest.c | 2 - .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 3 +- .../qemuxml2argv-boot-complex-bootindex.args | 3 +- .../qemuxml2argv-boot-complex.args | 3 +- ...xml2argv-boot-menu-disable-drive-bootindex.args | 3 +- .../qemuxml2argv-boot-menu-disable-drive.args | 3 +- .../qemuxml2argv-boot-menu-disable.args | 3 +- ...qemuxml2argv-boot-menu-enable-with-timeout.args | 3 +- .../qemuxml2argv-boot-menu-enable.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-boot-order.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-boot-strict.args | 3 +- .../qemuxml2argv-controller-order.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 2 +- .../qemuxml2argv-disk-blockio.args | 3 +- .../qemuxml2argv-disk-cdrom-empty.args | 2 +- .../qemuxml2argv-disk-cdrom-network-ftp.args | 2 +- .../qemuxml2argv-disk-cdrom-network-ftps.args | 2 +- .../qemuxml2argv-disk-cdrom-network-http.args | 2 +- .../qemuxml2argv-disk-cdrom-network-https.args | 2 +- .../qemuxml2argv-disk-cdrom-network-tftp.args | 2 +- ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 2 +- .../qemuxml2argv-disk-cdrom-tray.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 3 +- .../qemuxml2argv-disk-copy_on_read.args | 2 +- .../qemuxml2argv-disk-drive-boot-cdrom.args | 2 +- .../qemuxml2argv-disk-drive-boot-disk.args | 2 +- .../qemuxml2argv-disk-drive-cache-directsync.args | 2 +- .../qemuxml2argv-disk-drive-cache-unsafe.args | 2 +- .../qemuxml2argv-disk-drive-cache-v2-none.args | 2 +- .../qemuxml2argv-disk-drive-cache-v2-wb.args | 2 +- .../qemuxml2argv-disk-drive-cache-v2-wt.args | 2 +- .../qemuxml2argv-disk-drive-discard.args | 2 +- ...uxml2argv-disk-drive-error-policy-enospace.args | 2 +- .../qemuxml2argv-disk-drive-error-policy-stop.args | 2 +- ...gv-disk-drive-error-policy-wreport-rignore.args | 2 +- .../qemuxml2argv-disk-drive-fat.args | 22 -- .../qemuxml2argv-disk-drive-fat.xml | 31 -- .../qemuxml2argv-disk-drive-fmt-qcow.args | 2 +- .../qemuxml2argv-disk-drive-no-boot.args | 2 +- .../qemuxml2argv-disk-drive-shared.args | 2 +- .../qemuxml2argv-disk-ide-drive-split.args | 3 +- .../qemuxml2argv-disk-ioeventfd.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-order.args | 2 +- .../qemuxml2argv-disk-scsi-disk-split.args | 6 +- .../qemuxml2argv-disk-scsi-disk-vpd.args | 6 +- .../qemuxml2argv-disk-scsi-disk-wwn.args | 3 +- .../qemuxml2argv-disk-snapshot.args | 2 +- .../qemuxml2argv-disk-source-pool-mode.args | 5 +- .../qemuxml2argv-disk-source-pool.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 2 +- .../qemuxml2argv-floppy-drive-fat.args | 2 +- .../qemuxml2argv-graphics-spice-timeout.args | 2 +- .../qemuxml2argv-hugepages-numa.args | 2 +- .../qemuxml2argv-pci-autoadd-addr.args | 3 +- .../qemuxml2argv-pci-autoadd-idx.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-pci-many.args | 3 +- .../qemuxml2argv-seclabel-dynamic-override.xml | 1 - tests/qemuxml2argvtest.c | 43 +-- .../qemuxml2xmlout-seclabel-dynamic-override.xml | 1 - tests/qemuxml2xmltest.c | 2 - 85 files changed, 246 insertions(+), 631 deletions(-) delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml -- 2.7.3

2 12

Re: [libvirt] [PATCH] libxl: add .domainInterfaceAddresses
by Jim Fehlig 23 May '16

23 May '16

Chun Yan Liu wrote: > >>>> On 5/14/2016 at 07:47 AM, in message <5736677D.8030209(a)suse.com>, Jim Fehlig > <jfehlig(a)suse.com> wrote: >> On 05/13/2016 12:21 AM, Chunyan Liu wrote: >>> Add .domainInterfaceAddresses so that user can have a way to >>> get domain interface address by 'virsh domifaddr'. Currently >>> it only supports '--source lease'. >>> >>> Signed-off: Chunyan Liu <cyliu(a)suse.com> >>> --- >>> src/libxl/libxl_driver.c | 140 >> +++++++++++++++++++++++++++++++++++++++++++++++ >>> 1 file changed, 140 insertions(+) >>> >>> diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c >>> index 062d6f8..f2bd6fa 100644 >>> --- a/src/libxl/libxl_driver.c >>> +++ b/src/libxl/libxl_driver.c >>> @@ -5425,6 +5425,145 @@ static int libxlNodeGetSecurityModel(virConnectPtr >> conn, >>> return 0; >>> } >>> >>> +static int >>> +libxlGetDHCPInterfaces(virDomainPtr dom, >>> + virDomainObjPtr vm, >>> + virDomainInterfacePtr **ifaces) >>> +{ >>> + int rv = -1; >>> + int n_leases = 0; >>> + size_t i, j; >>> + size_t ifaces_count = 0; >>> + virNetworkPtr network = NULL; >>> + char macaddr[VIR_MAC_STRING_BUFLEN]; >>> + virDomainInterfacePtr iface = NULL; >>> + virNetworkDHCPLeasePtr *leases = NULL; >>> + virDomainInterfacePtr *ifaces_ret = NULL; >>> + >>> + if (!dom->conn->networkDriver || >>> + !dom->conn->networkDriver->networkGetDHCPLeases) { >>> + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", >>> + _("Network driver does not support DHCP lease >> query")); >>> + return -1; >>> + } >>> + >>> + for (i = 0; i < vm->def->nnets; i++) { >>> + if (vm->def->nets[i]->type != VIR_DOMAIN_NET_TYPE_NETWORK) >>> + continue; >>> + >>> + virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr); >>> + virObjectUnref(network); >>> + network = virNetworkLookupByName(dom->conn, >>> + vm->def->nets[i]->data.network.name); >>> + >>> + if ((n_leases = virNetworkGetDHCPLeases(network, macaddr, >>> + &leases, 0)) < 0) >>> + goto error; >>> + >>> + if (n_leases) { >>> + if (VIR_EXPAND_N(ifaces_ret, ifaces_count, 1) < 0) >>> + goto error; >>> + >>> + if (VIR_ALLOC(ifaces_ret[ifaces_count - 1]) < 0) >>> + goto error; >>> + >>> + iface = ifaces_ret[ifaces_count - 1]; >>> + /* Assuming each lease corresponds to a separate IP */ >>> + iface->naddrs = n_leases; >>> + >>> + if (VIR_ALLOC_N(iface->addrs, iface->naddrs) < 0) >>> + goto error; >>> + >>> + if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0) >>> + goto cleanup; >>> + >>> + if (VIR_STRDUP(iface->hwaddr, macaddr) < 0) >>> + goto cleanup; >>> + } >>> + >>> + for (j = 0; j < n_leases; j++) { >>> + virNetworkDHCPLeasePtr lease = leases[j]; >>> + virDomainIPAddressPtr ip_addr = &iface->addrs[j]; >>> + >>> + if (VIR_STRDUP(ip_addr->addr, lease->ipaddr) < 0) >>> + goto cleanup; >>> + >>> + ip_addr->type = lease->type; >>> + ip_addr->prefix = lease->prefix; >>> + } >>> + >>> + for (j = 0; j < n_leases; j++) >>> + virNetworkDHCPLeaseFree(leases[j]); >>> + >>> + VIR_FREE(leases); >>> + } >>> + >>> + *ifaces = ifaces_ret; >>> + ifaces_ret = NULL; >>> + rv = ifaces_count; >>> + >>> + cleanup: >>> + virObjectUnref(network); >>> + if (leases) { >>> + for (i = 0; i < n_leases; i++) >>> + virNetworkDHCPLeaseFree(leases[i]); >>> + } >>> + VIR_FREE(leases); >>> + >>> + return rv; >>> + >>> + error: >>> + if (ifaces_ret) { >>> + for (i = 0; i < ifaces_count; i++) >>> + virDomainInterfaceFree(ifaces_ret[i]); >>> + } >>> + VIR_FREE(ifaces_ret); >>> + >>> + goto cleanup; >>> +} >> >> It's unfortunate this is a copy-paste from the qemu driver. The code is not >> trivial and any bug fixes in one copy could be missed in the other. A lot of >> the >> function is domain related, so probably can't be abstracted further to the >> network code. Have you considered approaches that allow the drivers to share >> this code? > > Well, it can be extracted and placed in bridge_driver.c as networkGetDHCPInterfaces, > but I don't know if that is acceptable? Hmm, maybe something like networkGetDHCPLeasesAll() is a better name. Regardless of the name, I see that other functions in bridge_driver.c take a virDomainDefPtr, so maybe extracting the code to bridge_driver.c is acceptable. Laine (cc'd) is generally regarded as the libvirt networking expert :-). Let's see if he has an opinion. Regards, Jim

3 2

[libvirt] [PATCH] util: compilation fix if build without GNUTLS library
by Mikhail Feoktistov 22 May '16

22 May '16

--- src/util/vircrypto.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c index 5183d49..4f288f0 100644 --- a/src/util/vircrypto.c +++ b/src/util/vircrypto.c @@ -24,6 +24,7 @@ #include "virlog.h" #include "virerror.h" #include "viralloc.h" +#include "virrandom.h" #include "md5.h" #include "sha256.h" @@ -220,14 +221,14 @@ virCryptoEncryptDataAESgnutls(gnutls_cipher_algorithm_t gnutls_enc_alg, */ int virCryptoEncryptData(virCryptoCipher algorithm, - uint8_t *enckey, + uint8_t *enckey ATTRIBUTE_UNUSED, size_t enckeylen, - uint8_t *iv, + uint8_t *iv ATTRIBUTE_UNUSED, size_t ivlen, - uint8_t *data, - size_t datalen, - uint8_t **ciphertext, - size_t *ciphertextlen) + uint8_t *data ATTRIBUTE_UNUSED, + size_t datalen ATTRIBUTE_UNUSED, + uint8_t **ciphertext ATTRIBUTE_UNUSED, + size_t *ciphertextlen ATTRIBUTE_UNUSED) { switch (algorithm) { case VIR_CRYPTO_CIPHER_AES256CBC: -- 1.8.3.1

4 3

[libvirt] [PATCH 0/4] Couple of random and crypto adjustments
by John Ferlan 22 May '16

22 May '16

Patches 1&2 alter the virRandomBytes to accomodate the lone holdout code that was using /dev/urandom directly to add a range of bytes that are acceptible returns for the caller. Patches 3&4 modify the virCryptoEncryptData algorithm to "A" (hopefully) build right in a non gnutls environment and "B" make it so there future adjustments won't be doing cut, copy, & paste based on the key size and whether the iv is required. If AES192CBC were added the first two parameters to the DO_CRYPT macro would be 24, 16, while AES192CBC would have 16, 16. John Ferlan (4): util: Add range parameters to virRandomBytes storage: Use virRandomBytes for virStorageGenerateQcowPassphrase util: Alter virCryptoEncryptData for non GNUTLS builds util: Adjust virCryptoEncryptData code to use macros src/storage/storage_backend.c | 10 +++-- src/util/vircrypto.c | 88 +++++++++++++++++++++++++---------------- src/util/virrandom.c | 13 ++++-- src/util/virrandom.h | 3 +- src/util/virstorageencryption.c | 42 +++++++------------- src/util/virstorageencryption.h | 4 +- src/util/viruuid.c | 2 +- tests/qemuxml2argvmock.c | 2 +- tests/vircryptotest.c | 4 +- tests/virrandommock.c | 10 +++-- tests/virrandomtest.c | 32 +++++++++++---- 11 files changed, 124 insertions(+), 86 deletions(-) -- 2.5.5

1 4

[libvirt] [PATCH] tests: Allow multiple mock libraries
by Peter Krempa 20 May '16

20 May '16

Make virtTestMain take variable number of libraries to mock. --- tests/testutils.c | 11 ++++++++--- tests/testutils.h | 10 +++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index 9180e86..f4fbad2 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <stdlib.h> +#include <stdarg.h> #include <sys/time.h> #include <sys/types.h> #include <sys/stat.h> @@ -842,9 +843,11 @@ virTestSetEnvPath(void) int virtTestMain(int argc, char **argv, - const char *lib, - int (*func)(void)) + int (*func)(void), + ...) { + const char *lib; + va_list ap; int ret; char *testRange = NULL; #ifdef TEST_OOM @@ -854,8 +857,10 @@ int virtTestMain(int argc, if (getenv("VIR_TEST_FILE_ACCESS")) VIRT_TEST_PRELOAD(TEST_MOCK); - if (lib) + va_start(ap, func); + while ((lib = va_arg(ap, const char *))) VIRT_TEST_PRELOAD(lib); + va_end(ap); progname = last_component(argv[0]); if (STRPREFIX(progname, "lt-")) diff --git a/tests/testutils.h b/tests/testutils.h index d1caf20..c892902 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -102,13 +102,13 @@ const char *virtTestCounterNext(void); int virtTestMain(int argc, char **argv, - const char *lib, - int (*func)(void)); + int (*func)(void), + ...); /* Setup, then call func() */ # define VIRT_TEST_MAIN(func) \ int main(int argc, char **argv) { \ - return virtTestMain(argc, argv, NULL, func); \ + return virtTestMain(argc, argv, func, NULL); \ } # define VIRT_TEST_PRELOAD(lib) \ @@ -131,9 +131,9 @@ int virtTestMain(int argc, } \ } while (0) -# define VIRT_TEST_MAIN_PRELOAD(func, lib) \ +# define VIRT_TEST_MAIN_PRELOAD(func, ...) \ int main(int argc, char **argv) { \ - return virtTestMain(argc, argv, lib, func); \ + return virtTestMain(argc, argv, func, __VA_ARGS__, NULL); \ } virCapsPtr virTestGenericCapsInit(void); -- 2.8.2

3 2

[libvirt] [PATCH] Replace VIR_ERROR with standard vir*Error in state driver init
by Jovanka Gulicoska 20 May '16

20 May '16

Replace VIR_ERROR logging macros for error reporting in driver startup routines with vir*Error function. Link to task: http://wiki.libvirt.org/page/BiteSizedTasks#Replace_VIR_ERROR_with_standard… Jovanka Gulicoska (1): Replace VIR_ERROR with standard vir*Error in state driver init src/bhyve/bhyve_driver.c | 5 +++-- src/libxl/libxl_driver.c | 6 ++--- src/lxc/lxc_driver.c | 2 +- src/node_device/node_device_hal.c | 19 ++++++++-------- src/node_device/node_device_udev.c | 32 +++++++++++++------------- src/nwfilter/nwfilter_driver.c | 4 ++-- src/qemu/qemu_driver.c | 43 ++++++++++++++++++----------------- src/storage/storage_driver.c | 46 +++++++++++++++++++------------------- src/uml/uml_driver.c | 21 ++++++++--------- src/xen/xen_driver.c | 5 +++-- 10 files changed, 95 insertions(+), 88 deletions(-) -- 2.5.5

2 2

[libvirt] [PATCH 0/4] auto-assign controller indexes
by Laine Stump 20 May '16

20 May '16

The purpose of this series is just to eliminate the need to "count indexes" when adding controllers. Patch 4/4 is the meat of this series. 2/4 and 3/4 are code movement to enable 4/4, and 1/4 is a small code simplification that I noticed while testing the rest. Laine Stump (4): qemu: simplify addition of USB controller in qemuParseCommandLine conf/qemu: make IS_USB2_CONTROLLER globally available conf: make virDomainControllerFindUnusedIndex() more generally usable conf: permit auto-assignment of controller indexes docs/schemas/domaincommon.rng | 8 ++-- src/conf/domain_conf.c | 92 ++++++++++++++++++++++++++++++++++++------ src/conf/domain_conf.h | 7 ++++ src/qemu/qemu_domain_address.c | 7 ---- src/qemu/qemu_parse_command.c | 8 +--- 5 files changed, 92 insertions(+), 30 deletions(-) -- 2.5.5

2 13

[libvirt] [PATCH v3 0/2] qemu: parse: Introduce qemuParseCommandLineMem
by Nishith Shah 20 May '16

20 May '16

This series moves the parsing of qemu -m memory into a separate function and adds suffix support for the -m option. The first patch introduces the function qemuParseCommandLineMem, and the second patch handles suffixes for the -m values and adds a test for the same. Nishith Shah (2): qemu: parse: Use qemuParseCommandLineMem for -m memory qemu: parse: Handle suffixes for -m memory src/qemu/qemu_parse_command.c | 35 ++++++++++++++++---- tests/qemuargv2xmldata/qemuargv2xml-mem-scale.args | 22 +++++++++++++ tests/qemuargv2xmldata/qemuargv2xml-mem-scale.xml | 37 ++++++++++++++++++++++ tests/qemuargv2xmltest.c | 1 + 4 files changed, 88 insertions(+), 7 deletions(-) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-mem-scale.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-mem-scale.xml -- 2.1.4

2 4

[libvirt] [PATCH v5 0/6] Add AES Secret Object support (for RBD only)
by John Ferlan 20 May '16

20 May '16

This is a combination of two series... The first 2 patches are a followon to (v1 from yesterday): http://www.redhat.com/archives/libvir-list/2016-May/msg01396.html But there really were a offshoot of the original AES/IV Secret changes (v4): http://www.redhat.com/archives/libvir-list/2016-May/msg01292.html Hopefully I haven't forgotten anything along the way. There's been numerous adjustments and changes along the way. Patch 1 is a combination with adjustments of patches 1&2 from v1. This should make virRandomBytes available in the virrandommock library which then is used in later patches. Patch 2 mostly adjust names, comments, adds #ifdef's for unavailable code This patch will make use of the virrandommock library instead of self-populating the enc_alg and iv_buf. Mainly because it's possible, but also since it's the basis for later patches to utilize the same virrandommock library. Patch 3 splits out the existing qemuDomainGenerateRandomKey into a vircrypto.c API. The vircrypto.c was chosen over virrandom.c because virrandom.c ends up being included in setuid_rpc_client and it wasn't overly clear that it was desired to drag in all of gnutls for just this one mock function. Patch 4 splits out the qemuDomainSecretSetup as was suggested in one review Patch 5 is new to handle the ability to have more than one mock library to preload from a VIRT_TEST_MAIN_PRELOAD macro. As it turns out the qemuxml2argvtest will need not only the qemuxml2argvmock, but also the virrandommock libraries. I went with comma separated, but a "space" separated list is fine with me too. Patch 6 is the remainder of the v4 of the original series. Splitting it up with ATTRIBUTE_UNUSED markers just no longer made sense. Lots of changes here to keep up with the previous patches, but also to adjust error messages, variable/API names, etc. Also changed were the secret alias (leading to adjustments in each of the .args file for the secret alias. Along the way I also had to adjust the expected encoded ciphertext and iv since the mock algorithm changed from all 0xff to an increasing sequence starting at 0x00 through the length of the buffer. John Ferlan (6): tests: Add mock for virRandomBytes util: Introduce encryption APIs util: Introduce virCryptoGenerateRandom qemu: Introduce qemuDomainSecretSetup tests: Allow comma separate list of libs to preload qemu: Utilize qemu secret objects for RBD auth/secret configure.ac | 1 + src/libvirt_private.syms | 3 + src/qemu/qemu_alias.c | 23 ++ src/qemu/qemu_alias.h | 2 + src/qemu/qemu_command.c | 117 ++++++++++- src/qemu/qemu_domain.c | 200 +++++++++++++----- src/util/vircrypto.c | 233 ++++++++++++++++++++- src/util/vircrypto.h | 22 +- tests/Makefile.am | 12 ++ ...muxml2argv-disk-drive-network-rbd-auth-AES.args | 31 +++ ...emuxml2argv-disk-drive-network-rbd-auth-AES.xml | 42 ++++ tests/qemuxml2argvmock.c | 16 ++ tests/qemuxml2argvtest.c | 5 +- tests/testutils.c | 12 +- tests/vircryptotest.c | 100 ++++++++- tests/virrandommock.c | 39 ++++ tests/virrandomtest.c | 86 ++++++++ 17 files changed, 879 insertions(+), 65 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.xml create mode 100644 tests/virrandommock.c create mode 100644 tests/virrandomtest.c -- 2.5.5

2 16

[libvirt] VirtualBox 5 support
by Martin Pietsch 20 May '16

20 May '16

Dear libvirt-developer-team, I want to manage virtual machine of VirtualBox with libvirt. In a test I found out, that VirtualBox 5 is not support by the current version of libvirt. For this reason I have added this support in the source code. Now I want to commit these changes to the libvirt project, but I do not know, if there are any interests. Who can help me? Best Regards Martin -- Martin Pietsch Technische Univeristät Dresden Fakultät Mathematik und Naturwissenschaften / Fachrichtung Mathematik Besucheranschrift Willersbau, C-Flügel (Anbau), Raum C 232 Zellescher Weg 12-14 01069 Dresden Postanschrift Technische Universität Dresden Fachrichtung Mathematik 01062 Dresden Telefon +49-351-463 32646 Fax +49-351-463 37114 E-Mail martin.pietsch(a)tu-dresden.de

5 4

[libvirt] [PATCH 0/3] Couple of virtestmock fixes
by Michal Privoznik 20 May '16

20 May '16

Behold! This is not a trivial patch set and you will need a lot of courage to review it. Sorry. I hadn't had a nice time writing the patches neither. Michal Privoznik (3): tests: Drop VIR_MOCK_CALL_STAT virtestmock: Mock stat() properly tests: Link virtestmock with probes cfg.mk | 3 ++ configure.ac | 1 + tests/Makefile.am | 1 + tests/vircgroupmock.c | 14 +++---- tests/virmock.h | 23 ----------- tests/virpcimock.c | 19 ++++----- tests/virtestmock.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++-- 7 files changed, 124 insertions(+), 43 deletions(-) -- 2.8.1

2 6

[libvirt] [PATCH 0/2] qemu: reject invalid video accel* settings
by Cole Robinson 20 May '16

20 May '16

This series adds a couple checks for invalid video accel* settings, incase users screw up their XML when trying to enable spice GL Cole Robinson (2): qemu: command: Error if accel3d isn't supported for non-virtio qemu: command: Explicitly error if accel2d specified src/qemu/qemu_command.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) -- 2.7.4

2 4

[libvirt] [PATCH v4 00/14] improve graphics listen configuration
by Pavel Hrdina 20 May '16

20 May '16

The first 8 patches are cleanups and refactors of the graphics code. 9th patch introduces listen type socket and updates VNC graphics to use that new listen type. Patches 10 and 11 implements listen type socket for SPICE graphics and patch 12 adds spice_auto_unix_socket config option into qemu.conf. The last two patches introduces and implements new listen type none for VNC and SPICE graphics. The listen type none and socket are required to enable OpenGL support for SPICE graphics. Changes in v4: - removed the port patch that will be posted later as separate patch series - reordered some patches and added some more cleanups Changes in v3: - add listen type none support for vnc - fix issues pointed out in v2 Changes in v2: - don't remove vnc_auto_unix_socket from qemu.conf - add spice_auto_unix_socket Pavel Hrdina (14): qemu_domain: add a empty listen type address if we remove socket for VNC tests: cleanup vnc auto socket test graphics: rename gListen to glisten domain_conf: introduce virDomainGraphicsAddListenAddr qemu_command: move sasl parameter after port and addr definition graphics: resolve address for listen type network in qemu_process qemu_process: separate graphics socket and address generation qemu_command: refactor spice channel code graphics: introduce listen type socket and use it for VNC qemu_capabilites: add QEMU_CAPS_SPICE_UNIX spice: add support for listen type socket spice: introduce spice_auto_unix_socket config option spice: introduce listen type none vnc: add support for listen type none docs/formatdomain.html.in | 28 ++ docs/schemas/domaincommon.rng | 15 + src/conf/domain_conf.c | 314 ++++++++++++++++----- src/conf/domain_conf.h | 8 +- src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 16 +- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 17 +- src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 276 ++++++++---------- src/qemu/qemu_conf.c | 1 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 34 ++- src/qemu/qemu_hotplug.c | 9 + src/qemu/qemu_migration.c | 49 +++- src/qemu/qemu_parse_command.c | 2 +- src/qemu/qemu_process.c | 130 +++++++-- src/qemu/test_libvirtd_qemu.aug.in | 1 + src/security/virt-aa-helper.c | 15 +- src/vbox/vbox_common.c | 10 +- src/vmx/vmx.c | 8 +- src/vz/vz_sdk.c | 8 +- src/xenconfig/xen_common.c | 14 +- src/xenconfig/xen_sxpr.c | 16 +- src/xenconfig/xen_xl.c | 8 +- ...ric-graphics-vnc-socket-attr-listen-address.xml | 30 ++ ...hics-vnc-socket-attr-listen-socket-mismatch.xml | 30 ++ ...eric-graphics-vnc-socket-attr-listen-socket.xml | 30 ++ ...ric-graphics-vnc-socket-attr-listen-address.xml | 30 ++ ...eric-graphics-vnc-socket-attr-listen-socket.xml | 30 ++ .../generic-graphics-vnc-socket-listen.xml | 4 +- .../generic-graphics-vnc-socket.xml | 4 +- tests/genericxml2xmltest.c | 4 + .../qemuargv2xml-graphics-vnc-socket.xml | 4 +- ...emuxml2argv-graphics-spice-auto-socket-cfg.args | 20 ++ ...qemuxml2argv-graphics-spice-auto-socket-cfg.xml | 30 ++ .../qemuxml2argv-graphics-spice-auto-socket.args | 20 ++ .../qemuxml2argv-graphics-spice-auto-socket.xml | 30 ++ .../qemuxml2argv-graphics-spice-sasl.args | 2 +- .../qemuxml2argv-graphics-spice-socket.args | 20 ++ .../qemuxml2argv-graphics-spice-socket.xml | 30 ++ .../qemuxml2argv-graphics-vnc-auto-socket-cfg.args | 22 ++ .../qemuxml2argv-graphics-vnc-auto-socket-cfg.xml | 34 +++ .../qemuxml2argv-graphics-vnc-auto-socket.args | 20 ++ .../qemuxml2argv-graphics-vnc-auto-socket.xml | 30 ++ .../qemuxml2argv-graphics-vnc-autosocket.args | 22 -- .../qemuxml2argv-graphics-vnc-autosocket.xml | 34 --- .../qemuxml2argv-graphics-vnc-none.args | 20 ++ .../qemuxml2argv-graphics-vnc-none.xml | 30 ++ ...2argv-graphics-vnc-remove-generated-socket.args | 22 ++ ...l2argv-graphics-vnc-remove-generated-socket.xml | 34 +++ .../qemuxml2argv-graphics-vnc-socket.args | 4 +- .../qemuxml2argv-graphics-vnc-socket.xml | 10 +- .../qemuxml2argv-video-virtio-gpu-spice-gl.args | 2 +- tests/qemuxml2argvtest.c | 18 ++ ...muxml2xmlout-graphics-spice-auto-socket-cfg.xml | 35 +++ .../qemuxml2xmlout-graphics-spice-auto-socket.xml | 35 +++ .../qemuxml2xmlout-graphics-spice-socket.xml | 35 +++ ...qemuxml2xmlout-graphics-vnc-auto-socket-cfg.xml | 41 +++ .../qemuxml2xmlout-graphics-vnc-auto-socket.xml | 35 +++ .../qemuxml2xmlout-graphics-vnc-autosocket.xml | 39 --- ...graphics-vnc-remove-generated-socket-active.xml | 41 +++ ...aphics-vnc-remove-generated-socket-inactive.xml | 41 +++ .../qemuxml2xmlout-graphics-vnc-socket.xml | 35 +++ .../qemuxml2xmlout-video-virtio-gpu-spice-gl.xml | 4 +- tests/qemuxml2xmltest.c | 20 +- 67 files changed, 1530 insertions(+), 439 deletions(-) create mode 100644 tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-address.xml create mode 100644 tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket-mismatch.xml create mode 100644 tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket.xml create mode 100644 tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-address.xml create mode 100644 tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-socket.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket-cfg.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket-cfg.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-socket.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-socket.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket-cfg.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket-cfg.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.xml delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-autosocket.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-autosocket.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-none.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-none.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-remove-generated-socket.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-remove-generated-socket.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-auto-socket-cfg.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-auto-socket.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-socket.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-auto-socket-cfg.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-auto-socket.xml delete mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-autosocket.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-remove-generated-socket-active.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-remove-generated-socket-inactive.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-socket.xml -- 2.8.2

3 27

[libvirt] [PATCH] cpu: Add support for clflushopt and tsc_adjust Intel features
by Alexander Burluka 20 May '16

20 May '16

Corresponding QEMU commits: clflushopt f7fda280948a5e74aeb076ef346b991ecb173c56 tsc_adjust 7b458bfd12a71b3da6b531daedc417492c9334e0 Signed-off-by: Alexander Burluka <aburluka(a)virtuozzo.com> --- src/cpu/cpu_map.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 0b6d424..08aded2 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -293,6 +293,9 @@ <feature name='fsgsbase'> <cpuid function='0x00000007' ebx='0x00000001'/> </feature> + <feature name='tsc_adjust'> + <cpuid function='0x00000007' ebx='0x00000002'/> + </feature> <feature name='bmi1'> <cpuid function='0x00000007' ebx='0x00000008'/> </feature> @@ -332,6 +335,9 @@ <feature name='smap'> <cpuid function='0x00000007' ebx='0x00100000'/> </feature> + <feature name='clflushopt'> + <cpuid function='0x00000007' ebx='0x00800000'/> + </feature> <feature name='avx512pf'>  <cpuid function='0x00000007' ebx='0x04000000'/> </feature> -- 1.8.3.1

2 4

[libvirt] Process to upstream new driver for proprietary hypervisor?
by Scott Bissett 20 May '16

20 May '16

Hello, I am currently implementing a libvirt driver for my company's proprietary custom hypervisor. I have used the VMware driver as a design template, since it is interfacing a closed-source hypervisor as well. Ultimately, as we approach a minimally-usable implementation, we would like to upstream our driver mods to libvirt source. What is the process to do so? This is all new to me and my organization. For some brief background info, I am maintaining a git repo of our new code, plus ed scripts to modify libvirt source files. I am using quilt to create patches which are given to dpkg-buildpackage to create our own .deb packages. (I am working on Ubuntu at the moment; soon I will try to address repackaging rpms for CentOS). I appreciate any tips, pointers, suggestions, etc.

3 2

[libvirt] RFC: what are the requirements to domain id
by Nikolay Shirokovskiy 20 May '16

20 May '16

Hi, all. Domain id is somewhat required feature for hypervisors: virsh list prints them by default and active/inactive distinction is based on this id value analysys. But other than -1 is reserved for inactive domains there is no further requirements for it, one can happily keep them 0 for active domains. Looks like some drivers use process pids for this purpose. Qemu driver use its own incrementing counter and domain ids endure libvirtd restart. Vz do not provide a suitable value so the question arises can some simple id implementation be good enough? By simple I mean to keep counter as long as daemon lives and do not introduce any additional persistent state. As I said before there is basically no option to not to support it. A more profound question is what is this id for? How it is supposed to be used? Nikolay

4 5

[libvirt] [PATCH 0/3] RFC: qemu: drop vioserialaddr cache
by Cole Robinson 20 May '16

20 May '16

qemuDomainObjPrivate caches three lists of device addresses: virDomainPCIAddressSetPtr pciaddrs; virDomainCCWAddressSetPtr ccwaddrs; virDomainVirtioSerialAddrSetPtr vioserialaddrs; Yet I can't quite tell what issue they fix... they are only used at hotplug time for checking for address collisions, however it appears that we can generate those lists on demand from the runtime XML, which contains all the info we need. In truth I only looked deeply at the vioserialaddrs list... perhaps PCI has more to it. But at least for virtio serial it looks like this caching can be dropped. CCing jtomko who originally added it If this is acceptable, dropping all the caching will be a step towards unifying all uses of qemuDomainAssignAddresses, rather than sprinkling around a dozen call sites throughout the code. Also (again if this is acceptable), there's more cleanup to do here, dropping some now unused code in domain_addr Cole Robinson (3): domain: Add virDomainVirtioSerialAddrSetCreateFromDomain qemu: hotplug: generate vioserial address list on demand qemu: remove vioserialaddr cache src/conf/domain_addr.c | 35 ++++++++++++++++++++++++++++++++--- src/conf/domain_addr.h | 7 ++----- src/libvirt_private.syms | 3 +-- src/qemu/qemu_domain.c | 1 - src/qemu/qemu_domain.h | 1 - src/qemu/qemu_domain_address.c | 28 +++------------------------- src/qemu/qemu_hotplug.c | 37 +++++++++++++++++++++++++------------ src/qemu/qemu_process.c | 2 -- 8 files changed, 63 insertions(+), 51 deletions(-) -- 2.7.4

3 6

[libvirt] [PATCH] Add Skylake Cpu Model
by Eli Qiao 20 May '16

20 May '16

Add Skylake Cpu model to cpu maps to let libvirt discover host Skylake cpu model correctly. Currently, libvirt still think a Skylake cpu as Broadwell-noTSX Signed-off-by: Eli Qiao <liyong.qiao(a)intel.com> --- src/cpu/cpu_map.xml | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 0b6d424..228851d 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -347,6 +347,21 @@ <cpuid function='0x80000007' edx='0x00000100'/> </feature> +  + <feature name='xsaveopt'> + <cpuid function='0xd' eax='0x00000001'/> + </feature> + <feature name='xsavec'> + <cpuid function='0xd' eax='0x00000002'/> + </feature> + <feature name='xgetbv1'> + <cpuid function='0xd' eax='0x00000004'/> + </feature> + <feature name='xsaves' migratable='no'> + <cpuid function='0xd' eax='0x00000008'/> + </feature> + +  <model name='486'> <feature name='fpu'/> @@ -1137,6 +1152,67 @@ <feature name='xsave'/> </model> + <model name='Skylake'> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='invpcid'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='movbe'/> + <feature name='mpx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pcid'/> + <feature name='pclmuldq'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='tsc-deadline'/> + <feature name='x2apic'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + </model> + +  <model name='athlon'> <vendor name='AMD'/> -- 1.9.1

3 3

[libvirt] [PATCH v2 0/7] cpuGetModels: Create a NULL-terminated list
by Jiri Denemark 20 May '16

20 May '16

The list of CPU models is freed using virStringFreeList, which expects the list to by NULL-terminated. Jiri Denemark (7): cpu_x86: Use array of models in CPU map cpu_x86: Use array of vendors in CPU map cpu_x86: Use array of features in CPU map cpu_ppc64: Use array of vendors in CPU map cpu_ppc64: Use array of models in CPU map cpu: Rework CPU map loading cpu: Fix documentation of cpuGetModels src/cpu/cpu.c | 2 +- src/cpu/cpu_map.c | 21 +- src/cpu/cpu_map.h | 2 + src/cpu/cpu_ppc64.c | 216 +++++------ src/cpu/cpu_x86.c | 395 +++++++++++---------- tests/cputestdata/x86-baseline-3-expanded.xml | 62 ++-- tests/cputestdata/x86-baseline-4-expanded.xml | 80 ++--- tests/cputestdata/x86-baseline-4-result.xml | 18 +- tests/cputestdata/x86-baseline-5-expanded.xml | 80 ++--- tests/cputestdata/x86-baseline-5-result.xml | 8 +- tests/cputestdata/x86-baseline-6-migratable.xml | 8 +- tests/cputestdata/x86-baseline-6-result.xml | 10 +- .../cputestdata/x86-host+guest,model486-result.xml | 62 ++-- .../x86-host+guest,models,Penryn-result.xml | 14 +- .../x86-host+guest,models,qemu64-result.xml | 14 +- tests/cputestdata/x86-host+guest,models-result.xml | 14 +- tests/cputestdata/x86-host+guest-result.xml | 10 +- ...6-host+host+host-model,models,Penryn-result.xml | 28 +- tests/cputestdata/x86-host+min.xml | 26 +- tests/cputestdata/x86-host+pentium3.xml | 46 +-- .../x86-host+strict-force-extra-result.xml | 28 +- ...aswell-noTSX+Haswell,haswell,Haswell-result.xml | 2 +- ...+Haswell-noTSX,haswell,Haswell-noTSX-result.xml | 2 +- .../x86-host-better+pentium3,core2duo-result.xml | 32 +- .../x86-host-better+pentium3,pentium3-result.xml | 50 +-- .../x86-host-better+pentium3-result.xml | 26 +- tests/cputestdata/x86-host-worse+guest-result.xml | 6 +- .../qemuxml2argv-cpu-Haswell2.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 2 +- .../qemuxml2argv-cpu-exact2-nofallback.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 2 +- .../qemuxml2argv-cpu-host-model-fallback.args | 4 +- .../qemuxml2argv-cpu-host-model-vendor.args | 4 +- .../qemuxml2argv-cpu-host-model.args | 4 +- .../qemuxml2argv-cpu-minimum1.args | 4 +- .../qemuxml2argv-cpu-minimum2.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 2 +- .../qemuxml2argv-graphics-spice-timeout.args | 4 +- 38 files changed, 658 insertions(+), 638 deletions(-) -- 2.8.2

2 9

[libvirt] [PATCH] docs: fix <spice><gl enable> since version
by Ján Tomko 20 May '16

20 May '16

The support was added by commit 937ebba which was released in 1.3.3. --- Pushed as trivial. docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 1336c82..1333796 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5267,7 +5267,7 @@ qemu-kvm -net nic,model=? /dev/null Spice may provide accelerated server-side rendering with OpenGL. You can enable or disable OpenGL support explicitly with the <code>gl</code> element, by setting the <code>enable</code> - property. (QEMU only, since 1.3.2). + property. (QEMU only, since 1.3.3). </dd> <dt><code>rdp</code></dt> -- 2.7.3

1 0

[libvirt] [PATCH 0/7] More QEMU_CAPS_DEVICE cleanups
by Ján Tomko 20 May '16

20 May '16

While looking at Laine's patches I found uses of ADDRESS_TYPE_PCI in functions that are only called on !QEMU_CAPS_DEVICE (i.e. never). Then I cleaned up some more code until I remembered Cole already started doing that. So I included the only patch I could apply easily. Cole Robinson (1): qemu: process: Drop !QEMU_CAPS_DEVICE code Ján Tomko (6): Remove qemuProcessInitPCIAddresses with dependencies qemu: always add -nodefaults Remove DISK_BUS_XEN support from qemuBuildDiskDriveCommandLine Assume QEMU_CAPS_DEVICE in qemuBuildDiskDriveCommandLine Introduce qemuDiskBusNeedsDeviceArg Do not mask QEMU_CAPS_DEVICE in qemuBuildDriveStr src/qemu/qemu_command.c | 90 ++-- src/qemu/qemu_monitor.c | 15 - src/qemu/qemu_monitor.h | 10 - src/qemu/qemu_monitor_json.c | 9 - src/qemu/qemu_monitor_json.h | 3 - src/qemu/qemu_monitor_text.c | 126 ------ src/qemu/qemu_monitor_text.h | 3 - src/qemu/qemu_process.c | 463 ++------------------- .../qemuargv2xmldata/qemuargv2xml-disk-xenvbd.args | 25 -- .../qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml | 51 --- tests/qemuargv2xmltest.c | 1 - .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 26 -- .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml | 47 --- tests/qemuxml2argvtest.c | 1 - .../qemuxml2xmlout-disk-xenvbd.xml | 51 --- tests/qemuxml2xmltest.c | 1 - 16 files changed, 48 insertions(+), 874 deletions(-) delete mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.args delete mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml delete mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-xenvbd.xml -- 2.7.3

2 11

[libvirt] [PATCH v3 1/1] perf: add support to perf event for MBM
by Qiaowei Ren 20 May '16

20 May '16

Some Intel processor families (e.g. the Intel Xeon processor E5 v3 family) introduced some RDT (Resource Director Technology) features to monitor or control shared resource. Among these features, MBM (Memory Bandwidth Monitoring), which is build on the CMT (Cache Monitoring Technology) infrastructure, provides OS/VMM a way to monitor bandwidth from one level of cache to another. With current perf framework, this patch adds support to perf event for MBM. Signed-off-by: Qiaowei Ren <qiaowei.ren(a)intel.com> --- include/libvirt/libvirt-domain.h | 26 ++++++++++++++++- src/libvirt-domain.c | 12 ++++++++ src/qemu/qemu_driver.c | 41 +++++++++++++++++++------- src/util/virperf.c | 63 ++++++++++++++++++++++++---------------- src/util/virperf.h | 2 ++ 5 files changed, 108 insertions(+), 36 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 160f20f..27ed29a 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -1900,10 +1900,34 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); /** * VIR_PERF_PARAM_CMT: * - * Macro for typed parameter name that represents CMT perf event. + * Macro for typed parameter name that represents CMT perf event + * which can be used to measure the usage of cache (bytes) by + * applications running on the platform. It corresponds to the + * "perf.cmt" field in the *Stats APIs. */ # define VIR_PERF_PARAM_CMT "cmt" +/** + * VIR_PERF_PARAM_MBMT: + * + * Macro for typed parameter name that represents MBMT perf event + * which can be used to monitor total system bandwidth (bytes/s) + * from one level of cache to another. It corresponds to the + * "perf.mbmt" field in the *Stats APIs. + + */ +# define VIR_PERF_PARAM_MBMT "mbmt" + +/** + * VIR_PERF_PARAM_MBML: + * + * Macro for typed parameter name that represents MBML perf event + * which can be used to monitor the amount of data (bytes/s) sent + * through the memory controller on the socket. It corresponds to + * the "perf.mbml" field in the *Stats APIs. + */ +# define VIR_PERF_PARAM_MBML "mbml" + int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, int *nparams, diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 4f473c9..73ae369 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11441,6 +11441,18 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * "block.<num>.physical" - physical size in bytes of the container of the * backing image as unsigned long long. * + * VIR_DOMAIN_STATS_PERF: Return perf event statistics. + * The typed parameter keys are in this format: + * "perf.cmt" - the usage of l3 cache (bytes) by applications running on the + * platform as unsigned long long. It is produced by cmt perf + * event. + * "perf.mbmt" - the total system bandwidth (bytes/s) from one level of cache + * to another as unsigned long long. It is produced by mbmt perf + * event. + * "perf.mbml" - the amount of data (bytes/s) sent through the memory controller + * on the socket as unsigned long long. It is produced by mbml + * perf event. + * * Note that entire stats groups or individual stat fields may be missing from * the output in case they are not supported by the given hypervisor, are not * applicable for the current state of the guest domain, or their retrieval diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c4c4968..670f620 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10051,6 +10051,8 @@ qemuDomainSetPerfEvents(virDomainPtr dom, if (virTypedParamsValidate(params, nparams, VIR_PERF_PARAM_CMT, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_MBMT, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_MBML, VIR_TYPED_PARAM_BOOLEAN, NULL) < 0) return -1; @@ -19494,24 +19496,38 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, #undef QEMU_ADD_COUNT_PARAM +#define QEMU_ADD_PERF_PARAM_ULL(record, maxparams, name, value) \ +do { \ + char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \ + snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, \ + "perf.%s", name); \ + if (virTypedParamsAddULLong(&(record)->params, \ + &(record)->nparams, \ + maxparams, \ + param_name, \ + value) < 0) \ + goto cleanup; \ +} while (0) + static int -qemuDomainGetStatsPerfCmt(virPerfPtr perf, +qemuDomainGetStatsPerfRdt(virPerfPtr perf, + virPerfEventType type, virDomainStatsRecordPtr record, int *maxparams) { - uint64_t cache = 0; + uint64_t value = 0; - if (virPerfReadEvent(perf, VIR_PERF_EVENT_CMT, &cache) < 0) + if (virPerfReadEvent(perf, type, &value) < 0) return -1; - if (virTypedParamsAddULLong(&record->params, - &record->nparams, - maxparams, - "perf.cache", - cache) < 0) - return -1; + QEMU_ADD_PERF_PARAM_ULL(record, maxparams, + virPerfEventTypeToString(type), + value); return 0; + + cleanup: + return -1; } static int @@ -19531,7 +19547,10 @@ qemuDomainGetStatsPerf(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, switch (i) { case VIR_PERF_EVENT_CMT: - if (qemuDomainGetStatsPerfCmt(priv->perf, record, maxparams) < 0) + case VIR_PERF_EVENT_MBMT: + case VIR_PERF_EVENT_MBML: + if (qemuDomainGetStatsPerfRdt(priv->perf, i, + record, maxparams) < 0) goto cleanup; break; } @@ -19543,6 +19562,8 @@ qemuDomainGetStatsPerf(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, return ret; } +#undef QEMU_ADD_PERF_PARAM_ULL + typedef int (*qemuDomainGetStatsFunc)(virQEMUDriverPtr driver, virDomainObjPtr dom, diff --git a/src/util/virperf.c b/src/util/virperf.c index bd65587..450b3ba 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -38,7 +38,7 @@ VIR_LOG_INIT("util.perf"); #define VIR_FROM_THIS VIR_FROM_PERF VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, - "cmt"); + "cmt", "mbmt", "mbml"); struct virPerfEvent { int type; @@ -110,10 +110,10 @@ virPerfGetEvent(virPerfPtr perf, } static int -virPerfCmtEnable(virPerfEventPtr event, +virPerfRdtEnable(virPerfEventPtr event, pid_t pid) { - struct perf_event_attr cmt_attr; + struct perf_event_attr rdt_attr; char *buf = NULL; char *tmp = NULL; unsigned int event_type, scale; @@ -127,32 +127,42 @@ virPerfCmtEnable(virPerfEventPtr event, if (virStrToLong_ui(buf, NULL, 10, &event_type) < 0) { virReportSystemError(errno, "%s", - _("failed to get cmt event type")); + _("failed to get rdt event type")); goto error; } VIR_FREE(buf); - if (virFileReadAll("/sys/devices/intel_cqm/events/llc_occupancy.scale", - 10, &buf) < 0) - goto error; + memset(&rdt_attr, 0, sizeof(rdt_attr)); + rdt_attr.size = sizeof(rdt_attr); + rdt_attr.type = event_type; + rdt_attr.inherit = 1; + rdt_attr.disabled = 1; + rdt_attr.enable_on_exec = 0; - if (virStrToLong_ui(buf, NULL, 10, &scale) < 0) { - virReportSystemError(errno, "%s", - _("failed to get cmt scaling factor")); - goto error; + switch (event->type) { + case VIR_PERF_EVENT_CMT: + if (virFileReadAll("/sys/devices/intel_cqm/events/llc_occupancy.scale", + 10, &buf) < 0) + goto error; + + if (virStrToLong_ui(buf, NULL, 10, &scale) < 0) { + virReportSystemError(errno, "%s", + _("failed to get cmt scaling factor")); + goto error; + } + event->efields.cmt.scale = scale; + + rdt_attr.config = 1; + break; + case VIR_PERF_EVENT_MBMT: + rdt_attr.config = 2; + break; + case VIR_PERF_EVENT_MBML: + rdt_attr.config = 3; + break; } - event->efields.cmt.scale = scale; - - memset(&cmt_attr, 0, sizeof(cmt_attr)); - cmt_attr.size = sizeof(cmt_attr); - cmt_attr.type = event_type; - cmt_attr.config = 1; - cmt_attr.inherit = 1; - cmt_attr.disabled = 1; - cmt_attr.enable_on_exec = 0; - - event->fd = syscall(__NR_perf_event_open, &cmt_attr, pid, -1, -1, 0); + event->fd = syscall(__NR_perf_event_open, &rdt_attr, pid, -1, -1, 0); if (event->fd < 0) { virReportSystemError(errno, _("Unable to open perf type=%d for pid=%d"), @@ -161,8 +171,9 @@ virPerfCmtEnable(virPerfEventPtr event, } if (ioctl(event->fd, PERF_EVENT_IOC_ENABLE) < 0) { - virReportSystemError(errno, "%s", - _("Unable to enable perf event for CMT")); + virReportSystemError(errno, + _("Unable to enable perf event for %s"), + virPerfEventTypeToString(event->type)); goto error; } @@ -186,7 +197,9 @@ virPerfEventEnable(virPerfPtr perf, switch (type) { case VIR_PERF_EVENT_CMT: - if (virPerfCmtEnable(event, pid) < 0) + case VIR_PERF_EVENT_MBMT: + case VIR_PERF_EVENT_MBML: + if (virPerfRdtEnable(event, pid) < 0) return -1; break; case VIR_PERF_EVENT_LAST: diff --git a/src/util/virperf.h b/src/util/virperf.h index 8ec8753..769e85a 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -26,6 +26,8 @@ typedef enum { VIR_PERF_EVENT_CMT, + VIR_PERF_EVENT_MBMT, + VIR_PERF_EVENT_MBML, VIR_PERF_EVENT_LAST } virPerfEventType; -- 1.9.1

3 2

[libvirt] [PATCH] tests: nodeinfotest: Remove virSaveLastError() usage
by Cole Robinson 19 May '16

19 May '16

It's overkill here, we can use virGetLast* instead --- tests/nodeinfotest.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index d8eace5..03500fb 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -44,10 +44,8 @@ linuxTestCompareFiles(char *sysfs_prefix, memset(&nodeinfo, 0, sizeof(nodeinfo)); if (linuxNodeInfoCPUPopulate(sysfs_prefix, cpuinfo, arch, &nodeinfo) < 0) { if (virTestGetDebug()) { - virErrorPtr error = virSaveLastError(); - if (error && error->code != VIR_ERR_OK) - VIR_TEST_DEBUG("\n%s\n", error->message); - virFreeError(error); + if (virGetLastError()) + VIR_TEST_DEBUG("\n%s\n", virGetLastErrorMessage()); } VIR_FORCE_FCLOSE(cpuinfo); goto fail; -- 2.7.4

2 1

[libvirt] [PATCH v3 0/3] More usage of virGetLastErrorMessage()
by Jovanka Gulicoska 19 May '16

19 May '16

Use virGetLastErrorMessage() instead of virGetLastError() Link to task: http://wiki.libvirt.org/page/BiteSizedTasks#More_usage_of_virGetLastErrorMe… Jovanka Gulicoska (3): tests: nodeinfotest: Convert to virGetLastErrorMessage() tests: More usage of virGetLastErrorMessage() More usage of virGetLastErrorMessage daemon/libvirtd.c | 8 +--- examples/object-events/event-test.c | 9 ++--- src/bhyve/bhyve_driver.c | 3 +- src/conf/virsecretobj.c | 5 +-- src/libvirt.c | 3 +- src/libxl/libxl_domain.c | 3 +- src/libxl/libxl_driver.c | 4 +- src/locking/lock_daemon.c | 8 +--- src/logging/log_daemon.c | 8 +--- src/lxc/lxc_container.c | 9 ++--- src/lxc/lxc_controller.c | 9 ++--- src/lxc/lxc_domain.c | 4 +- src/lxc/lxc_process.c | 6 +-- src/rpc/virnettlscontext.c | 3 +- src/storage/storage_driver.c | 16 ++------ src/uml/uml_driver.c | 3 +- src/util/iohelper.c | 10 +---- src/util/virhook.c | 3 +- src/util/virhostdev.c | 20 ++++----- tests/commandtest.c | 81 +++++++++++++------------------------ tests/libvirtdconftest.c | 26 ++++++------ tests/nodeinfotest.c | 8 ++-- tests/openvzutilstest.c | 7 +--- tests/qemucapsprobe.c | 6 +-- tests/securityselinuxtest.c | 6 +-- 25 files changed, 91 insertions(+), 177 deletions(-) -- 2.5.5

2 4

[libvirt] [PATCH 0/6] conf: qemu: Introduce relaxed config validation
by Peter Krempa 19 May '16

19 May '16

Recently I NACKed quite a few patches attempting to add checks to the post parse callback infrastructure that would inhbit configs from being loaded after daemon restart. To solve this introduce a new infrastructure that will get called only on codepaths that define and start the config leaving the code paths that load configs untouched. Peter Krempa (6): conf: disk: Rename virDomainDiskDefValidate to virDomainDiskDefParseValidate qemu: driver: Fix function header alignment of some functions conf: Introduce infrastructure to add config validation to define time qemu: Move check that validates 'min_guarantee' to qemuDomainDefValidate conf: Move check that validates disk info to virDomainDefValidate conf: Add validation infrastructure for device hot/cold plug src/conf/domain_conf.c | 128 +++++++++++++++++++++++++++++++++++++++-------- src/conf/domain_conf.h | 11 ++-- src/libvirt_private.syms | 3 +- src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.c | 38 ++++++++++++++ src/qemu/qemu_domain.h | 3 ++ src/qemu/qemu_driver.c | 26 ++++++++-- src/qemu/qemu_process.c | 19 ++++--- 8 files changed, 190 insertions(+), 40 deletions(-) -- 2.8.2

5 15

[libvirt] [PATCH 0/3] More usage of virGetLastErrorMessage()
by Jovanka Gulicoska 19 May '16

19 May '16

v2 of patches Use virGetLastErrorMessage() insted of virGetLastError() Link to task: http://wiki.libvirt.org/page/BiteSizedTasks#More_usage_of_virGetLastErrorMe… Jovanka Gulicoska (3): virGetLastErrorMessage() in tests More usage of virGetLastErrorMessage() virGetLastErrorMessage in nodeinfotest daemon/libvirtd.c | 8 +--- examples/object-events/event-test.c | 9 ++--- src/bhyve/bhyve_driver.c | 3 +- src/conf/virsecretobj.c | 5 +-- src/libvirt.c | 3 +- src/libxl/libxl_domain.c | 3 +- src/libxl/libxl_driver.c | 4 +- src/locking/lock_daemon.c | 8 +--- src/logging/log_daemon.c | 8 +--- src/lxc/lxc_container.c | 9 ++--- src/lxc/lxc_controller.c | 9 ++--- src/lxc/lxc_domain.c | 4 +- src/lxc/lxc_process.c | 6 +-- src/rpc/virnettlscontext.c | 3 +- src/storage/storage_driver.c | 16 ++------ src/uml/uml_driver.c | 3 +- src/util/iohelper.c | 10 +---- src/util/virhook.c | 3 +- src/util/virhostdev.c | 20 ++++----- tests/commandtest.c | 81 +++++++++++++------------------------ tests/libvirtdconftest.c | 26 ++++++------ tests/nodeinfotest.c | 8 ++-- tests/openvzutilstest.c | 7 +--- tests/qemucapsprobe.c | 6 +-- tests/securityselinuxtest.c | 6 +-- 25 files changed, 91 insertions(+), 177 deletions(-) -- 2.5.5

2 7

[libvirt] [PATCH] tests: Add forgotten backslash
by Michal Privoznik 19 May '16

19 May '16

While introducing virtestmock.la, I've forgotten to add '\' at the end of one line leaving our Makefile.am mangled. Fortunately, the only thing that comes after is '$(NULL)' so nothing is terribly broken. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 238f6da..c7c9a03 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -447,7 +447,7 @@ endif WITH_DBUS if WITH_LINUX test_libraries += virusbmock.la \ virnetdevbandwidthmock.la \ - virtestmock.la + virtestmock.la \ $(NULL) endif WITH_LINUX -- 2.8.1

1 0

[libvirt] [PATCH 0/4] Remove need for STATIC_ANALYSIS in viralloc.h
by John Ferlan 19 May '16

19 May '16

Not sure which release exactly, but the coverity analysis bug I filed that was the reason for commit id 'c9a85af31' has been fixed, so it's time to remove that... In doing so uncovered another issue - it seems the fix for Coverity addressed the primary problem we've seen, but when there's functions returning allocated strings by reference that can also VIR_FREE(*string), whatever was added to address the main issue doesn't seem to recognize this other usage, resulinting in a false positive resource_leak. Luckily there's only two instances in our code for that. One is addressed by patch 3 and the other in virPCIDeviceGetDriverPathAndName which would require quite a few more changes to address (essentially split up the function - it'll be on my "to do" list). Patch 1: Addresses an issue seen once patches 2-4 were applied - that there's a real problem with the error path. It's a simple fix. Patches 2 & 3: Address a false positive resource leak even with patch 4 applied. Patch 4: Remove the rather ugly !STATIC_ANALYSIS within the VIR_FREE and VIR_DISPOSE* macros. As I found with a build after the fact, VIR_DISPOSE_STRING was missing an argument anyway (it should have been ": 0, 1, NULL" instead of ": 1, NULL"). NB: Patch 4 has been run through the private coverity server... John Ferlan (4): util: Fix error path for virPCIGetVirtualFunctions util: Remove need for ret in virPCIGetPhysicalFunction util: Adjust return for virPCIGetDeviceAddressFromSysfsLink util: Remove need for STATIC_ANALYSIS check src/util/viralloc.h | 34 ++++++---------------------------- src/util/virpci.c | 39 +++++++++++++++++++-------------------- 2 files changed, 25 insertions(+), 48 deletions(-) -- 2.5.5

2 5

[libvirt] [PATCH 0/3] Patches to set up the secret encryption
by John Ferlan 19 May '16

19 May '16

Based on v4 of the AES secret object series: http://www.redhat.com/archives/libvir-list/2016-May/msg01292.html Could have been an RFC too... Precursor for the AES secret object patches - figured I'd make sure this was the "right path" and hopefully to get some help with the mock environment since the virRandomBytes would move out of qemuxml2argvtest. Patch 3 is new and will work independent of 1 & 2, although it would be nice to alther the vircryptotest to use a mocked virRandomBytes rather than seeing the encalg and iv with what the mocked code would return. John Ferlan (3): tests: Add mock for virRandomBytes tests: Need help... Trying to add virRandomBytes mock util: Introduce encryption APIs configure.ac | 1 + src/libvirt_private.syms | 2 + src/util/vircrypto.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++- src/util/vircrypto.h | 20 ++++- tests/Makefile.am | 16 ++++ tests/commandhelper.c | 1 + tests/vircryptotest.c | 86 +++++++++++++++++++++ tests/virrandommock.c | 56 ++++++++++++++ tests/virrandomtest.c | 86 +++++++++++++++++++++ 9 files changed, 455 insertions(+), 2 deletions(-) create mode 100644 tests/virrandommock.c create mode 100644 tests/virrandomtest.c -- 2.5.5

2 9

[libvirt] hotplug support for "filesystem" devices?
by Snyder, Emile 19 May '16

19 May '16

Hello all, I'm a newbie to libvirt, coming to it because I'm trying to understand how to provide the ability to attach/detach network filesystem shares to openstack guest instances in something analogous to the way block devices can be now. While playing with the existing virtfs/9p support for qemu, I found that I can't use virsh to attach a "filesystem" device while the VM is running. For example, I create a snippet of XML like <filesystem type='mount' accessmode='mapped'> <source dir='/tmp/share'/> <target dir='share_tag'/> </filesystem> and then try: stack@devstack-8366:~/devstack$ virsh list Id Name State ---------------------------------------------------- 3 instance-00000002 running 5 instance-00000004 running 8 instance-00000007 running stack@devstack-8366:~/devstack$ virsh attach-device 8 share.xml error: Failed to attach device from share.xml error: Operation not supported: live attach of device 'filesystem' is not supported I see that error coming from src/qemu/qemu_driver.c in the qemuDomainAttachDeviceLive function. Can anyone tell me if this is something that is going to be hard or easy to make possible? Pointers to where I should look in the source, or in qemu? Is anyone working it already? Any advice at all welcome, Thanks -Emile Snyder

2 1

[libvirt] [PATCH 0/3] qemu: Don't get stuck in bulk-stats API on broken NFS
by Peter Krempa 19 May '16

19 May '16

Accessing VM disk files while we weren't able to get the stats from qemu directly as it was most probably stuck on missing storage will make libvrtd's thread handling the stats get stuck. Avoid touching files in such case. Peter Krempa (3): qemu: driver: Remove unnecessary flag in qemuDomainGetStatsBlock qemu: driver: Separate bulk stats worker for block devices qemu: bulk stats: Don't access possibly blocked storage src/qemu/qemu_driver.c | 78 +++++++++++++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 29 deletions(-) -- 2.8.2

2 6

[libvirt] [PATCH v2 0/2] qemu: parse: Introduce qemuParseCommandLineMem
by Nishith Shah 19 May '16

19 May '16

This series moves the parsing of qemu -m memory into a separate function and adds suffix support for the -m option. The first patch introduces the function qemuParseCommandLineMem, and the second patch handles suffixes for the -m values and adds a test for the same. Nishith Shah (2): qemu: parse: Use qemuParseCommandLineMem for -m memory qemu: parse: Handle suffixes for -m memory src/qemu/qemu_parse_command.c | 38 ++++++++++++++++++---- tests/qemuargv2xmldata/qemuargv2xml-mem-scale.args | 22 +++++++++++++ tests/qemuargv2xmldata/qemuargv2xml-mem-scale.xml | 33 +++++++++++++++++++ tests/qemuargv2xmltest.c | 1 + 4 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-mem-scale.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-mem-scale.xml -- 2.1.4

3 7

[libvirt] [PATCH] Introduce gnutls_priority config option
by Ján Tomko 19 May '16

19 May '16

The defaults provided by gnutls_set_default_priority are not configurable at runtime. Introduce a new config option to libvirt.conf that will be passed to gnutls_priority_set. One of the possible options is "@SYSTEM", where gnutls will get the settings from /etc/gnutls/default-priorities. Note that the /etc/libvirt/libvirt.conf file is only used by libvirt processes running as root, for regular users the file in $XDG_CONFIG_HOME or ~/.config is used. https://bugzilla.redhat.com/show_bug.cgi?id=1333404 --- src/libvirt.conf | 6 +++++ src/rpc/virnettlscontext.c | 59 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 56 insertions(+), 9 deletions(-) diff --git a/src/libvirt.conf b/src/libvirt.conf index da4dfbe..688c572 100644 --- a/src/libvirt.conf +++ b/src/libvirt.conf @@ -16,3 +16,9 @@ # (@uri_default also prevents probing of the hypervisor driver). # #uri_default = "qemu:///system" + +# +# Override the priority of exchange methods, ciphers etc. used by gnutls. +# See gnutls_priority_set_direct(3). +# +#gnutls_priority = "@SYSTEM" diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 947038d..e93887c 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -35,6 +35,7 @@ #include "virstring.h" #include "viralloc.h" +#include "virconf.h" #include "virerror.h" #include "virfile.h" #include "virutil.h" @@ -86,10 +87,17 @@ static virClassPtr virNetTLSContextClass; static virClassPtr virNetTLSSessionClass; static void virNetTLSContextDispose(void *obj); static void virNetTLSSessionDispose(void *obj); +static gnutls_priority_t *virNetTLSPriorityCache; static int virNetTLSContextOnceInit(void) { + virConfPtr conf = NULL; + virConfValuePtr value = NULL; + const char *err_pos; + int ret = -1; + int rc; + if (!(virNetTLSContextClass = virClassNew(virClassForObjectLockable(), "virNetTLSContext", sizeof(virNetTLSContext), @@ -102,7 +110,32 @@ static int virNetTLSContextOnceInit(void) virNetTLSSessionDispose))) return -1; - return 0; + if (virConfLoadConfig(&conf, NULL) < 0) + return -1; + + if ((value = virConfGetValue(conf, "gnutls_priority"))) { + if (value->type != VIR_CONF_STRING) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expected a string for 'gnutls_priority' config parameter")); + goto cleanup; + } + VIR_DEBUG("Using gnutls priority '%s'", value->str); + if (VIR_ALLOC(virNetTLSPriorityCache) < 0) + goto cleanup; + if ((rc = gnutls_priority_init(virNetTLSPriorityCache, value->str, + &err_pos)) != 0) { + VIR_FREE(virNetTLSPriorityCache); + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Failed to initialize TLS session priority \"%s\": %s"), + err_pos, gnutls_strerror(rc)); + goto cleanup; + } + } + + ret = 0; + cleanup: + virConfFree(conf); + return ret; } VIR_ONCE_GLOBAL_INIT(virNetTLSContext) @@ -1224,14 +1257,22 @@ virNetTLSSessionPtr virNetTLSSessionNew(virNetTLSContextPtr ctxt, goto error; } - /* avoid calling all the priority functions, since the defaults - * are adequate. - */ - if ((err = gnutls_set_default_priority(sess->session)) != 0) { - virReportError(VIR_ERR_SYSTEM_ERROR, - _("Failed to set TLS session priority %s"), - gnutls_strerror(err)); - goto error; + /* Use the defaults unless a priority string was specified in the + * config file */ + if (virNetTLSPriorityCache) { + if ((err = gnutls_priority_set(sess->session, *virNetTLSPriorityCache)) != 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Failed to set TLS session priority %s"), + gnutls_strerror(err)); + goto error; + } + } else { + if ((err = gnutls_set_default_priority(sess->session)) != 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Failed to set TLS session priority %s"), + gnutls_strerror(err)); + goto error; + } } if ((err = gnutls_credentials_set(sess->session, -- 2.7.3

2 3