- Devel - libvirt List Archives

[libvirt] [PATCH] security:selinux: Fix crash when tcon is NULL
by Luyao Huang 10 Nov '14

10 Nov '14

https://bugzilla.redhat.com/show_bug.cgi?id=1161831 Libvirtd will crash when parameter tcon = NULL in virSecuritySELinuxSetFileconHelper function, because libvirt do not check the first parameter when use strcmp(). Add a check for tcon before use strcmp() and output a error in log when tcon is NULL. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/security/security_selinux.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index f96be50..4fd09b8 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -887,6 +887,11 @@ virSecuritySELinuxSetFileconHelper(const char *path, char *tcon, bool optional) int setfilecon_errno = errno; if (getfilecon_raw(path, &econ) >= 0) { + if (tcon == NULL) { + virReportSystemError(errno,"%s", + _("Invalid security context : NULL")); + return -1; + } if (STREQ(tcon, econ)) { freecon(econ); /* It's alright, there's nothing to change anyway. */ -- 1.8.3.1

3 2

[libvirt] [PATCH] phyp: Fix NULL dereference in phypConnectOpen
by Martin Kletzander 10 Nov '14

10 Nov '14

Coverity found out that commit cd490086 caused a possible NULL pointer dereference. This is due to the fact, that phyp_driver might be NULL (if VIR_ALLOC() fails), but connection_data, which kept the socket before the mentioned commit, could not be NULL. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/phyp/phyp_driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 7c8bc5c..0d3ad53 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1222,6 +1222,7 @@ phypConnectOpen(virConnectPtr conn, if (phyp_driver != NULL) { virObjectUnref(phyp_driver->caps); virObjectUnref(phyp_driver->xmlopt); + VIR_FORCE_CLOSE(phyp_driver->sock); VIR_FREE(phyp_driver); } @@ -1232,8 +1233,6 @@ phypConnectOpen(virConnectPtr conn, libssh2_session_free(session); } - VIR_FORCE_CLOSE(phyp_driver->sock); - return VIR_DRV_OPEN_ERROR; } -- 2.1.3

2 2

[libvirt] [Bug report] - vm start failed after image snapshot rebase
by weiwei li 10 Nov '14

10 Nov '14

