- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: fix migration flags undefinesource cannot work
by Luyao Huang 28 Oct '15

28 Oct '15

In commit f41be296, we moved vm->persistent check into qemuDomainRemoveInactive, but we didn't change the vm->persistent before call qemuDomainRemoveInactive in some place before and just call it to remove the inactive vm. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_migration.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b53491a..2abf2ee 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3912,8 +3912,10 @@ qemuMigrationConfirm(virConnectPtr conn, qemuMigrationJobFinish(driver, vm); if (!virDomainObjIsActive(vm)) { - if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) + if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) { virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); + vm->persistent = 0; + } qemuDomainRemoveInactive(driver, vm); } @@ -5405,8 +5407,10 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver, qemuMigrationJobFinish(driver, vm); if (!virDomainObjIsActive(vm) && ret == 0) { - if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) + if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) { virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); + vm->persistent = 0; + } qemuDomainRemoveInactive(driver, vm); } -- 1.8.3.1

3 4

[libvirt] [PATCH] conf: Add serial target type to ABI stability check
by Luyao Huang 28 Oct '15

28 Oct '15

https://bugzilla.redhat.com/show_bug.cgi?id=1273686 There is no ABI check for serial target type attribute, just add it. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/domain_conf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 02cc8ad..a31bc05 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17225,6 +17225,14 @@ static bool virDomainSerialDefCheckABIStability(virDomainChrDefPtr src, virDomainChrDefPtr dst) { + if (src->targetType != dst->targetType) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target serial type %s does not match source %s"), + virDomainChrSerialTargetTypeToString(dst->targetType), + virDomainChrSerialTargetTypeToString(src->targetType)); + return false; + } + if (src->target.port != dst->target.port) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target serial port %d does not match source %d"), -- 1.8.3.1

3 2

[libvirt] [PATCH] rbd: Remove snapshots if the FORCED flag has been provided
by Wido den Hollander 28 Oct '15

28 Oct '15

When a RBD volume has snapshots it can not be removed. This patch introduces a new flag to force volume removal, VIR_STORAGE_VOL_DELETE_FORCED. With this flag any existing snapshots will be removed prior to removing the volume. No existing mechanism in libvirt allowed us to pass such information, so that's why a new flag was introduced. Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- include/libvirt/libvirt-storage.h | 1 + src/storage/storage_backend_rbd.c | 58 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/include/libvirt/libvirt-storage.h b/include/libvirt/libvirt-storage.h index 453089e..36ff979 100644 --- a/include/libvirt/libvirt-storage.h +++ b/include/libvirt/libvirt-storage.h @@ -115,6 +115,7 @@ typedef enum { typedef enum { VIR_STORAGE_VOL_DELETE_NORMAL = 0, /* Delete metadata only (fast) */ VIR_STORAGE_VOL_DELETE_ZEROED = 1 << 0, /* Clear all data to zeros (slow) */ + VIR_STORAGE_VOL_DELETE_FORCED = 2, /* Force removal of volume, even if in use */ } virStorageVolDeleteFlags; typedef enum { diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index ac5085a..ca5e802 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -428,9 +428,13 @@ static int virStorageBackendRBDDeleteVol(virConnectPtr conn, { int ret = -1; int r = 0; + int max_snaps = 128; + int i, snap_count, protected; virStorageBackendRBDState ptr; ptr.cluster = NULL; ptr.ioctx = NULL; + rbd_snap_info_t *snaps; + rbd_image_t image = NULL; VIR_DEBUG("Removing RBD image %s/%s", pool->def->source.name, vol->name); @@ -443,6 +447,59 @@ static int virStorageBackendRBDDeleteVol(virConnectPtr conn, if (virStorageBackendRBDOpenIoCTX(&ptr, pool) < 0) goto cleanup; + r = rbd_open(ptr.ioctx, vol->name, &image, NULL); + if (r < 0) { + virReportSystemError(-r, _("failed to open the RBD image '%s'"), + vol->name); + goto cleanup; + } + + do { + if (VIR_ALLOC_N(snaps, max_snaps)) + goto cleanup; + + snap_count = rbd_snap_list(image, snaps, &max_snaps); + if (snap_count <= 0) { + VIR_FREE(snaps); + } + } while (snap_count == -ERANGE); + + VIR_DEBUG("Found %d snapshots for volume %s/%s", snap_count, + pool->def->source.name, vol->name); + + if (snap_count > 0 && (flags & VIR_STORAGE_VOL_DELETE_FORCED)) { + for (i = 0; i < snap_count; i++) { + if (rbd_snap_is_protected(image, snaps[i].name, &protected)) + goto cleanup; + + if (protected == 1) { + VIR_DEBUG("Snapshot %s/%s@%s is protected needs to be " + "unprotected", pool->def->source.name, vol->name, + snaps[i].name); + + if (rbd_snap_unprotect(image, snaps[i].name) < 0) + goto cleanup; + } + + VIR_DEBUG("Removing snapshot %s/%s@%s", pool->def->source.name, + vol->name, snaps[i].name); + + if (rbd_snap_remove(image, snaps[i].name) < 0) { + virReportSystemError(-r, _("failed to remove snapshot '%s/%s@%s'"), + pool->def->source.name, vol->name, + snaps[i].name); + goto cleanup; + } + } + + rbd_snap_list_end(snaps); + } + + if (rbd_close(image) < 0) + goto cleanup; + + VIR_DEBUG("Removing volume %s/%s", pool->def->source.name, vol->name); + r = rbd_remove(ptr.ioctx, vol->name); if (r < 0 && (-r) != ENOENT) { virReportSystemError(-r, _("failed to remove volume '%s/%s'"), @@ -453,6 +510,7 @@ static int virStorageBackendRBDDeleteVol(virConnectPtr conn, ret = 0; cleanup: + VIR_FREE(snaps); virStorageBackendRBDCloseRADOSConn(&ptr); return ret; } -- 1.9.1

3 9

[libvirt] Plan for next release
by Daniel Veillard 28 Oct '15

28 Oct '15

I'm a bit late, sorry, but I think we should freeze on Thursday for the next release, and then shoot for middle of next week for the actual release, I hope this last moment warning isn't a problem, thanks, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] util: implement virProcessGetStartTime on GNU/kFreeBSD
by Pino Toscano 28 Oct '15

28 Oct '15

Use the virProcessGetStartTime implementation also when only the kernel is FreeBSD, such as on GNU/kFreeBSD. --- src/util/virprocess.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index e6b78ef..43118f8 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -36,11 +36,11 @@ # include <sched.h> #endif -#if defined(__FreeBSD__) || HAVE_BSD_CPU_AFFINITY +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || HAVE_BSD_CPU_AFFINITY # include <sys/param.h> #endif -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) # include <sys/sysctl.h> # include <sys/user.h> #endif @@ -937,7 +937,7 @@ int virProcessGetStartTime(pid_t pid, VIR_FREE(buf); return ret; } -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) int virProcessGetStartTime(pid_t pid, unsigned long long *timestamp) { -- 2.1.0

4 5

[libvirt] [PATCH] bhyve: implement domainGetOSType
by Roman Bogorodskiy 28 Oct '15

28 Oct '15