Hi , I hit a bug with libvirt+ qemu+kvm when doing follow steps: 1.initial status :vm = base+z(z is a snapshot) 2. call snapshotCreateXML( ): vm = base+z +z' 3. call blockRebase( ): vm = base+z''(z rebase to z') 4 .(after rebasing work done) vm shutdown and then start an error accord like this: unable to set user and group to '0:0' on '/tvm/tvm/405b9ea5-10a7-4e56-946d-58e93e2688d6/405b9ea5-10a7-4e56-946d-58e93e2688d6.vda_20141101044033': No such file or directory A second start may sucess. I debugged with gdb and found that the error message was cauesed by virSecurityDACSetSecurityDiskLabel misuse the disk chain(that is base+z +z', after rebase), and z' was deleted yet. why virSecurityDACSetSecurityDiskLabel used old disk chain after rebasing ? I finally find that In qemuProcessHandleBlockJob when rebase complete, disk chain in vm->def is updated but vm->newDef is not(when vm->newDef is not null). In shutdown( actrully in qemuProcessStop ), if vm->newDef is not null , vm->def will be replaced by vm->newDef, which contains a wrong disk chain!!! the next start will failed with above message.

1 0

[libvirt] [PATCH v2] esx: Simplify VI (vSphere) API and VMware product version handling
by Matthias Bolte 08 Nov '14

08 Nov '14

Store version numbers in this format version = 1000000 * major + 1000 * minor + micro produced by virParseVersionString instead of dedicated enums. Split the complex esxVI_ProductVersion enum into a simpler esxVI_ProductLine enum and a product version number. Relax API and product version number checks to accept everything that is equal or greater than the supported minimum version. VMware ESX went through 3 major versions and the vSphere API always stayed backward compatible. This commit assumes that this will also be true for future VMware ESX versions. Also reword error messages in esxConnectTo* to say what was expected and what was found instead (suggested by Richard W.M. Jones). --- v2: - Fix copy&paste accident that replaced hostname with conn->uri->server in esxConnectToVCenter - Fix and improve commit message src/esx/esx_driver.c | 59 +++++--------- src/esx/esx_vi.c | 215 ++++++++++++++++++++++++++------------------------- src/esx/esx_vi.h | 55 +++---------- 3 files changed, 140 insertions(+), 189 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 39784b9..64265ed 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -646,9 +646,9 @@ esxConnectToHost(esxPrivate *priv, esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *hostSystem = NULL; esxVI_Boolean inMaintenanceMode = esxVI_Boolean_Undefined; - esxVI_ProductVersion expectedProductVersion = STRCASEEQ(conn->uri->scheme, "esx") - ? esxVI_ProductVersion_ESX - : esxVI_ProductVersion_GSX; + esxVI_ProductLine expectedProductLine = STRCASEEQ(conn->uri->scheme, "esx") + ? esxVI_ProductLine_ESX + : esxVI_ProductLine_GSX; if (!vCenterIpAddress || *vCenterIpAddress) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); @@ -695,25 +695,13 @@ esxConnectToHost(esxPrivate *priv, goto cleanup; } - if (expectedProductVersion == esxVI_ProductVersion_ESX) { - if (priv->host->productVersion != esxVI_ProductVersion_ESX35 && - priv->host->productVersion != esxVI_ProductVersion_ESX40 && - priv->host->productVersion != esxVI_ProductVersion_ESX41 && - priv->host->productVersion != esxVI_ProductVersion_ESX4x && - priv->host->productVersion != esxVI_ProductVersion_ESX50 && - priv->host->productVersion != esxVI_ProductVersion_ESX51 && - priv->host->productVersion != esxVI_ProductVersion_ESX5x) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s is neither an ESX 3.5, 4.x nor 5.x host"), - conn->uri->server); - goto cleanup; - } - } else { /* GSX */ - if (priv->host->productVersion != esxVI_ProductVersion_GSX20) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s isn't a GSX 2.0 host"), conn->uri->server); - goto cleanup; - } + if (priv->host->productLine != expectedProductLine) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Expecting '%s' to be a %s host, but found a %s host"), + conn->uri->server, + esxVI_ProductLineToDisplayName(expectedProductLine), + esxVI_ProductLineToDisplayName(priv->host->productLine)); + goto cleanup; } /* Query the host for maintenance mode and vCenter IP address */ @@ -815,16 +803,12 @@ esxConnectToVCenter(esxPrivate *priv, goto cleanup; } - if (priv->vCenter->productVersion != esxVI_ProductVersion_VPX25 && - priv->vCenter->productVersion != esxVI_ProductVersion_VPX40 && - priv->vCenter->productVersion != esxVI_ProductVersion_VPX41 && - priv->vCenter->productVersion != esxVI_ProductVersion_VPX4x && - priv->vCenter->productVersion != esxVI_ProductVersion_VPX50 && - priv->vCenter->productVersion != esxVI_ProductVersion_VPX51 && - priv->vCenter->productVersion != esxVI_ProductVersion_VPX5x) { + if (priv->vCenter->productLine != esxVI_ProductLine_VPX) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s is neither a vCenter 2.5, 4.x nor 5.x server"), - hostname); + _("Expecting '%s' to be a %s host but found a %s host"), + hostname, + esxVI_ProductLineToDisplayName(esxVI_ProductLine_VPX), + esxVI_ProductLineToDisplayName(priv->vCenter->productLine)); goto cleanup; } @@ -1217,14 +1201,7 @@ esxConnectGetVersion(virConnectPtr conn, unsigned long *version) { esxPrivate *priv = conn->privateData; - if (virParseVersionString(priv->primary->service->about->version, - version, false) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse version number from '%s'"), - priv->primary->service->about->version); - - return -1; - } + *version = priv->primary->productVersion; return 0; } @@ -2934,7 +2911,7 @@ esxConnectDomainXMLToNative(virConnectPtr conn, const char *nativeFormat, } virtualHW_version = esxVI_ProductVersionToDefaultVirtualHWVersion - (priv->primary->productVersion); + (priv->primary->productLine, priv->primary->productVersion); if (virtualHW_version < 0) { return NULL; @@ -3190,7 +3167,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml) /* Build VMX from domain XML */ virtualHW_version = esxVI_ProductVersionToDefaultVirtualHWVersion - (priv->primary->productVersion); + (priv->primary->productLine, priv->primary->productVersion); if (virtualHW_version < 0) { goto cleanup; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index b00d8e7..d28b8e0 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -1040,98 +1040,77 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, return -1; } - if (STREQ(ctx->service->about->apiType, "HostAgent") || - STREQ(ctx->service->about->apiType, "VirtualCenter")) { - if (STRPREFIX(ctx->service->about->apiVersion, "2.5")) { - ctx->apiVersion = esxVI_APIVersion_25; - } else if (STRPREFIX(ctx->service->about->apiVersion, "4.0")) { - ctx->apiVersion = esxVI_APIVersion_40; - } else if (STRPREFIX(ctx->service->about->apiVersion, "4.1")) { - ctx->apiVersion = esxVI_APIVersion_41; - } else if (STRPREFIX(ctx->service->about->apiVersion, "4.")) { - ctx->apiVersion = esxVI_APIVersion_4x; - } else if (STRPREFIX(ctx->service->about->apiVersion, "5.0")) { - ctx->apiVersion = esxVI_APIVersion_50; - } else if (STRPREFIX(ctx->service->about->apiVersion, "5.1")) { - ctx->apiVersion = esxVI_APIVersion_51; - } else if (STRPREFIX(ctx->service->about->apiVersion, "5.")) { - ctx->apiVersion = esxVI_APIVersion_5x; - } else { + if (STRNEQ(ctx->service->about->apiType, "HostAgent") && + STRNEQ(ctx->service->about->apiType, "VirtualCenter")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Expecting VI API type 'HostAgent' or 'VirtualCenter' " + "but found '%s'"), ctx->service->about->apiType); + return -1; + } + + if (virParseVersionString(ctx->service->about->apiVersion, + &ctx->apiVersion, true) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not parse VI API version '%s'"), + ctx->service->about->apiVersion); + return -1; + } + + if (ctx->apiVersion < 1000000 * 2 + 1000 * 5 /* 2.5 */) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Minimum supported %s version is %s but found version '%s'"), + "VI API", "2.5", ctx->service->about->apiVersion); + return -1; + } + + if (virParseVersionString(ctx->service->about->version, + &ctx->productVersion, true) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not parse product version '%s'"), + ctx->service->about->version); + return -1; + } + + if (STREQ(ctx->service->about->productLineId, "gsx")) { + if (ctx->productVersion < 1000000 * 2 + 1000 * 0 /* 2.0 */) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VI API major/minor version '2.5', '4.x' or " - "'5.x' but found '%s'"), ctx->service->about->apiVersion); + _("Minimum supported %s version is %s but found version '%s'"), + esxVI_ProductLineToDisplayName(esxVI_ProductLine_GSX), + "2.0", ctx->service->about->version); return -1; } - if (STREQ(ctx->service->about->productLineId, "gsx")) { - if (STRPREFIX(ctx->service->about->version, "2.0")) { - ctx->productVersion = esxVI_ProductVersion_GSX20; - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting GSX major/minor version '2.0' but " - "found '%s'"), ctx->service->about->version); - return -1; - } - } else if (STREQ(ctx->service->about->productLineId, "esx") || - STREQ(ctx->service->about->productLineId, "embeddedEsx")) { - if (STRPREFIX(ctx->service->about->version, "3.5")) { - ctx->productVersion = esxVI_ProductVersion_ESX35; - } else if (STRPREFIX(ctx->service->about->version, "4.0")) { - ctx->productVersion = esxVI_ProductVersion_ESX40; - } else if (STRPREFIX(ctx->service->about->version, "4.1")) { - ctx->productVersion = esxVI_ProductVersion_ESX41; - } else if (STRPREFIX(ctx->service->about->version, "4.")) { - ctx->productVersion = esxVI_ProductVersion_ESX4x; - } else if (STRPREFIX(ctx->service->about->version, "5.0")) { - ctx->productVersion = esxVI_ProductVersion_ESX50; - } else if (STRPREFIX(ctx->service->about->version, "5.1")) { - ctx->productVersion = esxVI_ProductVersion_ESX51; - } else if (STRPREFIX(ctx->service->about->version, "5.")) { - ctx->productVersion = esxVI_ProductVersion_ESX5x; - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting ESX major/minor version '3.5', " - "'4.x' or '5.x' but found '%s'"), - ctx->service->about->version); - return -1; - } - } else if (STREQ(ctx->service->about->productLineId, "vpx")) { - if (STRPREFIX(ctx->service->about->version, "2.5")) { - ctx->productVersion = esxVI_ProductVersion_VPX25; - } else if (STRPREFIX(ctx->service->about->version, "4.0")) { - ctx->productVersion = esxVI_ProductVersion_VPX40; - } else if (STRPREFIX(ctx->service->about->version, "4.1")) { - ctx->productVersion = esxVI_ProductVersion_VPX41; - } else if (STRPREFIX(ctx->service->about->version, "4.")) { - ctx->productVersion = esxVI_ProductVersion_VPX4x; - } else if (STRPREFIX(ctx->service->about->version, "5.0")) { - ctx->productVersion = esxVI_ProductVersion_VPX50; - } else if (STRPREFIX(ctx->service->about->version, "5.1")) { - ctx->productVersion = esxVI_ProductVersion_VPX51; - } else if (STRPREFIX(ctx->service->about->version, "5.")) { - ctx->productVersion = esxVI_ProductVersion_VPX5x; - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VPX major/minor version '2.5', '4.x' " - "or '5.x' but found '%s'"), - ctx->service->about->version); - return -1; - } - } else { + ctx->productLine = esxVI_ProductLine_GSX; + } else if (STREQ(ctx->service->about->productLineId, "esx") || + STREQ(ctx->service->about->productLineId, "embeddedEsx")) { + if (ctx->productVersion < 1000000 * 3 + 1000 * 5 /* 3.5 */) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Minimum supported %s version is %s but found version '%s'"), + esxVI_ProductLineToDisplayName(esxVI_ProductLine_ESX), + "3.5", ctx->service->about->version); + return -1; + } + + ctx->productLine = esxVI_ProductLine_ESX; + } else if (STREQ(ctx->service->about->productLineId, "vpx")) { + if (ctx->productVersion < 1000000 * 2 + 1000 * 5 /* 2.5 */) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting product 'gsx' or 'esx' or 'embeddedEsx' " - "or 'vpx' but found '%s'"), - ctx->service->about->productLineId); + _("Minimum supported %s version is %s but found version '%s'"), + esxVI_ProductLineToDisplayName(esxVI_ProductLine_VPX), + "2.5", ctx->service->about->version); return -1; } + + ctx->productLine = esxVI_ProductLine_VPX; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VI API type 'HostAgent' or 'VirtualCenter' " - "but found '%s'"), ctx->service->about->apiType); + _("Expecting product 'gsx' or 'esx' or 'embeddedEsx' " + "or 'vpx' but found '%s'"), + ctx->service->about->productLineId); return -1; } - if (ctx->productVersion & esxVI_ProductVersion_ESX) { + if (ctx->productLine == esxVI_ProductLine_ESX) { /* * FIXME: Actually this should be detected by really calling * QueryVirtualDiskUuid and checking if a NotImplemented fault is @@ -1142,7 +1121,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, ctx->hasQueryVirtualDiskUuid = true; } - if (ctx->productVersion & esxVI_ProductVersion_VPX) { + if (ctx->productLine == esxVI_ProductLine_VPX) { ctx->hasSessionIsActive = true; } @@ -4770,9 +4749,33 @@ esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedHostCpuIdInfo, +const char * +esxVI_ProductLineToDisplayName(esxVI_ProductLine productLine) +{ + switch (productLine) { + case esxVI_ProductLine_GSX: + return "Server/GSX"; + + case esxVI_ProductLine_ESX: + return "ESX(i)"; + + case esxVI_ProductLine_VPX: + return "vCenter/VPX"; + + default: + return "<unknown>"; + } +} + + + int -esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductVersion productVersion) +esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductLine productLine, + unsigned long productVersion) { + /* product version == 1000000 * major + 1000 * minor + micro */ + int major = productVersion / 1000000; + /* * virtualHW.version compatibility matrix: * @@ -4785,35 +4788,39 @@ esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductVersion productVersio * ESX 5.5 + + + + + 5.5 * GSX 2.0 + + 2.5 */ - switch (productVersion) { - case esxVI_ProductVersion_ESX35: - case esxVI_ProductVersion_VPX25: - return 4; - - case esxVI_ProductVersion_GSX20: - case esxVI_ProductVersion_ESX40: - case esxVI_ProductVersion_ESX41: - case esxVI_ProductVersion_VPX40: - case esxVI_ProductVersion_VPX41: + switch (productLine) { + case esxVI_ProductLine_GSX: return 7; - case esxVI_ProductVersion_ESX4x: - case esxVI_ProductVersion_VPX4x: - return 7; + case esxVI_ProductLine_ESX: + switch (major) { + case 3: + return 4; - case esxVI_ProductVersion_ESX50: - case esxVI_ProductVersion_VPX50: - return 8; + case 4: + return 7; - case esxVI_ProductVersion_ESX51: - case esxVI_ProductVersion_ESX5x: - case esxVI_ProductVersion_VPX51: - case esxVI_ProductVersion_VPX5x: - return 8; + case 5: + default: + return 8; + } + + case esxVI_ProductLine_VPX: + switch (major) { + case 2: + return 4; + + case 4: + return 7; + + case 5: + default: + return 8; + } default: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpected product version")); + _("Unexpected product line")); return -1; } } diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index dac36cd..b7f0160 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -75,8 +75,7 @@ -typedef enum _esxVI_APIVersion esxVI_APIVersion; -typedef enum _esxVI_ProductVersion esxVI_ProductVersion; +typedef enum _esxVI_ProductLine esxVI_ProductLine; typedef enum _esxVI_Occurrence esxVI_Occurrence; typedef struct _esxVI_ParsedHostCpuIdInfo esxVI_ParsedHostCpuIdInfo; typedef struct _esxVI_CURL esxVI_CURL; @@ -90,45 +89,10 @@ typedef struct _esxVI_List esxVI_List; -enum _esxVI_APIVersion { - esxVI_APIVersion_Undefined = 0, - esxVI_APIVersion_Unknown, - esxVI_APIVersion_25, - esxVI_APIVersion_40, - esxVI_APIVersion_41, - esxVI_APIVersion_4x, /* > 4.1 */ - esxVI_APIVersion_50, - esxVI_APIVersion_51, - esxVI_APIVersion_5x /* > 5.1 */ -}; - -/* - * AAAABBBB: where AAAA0000 is the product and BBBB the version. this format - * allows simple bitmask testing for a product independent of the version - */ -enum _esxVI_ProductVersion { - esxVI_ProductVersion_Undefined = 0, - - esxVI_ProductVersion_GSX = (1 << 0) << 16, - esxVI_ProductVersion_GSX20 = esxVI_ProductVersion_GSX | 1, - - esxVI_ProductVersion_ESX = (1 << 1) << 16, - esxVI_ProductVersion_ESX35 = esxVI_ProductVersion_ESX | 1, - esxVI_ProductVersion_ESX40 = esxVI_ProductVersion_ESX | 2, - esxVI_ProductVersion_ESX41 = esxVI_ProductVersion_ESX | 3, - esxVI_ProductVersion_ESX4x = esxVI_ProductVersion_ESX | 4, /* > 4.1 */ - esxVI_ProductVersion_ESX50 = esxVI_ProductVersion_ESX | 5, - esxVI_ProductVersion_ESX51 = esxVI_ProductVersion_ESX | 6, - esxVI_ProductVersion_ESX5x = esxVI_ProductVersion_ESX | 7, /* > 5.1 */ - - esxVI_ProductVersion_VPX = (1 << 2) << 16, - esxVI_ProductVersion_VPX25 = esxVI_ProductVersion_VPX | 1, - esxVI_ProductVersion_VPX40 = esxVI_ProductVersion_VPX | 2, - esxVI_ProductVersion_VPX41 = esxVI_ProductVersion_VPX | 3, - esxVI_ProductVersion_VPX4x = esxVI_ProductVersion_VPX | 4, /* > 4.1 */ - esxVI_ProductVersion_VPX50 = esxVI_ProductVersion_VPX | 5, - esxVI_ProductVersion_VPX51 = esxVI_ProductVersion_VPX | 6, - esxVI_ProductVersion_VPX5x = esxVI_ProductVersion_VPX | 7 /* > 5.1 */ +enum _esxVI_ProductLine { + esxVI_ProductLine_GSX = 0, + esxVI_ProductLine_ESX, + esxVI_ProductLine_VPX }; enum _esxVI_Occurrence { @@ -226,8 +190,9 @@ struct _esxVI_Context { char *username; char *password; esxVI_ServiceContent *service; - esxVI_APIVersion apiVersion; - esxVI_ProductVersion productVersion; + unsigned long apiVersion; /* = 1000000 * major + 1000 * minor + micro */ + esxVI_ProductLine productLine; + unsigned long productVersion; /* = 1000000 * major + 1000 * minor + micro */ esxVI_UserSession *session; /* ... except the session ... */ virMutexPtr sessionLock; /* ... that is protected by this mutex */ esxVI_Datacenter *datacenter; @@ -536,8 +501,10 @@ int esxVI_WaitForTaskCompletion(esxVI_Context *ctx, int esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedHostCpuIdInfo, esxVI_HostCpuIdInfo *hostCpuIdInfo); +const char *esxVI_ProductLineToDisplayName(esxVI_ProductLine productLine); + int esxVI_ProductVersionToDefaultVirtualHWVersion - (esxVI_ProductVersion productVersion); + (esxVI_ProductLine productLine, unsigned long productVersion); int esxVI_LookupHostInternetScsiHbaStaticTargetByName (esxVI_Context *ctx, const char *name, -- 1.8.3.2

2 2

[libvirt] [PATCH 0/2] Resolve fc_host startup config issues
by John Ferlan 08 Nov '14

08 Nov '14

Fix a couple of bugs related to attempting to start an fc_host with incorrect 'parent' attributes. One consideration is a parent that is not capable to support the vport operations and the other is providing the incorrect scsi_host# for the parent from the nodedev-create used to generate the wwnn,wwpn Updated the documentation in order to add some more cautions I've find during my investigation and make it clearer what must be provided. John Ferlan (2): storage: Check for valid fc_host parent at startup storage: Ensure fc_host parent matches wwnn/wwpn docs/formatstorage.html.in | 15 ++++- src/storage/storage_backend_scsi.c | 115 ++++++++++++++++++++++++++++++++++--- 2 files changed, 119 insertions(+), 11 deletions(-) -- 1.9.3

1 3

[libvirt] [PATCH] domain_conf: Use virDomainParseMemory more widely
by Michal Privoznik 08 Nov '14

08 Nov '14

As reviewing patches upstream it occurred to me, that we have two functions doing nearly the same: virDomainParseMemory which expects XML in the following format: <memory unit='MiB'>1337</memory> The other function being virDomainHugepagesParseXML expecting the following format: <someElement memory='1337' unit='MiB'/> It wouldn't matter to have two functions handle two different scenarios like this if we could only not copy code that handles 32bit arches around. So this code merges the common parts into one by inventing new @units_xpath argument to virDomainParseMemory which allows overriding the default location of @unit attribute in XML. With this change both scenarios above can be parsed with virDomainParseMemory. Sweet. Of course, everything is commented as it should be. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 137 +++++++++++++++++++++++++++++-------------------- 1 file changed, 80 insertions(+), 57 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 21309b0..e097af7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6318,14 +6318,30 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, goto cleanup; } - -/* Parse a value located at XPATH within CTXT, and store the - * result into val. If REQUIRED, then the value must exist; - * otherwise, the value is optional. The value is in bytes. - * Return 1 on success, 0 if the value was not present and - * is not REQUIRED, -1 on failure after issuing error. */ +/** + * virDomainParseScaledValue: + * @bytes_xpath: XPath to memory amount + * @units_xpath: XPath to units attribute + * @ctxt: XPath context + * @val: scaled value is stored here + * @scale: default scale for @val + * @max: maximal @val allowed + * @required: is the value required? + * + * Parse a value located at @bytes_xpath within @ctxt, and store + * the result into @val. By default, if @units_xpath is NULL the + * unit attribute must be an attribute to @bytes_xpath. + * Otherwise, the unit attribute is looked for under specified + * path. If @required is set, then the value must exist; + * otherwise, the value is optional. The value is in bytes. + * + * Returns 1 on success, + * 0 if the value was not present and !@required, + * -1 on failure after issuing error. + */ static int -virDomainParseScaledValue(const char *xpath, +virDomainParseScaledValue(const char *bytes_xpath, + const char *units_xpath, xmlXPathContextPtr ctxt, unsigned long long *val, unsigned long long scale, @@ -6339,7 +6355,7 @@ virDomainParseScaledValue(const char *xpath, unsigned long long bytes; *val = 0; - if (virAsprintf(&xpath_full, "string(%s)", xpath) < 0) + if (virAsprintf(&xpath_full, "string(%s)", bytes_xpath) < 0) goto cleanup; bytes_str = virXPathString(xpath_full, ctxt); @@ -6348,8 +6364,8 @@ virDomainParseScaledValue(const char *xpath, ret = 0; } else { virReportError(VIR_ERR_XML_ERROR, - _("missing element %s"), - xpath); + _("missing element or attribute '%s'"), + bytes_xpath); } goto cleanup; } @@ -6357,12 +6373,15 @@ virDomainParseScaledValue(const char *xpath, if (virStrToLong_ullp(bytes_str, NULL, 10, &bytes) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid value '%s' for element '%s'"), - bytes_str, xpath); + _("Invalid value '%s' for element or attribute '%s'"), + bytes_str, bytes_xpath); goto cleanup; } - if (virAsprintf(&xpath_full, "string(%s/@unit)", xpath) < 0) + if ((units_xpath && + virAsprintf(&xpath_full, "string(%s)", units_xpath) < 0) || + (!units_xpath && + virAsprintf(&xpath_full, "string(%s/@unit)", bytes_xpath) < 0)) goto cleanup; unit = virXPathString(xpath_full, ctxt); @@ -6379,17 +6398,35 @@ virDomainParseScaledValue(const char *xpath, } -/* Parse a memory element located at XPATH within CTXT, and store the - * result into MEM, in blocks of 1024. If REQUIRED, then the value - * must exist; otherwise, the value is optional. The value must not - * exceed VIR_DOMAIN_MEMORY_PARAM_UNLIMITED once scaled; additionally, - * if CAPPED is true, the value must fit within an unsigned long (only - * matters on 32-bit platforms). +/** + * virDomainParseMemory: + * @bytes_xpath: XPath to memory amount + * @units_xpath: XPath to units attribute + * @ctxt: XPath context + * @mem: scaled memory amount is stored here + * @required: whether value is required + * @capped: whether scaled value must fit within unsigned long * - * Return 0 on success, -1 on failure after issuing error. */ + * Parse a memory element or attribute located at @bytes_xpath + * within @ctxt, and store the result into @mem, in blocks of + * 1024. By default, if @units_xpath is NULL the unit attribute + * must be an attribute to @bytes_xpath. Otherwise, the unit + * attribute is looked for under specified path. If @required is + * set, then the value must exist; otherwise, the value is + * optional. The value must not exceed + * VIR_DOMAIN_MEMORY_PARAM_UNLIMITED once scaled; additionally, + * if @capped is true, the value must fit within an unsigned long + * (only matters on 32-bit platforms). + * + * Return 0 on success, -1 on failure after issuing error. + */ static int -virDomainParseMemory(const char *xpath, xmlXPathContextPtr ctxt, - unsigned long long *mem, bool required, bool capped) +virDomainParseMemory(const char *bytes_xpath, + const char *units_xpath, + xmlXPathContextPtr ctxt, + unsigned long long *mem, + bool required, + bool capped) { int ret = -1; unsigned long long bytes, max; @@ -6401,7 +6438,8 @@ virDomainParseMemory(const char *xpath, xmlXPathContextPtr ctxt, else max = LLONG_MAX; - ret = virDomainParseScaledValue(xpath, ctxt, &bytes, 1024, max, required); + ret = virDomainParseScaledValue(bytes_xpath, units_xpath, ctxt, + &bytes, 1024, max, required); if (ret < 0) goto cleanup; @@ -6585,8 +6623,8 @@ virDomainControllerDefParseXML(xmlNodePtr node, "should have index 0")); goto error; } - if ((rc = virDomainParseScaledValue("./pcihole64", ctxt, - &bytes, 1024, + if ((rc = virDomainParseScaledValue("./pcihole64", NULL, + ctxt, &bytes, 1024, 1024ULL * ULONG_MAX, false)) < 0) goto error; @@ -6684,14 +6722,14 @@ virDomainFSDefParseXML(xmlNodePtr node, def->accessmode = VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH; } - if (virDomainParseScaledValue("./space_hard_limit[1]", ctxt, - &def->space_hard_limit, 1, - ULLONG_MAX, false) < 0) + if (virDomainParseScaledValue("./space_hard_limit[1]", + NULL, ctxt, &def->space_hard_limit, + 1, ULLONG_MAX, false) < 0) goto error; - if (virDomainParseScaledValue("./space_soft_limit[1]", ctxt, - &def->space_soft_limit, 1, - ULLONG_MAX, false) < 0) + if (virDomainParseScaledValue("./space_soft_limit[1]", + NULL, ctxt, &def->space_soft_limit, + 1, ULLONG_MAX, false) < 0) goto error; cur = node->children; @@ -9824,8 +9862,8 @@ virDomainShmemDefParseXML(xmlNodePtr node, goto cleanup; } - if (virDomainParseScaledValue("./size[1]", ctxt, &def->size, - 1, ULLONG_MAX, false) < 0) + if (virDomainParseScaledValue("./size[1]", NULL, ctxt, + &def->size, 1, ULLONG_MAX, false) < 0) goto cleanup; if ((server = virXPathNode("./server[1]", ctxt))) { @@ -11965,30 +12003,15 @@ virDomainHugepagesParseXML(xmlNodePtr node, { int ret = -1; xmlNodePtr oldnode = ctxt->node; - unsigned long long bytes, max; char *unit = NULL, *nodeset = NULL; ctxt->node = node; - /* On 32-bit machines, our bound is 0xffffffff * KiB. On 64-bit - * machines, our bound is off_t (2^63). */ - if (sizeof(unsigned long) < sizeof(long long)) - max = 1024ull * ULONG_MAX; - else - max = LLONG_MAX; - - if (virXPathULongLong("string(./@size)", ctxt, &bytes) < 0) { - virReportError(VIR_ERR_XML_DETAIL, "%s", - _("unable to parse size attribute")); - goto cleanup; - } - - unit = virXPathString("string(./@unit)", ctxt); - - if (virScaleInteger(&bytes, unit, 1024, max) < 0) + if (virDomainParseMemory("./@size", "./@unit", ctxt, + &hugepage->size, true, false) < 0) goto cleanup; - if (!(hugepage->size = VIR_DIV_UP(bytes, 1024))) { + if (!hugepage->size) { virReportError(VIR_ERR_XML_DETAIL, "%s", _("hugepage size can't be zero")); goto cleanup; @@ -12225,11 +12248,11 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; /* Extract domain memory */ - if (virDomainParseMemory("./memory[1]", ctxt, + if (virDomainParseMemory("./memory[1]", NULL, ctxt, &def->mem.max_balloon, true, true) < 0) goto error; - if (virDomainParseMemory("./currentMemory[1]", ctxt, + if (virDomainParseMemory("./currentMemory[1]", NULL, ctxt, &def->mem.cur_balloon, false, true) < 0) goto error; @@ -12349,19 +12372,19 @@ virDomainDefParseXML(xmlDocPtr xml, VIR_FREE(nodes); /* Extract other memory tunables */ - if (virDomainParseMemory("./memtune/hard_limit[1]", ctxt, + if (virDomainParseMemory("./memtune/hard_limit[1]", NULL, ctxt, &def->mem.hard_limit, false, false) < 0) goto error; - if (virDomainParseMemory("./memtune/soft_limit[1]", ctxt, + if (virDomainParseMemory("./memtune/soft_limit[1]", NULL, ctxt, &def->mem.soft_limit, false, false) < 0) goto error; - if (virDomainParseMemory("./memtune/min_guarantee[1]", ctxt, + if (virDomainParseMemory("./memtune/min_guarantee[1]", NULL, ctxt, &def->mem.min_guarantee, false, false) < 0) goto error; - if (virDomainParseMemory("./memtune/swap_hard_limit[1]", ctxt, + if (virDomainParseMemory("./memtune/swap_hard_limit[1]", NULL, ctxt, &def->mem.swap_hard_limit, false, false) < 0) goto error; -- 2.0.4

3 2

[libvirt] [PATCH 00/15] Cleanup some curly braces
by Martin Kletzander 08 Nov '14

08 Nov '14

5 25

[libvirt] [PATCH] Transform VIR_ERROR into VIR_WARN in detect_scsi_host_caps
by Cédric Bosdonnat 07 Nov '14

07 Nov '14

If detect_scsi_host_caps reports errors but keeps libvirtd going on startup, the user is mislead by the error messages. Transforming them into warning still shows the problems, but indicates this is not fatal. --- po/POTFILES.in | 1 - src/node_device/node_device_linux_sysfs.c | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 89c6a44..1439ae4 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -92,7 +92,6 @@ src/network/bridge_driver_linux.c src/network/leaseshelper.c src/node_device/node_device_driver.c src/node_device/node_device_hal.c -src/node_device/node_device_linux_sysfs.c src/node_device/node_device_udev.c src/nodeinfo.c src/nwfilter/nwfilter_dhcpsnoop.c diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index be95e51..4a95b2b 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -62,7 +62,7 @@ detect_scsi_host_caps(union _virNodeDevCapData *d) d->scsi_host.host, "port_name", &d->scsi_host.wwpn) < 0) { - VIR_ERROR(_("Failed to read WWPN for host%d"), d->scsi_host.host); + VIR_WARN("Failed to read WWPN for host%d", d->scsi_host.host); goto cleanup; } @@ -70,7 +70,7 @@ detect_scsi_host_caps(union _virNodeDevCapData *d) d->scsi_host.host, "node_name", &d->scsi_host.wwnn) < 0) { - VIR_ERROR(_("Failed to read WWNN for host%d"), d->scsi_host.host); + VIR_WARN("Failed to read WWNN for host%d", d->scsi_host.host); goto cleanup; } @@ -78,8 +78,8 @@ detect_scsi_host_caps(union _virNodeDevCapData *d) d->scsi_host.host, "fabric_name", &d->scsi_host.fabric_wwn) < 0) { - VIR_ERROR(_("Failed to read fabric WWN for host%d"), - d->scsi_host.host); + VIR_WARN("Failed to read fabric WWN for host%d", + d->scsi_host.host); goto cleanup; } } @@ -91,8 +91,8 @@ detect_scsi_host_caps(union _virNodeDevCapData *d) d->scsi_host.host, "max_npiv_vports", &max_vports) < 0) { - VIR_ERROR(_("Failed to read max_npiv_vports for host%d"), - d->scsi_host.host); + VIR_WARN("Failed to read max_npiv_vports for host%d", + d->scsi_host.host); goto cleanup; } @@ -100,22 +100,22 @@ detect_scsi_host_caps(union _virNodeDevCapData *d) d->scsi_host.host, "npiv_vports_inuse", &vports) < 0) { - VIR_ERROR(_("Failed to read npiv_vports_inuse for host%d"), - d->scsi_host.host); + VIR_WARN("Failed to read npiv_vports_inuse for host%d", + d->scsi_host.host); goto cleanup; } if (virStrToLong_i(max_vports, NULL, 10, &d->scsi_host.max_vports) < 0) { - VIR_ERROR(_("Failed to parse value of max_npiv_vports '%s'"), + VIR_WARN("Failed to parse value of max_npiv_vports '%s'", max_vports); goto cleanup; } if (virStrToLong_i(vports, NULL, 10, &d->scsi_host.vports) < 0) { - VIR_ERROR(_("Failed to parse value of npiv_vports_inuse '%s'"), - vports); + VIR_WARN("Failed to parse value of npiv_vports_inuse '%s'", + vports); goto cleanup; } } -- 1.8.4.5

3 2

[libvirt] [PATCH v2] Memory : Allow specification of 'units' for numa nodes.
by Prerna Saxena 07 Nov '14

07 Nov '14

Reference : ======= v1: http://www.spinics.net/linux/fedora/libvir/msg105516.html Changes since v1: =========== 1) As suggested by Michal, a new function "virCPUNumaCellMemoryParseXML" has been introduced for neat computation of NUMA memory. 2) Patches 2 & 3 of v1 have been merged together into this cumulative patch. 3) Corresponding documentation added. >From 2199d97b88cf9eab29788fb0e440c4b0a0bb23ec Mon Sep 17 00:00:00 2001 From: Prerna Saxena <prerna(a)linux.vnet.ibm.com> Date: Mon, 3 Nov 2014 07:53:59 +0530 CPU numa topology implicitly allows memory specification in 'KiB'. Enabling this to accept the 'unit' in which memory needs to be specified. This now allows users to specify memory in units of choice, and lists the same in 'KiB' -- just like other 'memory' elements in XML. <numa> <cell cpus='0-3' memory='1024' unit='MiB' /> <cell cpus='4-7' memory='1024' unit='MiB' /> </numa> Also augment test cases to correctly model NUMA memory specification. This adds the tag 'unit="KiB"' for memory attribute in NUMA cells. Signed-off-by: Prerna Saxena <prerna(a)linux.vnet.ibm.com> --- docs/formatdomain.html.in | 6 ++- docs/schemas/domaincommon.rng | 5 ++ src/conf/cpu_conf.c | 62 ++++++++++++++++------ .../qemuxml2argv-cpu-numa-disjoint.xml | 4 +- .../qemuxml2argv-cpu-numa-memshared.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa3.xml | 4 +- .../qemuxml2argv-hugepages-pages.xml | 8 +-- .../qemuxml2argv-hugepages-pages2.xml | 4 +- .../qemuxml2argv-hugepages-pages3.xml | 4 +- .../qemuxml2argv-hugepages-pages4.xml | 8 +-- .../qemuxml2argv-hugepages-shared.xml | 8 +-- .../qemuxml2argv-numatune-auto-prefer.xml | 2 +- .../qemuxml2argv-numatune-memnode-no-memory.xml | 4 +- .../qemuxml2argv-numatune-memnode.xml | 6 +-- .../qemuxml2argv-numatune-memnodes-problematic.xml | 4 +- .../qemuxml2xmlout-cpu-numa1.xml | 4 +- .../qemuxml2xmlout-cpu-numa2.xml | 4 +- .../qemuxml2xmlout-numatune-auto-prefer.xml | 2 +- .../qemuxml2xmlout-numatune-memnode.xml | 6 +-- 21 files changed, 97 insertions(+), 60 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0099ce7..24afc87 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1140,8 +1140,8 @@ <cpu> ... <numa> - <cell id='0' cpus='0-3' memory='512000'/> - <cell id='1' cpus='4-7' memory='512000' memAccess='shared'/> + <cell id='0' cpus='0-3' memory='512000' unit='KiB'/> + <cell id='1' cpus='4-7' memory='512000' unit='KiB' memAccess='shared'/> </numa> ... </cpu> @@ -1152,6 +1152,8 @@ <code>cpus</code> specifies the CPU or range of CPUs that are part of the node. <code>memory</code> specifies the node memory in kibibytes (i.e. blocks of 1024 bytes). + <span class="since">Since 1.2.11</span> one can specify an additional + <code>unit</code> attribute to describe the node memory unit. <span class="since">Since 1.2.7</span> all cells should have <code>id</code> attribute in case referring to some cell is necessary in the code, otherwise the cells are diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 20d81ae..44cabad 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4144,6 +4144,11 @@ <ref name="memoryKB"/> </attribute> <optional> + <attribute name="unit"> + <ref name="unit"/> + </attribute> + </optional> + <optional> <attribute name="memAccess"> <choice> <value>shared</value> diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 5475c07..a0a60c8 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -177,6 +177,48 @@ virCPUDefCopy(const virCPUDef *cpu) return NULL; } +static int +virCPUNumaCellMemoryParseXML(xmlNodePtr node, + xmlXPathContextPtr ctxt, + unsigned long long* cellMemory) +{ + int ret = -1; + xmlNodePtr oldnode = ctxt->node; + unsigned long long bytes, max; + char *unit = NULL; + + ctxt->node = node; + + /* 32 vs 64 bit will differ in value of upper memory bound. + * On 32-bit machines, our bound is 0xffffffff * KiB. On 64-bit + * machines, our bound is off_t (2^63). + */ + if (sizeof(unsigned long) < sizeof(long long)) + max = 1024ull * ULONG_MAX; + else + max = LLONG_MAX; + + if (virXPathULongLong("string(./@memory)", ctxt, &bytes) < 0) { + virReportError(VIR_ERR_XML_DETAIL, "%s", + _("unable to parse memory size attribute")); + goto cleanup; + } + + unit = virXPathString("string(./@unit)", ctxt); + + if (virScaleInteger(&bytes, unit, 1024, max) < 0) + goto cleanup; + + *cellMemory = VIR_DIV_UP(bytes, 1024); + + ret = 0; + cleanup: + VIR_FREE(unit); + ctxt->node = oldnode; + return ret; + +} + virCPUDefPtr virCPUDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, @@ -440,7 +482,7 @@ virCPUDefParseXML(xmlNodePtr node, def->ncells = n; for (i = 0; i < n; i++) { - char *cpus, *memory, *memAccessStr; + char *cpus, *memAccessStr; int ret, ncpus = 0; unsigned int cur_cell; char *tmp = NULL; @@ -489,21 +531,8 @@ virCPUDefParseXML(xmlNodePtr node, goto error; def->cells_cpus += ncpus; - memory = virXMLPropString(nodes[i], "memory"); - if (!memory) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("Missing 'memory' attribute in NUMA cell")); - goto error; - } - - ret = virStrToLong_ull(memory, NULL, 10, &def->cells[cur_cell].mem); - if (ret == -1) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("Invalid 'memory' attribute in NUMA cell")); - VIR_FREE(memory); - goto error; - } - VIR_FREE(memory); + virCPUNumaCellMemoryParseXML(nodes[i], + ctxt, &def->cells[cur_cell].mem); memAccessStr = virXMLPropString(nodes[i], "memAccess"); if (memAccessStr) { @@ -703,6 +732,7 @@ virCPUDefFormatBuf(virBufferPtr buf, virBufferAsprintf(buf, " id='%zu'", i); virBufferAsprintf(buf, " cpus='%s'", def->cells[i].cpustr); virBufferAsprintf(buf, " memory='%llu'", def->cells[i].mem); + virBufferAddLit(buf, " unit='KiB'"); if (memAccess) virBufferAsprintf(buf, " memAccess='%s'", virMemAccessTypeToString(memAccess)); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.xml index 474a238..bdffcd1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.xml @@ -11,8 +11,8 @@ <cpu> <topology sockets='2' cores='4' threads='2'/> <numa> - <cell id='0' cpus='0-3,8-11' memory='109550'/> - <cell id='1' cpus='4-7,12-15' memory='109550'/> + <cell id='0' cpus='0-3,8-11' memory='109550' unit='KiB'/> + <cell id='1' cpus='4-7,12-15' memory='109550' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.xml index cf7c040..c638ffa 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.xml @@ -11,8 +11,8 @@ <cpu> <topology sockets='2' cores='4' threads='2'/> <numa> - <cell id='0' cpus='0-7' memory='109550' memAccess='shared'/> - <cell id='1' cpus='8-15' memory='109550' memAccess='private'/> + <cell id='0' cpus='0-7' memory='109550' unit='KiB' memAccess='shared'/> + <cell id='1' cpus='8-15' memory='109550' unit='KiB' memAccess='private'/> </numa> </cpu> <clock offset='utc'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.xml index 0543f7f..20120e9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.xml @@ -11,8 +11,8 @@ <cpu> <topology sockets='2' cores='4' threads='2'/> <numa> - <cell cpus='0-7' memory='109550'/> - <cell cpus='8-15' memory='109550'/> + <cell cpus='0-7' memory='109550' unit='KiB'/> + <cell cpus='8-15' memory='109550' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.xml index 0a5f9fc..a90e7a2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.xml @@ -11,8 +11,8 @@ <cpu> <topology sockets='2' cores='4' threads='2'/> <numa> - <cell id='1' cpus='8-15' memory='109550'/> - <cell id='0' cpus='0-7' memory='109550'/> + <cell id='1' cpus='8-15' memory='109550' unit='KiB'/> + <cell id='0' cpus='0-7' memory='109550' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa3.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa3.xml index fa3070d..ea2dc81 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa3.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa3.xml @@ -11,8 +11,8 @@ <cpu> <topology sockets='2' cores='4' threads='2'/> <numa> - <cell id='1' cpus='0-7' memory='109550'/> - <cell id='2' cpus='8-15' memory='109550'/> + <cell id='1' cpus='0-7' memory='109550' unit='KiB'/> + <cell id='2' cpus='8-15' memory='109550' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.xml b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.xml index 5ad0695..b67df2f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.xml @@ -20,10 +20,10 @@ </os> <cpu> <numa> - <cell id='0' cpus='0' memory='1048576'/> - <cell id='1' cpus='1' memory='1048576'/> - <cell id='2' cpus='2' memory='1048576'/> - <cell id='3' cpus='3' memory='1048576'/> + <cell id='0' cpus='0' memory='1048576' unit='KiB'/> + <cell id='1' cpus='1' memory='1048576' unit='KiB'/> + <cell id='2' cpus='2' memory='1048576' unit='KiB'/> + <cell id='3' cpus='3' memory='1048576' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.xml b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.xml index 3df870b..6afa6ef 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.xml @@ -15,8 +15,8 @@ </os> <cpu> <numa> - <cell id='0' cpus='0' memory='262144'/> - <cell id='1' cpus='1' memory='786432'/> + <cell id='0' cpus='0' memory='262144' unit='KiB'/> + <cell id='1' cpus='1' memory='786432' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.xml b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.xml index 35aa2cf..21f4985 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.xml @@ -15,8 +15,8 @@ </os> <cpu> <numa> - <cell id='0' cpus='0' memory='262144'/> - <cell id='1' cpus='1' memory='786432'/> + <cell id='0' cpus='0' memory='262144' unit='KiB'/> + <cell id='1' cpus='1' memory='786432' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages4.xml b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages4.xml index a3ed29b..eb18f24 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages4.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages4.xml @@ -20,10 +20,10 @@ </os> <cpu> <numa> - <cell id='0' cpus='0' memory='1048576'/> - <cell id='1' cpus='1' memory='1048576'/> - <cell id='2' cpus='2' memory='1048576'/> - <cell id='3' cpus='3' memory='1048576'/> + <cell id='0' cpus='0' memory='1048576' unit='KiB'/> + <cell id='1' cpus='1' memory='1048576' unit='KiB'/> + <cell id='2' cpus='2' memory='1048576' unit='KiB'/> + <cell id='3' cpus='3' memory='1048576' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.xml b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.xml index e7db69c..52ca2f9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.xml @@ -20,10 +20,10 @@ </os> <cpu> <numa> - <cell id='0' cpus='0' memory='1048576'/> - <cell id='1' cpus='1' memory='1048576' memAccess='shared'/> - <cell id='2' cpus='2' memory='1048576' memAccess='private'/> - <cell id='3' cpus='3' memory='1048576'/> + <cell id='0' cpus='0' memory='1048576' unit='KiB'/> + <cell id='1' cpus='1' memory='1048576' unit='KiB' memAccess='shared'/> + <cell id='2' cpus='2' memory='1048576' unit='KiB' memAccess='private'/> + <cell id='3' cpus='3' memory='1048576' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.xml b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.xml index 63f0d1f..8f80962 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.xml @@ -13,7 +13,7 @@ </os> <cpu> <numa> - <cell id='0' cpus='0' memory='65536'/> + <cell id='0' cpus='0' memory='65536' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.xml b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.xml index 4b2efa2..886a07a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.xml @@ -13,8 +13,8 @@ </os> <cpu> <numa> - <cell id='0' cpus='0' memory='32768'/> - <cell id='1' cpus='1' memory='32768'/> + <cell id='0' cpus='0' memory='32768' unit='KiB'/> + <cell id='1' cpus='1' memory='32768' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.xml b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.xml index 440413b..8912017 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.xml @@ -15,9 +15,9 @@ </os> <cpu> <numa> - <cell id='0' cpus='0' memory='20002'/> - <cell id='1' cpus='1-27,29' memory='660066'/> - <cell id='2' cpus='28-31,^29' memory='24002400'/> + <cell id='0' cpus='0' memory='20002' unit='KiB'/> + <cell id='1' cpus='1-27,29' memory='660066' unit='KiB'/> + <cell id='2' cpus='28-31,^29' memory='24002400' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnodes-problematic.xml b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnodes-problematic.xml index bb4e4af..e1d115c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnodes-problematic.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnodes-problematic.xml @@ -14,8 +14,8 @@ </os> <cpu> <numa> - <cell id='0' cpus='0' memory='32768'/> - <cell id='1' cpus='1' memory='32768'/> + <cell id='0' cpus='0' memory='32768' unit='KiB'/> + <cell id='1' cpus='1' memory='32768' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa1.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa1.xml index 227bf1c..58f40b9 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa1.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa1.xml @@ -11,8 +11,8 @@ <cpu> <topology sockets='2' cores='4' threads='2'/> <numa> - <cell id='0' cpus='0-7' memory='109550'/> - <cell id='1' cpus='8-15' memory='109550'/> + <cell id='0' cpus='0-7' memory='109550' unit='KiB'/> + <cell id='1' cpus='8-15' memory='109550' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa2.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa2.xml index 227bf1c..58f40b9 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa2.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa2.xml @@ -11,8 +11,8 @@ <cpu> <topology sockets='2' cores='4' threads='2'/> <numa> - <cell id='0' cpus='0-7' memory='109550'/> - <cell id='1' cpus='8-15' memory='109550'/> + <cell id='0' cpus='0-7' memory='109550' unit='KiB'/> + <cell id='1' cpus='8-15' memory='109550' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-auto-prefer.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-auto-prefer.xml index 19761b4..1000e9f 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-auto-prefer.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-auto-prefer.xml @@ -13,7 +13,7 @@ </os> <cpu> <numa> - <cell id='0' cpus='0' memory='65536'/> + <cell id='0' cpus='0' memory='65536' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-memnode.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-memnode.xml index 82b5f61..ffc57cf 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-memnode.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-memnode.xml @@ -15,9 +15,9 @@ </os> <cpu> <numa> - <cell id='0' cpus='0' memory='20002'/> - <cell id='1' cpus='1-27,29' memory='660066'/> - <cell id='2' cpus='28-31,^29' memory='24002400'/> + <cell id='0' cpus='0' memory='20002' unit='KiB'/> + <cell id='1' cpus='1-27,29' memory='660066' unit='KiB'/> + <cell id='2' cpus='28-31,^29' memory='24002400' unit='KiB'/> </numa> </cpu> <clock offset='utc'/> -- 1.9.3 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 1