--- src/bhyve/bhyve_driver.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index d44cf2c..efba0ae 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -465,6 +465,27 @@ bhyveDomainIsPersistent(virDomainPtr domain) } static char * +bhyveDomainGetOSType(virDomainPtr dom) +{ + virDomainObjPtr vm; + char *ret = NULL; + + if (!(vm = bhyveDomObjFromDomain(dom))) + goto cleanup; + + if (virDomainGetOSTypeEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + if (VIR_STRDUP(ret, virDomainOSTypeToString(vm->def->os.type)) < 0) + goto cleanup; + + cleanup: + if (vm) + virObjectUnlock(vm); + return ret; +} + +static char * bhyveDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) { virDomainObjPtr vm; @@ -1487,6 +1508,7 @@ static virHypervisorDriver bhyveHypervisorDriver = { .domainDefineXML = bhyveDomainDefineXML, /* 1.2.2 */ .domainDefineXMLFlags = bhyveDomainDefineXMLFlags, /* 1.2.12 */ .domainUndefine = bhyveDomainUndefine, /* 1.2.2 */ + .domainGetOSType = bhyveDomainGetOSType, /* 1.2.21 */ .domainGetXMLDesc = bhyveDomainGetXMLDesc, /* 1.2.2 */ .domainIsActive = bhyveDomainIsActive, /* 1.2.2 */ .domainIsPersistent = bhyveDomainIsPersistent, /* 1.2.2 */ -- 2.6.1

2 2

[libvirt] [PATCH] qemu: Resolve agent deadlock
by John Ferlan 27 Oct '15

27 Oct '15

If we have a shutdown of a VM by a qemu agent while an agent EOF occurs at relatively the same time, it's possible that a deadlock occurs depending on what happens first. Assume qemuProcessHandleAgentEOF runs first, with the vm->lock it clears priv->agent, then clears the vm->lock. After some agent call such as qemuDomainShutdownFlags will call qemuDomainObjExitAgent in a worker thread with the agent lock. It will then reference the priv->agent field: hasRefs = virObjectUnref(priv->agent); in order to determine whether there are references. However, since priv->agent is NULL, this returns false, so the subsquent: if (hasRefs) virObjectUnlock(priv->agent); will not unlock the agent. Eventually the EOF thread will attempt to call qemuAgentClose which will try to lock the agent, but cannot since it's still locked. This patch resolves this issue by keeping a copy of the priv->agent address prior to releasing the vm->lock in qemuDomainObjEnterAgent. Then rather than assuming priv->agent is valid, use the copy of the agent pointer for the subsequent agent call and qemuDomainObjExitAgent. Within qemuDomainObjExitAgent, use the agent copy in order to release the agent lock, then get the vm->lock again and decide whether to clear the priv->agent based on whether any references still exist. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Recent upstream patch: http://www.redhat.com/archives/libvir-list/2015-September/msg00971.html attempted to undo commit id '1020a504' which appears to be the wrong approach since it would still have the vm->lock during the qemuAgentClose. src/qemu/qemu_domain.c | 11 +++--- src/qemu/qemu_domain.h | 4 +-- src/qemu/qemu_driver.c | 90 +++++++++++++++++++++++++++++++++----------------- 3 files changed, 67 insertions(+), 38 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 890d8ed..a908df8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1868,19 +1868,20 @@ qemuDomainObjEnterAgent(virDomainObjPtr obj) * Should be paired with an earlier qemuDomainObjEnterAgent() call */ void -qemuDomainObjExitAgent(virDomainObjPtr obj) +qemuDomainObjExitAgent(virDomainObjPtr obj, + qemuAgentPtr agent) { qemuDomainObjPrivatePtr priv = obj->privateData; bool hasRefs; - hasRefs = virObjectUnref(priv->agent); + hasRefs = virObjectUnref(agent); if (hasRefs) - virObjectUnlock(priv->agent); + virObjectUnlock(agent); virObjectLock(obj); - VIR_DEBUG("Exited agent (agent=%p vm=%p name=%s)", - priv->agent, obj, obj->def->name); + VIR_DEBUG("Exited agent (agent=%p vm=%p name=%s hasRefs=%d)", + agent, obj, obj->def->name, hasRefs); priv->agentStart = 0; if (!hasRefs) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 64cd7e1..def31a9 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -296,8 +296,8 @@ int qemuDomainObjEnterMonitorAsync(virQEMUDriverPtr driver, void qemuDomainObjEnterAgent(virDomainObjPtr obj) ATTRIBUTE_NONNULL(1); -void qemuDomainObjExitAgent(virDomainObjPtr obj) - ATTRIBUTE_NONNULL(1); +void qemuDomainObjExitAgent(virDomainObjPtr obj, qemuAgentPtr agent) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); void qemuDomainObjEnterRemote(virDomainObjPtr obj) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a2cc002..b8c9ff7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1994,9 +1994,10 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) qemuDomainSetFakeReboot(driver, vm, isReboot); if (useAgent) { + qemuAgentPtr agent = priv->agent; qemuDomainObjEnterAgent(vm); - ret = qemuAgentShutdown(priv->agent, agentFlag); - qemuDomainObjExitAgent(vm); + ret = qemuAgentShutdown(agent, agentFlag); + qemuDomainObjExitAgent(vm, agent); } /* If we are not enforced to use just an agent, try ACPI @@ -2087,9 +2088,10 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) qemuDomainSetFakeReboot(driver, vm, isReboot); if (useAgent) { + qemuAgentPtr agent = priv->agent; qemuDomainObjEnterAgent(vm); - ret = qemuAgentShutdown(priv->agent, agentFlag); - qemuDomainObjExitAgent(vm); + ret = qemuAgentShutdown(agent, agentFlag); + qemuDomainObjExitAgent(vm, agent); } /* If we are not enforced to use just an agent, try ACPI @@ -4864,6 +4866,7 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, qemuAgentCPUInfoPtr cpuinfo = NULL; int ncpuinfo; qemuDomainObjPrivatePtr priv; + qemuAgentPtr agent; size_t i; virCgroupPtr cgroup_temp = NULL; char *mem_mask = NULL; @@ -4924,6 +4927,7 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, } if (flags & VIR_DOMAIN_VCPU_GUEST) { + if (!qemuDomainAgentAvailable(vm, true)) goto endjob; @@ -4935,19 +4939,20 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, goto endjob; } + agent = priv->agent; qemuDomainObjEnterAgent(vm); - ncpuinfo = qemuAgentGetVCPUs(priv->agent, &cpuinfo); - qemuDomainObjExitAgent(vm); + ncpuinfo = qemuAgentGetVCPUs(agent, &cpuinfo); + qemuDomainObjExitAgent(vm, agent); - if (ncpuinfo < 0) + if (ncpuinfo < 0 || agent != priv->agent) goto endjob; if (qemuAgentUpdateCPUInfo(nvcpus, cpuinfo, ncpuinfo) < 0) goto endjob; qemuDomainObjEnterAgent(vm); - ret = qemuAgentSetVCPUs(priv->agent, cpuinfo, ncpuinfo); - qemuDomainObjExitAgent(vm); + ret = qemuAgentSetVCPUs(agent, cpuinfo, ncpuinfo); + qemuDomainObjExitAgent(vm, agent); if (ret < 0) goto endjob; @@ -5515,6 +5520,8 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) goto cleanup; if (flags & VIR_DOMAIN_VCPU_GUEST) { + qemuAgentPtr agent; + if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("vCPU count provided by the guest agent can only be " @@ -5534,9 +5541,10 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) goto endjob; } + agent = priv->agent; qemuDomainObjEnterAgent(vm); - ncpuinfo = qemuAgentGetVCPUs(priv->agent, &cpuinfo); - qemuDomainObjExitAgent(vm); + ncpuinfo = qemuAgentGetVCPUs(agent, &cpuinfo); + qemuDomainObjExitAgent(vm, agent); endjob: qemuDomainObjEndJob(driver, vm); @@ -13513,14 +13521,16 @@ qemuDomainSnapshotFSFreeze(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, unsigned int nmountpoints) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuAgentPtr agent; int frozen; if (!qemuDomainAgentAvailable(vm, true)) return -1; + agent = priv->agent; qemuDomainObjEnterAgent(vm); - frozen = qemuAgentFSFreeze(priv->agent, mountpoints, nmountpoints); - qemuDomainObjExitAgent(vm); + frozen = qemuAgentFSFreeze(agent, mountpoints, nmountpoints); + qemuDomainObjExitAgent(vm, agent); return frozen < 0 ? -2 : frozen; } @@ -13532,19 +13542,21 @@ qemuDomainSnapshotFSThaw(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, bool report) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuAgentPtr agent; int thawed; virErrorPtr err = NULL; if (!qemuDomainAgentAvailable(vm, report)) return -1; + agent = priv->agent; qemuDomainObjEnterAgent(vm); if (!report) err = virSaveLastError(); - thawed = qemuAgentFSThaw(priv->agent); + thawed = qemuAgentFSThaw(agent); if (!report) virSetError(err); - qemuDomainObjExitAgent(vm); + qemuDomainObjExitAgent(vm, agent); virFreeError(err); @@ -18146,6 +18158,7 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom, { virQEMUDriverPtr driver = dom->conn->privateData; qemuDomainObjPrivatePtr priv; + qemuAgentPtr agent; virDomainObjPtr vm; int ret = -1; @@ -18218,9 +18231,10 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom, goto endjob; } + agent = priv->agent; qemuDomainObjEnterAgent(vm); - ret = qemuAgentSuspend(priv->agent, target); - qemuDomainObjExitAgent(vm); + ret = qemuAgentSuspend(agent, target); + qemuDomainObjExitAgent(vm, agent); endjob: qemuDomainObjEndJob(driver, vm); @@ -18309,6 +18323,7 @@ qemuDomainQemuAgentCommand(virDomainPtr domain, int ret = -1; char *result = NULL; qemuDomainObjPrivatePtr priv; + qemuAgentPtr agent; virCheckFlags(0, NULL); @@ -18338,9 +18353,10 @@ qemuDomainQemuAgentCommand(virDomainPtr domain, goto endjob; } + agent = priv->agent; qemuDomainObjEnterAgent(vm); - ret = qemuAgentArbitraryCommand(priv->agent, cmd, &result, timeout); - qemuDomainObjExitAgent(vm); + ret = qemuAgentArbitraryCommand(agent, cmd, &result, timeout); + qemuDomainObjExitAgent(vm, agent); if (ret < 0) VIR_FREE(result); @@ -18411,6 +18427,7 @@ qemuDomainFSTrim(virDomainPtr dom, virDomainObjPtr vm; int ret = -1; qemuDomainObjPrivatePtr priv; + qemuAgentPtr agent; virCheckFlags(0, -1); @@ -18447,9 +18464,10 @@ qemuDomainFSTrim(virDomainPtr dom, goto endjob; } + agent = priv->agent; qemuDomainObjEnterAgent(vm); - ret = qemuAgentFSTrim(priv->agent, minimum); - qemuDomainObjExitAgent(vm); + ret = qemuAgentFSTrim(agent, minimum); + qemuDomainObjExitAgent(vm, agent); endjob: qemuDomainObjEndJob(driver, vm); @@ -18600,6 +18618,7 @@ qemuDomainGetTime(virDomainPtr dom, virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm = NULL; qemuDomainObjPrivatePtr priv; + qemuAgentPtr agent; int ret = -1; int rv; @@ -18625,9 +18644,10 @@ qemuDomainGetTime(virDomainPtr dom, if (!qemuDomainAgentAvailable(vm, true)) goto endjob; + agent = priv->agent; qemuDomainObjEnterAgent(vm); - rv = qemuAgentGetTime(priv->agent, seconds, nseconds); - qemuDomainObjExitAgent(vm); + rv = qemuAgentGetTime(agent, seconds, nseconds); + qemuDomainObjExitAgent(vm, agent); if (rv < 0) goto endjob; @@ -18650,6 +18670,7 @@ qemuDomainSetTime(virDomainPtr dom, { virQEMUDriverPtr driver = dom->conn->privateData; qemuDomainObjPrivatePtr priv; + qemuAgentPtr agent; virDomainObjPtr vm; bool rtcSync = flags & VIR_DOMAIN_TIME_SYNC; int ret = -1; @@ -18689,9 +18710,10 @@ qemuDomainSetTime(virDomainPtr dom, if (!qemuDomainAgentAvailable(vm, true)) goto endjob; + agent = priv->agent; qemuDomainObjEnterAgent(vm); - rv = qemuAgentSetTime(priv->agent, seconds, nseconds, rtcSync); - qemuDomainObjExitAgent(vm); + rv = qemuAgentSetTime(agent, seconds, nseconds, rtcSync); + qemuDomainObjExitAgent(vm, agent); if (rv < 0) goto endjob; @@ -19647,6 +19669,7 @@ qemuDomainGetFSInfo(virDomainPtr dom, { virQEMUDriverPtr driver = dom->conn->privateData; qemuDomainObjPrivatePtr priv; + qemuAgentPtr agent; virDomainObjPtr vm; int ret = -1; @@ -19672,9 +19695,10 @@ qemuDomainGetFSInfo(virDomainPtr dom, if (!qemuDomainAgentAvailable(vm, true)) goto endjob; + agent = priv->agent; qemuDomainObjEnterAgent(vm); - ret = qemuAgentGetFSInfo(priv->agent, info, vm->def); - qemuDomainObjExitAgent(vm); + ret = qemuAgentGetFSInfo(agent, info, vm->def); + qemuDomainObjExitAgent(vm, agent); endjob: qemuDomainObjEndJob(driver, vm); @@ -19692,6 +19716,7 @@ qemuDomainInterfaceAddresses(virDomainPtr dom, { virQEMUDriverPtr driver = dom->conn->privateData; qemuDomainObjPrivatePtr priv = NULL; + qemuAgentPtr agent; virDomainObjPtr vm = NULL; int ret = -1; @@ -19723,9 +19748,10 @@ qemuDomainInterfaceAddresses(virDomainPtr dom, if (!qemuDomainAgentAvailable(vm, true)) goto endjob; + agent = priv->agent; qemuDomainObjEnterAgent(vm); - ret = qemuAgentGetInterfaces(priv->agent, ifaces); - qemuDomainObjExitAgent(vm); + ret = qemuAgentGetInterfaces(agent, ifaces); + qemuDomainObjExitAgent(vm, agent); endjob: qemuDomainObjEndJob(driver, vm); @@ -19850,6 +19876,7 @@ qemuDomainSetUserPassword(virDomainPtr dom, { virQEMUDriverPtr driver = dom->conn->privateData; qemuDomainObjPrivatePtr priv; + qemuAgentPtr agent; virDomainObjPtr vm; int ret = -1; int rv; @@ -19876,10 +19903,11 @@ qemuDomainSetUserPassword(virDomainPtr dom, if (!qemuDomainAgentAvailable(vm, true)) goto endjob; + agent = priv->agent; qemuDomainObjEnterAgent(vm); - rv = qemuAgentSetUserPassword(priv->agent, user, password, + rv = qemuAgentSetUserPassword(agent, user, password, flags & VIR_DOMAIN_PASSWORD_ENCRYPTED); - qemuDomainObjExitAgent(vm); + qemuDomainObjExitAgent(vm, agent); if (rv < 0) goto endjob; -- 2.1.0

2 4

[libvirt] [PATCH 0/4] improve virsh attache-interface
by Pavel Hrdina 27 Oct '15

27 Oct '15

Pavel Hrdina (4): virsh-domain: use correct base for virStrToLong_ui virsh-nodedev: makes struct and functions for NodeDevice list available virsh-domain: update attach-interface to support type=hostdev virsh.pod: update and improve a attach-interface section tools/virsh-domain.c | 120 ++++++++++++++++++++++++++++++++++++++++++-------- tools/virsh-nodedev.c | 16 +++---- tools/virsh-nodedev.h | 11 +++++ tools/virsh.pod | 85 +++++++++++++++++++++-------------- 4 files changed, 170 insertions(+), 62 deletions(-) -- 2.6.2

3 13

[libvirt] [PATCH] locking: Add io_timeout to sanlock
by Michal Privoznik 27 Oct '15

27 Oct '15

https://bugzilla.redhat.com/show_bug.cgi?id=1251190 So, if domain loses access to storage, sanlock tries to kill it after some timeout. So far, the default is 80 seconds. But for some scenarios this might not be enough. We should allow users to adjust the timeout according to their needs. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/locking/libvirt_sanlock.aug | 1 + src/locking/lock_driver_sanlock.c | 8 +++++++- src/locking/sanlock.conf | 7 +++++++ src/locking/test_libvirt_sanlock.aug.in | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/locking/libvirt_sanlock.aug b/src/locking/libvirt_sanlock.aug index a78a444..8843590 100644 --- a/src/locking/libvirt_sanlock.aug +++ b/src/locking/libvirt_sanlock.aug @@ -22,6 +22,7 @@ module Libvirt_sanlock = | int_entry "host_id" | bool_entry "require_lease_for_disks" | bool_entry "ignore_readonly_and_shared_disks" + | int_entry "io_timeout" | str_entry "user" | str_entry "group" let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index e052875..f1dbbaf 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -73,6 +73,7 @@ struct _virLockManagerSanlockDriver { int hostID; bool autoDiskLease; char *autoDiskLeasePath; + unsigned int io_timeout; /* under which permissions does sanlock run */ uid_t user; @@ -151,6 +152,10 @@ static int virLockManagerSanlockLoadConfig(const char *configFile) else driver->requireLeaseForDisks = !driver->autoDiskLease; + p = virConfGetValue(conf, "io_timeout"); + CHECK_TYPE("io_timeout", VIR_CONF_ULONG); + if (p) driver->io_timeout = p->l; + p = virConfGetValue(conf, "user"); CHECK_TYPE("user", VIR_CONF_STRING); if (p) { @@ -338,7 +343,7 @@ static int virLockManagerSanlockSetupLockspace(void) * or we can fallback to polling. */ retry: - if ((rv = sanlock_add_lockspace(&ls, 0)) < 0) { + if ((rv = sanlock_add_lockspace_timeout(&ls, 0, driver->io_timeout)) < 0) { if (-rv == EINPROGRESS && --retries) { #ifdef HAVE_SANLOCK_INQ_LOCKSPACE /* we have this function which blocks until lockspace change the @@ -404,6 +409,7 @@ static int virLockManagerSanlockInit(unsigned int version, driver->requireLeaseForDisks = true; driver->hostID = 0; driver->autoDiskLease = false; + driver->io_timeout = 0; driver->user = (uid_t) -1; driver->group = (gid_t) -1; if (VIR_STRDUP(driver->autoDiskLeasePath, LOCALSTATEDIR "/lib/libvirt/sanlock") < 0) { diff --git a/src/locking/sanlock.conf b/src/locking/sanlock.conf index e5566ef..3a1a51c 100644 --- a/src/locking/sanlock.conf +++ b/src/locking/sanlock.conf @@ -54,6 +54,13 @@ #require_lease_for_disks = 1 # +# Sanlock is able to kill qemu processes on IO timeout. By its internal +# implementation, the current default is 80 seconds. If you need to adjust +# the value change the following variable. Value of zero means use the +# default sanlock timeout. +#io_timeout = 0 + +# # The combination of user and group under which the sanlock # daemon runs. Libvirt will chown created files (like # content of disk_lease_dir) to make sure sanlock daemon can diff --git a/src/locking/test_libvirt_sanlock.aug.in b/src/locking/test_libvirt_sanlock.aug.in index ef98ea6..7f66f81 100644 --- a/src/locking/test_libvirt_sanlock.aug.in +++ b/src/locking/test_libvirt_sanlock.aug.in @@ -6,5 +6,6 @@ module Test_libvirt_sanlock = { "disk_lease_dir" = "/var/lib/libvirt/sanlock" } { "host_id" = "1" } { "require_lease_for_disks" = "1" } +{ "io_timeout" = "0" } { "user" = "root" } { "group" = "root" } -- 2.4.10

2 2

[libvirt] [PATCH 0/4] HACKING: Improve handling
by Andrea Bolognani 27 Oct '15

27 Oct '15

Generate the HACKING file at dist time like we're already doing for NEWS, AUTHORS and ChangeLog. The file shouldn't be tracked by git as it's not a source file but rather a generated one; because of this, it should also be generated in $(builddir) as opposed to $(top_srcdir). Cheers. Andrea Bolognani (4): HACKING: Generate inside the build directory HACKING: Remove generated copy HACKING: Add to ignore file HACKING: Include in EXTRA_DIST .gitignore | 1 + HACKING | 1008 ----------------------------------------------------------- Makefile.am | 3 +- cfg.mk | 3 +- 4 files changed, 4 insertions(+), 1011 deletions(-) delete mode 100644 HACKING -- 2.4.3

3 7

[libvirt] [PATCH v2 0/2] reorder usb controllers correctly
by Pavel Hrdina 27 Oct '15

27 Oct '15

new in v2: - used git format-patch -b - added a test case Pavel Hrdina (2): domain-conf: reorder usb controllers so the master is first test: add test case for usb controller order src/conf/domain_conf.c | 21 +++++++++---- .../qemuxml2argv-controller-usb-order.xml | 32 ++++++++++++++++++++ .../qemuxml2xmlout-controller-usb-order.xml | 34 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 4 files changed, 83 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-controller-usb-order.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-controller-usb-order.xml -- 2.6.2

2 3

[libvirt] [PATCH] domain-conf: reorder usb controllers so the master is first
by Pavel Hrdina 27 Oct '15

27 Oct '15

USB controllers can share the same 'index' which indicates, that there is some sort of master-companion relationship. Reorder the controllers in XML in to place the master controller before its companions. This is required by QEMU to not fail with error message: error: internal error: process exited while connecting to monitor: 2015-10-26T16:25:17.630265Z qemu-system-x86_64: -device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x6: USB bus 'usb.0' not found Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1166452 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/domain_conf.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0c559d2..3f22de2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13397,6 +13397,7 @@ void virDomainControllerInsertPreAlloced(virDomainDefPtr def, int idx; /* Tenatively plan to insert controller at the end. */ int insertAt = -1; + virDomainControllerDefPtr current = NULL; /* Then work backwards looking for controllers of * the same type. If we find a controller with a @@ -13404,17 +13405,27 @@ void virDomainControllerInsertPreAlloced(virDomainDefPtr def, * that position */ for (idx = (def->ncontrollers - 1); idx >= 0; idx--) { - /* If bus matches and current controller is after - * new controller, then new controller should go here */ - if (def->controllers[idx]->type == controller->type && - def->controllers[idx]->idx > controller->idx) { - insertAt = idx; - } else if (def->controllers[idx]->type == controller->type && - insertAt == -1) { - /* Last controller with match bus is before the - * new controller, then put new controller just after - */ - insertAt = idx + 1; + current = def->controllers[idx]; + if (current->type == controller->type) { + if (current->idx > controller->idx) { + /* If bus matches and current controller is after + * new controller, then new controller should go here + * */ + insertAt = idx; + } else if (controller->info.mastertype == VIR_DOMAIN_CONTROLLER_MASTER_NONE && + current->info.mastertype != VIR_DOMAIN_CONTROLLER_MASTER_NONE && + current->idx == controller->idx) { + /* If bus matches and index matches and new controller is + * master and current isn't a master, then new controller + * should go here to be placed before its companion + */ + insertAt = idx; + } else if (insertAt == -1) { + /* Last controller with match bus is before the + * new controller, then put new controller just after + */ + insertAt = idx + 1; + } } } -- 2.6.2

2 1

[libvirt] [PATCH v2 0/5] qemu: hostdev: Unify naming
by Andrea Bolognani 27 Oct '15

27 Oct '15

Changes in v2: * make new names consistent with virHostdev (thanks John) * rename virHostdevUpdateDomainActiveDevices() as well - this was the only function in virHostdev that didn't conform to the module's naming conventions Cheers. Andrea Bolognani (5): hostdev: Rename virHostdevUpdateDomainActiveDevices() qemu: hostdev: Unify naming for qemuHostdevPrepare*Devices() qemu: hostdev: Unify naming for qemuHostdevReAttach*Devices() qemu: hostdev: Unify naming for qemuHostdevUpdateActive*Devices() qemu: hostdev: Introduce qemuHostdevUpdateActiveDomainDevices() src/libvirt_private.syms | 2 +- src/libxl/libxl_driver.c | 2 +- src/qemu/qemu_hostdev.c | 108 +++++++++++++++++++++++++++-------------------- src/qemu/qemu_hostdev.h | 69 +++++++++++++++--------------- src/qemu/qemu_hotplug.c | 20 ++++----- src/qemu/qemu_process.c | 14 ++---- src/util/virhostdev.c | 2 +- src/util/virhostdev.h | 2 +- 8 files changed, 117 insertions(+), 102 deletions(-) -- 2.4.3

2 7

[libvirt] [PATCH] tests: Fix virnetdaemontest to be skipped in non-yajl environment
by Prerna 27 Oct '15

27 Oct '15

When libvirt is compiled without yajl-devel, virnetdaemontest fails. This causes 'make check' to fail with nondescript errors, such as following: [snip]............................... PASS: read-bufsiz PASS: read-non-seekable PASS: start TEST: virsh-uriprecedence .... 4 OK PASS: virsh-uriprecedence PASS: vcpupin /home/prerna/trees/libvirt/tests/virsh-all: skipping test: This test is very expensive, so it is disabled by default. To run it anyway, rerun: make check VIR_TEST_EXPENSIVE=1 SKIP: virsh-all PASS: virsh-optparse PASS: virsh-schedinfo PASS: virsh-synopsis PASS: virsh-undefine ======================================= 1 of 108 tests failed (7 tests were not run) Please report to libvir-list(a)redhat.com ======================================= make[2]: *** [check-TESTS] Error 1 make[2]: Leaving directory `/home/prerna/build/libvirt/tests' make[1]: *** [check-am] Error 2 make[1]: Leaving directory `/home/prerna/build/libvirt/tests' make: *** [check-recursive] Error 1 ..................................... This patch skips virnetdaemontest in absence of yajl-devel, so that make check gracefully runs to completion. Signed-off-by: Prerna Saxena <saxenap.ltc(a)gmail.com> --- tests/virnetdaemontest.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c index 24cbd54..17d1f7f 100644 --- a/tests/virnetdaemontest.c +++ b/tests/virnetdaemontest.c @@ -290,6 +290,11 @@ mymain(void) { int ret = 0; +#if !WITH_YAJL + fputs("libvirt not compiled with yajl, skipping this test\n", stderr); + return EXIT_AM_SKIP; +#endif + if (virInitialize() < 0 || virEventRegisterDefaultImpl() < 0) { virDispatchError(NULL); -- 1.7.1

2 3

[libvirt] [PATCH 0/4] qemu: hostdev: Unify naming
by Andrea Bolognani 26 Oct '15

26 Oct '15

I was working on the QEMU hostdev code and the inconsistent naming used kept making things just that little harder for me to follow, so I unified it. Cheers. Andrea Bolognani (4): qemu: hostdev: Unify naming for qemuPrepareHost*Devices() qemu: hostdev: Unify naming for qemuDomainReAttachHost*Devices() qemu: hostdev: Unify naming for qemuUpdateActiveHost*Devices() qemu: hostdev: Introduce qemuUpdateActiveHostDevices() src/qemu/qemu_hostdev.c | 74 ++++++++++++++++++++++++++++++------------------- src/qemu/qemu_hostdev.h | 36 ++++++++++++------------ src/qemu/qemu_hotplug.c | 13 ++++----- src/qemu/qemu_process.c | 8 +----- 4 files changed, 72 insertions(+), 59 deletions(-) -- 2.4.3

3 8

[libvirt] [PATCH v2 0/2] tests: Add nodeinfo test data utility scripts
by Andrea Bolognani 23 Oct '15

23 Oct '15

Changes from v1: * use a better approach to copy host data (thanks Martin) * acknowledge the fact that the scripts require bash * other small cleanups and improvements Andrea Bolognani (2): tests: Add script to display nodeinfo test data tests: Add script to copy nodeinfo test data from host tests/nodeinfodata/copy-from-host.sh | 113 +++++++++++++++++++++++++++++++++++ tests/nodeinfodata/display.sh | 113 +++++++++++++++++++++++++++++++++++ 2 files changed, 226 insertions(+) create mode 100755 tests/nodeinfodata/copy-from-host.sh create mode 100755 tests/nodeinfodata/display.sh -- 2.4.3

3 7

[libvirt] outreachy 2015
by mesode akwe 22 Oct '15

22 Oct '15

hello! i am mesode from cameroon and am interested in participating in the libvirt-designer enhancement project. where do i go from here? thanks.

1 0

[libvirt] [RFC] Simplifying usage of {Enter, Exit}Monitor and {Begin/End}Job
by Jiri Denemark 22 Oct '15

22 Oct '15

Hi all. Looking at the qemu driver code, we have a lot of code with the following pattern: if (doSomething() < 0) goto cleanup; if (qemuDomainObjBeginJob() < 0) goto cleanup; if (doSomethingElse() < 0) goto endjob; qemuDomainObjEnterMonitor(); if (qemuMonitorSomething() < 0) { qemuDomainObjExitMonitor(); goto endjob; } if (qemuMonitorSomethingElse() < 0) { qemuDomainObjExitMonitor(); goto endjob; } if (qemuDomainObjExitMonitor() < 0) goto endjob; ... ret = 0; endjob: qemuDomainObjEndJob(); cleanup: ... return ret; Sometimes qemuDomainObjExitMonitor is in its own label instead of being explicitly called on every single error path. Sometimes qemuDomainObjEndJob is called explicitly followed by goto cleanup. In either case, it's pretty easy to get this wrong. It's too easy to jump to a wrong label (especially when moving code around) or forget to call the appropriate exit function before jumping to a label. So what if we make the code more robust by changing who needs to track whether we are in a monitor or have a job. Now it's the caller that tracks it while I think we could teach the job/monitor APIs themselves to track the state: bool inJob = false; bool inMonitor = false; if (doSomething() < 0) goto cleanup; if (qemuDomainObjBeginJob(..., &inJob) < 0) goto cleanup; if (doSomethingElse() < 0) goto cleanup; qemuDomainObjEnterMonitor(..., &inMonitor); if (qemuMonitorSomething() < 0) goto cleanup; if (qemuMonitorSomethingElse() < 0) goto cleanup; if (qemuDomainObjExitMonitor(..., &inMonitor) < 0) goto cleanup; ... ret = 0; cleanup: if (qemuDomainObjExitMonitor(..., &inMonitor) < 0) ret = -1; qemuDomainObjEndJob(..., &inJob); ... return ret; It's not a lot shorter or longer but it saves us from jumping to different labels and it makes sure we always exit the monitor and end the job. So is it worth the effort or do you thing it's even worse than before or do you have any other ideas? Thanks, Jirka

3 4

[libvirt] [PATCHv2] virsh: fix no error when pass a count <= 0 to setvcpus
by Luyao Huang 22 Oct '15

22 Oct '15

https://bugzilla.redhat.com/show_bug.cgi?id=1248277 When count <= 0, the client exit without set an error. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- v2: - use vshCommandOptUInt to forbid negative number, and check if count is zero. (thanks Peter and Andrea) tools/virsh-domain.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 4191548..3f032f4 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6873,7 +6873,7 @@ static bool cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - int count = 0; + unsigned int count = 0; bool ret = false; bool maximum = vshCommandOptBool(cmd, "maximum"); bool config = vshCommandOptBool(cmd, "config"); @@ -6900,9 +6900,14 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptInt(ctl, cmd, "count", &count) < 0 || count <= 0) + if (vshCommandOptUInt(ctl, cmd, "count", &count) < 0) goto cleanup; + if (count == 0) { + vshError(ctl, _("Can't set 0 processors for a VM")); + goto cleanup; + } + /* none of the options were specified */ if (!current && flags == 0) { if (virDomainSetVcpus(dom, count) != 0) -- 1.8.3.1

3 2

[libvirt] [PATCH] tests: Remove unused nodeinfo test data
by Andrea Bolognani 22 Oct '15

22 Oct '15

A bunch of files that we don't currently parse, and are very unlikely to ever start parsing, made their way into the nodeinfo test data. Get rid of them. --- tests/nodeinfodata/linux-f21-mustang/cpu/modalias | 1 - tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_driver | 1 - tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_governor_ro | 1 - tests/nodeinfodata/linux-rhelsa-3.19.0-mustang/cpu/modalias | 1 - tests/nodeinfodata/linux-test8/cpu/cpuidle/current_driver | 1 - tests/nodeinfodata/linux-test8/cpu/cpuidle/current_governor_ro | 1 - tests/nodeinfodata/linux-test8/cpu/sched_mc_power_savings | 1 - tests/nodeinfodata/linux-test8/cpu/sched_smt_power_savings | 1 - 8 files changed, 8 deletions(-) delete mode 100644 tests/nodeinfodata/linux-f21-mustang/cpu/modalias delete mode 100644 tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_driver delete mode 100644 tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_governor_ro delete mode 100644 tests/nodeinfodata/linux-rhelsa-3.19.0-mustang/cpu/modalias delete mode 100644 tests/nodeinfodata/linux-test8/cpu/cpuidle/current_driver delete mode 100644 tests/nodeinfodata/linux-test8/cpu/cpuidle/current_governor_ro delete mode 100644 tests/nodeinfodata/linux-test8/cpu/sched_mc_power_savings delete mode 100644 tests/nodeinfodata/linux-test8/cpu/sched_smt_power_savings diff --git a/tests/nodeinfodata/linux-f21-mustang/cpu/modalias b/tests/nodeinfodata/linux-f21-mustang/cpu/modalias deleted file mode 100644 index 18bb0b6..0000000 --- a/tests/nodeinfodata/linux-f21-mustang/cpu/modalias +++ /dev/null @@ -1 +0,0 @@ -cpu:type:aarch64:feature:,0000,0001,0002 diff --git a/tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_driver b/tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_driver deleted file mode 100644 index 621e94f..0000000 --- a/tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_driver +++ /dev/null @@ -1 +0,0 @@ -none diff --git a/tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_governor_ro b/tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_governor_ro deleted file mode 100644 index c35a724..0000000 --- a/tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_governor_ro +++ /dev/null @@ -1 +0,0 @@ -menu diff --git a/tests/nodeinfodata/linux-rhelsa-3.19.0-mustang/cpu/modalias b/tests/nodeinfodata/linux-rhelsa-3.19.0-mustang/cpu/modalias deleted file mode 100644 index 18bb0b6..0000000 --- a/tests/nodeinfodata/linux-rhelsa-3.19.0-mustang/cpu/modalias +++ /dev/null @@ -1 +0,0 @@ -cpu:type:aarch64:feature:,0000,0001,0002 diff --git a/tests/nodeinfodata/linux-test8/cpu/cpuidle/current_driver b/tests/nodeinfodata/linux-test8/cpu/cpuidle/current_driver deleted file mode 100644 index 57d5dd3..0000000 --- a/tests/nodeinfodata/linux-test8/cpu/cpuidle/current_driver +++ /dev/null @@ -1 +0,0 @@ -acpi_idle diff --git a/tests/nodeinfodata/linux-test8/cpu/cpuidle/current_governor_ro b/tests/nodeinfodata/linux-test8/cpu/cpuidle/current_governor_ro deleted file mode 100644 index c35a724..0000000 --- a/tests/nodeinfodata/linux-test8/cpu/cpuidle/current_governor_ro +++ /dev/null @@ -1 +0,0 @@ -menu diff --git a/tests/nodeinfodata/linux-test8/cpu/sched_mc_power_savings b/tests/nodeinfodata/linux-test8/cpu/sched_mc_power_savings deleted file mode 100644 index 573541a..0000000 --- a/tests/nodeinfodata/linux-test8/cpu/sched_mc_power_savings +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tests/nodeinfodata/linux-test8/cpu/sched_smt_power_savings b/tests/nodeinfodata/linux-test8/cpu/sched_smt_power_savings deleted file mode 100644 index 573541a..0000000 --- a/tests/nodeinfodata/linux-test8/cpu/sched_smt_power_savings +++ /dev/null @@ -1 +0,0 @@ -0 -- 2.4.3

2 2

[libvirt] [PATCHv2 0/3] improve the error report for virNodeAllocPages and virNodeGetFreePages
by Luyao Huang 22 Oct '15

22 Oct '15

v1: https://www.redhat.com/archives/libvir-list/2015-September/msg01054.html v2: -improve the error message -improve the code struct -add a new patch for rework the exist way to check node and page size Luyao Huang (3): util: split the virNumaGetHugePageInfoPath into separate function util: move the pagesize and node check and error report to one place util: Produce friendlier error message to user src/util/virnuma.c | 113 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 72 insertions(+), 41 deletions(-) -- 1.8.3.1

3 5

[libvirt] [PATCH] conf: Fix error message to use correct parameter
by John Ferlan 22 Oct '15

22 Oct '15

Fix a cut-n-paste error from commit id '35eecdde' where the previous check for max_sectors seems to have been copied, but the error message parameter not updated to be ioeventfd Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- pushing as trivial src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 02cc8ad..0c559d2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7985,7 +7985,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, if (ioeventfd && (def->ioeventfd = virTristateSwitchTypeFromString(ioeventfd)) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Malformed 'ioeventfd' value %s'"), max_sectors); + _("Malformed 'ioeventfd' value %s'"), ioeventfd); goto error; } -- 2.1.0

1 0

[libvirt] gem install ruby-libvirt fails on FreeBSD 10.2
by Rickard von Essen 21 Oct '15

21 Oct '15

Hi, Installing the ruby-libvirt gem fails on FreeBSD 10.2 since it can't locate the lib and include dir. Installing with: gem install ruby-libvirt -- --with-libvirt-include=/usr/local/include/libvirt --with-libvirt-lib=/usr/local/lib/libvirt.so works fine. It would be great if this worked out of the box, e.g. detects that it is building on BSD and applies the above settings as default, or at least it could be provided as a hint if running make fails to guide ruby noobs, like me. Regards, Rickard von Essen

2 2

[libvirt] [PATCH v2] use STRNEQ instead of !STREQ and new syntax-check rule to avoid !STREQ and !STRNEQ
by Ishmanpreet Kaur Khera 21 Oct '15

21 Oct '15

used STRNEQ instead of !STREQ to remove inconsistency and intoduced new syntax-check rule for !STREQ and !STRNEQ so that we don't end up in the same situation again. Signed-off-by: Ishmanpreet Kaur Khera <khera.ishman(a)gmail.com> --- cfg.mk | 18 ++++++++++++++++++ src/bhyve/bhyve_driver.c | 2 +- src/conf/network_conf.c | 4 ++-- src/conf/nwfilter_conf.c | 2 +- src/conf/nwfilter_params.c | 2 +- src/conf/storage_conf.c | 2 +- src/lxc/lxc_fuse.c | 4 ++-- src/openvz/openvz_driver.c | 2 +- src/qemu/qemu_command.c | 6 +++--- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_hotplug.c | 2 +- src/security/security_manager.c | 2 +- src/security/security_selinux.c | 12 ++++++------ src/storage/storage_backend_logical.c | 2 +- src/util/virfile.c | 2 +- src/util/virsystemd.c | 2 +- src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 2 +- src/xen/xend_internal.c | 2 +- src/xenconfig/xen_sxpr.c | 2 +- tests/commandtest.c | 10 +++++----- tests/securityselinuxlabeltest.c | 2 +- tests/virauthconfigtest.c | 2 +- tests/virbitmaptest.c | 12 ++++++------ tests/vircgrouptest.c | 2 +- tests/virkeyfiletest.c | 8 ++++---- tests/virnetsockettest.c | 2 +- tests/virtypedparamtest.c | 2 +- tests/viruritest.c | 16 ++++++++-------- 29 files changed, 74 insertions(+), 56 deletions(-) diff --git a/cfg.mk b/cfg.mk index e436434..7343dfc 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1011,6 +1011,18 @@ sc_prohibit_pthread_create: halt="avoid using 'pthread_create', use 'virThreadCreate' instead" \ $(_sc_search_regexp) +sc_prohibit_not_streq: + @prohibit='!STREQ' \ + exclude='exempt from syntax-check' \ + halt='Use STRNEQ instead of !STREQ' \ + $(_sc_search_regexp) + +sc_prohibit_not_strneq: + @prohibit='!STRNEQ' \ + exclude='exempt from syntax-check' \ + halt='Use STREQ instead of !STRNEQ' \ + $(_sc_search_regexp) + # We don't use this feature of maint.mk. prev_version_file = /dev/null @@ -1213,3 +1225,9 @@ exclude_file_name_regexp--sc_prohibit_sysconf_pagesize = \ exclude_file_name_regexp--sc_prohibit_pthread_create = \ ^(cfg\.mk|src/util/virthread\.c|tests/.*)$$ + +exclude_file_name_regexp--sc_prohibit_not_streq = \ + ^tests/.*\.[ch]$$ + +exclude_file_name_regexp--sc_prohibit_not_strneq = \ + ^tests/.*\.[ch]$$ diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index d44cf2c..e5d56e9 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -197,7 +197,7 @@ bhyveConnectOpen(virConnectPtr conn, if (conn->uri->server) return VIR_DRV_OPEN_DECLINED; - if (!STREQ_NULLABLE(conn->uri->path, "/system")) { + if (STRNEQ_NULLABLE(conn->uri->path, "/system")) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected bhyve URI path '%s', try bhyve:///system"), conn->uri->path); diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index c1cbd76..0ffb325 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -3042,7 +3042,7 @@ virNetworkLoadState(virNetworkObjListPtr nets, if (!(def = virNetworkDefParseXML(ctxt))) goto error; - if (!STREQ(name, def->name)) { + if (STRNEQ(name, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Network config filename '%s'" " does not match network name '%s'"), @@ -3152,7 +3152,7 @@ virNetworkObjPtr virNetworkLoadConfig(virNetworkObjListPtr nets, if (!(def = virNetworkDefParseFile(configFile))) goto error; - if (!STREQ(name, def->name)) { + if (STRNEQ(name, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Network config filename '%s'" " does not match network name '%s'"), diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index f7ccb75..ced8eb8 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -3082,7 +3082,7 @@ virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters, nwfilter = virNWFilterObjFindByUUID(nwfilters, def->uuid); if (nwfilter) { - if (!STREQ(def->name, nwfilter->def->name)) { + if (STRNEQ(def->name, nwfilter->def->name)) { virReportError(VIR_ERR_OPERATION_FAILED, _("filter with same UUID but different name " "('%s') already exists"), diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 0ac8baa..b6c6e78 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -444,7 +444,7 @@ virNWFilterVarCombIterEntryAreUniqueEntries(virNWFilterVarCombIterEntryPtr cie, /* should never occur to step on a NULL here */ return true; } - if (!STREQ(virNWFilterVarValueGetNthValue(tmp, cie->curValue), + if (STRNEQ(virNWFilterVarValueGetNthValue(tmp, cie->curValue), virNWFilterVarValueGetNthValue(tmp, i))) { isSame = false; break; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 9dae1a3..9b8abea 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1873,7 +1873,7 @@ virStoragePoolLoadState(virStoragePoolObjListPtr pools, if (!(def = virStoragePoolDefParseXML(ctxt))) goto error; - if (!STREQ(name, def->name)) { + if (STRNEQ(name, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Storage pool state file '%s' does not match " "pool name '%s'"), diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index 34a69cc..862dca3 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -90,7 +90,7 @@ static int lxcProcReaddir(const char *path, void *buf, off_t offset ATTRIBUTE_UNUSED, struct fuse_file_info *fi ATTRIBUTE_UNUSED) { - if (!STREQ(path, "/")) + if (STRNEQ(path, "/")) return -ENOENT; filler(buf, ".", NULL, 0); @@ -103,7 +103,7 @@ static int lxcProcReaddir(const char *path, void *buf, static int lxcProcOpen(const char *path ATTRIBUTE_UNUSED, struct fuse_file_info *fi ATTRIBUTE_UNUSED) { - if (!STREQ(path, fuse_meminfo_path)) + if (STRNEQ(path, fuse_meminfo_path)) return -ENOENT; if ((fi->flags & 3) != O_RDONLY) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index d78e2f5..b8c0f50 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -2048,7 +2048,7 @@ openvzUpdateDevice(virDomainDefPtr vmdef, cur = vmdef->fss[pos]; /* We only allow updating the quota */ - if (!STREQ(cur->src, fs->src) + if (STRNEQ(cur->src, fs->src) || cur->type != fs->type || cur->accessmode != fs->accessmode || cur->wrpolicy != fs->wrpolicy diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7b0879d..8824541 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3008,7 +3008,7 @@ qemuParseDriveURIString(virDomainDiskDefPtr def, virURIPtr uri, if (transp) *transp++ = 0; - if (!STREQ(uri->scheme, scheme)) { + if (STRNEQ(uri->scheme, scheme)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid transport/scheme '%s'"), uri->scheme); goto error; @@ -10027,7 +10027,7 @@ qemuBuildCommandLine(virConnectPtr conn, virDomainDiskDefPtr disk = def->disks[i]; if (disk->src->driverName != NULL && - !STREQ(disk->src->driverName, "qemu")) { + STRNEQ(disk->src->driverName, "qemu")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported driver name '%s' for disk '%s'"), disk->src->driverName, disk->src->path); @@ -12725,7 +12725,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, if (VIR_STRDUP(model, tokens[i]) < 0) goto cleanup; - if (!STREQ(model, "qemu32") && !STREQ(model, "qemu64")) { + if (STRNEQ(model, "qemu32") && STRNEQ(model, "qemu64")) { if (!(cpu = qemuInitGuestCPU(dom))) goto cleanup; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bdc0e67..890d8ed 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1061,7 +1061,7 @@ qemuDomainDefPostParse(virDomainDefPtr def, if (!STRPREFIX(def->os.machine, "pc-0.") && !STRPREFIX(def->os.machine, "pc-1.") && !STRPREFIX(def->os.machine, "pc-i440") && - !STREQ(def->os.machine, "pc") && + STRNEQ(def->os.machine, "pc") && !STRPREFIX(def->os.machine, "rhel")) break; addPCIRoot = true; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index afc5408..470ab6a 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -783,7 +783,7 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, const char *driverName = virDomainDiskGetDriver(disk); const char *src = virDomainDiskGetSource(disk); - if (driverName && !STREQ(driverName, "qemu")) { + if (driverName && STRNEQ(driverName, "qemu")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported driver name '%s' for disk '%s'"), driverName, src); diff --git a/src/security/security_manager.c b/src/security/security_manager.c index 5b05a47..07a0522 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -130,7 +130,7 @@ int virSecurityManagerStackAddNested(virSecurityManagerPtr stack, virSecurityManagerPtr nested) { - if (!STREQ("stack", stack->drv->name)) + if (STRNEQ("stack", stack->drv->name)) return -1; return virSecurityStackAddNested(stack, nested); } diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index c2464c2..80b0886 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2061,7 +2061,7 @@ virSecuritySELinuxSecurityVerify(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, if (secdef == NULL) return 0; - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " @@ -2092,7 +2092,7 @@ virSecuritySELinuxSetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UN return 0; VIR_DEBUG("label=%s", secdef->label); - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " @@ -2126,7 +2126,7 @@ virSecuritySELinuxSetSecurityChildProcessLabel(virSecurityManagerPtr mgr ATTRIBU return 0; VIR_DEBUG("label=%s", secdef->label); - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " @@ -2155,7 +2155,7 @@ virSecuritySELinuxSetSecurityDaemonSocketLabel(virSecurityManagerPtr mgr ATTRIBU if (!secdef || !secdef->label) return 0; - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " @@ -2202,7 +2202,7 @@ virSecuritySELinuxSetSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNU if (!secdef || !secdef->label) return 0; - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " @@ -2240,7 +2240,7 @@ virSecuritySELinuxClearSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_U if (!secdef || !secdef->label) return 0; - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index f1321db..536e617 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -147,7 +147,7 @@ virStorageBackendLogicalMakeVol(char **const groups, * (lvs outputs "[$lvname_vorigin] for field "origin" if the * lv is created with "--virtualsize"). */ - if (groups[1] && !STREQ(groups[1], "") && (groups[1][0] != '[')) { + if (groups[1] && STRNEQ(groups[1], "") && (groups[1][0] != '[')) { if (VIR_ALLOC(vol->target.backingStore) < 0) goto cleanup; diff --git a/src/util/virfile.c b/src/util/virfile.c index cba00cb5..e5cf2c5 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1008,7 +1008,7 @@ virFileStripSuffix(char *str, const char *suffix) if (len < suffixlen) return 0; - if (!STREQ(str + len - suffixlen, suffix)) + if (STRNEQ(str + len - suffixlen, suffix)) return 0; str[len-suffixlen] = '\0'; diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 54c409d..1354b08 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -375,7 +375,7 @@ int virSystemdTerminateMachine(const char *name, goto cleanup; if (error.code == VIR_ERR_ERROR && - !STREQ_NULLABLE("org.freedesktop.machine1.NoSuchMachine", + STRNEQ_NULLABLE("org.freedesktop.machine1.NoSuchMachine", error.str1)) { virReportErrorObject(&error); goto cleanup; diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index f6bb696..6f1cbfb 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -300,7 +300,7 @@ vzConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_DECLINED; /* From this point on, the connection is for us. */ - if (!STREQ_NULLABLE(conn->uri->path, "/system")) { + if (STRNEQ_NULLABLE(conn->uri->path, "/system")) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected Virtuozzo URI path '%s', try vz:///system"), conn->uri->path); diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index c24477c..89c9e89 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2026,7 +2026,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr def) } } else { if (def->os.nBootDevs != 0 || - !STREQ_NULLABLE(def->os.init, "/sbin/init") || + STRNEQ_NULLABLE(def->os.init, "/sbin/init") || (def->os.initargv != NULL && def->os.initargv[0] != NULL)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index b81c0b7..62ce930 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -2552,7 +2552,7 @@ xenDaemonDomainSetAutostart(virConnectPtr conn, if (autonode) { const char *val = (autonode->u.s.car->kind == SEXPR_VALUE ? autonode->u.s.car->u.value : NULL); - if (!val || (!STREQ(val, "ignore") && !STREQ(val, "start"))) { + if (!val || (STRNEQ(val, "ignore") && STRNEQ(val, "start"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unexpected value from on_xend_start")); goto error; diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index 033b0eb..7fc9c9d 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -2345,7 +2345,7 @@ xenFormatSxpr(virConnectPtr conn, /* Only xend <= 3.0.2 wants cdrom config here */ if (xendConfigVersion != XEND_CONFIG_VERSION_3_0_2) break; - if (!STREQ(def->disks[i]->dst, "hdc") || !src) + if (STRNEQ(def->disks[i]->dst, "hdc") || !src) break; virBufferEscapeSexpr(&buf, "(cdrom '%s')", src); diff --git a/tests/commandtest.c b/tests/commandtest.c index f001a39..cf5f44a 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -516,7 +516,7 @@ static int test13(const void *unused ATTRIBUTE_UNUSED) virCommandFree(cmd); cmd = NULL; - if (!STREQ(outactual, outexpect)) { + if (STRNEQ(outactual, outexpect)) { virtTestDifference(stderr, outexpect, outactual); goto cleanup; } @@ -580,15 +580,15 @@ static int test14(const void *unused ATTRIBUTE_UNUSED) if (!jointactual) goto cleanup; - if (!STREQ(outactual, outexpect)) { + if (STRNEQ(outactual, outexpect)) { virtTestDifference(stderr, outexpect, outactual); goto cleanup; } - if (!STREQ(erractual, errexpect)) { + if (STRNEQ(erractual, errexpect)) { virtTestDifference(stderr, errexpect, erractual); goto cleanup; } - if (!STREQ(jointactual, jointexpect)) { + if (STRNEQ(jointactual, jointexpect)) { virtTestDifference(stderr, jointexpect, jointactual); goto cleanup; } @@ -666,7 +666,7 @@ static int test16(const void *unused ATTRIBUTE_UNUSED) goto cleanup; } - if (!STREQ(outactual, outexpect)) { + if (STRNEQ(outactual, outexpect)) { virtTestDifference(stderr, outexpect, outactual); goto cleanup; } diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index 86660f4..c82b3f2 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -282,7 +282,7 @@ testSELinuxCheckLabels(testSELinuxFile *files, size_t nfiles) return -1; } } - if (!STREQ_NULLABLE(files[i].context, ctx)) { + if (STRNEQ_NULLABLE(files[i].context, ctx)) { virReportError(VIR_ERR_INTERNAL_ERROR, "File %s context '%s' did not match epected '%s'", files[i].file, ctx, files[i].context); diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c index d9e05fd..4c380b9 100644 --- a/tests/virauthconfigtest.c +++ b/tests/virauthconfigtest.c @@ -60,7 +60,7 @@ static int testAuthLookup(const void *args) if (data->expect) { if (!actual || - !STREQ(actual, data->expect)) { + STRNEQ(actual, data->expect)) { VIR_WARN("Expected value '%s' for '%s' '%s' '%s', but got '%s'", data->expect, data->hostname, data->service, data->credname, diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index a6e9a38..8e458d2 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -355,7 +355,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "")) + if (STRNEQ(str, "")) goto error; VIR_FREE(str); @@ -365,7 +365,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "0")) + if (STRNEQ(str, "0")) goto error; VIR_FREE(str); @@ -376,7 +376,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "0,4-5")) + if (STRNEQ(str, "0,4-5")) goto error; VIR_FREE(str); @@ -386,7 +386,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "0,4-6")) + if (STRNEQ(str, "0,4-6")) goto error; VIR_FREE(str); @@ -399,7 +399,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "0,4-6,13-16")) + if (STRNEQ(str, "0,4-6,13-16")) goto error; VIR_FREE(str); @@ -410,7 +410,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "0,4-6,13-16,62-63")) + if (STRNEQ(str, "0,4-6,13-16,62-63")) goto error; diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index 7a87640..731ecc4 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -662,7 +662,7 @@ static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED) } for (i = 0; i < EXPECTED_NCPUS; i++) { - if (!STREQ(params[i].field, VIR_DOMAIN_CPU_STATS_CPUTIME)) { + if (STRNEQ(params[i].field, VIR_DOMAIN_CPU_STATS_CPUTIME)) { fprintf(stderr, "Wrong parameter name value from virCgroupGetPercpuStats at %zu (is: %s)\n", i, params[i].field); diff --git a/tests/virkeyfiletest.c b/tests/virkeyfiletest.c index c31d2aa..3908fa8 100644 --- a/tests/virkeyfiletest.c +++ b/tests/virkeyfiletest.c @@ -70,17 +70,17 @@ static int testParse(const void *args ATTRIBUTE_UNUSED) VIR_DEBUG("Missing Value 'Foo.three'"); goto cleanup; } - if (!STREQ(virKeyFileGetValueString(kf, "Foo", "one"), + if (STRNEQ(virKeyFileGetValueString(kf, "Foo", "one"), "The first entry is here")) { VIR_DEBUG("Wrong value for 'Foo.one'"); goto cleanup; } - if (!STREQ(virKeyFileGetValueString(kf, "Foo", "two"), + if (STRNEQ(virKeyFileGetValueString(kf, "Foo", "two"), "The second entry")) { VIR_DEBUG("Wrong value for 'Foo.one'"); goto cleanup; } - if (!STREQ(virKeyFileGetValueString(kf, "Foo", "three"), + if (STRNEQ(virKeyFileGetValueString(kf, "Foo", "three"), "The third entry")) { VIR_DEBUG("Wrong value for 'Foo.one'"); goto cleanup; @@ -94,7 +94,7 @@ static int testParse(const void *args ATTRIBUTE_UNUSED) VIR_DEBUG("Missing Value 'Bar.one'"); goto cleanup; } - if (!STREQ(virKeyFileGetValueString(kf, "Bar", "one"), + if (STRNEQ(virKeyFileGetValueString(kf, "Bar", "one"), "The first entry in second group")) { VIR_DEBUG("Wrong value for 'Bar.one'"); goto cleanup; diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 1ababad..ce9eeab 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -406,7 +406,7 @@ static int testSocketSSH(const void *opaque) } buf[rv] = '\0'; - if (!STREQ(buf, data->expectOut)) { + if (STRNEQ(buf, data->expectOut)) { virtTestDifference(stderr, data->expectOut, buf); goto cleanup; } diff --git a/tests/virtypedparamtest.c b/tests/virtypedparamtest.c index b7bd72f..f4a5792 100644 --- a/tests/virtypedparamtest.c +++ b/tests/virtypedparamtest.c @@ -188,7 +188,7 @@ testTypedParamsGetStringList(const void *opaque ATTRIBUTE_UNUSED) goto cleanup; continue; } - if (!STREQLEN(strings[i], "bar", 3)) + if (STRNEQLEN(strings[i], "bar", 3)) goto cleanup; if (strings[i][3] != l++) goto cleanup; diff --git a/tests/viruritest.c b/tests/viruritest.c index 48b5865..e58e353 100644 --- a/tests/viruritest.c +++ b/tests/viruritest.c @@ -58,13 +58,13 @@ static int testURIParse(const void *args) if (!(uri = virURIParse(data->uri))) goto cleanup; - if (!STREQ(uri->scheme, data->scheme)) { + if (STRNEQ(uri->scheme, data->scheme)) { VIR_DEBUG("Expected scheme '%s', actual '%s'", data->scheme, uri->scheme); goto cleanup; } - if (!STREQ(uri->server, data->server)) { + if (STRNEQ(uri->server, data->server)) { VIR_DEBUG("Expected server '%s', actual '%s'", data->server, uri->server); goto cleanup; @@ -76,31 +76,31 @@ static int testURIParse(const void *args) goto cleanup; } - if (!STREQ_NULLABLE(uri->path, data->path)) { + if (STRNEQ_NULLABLE(uri->path, data->path)) { VIR_DEBUG("Expected path '%s', actual '%s'", data->path, uri->path); goto cleanup; } - if (!STREQ_NULLABLE(uri->query, data->query)) { + if (STRNEQ_NULLABLE(uri->query, data->query)) { VIR_DEBUG("Expected query '%s', actual '%s'", data->query, uri->query); goto cleanup; } - if (!STREQ_NULLABLE(uri->fragment, data->fragment)) { + if (STRNEQ_NULLABLE(uri->fragment, data->fragment)) { VIR_DEBUG("Expected fragment '%s', actual '%s'", data->fragment, uri->fragment); goto cleanup; } for (i = 0; data->params && data->params[i].name && i < uri->paramsCount; i++) { - if (!STREQ_NULLABLE(data->params[i].name, uri->params[i].name)) { + if (STRNEQ_NULLABLE(data->params[i].name, uri->params[i].name)) { VIR_DEBUG("Expected param name %zu '%s', actual '%s'", i, data->params[i].name, uri->params[i].name); goto cleanup; } - if (!STREQ_NULLABLE(data->params[i].value, uri->params[i].value)) { + if (STRNEQ_NULLABLE(data->params[i].value, uri->params[i].value)) { VIR_DEBUG("Expected param value %zu '%s', actual '%s'", i, data->params[i].value, uri->params[i].value); goto cleanup; @@ -123,7 +123,7 @@ static int testURIParse(const void *args) if (!(uristr = virURIFormat(uri))) goto cleanup; - if (!STREQ(uristr, data->uri_out)) { + if (STRNEQ(uristr, data->uri_out)) { VIR_DEBUG("URI did not roundtrip, expect '%s', actual '%s'", data->uri_out, uristr); goto cleanup; -- 1.9.1

2 1

[libvirt] [PATCH] vsh: print help more often
by Michal Privoznik 21 Oct '15

21 Oct '15

So, consider following scenario: virsh # migrate --help In this case migrate help is printed out. So far so good. However, you start writing this long migrate command (I bet you know the arguments there can get quite long), but then, at some point you need to print out the help. Something like this: virsh # migrate --copy-storage-all --migrate-disks --help In this specific case you just want to see the format that --migrate-disks accepts. So you append --help and expect help to be printed out. Well, it will not, because "--help" is taken as data to --migrate-disks. Therefore we will get this error instead: virsh # migrate --copy-storage-all --migrate-disks --help error: command 'migrate' requires <domain> option error: command 'migrate' requires <desturi> option Teach our parsing code, that --help may occur even in argument data, and therefore anywhere on the command line. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/vsh.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/vsh.c b/tools/vsh.c index e57c324..d67f5de 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1415,7 +1415,8 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser) /* if we encountered --help, replace parsed command with * 'help <cmdname>' */ for (tmpopt = first; tmpopt; tmpopt = tmpopt->next) { - if (STRNEQ(tmpopt->def->name, "help")) + if (STRNEQ(tmpopt->def->name, "help") && + STRNEQ_NULLABLE(tmpopt->data, "--help")) continue; const vshCmdDef *help = vshCmddefSearch("help"); -- 2.4.10

4 5

[libvirt] [PATCH] virsh: fix no error when pass a count <= 0 to setvcpus
by Luyao Huang 21 Oct '15

21 Oct '15

https://bugzilla.redhat.com/show_bug.cgi?id=1248277 When count <= 0, the client exit without set an error. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- tools/virsh-domain.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index f7edeeb..b6da684 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6744,8 +6744,12 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptInt(ctl, cmd, "count", &count) < 0 || count <= 0) + if (vshCommandOptInt(ctl, cmd, "count", &count) < 0) goto cleanup; + if (count <= 0) { + vshError(ctl, _("Invalid value '%d' for number of virtual CPUs"), count); + goto cleanup; + } /* none of the options were specified */ if (!current && flags == 0) { -- 1.8.3.1

4 9

[libvirt] [PATCH] conf: fix set the wrong fromconfig when specify addr in config
by Luyao Huang 21 Oct '15

21 Oct '15

https://bugzilla.redhat.com/show_bug.cgi?id=1238338#c6 If the user already specify address in xml, we will set the wrong $fromConfig, which will make libvirt output a wrong error message and make hot-plug fail when hot-plug a pci device (see commit 1e15be1 and 9a12b6c). Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/domain_addr.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index ca5803e..49769f7 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -376,6 +376,14 @@ virDomainPCIAddressReserveSlot(virDomainPCIAddressSetPtr addrs, return virDomainPCIAddressReserveAddr(addrs, addr, flags, true, false); } +static int +virDomainPCIAddressReserveSlotFromConfig(virDomainPCIAddressSetPtr addrs, + virDevicePCIAddressPtr addr, + virDomainPCIConnectFlags flags) +{ + return virDomainPCIAddressReserveAddr(addrs, addr, flags, true, true); +} + int virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr addrs, virDomainDeviceInfoPtr dev) @@ -408,7 +416,8 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr addrs, addrStr, flags, true)) goto cleanup; - ret = virDomainPCIAddressReserveSlot(addrs, &dev->addr.pci, flags); + ret = virDomainPCIAddressReserveSlotFromConfig(addrs, + &dev->addr.pci, flags); } else { ret = virDomainPCIAddressReserveNextSlot(addrs, dev, flags); } -- 1.8.3.1

2 1

[libvirt] [PATCH 00/12] Have 'buildVol' callers to clean up after themselves
by John Ferlan 21 Oct '15

21 Oct '15

NOTE: Although one may consider this a v2 of : http://www.redhat.com/archives/libvir-list/2015-October/msg00196.html It's more tackling the same problem a different way... Rather than pass a 'created' boolean around, this series investigated each of the 'createVol' and 'buildVol' paths in order to make more conscious decisions related to whether or not a volume was created and to handle failures after creation by deleting the volume/file. The end result is that all the 'buildVol' backends will now delete the volume they created on error paths leaving the storage driver to only need to remove the volume from the pool. As such this series will also revert a prior patch in this area. John Ferlan (12): storage: Remove duplicitous refreshVol in RBD buildVol storage: Remove duplicitous refreshVol in Sheepdog buildVol storage: Fix a resource leak in storageVolCreateXML storage: Track successful creation of LV for removal storage: On error unlink created file in virFileOpen{As|Forked} storage: On error rmdir created directory in virDirCreate[NoFork] storage: Rework error paths for virStorageBackendCreateExecCommand storage: Cleanup failures virStorageBackendCreateExecCommand storage: Cleanup failures in virStorageBackendCreateRaw storage: Pull volume removal from pool in storageVolDeleteInternal Revert "storage: Prior to creating a volume, refresh the pool" storage: On 'buildVol' failure don't delete the volume src/storage/storage_backend.c | 38 +++++++++++++++++------ src/storage/storage_backend_logical.c | 5 ++- src/storage/storage_backend_rbd.c | 3 -- src/storage/storage_backend_sheepdog.c | 5 +-- src/storage/storage_driver.c | 56 ++++++++++++++++++++-------------- src/util/virfile.c | 22 ++++++++++++- 6 files changed, 88 insertions(+), 41 deletions(-) -- 2.1.0

2 41

[libvirt] [PATCH v2] lxc: fuse mount for /proc/cpuinfo
by Cédric Bosdonnat 21 Oct '15

21 Oct '15

We already have a fuse mount to reflect the cgroup memory restrictions in the container. This commit adds the same for the number of available CPUs. Only the CPUs listed by virProcessGetAffinity are shown in the container's cpuinfo. --- src/lxc/lxc_container.c | 42 ++++++++++++------- src/lxc/lxc_fuse.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 133 insertions(+), 15 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index a433552..7ae13a8 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1055,24 +1055,38 @@ static int lxcContainerMountProcFuse(virDomainDefPtr def, const char *stateDir) { int ret; - char *meminfo_path = NULL; + char *src_path = NULL; + char *dst_path = NULL; + const char *paths[] = {"meminfo", "cpuinfo"}; + size_t i; - VIR_DEBUG("Mount /proc/meminfo stateDir=%s", stateDir); + for (i = 0; i < 2; i++) { + VIR_DEBUG("Mount /proc/%s stateDir=%s", paths[i], stateDir); + + if ((ret = virAsprintf(&src_path, + "/.oldroot/%s/%s.fuse/%s", + stateDir, + def->name, + paths[i])) < 0) + return ret; + + if ((ret = virAsprintf(&dst_path, + "/proc/%s", + paths[i])) < 0) { + VIR_FREE(src_path); + return ret; + } - if ((ret = virAsprintf(&meminfo_path, - "/.oldroot/%s/%s.fuse/meminfo", - stateDir, - def->name)) < 0) - return ret; + if ((ret = mount(src_path, dst_path, + NULL, MS_BIND, NULL)) < 0) { + virReportSystemError(errno, + _("Failed to mount %s on %s"), + src_path, dst_path); + } - if ((ret = mount(meminfo_path, "/proc/meminfo", - NULL, MS_BIND, NULL)) < 0) { - virReportSystemError(errno, - _("Failed to mount %s on /proc/meminfo"), - meminfo_path); + VIR_FREE(src_path); + VIR_FREE(dst_path); } - - VIR_FREE(meminfo_path); return ret; } #else diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index 34a69cc..0d60434 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -42,6 +42,58 @@ #if WITH_FUSE static const char *fuse_meminfo_path = "/meminfo"; +static const char *fuse_cpuinfo_path = "/cpuinfo"; + +static virBufferPtr lxcProcComputeCpuinfo(void) { + FILE *fd = NULL; + char *line = NULL; + size_t n; + bool writeProc = false; + virBuffer buffer = VIR_BUFFER_INITIALIZER; + virBufferPtr new_cpuinfo = &buffer; + pid_t pid; + virBitmapPtr cpuAffinity = NULL; + + fd = fopen("/proc/cpuinfo", "r"); + if (fd == NULL) { + virReportSystemError(errno, "%s", _("Cannot open /proc/cpuinfo")); + goto error; + } + + pid = getpid(); + if (!(cpuAffinity = virProcessGetAffinity(pid))) + goto error; + + while (getline(&line, &n, fd) > 0) { + if (STRPREFIX(line, "processor\t:")) { + unsigned long cpuid = 0; + char *suffix = NULL; + if (virStrToLong_ul(line + 12, &suffix, 10, &cpuid) < 0) + goto error; + + if (virBitmapGetBit(cpuAffinity, cpuid, &writeProc) < 0) + goto error; + } + + if (writeProc) { + virBufferAdd(new_cpuinfo, line, -1); + + if (virBufferCheckError(new_cpuinfo) < 0) + goto error; + } + } + + cleanup: + VIR_FREE(line); + VIR_FORCE_FCLOSE(fd); + virBitmapFree(cpuAffinity); + return new_cpuinfo; + + error: + virBufferFreeAndReset(new_cpuinfo); + new_cpuinfo = NULL; + goto cleanup; +} static int lxcProcGetattr(const char *path, struct stat *stbuf) { @@ -50,6 +102,7 @@ static int lxcProcGetattr(const char *path, struct stat *stbuf) struct stat sb; struct fuse_context *context = fuse_get_context(); virDomainDefPtr def = (virDomainDefPtr)context->private_data; + virBufferPtr cpuinfo = NULL; memset(stbuf, 0, sizeof(struct stat)); if (virAsprintf(&mempath, "/proc/%s", path) < 0) @@ -76,12 +129,36 @@ static int lxcProcGetattr(const char *path, struct stat *stbuf) stbuf->st_atime = sb.st_atime; stbuf->st_ctime = sb.st_ctime; stbuf->st_mtime = sb.st_mtime; + } else if (STREQ(path, fuse_cpuinfo_path)) { + if (!(cpuinfo = lxcProcComputeCpuinfo())) { + res = -EIO; + goto cleanup; + } + + if (stat(mempath, &sb) < 0) { + res = -errno; + goto cleanup; + } + + stbuf->st_uid = def->idmap.uidmap ? def->idmap.uidmap[0].target : 0; + stbuf->st_gid = def->idmap.gidmap ? def->idmap.gidmap[0].target : 0; + stbuf->st_mode = sb.st_mode; + stbuf->st_nlink = 1; + stbuf->st_blksize = sb.st_blksize; + stbuf->st_size = virBufferUse(cpuinfo); + stbuf->st_blocks = stbuf->st_size / 512; + if (stbuf->st_size % 512 != 0) + stbuf->st_blocks++; + stbuf->st_atime = sb.st_atime; + stbuf->st_ctime = sb.st_ctime; + stbuf->st_mtime = sb.st_mtime; } else { res = -ENOENT; } cleanup: VIR_FREE(mempath); + virBufferFreeAndReset(cpuinfo); return res; } @@ -96,6 +173,7 @@ static int lxcProcReaddir(const char *path, void *buf, filler(buf, ".", NULL, 0); filler(buf, "..", NULL, 0); filler(buf, fuse_meminfo_path + 1, NULL, 0); + filler(buf, fuse_cpuinfo_path + 1, NULL, 0); return 0; } @@ -103,7 +181,8 @@ static int lxcProcReaddir(const char *path, void *buf, static int lxcProcOpen(const char *path ATTRIBUTE_UNUSED, struct fuse_file_info *fi ATTRIBUTE_UNUSED) { - if (!STREQ(path, fuse_meminfo_path)) + if (!STREQ(path, fuse_meminfo_path) && + !STREQ(path, fuse_cpuinfo_path)) return -ENOENT; if ((fi->flags & 3) != O_RDONLY) @@ -234,6 +313,28 @@ static int lxcProcReadMeminfo(char *hostpath, virDomainDefPtr def, return res; } +static int lxcProcReadCpuinfo(char *buf, size_t size, off_t offset) +{ + virBufferPtr new_cpuinfo = lxcProcComputeCpuinfo(); + int new_size = -1; + int copied = -1; + + if (!new_cpuinfo) + goto error; + + copied = size; + new_size = virBufferUse(new_cpuinfo); + + if ((new_size - offset) < size) + copied = new_size - offset; + + memcpy(buf, virBufferCurrentContent(new_cpuinfo) + offset, copied); + + error: + virBufferFreeAndReset(new_cpuinfo); + return copied; +} + static int lxcProcRead(const char *path ATTRIBUTE_UNUSED, char *buf ATTRIBUTE_UNUSED, size_t size ATTRIBUTE_UNUSED, @@ -254,6 +355,9 @@ static int lxcProcRead(const char *path ATTRIBUTE_UNUSED, if (STREQ(path, fuse_meminfo_path)) { if ((res = lxcProcReadMeminfo(hostpath, def, buf, size, offset)) < 0) res = lxcProcHostRead(hostpath, buf, size, offset); + } else if (STREQ(path, fuse_cpuinfo_path)) { + if ((res = lxcProcReadCpuinfo(buf, size, offset)) < 0) + res = lxcProcHostRead(hostpath, buf, size, offset); } VIR_FREE(hostpath); -- 2.1.4

6 18

[libvirt] [PATCH 0/3] NEWS: Split releases by year
by Andrea Bolognani 20 Oct '15

20 Oct '15

As agreed, I've followed up with the cleanups by splitting the huge news.html.in file into separate, smaller files, one per year. Along with the split I've also included a fixed XSLT stylesheet so that we can start shipping a meaningful NEWS file again. Cheers. Andrea Bolognani (3): NEWS: Split releases by year (2005-2011) NEWS: Split releases by year (2012-2015) NEWS: Fix XSLT stylesheet docs/news-2005.html.in | 28 + docs/news-2006.html.in | 354 + docs/news-2007.html.in | 534 ++ docs/news-2008.html.in | 580 ++ docs/news-2009.html.in | 1603 ++++ docs/news-2010.html.in | 2218 ++++++ docs/news-2011.html.in | 3314 +++++++++ docs/news-2012.html.in | 3012 ++++++++ docs/news-2013.html.in | 3675 ++++++++++ docs/news-2014.html.in | 3418 +++++++++ docs/news.html.in | 18544 +---------------------------------------------- docs/news.xsl | 30 +- 12 files changed, 18759 insertions(+), 18551 deletions(-) create mode 100644 docs/news-2005.html.in create mode 100644 docs/news-2006.html.in create mode 100644 docs/news-2007.html.in create mode 100644 docs/news-2008.html.in create mode 100644 docs/news-2009.html.in create mode 100644 docs/news-2010.html.in create mode 100644 docs/news-2011.html.in create mode 100644 docs/news-2012.html.in create mode 100644 docs/news-2013.html.in create mode 100644 docs/news-2014.html.in -- 2.4.3

3 6

[libvirt] [PATCH 1/2] Prefer STREQ and STRNEQ
by Ishmanpreet Khera 20 Oct '15

20 Oct '15

use STRNEQ instead of !STREQ to remove inconsistency. Signed-off-by: Ishmanpreet Kaur Khera <khera.ishman(a)gmail.com> --- src/bhyve/bhyve_driver.c | 2 +- src/conf/network_conf.c | 4 ++-- src/conf/nwfilter_conf.c | 2 +- src/conf/nwfilter_params.c | 2 +- src/conf/storage_conf.c | 2 +- src/lxc/lxc_fuse.c | 4 ++-- src/openvz/openvz_driver.c | 2 +- src/qemu/qemu_command.c | 6 +++--- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_hotplug.c | 2 +- src/security/security_manager.c | 2 +- src/security/security_selinux.c | 12 ++++++------ src/storage/storage_backend_logical.c | 2 +- src/util/virfile.c | 2 +- src/util/virsystemd.c | 2 +- src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 2 +- src/xen/xend_internal.c | 2 +- src/xenconfig/xen_sxpr.c | 2 +- tests/commandtest.c | 10 +++++----- tests/securityselinuxlabeltest.c | 2 +- tests/virauthconfigtest.c | 2 +- tests/virbitmaptest.c | 12 ++++++------ tests/vircgrouptest.c | 2 +- tests/virkeyfiletest.c | 8 ++++---- tests/virnetsockettest.c | 2 +- tests/virtypedparamtest.c | 2 +- tests/viruritest.c | 16 ++++++++-------- 28 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index d44cf2c..e5d56e9 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -197,7 +197,7 @@ bhyveConnectOpen(virConnectPtr conn, if (conn->uri->server) return VIR_DRV_OPEN_DECLINED; - if (!STREQ_NULLABLE(conn->uri->path, "/system")) { + if (STRNEQ_NULLABLE(conn->uri->path, "/system")) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected bhyve URI path '%s', try bhyve:///system"), conn->uri->path); diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index c1cbd76..0ffb325 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -3042,7 +3042,7 @@ virNetworkLoadState(virNetworkObjListPtr nets, if (!(def = virNetworkDefParseXML(ctxt))) goto error; - if (!STREQ(name, def->name)) { + if (STRNEQ(name, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Network config filename '%s'" " does not match network name '%s'"), @@ -3152,7 +3152,7 @@ virNetworkObjPtr virNetworkLoadConfig(virNetworkObjListPtr nets, if (!(def = virNetworkDefParseFile(configFile))) goto error; - if (!STREQ(name, def->name)) { + if (STRNEQ(name, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Network config filename '%s'" " does not match network name '%s'"), diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index aed82ad..08c4264 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -3082,7 +3082,7 @@ virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters, nwfilter = virNWFilterObjFindByUUID(nwfilters, def->uuid); if (nwfilter) { - if (!STREQ(def->name, nwfilter->def->name)) { + if (STRNEQ(def->name, nwfilter->def->name)) { virReportError(VIR_ERR_OPERATION_FAILED, _("filter with same UUID but different name " "('%s') already exists"), diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 0ac8baa..b6c6e78 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -444,7 +444,7 @@ virNWFilterVarCombIterEntryAreUniqueEntries(virNWFilterVarCombIterEntryPtr cie, /* should never occur to step on a NULL here */ return true; } - if (!STREQ(virNWFilterVarValueGetNthValue(tmp, cie->curValue), + if (STRNEQ(virNWFilterVarValueGetNthValue(tmp, cie->curValue), virNWFilterVarValueGetNthValue(tmp, i))) { isSame = false; break; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 9dae1a3..9b8abea 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1873,7 +1873,7 @@ virStoragePoolLoadState(virStoragePoolObjListPtr pools, if (!(def = virStoragePoolDefParseXML(ctxt))) goto error; - if (!STREQ(name, def->name)) { + if (STRNEQ(name, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Storage pool state file '%s' does not match " "pool name '%s'"), diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index 34a69cc..862dca3 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -90,7 +90,7 @@ static int lxcProcReaddir(const char *path, void *buf, off_t offset ATTRIBUTE_UNUSED, struct fuse_file_info *fi ATTRIBUTE_UNUSED) { - if (!STREQ(path, "/")) + if (STRNEQ(path, "/")) return -ENOENT; filler(buf, ".", NULL, 0); @@ -103,7 +103,7 @@ static int lxcProcReaddir(const char *path, void *buf, static int lxcProcOpen(const char *path ATTRIBUTE_UNUSED, struct fuse_file_info *fi ATTRIBUTE_UNUSED) { - if (!STREQ(path, fuse_meminfo_path)) + if (STRNEQ(path, fuse_meminfo_path)) return -ENOENT; if ((fi->flags & 3) != O_RDONLY) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index d78e2f5..b8c0f50 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -2048,7 +2048,7 @@ openvzUpdateDevice(virDomainDefPtr vmdef, cur = vmdef->fss[pos]; /* We only allow updating the quota */ - if (!STREQ(cur->src, fs->src) + if (STRNEQ(cur->src, fs->src) || cur->type != fs->type || cur->accessmode != fs->accessmode || cur->wrpolicy != fs->wrpolicy diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f727d0b..d664bf1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3008,7 +3008,7 @@ qemuParseDriveURIString(virDomainDiskDefPtr def, virURIPtr uri, if (transp) *transp++ = 0; - if (!STREQ(uri->scheme, scheme)) { + if (STRNEQ(uri->scheme, scheme)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid transport/scheme '%s'"), uri->scheme); goto error; @@ -10030,7 +10030,7 @@ qemuBuildCommandLine(virConnectPtr conn, virDomainDiskDefPtr disk = def->disks[i]; if (disk->src->driverName != NULL && - !STREQ(disk->src->driverName, "qemu")) { + STRNEQ(disk->src->driverName, "qemu")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported driver name '%s' for disk '%s'"), disk->src->driverName, disk->src->path); @@ -12728,7 +12728,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, if (VIR_STRDUP(model, tokens[i]) < 0) goto cleanup; - if (!STREQ(model, "qemu32") && !STREQ(model, "qemu64")) { + if (STRNEQ(model, "qemu32") && STRNEQ(model, "qemu64")) { if (!(cpu = qemuInitGuestCPU(dom))) goto cleanup; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bdc0e67..890d8ed 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1061,7 +1061,7 @@ qemuDomainDefPostParse(virDomainDefPtr def, if (!STRPREFIX(def->os.machine, "pc-0.") && !STRPREFIX(def->os.machine, "pc-1.") && !STRPREFIX(def->os.machine, "pc-i440") && - !STREQ(def->os.machine, "pc") && + STRNEQ(def->os.machine, "pc") && !STRPREFIX(def->os.machine, "rhel")) break; addPCIRoot = true; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index afc5408..470ab6a 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -783,7 +783,7 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, const char *driverName = virDomainDiskGetDriver(disk); const char *src = virDomainDiskGetSource(disk); - if (driverName && !STREQ(driverName, "qemu")) { + if (driverName && STRNEQ(driverName, "qemu")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported driver name '%s' for disk '%s'"), driverName, src); diff --git a/src/security/security_manager.c b/src/security/security_manager.c index 5b05a47..07a0522 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -130,7 +130,7 @@ int virSecurityManagerStackAddNested(virSecurityManagerPtr stack, virSecurityManagerPtr nested) { - if (!STREQ("stack", stack->drv->name)) + if (STRNEQ("stack", stack->drv->name)) return -1; return virSecurityStackAddNested(stack, nested); } diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index c2464c2..80b0886 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2061,7 +2061,7 @@ virSecuritySELinuxSecurityVerify(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, if (secdef == NULL) return 0; - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " @@ -2092,7 +2092,7 @@ virSecuritySELinuxSetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UN return 0; VIR_DEBUG("label=%s", secdef->label); - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " @@ -2126,7 +2126,7 @@ virSecuritySELinuxSetSecurityChildProcessLabel(virSecurityManagerPtr mgr ATTRIBU return 0; VIR_DEBUG("label=%s", secdef->label); - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " @@ -2155,7 +2155,7 @@ virSecuritySELinuxSetSecurityDaemonSocketLabel(virSecurityManagerPtr mgr ATTRIBU if (!secdef || !secdef->label) return 0; - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " @@ -2202,7 +2202,7 @@ virSecuritySELinuxSetSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNU if (!secdef || !secdef->label) return 0; - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " @@ -2240,7 +2240,7 @@ virSecuritySELinuxClearSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_U if (!secdef || !secdef->label) return 0; - if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) { + if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 070f2bd..90bfa58 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -147,7 +147,7 @@ virStorageBackendLogicalMakeVol(char **const groups, * (lvs outputs "[$lvname_vorigin] for field "origin" if the * lv is created with "--virtualsize"). */ - if (groups[1] && !STREQ(groups[1], "") && (groups[1][0] != '[')) { + if (groups[1] && STRNEQ(groups[1], "") && (groups[1][0] != '[')) { if (VIR_ALLOC(vol->target.backingStore) < 0) goto cleanup; diff --git a/src/util/virfile.c b/src/util/virfile.c index a81f04c..33c7ff1 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1008,7 +1008,7 @@ virFileStripSuffix(char *str, const char *suffix) if (len < suffixlen) return 0; - if (!STREQ(str + len - suffixlen, suffix)) + if (STRNEQ(str + len - suffixlen, suffix)) return 0; str[len-suffixlen] = '\0'; diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 54c409d..1354b08 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -375,7 +375,7 @@ int virSystemdTerminateMachine(const char *name, goto cleanup; if (error.code == VIR_ERR_ERROR && - !STREQ_NULLABLE("org.freedesktop.machine1.NoSuchMachine", + STRNEQ_NULLABLE("org.freedesktop.machine1.NoSuchMachine", error.str1)) { virReportErrorObject(&error); goto cleanup; diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index d0b4692..c4ba982 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -301,7 +301,7 @@ vzConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_DECLINED; /* From this point on, the connection is for us. */ - if (!STREQ_NULLABLE(conn->uri->path, "/system")) { + if (STRNEQ_NULLABLE(conn->uri->path, "/system")) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected Virtuozzo URI path '%s', try vz:///system"), conn->uri->path); diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 7a2afd6..d14c732 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2026,7 +2026,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr def) } } else { if (def->os.nBootDevs != 0 || - !STREQ_NULLABLE(def->os.init, "/sbin/init") || + STRNEQ_NULLABLE(def->os.init, "/sbin/init") || (def->os.initargv != NULL && def->os.initargv[0] != NULL)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index b81c0b7..62ce930 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -2552,7 +2552,7 @@ xenDaemonDomainSetAutostart(virConnectPtr conn, if (autonode) { const char *val = (autonode->u.s.car->kind == SEXPR_VALUE ? autonode->u.s.car->u.value : NULL); - if (!val || (!STREQ(val, "ignore") && !STREQ(val, "start"))) { + if (!val || (STRNEQ(val, "ignore") && STRNEQ(val, "start"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unexpected value from on_xend_start")); goto error; diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index 033b0eb..7fc9c9d 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -2345,7 +2345,7 @@ xenFormatSxpr(virConnectPtr conn, /* Only xend <= 3.0.2 wants cdrom config here */ if (xendConfigVersion != XEND_CONFIG_VERSION_3_0_2) break; - if (!STREQ(def->disks[i]->dst, "hdc") || !src) + if (STRNEQ(def->disks[i]->dst, "hdc") || !src) break; virBufferEscapeSexpr(&buf, "(cdrom '%s')", src); diff --git a/tests/commandtest.c b/tests/commandtest.c index f001a39..cf5f44a 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -516,7 +516,7 @@ static int test13(const void *unused ATTRIBUTE_UNUSED) virCommandFree(cmd); cmd = NULL; - if (!STREQ(outactual, outexpect)) { + if (STRNEQ(outactual, outexpect)) { virtTestDifference(stderr, outexpect, outactual); goto cleanup; } @@ -580,15 +580,15 @@ static int test14(const void *unused ATTRIBUTE_UNUSED) if (!jointactual) goto cleanup; - if (!STREQ(outactual, outexpect)) { + if (STRNEQ(outactual, outexpect)) { virtTestDifference(stderr, outexpect, outactual); goto cleanup; } - if (!STREQ(erractual, errexpect)) { + if (STRNEQ(erractual, errexpect)) { virtTestDifference(stderr, errexpect, erractual); goto cleanup; } - if (!STREQ(jointactual, jointexpect)) { + if (STRNEQ(jointactual, jointexpect)) { virtTestDifference(stderr, jointexpect, jointactual); goto cleanup; } @@ -666,7 +666,7 @@ static int test16(const void *unused ATTRIBUTE_UNUSED) goto cleanup; } - if (!STREQ(outactual, outexpect)) { + if (STRNEQ(outactual, outexpect)) { virtTestDifference(stderr, outexpect, outactual); goto cleanup; } diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index 86660f4..c82b3f2 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -282,7 +282,7 @@ testSELinuxCheckLabels(testSELinuxFile *files, size_t nfiles) return -1; } } - if (!STREQ_NULLABLE(files[i].context, ctx)) { + if (STRNEQ_NULLABLE(files[i].context, ctx)) { virReportError(VIR_ERR_INTERNAL_ERROR, "File %s context '%s' did not match epected '%s'", files[i].file, ctx, files[i].context); diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c index d9e05fd..4c380b9 100644 --- a/tests/virauthconfigtest.c +++ b/tests/virauthconfigtest.c @@ -60,7 +60,7 @@ static int testAuthLookup(const void *args) if (data->expect) { if (!actual || - !STREQ(actual, data->expect)) { + STRNEQ(actual, data->expect)) { VIR_WARN("Expected value '%s' for '%s' '%s' '%s', but got '%s'", data->expect, data->hostname, data->service, data->credname, diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index a6e9a38..8e458d2 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -355,7 +355,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "")) + if (STRNEQ(str, "")) goto error; VIR_FREE(str); @@ -365,7 +365,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "0")) + if (STRNEQ(str, "0")) goto error; VIR_FREE(str); @@ -376,7 +376,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "0,4-5")) + if (STRNEQ(str, "0,4-5")) goto error; VIR_FREE(str); @@ -386,7 +386,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "0,4-6")) + if (STRNEQ(str, "0,4-6")) goto error; VIR_FREE(str); @@ -399,7 +399,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "0,4-6,13-16")) + if (STRNEQ(str, "0,4-6,13-16")) goto error; VIR_FREE(str); @@ -410,7 +410,7 @@ test6(const void *v ATTRIBUTE_UNUSED) if (!str) goto error; - if (!STREQ(str, "0,4-6,13-16,62-63")) + if (STRNEQ(str, "0,4-6,13-16,62-63")) goto error; diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index 7a87640..731ecc4 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -662,7 +662,7 @@ static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED) } for (i = 0; i < EXPECTED_NCPUS; i++) { - if (!STREQ(params[i].field, VIR_DOMAIN_CPU_STATS_CPUTIME)) { + if (STRNEQ(params[i].field, VIR_DOMAIN_CPU_STATS_CPUTIME)) { fprintf(stderr, "Wrong parameter name value from virCgroupGetPercpuStats at %zu (is: %s)\n", i, params[i].field); diff --git a/tests/virkeyfiletest.c b/tests/virkeyfiletest.c index c31d2aa..3908fa8 100644 --- a/tests/virkeyfiletest.c +++ b/tests/virkeyfiletest.c @@ -70,17 +70,17 @@ static int testParse(const void *args ATTRIBUTE_UNUSED) VIR_DEBUG("Missing Value 'Foo.three'"); goto cleanup; } - if (!STREQ(virKeyFileGetValueString(kf, "Foo", "one"), + if (STRNEQ(virKeyFileGetValueString(kf, "Foo", "one"), "The first entry is here")) { VIR_DEBUG("Wrong value for 'Foo.one'"); goto cleanup; } - if (!STREQ(virKeyFileGetValueString(kf, "Foo", "two"), + if (STRNEQ(virKeyFileGetValueString(kf, "Foo", "two"), "The second entry")) { VIR_DEBUG("Wrong value for 'Foo.one'"); goto cleanup; } - if (!STREQ(virKeyFileGetValueString(kf, "Foo", "three"), + if (STRNEQ(virKeyFileGetValueString(kf, "Foo", "three"), "The third entry")) { VIR_DEBUG("Wrong value for 'Foo.one'"); goto cleanup; @@ -94,7 +94,7 @@ static int testParse(const void *args ATTRIBUTE_UNUSED) VIR_DEBUG("Missing Value 'Bar.one'"); goto cleanup; } - if (!STREQ(virKeyFileGetValueString(kf, "Bar", "one"), + if (STRNEQ(virKeyFileGetValueString(kf, "Bar", "one"), "The first entry in second group")) { VIR_DEBUG("Wrong value for 'Bar.one'"); goto cleanup; diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 1ababad..ce9eeab 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -406,7 +406,7 @@ static int testSocketSSH(const void *opaque) } buf[rv] = '\0'; - if (!STREQ(buf, data->expectOut)) { + if (STRNEQ(buf, data->expectOut)) { virtTestDifference(stderr, data->expectOut, buf); goto cleanup; } diff --git a/tests/virtypedparamtest.c b/tests/virtypedparamtest.c index b7bd72f..f4a5792 100644 --- a/tests/virtypedparamtest.c +++ b/tests/virtypedparamtest.c @@ -188,7 +188,7 @@ testTypedParamsGetStringList(const void *opaque ATTRIBUTE_UNUSED) goto cleanup; continue; } - if (!STREQLEN(strings[i], "bar", 3)) + if (STRNEQLEN(strings[i], "bar", 3)) goto cleanup; if (strings[i][3] != l++) goto cleanup; diff --git a/tests/viruritest.c b/tests/viruritest.c index 48b5865..e58e353 100644 --- a/tests/viruritest.c +++ b/tests/viruritest.c @@ -58,13 +58,13 @@ static int testURIParse(const void *args) if (!(uri = virURIParse(data->uri))) goto cleanup; - if (!STREQ(uri->scheme, data->scheme)) { + if (STRNEQ(uri->scheme, data->scheme)) { VIR_DEBUG("Expected scheme '%s', actual '%s'", data->scheme, uri->scheme); goto cleanup; } - if (!STREQ(uri->server, data->server)) { + if (STRNEQ(uri->server, data->server)) { VIR_DEBUG("Expected server '%s', actual '%s'", data->server, uri->server); goto cleanup; @@ -76,31 +76,31 @@ static int testURIParse(const void *args) goto cleanup; } - if (!STREQ_NULLABLE(uri->path, data->path)) { + if (STRNEQ_NULLABLE(uri->path, data->path)) { VIR_DEBUG("Expected path '%s', actual '%s'", data->path, uri->path); goto cleanup; } - if (!STREQ_NULLABLE(uri->query, data->query)) { + if (STRNEQ_NULLABLE(uri->query, data->query)) { VIR_DEBUG("Expected query '%s', actual '%s'", data->query, uri->query); goto cleanup; } - if (!STREQ_NULLABLE(uri->fragment, data->fragment)) { + if (STRNEQ_NULLABLE(uri->fragment, data->fragment)) { VIR_DEBUG("Expected fragment '%s', actual '%s'", data->fragment, uri->fragment); goto cleanup; } for (i = 0; data->params && data->params[i].name && i < uri->paramsCount; i++) { - if (!STREQ_NULLABLE(data->params[i].name, uri->params[i].name)) { + if (STRNEQ_NULLABLE(data->params[i].name, uri->params[i].name)) { VIR_DEBUG("Expected param name %zu '%s', actual '%s'", i, data->params[i].name, uri->params[i].name); goto cleanup; } - if (!STREQ_NULLABLE(data->params[i].value, uri->params[i].value)) { + if (STRNEQ_NULLABLE(data->params[i].value, uri->params[i].value)) { VIR_DEBUG("Expected param value %zu '%s', actual '%s'", i, data->params[i].value, uri->params[i].value); goto cleanup; @@ -123,7 +123,7 @@ static int testURIParse(const void *args) if (!(uristr = virURIFormat(uri))) goto cleanup; - if (!STREQ(uristr, data->uri_out)) { + if (STRNEQ(uristr, data->uri_out)) { VIR_DEBUG("URI did not roundtrip, expect '%s', actual '%s'", data->uri_out, uristr); goto cleanup; -- 1.9.1

2 1

[libvirt] [PATCH 2/2] Prefer STREQ and STRNEQ
by Ishmanpreet Khera 20 Oct '15

20 Oct '15

new syntax-check rule for !STREQ and !STRNEQ so that we don't end up in the same situation again. Signed-off-by: Ishmanpreet Kaur Khera <khera.ishman(a)gmail.com> --- cfg.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/cfg.mk b/cfg.mk index e436434..7343dfc 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1011,6 +1011,18 @@ sc_prohibit_pthread_create: halt="avoid using 'pthread_create', use 'virThreadCreate' instead" \ $(_sc_search_regexp) +sc_prohibit_not_streq: + @prohibit='!STREQ' \ + exclude='exempt from syntax-check' \ + halt='Use STRNEQ instead of !STREQ' \ + $(_sc_search_regexp) + +sc_prohibit_not_strneq: + @prohibit='!STRNEQ' \ + exclude='exempt from syntax-check' \ + halt='Use STREQ instead of !STRNEQ' \ + $(_sc_search_regexp) + # We don't use this feature of maint.mk. prev_version_file = /dev/null @@ -1213,3 +1225,9 @@ exclude_file_name_regexp--sc_prohibit_sysconf_pagesize = \ exclude_file_name_regexp--sc_prohibit_pthread_create = \ ^(cfg\.mk|src/util/virthread\.c|tests/.*)$$ + +exclude_file_name_regexp--sc_prohibit_not_streq = \ + ^tests/.*\.[ch]$$ + +exclude_file_name_regexp--sc_prohibit_not_strneq = \ + ^tests/.*\.[ch]$$ -- 1.9.1

1 1

[libvirt] [PATCH v2 0/3] vz: implement some API calls
by Maxim Nestratov 20 Oct '15

20 Oct '15

v1-v2 change: - removed vzConnectGetType - addressed comments on vzConnectGetMaxVcpus Maxim Nestratov (3): vz: implement connectGetMaxVcpus API calls vz: implement API calls of nodeGetxxx family vz: implement some domain API calls src/vz/vz_driver.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) -- 2.4.3

2 4

[libvirt] [PATCH 1/3] vz: implement connectGetType and connectGetMaxVcpus API calls
by Maxim Nestratov 20 Oct '15

20 Oct '15

From: Maxim Nestratov <mnestratov(a)virtuozzo.com> As a connection type we report 'vz'. And because we have no limitation for maximal number of vcpus in containers we report as maximum 1028 just for the sake of common sence. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/vz/vz_driver.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 15dc70f..3cd6096 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -1337,12 +1337,31 @@ vzDomainMemoryStats(virDomainPtr domain, return ret; } +static int vzConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, + const char *type) +{ + /* As far as we have no limitation for containers + * we report maximum */ + if (type == NULL || STRCASEEQ(type, "vz")) + return 1028; + + virReportError(VIR_ERR_INVALID_ARG, + _("unknown type '%s'"), type); + return -1; +} + +static const char *vzConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { + return "vz"; +} + static virHypervisorDriver vzDriver = { .name = "vz", .connectOpen = vzConnectOpen, /* 0.10.0 */ .connectClose = vzConnectClose, /* 0.10.0 */ .connectGetVersion = vzConnectGetVersion, /* 0.10.0 */ .connectGetHostname = vzConnectGetHostname, /* 0.10.0 */ + .connectGetType = vzConnectGetType, /* 1.2.21 */ + .connectGetMaxVcpus = vzConnectGetMaxVcpus, /* 1.2.21 */ .nodeGetInfo = vzNodeGetInfo, /* 0.10.0 */ .connectGetCapabilities = vzConnectGetCapabilities, /* 0.10.0 */ .connectBaselineCPU = vzConnectBaselineCPU, /* 1.2.6 */ -- 1.7.1

3 6

[libvirt] [PATCHv3 0/2] Added waiting for DAD to finish for bridge address.
by Maxim Perevedentsev 19 Oct '15

19 Oct '15

This is a fix for commit db488c79173b240459c7754f38c3c6af9b432970 dnsmasq main process which is relied on when waiting for DAD to complete exits without actually waiting for DAD. This is dnsmasq daemon's task. It seems to be a race that DAD finished before dnsmasq main process exited. The above commit needs the execution to block until DAD finishes for bridge IPv6 address because then it closes dummy tap device. Thus we need to ensure this ourselves. So we periodically poll the kernel using netlink and check whether there are any IPv6 addresses assigned to bridge which have 'tentative' state. After DAD is finished, execution continues. I guess that is what dnsmasq was assumed to do. We use netlink to dump information about existing IPv6 addresses. Netlink's response is a multi-part message. Unfortunately, the current implementation of virNetlink treats such messages as faulty and throws an error. So the patch 2/2 adds multi-part nelink response support. Update v2: fixed syntax. Update v3: moved to virnetdev. Resend: These patches were ignored and buried long ago :-( Maxim Perevedentsev (2): network: added waiting for DAD to finish for bridge address. netlink: add support for multi-part netlink messages. src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 35 +++++++++- src/util/virnetdev.c | 160 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetdev.h | 2 + src/util/virnetlink.c | 4 +- 5 files changed, 200 insertions(+), 2 deletions(-) -- 1.8.3.1

3 10

[libvirt] [PATCH v1 00/23] Keep original seclabel
by Michal Privoznik 19 Oct '15

19 Oct '15

So, you may be familiar with this already. Well, I've tried to get these patches in like a year ago (or even more). Point is, these ones are new, written from scratch. However, still based on idea, that virtlockd will keep the track of the original seclabels. So far only DAC driver is fixed, but the infrastructure I'm proposing here is easily extensible to other drivers too. Even if there's some disagreement on the design, the first few patches fix some bugs, so they should make it in. Michal Privoznik (23): virtlockd: Don't SIGSEGV on SIGUSR1 security_dac: Fix TODO marks virSecurityDACSetOwnershipInternal: Don't chown so often security_dac: Introduce remember/recall stubs virSecurityDACSetOwnership: Pass virSecurityDACDataPtr virSecurityDACRestoreSecurityFileLabel: Pass virSecurityDACDataPtr security_dac: Limit usage of virSecurityDACSetOwnershipInternal security_dac: Plug in remember/recall APIs lock_protocol: Add two new remote procedures lock_daemon: Switch to wrapper locking functions locking: Introduce virSeclabelSpace virtlockd: Work virSeclabelSpace in virLockDriver: Introduce virLockDriverRemember and virLockDriverRecall lock_driver_nop: Implement remember and recall APIs lock_driver_lockd: Implement remember and recall APIs lock_manager: Implement remember & recall APIs locking: Favour enum type over int lock_driver: Introduce VIR_LOCK_MANAGER_OBJECT_TYPE_SECLABEL virSecurityManagerNewDAC: Pass locking plugin in security_dac: Remember security labels security_dac: Restore original owner more often security: Introduce virSecurityManagerDomainRestoreDirLabel qemuProcessStop: Restore seclabels on dirs too cfg.mk | 2 +- po/POTFILES.in | 1 + src/Makefile.am | 3 + src/libvirt_private.syms | 3 + src/lock_protocol-structs | 15 + src/locking/lock_daemon.c | 69 ++++- src/locking/lock_daemon.h | 8 + src/locking/lock_daemon_dispatch.c | 68 +++++ src/locking/lock_daemon_seclabels.c | 545 ++++++++++++++++++++++++++++++++++++ src/locking/lock_daemon_seclabels.h | 43 +++ src/locking/lock_driver.h | 42 ++- src/locking/lock_driver_lockd.c | 103 ++++++- src/locking/lock_driver_nop.c | 28 +- src/locking/lock_driver_sanlock.c | 4 +- src/locking/lock_manager.c | 36 ++- src/locking/lock_manager.h | 13 +- src/locking/lock_protocol.x | 29 +- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_process.c | 22 +- src/security/security_dac.c | 288 +++++++++++++++---- src/security/security_dac.h | 2 + src/security/security_driver.h | 5 +- src/security/security_manager.c | 20 +- src/security/security_manager.h | 7 +- src/security/security_selinux.c | 16 ++ src/security/security_stack.c | 20 ++ 26 files changed, 1310 insertions(+), 85 deletions(-) create mode 100644 src/locking/lock_daemon_seclabels.c create mode 100644 src/locking/lock_daemon_seclabels.h -- 2.4.9

3 49

[libvirt] Need help problem with libvirt
by suresh knv 19 Oct '15

19 Oct '15

Hi, I am trying to install libvirt 1.2.2 on arm64 board with xen. It got installed successfully but when i run the command virsh list --all it is taking too long time and not responding application hangs. When I tried with strace virsh list --all these are the last few lines of the log futex(0x7fae646c48, FUTEX_WAKE_PRIVATE, 2147483647) = 0 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 gettid() = 8589 write(5, "\0", 1) = 1 futex(0x7fae5e56d0, FUTEX_WAKE_PRIVATE, 1) = 1 rt_sigprocmask(SIG_BLOCK, [PIPE CHLD WINCH], [], 8) = 0 ppoll([{fd=6, events=POLLOUT}, {fd=7, events=POLLIN}], 2, NULL, NULL, 0) = 1 ([{fd=6, revents=POLLOUT}]) rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0 write(6, "\0\0\0\34 \0\200\206\0\0\0\1\0\0\0B\0\0\0\0\0\0\0\0\0\0\0\0", 28) = 28 rt_sigprocmask(SIG_BLOCK, [PIPE CHLD WINCH], [], 8) = 0 ppoll([{fd=6, events=POLLIN}, {fd=7, events=POLLIN}], 2, NULL, NULL, 0 I am attaching the complete log with the mail. Can anyone suggest what is going wrong? Thanks Suresh KN V

2 2

[libvirt] [PATCH 0/9] Introduce virt-admin client
by Erik Skultety 16 Oct '15

16 Oct '15

Erik Skultety (9): libvirt: Export libvirt config getters by moving them to util virt-admin: Introduce first working skeleton admin: Do not generate remoteAdminConnect{Open,Close} admin: Add support for connection close callbacks admin: Introduce virAdmConnectGetLibVersion admin: Add URI support and introduce virAdmGetDefaultURI virt-admin: Introduce vshAdmCatchDisconnect handler virt-admin: Register async IO event polling virt-admin: Provide a man page for virt-admin .gitignore | 1 + daemon/admin_server.c | 9 + daemon/libvirtd.c | 3 +- include/libvirt/libvirt-admin.h | 25 ++ po/POTFILES.in | 2 + src/admin/admin_protocol.x | 15 +- src/datatypes.c | 24 ++ src/datatypes.h | 15 +- src/libvirt-admin.c | 387 ++++++++++++++++++-- src/libvirt.c | 55 +-- src/libvirt_admin_private.syms | 1 + src/libvirt_admin_public.syms | 5 + src/libvirt_private.syms | 2 +- src/rpc/gendispatch.pl | 11 +- src/util/virconf.c | 52 +++ src/util/virconf.h | 2 +- tools/Makefile.am | 36 +- tools/virt-admin.c | 759 ++++++++++++++++++++++++++++++++++++++++ tools/virt-admin.h | 71 ++++ tools/virt-admin.pod | 297 ++++++++++++++++ 20 files changed, 1675 insertions(+), 97 deletions(-) create mode 100644 tools/virt-admin.c create mode 100644 tools/virt-admin.h create mode 100644 tools/virt-admin.pod -- 2.4.3

3 19

[libvirt] [PATCH v3] Close the source fd if the destination qemu exits during tunnelled migration
by Shivaprasad G Bhat 16 Oct '15

16 Oct '15

Tunnelled migration can hang if the destination qemu exits despite all the ABI checks. This happens whenever the destination qemu exits before the complete transfer is noticed by source qemu. The savevm state checks at runtime can fail at destination and cause qemu to error out. The source qemu cant notice it as the EPIPE is not propogated to it. The qemuMigrationIOFunc() notices the stream being broken from virStreamSend() and it cleans up the stream alone. The qemuMigrationWaitForCompletion() would never get to 100% transfer completion. The qemuMigrationWaitForCompletion() never breaks out as well since the ssh connection to destination is healthy, and the source qemu also thinks the migration is ongoing as the Fd to which it transfers, is never closed or broken. So, the migration will hang forever. Even Ctrl-C on the virsh migrate wouldn't be honoured. Close the source side FD when there is an error in the stream. That way, the source qemu updates itself and qemuMigrationWaitForCompletion() notices the failure. Close the FD for all kinds of errors to be sure. The error message is not copied for EPIPE so that the destination error is copied instead later. Note: Reproducible with repeated migrations between Power hosts running in different subcores-per-core modes. Changes from v2 -> v3: VIR_FORCE_CLOSE() needn't be called on the qemu source fd as that is closed by qemuMigrationIOFunc() for tunnelled migration. Set the fd to -1. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_migration.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 7440108..c982838 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4019,6 +4019,7 @@ static void qemuMigrationIOFunc(void *arg) if (virStreamFinish(data->st) < 0) goto error; + VIR_FORCE_CLOSE(data->sock); VIR_FREE(buffer); return; @@ -4036,7 +4037,11 @@ static void qemuMigrationIOFunc(void *arg) } error: - virCopyLastError(&data->err); + /* Let the source qemu know that the transfer cant continue anymore. + * Don't copy the error for EPIPE as destination has the actual error. */ + VIR_FORCE_CLOSE(data->sock); + if (!virLastErrorIsSystemErrno(EPIPE)) + virCopyLastError(&data->err); virResetLastError(); VIR_FREE(buffer); } @@ -4359,9 +4364,14 @@ qemuMigrationRun(virQEMUDriverPtr driver, } } - if (spec->fwdType != MIGRATION_FWD_DIRECT && - !(iothread = qemuMigrationStartTunnel(spec->fwd.stream, fd))) - goto cancel; + if (spec->fwdType != MIGRATION_FWD_DIRECT) { + if (!(iothread = qemuMigrationStartTunnel(spec->fwd.stream, fd))) + goto cancel; + /* If we've created a tunnel, then the 'fd' will be closed in the + * qemuMigrationIOFunc as data->sock. + */ + fd = -1; + } rc = qemuMigrationWaitForCompletion(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT,

3 4

[libvirt] [PATCH v2 0/4] Fix a couple of iothread bugs
by John Ferlan 16 Oct '15

16 Oct '15

v1: http://www.redhat.com/archives/libvir-list/2015-October/msg00417.html Differences since v1 - many. - Reworked patches 1 & 2 to become patches 1 - 3 in the new series - Patch 1 is new, but the thinking behind patch 3 caused me to generate this patch which essentially changes comparisons with "->iothreads" to use "->niothreadids" instead except for one place where we're building the "iothreadids[]" array based on the difference between iothreads and niothreadids. - Patch 2 is essentially what former patch 1 became, adding a single check for niothreads == 0 rather than checking the capabilities bit. - The former patch 2 was dropped. In it's place is the new Patch 3 which moves the check for the capabilities bit to when the IOThread objects are added to the domain at startup time. Making that change had a couple of side effects and the whole sordid history of how we got into this situation was left in the commit message. Due to moving the check one test started failing, so that was fixed and while I was at it - I added a test which would define iothreads, some iothreadids, and some iothreadpin to show that without the capability the failure will be at start time. - The former patch 3 was already pushed since it was ACK'd - The former patch 4 logic was adjusted (more or less) to what was requested during the review with a couple of tweaks based on the realities I found during testing. NB: I spent some cycles considering how to handle the case where a domain with iothreads/niothreadids > 0 was already running when libvirtd was restarted and how to handle that. In the end I decided upon trying to do the somewhat nice thing and remove all traces and if some domain had iothreadid's defined, then leave a VIR_INFO message indicating the removal. Without this change, then qemuDomainPinIOThread for the live code will need some kind of adjustment in order to handle the case where the capability doesn't exist (some sort of thread_id == 0 check right after the IOThreadIDFind succeeds). John Ferlan (4): qemu: Use 'niothreadids' instead of 'iothreads' qemu: Check for niothreads == 0 in qemuSetupCgroupForIOThreads qemu: Fix qemu startup check for QEMU_CAPS_OBJECT_IOTHREAD conf: Optimize the iothreadid initialization src/conf/domain_audit.c | 4 +- src/conf/domain_conf.c | 43 +++++++++++++++++----- src/qemu/qemu_cgroup.c | 3 ++ src/qemu/qemu_command.c | 19 ++++------ src/qemu/qemu_driver.c | 16 ++++---- src/qemu/qemu_process.c | 32 ++++++++++++++-- .../qemuxml2argv-cputune-numatune.args | 1 + .../qemuxml2argv-iothreads-nocap.xml | 37 +++++++++++++++++++ tests/qemuxml2argvtest.c | 2 + 9 files changed, 122 insertions(+), 35 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-nocap.xml -- 2.1.0

2 9

[libvirt] [PATCH] virsh: Use 'format' argument only when specified
by Peter Krempa 16 Oct '15

16 Oct '15

The condition checking whether --format was specified was incorrect. virsh crashed if the following format was used: virsh dump VM dump --format '' --memory-only Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1272301 --- tools/virsh-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 456e273..4191548 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5280,7 +5280,7 @@ doDump(void *opaque) goto out; } - if (vshCommandOptString(ctl, cmd, "format", &format)) { + if (vshCommandOptString(ctl, cmd, "format", &format) > 0) { if (STREQ(format, "kdump-zlib")) { dumpformat = VIR_DOMAIN_CORE_DUMP_FORMAT_KDUMP_ZLIB; } else if (STREQ(format, "kdump-lzo")) { -- 2.4.5

2 2

[libvirt] [PATCH] docs: event impl. registration before hypervisor connection
by Dominik Perpeet 16 Oct '15

16 Oct '15

Event implementations need to be registered before a connection to the Hypervisor is opened, otherwise event handling can be impaired (e.g. delayed messages). This fact is referenced in an e-mail [1], but should also be noted in the documentation of the registration functions. [1] https://www.redhat.com/archives/libvirt-users/2014-April/msg00011.html --- src/util/virevent.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/util/virevent.c b/src/util/virevent.c index 54b6396..e0fd35e 100644 --- a/src/util/virevent.c +++ b/src/util/virevent.c @@ -204,6 +204,9 @@ virEventRemoveTimeout(int timer) * to integrate with the libglib2 event loop, or libevent * or the QT event loop. * + * For proper event handling, it is important that the event implementation + * is registered before a connection to the Hypervisor is opened. + * * Use of the virEventAddHandle() and similar APIs require that the * corresponding handler is registered. Use of the * virConnectDomainEventRegisterAny() and similar APIs requires that @@ -247,6 +250,9 @@ void virEventRegisterImpl(virEventAddHandleFunc addHandle, * not have a need to integrate with an external event * loop impl. * + * For proper event handling, it is important that the event implementation + * is registered before a connection to the Hypervisor is opened. + * * Once registered, the application has to invoke virEventRunDefaultImpl() in * a loop to process events. Failure to do so may result in connections being * closed unexpectedly as a result of keepalive timeout. The default -- 1.8.3.1

3 2

[libvirt] Fwd: [PATCH 2/3] NEWS: Split releases by year (2012-2015)
by Eric Blake 16 Oct '15

16 Oct '15

[moderated for smaller size] -------- Forwarded Message -------- From: Andrea Bolognani <abologna(a)redhat.com> To: libvir-list(a)redhat.com Subject: [PATCH 2/3] NEWS: Split releases by year (2012-2015) Date: Thu, 15 Oct 2015 16:12:09 +0200 Message-Id: <1444918330-15696-3-git-send-email-abologna(a)redhat.com> --- docs/news-2012.html.in | 3012 ++++++++++++++ docs/news-2013.html.in | 3675 +++++++++++++++++ docs/news-2014.html.in | 3418 ++++++++++++++++ docs/news.html.in | 10052 +---------------------------------------------- 4 files changed, 10110 insertions(+), 10047 deletions(-) create mode 100644 docs/news-2012.html.in create mode 100644 docs/news-2013.html.in create mode 100644 docs/news-2014.html.in diff --git a/docs/news-2012.html.in b/docs/news-2012.html.in new file mode 100644 index 0000000..a198d3c --- /dev/null +++ b/docs/news-2012.html.in @@ -0,0 +1,3012 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Releases (2012)</h1> + <p>Here is the list of official releases made during the year 2012. + A similar list for <a href="news-2011.html">2011</a> is also available. + </p> + <p>It is also possible to just use + the <a href="downloads.html" shape="rect">GIT version or snapshot</a>, + contact the mailing list and check + the <a href="http://libvirt.org/git/?p=libvirt.git;a=log" shape="rect">GIT log</a> + to gauge progress. + </p> + + <h3>1.0.1: Dec 17 2012</h3> + <ul> + <li>Features:<br/> + Introduce virtlockd daemon (Daniel P. Berrange),<br/> [...] diff --git a/docs/news-2013.html.in b/docs/news-2013.html.in new file mode 100644 index 0000000..62b75a5 --- /dev/null +++ b/docs/news-2013.html.in @@ -0,0 +1,3675 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Releases (2013)</h1> + <p>Here is the list of official releases made during the year 2013. + A similar list for <a href="news-2012.html">2012</a> is also available. + </p> + <p>It is also possible to just use + the <a href="downloads.html" shape="rect">GIT version or snapshot</a>, + contact the mailing list and check + the <a href="http://libvirt.org/git/?p=libvirt.git;a=log" shape="rect">GIT log</a> + to gauge progress. + </p> + + <h3>1.2.0: Dec 02 2013</h3> + <ul> + <li>Features:<br/> + Add support for gluster pool (Eric Blake),<br/> [...] diff --git a/docs/news-2014.html.in b/docs/news-2014.html.in new file mode 100644 index 0000000..5480d5d --- /dev/null +++ b/docs/news-2014.html.in @@ -0,0 +1,3418 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Releases (2014)</h1> + <p>Here is the list of official releases made during the year 2014. + A similar list for <a href="news-2013.html">2013</a> is also available. + </p> + <p>It is also possible to just use + the <a href="downloads.html">GIT version or snapshot</a>, + contact the mailing list and check + the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> + to gauge progress. + </p> + + <h3>1.2.11: Dec 13 2014</h3> + <ul> + <li>Features:<br/> + Implement public API for virDomainGetFSInfo (Tomoki Sekiyama),<br/> [...] diff --git a/docs/news.html.in b/docs/news.html.in index 90e6ac7..3e133c2 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -5,8 +5,11 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> </head> <body> - <h1>Releases</h1> - <p>Here is the list of official releases, it is also possible to just use + <h1>Releases (2015)</h1> + <p>Here is the list of official releases made during the year 2015. + A similar list for <a href="news-2014.html">2014</a> is also available. + </p> + <p>It is also possible to just use the <a href="downloads.html">GIT version or snapshot</a>, contact the mailing list and check the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> @@ -2441,10050 +2444,5 @@ </li> </ul> - <h3>1.2.11: Dec 13 2014</h3> - <ul> - <li>Features:<br/> - Implement public API for virDomainGetFSInfo (Tomoki Sekiyama),<br/> [...] - - <h3>0.9.9: Jan 07 2012</h3> - <ul> - <li>Features:<br/> [...] - <li>Cleanups:<br/> - network_conf: Fix whitespace to pass syntax-check (Peter Krempa)<br/> - </li> - </ul> - </body> </html> -- 2.4.3

1 0

[libvirt] Fwd: [PATCH 1/3] NEWS: Split releases by year (2005-2011)
by Eric Blake 16 Oct '15

16 Oct '15

[moderated for smaller size] -------- Forwarded Message -------- From: Andrea Bolognani <abologna(a)redhat.com> To: libvir-list(a)redhat.com Subject: [PATCH 1/3] NEWS: Split releases by year (2005-2011) Date: Thu, 15 Oct 2015 16:12:08 +0200 Message-Id: <1444918330-15696-2-git-send-email-abologna(a)redhat.com> --- docs/news-2005.html.in | 28 + docs/news-2006.html.in | 354 ++ docs/news-2007.html.in | 534 +++ docs/news-2008.html.in | 580 ++++ docs/news-2009.html.in | 1603 +++++++++ docs/news-2010.html.in | 2218 +++++++++++++ docs/news-2011.html.in | 3314 +++++++++++++++++++ docs/news.html.in | 8492 ------------------------------------------------ 8 files changed, 8631 insertions(+), 8492 deletions(-) create mode 100644 docs/news-2005.html.in create mode 100644 docs/news-2006.html.in create mode 100644 docs/news-2007.html.in create mode 100644 docs/news-2008.html.in create mode 100644 docs/news-2009.html.in create mode 100644 docs/news-2010.html.in create mode 100644 docs/news-2011.html.in diff --git a/docs/news-2005.html.in b/docs/news-2005.html.in new file mode 100644 index 0000000..97a43c6 --- /dev/null +++ b/docs/news-2005.html.in @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Releases (2005)</h1> + <p>Here is the list of official releases made during the year 2005. + </p> + <p>It is also possible to just use + the <a href="downloads.html" shape="rect">GIT version or snapshot</a>, + contact the mailing list and check + the <a href="http://libvirt.org/git/?p=libvirt.git;a=log" shape="rect">GIT log</a> + to gauge progress. + </p> + + <h3>0.0.1: Dec 19 2005</h3> + <ul> + <li>Features:<br/> + First release,<br/> + Basic management of existing Xen domains,<br/> + Minimal autogenerated Python bindings<br/> + </li> + </ul> + + </body> +</html> diff --git a/docs/news-2006.html.in b/docs/news-2006.html.in new file mode 100644 index 0000000..df29a06 --- /dev/null +++ b/docs/news-2006.html.in @@ -0,0 +1,354 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Releases (2006)</h1> + <p>Here is the list of official releases made during the year 2006. + A similar list for <a href="news-2005.html">2005</a> is also available. + </p> + <p>It is also possible to just use + the <a href="downloads.html" shape="rect">GIT version or snapshot</a>, + contact the mailing list and check + the <a href="http://libvirt.org/git/?p=libvirt.git;a=log" shape="rect">GIT log</a> + to gauge progress. + </p> + + <h3>0.1.10: Dec 20 2006</h3> + <ul> + <li>Bug Fixes:<br/> + VCPU info breakages on xen 3.0.3,<br/> [...] diff --git a/docs/news-2007.html.in b/docs/news-2007.html.in new file mode 100644 index 0000000..8b08963 --- /dev/null +++ b/docs/news-2007.html.in @@ -0,0 +1,534 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Releases (2007)</h1> + <p>Here is the list of official releases made during the year 2007. + A similar list for <a href="news-2006.html">2006</a> is also available. + </p> + <p>It is also possible to just use + the <a href="downloads.html" shape="rect">GIT version or snapshot</a>, + contact the mailing list and check + the <a href="http://libvirt.org/git/?p=libvirt.git;a=log" shape="rect">GIT log</a> + to gauge progress. + </p> + + <h3>0.4.0: Dec 18 2007</h3> + <ul> + <li>Features:<br/> + Compilation on Windows cygwin/mingw (Richard Jones),<br/> [...] diff --git a/docs/news-2008.html.in b/docs/news-2008.html.in new file mode 100644 index 0000000..16ee9b1 --- /dev/null +++ b/docs/news-2008.html.in @@ -0,0 +1,580 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Releases (2008)</h1> + <p>Here is the list of official releases made during the year 2008. + A similar list for <a href="news-2007.html">2007</a> is also available. + </p> + <p>It is also possible to just use + the <a href="downloads.html" shape="rect">GIT version or snapshot</a>, + contact the mailing list and check + the <a href="http://libvirt.org/git/?p=libvirt.git;a=log" shape="rect">GIT log</a> + to gauge progress. + </p> + + <h3>0.5.1: Dec 04 2008</h3> + <ul> + <li>Portability:<br/> [...] + fix parsing for CDRom device with no source (Daniel Berrange),<br/> + use xenstore to list domains to avoid some bugs (Guido GÃ¼nther),<br/> [...] diff --git a/docs/news-2009.html.in b/docs/news-2009.html.in new file mode 100644 index 0000000..c0b48ae --- /dev/null +++ b/docs/news-2009.html.in @@ -0,0 +1,1603 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Releases (2009)</h1> + <p>Here is the list of official releases made during the year 2009. + A similar list for <a href="news-2008.html">2008</a> is also available. + </p> + <p>It is also possible to just use + the <a href="downloads.html" shape="rect">GIT version or snapshot</a>, + contact the mailing list and check + the <a href="http://libvirt.org/git/?p=libvirt.git;a=log" shape="rect">GIT log</a> + to gauge progress. + </p> + + <h3>0.7.5: Dec 23 2009</h3> + <ul> + <li>Features:<br/> [...] diff --git a/docs/news-2010.html.in b/docs/news-2010.html.in new file mode 100644 index 0000000..0fd8860 --- /dev/null +++ b/docs/news-2010.html.in @@ -0,0 +1,2218 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Releases (2010)</h1> + <p>Here is the list of official releases made during the year 2010. + A similar list for <a href="news-2009.html">2009</a> is also available. + </p> + <p>It is also possible to just use + the <a href="downloads.html" shape="rect">GIT version or snapshot</a>, + contact the mailing list and check + the <a href="http://libvirt.org/git/?p=libvirt.git;a=log" shape="rect">GIT log</a> + to gauge progress. + </p> + + <h3>0.8.6: Nov 30 2010</h3> + <ul> + <li>Features:<br/> [...] diff --git a/docs/news-2011.html.in b/docs/news-2011.html.in new file mode 100644 index 0000000..5dacb5c --- /dev/null +++ b/docs/news-2011.html.in @@ -0,0 +1,3314 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </head> + <body> + <h1>Releases (2011)</h1> + <p>Here is the list of official releases made during the year 2011. + A similar list for <a href="news-2010.html">2010</a> is also available. + </p> + <p>It is also possible to just use + the <a href="downloads.html" shape="rect">GIT version or snapshot</a>, + contact the mailing list and check + the <a href="http://libvirt.org/git/?p=libvirt.git;a=log" shape="rect">GIT log</a> + to gauge progress. + </p> + + <h3>0.9.8: Dec 08 2011</h3> + <ul> + <li>Features:<br/> [...] diff --git a/docs/news.html.in b/docs/news.html.in index 0e89fae..90e6ac7 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -12486,8497 +12486,5 @@ </li> </ul> - <h3>0.9.8: Dec 08 2011</h3> - <ul> - <li>Features:<br/> [...] - - <h3>0.0.1: Dec 19 2005</h3> - <ul> - <li>Features:<br/> - First release,<br/> - Basic management of existing Xen domains,<br/> - Minimal autogenerated Python bindings<br/> - </li> - </ul> - </body> </html> -- 2.4.3

1 0

[libvirt] [PATCH v5 0/5] vz: add migration support
by Nikolay Shirokovskiy 15 Oct '15

15 Oct '15

NOTE that minimal command to migrate vz domain is like next: virsh -c vz:///system migrate 200 vz+ssh://shiny0/system --p2p --live --compressed --persistent --undefinesource Difference from v4: 1. move preparation of the migration uri from src to dst as dst intended to do it. 2. change hypervisor migration scheme from 'tcp' to 'vzmigr' 3. declare this scheme in host caps src/vz/vz_driver.c | 356 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/vz/vz_sdk.c | 86 +++++++++++-- src/vz/vz_sdk.h | 6 + src/vz/vz_utils.h | 4 +- 4 files changed, 437 insertions(+), 15 deletions(-)

4 12

[libvirt] crash in virDomainNumaGetMemorySize
by Olaf Hering 15 Oct '15

15 Oct '15

With current master (56945e1), while toying around with a WS2008R2 Hyper-V host: root@probook:~ # gdb --quiet -ex 'r -c hv dumpxml all-sles12-dev' -ex bt -ex detach -ex quit virsh Reading symbols from virsh...Reading symbols from /usr/lib/debug/usr/bin/virsh.debug...done. done. Starting program: /usr/bin/virsh -c hv dumpxml all-sles12-dev [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Enter Administrator's password for optiplex.fritz.box: [New Thread 0x7fffee601700 (LWP 26921)] Program received signal SIGSEGV, Segmentation fault. virDomainNumaGetMemorySize (numa=0x0) at conf/numa_conf.c:971 971 for (i = 0; i < numa->nmem_nodes; i++) #0 virDomainNumaGetMemorySize (numa=0x0) at conf/numa_conf.c:971 #1 0x00007ffff793bce0 in virDomainDefGetMemoryActual (def=def@entry=0x55555582ead0) at conf/domain_conf.c:7857 #2 0x00007ffff7948978 in virDomainDefFormatInternal (def=0x55555582ead0, flags=0, buf=buf@entry=0x7fffffffdde0) at conf/domain_conf.c:21677 #3 0x00007ffff794b8bc in virDomainDefFormat (def=<optimized out>, flags=<optimized out>) at conf/domain_conf.c:22507 #4 0x00007ffff7a94c33 in hypervDomainGetXMLDesc (domain=<optimized out>, flags=0) at hyperv/hyperv_driver.c:882 #5 0x00007ffff79b5351 in virDomainGetXMLDesc (domain=domain@entry=0x5555558237a0, flags=0) at libvirt-domain.c:2591 #6 0x000055555558b978 in cmdDumpXML (ctl=0x7fffffffe1c0, cmd=<optimized out>) at virsh-domain.c:9634 #7 0x000055555557d04f in vshCommandRun (ctl=0x7fffffffe1c0, cmd=0x555555822580) at vsh.c:1212 #8 0x0000555555579a4d in main (argc=5, argv=0x7fffffffe3c8) at virsh.c:921 Detaching from program: /usr/bin/virsh, process 26917 root@probook:~ # rpm -qf `which virsh` libvirt-client-20150917T085913.56945e1-3.xen_unstable.1.x86_64 Olaf

2 3

[libvirt] genprotocol.pl generates unstable output
by Olaf Hering 15 Oct '15

15 Oct '15

If the same source gets built twice the resulting files may differ. One example is this: ... [ 305s] /usr/bin/perl -w ./rpc/genprotocol.pl /usr/bin/rpcgen -c \ [ 305s] remote/remote_protocol.x ./remote/remote_protocol.c ... [ 577s] /usr/src/debug/libvirt-20150929T082652.68572de/src/remote/remote_protocol.c differs (C source, ASCII text) [ 577s] --- old//usr/src/debug/libvirt-20150929T082652.68572de/src/remote/remote_protocol.c 2015-09-30 11:34:31.000000000 +0000 [ 577s] +++ new//usr/src/debug/libvirt-20150929T082652.68572de/src/remote/remote_protocol.c 2015-09-30 14:57:39.000000000 +0000 [ 577s] @@ -2084,8 +2084,8 @@ [ 577s] bool_t [ 577s] xdr_remote_domain_get_vcpus_ret (XDR *xdrs, remote_domain_get_vcpus_ret *objp) [ 577s] { [ 577s] - char **objp_cpp1 = (char **) (void *) &objp->cpumaps.cpumaps_val; [ 577s] char **objp_cpp0 = (char **) (void *) &objp->info.info_val; [ 577s] + char **objp_cpp1 = (char **) (void *) &objp->cpumaps.cpumaps_val; [ 577s] [ 577s] if (!xdr_array (xdrs, objp_cpp0, (u_int *) &objp->info.info_len, REMOTE_VCPUINFO_MAX, [ 577s] sizeof (remote_vcpu_info), (xdrproc_t) xdr_remote_vcpu_info)) ... The input is like: bool_t xdr_remote_domain_get_vcpus_ret (XDR *xdrs, remote_domain_get_vcpus_ret *objp) { register int32_t *buf; if (!xdr_array (xdrs, (char **)&objp->info.info_val, (u_int *) &objp->info.info_len, REMOTE_VCPUINFO_MAX, sizeof (remote_vcpu_info), (xdrproc_t) xdr_remote_vcpu_info)) return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->cpumaps.cpumaps_val, (u_int *) &objp->cpumaps.cpumaps_len, REMOTE_CPUMAPS_MAX)) return FALSE; return TRUE; } Looks like the perl script transforms the pointers, but it does not sort them to enforce an order. I think its the map() which does it, but dont know enough perl to be sure. How can this be fixed? Olaf

3 5

[libvirt] [PATCH 1/3] libvirt-domain: Introduce macro to save duplicated codes
by Wei Jiangang 15 Oct '15

15 Oct '15

Signed-off-by: Wei Jiangang <weijg.fnst(a)cn.fujitsu.com> --- src/libvirt-domain.c | 55 ++++++++++++++-------------------------------------- 1 file changed, 15 insertions(+), 40 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 6e1aacd..ed07c9e 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -33,6 +33,13 @@ VIR_LOG_INIT("libvirt.domain"); #define VIR_FROM_THIS VIR_FROM_DOMAIN +#define VIR_ABSOLUTIZE_PATH(PATH, ABSPATH) \ + if (virFileAbsPath(PATH, ABSPATH) < 0) { \ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", \ + _("could not build absolute input file path")); \ + goto error; \ + } + /** * virConnectListDomains: @@ -830,11 +837,7 @@ virDomainSave(virDomainPtr domain, const char *to) char *absolute_to; /* We must absolutize the file path as the save is done out of process */ - if (virFileAbsPath(to, &absolute_to) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not build absolute output file path")); - goto error; - } + VIR_ABSOLUTIZE_PATH(to, &absolute_to); ret = conn->driver->domainSave(domain, absolute_to); @@ -918,11 +921,7 @@ virDomainSaveFlags(virDomainPtr domain, const char *to, char *absolute_to; /* We must absolutize the file path as the save is done out of process */ - if (virFileAbsPath(to, &absolute_to) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not build absolute output file path")); - goto error; - } + VIR_ABSOLUTIZE_PATH(to, &absolute_to); ret = conn->driver->domainSaveFlags(domain, absolute_to, dxml, flags); @@ -968,11 +967,7 @@ virDomainRestore(virConnectPtr conn, const char *from) char *absolute_from; /* We must absolutize the file path as the restore is done out of process */ - if (virFileAbsPath(from, &absolute_from) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not build absolute input file path")); - goto error; - } + VIR_ABSOLUTIZE_PATH(from, &absolute_from); ret = conn->driver->domainRestore(conn, absolute_from); @@ -1042,11 +1037,7 @@ virDomainRestoreFlags(virConnectPtr conn, const char *from, const char *dxml, char *absolute_from; /* We must absolutize the file path as the restore is done out of process */ - if (virFileAbsPath(from, &absolute_from) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not build absolute input file path")); - goto error; - } + VIR_ABSOLUTIZE_PATH(from, &absolute_from); ret = conn->driver->domainRestoreFlags(conn, absolute_from, dxml, flags); @@ -1107,11 +1098,7 @@ virDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *file, char *absolute_file; /* We must absolutize the file path as the read is done out of process */ - if (virFileAbsPath(file, &absolute_file) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not build absolute input file path")); - goto error; - } + VIR_ABSOLUTIZE_PATH(file, &absolute_file); ret = conn->driver->domainSaveImageGetXMLDesc(conn, absolute_file, flags); @@ -1180,11 +1167,7 @@ virDomainSaveImageDefineXML(virConnectPtr conn, const char *file, char *absolute_file; /* We must absolutize the file path as the read is done out of process */ - if (virFileAbsPath(file, &absolute_file) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not build absolute input file path")); - goto error; - } + VIR_ABSOLUTIZE_PATH(file, &absolute_file); ret = conn->driver->domainSaveImageDefineXML(conn, absolute_file, dxml, flags); @@ -1255,11 +1238,7 @@ virDomainCoreDump(virDomainPtr domain, const char *to, unsigned int flags) char *absolute_to; /* We must absolutize the file path as the save is done out of process */ - if (virFileAbsPath(to, &absolute_to) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not build absolute core file path")); - goto error; - } + VIR_ABSOLUTIZE_PATH(to, &absolute_to); ret = conn->driver->domainCoreDump(domain, absolute_to, flags); @@ -1339,11 +1318,7 @@ virDomainCoreDumpWithFormat(virDomainPtr domain, const char *to, char *absolute_to; /* We must absolutize the file path as the save is done out of process */ - if (virFileAbsPath(to, &absolute_to) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not build absolute core file path")); - goto error; - } + VIR_ABSOLUTIZE_PATH(to, &absolute_to); ret = conn->driver->domainCoreDumpWithFormat(domain, absolute_to, dumpformat, flags); -- 1.9.3

4 7

[libvirt] [PATCH] testscripts: make redirects happen in correct order
by Wei Jiangang 15 Oct '15

15 Oct '15

It should redirect stdout to /dev/null firstly, then redirect stderr to whatever stdout currently points at. Signed-off-by: Wei Jiangang <weijg.fnst(a)cn.fujitsu.com> --- tests/test-lib.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test-lib.sh b/tests/test-lib.sh index e612f8f..d36a901 100644 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -248,9 +248,9 @@ trap '(exit $?); exit $?' 1 2 13 15 cd "$t_" || error_ "failed to cd to $t_" -if ( diff --version < /dev/null 2>&1 | grep GNU ) 2>&1 > /dev/null; then +if ( diff --version < /dev/null 2>&1 | grep GNU ) >/dev/null 2>&1; then compare() { diff -u "$@"; } -elif ( cmp --version < /dev/null 2>&1 | grep GNU ) 2>&1 > /dev/null; then +elif ( cmp --version < /dev/null 2>&1 | grep GNU ) >/dev/null 2>&1; then compare() { cmp -s "$@"; } else compare() { cmp "$@"; } -- 1.9.3

3 2

[libvirt] [PATCH 0/4] Fix a couple of iothread bugs
by John Ferlan 15 Oct '15

15 Oct '15

Details in the patches. John Ferlan (4): qemu: During startup need more QEMU_CAPS_OBJECT_IOTHREAD checks qemu: Check QEMU_CAPS_OBJECT_IOTHREAD for qemuDomainPinIOThread conf: Refactor the iothreadid initialization conf: Optimize the iothreadid initialization src/conf/domain_conf.c | 83 +++++++++++++++++++++++++++++++++++++++---------- src/qemu/qemu_cgroup.c | 3 ++ src/qemu/qemu_driver.c | 6 ++++ src/qemu/qemu_process.c | 18 +++++++---- 4 files changed, 88 insertions(+), 22 deletions(-) -- 2.1.0

2 16