[libvirt] is there a notification when watchdog triggers?
by Chris Friesen 07 Nov '14

07 Nov '14

The libvirt.org docs say "A virtual hardware watchdog device can be added to the guest via the watchdog element....Currently libvirt does not support notification when the watchdog fires. This feature is planned for a future version of libvirt." Is that still accurate? Or does libvirt now support notifications? Chris

2 2

[libvirt] [PATCH] qemu: don't setup cpuset.mems if memory mode in numatune is 'preferred'
by Wang Rui 07 Nov '14

07 Nov '14

If the memory mode is specified as preferred, we get the following error when starting domain. error: Unable to write to '$my_cgroup_path/cpuset.mems': Device or resource busy XML is configured with numatune as follows: <numatune> <memory mode='preferred' nodeset='0'/> </numatune> If memory mode is 'preferred', cpuset.mems in cgroup shouldn't be set to 'nodeset'. I find that maybe commit 1a7be8c600905aa07ac2d78293336ba8523ad48e changes the former logic of checking mode in virDomainNumatuneGetNodeset. Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com> --- src/qemu/qemu_cgroup.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index b5bdb36..8685d6f 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -618,6 +618,11 @@ qemuSetupCpusetMems(virDomainObjPtr vm, if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUSET)) return 0; + if (virDomainNumatuneGetMode(vm->def->numatune, -1) != + VIR_DOMAIN_NUMATUNE_MEM_STRICT) { + return 0; + } + if (virDomainNumatuneMaybeFormatNodeset(vm->def->numatune, nodemask, &mem_mask, -1) < 0) -- 1.7.12.4

2 5

[libvirt] [PATCH] virnuma: add notset NULL check in virNumaSetupMemoryPolicy
by Chen Fan 07 Nov '14

07 Nov '14

introduce by commit c63ef0452b, when nodeset is NULL, validation will pass in virNumaSetupMemoryPolicy, but virBitmapNextSetBit must ensure bitmap is not Null. there will cause a segmentation fault. this patch fixed it. Signed-off-by: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com> --- src/util/virnuma.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 06520f7..b8d76f4 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -97,6 +97,9 @@ virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode, size_t i; int maxnode = 0; + if (!nodeset) + return 0; + if (!virNumaNodesetIsAvailable(nodeset)) return -1; -- 1.9.3

2 1

[libvirt] [v2 PATCH] doc: Fix a mismatch attribute name
by Luyao Huang 07 Nov '14

07 Nov '14

>From virAccessDriverPolkitCheckInterface function, we know this attribute should named: interface_macaddr Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- docs/aclpolkit.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/aclpolkit.html.in b/docs/aclpolkit.html.in index 91b5296..e5a9b16 100644 --- a/docs/aclpolkit.html.in +++ b/docs/aclpolkit.html.in @@ -121,7 +121,7 @@ <td>Name of the network interface, unique to the local host</td> </tr> <tr> - <td>interface_mac</td> + <td>interface_macaddr</td> <td>MAC address of the network interface, not unique</td> </tr> </tbody> -- 1.8.3.1

3 3

[libvirt] [PATCH] Fix a mismatch attribute name
by Luyao Huang 07 Nov '14

07 Nov '14

>From libvirt.org we know this attribute named: interface_mac MAC address of the network interface, not unique Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/access/viraccessdriverpolkit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c index 3136be7..0e07053 100644 --- a/src/access/viraccessdriverpolkit.c +++ b/src/access/viraccessdriverpolkit.c @@ -206,7 +206,7 @@ virAccessDriverPolkitCheckInterface(virAccessManagerPtr manager, const char *attrs[] = { "connect_driver", driverName, "interface_name", iface->name, - "interface_macaddr", iface->mac, + "interface_mac", iface->mac, NULL, }; -- 1.8.3.1

3 4

[libvirt] [Patch v6 0/5] Libvirt CPU enhancements for Power KVM
by Prerna Saxena 07 Nov '14

07 Nov '14

This patch series is a collection of enhancements for PowerPC CPUs on PowerKVM. The v5 of this series has been acked. I have just rebased the patches on top of latest master and added a testcase. Series Summary: ========== Patch 1/5 : Introduce a new architecture 'ppc64le' for libvirt. Patch 2/5 : Add libvirt support for VMs running in 'compat' mode on Power KVM. Patch 3/5 : Improve PVR handling to fall back to cpu generation. Patch 4/5 : Add documentation describing compat mode usage for PowerPC guests. Patch 5/5 : Add a test case for compat mode. Detail: ==== * PowerPC has traditionally been a Big-endian architecture. However, with PowerPC ISA version 2.07, it can run in Little-endian mode as well. IBM Power8 processors, compliant with ISA 2.07 allow launching VMs in little-endian mode. This is signified by 'ppc64le' architecture. Patch 1 adds this support to libvirt, to allow running VMs based on ppc64le architecture. * Patch 2,3 tweak libvirt to correctly model PowerPC CPUs based on recent PowerKVM implementation. PowerKVM permits VMs with vcpus in the following allowed modes : i) Host native mode: where the vcpu seen in the VM belongs to the same processor generation as the host. Example: A POWER7 host, conforming to PowerISA version 2.06, will run VMs with "power7" vcpus. ii) Binary Compatibility ("compat") mode: PowerISA allows processors to run VMs in binary compatibility ("compat") mode supporting an older version of ISA. As an example: In compatibility mode, a POWER7 host can run a "power6" VM, conforming to power ISA v2.05. Similarly, a POWER8 host can run a "power7" VM conforming to PowerISA v2.06. QEMU has recently added support to explicitly denote a VM running in compatibility mode through commits 6d9412ea & 8dfa3a5e85. Henceforth, VMs of type (i) will be invoked with the QEMU invocation "-cpu host", while VMs of type (ii) will be invoked using "-cpu host, compat=power6". Now, an explicit cpu selection using "-cpu POWER6" is not valid. Instead, the recommended practice is to use the matching compat mode, if the requested cpu type differs from the host. Patches 2-3 address various aspects of this change. * Patch 2 : Adds support for generating the correct command line for QEMU. Existing xml semantics of 'host-model' are interpreted differently on PowerPc architecture to signify this type. * Patch 3 : PowerKVM vCPUs differ uniquely across generations ( such as power6, power7, power8). Each generation signifies a new PowerISA version that exhibits features unique to that generation. The higher order 16 bits of PVR denote the processor generation and the lower order 16 bits denote the cpu chip (sub)version. For all practical purposes of launching a VM, we care about the generation the vCPU will belong to, and not specifically the chip version. In fact, PowerKVM does not seek out specification of a unique chip version(such as POWER7_v2.3) for running a vCPU. This patch updates the libvirt PVR check to reflect this relationship. * Patch 4 : Documentation is added to explain functionality introduced by Patch 2. * Patch 5 : Added a test case for patch 2. Changelog: ========= v1 : https://www.redhat.com/archives/libvir-list/2014-June/msg01338.html v2 : http://www.redhat.com/archives/libvir-list/2014-October/msg00351.html v3 : http://www.mail-archive.com/libvir-list@redhat.com/msg104010.html v4 : http://www.mail-archive.com/libvir-list@redhat.com/msg104067.html v5 : http://www.mail-archive.com/libvir-list@redhat.com/msg104311.html Changes since v5: ================ * Added a new patch which introduces a test case for compat mode. * Fixed a whitespace in documentation patch #4. * Added listing for Power8e cpu model in cpu_map.xml Regards, -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 6

[libvirt] [[PATCH libvirt-java]] Implement Connect.listAllDomains
by Cédric Bosdonnat 07 Nov '14

07 Nov '14

From: Cédric Bosdonnat <cedric.bosdonnat(a)free.fr> --- src/main/java/org/libvirt/Connect.java | 46 +++++++++++++++++++++++++ src/main/java/org/libvirt/jna/Libvirt.java | 2 ++ src/test/java/org/libvirt/TestJavaBindings.java | 1 + 3 files changed, 49 insertions(+) diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index fedc60e..390ed89 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -24,6 +24,7 @@ import com.sun.jna.Memory; import com.sun.jna.NativeLong; import com.sun.jna.Pointer; import com.sun.jna.ptr.LongByReference; +import com.sun.jna.ptr.PointerByReference; /** * The Connect object represents a connection to a local or remote @@ -33,6 +34,28 @@ import com.sun.jna.ptr.LongByReference; */ public class Connect { + static final class ListAllDomainsFlags { + static final int VIR_CONNECT_LIST_DOMAINS_ACTIVE = (1 << 0); + static final int VIR_CONNECT_LIST_DOMAINS_INACTIVE = (1 << 1); + + static final int VIR_CONNECT_LIST_DOMAINS_PERSISTENT = (1 << 2); + static final int VIR_CONNECT_LIST_DOMAINS_TRANSIENT = (1 << 3); + + static final int VIR_CONNECT_LIST_DOMAINS_RUNNING = (1 << 4); + static final int VIR_CONNECT_LIST_DOMAINS_PAUSED = (1 << 5); + static final int VIR_CONNECT_LIST_DOMAINS_SHUTOFF = (1 << 6); + static final int VIR_CONNECT_LIST_DOMAINS_OTHER = (1 << 7); + + static final int VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE = (1 << 8); + static final int VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE = (1 << 9); + + static final int VIR_CONNECT_LIST_DOMAINS_AUTOSTART = (1 << 10); + static final int VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART = (1 << 11); + + static final int VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT = (1 << 12); + static final int VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT = (1 << 13); + } + /** * Get the version of a connection. * @@ -758,6 +781,29 @@ public class Connect { } /** + * Lists a possibly filtered list of all the domains. + * + * @param flags bitwise-OR of ListAllDomainsFlags + * + * @return and array of the IDs of the active domains + * @throws LibvirtException + */ + public Domain[] listAllDomains(int flags) throws LibvirtException { + PointerByReference domainsRef = new PointerByReference(); + int ret = libvirt.virConnectListAllDomains(VCP, domainsRef, flags); + processError(ret); + + Pointer[] pointers = domainsRef.getValue().getPointerArray(0); + Domain[] domains = new Domain[ret]; + for (int i = 0; i < ret; i++) { + DomainPointer domainPtr = new DomainPointer(); + domainPtr.setPointer(pointers[i]); + domains[i] = new Domain(this, domainPtr); + } + return domains; + } + + /** * Provides the list of names of interfaces on this host * * @return an Array of Strings that contains the names of the interfaces on diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 0e4c9fc..1331f80 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -8,6 +8,7 @@ import com.sun.jna.Platform; import com.sun.jna.Pointer; import com.sun.jna.ptr.IntByReference; import com.sun.jna.ptr.LongByReference; +import com.sun.jna.ptr.PointerByReference; /** * The libvirt interface which is exposed via JNA. The complete API is @@ -135,6 +136,7 @@ public interface Libvirt extends Library { int virConnectListDefinedStoragePools(ConnectionPointer virConnectPtr, Pointer[] names, int maxnames); int virConnectListDefinedInterfaces(ConnectionPointer virConnectPtr, Pointer[] name, int maxNames); int virConnectListDomains(ConnectionPointer virConnectPtr, int[] ids, int maxnames); + int virConnectListAllDomains(ConnectionPointer virConnectPtr, PointerByReference domains, int flags); int virConnectListInterfaces(ConnectionPointer virConnectPtr, Pointer[] name, int maxNames); int virConnectListNetworks(ConnectionPointer virConnectPtr, Pointer[] name, int maxnames); int virConnectListNWFilters(ConnectionPointer virConnectPtr, Pointer[] name, int maxnames); diff --git a/src/test/java/org/libvirt/TestJavaBindings.java b/src/test/java/org/libvirt/TestJavaBindings.java index 0123e6a..2703aa3 100644 --- a/src/test/java/org/libvirt/TestJavaBindings.java +++ b/src/test/java/org/libvirt/TestJavaBindings.java @@ -137,6 +137,7 @@ public final class TestJavaBindings extends TestCase { assertEquals("Number of listed domains", 2, conn.listDomains().length); assertEquals("Number of defined domains", 1, conn.numOfDefinedDomains()); assertEquals("Number of listed defined domains", 1, conn.listDefinedDomains().length); + assertEquals("Number of all listed domains", 3, conn.listAllDomains(0).length); assertTrue("Domain1 should be persistent", dom1.isPersistent() == 1); assertTrue("Domain1 should not be active", dom1.isActive() == 0); assertTrue("Domain2 should be active", dom2.isActive() == 1); -- 1.8.4.5

3 4

[libvirt] [PATCH] add temporary compilation files into .gitignore
by Martin Kletzander 06 Nov '14

06 Nov '14

When using git-status during configure phase, three additional files are shown as untracked. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 9776ea1..c1d1455 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ /build-aux /build-aux/ /build/ +/confdefs.h /config.cache /config.guess /config.h @@ -50,6 +51,8 @@ /config.sub /configure /configure.lineno +/conftest.c +/conftest.err /daemon/*_dispatch.h /daemon/libvirt_qemud /daemon/libvirtd -- 2.1.3

3 2

[libvirt] [PATCH] virnetdevbandwidth: Include virutil.h
by Michal Privoznik 06 Nov '14

06 Nov '14

One of the latest patches (9a8fc3efc2470) introduced call of geteuid(). However, not all systems have the function implemented, e.g. mingw. Therefore, we fail to build on those system. The fix consist of including virutil.h which defines geteuid in needed. Sigh. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build-breaker rule. src/util/virnetdevbandwidth.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index 9f2a159..fbd2a8d 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -28,6 +28,7 @@ #include "viralloc.h" #include "virerror.h" #include "virstring.h" +#include "virutil.h" #define VIR_FROM_THIS VIR_FROM_NONE -- 2.0.4

1 0

[libvirt] [PATCH 0/2] Fix NUMA compilation issues
by Martin Kletzander 06 Nov '14

06 Nov '14

Thanks to Michal who noticed it, I went over the code I reviewed recently (while my brain was out of order, apparently), and found some addiitonal issues that this series is trying to fix with the last one Michal was fixing in his patch (referenced in 1/2). Martin Kletzander (2): numa: split util/ and conf/ and support non-contiguous nodesets numa: fix assumption in virNumaNodeIsAvailable() src/conf/numatune_conf.c | 24 ++++++++++++++ src/conf/numatune_conf.h | 3 ++ src/libvirt_private.syms | 1 + src/lxc/lxc_controller.c | 17 +++++++--- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_process.c | 9 +++++- src/util/virnuma.c | 82 +++++++++++++++++------------------------------- src/util/virnuma.h | 7 ++--- tests/qemuxml2argvmock.c | 12 +++++++ 9 files changed, 92 insertions(+), 65 deletions(-) -- 2.1.3

3 4

[libvirt] [PATCHv3 0/2] network: bandwidth tuning in session mode revert patch
by Erik Skultety 06 Nov '14

06 Nov '14

Erik Skultety (2): qemu: revert patch - bandwidth tuning in session mode Iface: disallow network tuning in session mode globally src/qemu/qemu_command.c | 11 ----------- src/qemu/qemu_driver.c | 9 --------- src/util/virnetdevbandwidth.c | 8 ++++++++ tests/Makefile.am | 26 +++++++++++++++++++------- tests/virnetdevbandwidthmock.c | 28 ++++++++++++++++++++++++++++ tests/virnetdevbandwidthtest.c | 2 +- 6 files changed, 56 insertions(+), 28 deletions(-) create mode 100644 tests/virnetdevbandwidthmock.c -- 1.9.3

2 5

[libvirt] [PATCH] qemu: Update fsfreeze status on domain state transitions
by Michal Privoznik 06 Nov '14

06 Nov '14

As of b6d4dad1 (1.2.5) libvirt keeps track if domain disks have been frozen. However, this falls into that set of information which don't survive domain restart. Therefore, we need to clear the flag upon some state transitions. Moreover, once we clear the flag we must update the status file too. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 10 +++++----- src/qemu/qemu_process.c | 10 ++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2eaf77d..03c04ce 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4040,11 +4040,6 @@ processGuestPanicEvent(virQEMUDriverPtr driver, VIR_WARN("Unable to release lease on %s", vm->def->name); VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { - VIR_WARN("Unable to save status on vm %s after state change", - vm->def->name); - } - switch (action) { case VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_DESTROY: if (doCoreDumpToAutoDumpPath(driver, vm, VIR_DUMP_MEMORY_ONLY) < 0) { @@ -4102,6 +4097,11 @@ processGuestPanicEvent(virQEMUDriverPtr driver, } cleanup: + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { + VIR_WARN("Unable to save status on vm %s after state change", + vm->def->name); + } + virObjectUnref(cfg); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ba8ba82..0df375c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -529,6 +529,7 @@ qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virQEMUDriverPtr driver = opaque; virObjectEventPtr event; qemuDomainObjPrivatePtr priv; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virObjectLock(vm); @@ -536,12 +537,20 @@ qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNUSED, priv = vm->privateData; if (priv->agent) qemuAgentNotifyEvent(priv->agent, QEMU_AGENT_EVENT_RESET); + /* Clear some domain runtime information. For instance, + * fsfreeze won't survive domain reset. This, however, + * required the domain status file to be rewritten onto disk. */ + priv->quiesced = false; virObjectUnlock(vm); + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + VIR_WARN("Failed to save status on vm %s", vm->def->name); + if (event) qemuDomainEventQueue(driver, event); + virObjectUnref(cfg); return 0; } @@ -4841,6 +4850,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort); priv->nbdPort = 0; + priv->quiesced = false; if (priv->agent) { qemuAgentClose(priv->agent); -- 2.0.4

2 2

[libvirt] [PATCH 0/2] Enable iothread for virtio-ccw
by Boris Fiuczynski 06 Nov '14

06 Nov '14

Commit ef8da2a "qemu: Allow use of iothreads for disk definitions" added iothread support for disk devices to libvirt. This patch series fixes a checking logic for virtio-pci and adds virtio-ccw to the supported disk types. Boris Fiuczynski (2): qemu: Correct disk type checking logic for iothreads qemu: Allow use of iothreads for virtio ccw disk definitions docs/formatdomain.html.in | 6 ++-- src/qemu/qemu_command.c | 10 +++++-- .../qemuxml2argv-iothreads-disk-virtio-ccw.args | 14 +++++++++ .../qemuxml2argv-iothreads-disk-virtio-ccw.xml | 34 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ tests/qemuxml2xmltest.c | 1 + 6 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.xml -- 1.9.3

2 3

[libvirt] [PATCH] network: fix call virNetworkEventLifecycleNew when networkStartNetwork fail
by Luyao Huang 06 Nov '14

06 Nov '14

When start a network fail, libvirt still call virNetworkEventLifecycleNew to send a event. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/network/bridge_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 10ded33..11e86e0 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3253,7 +3253,8 @@ static int networkCreate(virNetworkPtr net) if (virNetworkCreateEnsureACL(net->conn, network->def) < 0) goto cleanup; - ret = networkStartNetwork(driver, network); + if ((ret = networkStartNetwork(driver, network)) < 0) + goto cleanup; event = virNetworkEventLifecycleNew(network->def->name, network->def->uuid, -- 1.8.3.1

2 1

[libvirt] [PATCH] virsh: fix net-dhcp-leases no output in quiet mode
by Luyao Huang 06 Nov '14

06 Nov '14

When run net-dhcp-leases in quiet mode, cannot get any output. # virsh -q net-dhcp-leases default Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- tools/virsh-network.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 4610a34..8f9fbd3 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1377,10 +1377,10 @@ cmdNetworkDHCPLeases(vshControl *ctl, const vshCmd *cmd) ignore_value(virAsprintf(&cidr_format, "%s/%d", lease->ipaddr, lease->prefix)); - vshPrintExtra(ctl, " %-20s %-18s %-9s %-25s %-15s %s\n", - expirytime, EMPTYSTR(lease->mac), - EMPTYSTR(typestr), cidr_format, - EMPTYSTR(lease->hostname), EMPTYSTR(lease->clientid)); + vshPrint(ctl, " %-20s %-18s %-9s %-25s %-15s %s\n", + expirytime, EMPTYSTR(lease->mac), + EMPTYSTR(typestr), cidr_format, + EMPTYSTR(lease->hostname), EMPTYSTR(lease->clientid)); VIR_FREE(cidr_format); } -- 1.8.3.1

2 1

[libvirt] [PATCH 0/5] Allow time sync on domain resume
by Michal Privoznik 06 Nov '14

06 Nov '14

*** BLURB HERE *** Michal Privoznik (5): Introduce virDomainResumeFlags API Implement virDomainResumeFlags in all drivers qemu: Split qemuDomainSetTime into two functions qemuDomainResumeFlags: Introduce VIR_DOMAIN_RESUME_SYNC_TIME virsh: Implement virDomainResumeFlags include/libvirt/libvirt-domain.h | 6 +++ src/driver-hypervisor.h | 5 ++ src/esx/esx_driver.c | 14 +++++- src/hyperv/hyperv_driver.c | 14 +++++- src/libvirt-domain.c | 44 ++++++++++++++++ src/libvirt_public.syms | 5 ++ src/libxl/libxl_driver.c | 14 +++++- src/lxc/lxc_driver.c | 15 +++++- src/openvz/openvz_driver.c | 13 ++++- src/parallels/parallels_driver.c | 11 +++- src/phyp/phyp_driver.c | 12 ++++- src/qemu/qemu_driver.c | 106 ++++++++++++++++++++++++++------------- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 13 ++++- src/remote_protocol-structs | 5 ++ src/test/test_driver.c | 13 ++++- src/vbox/vbox_common.c | 11 +++- src/vmware/vmware_driver.c | 12 ++++- src/xen/xen_driver.c | 14 +++++- src/xenapi/xenapi_driver.c | 21 +++++++- tools/virsh-domain.c | 13 ++++- tools/virsh.pod | 10 ++-- 22 files changed, 316 insertions(+), 56 deletions(-) -- 2.0.4

3 12

[libvirt] [PATCH] Free job statistics from the migration cookie
by Ján Tomko 06 Nov '14

06 Nov '14

==404== 232 bytes in 1 blocks are definitely lost in loss record 669 of 758 ==404== at 0x4C2B934: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==404== by 0x52A2BF3: virAlloc (viralloc.c:144) ==404== by 0x1D49AD70: qemuMigrationCookieAddStatistics (qemu_migration.c:554) ==404== by 0x1D49AD70: qemuMigrationBakeCookie (qemu_migration.c:1228) ==404== by 0x1D4A43B8: qemuMigrationFinish (qemu_migration.c:5002) ==404== by 0x1D4C9339: qemuDomainMigrateFinish3Params (qemu_driver.c:11526) Introduced by commit 5d6fb96 --- src/qemu/qemu_migration.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 94a4cf6..c797206 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -219,6 +219,7 @@ static void qemuMigrationCookieFree(qemuMigrationCookiePtr mig) VIR_FREE(mig->lockState); VIR_FREE(mig->lockDriver); VIR_FREE(mig->nbd); + VIR_FREE(mig->jobInfo); VIR_FREE(mig); } -- 2.0.4

2 1

[libvirt] [python PATCH] Check return value of libvirt_uintUnwrap
by Jiri Denemark 06 Nov '14

06 Nov '14

libvirt_virDomainSendKey didn't check whether libvirt_uintUnwrap succeeded or not. https://bugzilla.redhat.com/show_bug.cgi?id=1161039 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Providing extra context for easier review... libvirt-override.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libvirt-override.c b/libvirt-override.c index a53b46f..f496c6e 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -7119,47 +7119,48 @@ static PyObject * libvirt_virDomainSendKey(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; virDomainPtr domain; PyObject *pyobj_domain; PyObject *pyobj_list; int codeset; int holdtime; unsigned int flags; int ret; size_t i; unsigned int keycodes[VIR_DOMAIN_SEND_KEY_MAX_KEYS]; unsigned int nkeycodes; if (!PyArg_ParseTuple(args, (char *)"OiiOiI:virDomainSendKey", &pyobj_domain, &codeset, &holdtime, &pyobj_list, &nkeycodes, &flags)) { DEBUG("%s failed to parse tuple\n", __FUNCTION__); return VIR_PY_INT_FAIL; } domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); if (!PyList_Check(pyobj_list)) { return VIR_PY_INT_FAIL; } if (nkeycodes != PyList_Size(pyobj_list) || nkeycodes > VIR_DOMAIN_SEND_KEY_MAX_KEYS) { return VIR_PY_INT_FAIL; } for (i = 0; i < nkeycodes; i++) { - libvirt_uintUnwrap(PyList_GetItem(pyobj_list, i), &(keycodes[i])); + if (libvirt_uintUnwrap(PyList_GetItem(pyobj_list, i), &keycodes[i]) < 0) + return VIR_PY_INT_FAIL; } LIBVIRT_BEGIN_ALLOW_THREADS; ret = virDomainSendKey(domain, codeset, holdtime, keycodes, nkeycodes, flags); LIBVIRT_END_ALLOW_THREADS; DEBUG("virDomainSendKey ret=%d\n", ret); py_retval = libvirt_intWrap(ret); return py_retval; } #if LIBVIR_CHECK_VERSION(1, 0, 3) -- 2.1.3

3 4

[libvirt] [PATCH] Fix build-time pkg-config files in VPATH
by Jiri Denemark 06 Nov '14

06 Nov '14

Since libvirt.h was split into several files, it is impossible to compile anything against a VPATH-built libvirt. In VPATH, only libvirt.h is in build/include/libvirt while all other libvirt-*.h files are in source/include/libvirt. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/libvirt-lxc.pc.in | 3 ++- src/libvirt-qemu.pc.in | 3 ++- src/libvirt.pc.in | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libvirt-lxc.pc.in b/src/libvirt-lxc.pc.in index dd04950..b9e1319 100644 --- a/src/libvirt-lxc.pc.in +++ b/src/libvirt-lxc.pc.in @@ -6,6 +6,7 @@ prefix=@abs_top_builddir@ exec_prefix=@abs_top_builddir@ libdir=@abs_top_builddir@/src/.libs includedir=@abs_top_builddir@/include +source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_srcdir@ libvirt_lxc_api=@datadir@/docs/libvirt-lxc-api.xml @@ -15,4 +16,4 @@ Version: @VERSION@ Description: libvirt LXC library Requires: Libs: -L${libdir} -lvirt-lxc -Cflags: -I${includedir} +Cflags: -I${includedir} -I${source_includedir} diff --git a/src/libvirt-qemu.pc.in b/src/libvirt-qemu.pc.in index 5483da9..173ec5c 100644 --- a/src/libvirt-qemu.pc.in +++ b/src/libvirt-qemu.pc.in @@ -6,6 +6,7 @@ prefix=@abs_top_builddir@ exec_prefix=@abs_top_builddir@ libdir=@abs_top_builddir@/src/.libs includedir=@abs_top_builddir@/include +source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_srcdir@ libvirt_qemu_api=@datadir@/docs/libvirt-qemu-api.xml @@ -15,4 +16,4 @@ Version: @VERSION@ Description: libvirt QEMU library Requires: Libs: -L${libdir} -lvirt-qemu -Cflags: -I${includedir} +Cflags: -I${includedir} -I${source_includedir} diff --git a/src/libvirt.pc.in b/src/libvirt.pc.in index 548fa77..9fe2f1f 100644 --- a/src/libvirt.pc.in +++ b/src/libvirt.pc.in @@ -6,6 +6,7 @@ prefix=@abs_top_builddir@ exec_prefix=@abs_top_builddir@ libdir=@abs_top_builddir@/src/.libs includedir=@abs_top_builddir@/include +source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_srcdir@ libvirt_api=@datadir@/docs/libvirt-api.xml @@ -20,4 +21,4 @@ Version: @VERSION@ Description: libvirt library Requires: Libs: -L${libdir} -lvirt -Cflags: -I${includedir} +Cflags: -I${includedir} -I${source_includedir} -- 2.1.3

2 1

[libvirt] [PATCH] virsh: Fix types for option bandwidth in block*
by Hao Liu 06 Nov '14

06 Nov '14

Bandwidth options in blockcommit, blockcopy, blockjob and blockpull are parsed by vshCommandOptULWrap() and should be shown as a number type option. And a typo is fixed. Signed-off-by: Hao Liu <hliu(a)redhat.com> --- tools/virsh-domain.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index dfc3a8c..bd5f404 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1616,7 +1616,7 @@ static const vshCmdOptDef opts_block_commit[] = { .help = N_("fully-qualified path of disk") }, {.name = "bandwidth", - .type = VSH_OT_DATA, + .type = VSH_OT_INT, .help = N_("bandwidth limit in MiB/s") }, {.name = "base", @@ -1834,7 +1834,7 @@ static const vshCmdOptDef opts_block_copy[] = { .help = N_("path of the copy to create") }, {.name = "bandwidth", - .type = VSH_OT_DATA, + .type = VSH_OT_INT, .help = N_("bandwidth limit in MiB/s") }, {.name = "shallow", @@ -2190,8 +2190,8 @@ static const vshCmdOptDef opts_block_job[] = { .help = N_("implies --info; output details rather than human summary") }, {.name = "bandwidth", - .type = VSH_OT_DATA, - .help = N_("set the Bandwidth limit in MiB/s") + .type = VSH_OT_INT, + .help = N_("set the bandwidth limit in MiB/s") }, {.name = NULL} }; @@ -2349,7 +2349,7 @@ static const vshCmdOptDef opts_block_pull[] = { .help = N_("fully-qualified path of disk") }, {.name = "bandwidth", - .type = VSH_OT_DATA, + .type = VSH_OT_INT, .help = N_("bandwidth limit in MiB/s") }, {.name = "base", -- 1.8.3.1

2 1

[libvirt] [PATCH v2 0/8] Post-copy live migration support
by Cristian Klein 06 Nov '14

06 Nov '14

Qemu currently implements pre-copy live migration. VM memory pages are first copied from the source hypervisor to the destination, potentially multiple times as pages get dirtied during transfer, then VCPU state is migrated. Unfortunately, if the VM dirties memory faster than the network bandwidth, then pre-copy cannot finish. `virsh` currently includes an option to suspend a VM after a timeout, so that migration may finish, but at the expense of downtime. A future version of qemu will implement post-copy live migration. The VCPU state is first migrated to the destination hypervisor, then memory pages are pulled from the source hypervisor. Post-copy has the potential to do migration with zero-downtime, despite the VM dirtying pages fast, with minimum performance impact. On the other hand, one post-copy is in progress, any network failure would render the VM unusable, as its memory is partitioned between the source and destination hypervisor. Therefore, post-copy should only be used when necessary. Post-copy migration in qemu will work as follows: (1) The `x-postcopy-ram` migration capability needs to be set. (2) Migration is started. (3) When the user decides so, post-copy migration is activated by sending the `migrate-start-postcopy` command. Qemu acknowledges by setting migration status to `postcopy-active`. v2: - Fixed formatting - Set target version to libvirt 1.2.10 - Only use JSON monitor - Renamed `qemuMigrateStartPostCopy` to `qemuDomainMigrateStartPostCopy` - Added parameter `flags` to domainMigrateStartPostCopy (currently unused) - Misc fixes required for `make check` - Stop perform phase, when post-copy starts - Wait for post-copy completion in confirm phase, before killing source VM Implementation note: `qemuMigrationWaitForCompletion` is overloaded. When called the first time it waits for post-copy to start, when called the second time it waits for post-copy to complete. I did so to reduce code duplication, but am not sure this is the best solution. Cristian Klein (8): Added public API to enable post-copy migration Added public API to start post-copy migration Added low-level API to qemu post-copy migration Implemented VIR_MIGRATE_POSTCOPY in qemu driver Added job type VIR_DOMAIN_JOB_PHASE1_COMPLETED Implemented post-copy migration logic in qemu Implement virDomainMigrateStartPostCopy in qemu virsh: add postcopy-after option to migrate command include/libvirt/libvirt.h.in | 5 +++ src/driver.h | 5 +++ src/libvirt.c | 46 ++++++++++++++++++++++++ src/libvirt_public.syms | 5 +++ src/qemu/qemu_driver.c | 58 ++++++++++++++++++++++++++++++ src/qemu/qemu_migration.c | 85 ++++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_migration.h | 3 +- src/qemu/qemu_monitor.c | 24 +++++++++++-- src/qemu/qemu_monitor.h | 4 +++ src/qemu/qemu_monitor_json.c | 23 +++++++++++- src/qemu/qemu_monitor_json.h | 1 + src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 13 ++++++- src/remote_protocol-structs | 5 +++ tools/virsh-domain.c | 75 ++++++++++++++++++++++++++++++++++++-- tools/virsh.pod | 5 +++ 16 files changed, 347 insertions(+), 11 deletions(-) -- 1.9.1

6 29

[libvirt] [PATCH] CVE-2014-7823: dumpxml: security hole with migratable flag
by Eric Blake 06 Nov '14

06 Nov '14

Commit 28f8dfd (v1.0.0) introduced a security hole: in at least the qemu implementation of virDomainGetXMLDesc, the use of the flag VIR_DOMAIN_XML_MIGRATABLE (which is usable from a read-only connection) triggers the implicit use of VIR_DOMAIN_XML_SECURE prior to calling qemuDomainFormatXML. However, the use of VIR_DOMAIN_XML_SECURE is supposed to be restricted to read-write clients only. This patch treats the migratable flag as requiring the same permissions, rather than analyzing what might break if migratable xml no longer includes secret information. Fortunately, the information leak is low-risk: all that is gated by the VIR_DOMAIN_XML_SECURE flag is the VNC connection password; but VNC passwords are already weak (FIPS forbids their use, and on a non-FIPS machine, anyone stupid enough to trust a max-8-byte password sent in plaintext over the network deserves what they get). SPICE offers better security than VNC, and all other secrets are properly protected by use of virSecret associations rather than direct output in domain XML. * src/remote/remote_protocol.x (REMOTE_PROC_DOMAIN_GET_XML_DESC): Tighten rules on use of migratable flag. * src/libvirt-domain.c (virDomainGetXMLDesc): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- The libvirt-security list agreed that this did not need an embargo because it is low-risk; but I'm on the road this week, so while this patch for master can go in now, I won't complete the backport to all the affected stable branches (everything since v1.0.0) or do the Libvirt Security Notice writeup until Monday. src/libvirt-domain.c | 3 ++- src/remote/remote_protocol.x | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 7dc3146..2b0defc 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -2607,7 +2607,8 @@ virDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) virCheckDomainReturn(domain, NULL); conn = domain->conn; - if ((conn->flags & VIR_CONNECT_RO) && (flags & VIR_DOMAIN_XML_SECURE)) { + if ((conn->flags & VIR_CONNECT_RO) && + (flags & (VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_MIGRATABLE))) { virReportError(VIR_ERR_OPERATION_DENIED, "%s", _("virDomainGetXMLDesc with secure flag")); goto error; diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index db12cda..ebf4530 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -3255,6 +3255,7 @@ enum remote_procedure { * @generate: both * @acl: domain:read * @acl: domain:read_secure:VIR_DOMAIN_XML_SECURE + * @acl: domain:read_secure:VIR_DOMAIN_XML_MIGRATABLE */ REMOTE_PROC_DOMAIN_GET_XML_DESC = 14, -- 1.9.3

1 1

[libvirt] [PATCH 0/3] Fix build without NUMA
by Michal Privoznik 06 Nov '14

06 Nov '14

Even though these patches would qualify as build breaker fixes, I don't think they are that critical to be pushed without somebody else's taking a look on them. Michal Privoznik (3): virnuma: Add some more comments private.syms: Export virDomainNumatuneSpecifiedMaxNode qemuxml2argvmock: Mock virNumaNodesetIsAvailable src/libvirt_private.syms | 1 + src/util/virnuma.c | 14 +++++++------- tests/qemuxml2argvmock.c | 9 +++++++++ 3 files changed, 17 insertions(+), 7 deletions(-) -- 2.0.4

3 7

[libvirt] [PATCH 0/3] Libvirt memory & NUMA fixes
by Prerna Saxena 06 Nov '14

06 Nov '14

This patch set addresses a bunch of memory & NUMA fixes. Series Description: =========== Patch 1/3 : Use consistent data type to represent memory elements in various XML attributes. This ensures all memory elements are always represented as 'unsigned long long'. Patch 2/3 : This adds a 'unit' attribute alongwith the 'memory' attribute of a NUMA cell. This enables users to easily describe how much memory needs to be allocated to each NUMA cell for a guest domain. Patch 3/3 : This augments test cases to add the 'unit' tag. Regards, -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 7

[libvirt] [PATCHv2 0/2] network: bandwidth tuning in session mode revert patch
by Erik Skultety 06 Nov '14

06 Nov '14

Erik Skultety (2): qemu: revert patch - bandwidth tuning in session mode Iface: disallow network tuning in session mode globally src/qemu/qemu_command.c | 11 ----------- src/qemu/qemu_driver.c | 9 --------- src/util/virnetdevbandwidth.c | 8 ++++++++ tests/Makefile.am | 11 ++++++++++- tests/virnetdevbandwidthtest.c | 14 +++++++++++++- 5 files changed, 31 insertions(+), 22 deletions(-) -- 1.9.3

2 4

[libvirt] [PATCH] UpdateDevice: Allow startupPolicy update
by Michal Privoznik 06 Nov '14

06 Nov '14

Users might want to update startupPolicy via the virDomainUpdateDeviceFlags API too. This patch implements the feature on config layer. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6acaea8..6fc15c0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7437,6 +7437,7 @@ qemuDomainUpdateDeviceConfig(virQEMUCapsPtr qemuCaps, if (disk->src->format) orig->src->format = disk->src->format; disk->src->path = NULL; + orig->startupPolicy = disk->startupPolicy; break; case VIR_DOMAIN_DEVICE_NET: -- 2.0.4

2 2

[libvirt] Local qemu migration
by Marc-André Lureau 05 Nov '14

05 Nov '14

Hi, Attempting to migration from session to system qemu fails because of the following checks in qemuMigrationCookieXMLParse(): if (STREQ(mig->remoteHostname, mig->localHostname)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Attempt to migrate guest to the same host %s"), mig->remoteHostname); goto error; } .... if (memcmp(mig->remoteHostuuid, mig->localHostuuid, VIR_UUID_BUFLEN) == 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Attempt to migrate guest to the same host %s"), tmp); goto error; Is there a technical limitation for this error? If not, could it be overriden with an additional flag? cheers -- Marc-André Lureau

4 6

[libvirt] [PATCH] remote: Fix memory leak in remoteConnectGetAllDomainStats
by Peter Krempa 05 Nov '14

05 Nov '14

The remote call actually doesn't free the arguments array so we leak memory in case a domain list is specified. As the remote domain list array consists only of stolen pointers from the actual domain objects it's sufficient just to free the array. Valgrind message: ==1081452== 64 bytes in 1 blocks are definitely lost in loss record 632 of 726 ==1081452== at 0x4C296D0: calloc (vg_replace_malloc.c:618) ==1081452== by 0x4EA5CB4: virAllocN (viralloc.c:191) ==1081452== by 0x505D21E: remoteConnectGetAllDomainStats (remote_driver.c:7785) ==1081452== by 0x50081AA: virDomainListGetStats (libvirt-domain.c:11080) ==1081452== by 0x155249: cmdDomstats (virsh-domain-monitor.c:2147) ==1081452== by 0x12FB73: vshCommandRun (virsh.c:1935) ==1081452== by 0x133FEB: main (virsh.c:3719) --- src/remote/remote_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 65c04d9..d111e10 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7846,6 +7846,7 @@ remoteConnectGetAllDomainStats(virConnectPtr conn, VIR_FREE(elem); } virDomainStatsRecordListFree(tmpret); + VIR_FREE(args.doms.doms_val); xdr_free((xdrproc_t)xdr_remote_connect_get_all_domain_stats_ret, (char *) &ret); -- 2.1.0

2 1

[libvirt] [sandbox PATCH 0/2] v1.1 bugfix: support dhcp network interfaces
by Gene Czarcinski 05 Nov '14

05 Nov '14

Resubmitted to add "sandbox PATCH" to Subject v1.1 adds some documentation changes. Support for a network such as -N dhcp,source=default was not working in that dhclient was not being started. Although I am not sure what the real problem is, the solution is to use g_spawn_sync() instead of g_spawn_async() to start /sbin/dhclient. The second patch addes "-v" to the dhclient arguments to improve debugging info. The dhclient into will be in /var/log/messages the Secure Contrainer host system and not in the container itself. Gene Czarcinski (2): v1.1 for dhclient use g_spawn_sync() v1.1 add -v to dhclient parameter arguments libvirt-sandbox/libvirt-sandbox-init-common.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- 1.9.3

2 3

[libvirt] [libvirt-sandbox][PATCH 0/4] Couple of fixes to compile again
by Michal Privoznik 05 Nov '14

05 Nov '14

It's been a while that I tried to build libvirt-sandbox. And guess what, it doesn't compile cleanly so here are some patches to fix the issues I met. Michal Privoznik (4): virt-selinux.m4: Define SELINUX variables Makefile: link SELINUX into libvirt-sandbox-1.0.so m4: sync macros with libvirt libvirt-sandbox-config.c: Fix comment libvirt-sandbox/Makefile.am | 4 +- libvirt-sandbox/libvirt-sandbox-config.c | 2 +- m4/manywarnings.m4 | 217 ++++++++++++++++++++----------- m4/virt-compile-warnings.m4 | 216 ++++++++++++++++++++++-------- m4/virt-selinux.m4 | 6 +- m4/warnings.m4 | 82 +++++++++--- 6 files changed, 369 insertions(+), 158 deletions(-) -- 2.0.4

2 6

[libvirt] [PATCH] Require at least one console for LXC domain
by Ján Tomko 05 Nov '14

05 Nov '14

A domain without a console quietly dies soon after start, because we try to set /dev/null as a controlling TTY 2014-10-30 15:10:59.705+0000: 1: error : lxcContainerSetupFDs:283 : ioctl(TIOCSTTY) failed: Inappropriate ioctl for device Report an error early instead of trying to start it. https://bugzilla.redhat.com/show_bug.cgi?id=1155410 --- src/lxc/lxc_container.c | 6 ++++-- src/lxc/lxc_process.c | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index f02b959..8aba3ba 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -2093,8 +2093,10 @@ static int lxcContainerChild(void *data) if (virAsprintf(&ttyPath, "%s/%s.devpts/%s", LXC_STATE_DIR, vmDef->name, tty) < 0) goto cleanup; - } else if (VIR_STRDUP(ttyPath, "/dev/null") < 0) { - goto cleanup; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("At least one tty is required")); + goto cleanup; } VIR_DEBUG("Container TTY path: %s", ttyPath); diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index ed30c37..6c83fdb 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1144,6 +1144,12 @@ int virLXCProcessStart(virConnectPtr conn, vm->def, NULL) < 0) goto cleanup; + if (vm->def->nconsoles == 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("At least one PTY console is required")); + goto cleanup; + } + for (i = 0; i < vm->def->nconsoles; i++) { char *ttyPath; if (vm->def->consoles[i]->source.type != VIR_DOMAIN_CHR_TYPE_PTY) { -- 2.0.4

3 5

[libvirt] [v5][Patch 0/4] Libvirt CPU enhancements for Power KVM
by Prerna Saxena 05 Nov '14

05 Nov '14

This patch series is a collection of enhancements for PowerPC CPUs on PowerKVM. In this iteration, I have followed Dan's suggestion on using existing cpu mode format to describe powerPC compatibility mode. Hope this can finally make it for 1.2.10 ! Series Summary: ========== Patch 1/4 : Introduce a new architecture 'ppc64le' for libvirt. Patch 2/4 : Add libvirt support for VMs running in 'compat' mode on Power KVM. Patch 3/4 : Improve PVR handling to fall back to cpu generation. Patch 4/4 : Add documentation describing compat mode usage for PowerPC guests. Detail: ==== * PowerPC has traditionally been a Big-endian architecture. However, with PowerPC ISA version 2.07, it can run in Little-endian mode as well. IBM Power8 processors, compliant with ISA 2.07 allow launching VMs in little-endian mode. This is signified by 'ppc64le' architecture. Patch 1 adds this support to libvirt, to allow running VMs based on ppc64le architecture. * Patch 2,3 tweak libvirt to correctly model PowerPC CPUs based on recent PowerKVM implementation. PowerKVM permits VMs with vcpus in the following allowed modes : i) Host native mode: where the vcpu seen in the VM belongs to the same processor generation as the host. Example: A POWER7 host, conforming to PowerISA version 2.06, will run VMs with "power7" vcpus. ii) Binary Compatibility ("compat") mode: PowerISA allows processors to run VMs in binary compatibility ("compat") mode supporting an older version of ISA. As an example: In compatibility mode, a POWER7 host can run a "power6" VM, conforming to power ISA v2.05. Similarly, a POWER8 host can run a "power7" VM conforming to PowerISA v2.06. QEMU has recently added support to explicitly denote a VM running in compatibility mode through commits 6d9412ea & 8dfa3a5e85. Henceforth, VMs of type (i) will be invoked with the QEMU invocation "-cpu host", while VMs of type (ii) will be invoked using "-cpu host, compat=power6". Now, an explicit cpu selection using "-cpu POWER6" is not valid. Instead, the recommended practice is to use the matching compat mode, if the requested cpu type differs from the host. Patches 2-3 address various aspects of this change. * Patch 2 : Adds support for generating the correct command line for QEMU. Existing xml semantics of 'host-model' are interpreted differently on PowerPc architecture to signify this type. * Patch 3 : PowerKVM vCPUs differ uniquely across generations ( such as power6, power7, power8). Each generation signifies a new PowerISA version that exhibits features unique to that generation. The higher order 16 bits of PVR denote the processor generation and the lower order 16 bits denote the cpu chip (sub)version. For all practical purposes of launching a VM, we care about the generation the vCPU will belong to, and not specifically the chip version. In fact, PowerKVM does not seek out specification of a unique chip version(such as POWER7_v2.3) for running a vCPU. This patch updates the libvirt PVR check to reflect this relationship. * Patch 4 : Documentation is added to explain functionality introduced by Patch 2. Changelog: ========= v1 : https://www.redhat.com/archives/libvir-list/2014-June/msg01338.html v2 : http://www.redhat.com/archives/libvir-list/2014-October/msg00351.html v3 : http://www.mail-archive.com/libvir-list@redhat.com/msg104010.html v4: http://www.mail-archive.com/libvir-list@redhat.com/msg104067.html Changes since v4: ================ * Patches 1,3 already ack'ed by Michal, and have been posted unchanged. * In Patch 2,Discarded fallback=compat, and implemented Dan's suggestion to overload cpu mode "host-model". Now, on PowerPc, a VM with this XML schema will automatically be a compat-mode VM: <cpu mode='host-model'> <model>power7</model> </cpu> * Introduced a new patch '4' to add documentation that explains this. Regards, -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 9

[libvirt] Release of libvirt-python-1.2.10
by Daniel Veillard 05 Nov '14

05 Nov '14

I also tagged and pushed a new version of libvirt-python, it is available at: ftp://libvirt.org/libvirt/python it handle the new header split in libvirt-1.2.10 and fixes a number of issues: Documentation: d Change the comment in getPyNodeCPUCount method reflecting correct called methods (Pradipta Kr. Banerjee) Bug Fixes: b virDomainBlockCopy: initialize flags to 0 (Pavel Hrdina) b flags cannot get right value for blockCopy function (Pavel Hrdina) b Fix rest of unsigned integer handling (Peter Krempa) b Fix parsing of 'flags' argument for bulk stats functions (Luyao Huang) b Fix function name when parsing arguments in libvirt_virNodeAllocPages (Peter Krempa) Improvements: i fix libvirt headers list (Dmitry Guryanov) i Improve error output when use getTime with a nonzero flags. (Luyao Huang) i setup.py: fix rpm build to return 1 on error (Pavel Hrdina) i sanitytest: define long for python version >= 3 (Martin Kletzander) i sanitytest: count with the fact that large enums can be long (Martin Kletzander) i sanitytest: check for exported enums (Martin Kletzander) Thanks everybody who contributed to this release ! 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/

2 3

[libvirt] [PATCH] domain: Improve error output for virDomainListGetStats
by Luyao Huang 04 Nov '14

04 Nov '14

When pass flags --domain and --list-* to cmdDomstats, a unsupport error will output from qemuConnectGetAllDomainStats. error: unsupported flags (0x1) in function qemuConnectGetAllDomainStats >From manual of virsh: The approaches can't be combined. Improve error to: error: --domain and --list-* flags are mutually exclusive Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/libvirt-domain.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 7dc3146..6ae6dd2 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11053,6 +11053,19 @@ virDomainListGetStats(virDomainPtr *doms, goto cleanup; } + if (flags & (VIR_CONNECT_LIST_DOMAINS_ACTIVE | + VIR_CONNECT_LIST_DOMAINS_INACTIVE | + VIR_CONNECT_LIST_DOMAINS_PERSISTENT | + VIR_CONNECT_LIST_DOMAINS_TRANSIENT | + VIR_CONNECT_LIST_DOMAINS_RUNNING | + VIR_CONNECT_LIST_DOMAINS_SHUTOFF | + VIR_CONNECT_LIST_DOMAINS_PAUSED | + VIR_CONNECT_LIST_DOMAINS_OTHER)) { + virReportInvalidArg(flags, "%s", + _("--domain and --list-* flags are mutually exclusive")); + goto cleanup; + } + conn = doms[0]->conn; virCheckConnectReturn(conn, -1); -- 1.8.3.1

3 4

[libvirt] [v2 PATCH] qemu: Improve error output for virDomainListGetStats
by Luyao Huang 04 Nov '14

04 Nov '14

A unsupport error will output from qemuConnectGetAllDomainStats. Add a check for the flags in qemuConnectGetAllDomainStats and improve the error in the current implementation.From manual of virsh: The approaches can't be combined. Improve error to: error: --domain and --list-* flags are mutually exclusive Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6acaea8..60c3882 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18487,13 +18487,18 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, unsigned int privflags = 0; unsigned int domflags = 0; - if (ndoms) - virCheckFlags(VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS, -1); - else - virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE | - VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT | - VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE | - VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS, -1); + if (ndoms && (flags & (VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE | + VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT | + VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE))) { + virReportInvalidArg(flags, "%s", + _("--domain and --list-* flags are mutually exclusive")); + return -1; + } + + virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE | + VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT | + VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE | + VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS, -1); if (virConnectGetAllDomainStatsEnsureACL(conn) < 0) return -1; -- 1.8.3.1

1 0

[libvirt] internal error: Cannot find suitable CPU model for given data
by Matias Kreder 04 Nov '14

04 Nov '14

Hello, I am having troubles with libvirt on Fedora 21 alpha. On virt-manager: Unable to complete install: 'internal error: Cannot find suitable CPU model for given data' Traceback (most recent call last): File "/usr/share/virt-manager/virtManager/asyncjob.py", line 89, in cb_wrapper callback(asyncjob, *args, **kwargs) File "/usr/share/virt-manager/virtManager/create.py", line 1854, in do_install guest.start_install(meter=meter) File "/usr/share/virt-manager/virtinst/guest.py", line 411, in start_install noboot) File "/usr/share/virt-manager/virtinst/guest.py", line 475, in _create_guest dom = self.conn.createLinux(start_xml or final_xml, 0) File "/usr/lib64/python2.7/site-packages/libvirt.py", line 3361, in createLinux if ret is None:raise libvirtError('virDomainCreateLinux() failed', conn=self) libvirtError: internal error: Cannot find suitable CPU model for given data On "systemctl status libvirtd" I can see: Nov 04 10:23:41 lappie.mkeder.com libvirtd[3822]: Preferred CPU model Westmere not allowed by hypervisor; closest supported model will be used Nov 04 10:23:41 lappie.mkeder.com libvirtd[3822]: internal error: Cannot find suitable CPU model for given data I can't create the VM using any CPU configuration on virt-manager. Intel VT is enabled on the BIOS. This is a Lenovo Thinkpad t410 that I got yesterday. CPU is Intel(R) Core(TM) i5 CPU M 520 [root@lappie matias]# virsh -r capabilities | grep model <model>Westmere</model> I haven't tried Fedora 20 on it but I might re-install it soon. Just wanted to give my feedback for Fedora 21. [root@lappie matias]# rpm -q libvirt-daemon libvirt-daemon-1.2.9-4.fc21.x86_64 [root@lappie matias]# rpm -q virt-manager virt-manager-1.1.0-3.git310f6527.fc21.noarch Doing a google search it seems that some people had the same problem a few months ago and they solved but by updating. Seems to be some sort of problem between libvirt and qemu-kvm. Regards Matias

1 0

[libvirt] [PATCH] qemu: fix up NBD Server can not be stopped properly
by weiwei li 04 Nov '14

04 Nov '14

In qemuMigrationFinish mig->nbd can not be initialized by qemuMigrationEatCookie without a flag QEMU_MIGRATION_COOKIE_NBD. That cause qemuMigrationStopNBDServer return and the NBD server can not be stopped properly. Signed-off-by: Weiwei Li <nuonuoli(a)tencent.com> Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_migration.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 13239eb..9cb2a06 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4822,7 +4822,8 @@ qemuMigrationFinish(virQEMUDriverPtr driver, VIR_FREE(priv->job.completed); cookie_flags = QEMU_MIGRATION_COOKIE_NETWORK | - QEMU_MIGRATION_COOKIE_STATS; + QEMU_MIGRATION_COOKIE_STATS | + QEMU_MIGRATION_COOKIE_NBD; if (flags & VIR_MIGRATE_PERSIST_DEST) cookie_flags |= QEMU_MIGRATION_COOKIE_PERSISTENT; -- 1.7.1

2 1

[libvirt] [PATCH] util: fix releasing pidfile in cleanup
by Martin Kletzander 04 Nov '14

04 Nov '14

Coverity found out the very obvious problem in the code. That is that virPidFileReleasePath() was called only if virPidFileAcquirePath() returned 0. But virPidFileAcquirePath() doesn't return only 0 on success, but the FD that needs to be closed. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virpidfile.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index 098458f..a77a326 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -592,9 +592,8 @@ virPidFileForceCleanupPath(const char *path) if (virPidFileReadPath(path, &pid) < 0) return -1; - if (virPidFileAcquirePath(path, false, 0) == 0) { - virPidFileReleasePath(path, fd); - } else { + fd = virPidFileAcquirePath(path, false, 0); + if (fd < 0) { virResetLastError(); /* Only kill the process if the pid is valid one. 0 means @@ -607,5 +606,8 @@ virPidFileForceCleanupPath(const char *path) return -1; } + if (fd) + virPidFileReleasePath(path, fd); + return 0; } -- 2.1.3

2 1

[libvirt] [PATCH v5 0/3] add nodeset check in numatune
by Chen Fan 04 Nov '14

04 Nov '14

when setting elements memnode and nodeset in attribute numatune more than the host nodes in XML file, VM boot should fail. so add check for that. Chen Fan (3): bitmap: add virBitmapLastSetBit for finding the last bit position of bitmap numatune: add check for numatune nodeset range virnuma: use virNumaNodesetIsAvailable checking nodeset in virNumaSetupMemoryPolicy src/conf/numatune_conf.c | 28 ++++++++++++ src/conf/numatune_conf.h | 1 + src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 4 ++ src/util/virbitmap.c | 45 ++++++++++++++++++ src/util/virbitmap.h | 3 ++ src/util/virnuma.c | 53 +++++++++++++++++----- src/util/virnuma.h | 1 + ...rgv-numatune-static-nodeset-exceed-hostnode.xml | 35 ++++++++++++++ tests/qemuxml2argvmock.c | 9 ++++ tests/qemuxml2argvtest.c | 2 + tests/virbitmaptest.c | 13 +++++- 12 files changed, 184 insertions(+), 12 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-static-nodeset-exceed-hostnode.xml -- 1.9.3

2 4

[libvirt] [PATCH v4 0/3] add nodeset check in numatune
by Chen Fan 04 Nov '14

04 Nov '14

when setting elements memnode and nodeset in attribute numatune more than the host nodes in XML file, VM boot should fail. so add check for that. Chen Fan (3): bitmap: add virBitmapLastSetBit for finding the last bit position of bitmap numatune: add check for numatune nodeset range virnuma: use virNumaNodesetIsAvailable checking nodeset in virNumaSetupMemoryPolicy src/conf/numatune_conf.c | 28 ++++++++++ src/conf/numatune_conf.h | 1 + src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 4 ++ src/util/virbitmap.c | 45 ++++++++++++++++ src/util/virbitmap.h | 3 ++ src/util/virnuma.c | 61 +++++++++++++++------- src/util/virnuma.h | 1 + ...rgv-numatune-static-nodeset-exceed-hostnode.xml | 36 +++++++++++++ tests/qemuxml2argvmock.c | 9 ++++ tests/qemuxml2argvtest.c | 1 + tests/virbitmaptest.c | 13 ++++- 12 files changed, 184 insertions(+), 20 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-static-nodeset-exceed-hostnode.xml -- 1.9.3

3 13

[libvirt] [PATCH 2/2] qemu: migration: Ignore null ptr in qemuMigrationStopNBDServer
by weiwei li 04 Nov '14

04 Nov '14

qemuMigrationCookiePtr mig->nbd may be null when MigrationCookie do not have nbd information ,but nbd port did allocated before and must be released here, so ignore mig->nbd null ptr and just warn. Signed-off-by: Weiwei Li <nuonuoli(a)tencent.com> --- src/qemu/qemu_migration.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0ad8054..134b041 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1584,7 +1584,7 @@ qemuMigrationStopNBDServer(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; if (!mig->nbd) - return; + VIR_WARN("mig->nbd is null"); if (qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN) < 0) -- 1.7.1

2 4