- Devel - libvirt List Archives

[libvirt] oVirt Live Snapshots
by Federico Simoncelli 02 Feb '12

02 Feb '12

Hi, oVirt, and more specifically VDSM, is currently implementing the live snapshot feature using the API/commands provided by libvirt and qemu. It would be great if you could review the design and the current open issues at: http://ovirt.org/wiki/Live_Snapshots Thank you, -- Federico

2 2

[libvirt] [PATCH] virsh: Plug memory leak on cmdUndefine
by ajia＠redhat.com 02 Feb '12

02 Feb '12

From: Alex Jia <ajia(a)redhat.com> Detected by valgrind. Leak is introduced in commit 3bb6bcf. Free 'vol' memory before allocating memory, the codes will miss one time free when 'vol_i = nvolumes' in for loop, so plug memory leak. * tools/virsh.c: fix memory leak on cmdUndefine. * How to reproduce? % dd if=/dev/null of=/var/lib/libvirt/images/foo bs=1 count=1 seek=10M % virsh define foo.xml (disk source file points to '/var/lib/libvirt/images/foo') % virsh vol-clone foo foo-clone default (the original guest name is 'foo') % virsh pool-refresh default % virsh vol-list default (make sure 'foo-clone' volume exists) % virsh define foo-clone.xml (disk source file points to '/var/lib/libvirt/images/foo-clone') % valgrind -v --leak-check=full virsh undefine foo-clone --remove-all-storage * Actual results: 1. virsh output Domain foo-clone has been undefined Volume '/var/lib/libvirt/images/foo-clone' removed. error: Failed to disconnect from the hypervisor, 1 leaked reference(s) 2. valgrind result ==6515== 92 (40 direct, 52 indirect) bytes in 1 blocks are definitely lost in loss record 46 of 69 ==6515== at 0x4A04A28: calloc (vg_replace_malloc.c:467) ==6515== by 0x4C89B71: virAlloc (memory.c:101) ==6515== by 0x4CFCACE: virGetStorageVol (datatypes.c:724) ==6515== by 0x4D4A8E0: remoteStorageVolLookupByPath (remote_driver.c:4664) ==6515== by 0x4D07153: virStorageVolLookupByPath (libvirt.c:12508) ==6515== by 0x4270E6: cmdUndefine (virsh.c:2828) ==6515== by 0x4151B6: vshCommandRun (virsh.c:17693) ==6515== by 0x4264D3: main (virsh.c:19270) ==6515== ==6515== LEAK SUMMARY: ==6515== definitely lost: 40 bytes in 1 blocks RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=786674 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index c8fd448..73c2192 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2787,10 +2787,6 @@ out: ctxt->node = vol_nodes[vol_i]; VIR_FREE(target); VIR_FREE(source); - if (vol) { - virStorageVolFree(vol); - vol = NULL; - } /* get volume source and target paths */ if (!(target = virXPathString("string(./target/@dev)", ctxt))) { @@ -2852,6 +2848,10 @@ out: vol_del_failed = true; } vshPrint(ctl, _("Volume '%s' removed.\n"), volume_tok?volume_tok:source); + + /* cleanup */ + virStorageVolFree(vol); + vol = NULL; } /* print volumes specified by user that were not found in domain definition */ -- 1.7.1

2 1

[libvirt] [PATCH] xen_xs: name xendConfigVersion magic numbers
by Philipp Hahn 02 Feb '12

02 Feb '12

libvirt supports 4 different versions of the user-land XenD daemon. When queried the daemon just returns its generation number, which is hard to match to the version of the Xen tools. Replace the magic generation numbers by named macro definitions to improve code readability. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- .../0013-improve-getting-xen-vcpu-counts.patch | 2 +- .../0014-improve-setting-xen-vcpu-counts.patch | 6 +- docs/api_extension/0015-remove-dead-xen-code.patch | 2 +- src/xen/xen_driver.c | 14 ++-- src/xen/xend_internal.c | 70 ++++++++++---------- src/xenxs/xen_sxpr.c | 24 ++++---- src/xenxs/xen_sxpr.h | 5 ++ src/xenxs/xen_xm.c | 14 ++-- src/xenxs/xenxs_private.h | 7 +- 9 files changed, 75 insertions(+), 69 deletions(-) diff --git a/docs/api_extension/0013-improve-getting-xen-vcpu-counts.patch b/docs/api_extension/0013-improve-getting-xen-vcpu-counts.patch index 047bc7b..c1aad03 100644 --- a/docs/api_extension/0013-improve-getting-xen-vcpu-counts.patch +++ b/docs/api_extension/0013-improve-getting-xen-vcpu-counts.patch @@ -100,7 +100,7 @@ index dfc6415..3642296 100644 + /* If xendConfigVersion is 2, then we can only report _LIVE (and + * xm_internal reports _CONFIG). If it is 3, then _LIVE and + * _CONFIG are always in sync for a running system. */ -+ if (domain->id < 0 && priv->xendConfigVersion < 3) ++ if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) + return -2; + if (domain->id < 0 && (flags & VIR_DOMAIN_VCPU_LIVE)) { + virXendError(VIR_ERR_OPERATION_INVALID, "%s", diff --git a/docs/api_extension/0014-improve-setting-xen-vcpu-counts.patch b/docs/api_extension/0014-improve-setting-xen-vcpu-counts.patch index 76dc948..3adbd75 100644 --- a/docs/api_extension/0014-improve-setting-xen-vcpu-counts.patch +++ b/docs/api_extension/0014-improve-setting-xen-vcpu-counts.patch @@ -110,7 +110,7 @@ index fe2ff86..66e8518 100644 + * depends on xendConfigVersion. */ + if (dom) { + priv = dom->conn->privateData; -+ if (priv->xendConfigVersion >= 3) ++ if (priv->xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4) + flags |= VIR_DOMAIN_VCPU_CONFIG; + } + return xenUnifiedDomainSetVcpusFlags(dom, nvcpus, flags); @@ -163,14 +163,14 @@ index 3642296..55c2cc4 100644 + + priv = (xenUnifiedPrivatePtr) domain->conn->privateData; + -+ if ((domain->id < 0 && priv->xendConfigVersion < 3) || ++ if ((domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) || + (flags & VIR_DOMAIN_VCPU_MAXIMUM)) + return -2; + + /* With xendConfigVersion 2, only _LIVE is supported. With + * xendConfigVersion 3, only _LIVE|_CONFIG is supported for + * running domains, or _CONFIG for inactive domains. */ -+ if (priv->xendConfigVersion < 3) { ++ if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { + if (flags & VIR_DOMAIN_VCPU_CONFIG) { + virXendError(VIR_ERR_OPERATION_INVALID, "%s", + _("Xend version does not support modifying " diff --git a/docs/api_extension/0015-remove-dead-xen-code.patch b/docs/api_extension/0015-remove-dead-xen-code.patch index 56b99a3..64e0d98 100644 --- a/docs/api_extension/0015-remove-dead-xen-code.patch +++ b/docs/api_extension/0015-remove-dead-xen-code.patch @@ -122,7 +122,7 @@ index 55c2cc4..b90c331 100644 - - priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - -- if (domain->id < 0 && priv->xendConfigVersion < 3) +- if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) - return(-1); - - snprintf(buf, sizeof(buf), "%d", vcpus); diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 12d7eb0..94cafde 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -354,7 +354,7 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags) /* XenD is active, so try the xm & xs drivers too, both requird to * succeed if root, optional otherwise */ - if (priv->xendConfigVersion <= 2) { + if (priv->xendConfigVersion <= XEND_CONFIG_VERSION_3_0_3) { VIR_DEBUG("Trying XM sub-driver"); if (xenXMOpen(conn, auth, flags) == VIR_DRV_OPEN_SUCCESS) { VIR_DEBUG("Activated XM sub-driver"); @@ -1161,7 +1161,7 @@ xenUnifiedDomainSetVcpus (virDomainPtr dom, unsigned int nvcpus) * depends on xendConfigVersion. */ if (dom) { priv = dom->conn->privateData; - if (priv->xendConfigVersion >= 3) + if (priv->xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4) flags |= VIR_DOMAIN_VCPU_CONFIG; } return xenUnifiedDomainSetVcpusFlags(dom, nvcpus, flags); @@ -1239,7 +1239,7 @@ xenUnifiedDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) { GET_PRIVATE(dom->conn); - if (dom->id == -1 && priv->xendConfigVersion < 3 ) { + if (dom->id == -1 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { if (priv->opened[XEN_UNIFIED_XM_OFFSET]) return xenXMDomainGetXMLDesc(dom, flags); } else { @@ -1561,7 +1561,7 @@ xenUnifiedDomainAttachDevice (virDomainPtr dom, const char *xml) * to make this API work */ if (priv->opened[XEN_UNIFIED_XEND_OFFSET] && - priv->xendConfigVersion >= 3) + priv->xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4) flags |= VIR_DOMAIN_DEVICE_MODIFY_CONFIG; for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i) @@ -1600,7 +1600,7 @@ xenUnifiedDomainDetachDevice (virDomainPtr dom, const char *xml) * to make this API work */ if (priv->opened[XEN_UNIFIED_XEND_OFFSET] && - priv->xendConfigVersion >= 3) + priv->xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4) flags |= VIR_DOMAIN_DEVICE_MODIFY_CONFIG; for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i) @@ -1642,7 +1642,7 @@ xenUnifiedDomainGetAutostart (virDomainPtr dom, int *autostart) { GET_PRIVATE(dom->conn); - if (priv->xendConfigVersion < 3) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { if (priv->opened[XEN_UNIFIED_XM_OFFSET]) return xenXMDomainGetAutostart(dom, autostart); } else { @@ -1659,7 +1659,7 @@ xenUnifiedDomainSetAutostart (virDomainPtr dom, int autostart) { GET_PRIVATE(dom->conn); - if (priv->xendConfigVersion < 3) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { if (priv->opened[XEN_UNIFIED_XM_OFFSET]) return xenXMDomainSetAutostart(dom, autostart); } else { diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index b754eca..5c3838f 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -954,7 +954,7 @@ xend_detect_config_version(virConnectPtr conn) { } else { /* Xen prior to 3.0.3 did not have the xend_config_format field, and is implicitly version 1. */ - priv->xendConfigVersion = 1; + priv->xendConfigVersion = XEND_CONFIG_VERSION_3_0_2; } sexpr_free(root); return (0); @@ -1224,7 +1224,7 @@ sexpr_to_domain(virConnectPtr conn, const struct sexpr *root) /* New 3.0.4 XenD will not report a domid for inactive domains, * so only error out for old XenD */ - if (!tmp && priv->xendConfigVersion < 3) + if (!tmp && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) goto error; if (tmp) @@ -1512,7 +1512,7 @@ xenDaemonDomainGetOSType(virDomainPtr domain) priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (domain->id < 0 && priv->xendConfigVersion < 3) + if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(NULL); /* can we ask for a subset ? worth it ? */ @@ -1652,7 +1652,7 @@ xenDaemonDomainGetMaxMemory(virDomainPtr domain) priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (domain->id < 0 && priv->xendConfigVersion < 3) + if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(-1); /* can we ask for a subset ? worth it ? */ @@ -1691,7 +1691,7 @@ xenDaemonDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (domain->id < 0 && priv->xendConfigVersion < 3) + if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(-1); snprintf(buf, sizeof(buf), "%lu", VIR_DIV_UP(memory, 1024)); @@ -1728,7 +1728,7 @@ xenDaemonDomainSetMemory(virDomainPtr domain, unsigned long memory) priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (domain->id < 0 && priv->xendConfigVersion < 3) + if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(-1); snprintf(buf, sizeof(buf), "%lu", VIR_DIV_UP(memory, 1024)); @@ -1808,7 +1808,7 @@ xenDaemonDomainGetXMLDesc(virDomainPtr domain, unsigned int flags, } priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (domain->id < 0 && priv->xendConfigVersion < 3) { + if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { /* fall-through to the next driver to handle */ return(NULL); } @@ -1852,7 +1852,7 @@ xenDaemonDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (domain->id < 0 && priv->xendConfigVersion < 3) + if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(-1); root = sexpr_get(domain->conn, "/xend/domain/%s?detail=1", domain->name); @@ -1887,7 +1887,7 @@ xenDaemonDomainGetState(virDomainPtr domain, virCheckFlags(0, -1); - if (domain->id < 0 && priv->xendConfigVersion < 3) + if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return -1; root = sexpr_get(domain->conn, "/xend/domain/%s?detail=1", domain->name); @@ -2186,14 +2186,14 @@ xenDaemonDomainSetVcpusFlags(virDomainPtr domain, unsigned int vcpus, priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if ((domain->id < 0 && priv->xendConfigVersion < 3) || + if ((domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) || (flags & VIR_DOMAIN_VCPU_MAXIMUM)) return -2; /* With xendConfigVersion 2, only _LIVE is supported. With * xendConfigVersion 3, only _LIVE|_CONFIG is supported for * running domains, or _CONFIG for inactive domains. */ - if (priv->xendConfigVersion < 3) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { if (flags & VIR_DOMAIN_VCPU_CONFIG) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("Xend version does not support modifying " @@ -2267,7 +2267,7 @@ xenDaemonDomainPinVcpu(virDomainPtr domain, unsigned int vcpu, } priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->xendConfigVersion < 3) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { mapstr[0] = '['; mapstr[1] = 0; } else { @@ -2280,7 +2280,7 @@ xenDaemonDomainPinVcpu(virDomainPtr domain, unsigned int vcpu, snprintf(buf, sizeof(buf), "%d,", (8 * i) + j); strcat(mapstr, buf); } - if (priv->xendConfigVersion < 3) + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) mapstr[strlen(mapstr) - 1] = ']'; else mapstr[strlen(mapstr) - 1] = 0; @@ -2343,7 +2343,7 @@ xenDaemonDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) /* If xendConfigVersion is 2, then we can only report _LIVE (and * xm_internal reports _CONFIG). If it is 3, then _LIVE and * _CONFIG are always in sync for a running system. */ - if (domain->id < 0 && priv->xendConfigVersion < 3) + if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return -2; if (domain->id < 0 && (flags & VIR_DOMAIN_VCPU_LIVE)) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", @@ -2477,7 +2477,7 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid) xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData; /* Old approach for xen <= 3.0.3 */ - if (priv->xendConfigVersion < 3) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { char **names, **tmp; unsigned char ident[VIR_UUID_BUFLEN]; names = xenDaemonListDomainsOld(conn); @@ -2648,7 +2648,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, return -1; } /* If xendConfigVersion < 3 only live config can be changed */ - if (priv->xendConfigVersion < 3) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("Xend version does not support modifying " "persistent config")); @@ -2656,7 +2656,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, } } else { /* Only live config can be changed if xendConfigVersion < 3 */ - if (priv->xendConfigVersion < 3 && + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4 && (flags != VIR_DOMAIN_DEVICE_MODIFY_CURRENT && flags != VIR_DOMAIN_DEVICE_MODIFY_LIVE)) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", @@ -2667,7 +2667,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, /* Xen only supports modifying both live and persistent config if * xendConfigVersion >= 3 */ - if (priv->xendConfigVersion >= 3 && + if (priv->xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4 && (flags != (VIR_DOMAIN_DEVICE_MODIFY_LIVE | VIR_DOMAIN_DEVICE_MODIFY_CONFIG))) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", @@ -2816,7 +2816,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml, return -1; } /* If xendConfigVersion < 3 only live config can be changed */ - if (priv->xendConfigVersion < 3) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("Xend version does not support modifying " "persistent config")); @@ -2824,7 +2824,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml, } } else { /* Only live config can be changed if xendConfigVersion < 3 */ - if (priv->xendConfigVersion < 3 && + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4 && (flags != VIR_DOMAIN_DEVICE_MODIFY_CURRENT && flags != VIR_DOMAIN_DEVICE_MODIFY_LIVE)) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", @@ -2835,7 +2835,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml, /* Xen only supports modifying both live and persistent config if * xendConfigVersion >= 3 */ - if (priv->xendConfigVersion >= 3 && + if (priv->xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4 && (flags != (VIR_DOMAIN_DEVICE_MODIFY_LIVE | VIR_DOMAIN_DEVICE_MODIFY_CONFIG))) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", @@ -2929,7 +2929,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr domain, const char *xml, return -1; } /* If xendConfigVersion < 3 only live config can be changed */ - if (priv->xendConfigVersion < 3) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("Xend version does not support modifying " "persistent config")); @@ -2937,7 +2937,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr domain, const char *xml, } } else { /* Only live config can be changed if xendConfigVersion < 3 */ - if (priv->xendConfigVersion < 3 && + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4 && (flags != VIR_DOMAIN_DEVICE_MODIFY_CURRENT && flags != VIR_DOMAIN_DEVICE_MODIFY_LIVE)) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", @@ -2948,7 +2948,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr domain, const char *xml, /* Xen only supports modifying both live and persistent config if * xendConfigVersion >= 3 */ - if (priv->xendConfigVersion >= 3 && + if (priv->xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4 && (flags != (VIR_DOMAIN_DEVICE_MODIFY_LIVE | VIR_DOMAIN_DEVICE_MODIFY_CONFIG))) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", @@ -3016,7 +3016,7 @@ xenDaemonDomainGetAutostart(virDomainPtr domain, * config files used by old Xen) will handle this. */ priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->xendConfigVersion < 3) + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(-1); root = sexpr_get(domain->conn, "/xend/domain/%s?detail=1", domain->name); @@ -3056,7 +3056,7 @@ xenDaemonDomainSetAutostart(virDomainPtr domain, * config files used by old Xen) will handle this. */ priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->xendConfigVersion < 3) + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(-1); root = sexpr_get(domain->conn, "/xend/domain/%s?detail=1", domain->name); @@ -3318,7 +3318,7 @@ virDomainPtr xenDaemonDomainDefineXML(virConnectPtr conn, const char *xmlDesc) { priv = (xenUnifiedPrivatePtr) conn->privateData; - if (priv->xendConfigVersion < 3) + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(NULL); if (!(def = virDomainDefParseString(priv->caps, xmlDesc, @@ -3367,7 +3367,7 @@ int xenDaemonDomainCreate(virDomainPtr domain) priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->xendConfigVersion < 3) + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(-1); ret = xend_op(domain->conn, domain->name, "op", "start", NULL); @@ -3394,7 +3394,7 @@ int xenDaemonDomainUndefine(virDomainPtr domain) priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->xendConfigVersion < 3) + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(-1); return xend_op(domain->conn, domain->name, "op", "delete", NULL); @@ -3419,7 +3419,7 @@ xenDaemonNumOfDefinedDomains(virConnectPtr conn) /* xm_internal.c (the support for defined domains from /etc/xen * config files used by old Xen) will handle this. */ - if (priv->xendConfigVersion < 3) + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(-1); root = sexpr_get(conn, "/xend/domain?state=halted"); @@ -3447,7 +3447,7 @@ xenDaemonListDefinedDomains(virConnectPtr conn, char **const names, int maxnames struct sexpr *_for_i, *node; xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData; - if (priv->xendConfigVersion < 3) + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(-1); if ((names == NULL) || (maxnames < 0)) @@ -3513,7 +3513,7 @@ xenDaemonGetSchedulerType(virDomainPtr domain, int *nparams) /* Support only xendConfigVersion >=4 */ priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->xendConfigVersion < 4) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_1_0) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("unsupported in xendConfigVersion < 4")); return NULL; @@ -3586,7 +3586,7 @@ xenDaemonGetSchedulerParameters(virDomainPtr domain, /* Support only xendConfigVersion >=4 */ priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->xendConfigVersion < 4) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_1_0) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("unsupported in xendConfigVersion < 4")); return (-1); @@ -3694,7 +3694,7 @@ xenDaemonSetSchedulerParameters(virDomainPtr domain, /* Support only xendConfigVersion >=4 and active domains */ priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->xendConfigVersion < 4) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_1_0) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("unsupported in xendConfigVersion < 4")); return (-1); @@ -3802,7 +3802,7 @@ xenDaemonDomainBlockPeek (virDomainPtr domain, const char *path, priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (domain->id < 0 && priv->xendConfigVersion < 3) + if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return -2; /* Decline, allow XM to handle it. */ /* Security check: The path must correspond to a block device. */ diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index 8c04596..756eb77 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -55,7 +55,7 @@ int xenGetDomIdFromSxpr(const struct sexpr *root, int xendConfigVersion) { int id = -1; const char * tmp = sexpr_node(root, "domain/domid"); - if (tmp == NULL && xendConfigVersion < 3) { /* Old XenD, domid was mandatory */ + if (tmp == NULL && xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { /* domid was mandatory */ XENXS_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incomplete, missing id")); } else { @@ -468,7 +468,7 @@ xenParseSxprDisks(virDomainDefPtr def, disk->device = VIR_DOMAIN_DISK_DEVICE_DISK; /* New style disk config from Xen >= 3.0.3 */ - if (xendConfigVersion > 1) { + if (xendConfigVersion >= XEND_CONFIG_VERSION_3_0_3) { offset = strrchr(dst, ':'); if (offset) { if (STREQ (offset, ":cdrom")) { @@ -814,7 +814,7 @@ xenParseSxprGraphicsOld(virDomainDefPtr def, * present yet. Subsquent dumps of the XML will eventually * find the port in XenStore once VNC server has started */ - if (port == -1 && xendConfigVersion < 2) + if (port == -1 && xendConfigVersion < XEND_CONFIG_VERSION_3_0_3) port = 5900 + def->id; if ((unused && STREQ(unused, "1")) || port == -1) @@ -1132,7 +1132,7 @@ xenParseSxpr(const struct sexpr *root, goto no_memory; tmp = sexpr_node(root, "domain/domid"); - if (tmp == NULL && xendConfigVersion < 3) { /* Old XenD, domid was mandatory */ + if (tmp == NULL && xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { /* domid was mandatory */ XENXS_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incomplete, missing id")); goto error; @@ -1318,7 +1318,7 @@ xenParseSxpr(const struct sexpr *root, /* Old style cdrom config from Xen <= 3.0.2 */ if (hvm && - xendConfigVersion == 1) { + xendConfigVersion == XEND_CONFIG_VERSION_3_0_2) { tmp = sexpr_node(root, "domain/image/hvm/cdrom"); if ((tmp != NULL) && (tmp[0] != 0)) { virDomainDiskDefPtr disk; @@ -1617,7 +1617,7 @@ xenFormatSxprGraphicsOld(virDomainGraphicsDefPtr def, virBufferAsprintf(buf, "(xauthority '%s')", def->data.sdl.xauth); } else if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { virBufferAddLit(buf, "(vnc 1)"); - if (xendConfigVersion >= 2) { + if (xendConfigVersion >= XEND_CONFIG_VERSION_3_0_3) { if (def->data.vnc.autoport) { virBufferAddLit(buf, "(vncunused 1)"); } else { @@ -1762,7 +1762,7 @@ xenFormatSxprDisk(virDomainDiskDefPtr def, /* Xend <= 3.0.2 doesn't include cdrom config here */ if (hvm && def->device == VIR_DOMAIN_DISK_DEVICE_CDROM && - xendConfigVersion == 1) { + xendConfigVersion == XEND_CONFIG_VERSION_3_0_2) { if (isAttach) { XENXS_ERROR(VIR_ERR_INVALID_ARG, _("Cannot directly attach CDROM %s"), def->src); @@ -1787,7 +1787,7 @@ xenFormatSxprDisk(virDomainDiskDefPtr def, if (hvm) { /* Xend <= 3.0.2 wants a ioemu: prefix on devices for HVM */ - if (xendConfigVersion == 1) { + if (xendConfigVersion == XEND_CONFIG_VERSION_3_0_2) { virBufferEscapeSexpr(buf, "(dev 'ioemu:%s')", def->dst); } else { /* But newer does not */ @@ -2338,7 +2338,7 @@ xenFormatSxpr(virConnectPtr conn, switch (def->disks[i]->device) { case VIR_DOMAIN_DISK_DEVICE_CDROM: /* Only xend <= 3.0.2 wants cdrom config here */ - if (xendConfigVersion != 1) + if (xendConfigVersion != XEND_CONFIG_VERSION_3_0_2) break; if (!STREQ(def->disks[i]->dst, "hdc") || def->disks[i]->src == NULL) @@ -2437,7 +2437,7 @@ xenFormatSxpr(virConnectPtr conn, } /* get the device emulation model */ - if (def->emulator && (hvm || xendConfigVersion >= 3)) + if (def->emulator && (hvm || xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4)) virBufferEscapeSexpr(&buf, "(device_model '%s')", def->emulator); /* look for HPET in order to override the hypervisor/xend default */ @@ -2452,7 +2452,7 @@ xenFormatSxpr(virConnectPtr conn, /* PV graphics for xen <= 3.0.4, or HVM graphics for xen <= 3.1.0 */ if ((!hvm && xendConfigVersion < XEND_CONFIG_MIN_VERS_PVFB_NEWCONF) || - (hvm && xendConfigVersion < 4)) { + (hvm && xendConfigVersion < XEND_CONFIG_VERSION_3_1_0)) { if ((def->ngraphics == 1) && xenFormatSxprGraphicsOld(def->graphics[0], &buf, xendConfigVersion) < 0) @@ -2484,7 +2484,7 @@ xenFormatSxpr(virConnectPtr conn, /* New style PV graphics config xen >= 3.0.4, * or HVM graphics config xen >= 3.0.5 */ if ((xendConfigVersion >= XEND_CONFIG_MIN_VERS_PVFB_NEWCONF && !hvm) || - (xendConfigVersion >= 4 && hvm)) { + (xendConfigVersion >= XEND_CONFIG_VERSION_3_1_0 && hvm)) { if ((def->ngraphics == 1) && xenFormatSxprGraphicsNew(def->graphics[0], &buf) < 0) goto error; diff --git a/src/xenxs/xen_sxpr.h b/src/xenxs/xen_sxpr.h index a66c60a..4f96d2b 100644 --- a/src/xenxs/xen_sxpr.h +++ b/src/xenxs/xen_sxpr.h @@ -32,6 +32,11 @@ # include "domain_conf.h" # include "sexpr.h" +#define XEND_CONFIG_VERSION_3_0_2 1 +#define XEND_CONFIG_VERSION_3_0_3 2 +#define XEND_CONFIG_VERSION_3_0_4 3 +#define XEND_CONFIG_VERSION_3_1_0 4 + /* helper functions to get the dom id from a sexpr */ int xenGetDomIdFromSxprString(const char *sexpr, int xendConfigVersion); int xenGetDomIdFromSxpr(const struct sexpr *root, int xendConfigVersion); diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index a0d4806..e580a3e 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -570,7 +570,7 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, } } - if (hvm && xendConfigVersion == 1) { + if (hvm && xendConfigVersion == XEND_CONFIG_VERSION_3_0_2) { if (xenXMConfigGetString(conf, "cdrom", &str, NULL) < 0) goto cleanup; if (str) { @@ -858,7 +858,7 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, } /* HVM guests, or old PV guests use this config format */ - if (hvm || xendConfigVersion < 3) { + if (hvm || xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { if (xenXMConfigGetBool(conf, "vnc", &val, 0) < 0) goto cleanup; @@ -1169,7 +1169,7 @@ static int xenFormatXMDisk(virConfValuePtr list, virBufferAdd(&buf, disk->src, -1); } virBufferAddLit(&buf, ","); - if (hvm && xendConfigVersion == 1) + if (hvm && xendConfigVersion == XEND_CONFIG_VERSION_3_0_2) virBufferAddLit(&buf, "ioemu:"); virBufferAdd(&buf, disk->dst, -1); @@ -1545,7 +1545,7 @@ virConfPtr xenFormatXM(virConnectPtr conn, (1 << VIR_DOMAIN_FEATURE_APIC)) ? 1 : 0) < 0) goto no_memory; - if (xendConfigVersion >= 3) { + if (xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4) { if (xenXMConfigSetInt(conf, "hap", (def->features & (1 << VIR_DOMAIN_FEATURE_HAP)) ? 1 : 0) < 0) @@ -1584,7 +1584,7 @@ virConfPtr xenFormatXM(virConnectPtr conn, break; } - if (xendConfigVersion == 1) { + if (xendConfigVersion == XEND_CONFIG_VERSION_3_0_2) { for (i = 0 ; i < def->ndisks ; i++) { if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM && def->disks[i]->dst && @@ -1665,7 +1665,7 @@ virConfPtr xenFormatXM(virConnectPtr conn, } if (def->ngraphics == 1) { - if (xendConfigVersion < (hvm ? 4 : XEND_CONFIG_MIN_VERS_PVFB_NEWCONF)) { + if (xendConfigVersion < (hvm ? XEND_CONFIG_VERSION_3_1_0 : XEND_CONFIG_MIN_VERS_PVFB_NEWCONF)) { if (def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) { if (xenXMConfigSetInt(conf, "sdl", 1) < 0) goto no_memory; @@ -1772,7 +1772,7 @@ virConfPtr xenFormatXM(virConnectPtr conn, diskVal->list = NULL; for (i = 0 ; i < def->ndisks ; i++) { - if (xendConfigVersion == 1 && + if (xendConfigVersion == XEND_CONFIG_VERSION_3_0_2 && def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM && def->disks[i]->dst && STREQ(def->disks[i]->dst, "hdc")) { diff --git a/src/xenxs/xenxs_private.h b/src/xenxs/xenxs_private.h index 60d27d2..bc903f5 100644 --- a/src/xenxs/xenxs_private.h +++ b/src/xenxs/xenxs_private.h @@ -29,6 +29,7 @@ # include <stdint.h> # include <xen/xen.h> +# include "xen_sxpr.h" /* xen-unstable changeset 19788 removed MAX_VIRT_CPUS from public * headers. Its semantic was retained with XEN_LEGACY_MAX_VCPUS. @@ -40,10 +41,10 @@ # ifdef WITH_RHEL5_API # define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 0 -# define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 2 +# define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF XEND_CONFIG_VERSION_3_0_3 # else -# define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 3 -# define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 3 +# define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU XEND_CONFIG_VERSION_3_0_4 +# define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF XEND_CONFIG_VERSION_3_0_4 # endif # define MIN_XEN_GUEST_SIZE 64 /* 64 megabytes */ -- 1.7.1

2 2

[libvirt] Linker error while compiling latest libvirt git source
by Deepak C Shetty 02 Feb '12

02 Feb '12

make all-am make[3]: Entering directory `/home/dpkshetty/work/libvirt/libvirt/daemon' GEN qemu_dispatch.h GEN remote_dispatch.h CC libvirtd-remote_protocol.o CC libvirtd-qemu_protocol.o CC libvirtd-remote.o CC libvirtd-libvirtd.o CC libvirtd-stream.o In file included from remote.c:107:0: remote_dispatch.h: In function 'remoteDispatchDomainGetDiskErrorsHelper': remote.c:3611:9: warning: 'len' may be used uninitialized in this function [-Wuninitialized] At top level: cc1: warning: unrecognized command line option "-Wno-suggest-attribute=const" cc1: warning: unrecognized command line option "-Wno-suggest-attribute=pure" CCLD libvirtd libtool: link: warning: library `/usr/lib/i386-linux-gnu/libgcrypt.la' was moved. libtool: link: warning: library `/usr/lib/i386-linux-gnu/libgcrypt.la' was moved. ../src/.libs/libvirt_driver_qemu.a(libvirt_driver_qemu_la-qemu_process.o): In function `qemuProcessStart': /home/dpkshetty/work/libvirt/libvirt/src/qemu/qemu_process.c:3343: undefined reference to `virCommandAllowCap' ../src/.libs/libvirt_driver_storage.a(libvirt_driver_storage_la-storage_backend_fs.o): In function `virStorageBackendFileSystemVolResize': /home/dpkshetty/work/libvirt/libvirt/src/storage/storage_backend_fs.c:1234: undefined reference to `virStorageFileResize' collect2: ld returned 1 exit status make[3]: *** [libvirtd] Error 1 make[3]: Leaving directory `/home/dpkshetty/work/libvirt/libvirt/daemon' make[2]: *** [all] Error 2 make[2]: Leaving directory `/home/dpkshetty/work/libvirt/libvirt/daemon' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/dpkshetty/work/libvirt/libvirt' make: *** [all] Error 2

2 5

[libvirt] [PATCHv4] network: Avoid memory leaks on networkBuildDnsmasqArgv
by ajia＠redhat.com 02 Feb '12

02 Feb '12

From: Alex Jia <ajia(a)redhat.com> Detected by valgrind. Leaks introduced in commit 973af236. * src/network/bridge_driver.c: fix memory leaks on failure and successful path. * How to reproduce? % make -C tests check TESTS=networkxml2argvtest % cd tests && valgrind -v --leak-check=full ./networkxml2argvtest * Actual result: ==2226== 3 bytes in 1 blocks are definitely lost in loss record 1 of 24 ==2226== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==2226== by 0x39CF0FEDE7: __vasprintf_chk (in /lib64/libc-2.12.so) ==2226== by 0x41DFF7: virVasprintf (stdio2.h:199) ==2226== by 0x41E0B7: virAsprintf (util.c:1695) ==2226== by 0x41A2D9: networkBuildDhcpDaemonCommandLine (bridge_driver.c:545) ==2226== by 0x4145C8: testCompareXMLToArgvHelper (networkxml2argvtest.c:47) ==2226== by 0x4156A1: virtTestRun (testutils.c:141) ==2226== by 0x414332: mymain (networkxml2argvtest.c:123) ==2226== by 0x414D97: virtTestMain (testutils.c:696) ==2226== by 0x39CF01ECDC: (below main) (in /lib64/libc-2.12.so) ==2226== ==2226== 3 bytes in 1 blocks are definitely lost in loss record 2 of 24 ==2226== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==2226== by 0x39CF0FEDE7: __vasprintf_chk (in /lib64/libc-2.12.so) ==2226== by 0x41DFF7: virVasprintf (stdio2.h:199) ==2226== by 0x41E0B7: virAsprintf (util.c:1695) ==2226== by 0x41A307: networkBuildDhcpDaemonCommandLine (bridge_driver.c:551) ==2226== by 0x4145C8: testCompareXMLToArgvHelper (networkxml2argvtest.c:47) ==2226== by 0x4156A1: virtTestRun (testutils.c:141) ==2226== by 0x414332: mymain (networkxml2argvtest.c:123) ==2226== by 0x414D97: virtTestMain (testutils.c:696) ==2226== by 0x39CF01ECDC: (below main) (in /lib64/libc-2.12.so) ==2226== ==2226== 5 bytes in 1 blocks are definitely lost in loss record 4 of 24 ==2226== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==2226== by 0x39CF0FEDE7: __vasprintf_chk (in /lib64/libc-2.12.so) ==2226== by 0x41DFF7: virVasprintf (stdio2.h:199) ==2226== by 0x41E0B7: virAsprintf (util.c:1695) ==2226== by 0x41A2AB: networkBuildDhcpDaemonCommandLine (bridge_driver.c:539) ==2226== by 0x4145C8: testCompareXMLToArgvHelper (networkxml2argvtest.c:47) ==2226== by 0x4156A1: virtTestRun (testutils.c:141) ==2226== by 0x414332: mymain (networkxml2argvtest.c:123) ==2226== by 0x414D97: virtTestMain (testutils.c:696) ==2226== by 0x39CF01ECDC: (below main) (in /lib64/libc-2.12.so) ==2226== ==2226== LEAK SUMMARY: ==2226== definitely lost: 11 bytes in 3 blocks Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/network/bridge_driver.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 5d0d528..36bdf44 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -459,6 +459,10 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, int r, ret = -1; int nbleases = 0; int ii; + char *record = NULL; + char *recordPort = NULL; + char *recordWeight = NULL; + char *recordPriority = NULL; virNetworkIpDefPtr tmpipdef; /* @@ -516,7 +520,6 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, int i; for (i = 0; i < dns->ntxtrecords; i++) { - char *record = NULL; if (virAsprintf(&record, "%s,%s", dns->txtrecords[i].name, dns->txtrecords[i].value) < 0) { @@ -529,11 +532,6 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, } for (i = 0; i < dns->nsrvrecords; i++) { - char *record = NULL; - char *recordPort = NULL; - char *recordPriority = NULL; - char *recordWeight = NULL; - if (dns->srvrecords[i].service && dns->srvrecords[i].protocol) { if (dns->srvrecords[i].port) { if (virAsprintf(&recordPort, "%d", dns->srvrecords[i].port) < 0) { @@ -568,6 +566,9 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, virCommandAddArgPair(cmd, "--srv-host", record); VIR_FREE(record); + VIR_FREE(recordPort); + VIR_FREE(recordWeight); + VIR_FREE(recordPriority); } } } @@ -671,6 +672,10 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, ret = 0; cleanup: + VIR_FREE(record); + VIR_FREE(recordPort); + VIR_FREE(recordWeight); + VIR_FREE(recordPriority); return ret; } -- 1.7.1

3 3

[libvirt] [PATCH v2] tests: dynamically replace dnsmasq path
by Philipp Hahn 02 Feb '12

02 Feb '12

The path to the dnsmasq binary can be configured while in the test data the path is hard-coded to /usr/bin/. This break the test suite if a the binary is located in a different location, like /usr/local/sbin/. Replace the hard coded path in the test data by a token, which is dynamically replaced in networkxml2argvtest with the configured path after the test data has been loaded. (Another option would have been to modify configure.ac to generate the test data during configure, but I do not know of an easy way do trick configure into mass-generate those test files without listing every single one, which I consider less flexible.) v2: - Use VIR_REALLOC_N() instead of realloc() - Use memcpy() for replacement - Skip shrinking buffer - Add missing update of token_end - simplify code after the changes above - unit-test the unit-test: #include <assert.h> #define TEST(in,token,rep,out) { char *buf = strdup(in); assert(!replaceTokens(&buf, token, rep) && !strcmp(buf, out)); free(buf); } TEST("", "AA", "B", ""); TEST("A", "AA", "B", "A"); TEST("AA", "AA", "B", "B"); TEST("AAA", "AA", "B", "BA"); TEST("AA", "AA", "BB", "BB"); TEST("AA", "AA", "BBB", "BBB"); TEST("<AA", "AA", "B", "<B"); TEST("<AA", "AA", "BB", "<BB"); TEST("<AA", "AA", "BBB", "<BBB"); TEST("AA>", "AA", "B", "B>"); TEST("AA>", "AA", "BB", "BB>"); TEST("AA>", "AA", "BBB", "BBB>"); TEST("<AA>", "AA", "B", "<B>"); TEST("<AA>", "AA", "BB", "<BB>"); TEST("<AA>", "AA", "BBB", "<BBB>"); TEST("<AA|AA>", "AA", "B", "<B|B>"); TEST("<AA|AA>", "AA", "BB", "<BB|BB>"); TEST("<AA|AA>", "AA", "BBB", "<BBB|BBB>"); TEST("<AAAA>", "AA", "B", "<BB>"); TEST("<AAAA>", "AA", "BB", "<BBBB>"); TEST("<AAAA>", "AA", "BBB", "<BBBBBB>"); TEST("AAAA>", "AA", "B", "BB>"); TEST("AAAA>", "AA", "BB", "BBBB>"); TEST("AAAA>", "AA", "BBB", "BBBBBB>"); TEST("<AAAA", "AA", "B", "<BB"); TEST("<AAAA", "AA", "BB", "<BBBB"); TEST("<AAAA", "AA", "BBB", "<BBBBBB"); alarm(1); /* no infinit loop */ TEST("A", "A", "A", "A"); TEST("AA", "A", "A", "AA"); alarm(0); Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- tests/networkxml2argvdata/isolated-network.argv | 2 +- .../networkxml2argvdata/nat-network-dns-hosts.argv | 2 +- .../nat-network-dns-srv-record-minimal.argv | 2 +- .../nat-network-dns-srv-record.argv | 2 +- .../nat-network-dns-txt-record.argv | 2 +- tests/networkxml2argvdata/nat-network.argv | 2 +- tests/networkxml2argvdata/netboot-network.argv | 2 +- .../networkxml2argvdata/netboot-proxy-network.argv | 2 +- tests/networkxml2argvdata/routed-network.argv | 2 +- tests/networkxml2argvtest.c | 33 ++++++++++++++++++++ 10 files changed, 42 insertions(+), 9 deletions(-) diff --git a/tests/networkxml2argvdata/isolated-network.argv b/tests/networkxml2argvdata/isolated-network.argv index 7ea2e94..a9beb05 100644 --- a/tests/networkxml2argvdata/isolated-network.argv +++ b/tests/networkxml2argvdata/isolated-network.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +@DNSMASQ@ --strict-order --bind-interfaces --conf-file= \ --except-interface lo --dhcp-option=3 --no-resolv \ --listen-address 192.168.152.1 \ --dhcp-range 192.168.152.2,192.168.152.254 \ diff --git a/tests/networkxml2argvdata/nat-network-dns-hosts.argv b/tests/networkxml2argvdata/nat-network-dns-hosts.argv index 2158df8..c7e4967 100644 --- a/tests/networkxml2argvdata/nat-network-dns-hosts.argv +++ b/tests/networkxml2argvdata/nat-network-dns-hosts.argv @@ -1,3 +1,3 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com \ +@DNSMASQ@ --strict-order --bind-interfaces --domain example.com \ --conf-file= --except-interface lo --listen-address 192.168.122.1 \ --expand-hosts --addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv index 021e8f0..ea1da6d 100644 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq \ +@DNSMASQ@ \ --strict-order \ --bind-interfaces \ --conf-file= \ diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv index 85afbba..84c2d2f 100644 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq \ +@DNSMASQ@ \ --strict-order \ --bind-interfaces \ --conf-file= \ diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv index be6ba4b..bed309f 100644 --- a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +@DNSMASQ@ --strict-order --bind-interfaces --conf-file= \ --except-interface lo --txt-record=example,example value \ --listen-address 192.168.122.1 --listen-address 192.168.123.1 \ --listen-address 2001:db8:ac10:fe01::1 \ diff --git a/tests/networkxml2argvdata/nat-network.argv b/tests/networkxml2argvdata/nat-network.argv index d7faee2..80878a8 100644 --- a/tests/networkxml2argvdata/nat-network.argv +++ b/tests/networkxml2argvdata/nat-network.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +@DNSMASQ@ --strict-order --bind-interfaces --conf-file= \ --except-interface lo --listen-address 192.168.122.1 \ --listen-address 192.168.123.1 --listen-address 2001:db8:ac10:fe01::1 \ --listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \ diff --git a/tests/networkxml2argvdata/netboot-network.argv b/tests/networkxml2argvdata/netboot-network.argv index 78e873c..7ae5b75 100644 --- a/tests/networkxml2argvdata/netboot-network.argv +++ b/tests/networkxml2argvdata/netboot-network.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com \ +@DNSMASQ@ --strict-order --bind-interfaces --domain example.com \ --conf-file= --except-interface lo --listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ diff --git a/tests/networkxml2argvdata/netboot-proxy-network.argv b/tests/networkxml2argvdata/netboot-proxy-network.argv index 5fe1b8e..2c5a0d5 100644 --- a/tests/networkxml2argvdata/netboot-proxy-network.argv +++ b/tests/networkxml2argvdata/netboot-proxy-network.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com \ +@DNSMASQ@ --strict-order --bind-interfaces --domain example.com \ --conf-file= --except-interface lo --listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ diff --git a/tests/networkxml2argvdata/routed-network.argv b/tests/networkxml2argvdata/routed-network.argv index d059630..75303e6 100644 --- a/tests/networkxml2argvdata/routed-network.argv +++ b/tests/networkxml2argvdata/routed-network.argv @@ -1,2 +1,2 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +@DNSMASQ@ --strict-order --bind-interfaces --conf-file= \ --except-interface lo --listen-address 192.168.122.1\ diff --git a/tests/networkxml2argvtest.c b/tests/networkxml2argvtest.c index 2dd9b7f..f2e9086 100644 --- a/tests/networkxml2argvtest.c +++ b/tests/networkxml2argvtest.c @@ -15,6 +15,36 @@ #include "memory.h" #include "network/bridge_driver.h" +/* Replace all occurrences of @token in @buf by @replacement and adjust size of + * @buf accordingly. Returns 0 on success and -1 on out-of-memory errors. */ +static int replaceTokens(char **buf, const char *token, const char *replacement) { + char *token_start, *token_end; + size_t buf_len, rest_len; + const size_t token_len = strlen(token); + const size_t replacement_len = strlen(replacement); + const int diff = replacement_len - token_len; + + buf_len = rest_len = strlen(*buf) + 1; + token_end = *buf; + for (;;) { + token_start = strstr(token_end, token); + if (token_start == NULL) + break; + rest_len -= token_start + token_len - token_end; + token_end = token_start + token_len; + buf_len += diff; + if (diff > 0) + if (VIR_REALLOC_N(*buf, buf_len) < 0) + return -1; + if (diff != 0) + memmove(token_end + diff, token_end, rest_len); + memcpy(token_start, replacement, replacement_len); + token_end += diff; + } + /* if diff < 0, we could shrinkt the buffer here... */ + return 0; +} + static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { char *inXmlData = NULL; char *outArgvData = NULL; @@ -32,6 +62,9 @@ static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { if (virtTestLoadFile(outargv, &outArgvData) < 0) goto fail; + if (replaceTokens(&outArgvData, "@DNSMASQ@", DNSMASQ)) + goto fail; + if (!(dev = virNetworkDefParseString(inXmlData))) goto fail; -- 1.7.1

2 1

[libvirt] [PATCH v2] tests: virnettlscontexttest needs gnutls-2.6.0
by Philipp Hahn 01 Feb '12

01 Feb '12

virnettlscontexttest uses gnutls_x509_crt_set_subject_alt_name() and GNUTLS_FSAN_APPEND, which - according to <http://www.gnu.org/software/gnutls/manual/gnutls.html> - are only available since 2.6.0. Since libvirt still works fine with gnutls-1.0.25 from RHEL5, only enable the test when the version of GNUTLS is at least 2.6.0. v2: greater-equal 2.6.0 instead of strictly greater. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- tests/virnettlscontexttest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 51f75b4..508617a 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -36,7 +36,7 @@ #include "virsocketaddr.h" #include "gnutls_1_0_compat.h" -#if !defined WIN32 && HAVE_LIBTASN1_H && !defined GNUTLS_1_0_COMPAT +#if !defined WIN32 && HAVE_LIBTASN1_H && !defined GNUTLS_1_0_COMPAT && LIBGNUTLS_VERSION_NUMBER >= 0x020600 # include <libtasn1.h> # include "rpc/virnettlscontext.h" -- 1.7.1

2 1

[libvirt] [PATCH 0/3] add virDomainBlockRebase
by Eric Blake 01 Feb '12

01 Feb '12

As discussed here: https://www.redhat.com/archives/libvir-list/2012-January/msg01448.html Qemu patch series here: https://lists.gnu.org/archive/html/qemu-devel/2012-01/msg03488.html This is the bare-minimum implementation for getting the API in place prior to the 0.9.10 rc1 freeze; I can later do patches to wire up the new optional argument to the qemu block_stream monitor command to actually make use of the new base argument. Eric Blake (3): block rebase: add new API virDomainBlockRebase block rebase: wire up remote protocol block rebase: initial qemu implementation docs/apibuild.py | 1 + include/libvirt/libvirt.h.in | 9 +++- src/driver.h | 5 ++ src/libvirt.c | 84 ++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 1 + src/qemu/qemu_driver.c | 40 +++++++++++++------- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 10 ++++- src/remote_protocol-structs | 8 ++++ src/rpc/gendispatch.pl | 1 + 10 files changed, 143 insertions(+), 17 deletions(-) -- 1.7.7.6

2 8

[libvirt] [PATCH 0/2] build: add missing functions to libvirt_private.syms
by Laine Stump 01 Feb '12

01 Feb '12

Both of these pushed under the build-breaker rule.

1 2

[libvirt] [libvirt-glib] Add gvir_storage_vol_resize()
by Zeeshan Ali (Khattak) 01 Feb '12

01 Feb '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Add wrapper for virStorageVolResize(). --- libvirt-gobject/libvirt-gobject-storage-vol.c | 45 +++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-storage-vol.h | 20 +++++++++++ libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 66 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 491e2e6..f6f0c50 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -299,3 +299,48 @@ gboolean gvir_storage_vol_delete(GVirStorageVol *vol, return TRUE; } + +/** + * gvir_storage_vol_resize: + * @vol: the storage volume to resize + * @capacity: the new capacity of the volume + * @flags: the flags + * @err: Return location for errors, or NULL + * + * Changes the capacity of the storage volume @vol to @capacity. + * + * Returns: the new capacity of the volume on success, 0 otherwise + */ +gboolean gvir_storage_vol_resize(GVirStorageVol *vol, + guint64 capacity, + GVirStorageVolResizeFlags flags, + GError **err) +{ + GVirStoragePoolInfo* pool_info = NULL; + GVirStorageVolInfo* volume_info = NULL; + gboolean ret = FALSE; + + pool_info = gvir_storage_pool_get_info (vol->priv->pool, err); + if (err != NULL && *err != NULL) + goto cleanup; + volume_info = gvir_storage_vol_get_info (vol, err); + if (err != NULL && *err != NULL) + goto cleanup; + + if (virStorageVolResize(vol->priv->handle, capacity, flags) < 0) { + gvir_set_error_literal(err, + GVIR_STORAGE_VOL_ERROR, + 0, + "Unable to resize volume storage"); + goto cleanup; + } + + ret = TRUE; + +cleanup: + if (pool_info) + g_boxed_free(GVIR_TYPE_STORAGE_POOL_INFO, pool_info); + if (volume_info) + gvir_storage_vol_info_free(volume_info); + return ret; +} diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.h b/libvirt-gobject/libvirt-gobject-storage-vol.h index 25f683a..459a2ac 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.h +++ b/libvirt-gobject/libvirt-gobject-storage-vol.h @@ -23,6 +23,7 @@ #if !defined(__LIBVIRT_GOBJECT_H__) && !defined(LIBVIRT_GOBJECT_BUILD) #error "Only <libvirt-gobject/libvirt-gobject.h> can be included directly." #endif +#include <libvirt/libvirt.h> #ifndef __LIBVIRT_GOBJECT_STORAGE_VOL_H__ #define __LIBVIRT_GOBJECT_STORAGE_VOL_H__ @@ -65,6 +66,21 @@ typedef enum { GVIR_STORAGE_VOL_STATE_DIR = 2, /* Directory-passthrough based volume */ } GVirStorageVolType; +/** + * GVirStorageVolResizeFlags: + * @GVIR_STORAGE_VOL_RESIZE_NONE: No flags + * @GVIR_STORAGE_VOL_RESIZE_ALLOCATE: force allocation of new size + * @GVIR_STORAGE_VOL_RESIZE_DELTA: size is relative to current + * @GVIR_STORAGE_VOL_RESIZE_SHRINK: allow decrease in capacity. This combined + * with #GVIR_STORAGE_VOL_RESIZE_DELTA, implies a negative delta. + */ +typedef enum { + GVIR_STORAGE_VOL_RESIZE_NONE = 0, + GVIR_STORAGE_VOL_RESIZE_ALLOCATE = VIR_STORAGE_VOL_RESIZE_ALLOCATE, + GVIR_STORAGE_VOL_RESIZE_DELTA = VIR_STORAGE_VOL_RESIZE_DELTA, + GVIR_STORAGE_VOL_RESIZE_SHRINK = VIR_STORAGE_VOL_RESIZE_SHRINK, +} GVirStorageVolResizeFlags; + typedef struct _GVirStorageVolInfo GVirStorageVolInfo; struct _GVirStorageVolInfo { @@ -89,6 +105,10 @@ GVirConfigStorageVol *gvir_storage_vol_get_config(GVirStorageVol *vol, GError **err); GVirStorageVolInfo *gvir_storage_vol_get_info(GVirStorageVol *vol, GError **err); +gboolean gvir_storage_vol_resize(GVirStorageVol *vol, + guint64 capacity, + GVirStorageVolResizeFlags flags, + GError **err); G_END_DECLS diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index a4f03f7..468bf65 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -126,6 +126,7 @@ LIBVIRT_GOBJECT_0.0.4 { gvir_storage_vol_get_config; gvir_storage_vol_get_info; gvir_storage_vol_delete; + gvir_storage_vol_resize; gvir_connection_handle_get_type; -- 1.7.7.6

4 5

[libvirt] Generic processing of xml data
by Hendrik Schwartke 01 Feb '12

01 Feb '12

There are some changes made to the conf code to handle some new tags like <title> or to add some "metadata" to a domain description in the last days. I'm wondering if there is a more generic (read better) way to handle those extra data in xml config elements. I think it would be far more reasonable to use xml namespaces to enable libvirt to differentiate between config options which it has to process and data which are unknown to libvirt and thus are only stored without any further processing. This distinction could then by easily used for expansions like the <title>-tag, to store the x- and y-position of a guest in a graphical visualization of virtual networks, to add some names of administrators which are responsible for the guests, to add some hints to interfaces concerning quality of service, etc... I don't know how complex such in implementation would be but I think it would be worth the effort. Hendrik Schwartke

2 3

[libvirt] [PATCH] qemu: Silent bogus warning about unitialized variable
by Jiri Denemark 01 Feb '12

01 Feb '12

GCC complaints about uninitialized use of len, which however is only used when errors != NULL and in that case len is always initialized. It's trivial to silence this by always initializing len. --- Pushed as both trivial and build-breaking. daemon/remote.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 8fbcf43..26ac4a6 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -3608,7 +3608,7 @@ static int remoteDispatchDomainGetDiskErrors( int rv = -1; virDomainPtr dom = NULL; virDomainDiskErrorPtr errors = NULL; - int len; + int len = 0; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); -- 1.7.8.4

1 0

[libvirt] Unable to compile libvirt git src... python-config error
by Deepak C Shetty 01 Feb '12

01 Feb '12

Hi All, I am getting this error, while trying to compile latest git src. ./autogen.sh --prefix=$HOME/usr --enable-compile-warnings=error running bootstrap... ./bootstrap: Error: 'python-config' not found ./bootstrap: Please install the prerequisite programs Failed to bootstrap, please investigate. I am ubuntu, and all packages related to python-config are installed.. as seen by the 'i' below... aptitude search python-config i python-configglue - Glues together optparse.OptionParser and ConfigParser.ConfigParser i python-configobj - simple but powerful config file reader and writer for Python Can someone help, what i am missing ? thanx, deepak

2 2

[libvirt] [PATCH 0/2][RFC] netlink events
by D. Herrendoerfer 01 Feb '12

01 Feb '12

From: "D. Herrendoerfer" <d.herrendoerfer(a)herrendoerfer.name> I'd like to put this up for discussion. This is the prototype for netlink events as discussed before, it follows the design of the event_poll functions. Included is the unfinished prototype netlink event callback for virnetdevmacvtap.c as reference. We are still working with lldpad to get the message finalized and tested. Regards, Dirk H. D. Herrendoerfer (2): Add netlink message event service macvtap: listen for netlink messages from lldpad daemon/Makefile.am | 3 +- daemon/libvirtd.c | 7 + src/Makefile.am | 1 + src/libvirt_private.syms | 7 + src/util/netlink-event.c | 363 +++++++++++++++++++++++++++++++++++++++++++ src/util/netlink-event.h | 63 ++++++++ src/util/netlink.c | 1 + src/util/virnetdevmacvlan.c | 161 +++++++++++++++++++- src/util/virnetdevmacvlan.h | 1 + 9 files changed, 605 insertions(+), 2 deletions(-) create mode 100644 src/util/netlink-event.c create mode 100644 src/util/netlink-event.h -- 1.7.7.5

3 8

[libvirt] [PATCH] daemon: Allow overriding NOFILES ulimit for the daemon as well
by Michal Privoznik 01 Feb '12

01 Feb '12

One of my latest patches (d8db0f9690) created support for setting the limit for the maximum of opened files by qemu user. However, since libvirtd keeps one FD opened per domain (well, for qemu at least) it will likely hit this limit on huge scenarios. --- daemon/libvirtd.aug | 1 + daemon/libvirtd.c | 37 +++++++++++++++++++++++++++++++++++++ daemon/libvirtd.conf | 9 +++++++++ 3 files changed, 47 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.aug b/daemon/libvirtd.aug index 9d78bd7..278099b 100644 --- a/daemon/libvirtd.aug +++ b/daemon/libvirtd.aug @@ -58,6 +58,7 @@ module Libvirtd = | int_entry "max_requests" | int_entry "max_client_requests" | int_entry "prio_workers" + | int_entry "max_files" let logging_entry = int_entry "log_level" | str_entry "log_filters" diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index b1b542b..34bdd39 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -139,6 +139,8 @@ struct daemonConfig { int max_requests; int max_client_requests; + int max_files; + int log_level; char *log_filters; char *log_outputs; @@ -1081,6 +1083,8 @@ daemonConfigLoad(struct daemonConfig *data, GET_CONF_INT (conf, filename, max_requests); GET_CONF_INT (conf, filename, max_client_requests); + GET_CONF_INT (conf, filename, max_files); + GET_CONF_INT (conf, filename, audit_level); GET_CONF_INT (conf, filename, audit_logging); @@ -1198,6 +1202,34 @@ static int daemonStateInit(virNetServerPtr srv) return 0; } +/* + * daemonSetProcessLimits: + * @config: where to take limits from + * + * Set both soft and hard limits set in config file. + * + * Returns 0 on success, -1 otherwise. + */ +static int +daemonSetProcessLimits(struct daemonConfig *config) +{ + struct rlimit rlim; + + if (config->max_files > 0) { + /* Max number of opened files is one greater than + * actual limit. See man setrlimit */ + rlim.rlim_cur = rlim.rlim_max = config->max_files + 1; + if (setrlimit(RLIMIT_NOFILE, &rlim) < 0) { + virReportSystemError(errno, + _("cannot set max opened files to %d"), + config->max_files); + return -1; + } + } + + return 0; +} + /* Print command-line usage. */ static void daemonUsage(const char *argv0, bool privileged) @@ -1429,6 +1461,11 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } + if (daemonSetProcessLimits(config) < 0) { + /* Helper reported error */ + exit(EXIT_FAILURE); + } + if (godaemon) { char ebuf[1024]; diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index 3eab2be..70d5294 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -279,6 +279,15 @@ # and max_workers parameter #max_client_requests = 5 +# If max_files is set to positive integer, the maximum number +# of opened files for the daemon is set to given value. This +# can be used to override host system default value. +# Please keep in mind that in some drivers (like qemu) this +# will affect the upper bound of domains which can run simultaneously. +# That's because the daemon keeps one file opened per domain - monitor. +# Well, at least one. +#max_files = 0 + ################################################################# # # Logging controls -- 1.7.3.4

2 6

[libvirt] virDomainNetGetActualBridgeName doesn't return the actual bridge
by Hendrik Schwartke 01 Feb '12

01 Feb '12

Hi, calling virDomainNetGetActualBridgeName on a bridge with type VIR_DOMAIN_NET_TYPE_NETWORK seems to return NULL in any case, because iface->data.network.actual is NULL. Is that intented? What is the best way to determine the bridge the interface is connected to? Hendrik Schwartke

3 4

[libvirt] [PATCH v3 0/5] Add virDomainGetDiskErrors API
by Jiri Denemark 01 Feb '12

01 Feb '12

We already provide ways to detect when a domain has been paused as a result of I/O error, but there was no way of getting the exact error or even the device that experienced it. This new API may be used for both. Changes in version 3: - special case errors == NULL, maxerrors == 0 returns size of the array the caller should pass - explicitly document that disks with no error are not returned and that the caller must free disk names - explicitly document what happens when maxerrors is lower then the actual number of disk errors - maxerrors turned unsigned - the first patch was split into two (public API and RPC) - python binding is back Changes in version 2: - the API is now called virDomainGetDiskErrors - it returns a list (allocated by caller) of disks with errors instead so that users don't have to call it multiple times to get all errors - there's no python API yet since it can't be autogenerated; I'll send a patch for it tomorrow Jiri Denemark (5): virDomainGetDiskErrors public API Remote protocol for virDomainGetDiskErrors qemu: Implement virDomainGetDiskErrors virsh: Implement domblkerror command python: Add binding for virDomainGetDiskErrors daemon/remote.c | 103 +++++++++++++++++++++++++++++++++++++++ include/libvirt/libvirt.h.in | 32 ++++++++++++ python/generator.py | 3 +- python/libvirt-override-api.xml | 6 ++ python/libvirt-override.c | 50 +++++++++++++++++++ src/driver.h | 7 +++ src/libvirt.c | 65 ++++++++++++++++++++++++ src/libvirt_public.syms | 1 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 86 ++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 40 +++++++++++++++ src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 8 +++ src/qemu/qemu_monitor_text.c | 15 ++++++ src/remote/remote_driver.c | 77 +++++++++++++++++++++++++++++ src/remote/remote_protocol.x | 23 ++++++++- src/remote_protocol-structs | 17 ++++++ tools/virsh.c | 78 +++++++++++++++++++++++++++++ tools/virsh.pod | 7 +++ 19 files changed, 618 insertions(+), 2 deletions(-) -- 1.7.8.4

2 12

[libvirt] [PATCH] python: correct a copy-paste error
by Alex.Jia＠redhat.com 01 Feb '12

01 Feb '12

From: Alex Jia <ajia(a)redhat.com> * python/libvirt-override-virStream.py: fix a copy-paste error in sendAll(). Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override-virStream.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/python/libvirt-override-virStream.py b/python/libvirt-override-virStream.py index ff53a16..b5cec2a 100644 --- a/python/libvirt-override-virStream.py +++ b/python/libvirt-override-virStream.py @@ -86,7 +86,7 @@ ret = self.send(got) if ret == -2: - raise libvirtError("cannot use recvAll with " + raise libvirtError("cannot use sendAll with " "nonblocking stream") def recv(self, nbytes): -- 1.7.1

2 1

[libvirt] [PATCH] command: Fix ATTRIBUTE_UNUSED on virSetCapabilities
by Michal Privoznik 01 Feb '12

01 Feb '12

If we are building not on a WIN32 architecture and without HAVE_CAPNG virSetCapabilities has unused argument and virClearCapabilities is unused as well. --- Pushed under build breaker rule. src/util/command.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/command.c b/src/util/command.c index e3a8371..6f51fbb 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -169,8 +169,9 @@ virCommandFDSet(int fd, #ifndef WIN32 -# if HAVE_CAPNG static int virClearCapabilities(void) ATTRIBUTE_UNUSED; + +# if HAVE_CAPNG static int virClearCapabilities(void) { int ret; @@ -220,7 +221,8 @@ static int virClearCapabilities(void) return 0; } -static int virSetCapabilities(unsigned long long capabilities) +static int +virSetCapabilities(unsigned long long capabilities ATTRIBUTE_UNUSED) { return 0; } -- 1.7.3.4

1 0

[libvirt] [PATCH] qemu: Clenup qemuDomainSetInterfaceParameters
by Michal Privoznik 01 Feb '12

01 Feb '12

which contained some useless lines, copied code, NULL dereference. --- src/libvirt.c | 4 ++-- src/qemu/qemu_driver.c | 44 ++++++++++++++++---------------------------- 2 files changed, 18 insertions(+), 30 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index e702a34..433ae0a 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -7226,8 +7226,8 @@ error: * * Change a subset or all parameters of interface; currently this * includes bandwidth parameters. The value of @flags should be - * either VIR_DOMAIN_AFFECT_CURRENT, or a bitwise-or of values from - * VIR_DOMAIN_AFFECT_LIVE and VIR_DOMAIN_AFFECT_CURRENT, although + * either VIR_DOMAIN_AFFECT_CURRENT, or a bitwise-or of values + * VIR_DOMAIN_AFFECT_LIVE and VIR_DOMAIN_AFFECT_CONFIG, although * hypervisors vary in which flags are supported. * * This function may require privileged access to the hypervisor. diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1b147a9..b1d0b7f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7779,20 +7779,12 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, } } - if (VIR_ALLOC(bandwidth) < 0) { + if ((VIR_ALLOC(bandwidth) < 0) || + (VIR_ALLOC(bandwidth->in) < 0) || + (VIR_ALLOC(bandwidth->out) < 0)) { virReportOOMError(); goto cleanup; } - if (VIR_ALLOC(bandwidth->in) < 0) { - virReportOOMError(); - goto cleanup; - } - memset(bandwidth->in, 0, sizeof(*bandwidth->in)); - if (VIR_ALLOC(bandwidth->out) < 0) { - virReportOOMError(); - goto cleanup; - } - memset(bandwidth->out, 0, sizeof(*bandwidth->out)); for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; @@ -7817,11 +7809,9 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, * inbound/outbound to not be set. */ if (!bandwidth->in->average) { VIR_FREE(bandwidth->in); - bandwidth->in = NULL; } if (!bandwidth->out->average) { VIR_FREE(bandwidth->out); - bandwidth->out = NULL; } if (flags & VIR_DOMAIN_AFFECT_LIVE) { @@ -7833,29 +7823,27 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, /* virNetDevBandwidthSet() will clear any previous value of * bandwidth parameters, so merge with old bandwidth parameters * here to prevent them from being lost. */ - if (bandwidth->in || net->bandwidth->in) { + if (bandwidth->in || + (net->bandwidth && net->bandwidth->in)) { if (VIR_ALLOC(newBandwidth->in) < 0) { virReportOOMError(); goto cleanup; } - if (bandwidth->in) - memcpy(newBandwidth->in, bandwidth->in, - sizeof(*newBandwidth->in)); - else if (net->bandwidth->in) - memcpy(newBandwidth->in, net->bandwidth->in, - sizeof(*newBandwidth->in)); - } - if (bandwidth->out || net->bandwidth->out) { + + memcpy(newBandwidth->in, + bandwidth->in ? bandwidth->in : net->bandwidth->in, + sizeof(*newBandwidth->in)); + } + if (bandwidth->out || + (net->bandwidth && net->bandwidth->out)) { if (VIR_ALLOC(newBandwidth->out) < 0) { virReportOOMError(); goto cleanup; } - if (bandwidth->out) - memcpy(newBandwidth->out, bandwidth->out, - sizeof(*newBandwidth->out)); - else if (net->bandwidth->out) - memcpy(newBandwidth->out, net->bandwidth->out, - sizeof(*newBandwidth->out)); + + memcpy(newBandwidth->out, + bandwidth->out ? bandwidth->out : net->bandwidth->out, + sizeof(*newBandwidth->out)); } if (virNetDevBandwidthSet(net->ifname, newBandwidth) < 0) { -- 1.7.3.4

2 2

[libvirt] [PATCH] qemu: Don't jump to endjob if no job was even started
by Michal Privoznik 01 Feb '12

01 Feb '12

In qemuDomainShutdownFlags if we try to use guest agent, which has error or is not configured, we jump go endjob label even if we haven't started any job yet. This may lead to the daemon crash: 1) virsh shutdown --mode agent on a domain without agent configured 2) wait until domain quits 3) virsh edit --- src/qemu/qemu_driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1b147a9..7945c5d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1546,12 +1546,12 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) { if (priv->agentError) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("QEMU guest agent is not available due to an error")); - goto endjob; + goto cleanup; } if (!priv->agent) { qemuReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("QEMU guest agent is not configured")); - goto endjob; + goto cleanup; } } -- 1.7.3.4

2 2

[libvirt] [test-API][PATCH 1/2] Add 2 new functions in storageAPI
by Wayne Sun 01 Feb '12

01 Feb '12

* download(self, poolname, volname, stream, offset, length, flags = 0) * upload(self, poolname, volname, stream, offset, length, flags = 0) --- lib/storageAPI.py | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/lib/storageAPI.py b/lib/storageAPI.py index 6c9d286..b0733f8 100644 --- a/lib/storageAPI.py +++ b/lib/storageAPI.py @@ -466,3 +466,20 @@ class StorageAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def download(self, poolname, volname, stream, offset, length, flags = 0): + try: + volobj = self.get_volume_obj(poolname, volname) + return volobj.download(stream, offset, length, flags) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def upload(self, poolname, volname, stream, offset, length, flags = 0): + try: + volobj = self.get_volume_obj(poolname, volname) + return volobj.upload(stream, offset, length, flags) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) -- 1.7.1

3 4

[libvirt] ANNOUNCE: virt-manager 0.9.1 and virtinst 0.600.1 released
by Cole Robinson 01 Feb '12

01 Feb '12

I'm happy to announce two new releases: virt-manager 0.9.1: virt-manager is a desktop application for managing KVM and Xen virtual machines via libvirt. virtinst 0.600.1: virtinst is a collection of command line tools for provisioning libvirt virtual machines, including virt-install and virt-clone. The releases can be downloaded from: http://virt-manager.org/download.html The direct download links are: http://virt-manager.org/download/sources/virt-manager/virt-manager-0.9.1.ta… http://virt-manager.org/download/sources/virtinst/virtinst-0.600.1.tar.gz The virt-manager release includes: - Support for adding usb redirection devices (Marc-André Lureau) - Option to switch usb controller to support usb2.0 (Marc-André Lureau) - Option to specify machine type for non-x86 guests (Li Zhang) - Support for filesystem device type and write policy (Deepak C Shetty) - Many bug fixes! The virtinst release includes: - virt-install: --redir option for usb redirection (Marc-André Lureau) - virt-install: Advanced --controller support for usb2 (Marc-André Lureau) - Many bug fixes and minor improvments. Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 0

[libvirt] [PATCH] tests: dynamically replace dnsmasq path
by Philipp Hahn 01 Feb '12

01 Feb '12

The path to the dnsmasq binary can be configured while in the test data the path is hard-coded to /usr/bin/. This break the test suite if a the binary is located in a different location, like /usr/local/sbin/. Replace the hard coded path in the test data by a token, which is dynamically replaced in networkxml2argvtest with the configured path after the test data has been loaded. (Another option would have been to modify configure.ac to generate the test data during configure, but I do not know of an easy way do trick configure into mass-generate those test files without listing every single one, which I consider less flexible.) Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- tests/networkxml2argvdata/isolated-network.argv | 2 +- .../networkxml2argvdata/nat-network-dns-hosts.argv | 2 +- .../nat-network-dns-srv-record-minimal.argv | 2 +- .../nat-network-dns-srv-record.argv | 2 +- .../nat-network-dns-txt-record.argv | 2 +- tests/networkxml2argvdata/nat-network.argv | 2 +- tests/networkxml2argvdata/netboot-network.argv | 2 +- .../networkxml2argvdata/netboot-proxy-network.argv | 2 +- tests/networkxml2argvdata/routed-network.argv | 2 +- tests/networkxml2argvtest.c | 42 ++++++++++++++++++++ 10 files changed, 51 insertions(+), 9 deletions(-) diff --git a/tests/networkxml2argvdata/isolated-network.argv b/tests/networkxml2argvdata/isolated-network.argv index 7ea2e94..a9beb05 100644 --- a/tests/networkxml2argvdata/isolated-network.argv +++ b/tests/networkxml2argvdata/isolated-network.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +@DNSMASQ@ --strict-order --bind-interfaces --conf-file= \ --except-interface lo --dhcp-option=3 --no-resolv \ --listen-address 192.168.152.1 \ --dhcp-range 192.168.152.2,192.168.152.254 \ diff --git a/tests/networkxml2argvdata/nat-network-dns-hosts.argv b/tests/networkxml2argvdata/nat-network-dns-hosts.argv index 2158df8..c7e4967 100644 --- a/tests/networkxml2argvdata/nat-network-dns-hosts.argv +++ b/tests/networkxml2argvdata/nat-network-dns-hosts.argv @@ -1,3 +1,3 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com \ +@DNSMASQ@ --strict-order --bind-interfaces --domain example.com \ --conf-file= --except-interface lo --listen-address 192.168.122.1 \ --expand-hosts --addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv index 021e8f0..ea1da6d 100644 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq \ +@DNSMASQ@ \ --strict-order \ --bind-interfaces \ --conf-file= \ diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv index 85afbba..84c2d2f 100644 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq \ +@DNSMASQ@ \ --strict-order \ --bind-interfaces \ --conf-file= \ diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv index be6ba4b..bed309f 100644 --- a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +@DNSMASQ@ --strict-order --bind-interfaces --conf-file= \ --except-interface lo --txt-record=example,example value \ --listen-address 192.168.122.1 --listen-address 192.168.123.1 \ --listen-address 2001:db8:ac10:fe01::1 \ diff --git a/tests/networkxml2argvdata/nat-network.argv b/tests/networkxml2argvdata/nat-network.argv index d7faee2..80878a8 100644 --- a/tests/networkxml2argvdata/nat-network.argv +++ b/tests/networkxml2argvdata/nat-network.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +@DNSMASQ@ --strict-order --bind-interfaces --conf-file= \ --except-interface lo --listen-address 192.168.122.1 \ --listen-address 192.168.123.1 --listen-address 2001:db8:ac10:fe01::1 \ --listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \ diff --git a/tests/networkxml2argvdata/netboot-network.argv b/tests/networkxml2argvdata/netboot-network.argv index 78e873c..7ae5b75 100644 --- a/tests/networkxml2argvdata/netboot-network.argv +++ b/tests/networkxml2argvdata/netboot-network.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com \ +@DNSMASQ@ --strict-order --bind-interfaces --domain example.com \ --conf-file= --except-interface lo --listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ diff --git a/tests/networkxml2argvdata/netboot-proxy-network.argv b/tests/networkxml2argvdata/netboot-proxy-network.argv index 5fe1b8e..2c5a0d5 100644 --- a/tests/networkxml2argvdata/netboot-proxy-network.argv +++ b/tests/networkxml2argvdata/netboot-proxy-network.argv @@ -1,4 +1,4 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com \ +@DNSMASQ@ --strict-order --bind-interfaces --domain example.com \ --conf-file= --except-interface lo --listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ diff --git a/tests/networkxml2argvdata/routed-network.argv b/tests/networkxml2argvdata/routed-network.argv index d059630..75303e6 100644 --- a/tests/networkxml2argvdata/routed-network.argv +++ b/tests/networkxml2argvdata/routed-network.argv @@ -1,2 +1,2 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +@DNSMASQ@ --strict-order --bind-interfaces --conf-file= \ --except-interface lo --listen-address 192.168.122.1\ diff --git a/tests/networkxml2argvtest.c b/tests/networkxml2argvtest.c index 2dd9b7f..ec2ef39 100644 --- a/tests/networkxml2argvtest.c +++ b/tests/networkxml2argvtest.c @@ -15,6 +15,45 @@ #include "memory.h" #include "network/bridge_driver.h" +/* Replace all occurrences of @token in @buf by @replacement and adjust size of + * @buf accordingly. Returns 0 on success and -1 on out-of-memory errors. */ +static int replaceTokens(char **buf, const char *token, const char *replacement) { + char *token_start, *token_end; + size_t old_len, new_len, rest_len; + void *tmp; + const size_t token_len = strlen(token); + const size_t replacement_len = strlen(replacement); + const int diff = replacement_len - token_len; + + old_len = rest_len = strlen(*buf) + 1; + token_end = *buf; + for (;;) { + token_start = strstr(token_end, token); + if (token_start == NULL) + break; + rest_len -= token_start + token_len - token_end; + token_end = token_start + token_len; + new_len = old_len + diff; + if (diff > 0) { + tmp = realloc((void *)*buf, new_len); + if (tmp == NULL) + return -1; + *buf = tmp; + } + if (diff != 0) + memmove(token_end + diff, token_end, rest_len); + memmove(token_start, replacement, replacement_len); + if (diff < 0) { + tmp = realloc((void *)*buf, new_len); + if (tmp == NULL) + return -1; + *buf = tmp; + } + old_len = new_len; + } + return 0; +} + static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { char *inXmlData = NULL; char *outArgvData = NULL; @@ -32,6 +71,9 @@ static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { if (virtTestLoadFile(outargv, &outArgvData) < 0) goto fail; + if (replaceTokens(&outArgvData, "@DNSMASQ@", DNSMASQ)) + goto fail; + if (!(dev = virNetworkDefParseString(inXmlData))) goto fail; -- 1.7.1

2 3

[libvirt] Implement virStorageVolResize() for FS backend
by Zeeshan Ali (Khattak) 01 Feb '12

01 Feb '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Currently only VIR_STORAGE_VOL_RESIZE_DELTA flag is supported. --- src/storage/storage_backend.h | 6 +++ src/storage/storage_backend_fs.c | 53 +++++++++++++++++++++++ src/storage/storage_driver.c | 88 ++++++++++++++++++++++++++++++++++++++ src/util/storage_file.c | 16 +++++++ src/util/storage_file.h | 2 + 5 files changed, 165 insertions(+), 0 deletions(-) diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index 75ed676..a37bf7c 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -44,6 +44,11 @@ typedef int (*virStorageBackendDeleteVol)(virConnectPtr conn, virStoragePoolObjP typedef int (*virStorageBackendBuildVolFrom)(virConnectPtr conn, virStoragePoolObjPtr pool, virStorageVolDefPtr origvol, virStorageVolDefPtr newvol, unsigned int flags); +typedef int (*virStorageBackendVolumeResize)(virConnectPtr conn, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol, + unsigned long long capacity, + unsigned int flags); /* File creation/cloning functions used for cloning between backends */ int virStorageBackendCreateRaw(virConnectPtr conn, @@ -78,6 +83,7 @@ struct _virStorageBackend { virStorageBackendCreateVol createVol; virStorageBackendRefreshVol refreshVol; virStorageBackendDeleteVol deleteVol; + virStorageBackendVolumeResize resizeVol; }; virStorageBackendPtr virStorageBackendForType(int type); diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index d8dc29c..1af12e6 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1187,6 +1187,56 @@ virStorageBackendFileSystemVolRefresh(virConnectPtr conn, return 0; } +static int +virStorageBackendFilesystemResizeQemuImg(const char *path, + unsigned long long capacity) +{ + int ret = -1; + char *img_tool; + virCommandPtr cmd = NULL; + + /* KVM is usually ahead of qemu on features, so try that first */ + img_tool = virFindFileInPath("kvm-img"); + if (!img_tool) + img_tool = virFindFileInPath("qemu-img"); + + if (!img_tool) { + virStorageReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("unable to find kvm-img or qemu-img")); + return -1; + } + + cmd = virCommandNew(img_tool); + virCommandAddArgList(cmd, "resize", path, NULL); + virCommandAddArgFormat(cmd, "%llu", capacity); + + ret = virCommandRun(cmd, NULL); + + VIR_FREE(img_tool); + virCommandFree(cmd); + + return ret; +} + +/** + * Resize a volume + */ +static int +virStorageBackendFileSystemVolResize(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, + virStorageVolDefPtr vol, + unsigned long long capacity, + unsigned int flags) +{ + virCheckFlags(0, -1); + + if (vol->target.format == VIR_STORAGE_FILE_RAW) + return virStorageFileResize(vol->target.path, capacity); + else + return virStorageBackendFilesystemResizeQemuImg(vol->target.path, + capacity); +} + virStorageBackend virStorageBackendDirectory = { .type = VIR_STORAGE_POOL_DIR, @@ -1199,6 +1249,7 @@ virStorageBackend virStorageBackendDirectory = { .createVol = virStorageBackendFileSystemVolCreate, .refreshVol = virStorageBackendFileSystemVolRefresh, .deleteVol = virStorageBackendFileSystemVolDelete, + .resizeVol = virStorageBackendFileSystemVolResize, }; #if WITH_STORAGE_FS @@ -1216,6 +1267,7 @@ virStorageBackend virStorageBackendFileSystem = { .createVol = virStorageBackendFileSystemVolCreate, .refreshVol = virStorageBackendFileSystemVolRefresh, .deleteVol = virStorageBackendFileSystemVolDelete, + .resizeVol = virStorageBackendFileSystemVolResize, }; virStorageBackend virStorageBackendNetFileSystem = { .type = VIR_STORAGE_POOL_NETFS, @@ -1232,5 +1284,6 @@ virStorageBackend virStorageBackendNetFileSystem = { .createVol = virStorageBackendFileSystemVolCreate, .refreshVol = virStorageBackendFileSystemVolRefresh, .deleteVol = virStorageBackendFileSystemVolDelete, + .resizeVol = virStorageBackendFileSystemVolResize, }; #endif /* WITH_STORAGE_FS */ diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index a332ada..e7a8a8b 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1695,7 +1695,94 @@ out: return ret; } +static int +storageVolumeResize(virStorageVolPtr obj, + long long capacity, + unsigned int flags) +{ + virStorageDriverStatePtr driver = obj->conn->storagePrivateData; + virStorageBackendPtr backend; + virStoragePoolObjPtr pool = NULL; + virStorageVolDefPtr vol = NULL; + unsigned long long abs_capacity; + int ret = -1; + + virCheckFlags(VIR_STORAGE_VOL_RESIZE_DELTA, -1); + + storageDriverLock(driver); + pool = virStoragePoolObjFindByName(&driver->pools, obj->pool); + storageDriverUnlock(driver); + + if (!pool) { + virStorageReportError(VIR_ERR_NO_STORAGE_POOL, + _("no storage pool with matching uuid")); + goto out; + } + + if (!virStoragePoolObjIsActive(pool)) { + virStorageReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool is not active")); + goto out; + } + + if ((backend = virStorageBackendForType(pool->def->type)) == NULL) + goto out; + + vol = virStorageVolDefFindByName(pool, obj->name); + + if (vol == NULL) { + virStorageReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching name '%s'"), + obj->name); + goto out; + } + + if (vol->building) { + virStorageReportError(VIR_ERR_OPERATION_INVALID, + _("volume '%s' is still being allocated."), + vol->name); + goto out; + } + if (flags & VIR_STORAGE_VOL_RESIZE_DELTA) { + abs_capacity = vol->capacity + capacity; + flags &= ~VIR_STORAGE_VOL_RESIZE_DELTA; + } else { + abs_capacity = capacity; + } + + if (abs_capacity < vol->allocation) { + virStorageReportError(VIR_ERR_INVALID_ARG, + _("can't shrink capacity below " + "existing allocation")); + goto out; + } + + if (abs_capacity > vol->allocation + pool->def->available) { + virStorageReportError(VIR_ERR_INVALID_ARG, + _("Not enough space left on storage pool")); + goto out; + } + + if (!backend->resizeVol) { + virStorageReportError(VIR_ERR_NO_SUPPORT, + _("storage pool does not support changing of " + "volume capacity")); + goto out; + } + + if (backend->resizeVol(obj->conn, pool, vol, abs_capacity, flags) < 0) + goto out; + + vol->capacity = abs_capacity; + ret = 0; + +out: + if (pool) + virStoragePoolObjUnlock(pool); + + return ret; +} /* If the volume we're wiping is already a sparse file, we simply * truncate and extend it to its original size, filling it with @@ -2243,6 +2330,7 @@ static virStorageDriver storageDriver = { .volGetInfo = storageVolumeGetInfo, /* 0.4.0 */ .volGetXMLDesc = storageVolumeGetXMLDesc, /* 0.4.0 */ .volGetPath = storageVolumeGetPath, /* 0.4.0 */ + .volResize = storageVolumeResize, /* 0.9.10 */ .poolIsActive = storagePoolIsActive, /* 0.7.3 */ .poolIsPersistent = storagePoolIsPersistent, /* 0.7.3 */ diff --git a/src/util/storage_file.c b/src/util/storage_file.c index ba9cfc5..8260adb 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -931,6 +931,22 @@ virStorageFileFreeMetadata(virStorageFileMetadata *meta) VIR_FREE(meta); } +/** + * virStorageFileResize: + * + * Change the capacity of the raw storage file at 'path'. + */ +int +virStorageFileResize(const char *path, unsigned long long capacity) +{ + if (truncate(path, capacity) < 0) { + virReportSystemError(errno, _("Failed to truncate file '%s'"), path); + return -1; + } + + return 0; +} + #ifdef __linux__ # ifndef NFS_SUPER_MAGIC diff --git a/src/util/storage_file.h b/src/util/storage_file.h index b8920d0..96afb12 100644 --- a/src/util/storage_file.h +++ b/src/util/storage_file.h @@ -72,6 +72,8 @@ int virStorageFileGetMetadataFromFD(const char *path, void virStorageFileFreeMetadata(virStorageFileMetadata *meta); +int virStorageFileResize(const char *path, unsigned long long capacity); + enum { VIR_STORAGE_FILE_SHFS_NFS = (1 << 0), VIR_STORAGE_FILE_SHFS_GFS2 = (1 << 1), -- 1.7.7.6

3 2

[libvirt] [PATCHv3] network: Avoid memory leaks on networkBuildDnsmasqArgv
by ajia＠redhat.com 01 Feb '12

01 Feb '12

From: Alex Jia <ajia(a)redhat.com> Detected by valgrind. Leaks introduced in commit 973af236. * src/network/bridge_driver.c: fix memory leaks on failure and successful path. * How to reproduce? % make -C tests check TESTS=networkxml2argvtest % cd tests && valgrind -v --leak-check=full ./networkxml2argvtest * Actual result: ==2226== 3 bytes in 1 blocks are definitely lost in loss record 1 of 24 ==2226== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==2226== by 0x39CF0FEDE7: __vasprintf_chk (in /lib64/libc-2.12.so) ==2226== by 0x41DFF7: virVasprintf (stdio2.h:199) ==2226== by 0x41E0B7: virAsprintf (util.c:1695) ==2226== by 0x41A2D9: networkBuildDhcpDaemonCommandLine (bridge_driver.c:545) ==2226== by 0x4145C8: testCompareXMLToArgvHelper (networkxml2argvtest.c:47) ==2226== by 0x4156A1: virtTestRun (testutils.c:141) ==2226== by 0x414332: mymain (networkxml2argvtest.c:123) ==2226== by 0x414D97: virtTestMain (testutils.c:696) ==2226== by 0x39CF01ECDC: (below main) (in /lib64/libc-2.12.so) ==2226== ==2226== 3 bytes in 1 blocks are definitely lost in loss record 2 of 24 ==2226== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==2226== by 0x39CF0FEDE7: __vasprintf_chk (in /lib64/libc-2.12.so) ==2226== by 0x41DFF7: virVasprintf (stdio2.h:199) ==2226== by 0x41E0B7: virAsprintf (util.c:1695) ==2226== by 0x41A307: networkBuildDhcpDaemonCommandLine (bridge_driver.c:551) ==2226== by 0x4145C8: testCompareXMLToArgvHelper (networkxml2argvtest.c:47) ==2226== by 0x4156A1: virtTestRun (testutils.c:141) ==2226== by 0x414332: mymain (networkxml2argvtest.c:123) ==2226== by 0x414D97: virtTestMain (testutils.c:696) ==2226== by 0x39CF01ECDC: (below main) (in /lib64/libc-2.12.so) ==2226== ==2226== 5 bytes in 1 blocks are definitely lost in loss record 4 of 24 ==2226== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==2226== by 0x39CF0FEDE7: __vasprintf_chk (in /lib64/libc-2.12.so) ==2226== by 0x41DFF7: virVasprintf (stdio2.h:199) ==2226== by 0x41E0B7: virAsprintf (util.c:1695) ==2226== by 0x41A2AB: networkBuildDhcpDaemonCommandLine (bridge_driver.c:539) ==2226== by 0x4145C8: testCompareXMLToArgvHelper (networkxml2argvtest.c:47) ==2226== by 0x4156A1: virtTestRun (testutils.c:141) ==2226== by 0x414332: mymain (networkxml2argvtest.c:123) ==2226== by 0x414D97: virtTestMain (testutils.c:696) ==2226== by 0x39CF01ECDC: (below main) (in /lib64/libc-2.12.so) ==2226== ==2226== LEAK SUMMARY: ==2226== definitely lost: 11 bytes in 3 blocks Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/network/bridge_driver.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 5d0d528..c9a8ccf 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -458,7 +458,10 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, { int r, ret = -1; int nbleases = 0; - int ii; + int ii, i, j; + char *recordPort = NULL; + char *recordPriority = NULL; + char *recordWeight = NULL; virNetworkIpDefPtr tmpipdef; /* @@ -513,7 +516,6 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, if (network->def->dns != NULL) { virNetworkDNSDefPtr dns = network->def->dns; - int i; for (i = 0; i < dns->ntxtrecords; i++) { char *record = NULL; @@ -530,10 +532,6 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, for (i = 0; i < dns->nsrvrecords; i++) { char *record = NULL; - char *recordPort = NULL; - char *recordPriority = NULL; - char *recordWeight = NULL; - if (dns->srvrecords[i].service && dns->srvrecords[i].protocol) { if (dns->srvrecords[i].port) { if (virAsprintf(&recordPort, "%d", dns->srvrecords[i].port) < 0) { @@ -671,6 +669,11 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, ret = 0; cleanup: + for (j = 0; j < i; j++) { + VIR_FREE(recordPort); + VIR_FREE(recordWeight); + VIR_FREE(recordPriority); + } return ret; } -- 1.7.1

4 5

[libvirt] [PATCHv3] simplify block of codes
by Alex.Jia＠redhat.com 01 Feb '12

01 Feb '12

From: Alex Jia <ajia(a)redhat.com> Using new function 'virTypedParameterArrayClear' to simplify block of codes. * daemon/remote.c, src/remote/remote_driver.c: simplify codes. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- daemon/remote.c | 6 +----- src/remote/remote_driver.c | 19 +++++-------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index cb8423a..e7d9b2f 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -848,11 +848,7 @@ remoteDeserializeTypedParameters(remote_typed_param *args_params_val, cleanup: if (rv < 0) { - int j; - for (j = 0; j < i; ++j) { - if (params[j].type == VIR_TYPED_PARAM_STRING) - VIR_FREE(params[j].value.s); - } + virTypedParameterArrayClear(params, i); VIR_FREE(params); } return params; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 61b96e9..031becd 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -46,6 +46,7 @@ #include "virfile.h" #include "command.h" #include "intprops.h" +#include "virtypedparam.h" #define VIR_FROM_THIS VIR_FROM_REMOTE @@ -1417,12 +1418,8 @@ remoteDeserializeTypedParameters(remote_typed_param *ret_params_val, rv = 0; cleanup: - if (rv < 0) { - int j; - for (j = 0; j < i; j++) - if (params[j].type == VIR_TYPED_PARAM_STRING) - VIR_FREE(params[j].value.s); - } + if (rv < 0) + virTypedParameterArrayClear(params, i); return rv; } @@ -2384,15 +2381,9 @@ static int remoteDomainGetCPUStats(virDomainPtr domain, rv = ret.nparams; cleanup: - if (rv < 0) { - int max = nparams * ncpus; - int i; + if (rv < 0) + virTypedParameterArrayClear(params, nparams * ncpus); - for (i = 0; i < max; i++) { - if (params[i].type == VIR_TYPED_PARAM_STRING) - VIR_FREE(params[i].value.s); - } - } xdr_free ((xdrproc_t) xdr_remote_domain_get_cpu_stats_ret, (char *) &ret); done: -- 1.7.1

2 1

[libvirt] [PATCHv2] schema: Relax schema for domain name
by Peter Krempa 31 Jan '12

31 Jan '12

The domain schema enforced restrictions on the domain name string that the code doesn't. This patch relaxes the check, leaving the restrictions on the driver or hypervisor. The only invalid character is a newline. --- docs/schemas/domaincommon.rng | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4fa968d..ecf3484 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3030,7 +3030,7 @@ </define> <define name="domainName"> <data type="string"> - <param name="pattern">[A-Za-z0-9_\.\+\-&:/]+</param> + <param name="pattern">[^\n]+</param> </data> </define> <define name="diskSerial"> -- 1.7.3.4

2 3

[libvirt] RFC API proposal: virDomainBlockRebase
by Eric Blake 31 Jan '12

31 Jan '12

Right now, the existing virDomainBlockPull API has a tough limitation - it is an all-or-none approach. In all my examples below, I'm starting from the following relationship, where '<-' means 'is a backing file of': template <- intermediate <- current virDomainBlockPull can only convert things in a forward direction, with the merge destination being the current image, resulting in: merge template and intermediate into current, creating: current Meanwhile, qemu is adding support for a partial block pull operation, still on the current image as the merge destination, but where you can now specify an optional argument to limit the pull to just the intermediate files and altering the current image to be backed by an ancestor file, as in: merge intermediate into current, creating: template <- current For 0.9.10, I'd like to add the following API: /** * virDomainBlockRebase: * @dom: pointer to domain object * @disk: path to the block device, or device shorthand * @base: new base image, or NULL for entire block pull * @bandwidth: (optional) specify copy bandwidth limit in Mbps * @flags: extra flags; not used yet, so callers should always pass 0 * * Populate a disk image with data from its backing image chain, and * setting the new backing image to @base, where base is the absolute * path of one of the backing images in the chain. If @base is NULL, * then this operation is identical to virDomainBlockPull(). Once all * data from its backing image chain has been pulled, the disk no * longer depends on those intermediate backing images. This function * pulls data for the entire device in the background. Progress of the * operation can be checked with virDomainGetBlockJobInfo() and * the operation can be aborted with virDomainBlockJobAbort(). When * finished, an asynchronous event is raised to indicate the final * status. * * The @disk, @bandwidth, and @flags parameters are handled as in * virDomainBlockPull(). * * Returns 0 if the operation has started, -1 on failure. */ int virDomainBlockRebase(virDomainPtr dom, const char *disk, const char *base, unsigned long bandwidth, unsigned int flags); Given that Adam has a pending patch to support a VIR_DOMAIN_BLOCK_PULL_ASYNC flag, this same flag would have to be supported in virDomainBlockRebase. I've also been chatting with Federico Simoncelli about how the above operation would work for VDSM purposes in doing a live block move, while preserving a common template base file: start with: vda: template <- current1 create a disk-only snapshot, with: tmpsnap = virDomainSnapshotCreateXML(dom, "<domainsnapshot>\n" " <disks>\n" " <disk name='vda'>\n" " <source>/path/to/current2</source>\n" " </disk>\n" " <disks>\n" "</domainsnapshot>", VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) where the xml calls out the destination file name, resulting in: vda: template <- current1 <- current2 perform the block rebase, with: virDomainBlockRebase(dom, "vda", "/path/to/template", VIR_DOMAIN_BLOCK_PULL_ASYNC) as well as waiting for the event (or polling status) to wait for completion, resulting in: vda: template <- current2 delete the disk-only snapshot metadata as no longer useful, with: virDomainSnapshotDelete(tmpsnap, VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY) At one point, I thought of creating a single libvirt API that performs all of those steps in one call; but right now, I'm not proposing that, because of the fact that qemu has no way to undo a snapshot. In other words, without an undo operation, if the snapshot phase succeeds but the block rebase phase fails, a single API would have to report failure even though the domain was altered, while the ideal scenario is that reporting failure means things were in the same state as before the API started. Beyond 0.9.10, there are some additional useful merge patterns that might be worth exposing. All of these operations are already possible on offline images, using qemu-img; but none of them are possible on live images using current qemu, which is why I'm thinking it is something for another day. I'm also hoping to someday enhance the set of virStorageVol APIs to make backing file manipulation of offline images easier. At any rate, the addition merge operations are: forward live merge with a non-current image as the merge destination, as in: merge template into intermediate, creating: intermediate <- current backward merge of a current image (that is, undoing a current snapshot): merge current into intermediate, creating: template <- intermediate and backward merge of a non-current image (that is, undoing an earlier snapshot, but by modifying the template rather than the current image): merge intermediate into base, creating: template <- current Backward merge of the current image seems like something easy to fit into my proposed API (add a new flag, maybe called VIR_DOMAIN_BLOCK_REBASE_BACKWARD). Manipulations of anything that does not involve the current image seems tougher, assuming qemu ever even reaches the point where it exposes those operations on live volumes - the user has to specify not one, but two backing file names. But even that could possibly be fit into my API, by adding a flag that states that the const char *backing argument is treated as an XML snippet describing the full details of the merge, with the XML listing which image is being merged to which destination, rather than as just the name of the backing file becoming the new base of the current image. Perhaps something like: virDomainBlockRebase(dom, block, "<rebase>\n" " <source>/path/to/intermediate</source>\n" " <dest>/path/to/template</dest>\n" "</rebase>", VIR_DOMAIN_BLOCK_REBASE_XML|VIR_DOMAIN_BLOCK_REBASE_BACKWARD) as a specification to take the contents of intermediate, merge those backwards into template, and as well as adjusting the rest of the backing file chain so that whatever used to be backed by intermediate is now backed by template. Or, if qemu ever gives us the ability to merge non-current images, we may decide at that time that it is worth a new API to expose those new complexities. Another thing I have been thinking about is virDomainSnapshotDelete. The above conversation talks about merging of a single disk, but a live disk snapshot operation can create backing file chains for multiple disks at once, all tracked by a snapshot. Additionally, the current code allows a snapshot delete of internal snapshots, but refuses to do anything useful with an external snapshot, because there is currently no way to specify if the snapshot is removed by merging the base into the new current, or by undoing the current and merging it backwards into the base. Alas, virDomainSnapshotDelete doesn't take any arguments for how to handle the situation, and use of a flag to make the decision would limit all disks to be handled in the same manner. So what I'm thinking is that when a snapshot is created (or redefined, using redefinition as the vehicle to add in the new XML), that the snapshot XML itself can record the preferred direction for undoing the snapshot; for example: <domainsnapshot> <disks> <disk name='/path/to/old_vda'> <source file='/path/to/new_vda'/> <on_delete merge='forward'/> </disk> <disk name='/path/to/old_vdb'> <source file='/path/to/new_vdb'/> <on_delete merge='backward'/> </disk> <disks> </domainsnapshot> then when virDomainSnapshotDelete is called on that snapshot, old_vda would be forward merged into new_vda, while new_vdb would be backward merged into old_vdb. Again, that's food for thought for post-0.9.10, and shouldn't get in the way of adding virDomainBlockRebase() now. -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 3

[libvirt] Qemu text monitor
by Shradha Shah 31 Jan '12

31 Jan '12

Hello All, I am currently working with libvirt on RHEL6.2. There are a few points I have noticed regarding the QEMU monitor. When I hotplug a device into the guest, the Qemu text monitor receives a device_add command and adds the device to its current devices list (I found this list via the qemu-monitor-command "info pci"). When I hot-unplug the device from the guest, the Qemu text monitor receives the device_del command but does not remove the device from its current devices list (qemu-monitor-command "info pci" still shows the device). The result of this is that the next hotplug of the device fails giving an error "Duplicate id". I was wondering if any of you have hit this issue before or know about any qemu-monitor bugs I may not be aware of? Many Thanks in advance, Regards, Shradha Shah

3 2

[libvirt] [PATCH v2 0/4] RFC: grant KVM guest rawio capability
by Taku Izumi 31 Jan '12

31 Jan '12

This is the new version of http://www.redhat.com/archives/libvir-list/2012-January/msg01312.html Thank you for reviewing, Danie, Paolo, and Eric. -- This patchset achieves #1 and #2 of the following tasks: > 1. rawio="yes|nmo" on the <disk> element somewhere > 2. Give the QEMU process CAP_SYS_RAWIO > 3. Use the devices cgroup to specify which individual disks > can use rawio. In short, if you specify the following XML: <disk type='block' device='lun' rawio='yes'> the domain will be granted CAP_SYS_RAWIO. # virsh start VM # cat /proc/<VM's PID>/status ... CapInh: 0000000000000000 CapPrm: fffffffc00020000 CapEff: fffffffc00020000 CapBnd: fffffffc00020000 ... *[PATCH v2 1/4] conf: add rawio attribute to disk element of domain XML *[PATCH v2 2/4] util: add functions to keep capabilities *[PATCH v2 3/4] util: extend virExecWithHook() *[PATCH v2 4/4] qemu: make qemu processes to retain rawio capability - Best regards, Taku Izumi

4 15

[libvirt] [PATCH] qemu: never send SIGKILL to qemu process unless specifically requested
by Laine Stump 31 Jan '12

31 Jan '12

When libvirt is shutting down the qemu process, it first sends SIGTERM, then waits for 1.6 seconds and, if it sees the process still there, sends a SIGKILL. There have been reports that this behavior can lead to data loss because the guest running in qemu doesn't have time to flush it's disk cache buffers before it's unceremoniously whacked. One suggestion on how to solve that problem was to remove SIGKILL from the normal virDomainDestroyFlags, but still provide the ability to kill qemu with SIGKILL by using a new flag to virDomainDestroyFlags. This patch is a quick attempt at that in order to start a conversation on the topic. So what are your opinions? Is this the right way to solve the problem? Any better ideas? --- include/libvirt/libvirt.h.in | 12 ++++++------ src/qemu/qemu_driver.c | 7 +++++-- src/qemu/qemu_process.c | 40 ++++++++++++++++++++++------------------ src/qemu/qemu_process.h | 8 +++++++- 4 files changed, 40 insertions(+), 27 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index e99cd00..f9ac865 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1182,12 +1182,6 @@ virConnectPtr virDomainGetConnect (virDomainPtr domain); * Domain creation and destruction */ - -/* - * typedef enum { - * } virDomainDestroyFlagsValues; - */ - virDomainPtr virDomainCreateXML (virConnectPtr conn, const char *xmlDesc, unsigned int flags); @@ -1222,6 +1216,12 @@ int virDomainReset (virDomainPtr domain, unsigned int flags); int virDomainDestroy (virDomainPtr domain); + +typedef enum { + VIR_DOMAIN_DESTROY_NONE = 0, /* Default behavior */ + VIR_DOMAIN_DESTROY_IMMEDIATE = 1 << 0, /* immediately kill, could lead to data loss!! */ +} virDomainDestroyFlagsValues; + int virDomainDestroyFlags (virDomainPtr domain, unsigned int flags); int virDomainRef (virDomainPtr domain); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ab69dca..0e80241 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1754,7 +1754,7 @@ qemuDomainDestroyFlags(virDomainPtr dom, virDomainEventPtr event = NULL; qemuDomainObjPrivatePtr priv; - virCheckFlags(0, -1); + virCheckFlags(VIR_DOMAIN_DESTROY_IMMEDIATE, -1); qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -1775,7 +1775,10 @@ qemuDomainDestroyFlags(virDomainPtr dom, * can kill the process even if a job is active. Killing * it now means the job will be released */ - qemuProcessKill(vm, false); + if (flags & VIR_DOMAIN_DESTROY_IMMEDIATE) + qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_IMMEDIATELY); + else + qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_FORCEFULLY); /* We need to prevent monitor EOF callback from doing our work (and sending * misleading events) while the vm is unlocked inside BeginJob API diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d22020b..efbe46c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -586,7 +586,7 @@ endjob: cleanup: if (vm) { if (ret == -1) - qemuProcessKill(vm, false); + qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_FORCEFULLY); if (virDomainObjUnref(vm) > 0) virDomainObjUnlock(vm); } @@ -611,12 +611,12 @@ qemuProcessShutdownOrReboot(struct qemud_driver *driver, qemuProcessFakeReboot, vm) < 0) { VIR_ERROR(_("Failed to create reboot thread, killing domain")); - qemuProcessKill(vm, true); + qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_GRACEFULLY); /* Safe to ignore value since ref count was incremented above */ ignore_value(virDomainObjUnref(vm)); } } else { - qemuProcessKill(vm, true); + qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_GRACEFULLY); } } @@ -3524,30 +3524,34 @@ cleanup: } -void qemuProcessKill(virDomainObjPtr vm, bool gracefully) +void qemuProcessKill(virDomainObjPtr vm, unsigned int killMode) { int i; - VIR_DEBUG("vm=%s pid=%d gracefully=%d", - vm->def->name, vm->pid, gracefully); + VIR_DEBUG("vm=%s pid=%d killMode=%d", + vm->def->name, vm->pid, killMode); if (!virDomainObjIsActive(vm)) { VIR_DEBUG("VM '%s' not active", vm->def->name); return; } - /* This loop sends SIGTERM, then waits a few iterations - * (1.6 seconds) to see if it dies. If still alive then - * it does SIGKILL, and waits a few more iterations (1.6 - * seconds more) to confirm that it has really gone. + /* This loop sends SIGTERM (or SIGKILL if killMode is + * VIR_QEMU_KILL_MODE_IMMEDIATELY), then waits a few iterations + * (3.2 seconds) to see if it dies. Note that the IMMEDIATELY mode + * will very likely result in lost data in the guest, so it should + * only be used if the guest is hung and can't be destroyed in any + * other manner. */ - for (i = 0 ; i < 15 ; i++) { + for (i = 0 ; i < 16 ; i++) { int signum; - if (i == 0) - signum = SIGTERM; - else if (i == 8) - signum = SIGKILL; - else + if (i == 0) { + if (killMode == VIR_QEMU_PROCESS_KILL_IMMEDIATELY) + signum = SIGKILL; + else + signum = SIGTERM; + } else { signum = 0; /* Just check for existence */ + } if (virKillProcess(vm->pid, signum) < 0) { if (errno != ESRCH) { @@ -3558,7 +3562,7 @@ void qemuProcessKill(virDomainObjPtr vm, bool gracefully) break; } - if (i == 0 && gracefully) + if (i == 0 && (killMode == VIR_QEMU_PROCESS_KILL_GRACEFULLY)) break; usleep(200 * 1000); @@ -3651,7 +3655,7 @@ void qemuProcessStop(struct qemud_driver *driver, } /* shut it off for sure */ - qemuProcessKill(vm, false); + qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_FORCEFULLY); /* Stop autodestroy in case guest is restarted */ qemuProcessAutoDestroyRemove(driver, vm); diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 062d79e..755d4a6 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -68,7 +68,13 @@ int qemuProcessAttach(virConnectPtr conn, virDomainChrSourceDefPtr monConfig, bool monJSON); -void qemuProcessKill(virDomainObjPtr vm, bool gracefully); +typedef enum { + VIR_QEMU_PROCESS_KILL_GRACEFULLY = 0, + VIR_QEMU_PROCESS_KILL_FORCEFULLY = 1, + VIR_QEMU_PROCESS_KILL_IMMEDIATELY = 2, +} virQemuProcessKillMode; + +void qemuProcessKill(virDomainObjPtr vm, unsigned int killMode); int qemuProcessAutoDestroyInit(struct qemud_driver *driver); void qemuProcessAutoDestroyRun(struct qemud_driver *driver, -- 1.7.7.5

4 8

[libvirt] [PATCH v2 0/3] Add virDomainGetDiskErrors API
by Jiri Denemark 31 Jan '12

31 Jan '12

We already provide ways to detect when a domain has been paused as a result of I/O error, but there was no way of getting the exact error or even the device that experienced it. This new API may be used for both. Changes in version 2: - the API is now called virDomainGetDiskErrors - it returns a list (allocated by caller) of disks with errors instead so that users don't have to call it multiple times to get all errors - there's no python API yet since it can't be autogenerated; I'll send a patch for it tomorrow Jiri Denemark (3): virDomainGetDiskErrors public API and remote protocol qemu: Implement virDomainGetDiskErrors virsh: Implement domblkerror command daemon/remote.c | 40 +++++++++++++++++++ include/libvirt/libvirt.h.in | 32 +++++++++++++++ python/generator.py | 3 +- src/driver.h | 7 +++ src/libvirt.c | 52 ++++++++++++++++++++++++ src/libvirt_public.syms | 1 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 83 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 40 +++++++++++++++++++ src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 8 ++++ src/qemu/qemu_monitor_text.c | 15 +++++++ src/remote/remote_driver.c | 34 ++++++++++++++++ src/remote/remote_protocol.x | 22 ++++++++++- src/remote_protocol-structs | 16 +++++++ src/rpc/gendispatch.pl | 47 ++++++++++++++++++++++ tools/virsh.c | 89 ++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 7 +++ 18 files changed, 496 insertions(+), 2 deletions(-) -- 1.7.8.4

2 9

[libvirt] [PATCH] XenXs: Update documentation
by Philipp Hahn 31 Jan '12

31 Jan '12

Fix several references to now renamed functions and parameters when the functions were moved from src/xen/ to src/xenxs/. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/xenxs/xen_sxpr.c | 222 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 185 insertions(+), 37 deletions(-) diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index 04ba5aa..ac15853 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -37,7 +37,7 @@ #include "xenxs_private.h" #include "xen_sxpr.h" -/* Get a domain id from a sexpr string */ +/* Get a domain id from a S-expression string */ int xenGetDomIdFromSxprString(const char *sexpr, int xendConfigVersion) { struct sexpr *root = string2sexpr(sexpr); @@ -50,7 +50,7 @@ int xenGetDomIdFromSxprString(const char *sexpr, int xendConfigVersion) return id; } -/* Get a domain id from a sexpr */ +/* Get a domain id from a S-expression */ int xenGetDomIdFromSxpr(const struct sexpr *root, int xendConfigVersion) { int id = -1; @@ -66,16 +66,15 @@ int xenGetDomIdFromSxpr(const struct sexpr *root, int xendConfigVersion) /***************************************************************** ****** - ****** Parsing of SEXPR into virDomainDef objects + ****** Parsing of S-Expression into virDomainDef objects ****** *****************************************************************/ /** - * xenParseSxprOS + * xenParseSxprOS: * @node: the root of the parsed S-Expression * @def: the domain config - * @hvm: true or 1 if no contains HVM S-Expression - * @bootloader: true or 1 if a bootloader is defined + * @hvm: true or 1 if node contains HVM S-Expression * * Parse the xend sexp for description of os and append it to buf. * @@ -166,6 +165,16 @@ no_memory: return -1; } + +/** + * xenParseSxprChar: + * @value: A string describing a character device. + * @tty: the console pty path + * + * Parse the xend S-expression for description of a character device. + * + * Returns a character device object or NULL in case of failure. + */ virDomainChrDefPtr xenParseSxprChar(const char *value, const char *tty) @@ -316,13 +325,15 @@ error: return NULL; } + /** - * xend_parse_sexp_desc_disks - * @conn: connection - * @root: root sexpr + * xenParseSxprDisks: + * @def: the domain config + * @root: root S-expression + * @hvm: true or 1 if node contains HVM S-Expression * @xendConfigVersion: version of xend * - * This parses out block devices from the domain sexpr + * This parses out block devices from the domain S-expression * * Returns 0 if successful or -1 if failed. */ @@ -518,6 +529,15 @@ error: } +/** + * xenParseSxprNets: + * @def: the domain config + * @root: root S-expression + * + * This parses out network devices from the domain S-expression + * + * Returns 0 if successful or -1 if failed. + */ static int xenParseSxprNets(virDomainDefPtr def, const struct sexpr *root) @@ -614,6 +634,15 @@ cleanup: } +/** + * xenParseSxprSound: + * @def: the domain config + * @str: comma separated list of sound models + * + * This parses out sound devices from the domain S-expression + * + * Returns 0 if successful or -1 if failed. + */ int xenParseSxprSound(virDomainDefPtr def, const char *str) @@ -692,6 +721,15 @@ error: } +/** + * xenParseSxprUSB: + * @def: the domain config + * @root: root S-expression + * + * This parses out USB devices from the domain S-expression + * + * Returns 0 if successful or -1 if failed. + */ static int xenParseSxprUSB(virDomainDefPtr def, const struct sexpr *root) @@ -733,6 +771,19 @@ no_memory: return -1; } + +/* + * xenParseSxprGraphicsOld: + * @def: the domain config + * @root: root S-expression + * @hvm: true or 1 if root contains HVM S-Expression + * @xendConfigVersion: version of xend + * @vncport: VNC port number + * + * This parses out VNC devices from the domain S-expression + * + * Returns 0 if successful or -1 if failed. + */ static int xenParseSxprGraphicsOld(virDomainDefPtr def, const struct sexpr *root, @@ -821,6 +872,16 @@ error: } +/* + * xenParseSxprGraphicsNew: + * @def: the domain config + * @root: root S-expression + * @vncport: VNC port number + * + * This parses out VNC devices from the domain S-expression + * + * Returns 0 if successful or -1 if failed. + */ static int xenParseSxprGraphicsNew(virDomainDefPtr def, const struct sexpr *root, int vncport) @@ -918,11 +979,13 @@ error: return -1; } + /** - * xenParseSxprPCI + * xenParseSxprPCI: + * @def: the domain config * @root: root sexpr * - * This parses out block devices from the domain sexpr + * This parses out PCI devices from the domain sexpr * * Returns 0 if successful or -1 if failed. */ @@ -1044,16 +1107,17 @@ error: /** * xenParseSxpr: - * @conn: the connection associated with the XML * @root: the root of the parsed S-Expression * @xendConfigVersion: version of xend * @cpus: set of cpus the domain may be pinned to + * @tty: the console pty path + * @vncport: VNC port number * - * Parse the xend sexp description and turn it into the XML format similar - * to the one unsed for creation. + * Parse the xend S-expression description and turn it into a virDomainDefPtr + * representing these settings as closeley as is practical. * - * Returns the 0 terminated XML string or NULL in case of error. - * the caller must free() the returned value. + * Returns the domain config or NULL in case of error. + * The caller must free() the returned value. */ virDomainDefPtr xenParseSxpr(const struct sexpr *root, @@ -1424,6 +1488,20 @@ error: return NULL; } + +/** + * xenParseSxprString: + * @sexpr: the root of the parsed S-Expression + * @xendConfigVersion: version of xend + * @tty: the console pty path + * @vncport: VNC port number + * + * Parse the xend S-expression description and turn it into a virDomainDefPtr + * representing these settings as closeley as is practical. + * + * Returns the domain config or NULL in case of error. + * The caller must free() the returned value. + */ virDomainDefPtr xenParseSxprString(const char *sexpr, int xendConfigVersion, char *tty, int vncport) @@ -1449,15 +1527,12 @@ xenParseSxprString(const char *sexpr, /** - * virtDomainParseXMLGraphicsDescVFB: - * @conn: pointer to the hypervisor connection - * @node: node containing graphics description - * @buf: a buffer for the result S-Expr + * xenFormatSxprGraphicsNew: + * @def: the domain config + * @buf: a buffer for the result S-expression * - * Parse the graphics part of the XML description and add it to the S-Expr - * in buf. This is a temporary interface as the S-Expr interface will be - * replaced by XML-RPC in the future. However the XML format should stay - * valid over time. + * Convert the graphics part of the domain description into a S-expression + * in buf. (HVM > 3.0.4 or PV > 3.0.3) * * Returns 0 in case of success, -1 in case of error */ @@ -1508,6 +1583,17 @@ xenFormatSxprGraphicsNew(virDomainGraphicsDefPtr def, } +/** + * xenFormatSxprGraphicsOld: + * @def: the domain config + * @buf: a buffer for the result S-expression + * @xendConfigVersion: version of xend + * + * Convert the graphics part of the domain description into a S-expression + * in buf. (HVM <= 3.0.4 or PV <= 3.0.3) + * + * Returns 0 in case of success, -1 in case of error + */ static int xenFormatSxprGraphicsOld(virDomainGraphicsDefPtr def, virBufferPtr buf, @@ -1553,6 +1639,17 @@ xenFormatSxprGraphicsOld(virDomainGraphicsDefPtr def, return 0; } + +/** + * xenFormatSxprChr: + * @def: the domain config + * @buf: a buffer for the result S-expression + * + * Convert the character deivce part of the domain config into a S-expression + * in buf. + * + * Returns 0 in case of success, -1 in case of error + */ int xenFormatSxprChr(virDomainChrDefPtr def, virBufferPtr buf) @@ -1631,15 +1728,14 @@ xenFormatSxprChr(virDomainChrDefPtr def, /** - * virDomainParseXMLDiskDesc: - * @node: node containing disk description - * @buf: a buffer for the result S-Expr + * xenFormatSxprDisk: + * @node: node containing the disk description + * @buf: a buffer for the result S-expression + * @hvm: true or 1 if domain is HVM * @xendConfigVersion: xend configuration file format + * @isAttach: create expression for device attach (1). * - * Parse the one disk in the XML description and add it to the S-Expr in buf - * This is a temporary interface as the S-Expr interface - * will be replaced by XML-RPC in the future. However the XML format should - * stay valid over time. + * Convert the disk device part of the domain config into a S-expresssion in buf. * * Returns 0 in case of success, -1 in case of error. */ @@ -1757,12 +1853,15 @@ xenFormatSxprDisk(virDomainDiskDefPtr def, } /** - * xenFormatSxprNet - * @node: node containing the interface description - * @buf: a buffer for the result S-Expr + * xenFormatSxprNet: + * @conn: connection + * @def: the domain config + * @buf: a buffer for the result S-expression + * @hvm: true or 1 if domain is HVM * @xendConfigVersion: xend configuration file format + * @isAttach: create expression for device attach (1). * - * Parse the one interface the XML description and add it to the S-Expr in buf + * Convert the interface description of the domain config into a S-expression in buf. * This is a temporary interface as the S-Expr interface * will be replaced by XML-RPC in the future. However the XML format should * stay valid over time. @@ -1893,6 +1992,15 @@ xenFormatSxprNet(virConnectPtr conn, } +/** + * xenFormatSxprPCI: + * @def: the device config + * @buf: a buffer for the result S-expression + * + * Convert a single PCI device part of the domain config into a S-expresssion in buf. + * + * Returns 0 in case of success, -1 in case of error. + */ static void xenFormatSxprPCI(virDomainHostdevDefPtr def, virBufferPtr buf) @@ -1904,6 +2012,17 @@ xenFormatSxprPCI(virDomainHostdevDefPtr def, def->source.subsys.u.pci.function); } + +/** + * xenFormatSxprOnePCI: + * @def: the device config + * @buf: a buffer for the result S-expression + * @detach: create expression for device detach (1). + * + * Convert a single PCI device part of the domain config into a S-expresssion in buf. + * + * Returns 0 in case of success, -1 in case of error. + */ int xenFormatSxprOnePCI(virDomainHostdevDefPtr def, virBufferPtr buf, @@ -1926,6 +2045,16 @@ xenFormatSxprOnePCI(virDomainHostdevDefPtr def, return 0; } + +/** + * xenFormatSxprAllPCI: + * @def: the domain config + * @buf: a buffer for the result S-expression + * + * Convert all PCI device parts of the domain config into a S-expresssion in buf. + * + * Returns 0 in case of success, -1 in case of error. + */ static int xenFormatSxprAllPCI(virDomainDefPtr def, virBufferPtr buf) @@ -1973,6 +2102,16 @@ xenFormatSxprAllPCI(virDomainDefPtr def, return 0; } + +/** + * xenFormatSxprSound: + * @def: the domain config + * @buf: a buffer for the result S-expression + * + * Convert all sound device parts of the domain config into S-expression in buf. + * + * Returns 0 if successful or -1 if failed. + */ int xenFormatSxprSound(virDomainDefPtr def, virBufferPtr buf) @@ -2001,6 +2140,15 @@ xenFormatSxprSound(virDomainDefPtr def, } +/** + * xenFormatSxprInput: + * @input: the input config + * @buf: a buffer for the result S-expression + * + * Convert all input device parts of the domain config into S-expression in buf. + * + * Returns 0 if successful or -1 if failed. + */ static int xenFormatSxprInput(virDomainInputDefPtr input, virBufferPtr buf) @@ -2033,7 +2181,7 @@ verify(MAX_VIRT_CPUS <= sizeof(1UL) * CHAR_BIT); * @def: domain config definition * @xendConfigVersion: xend configuration file format * - * Generate an SEXPR representing the domain configuration. + * Generate an S-expression representing the domain configuration. * * Returns the 0 terminated S-Expr string or NULL in case of error. * the caller must free() the returned value. -- 1.7.1

2 4

[libvirt] [PATCH] tests: virnettlscontexttest needs gnutls-2.6.0
by Philipp Hahn 31 Jan '12

31 Jan '12

virnettlscontexttest uses gnutls_x509_crt_set_subject_alt_name() and GNUTLS_FSAN_APPEND, which - according to <http://www.gnu.org/software/gnutls/manual/gnutls.html> - are only available since 2.6.0. Since libvirt still works fine with gnutls-1.0.25 from RHEL5, only enable the test when the version of GNUTLS is at least 2.6.0. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- tests/virnettlscontexttest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 51f75b4..6dd42d4 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -36,7 +36,7 @@ #include "virsocketaddr.h" #include "gnutls_1_0_compat.h" -#if !defined WIN32 && HAVE_LIBTASN1_H && !defined GNUTLS_1_0_COMPAT +#if !defined WIN32 && HAVE_LIBTASN1_H && !defined GNUTLS_1_0_COMPAT && LIBGNUTLS_VERSION_NUMBER > 0x020600 # include <libtasn1.h> # include "rpc/virnettlscontext.h" -- 1.7.1

3 4

[libvirt] [[libvirt-glib PATCHv3] 1/3] Add proper error reporting to gvir_storage_vol_get_path
by Christophe Fergeau 31 Jan '12

31 Jan '12

gvir_storage_vol_get_name currently call g_error when an error occurs. Since g_error trigger a coredump, calling it in a library is harmful. Replace this with proper GError error reporting. --- libvirt-gobject/libvirt-gobject-storage-vol.c | 7 +++++-- libvirt-gobject/libvirt-gobject-storage-vol.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 5b18877..5e83e1b 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -184,13 +184,16 @@ const gchar *gvir_storage_vol_get_name(GVirStorageVol *vol) return name; } -const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol) +const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol, GError **error) { GVirStorageVolPrivate *priv = vol->priv; const char *path; if (!(path = virStorageVolGetPath(priv->handle))) { - g_error("Failed to get storage_vol path on %p", priv->handle); + gvir_set_error(error, GVIR_STORAGE_VOL_ERROR, 0, + "Failed to get storage_vol path on %p", + priv->handle); + return NULL; } return path; diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.h b/libvirt-gobject/libvirt-gobject-storage-vol.h index db63865..25f683a 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.h +++ b/libvirt-gobject/libvirt-gobject-storage-vol.h @@ -78,7 +78,7 @@ GType gvir_storage_vol_info_get_type(void); GType gvir_storage_vol_handle_get_type(void); const gchar *gvir_storage_vol_get_name(GVirStorageVol *vol); -const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol); +const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol, GError **error); gboolean gvir_storage_vol_delete(GVirStorageVol *vol, guint flags, -- 1.7.7.6

2 5

[libvirt] RFC: setting mac address on network devices being assigned to a guest via PCI passthrough (<hostdev>)
by Laine Stump 31 Jan '12

31 Jan '12

To refresh everyone's memory, the origin of the problem I'm trying to solve here is that the VFs of an SRIOV-capable ethernet card are given new random MAC addresses each time the card is initialized. If those VFs are then passed-through to a guest using the existing <hostdev> config, the guest will see a new MAC address each time the host is restarted, and will thus believe that a new ethernet card has been installed. This can result in anything from a dialog claiming that the guest has connected to a new network (MS products) to a new network device name showing up (Linux - "hmm, eth0 was unplugged, but here's this new device. Let's call it "eth1"!) Several months ago I sent out some mail proposing a scheme for automatically allocating network devices from a pool to be assigned to guests via PCI passthrough: https://www.redhat.com/archives/libvir-list/2011-August/msg00937.html My idea was to have a new <network> forward mode combined with guest <interface> definitions that would end up auto-generating a transient <hostdev> entry in the guest's config (and setting the VF's mac address in the process). Dan Berrange pointed out in that thread that we really do need to have a persistent <hostdev> entry for these devices in the domain xml, if for no other reason than to guarantee that the same guest-side PCI address is always used (thus preventing surprises in the guest, such as re-activation demands from Microsoft OSes). (There were other reasons, but that one was the real "hard stop" for me.) I've come back to this problem, and have decided that, while having the actual host device auto-allocated at runtime would be nice, first implementing a less ambitious solution that uses a hand-picked device would not preclude adding the more complicated/useful functionality later. So, here's a new simpler proposal. Step 1 ------ In the end, the solution will be that the VF's auto-generated random MAC address should be replaced with a fixed MAC address supplied by libvirt prior to assigning the VF to the guest. As a first step to satisfy this basic requirement, I'm figuring to just extend the <hostdev> xml in this way: |<hostdev mode='subsystem' type='pci' managed='yes'> |<source> |<address bus='0x06' slot='0x02' function='0x0'/> |</source> |<mac address='11:22:33:44:55:66"/> |</hostdev> When libvirt sees <mac address...> in the hostdev at device attach time, it would first verify that the device is a network device (if not, it would log an error and fail the operation). If it is a network device, the pci address would be converted into a network device name, and that device would have its MAC address set to the configured value, and then the attach would proceed. My main questions here are: 1) Is this the right place for the new element? Or should it go into <source>? 2) Should we bother trying to save the original MAC address to restore when the device is released? (I guess that might be important if, for example, the guest config was changed to use a different device but same MAC address - you could end up with two devices having the same MAC address). 3) I've seen requests from 2 places to do host-side virtual port association (i.e. vepa / 802.1Qb[gh]). Would it be feasible to do that association with the device after setting MAC address and before assigning it to the guest? (and likewise for the inverse) Or would the act of PCI assignment screw that up somehow? (one of the messages in the earlier thread says something about the device initialization by the guest un-doing necessary setup) (if it would work, a <virtualport> could just be added along with <mac address>). Beyond those 3 questons, this all seems rather uncontroversial, so I'll start coding something up right away (and modify as necessary after discussion). Step 2 ------ Once the basic functionality is in place, a further step would be one just to simplify the admins job - we could do this by replacing this config: | <source> | <address bus='x' slot='y' function='z'/> | </source> with: | <source> | <address netdev='eth22'/> | </source> (or possibly it could be a separate element within <source>, e.g. "<network dev='eth22'/>") As long as the domain isn't running, the config would remain like this. The first time the device was attached, the name in netdev would be resolved to a pci address (or failed if the given netdev wasn't a PCI device); and the config auto-filled as follows: | <source> | <address bus='x' slot='y' function='z' netdev='eth22'/> | </source> On subsequent attaches (i.e. when both netdev and a pci address are present) the netdev would again be resolved and compared to the pci address to make sure they still agree; if not, the operation would fail. This would satisfy management applications' desire to see the pci address info of all devices assigned to guests, while retaining the original config info (and also lead quite nicely into step 3...). Step 3 ------ To further simplify configuration, it would be very nice if the choice of network device could be done automatically. Since libvirt's networks already have the concept of a pool of devices (and also of portgroups which can be used to set <virtualport> parameters), it kind of makes to sense to use that. In this case, a network would be defined something like this: | <network> | <name>passthrough-net</name> | <forward dev='eth20' mode='hostdev'>  | <interface dev='eth20'/> | <interface dev='eth21'/> | <interface dev='eth22'/> | .. | </forward> | </network> (it could also contain a virtualport definition and/or portgroups containing virtualport definitions. Obviously, we would have to prohibit <bandwidth> elements (and several other things) in the definitions>) Then, in lieu of a pci address or network device name (as "netdev"), the <hostdev>'s <source> would have a reference to the network: |<hostdev mode='subsystem' type='pci' managed='yes'> |<source> |<address network='passthrough-net'/> |</source> |<mac address='11:22:33:44:55:66"/> |</hostdev> (or, again, maybe use the separate <network> element: "<network name='passthrough-net'/>) At attach time, the pool of devices in passthrough-net would be searched for a free device, and if found, that device would have its MAC address changed and be assigned to the guest. In this case, the live XML would be updated with the pci address information, but when the guest was destroyed, the device would be handed back to the pool, and the pci address info once again removed from the config. Step 2 & 3 probably won't be implemented right away, but I thought I should toss the ideas out there in case they lead to something else that would require a change in step 1.

3 11

[libvirt] [[libvirt-glib PATCHv2]] API to get/set custom metadata from/to domain config
by Christophe Fergeau 31 Jan '12

31 Jan '12

Based on a patch from Zeeshan Ali (Khattak) <zeeshanak(a)gnome.org> --- libvirt-gconfig/libvirt-gconfig-domain.c | 60 +++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain.h | 7 +++ libvirt-gconfig/libvirt-gconfig-helpers-private.h | 1 + libvirt-gconfig/libvirt-gconfig-helpers.c | 23 ++++++++- libvirt-gconfig/libvirt-gconfig-object-private.h | 3 + libvirt-gconfig/libvirt-gconfig-object.c | 20 +++++++ libvirt-gconfig/libvirt-gconfig.sym | 2 + 7 files changed, 115 insertions(+), 1 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 61af625..606f5a4 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -449,3 +449,63 @@ GList *gvir_config_domain_get_devices(GVirConfigDomain *domain) return data.devices; } + +gboolean gvir_config_domain_set_custom_xml(GVirConfigDomain *domain, + const gchar *xml, + const gchar *ns, + const gchar *ns_uri, + GError **error) +{ + GVirConfigObject *metadata; + GVirConfigObject *custom_xml; + + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN(domain), FALSE); + g_return_val_if_fail(xml != NULL, FALSE); + g_return_val_if_fail(error == NULL || *error == NULL, FALSE); + + metadata = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(domain), "metadata"); + + custom_xml = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_OBJECT, NULL, NULL, xml, error); + if (error != NULL && *error != NULL) + return FALSE; + + gvir_config_object_set_namespace(custom_xml, ns, ns_uri); + + gvir_config_object_attach_replace(metadata, custom_xml); + + return TRUE; +} + +struct LookupNamespacedNodeData { + const char *ns_uri; + xmlNodePtr node; +}; + +static gboolean lookup_namespaced_node(xmlNodePtr node, gpointer opaque) +{ + struct LookupNamespacedNodeData* data = opaque; + + if (node->ns == NULL) + return TRUE; + + if (g_strcmp0((char *)node->ns->href, data->ns_uri) == 0) { + data->node = node; + return FALSE; + } + + return TRUE; +} + +gchar *gvir_config_domain_get_custom_xml(GVirConfigDomain *domain, + const gchar *ns_uri) +{ + struct LookupNamespacedNodeData data = { NULL, NULL }; + + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN(domain), NULL); + g_return_val_if_fail(ns_uri != NULL, NULL); + + data.ns_uri = ns_uri; + gvir_config_object_foreach_child(GVIR_CONFIG_OBJECT(domain), "metadata", + lookup_namespaced_node, &data); + return gvir_config_xml_node_to_string(data.node); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain.h b/libvirt-gconfig/libvirt-gconfig-domain.h index 6cdaec9..769d2f0 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.h +++ b/libvirt-gconfig/libvirt-gconfig-domain.h @@ -126,6 +126,13 @@ GList *gvir_config_domain_get_devices(GVirConfigDomain *domain); void gvir_config_domain_set_lifecycle(GVirConfigDomain *domain, GVirConfigDomainLifecycleEvent event, GVirConfigDomainLifecycleAction action); +gboolean gvir_config_domain_set_custom_xml(GVirConfigDomain *domain, + const gchar *xml, + const gchar *ns, + const gchar *ns_uri, + GError **error); +gchar *gvir_config_domain_get_custom_xml(GVirConfigDomain *domain, + const gchar *ns_uri); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig-helpers-private.h b/libvirt-gconfig/libvirt-gconfig-helpers-private.h index 96ec02e..514aeb0 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers-private.h +++ b/libvirt-gconfig/libvirt-gconfig-helpers-private.h @@ -56,6 +56,7 @@ char *gvir_config_xml_get_child_element_content_glib (xmlNode *node, const char *child_name); xmlChar *gvir_config_xml_get_attribute_content(xmlNodePtr node, const char *attr_name); +char *gvir_config_xml_node_to_string(xmlNodePtr node); char *gvir_config_xml_get_attribute_content_glib(xmlNodePtr node, const char *attr_name); const char *gvir_config_genum_get_nick (GType enum_type, gint value); diff --git a/libvirt-gconfig/libvirt-gconfig-helpers.c b/libvirt-gconfig/libvirt-gconfig-helpers.c index fecf3eb..a324d0e 100644 --- a/libvirt-gconfig/libvirt-gconfig-helpers.c +++ b/libvirt-gconfig/libvirt-gconfig-helpers.c @@ -148,7 +148,8 @@ gvir_config_xml_parse(const char *xml, const char *root_node, GError **err) "Unable to parse configuration"); return NULL; } - if ((!doc->children) || (strcmp((char *)doc->children->name, root_node) != 0)) { + if ((!doc->children) || + (g_strcmp0((char *)doc->children->name, root_node) != 0)) { g_set_error(err, GVIR_CONFIG_OBJECT_ERROR, 0, @@ -307,3 +308,23 @@ gvir_config_genum_get_value (GType enum_type, const char *nick, g_return_val_if_reached(default_value); } + +G_GNUC_INTERNAL char * +gvir_config_xml_node_to_string(xmlNodePtr node) +{ + xmlBufferPtr xmlbuf; + char *xml; + + if (node == NULL) + return NULL; + + xmlbuf = xmlBufferCreate(); + if (xmlNodeDump(xmlbuf, node->doc, node, 0, 0) < 0) + return NULL; + else + xml = g_strndup((gchar *)xmlBufferContent(xmlbuf), xmlBufferLength(xmlbuf)); + + xmlBufferFree(xmlbuf); + + return xml; +} diff --git a/libvirt-gconfig/libvirt-gconfig-object-private.h b/libvirt-gconfig/libvirt-gconfig-object-private.h index 781e1a3..7e000f5 100644 --- a/libvirt-gconfig/libvirt-gconfig-object-private.h +++ b/libvirt-gconfig/libvirt-gconfig-object-private.h @@ -90,6 +90,9 @@ void gvir_config_object_foreach_child(GVirConfigObject *object, const char *parent_name, GVirConfigXmlNodeIterator iter_func, gpointer opaque); +gboolean gvir_config_object_set_namespace(GVirConfigObject *object, + const char *ns, + const char *ns_uri); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index 2e28208..f664b12 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -846,3 +846,23 @@ gvir_config_object_remove_attribute(GVirConfigObject *object, status = xmlUnsetProp(object->priv->node, (xmlChar *)attr_name); } while (status == 0); } + +G_GNUC_INTERNAL gboolean +gvir_config_object_set_namespace(GVirConfigObject *object, const char *ns, + const char *ns_uri) +{ + xmlNsPtr namespace; + + g_return_val_if_fail(GVIR_CONFIG_IS_OBJECT(object), FALSE); + g_return_val_if_fail(ns != NULL, FALSE); + g_return_val_if_fail(ns_uri != NULL, FALSE); + + namespace = xmlNewNs(object->priv->node, + (xmlChar *)ns_uri, (xmlChar *)ns); + if (namespace == NULL) + return FALSE; + + xmlSetNs(object->priv->node, namespace); + + return TRUE; +} diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 88aef57..ab2c7bf 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -14,6 +14,8 @@ LIBVIRT_GCONFIG_0.0.4 { gvir_config_domain_new; gvir_config_domain_new_from_xml; gvir_config_domain_set_clock; + gvir_config_domain_set_custom_xml; + gvir_config_domain_get_custom_xml; gvir_config_domain_get_description; gvir_config_domain_set_description; gvir_config_domain_get_devices; -- 1.7.7.6

2 2

[libvirt] [[libvirt-glib PATCHv2] 1/4] Add proper error reporting to GVirStorageVol getters
by Christophe Fergeau 31 Jan '12

31 Jan '12

gvir_storage_vol_get_name and gvir_storage_vol_get_path currently call g_error when an error occurs. Since g_error trigger a coredump, calling it in a library is harmful. Replace this with proper GError error reporting. --- libvirt-gobject/libvirt-gobject-storage-pool.c | 10 +++++++--- libvirt-gobject/libvirt-gobject-storage-vol.c | 14 ++++++++++---- libvirt-gobject/libvirt-gobject-storage-vol.h | 4 ++-- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index bf25641..a88699e 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -528,6 +528,7 @@ GVirStorageVol *gvir_storage_pool_create_volume const gchar *xml; virStorageVolPtr handle; GVirStoragePoolPrivate *priv = pool->priv; + const char *name; xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(conf)); @@ -545,11 +546,14 @@ GVirStorageVol *gvir_storage_pool_create_volume volume = GVIR_STORAGE_VOL(g_object_new(GVIR_TYPE_STORAGE_VOL, "handle", handle, NULL)); + name = gvir_storage_vol_get_name(volume, err); + if (name == NULL) { + g_object_unref(G_OBJECT(volume)); + return NULL; + } g_mutex_lock(priv->lock); - g_hash_table_insert(priv->volumes, - g_strdup(gvir_storage_vol_get_name(volume)), - volume); + g_hash_table_insert(priv->volumes, g_strdup(name), volume); g_mutex_unlock(priv->lock); return g_object_ref(volume); diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 5b18877..c427e42 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -172,25 +172,31 @@ gvir_storage_vol_info_free(GVirStorageVolInfo *info) G_DEFINE_BOXED_TYPE(GVirStorageVolInfo, gvir_storage_vol_info, gvir_storage_vol_info_copy, gvir_storage_vol_info_free) -const gchar *gvir_storage_vol_get_name(GVirStorageVol *vol) +const gchar *gvir_storage_vol_get_name(GVirStorageVol *vol, GError **error) { GVirStorageVolPrivate *priv = vol->priv; const char *name; if (!(name = virStorageVolGetName(priv->handle))) { - g_error("Failed to get storage_vol name on %p", priv->handle); + gvir_set_error(error, GVIR_STORAGE_VOL_ERROR, 0, + "Failed to get storage_vol name on %p", + priv->handle); + return NULL; } return name; } -const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol) +const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol, GError **error) { GVirStorageVolPrivate *priv = vol->priv; const char *path; if (!(path = virStorageVolGetPath(priv->handle))) { - g_error("Failed to get storage_vol path on %p", priv->handle); + gvir_set_error(error, GVIR_STORAGE_VOL_ERROR, 0, + "Failed to get storage_vol path on %p", + priv->handle); + return NULL; } return path; diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.h b/libvirt-gobject/libvirt-gobject-storage-vol.h index db63865..fd2be80 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.h +++ b/libvirt-gobject/libvirt-gobject-storage-vol.h @@ -77,8 +77,8 @@ GType gvir_storage_vol_get_type(void); GType gvir_storage_vol_info_get_type(void); GType gvir_storage_vol_handle_get_type(void); -const gchar *gvir_storage_vol_get_name(GVirStorageVol *vol); -const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol); +const gchar *gvir_storage_vol_get_name(GVirStorageVol *vol, GError **error); +const gchar *gvir_storage_vol_get_path(GVirStorageVol *vol, GError **error); gboolean gvir_storage_vol_delete(GVirStorageVol *vol, guint flags, -- 1.7.7.6

2 6

[libvirt] Build issue with libvirt 0.9.8
by Christophe Fergeau 31 Jan '12

31 Jan '12

Hi, When building libvirt 0.9.8 with jhbuild, I have now reproduced twice some issue during the build. Namely, after successfully building and installing libvirt 0.9.8, when I try to run virsh, I get: virsh: /home/teuf/jhbuild-boxes/opt/lib64/libvirt.so.0: version `LIBVIRT_PRIVATE_0.9.7' not found (required by /home/teuf/jhbuild-boxes/opt/lib64/libvirt-qemu.so.0) This happens when I start from a clean prefix (no libvirt in it), then I install 0.9.7, and then I try to install 0.9.8 on top of it. If I rebuild libvirt-0.9.8 once more this goes away, so this is not a blocking problem for me. I have checked that libvirt-qemu.so.0 is the 0.9.8 version, I have looked in the build logs and in Makefile.am and everything looks correct to me, so I was wondering if anyone had any explanation for this behaviour. Once again, it's easy to workaround so it's not a big issue, but I'm mentioning it in case there would something obvious I missed. I put the build logs at http://people.gnome.org/~teuf/libvirt-0.9.7 and http://people.gnome.org/~teuf/libvirt-0.9.8 Christophe

2 3

[libvirt] g_error considered harmful
by Christophe Fergeau 31 Jan '12

31 Jan '12

Hi, g_error calls abort() when it's called, thus it should only be used for bad assertion failures. We currently are using it in some places in libvirt-gobject as if it was g_warning. This patch series gets rid of most occurrences of g_error by either replacing it with g_warning or by adding a GError ** argument to the function calling g_error. Christophe

3 13

[libvirt] [PATCH] resize: slightly alter signature
by Eric Blake 31 Jan '12

31 Jan '12

Our existing virDomainBlockResize takes an unsigned long long argument; if that command is later taught a DELTA and SHRINK flag, we cannot change its type without breaking API (but at least such a change would be ABI compatible). Meanwhile, the only time a negative size makes sense is if both DELTA and SHRINK are used together, but if we keep the argument unsigned, applications can pass the positive delta amount by which they would like to shrink the system, and have the flags imply the negative value. So, since this API has not yet been released, and in the interest of consistency with existing API, we swap virStorageVolResize to always pass an unsigned value. * include/libvirt/libvirt.h.in (virStorageVolResize): Use unsigned argument. * src/libvirt.c (virStorageVolResize): Likewise. * src/driver.h (virDrvStorageVolUpload): Adjust clients. * src/remote/remote_protocol.x (remote_storage_vol_resize_args): Likewise. * src/remote_protocol-structs: Regenerate. Suggested by Daniel P. Berrange. --- include/libvirt/libvirt.h.in | 2 +- src/driver.h | 2 +- src/libvirt.c | 17 +++++++++-------- src/remote/remote_protocol.x | 2 +- src/remote_protocol-structs | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 0a7b324..d9b9b95 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2415,7 +2415,7 @@ typedef enum { } virStorageVolResizeFlags; int virStorageVolResize (virStorageVolPtr vol, - long long capacity, + unsigned long long capacity, unsigned int flags); diff --git a/src/driver.h b/src/driver.h index ba7dbc4..2e2042e 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1277,7 +1277,7 @@ typedef int unsigned int flags); typedef int (*virDrvStorageVolResize) (virStorageVolPtr vol, - long long capacity, + unsigned long long capacity, unsigned int flags); typedef int diff --git a/src/libvirt.c b/src/libvirt.c index e702a34..c609202 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -13014,16 +13014,20 @@ error: * Normally, this operation should only be used to enlarge capacity; * but if @flags contains VIR_STORAGE_RESIZE_SHRINK, it is possible to * attempt a reduction in capacity even though it might cause data loss. + * If VIR_STORAGE_RESIZE_DELTA is also present, then @capacity is + * subtracted from the current size; without it, @capacity represents + * the absolute new size regardless of whether it is larger or smaller + * than the current size. * * Returns 0 on success, or -1 on error. */ int virStorageVolResize(virStorageVolPtr vol, - long long capacity, + unsigned long long capacity, unsigned int flags) { virConnectPtr conn; - VIR_DEBUG("vol=%p capacity=%lld flags=%x", vol, capacity, flags); + VIR_DEBUG("vol=%p capacity=%llu flags=%x", vol, capacity, flags); virResetLastError(); @@ -13040,12 +13044,9 @@ virStorageVolResize(virStorageVolPtr vol, goto error; } - /* Negative capacity is valid only with both delta and shrink; - * zero capacity is valid with either delta or shrink. */ - if ((capacity < 0 && !(flags & VIR_STORAGE_VOL_RESIZE_DELTA) && - !(flags & VIR_STORAGE_VOL_RESIZE_SHRINK)) || - (capacity == 0 && !((flags & VIR_STORAGE_VOL_RESIZE_DELTA) || - (flags & VIR_STORAGE_VOL_RESIZE_SHRINK)))) { + /* Zero capacity is only valid with either delta or shrink. */ + if (capacity == 0 && !((flags & VIR_STORAGE_VOL_RESIZE_DELTA) || + (flags & VIR_STORAGE_VOL_RESIZE_SHRINK))) { virLibStorageVolError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index b58925a..b2c8426 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -1709,7 +1709,7 @@ struct remote_storage_vol_get_path_ret { struct remote_storage_vol_resize_args { remote_nonnull_storage_vol vol; - hyper capacity; + unsigned hyper capacity; unsigned int flags; }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 5eac9bf..e9137a9 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -1282,7 +1282,7 @@ struct remote_storage_vol_get_path_ret { }; struct remote_storage_vol_resize_args { remote_nonnull_storage_vol vol; - int64_t capacity; + uint64_t capacity; u_int flags; }; struct remote_node_num_of_devices_args { -- 1.7.7.6

2 1

[libvirt] [PATCHv2 0/4] API for modification of domain metadata
by Peter Krempa 31 Jan '12

31 Jan '12

This is a corrected version of the domain metadata modification API. I dropped the limit on length of the domain title and added skipping of newlines added at the end of file by some editors, which made --edit unusable with --title for the new desc command. Peter Krempa (4): xml: Add element <title> to allow short description of domains API: Add api to set and get domain metadata virsh: Add support for modifying domain description and titles qemu: Add support for virDomainGetMetadata and virDomainSetMetadata docs/formatdomain.html.in | 6 + docs/schemas/domaincommon.rng | 13 +- include/libvirt/libvirt.h.in | 24 ++ include/libvirt/virterror.h | 1 + src/conf/domain_conf.c | 11 + src/conf/domain_conf.h | 1 + src/driver.h | 16 ++ src/libvirt.c | 181 +++++++++++++ src/libvirt_public.syms | 2 + src/qemu/qemu_driver.c | 174 ++++++++++++ src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 24 ++- src/util/virterror.c | 6 + .../qemu-simple-description-title.xml | 27 ++ tests/qemuxml2argvdata/qemuxml2argv-minimal.xml | 5 + tools/virsh.c | 283 ++++++++++++++++++-- tools/virsh.pod | 34 +++- 17 files changed, 787 insertions(+), 23 deletions(-) create mode 100644 tests/domainschemadata/qemu-simple-description-title.xml -- 1.7.3.4

2 6

[libvirt] Public API Change Advice
by Phantomcircuit 30 Jan '12

30 Jan '12

I'd like to add a simple flag to virStorageVolWipe to use O_DIRECT. What's the proper way to add such a flag?

2 1

[libvirt] [PATCH 0/4] RFC: grant KVM guest rawio capability
by Taku Izumi 30 Jan '12

30 Jan '12

This patch is as a result of the following dispute: http://www.redhat.com/archives/libvir-list/2011-December/msg00857.html http://www.redhat.com/archives/libvir-list/2011-December/msg00950.html http://www.redhat.com/archives/libvir-list/2012-January/msg00449.html This patchset achieves #1 and #2 of the following tasks: > 1. rawio="yes|nmo" on the <disk> element somewhere > 2. Give the QEMU process CAP_SYS_RAWIO > 3. Use the devices cgroup to specify which individual disks > can use rawio. In short, if you specify the following XML: <disk type='block' device='lun' rawio='yes'> the domain will be granted CAP_SYS_RAWIO. # virsh start VM # cat /proc/<VM's PID>/status ... CapInh: 0000000000000000 CapPrm: fffffffc00020000 CapEff: fffffffc00020000 CapBnd: fffffffc00020000 ... *[PATCH 1/4] conf: add rawio attribute to disk element of domain XML *[PATCH 2/4] util: add functions to keep capabilities *[PATCH 3/4] util: extend virExecWithHook() *[PATCH 4/4] qemu: make qemu processes to retain capabilities - Best regards, Taku Izumi -- Taku Izumi <izumi.taku(a)jp.fujitsu.com>

4 10

[libvirt] [PATCH] XenXs: Update documentation
by Philipp Hahn 30 Jan '12

30 Jan '12

Fix several references to now renamed functions and parameters when the functions were moved from src/xen/ to src/xenxs/. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/xenxs/xen_sxpr.c | 222 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 185 insertions(+), 37 deletions(-) diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index 09e7730..03a0eb1 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -37,7 +37,7 @@ #include "xenxs_private.h" #include "xen_sxpr.h" -/* Get a domain id from a sexpr string */ +/* Get a domain id from a S-expression string */ int xenGetDomIdFromSxprString(const char *sexpr, int xendConfigVersion) { struct sexpr *root = string2sexpr(sexpr); @@ -50,7 +50,7 @@ int xenGetDomIdFromSxprString(const char *sexpr, int xendConfigVersion) return id; } -/* Get a domain id from a sexpr */ +/* Get a domain id from a S-expression */ int xenGetDomIdFromSxpr(const struct sexpr *root, int xendConfigVersion) { int id = -1; @@ -66,16 +66,15 @@ int xenGetDomIdFromSxpr(const struct sexpr *root, int xendConfigVersion) /***************************************************************** ****** - ****** Parsing of SEXPR into virDomainDef objects + ****** Parsing of S-Expression into virDomainDef objects ****** *****************************************************************/ /** - * xenParseSxprOS + * xenParseSxprOS: * @node: the root of the parsed S-Expression * @def: the domain config - * @hvm: true or 1 if no contains HVM S-Expression - * @bootloader: true or 1 if a bootloader is defined + * @hvm: true or 1 if node contains HVM S-Expression * * Parse the xend sexp for description of os and append it to buf. * @@ -166,6 +165,16 @@ no_memory: return -1; } + +/** + * xenParseSxprChar: + * @value: A string describing a character device. + * @tty: the console pty path + * + * Parse the xend S-expression for description of a character device. + * + * Returns a character device object or NULL in case of failure. + */ virDomainChrDefPtr xenParseSxprChar(const char *value, const char *tty) @@ -316,13 +325,15 @@ error: return NULL; } + /** - * xend_parse_sexp_desc_disks - * @conn: connection - * @root: root sexpr + * xenParseSxprDisks: + * @def: the domain config + * @root: root S-expression + * @hvm: true or 1 if node contains HVM S-Expression * @xendConfigVersion: version of xend * - * This parses out block devices from the domain sexpr + * This parses out block devices from the domain S-expression * * Returns 0 if successful or -1 if failed. */ @@ -518,6 +529,15 @@ error: } +/** + * xenParseSxprNets: + * @def: the domain config + * @root: root S-expression + * + * This parses out network devices from the domain S-expression + * + * Returns 0 if successful or -1 if failed. + */ static int xenParseSxprNets(virDomainDefPtr def, const struct sexpr *root) @@ -614,6 +634,15 @@ cleanup: } +/** + * xenParseSxprSound: + * @def: the domain config + * @str: comma separated list of sound models + * + * This parses out sound devices from the domain S-expression + * + * Returns 0 if successful or -1 if failed. + */ int xenParseSxprSound(virDomainDefPtr def, const char *str) @@ -692,6 +721,15 @@ error: } +/** + * xenParseSxprUSB: + * @def: the domain config + * @root: root S-expression + * + * This parses out USB devices from the domain S-expression + * + * Returns 0 if successful or -1 if failed. + */ static int xenParseSxprUSB(virDomainDefPtr def, const struct sexpr *root) @@ -733,6 +771,19 @@ no_memory: return -1; } + +/* + * xenParseSxprGraphicsOld: + * @def: the domain config + * @root: root S-expression + * @hvm: true or 1 if root contains HVM S-Expression + * @xendConfigVersion: version of xend + * @vncport: VNC port number + * + * This parses out VNC devices from the domain S-expression + * + * Returns 0 if successful or -1 if failed. + */ static int xenParseSxprGraphicsOld(virDomainDefPtr def, const struct sexpr *root, @@ -821,6 +872,16 @@ error: } +/* + * xenParseSxprGraphicsNew: + * @def: the domain config + * @root: root S-expression + * @vncport: VNC port number + * + * This parses out VNC devices from the domain S-expression + * + * Returns 0 if successful or -1 if failed. + */ static int xenParseSxprGraphicsNew(virDomainDefPtr def, const struct sexpr *root, int vncport) @@ -918,11 +979,13 @@ error: return -1; } + /** - * xenParseSxprPCI + * xenParseSxprPCI: + * @def: the domain config * @root: root sexpr * - * This parses out block devices from the domain sexpr + * This parses out PCI devices from the domain sexpr * * Returns 0 if successful or -1 if failed. */ @@ -1044,16 +1107,17 @@ error: /** * xenParseSxpr: - * @conn: the connection associated with the XML * @root: the root of the parsed S-Expression * @xendConfigVersion: version of xend * @cpus: set of cpus the domain may be pinned to + * @tty: the console pty path + * @vncport: VNC port number * - * Parse the xend sexp description and turn it into the XML format similar - * to the one unsed for creation. + * Parse the xend S-expression description and turn it into a virDomainDefPtr + * representing these settings as closeley as is practical. * - * Returns the 0 terminated XML string or NULL in case of error. - * the caller must free() the returned value. + * Returns the domain config or NULL in case of error. + * The caller must free() the returned value. */ virDomainDefPtr xenParseSxpr(const struct sexpr *root, @@ -1424,6 +1488,20 @@ error: return NULL; } + +/** + * xenParseSxprString: + * @sexpr: the root of the parsed S-Expression + * @xendConfigVersion: version of xend + * @tty: the console pty path + * @vncport: VNC port number + * + * Parse the xend S-expression description and turn it into a virDomainDefPtr + * representing these settings as closeley as is practical. + * + * Returns the domain config or NULL in case of error. + * The caller must free() the returned value. + */ virDomainDefPtr xenParseSxprString(const char *sexpr, int xendConfigVersion, char *tty, int vncport) @@ -1449,15 +1527,12 @@ xenParseSxprString(const char *sexpr, /** - * virtDomainParseXMLGraphicsDescVFB: - * @conn: pointer to the hypervisor connection - * @node: node containing graphics description - * @buf: a buffer for the result S-Expr + * xenFormatSxprGraphicsNew: + * @def: the domain config + * @buf: a buffer for the result S-expression * - * Parse the graphics part of the XML description and add it to the S-Expr - * in buf. This is a temporary interface as the S-Expr interface will be - * replaced by XML-RPC in the future. However the XML format should stay - * valid over time. + * Convert the graphics part of the domain description into a S-expression + * in buf. (HVM > 3.0.4 or PV > 3.0.3) * * Returns 0 in case of success, -1 in case of error */ @@ -1508,6 +1583,17 @@ xenFormatSxprGraphicsNew(virDomainGraphicsDefPtr def, } +/** + * xenFormatSxprGraphicsOld: + * @def: the domain config + * @buf: a buffer for the result S-expression + * @xendConfigVersion: version of xend + * + * Convert the graphics part of the domain description into a S-expression + * in buf. (HVM <= 3.0.4 or PV <= 3.0.3) + * + * Returns 0 in case of success, -1 in case of error + */ static int xenFormatSxprGraphicsOld(virDomainGraphicsDefPtr def, virBufferPtr buf, @@ -1553,6 +1639,17 @@ xenFormatSxprGraphicsOld(virDomainGraphicsDefPtr def, return 0; } + +/** + * xenFormatSxprChr: + * @def: the domain config + * @buf: a buffer for the result S-expression + * + * Convert the character deivce part of the domain config into a S-expression + * in buf. + * + * Returns 0 in case of success, -1 in case of error + */ int xenFormatSxprChr(virDomainChrDefPtr def, virBufferPtr buf) @@ -1631,15 +1728,14 @@ xenFormatSxprChr(virDomainChrDefPtr def, /** - * virDomainParseXMLDiskDesc: - * @node: node containing disk description - * @buf: a buffer for the result S-Expr + * xenFormatSxprDisk: + * @node: node containing the disk description + * @buf: a buffer for the result S-expression + * @hvm: true or 1 if domain is HVM * @xendConfigVersion: xend configuration file format + * @isAttach: create expression for device attach (1). * - * Parse the one disk in the XML description and add it to the S-Expr in buf - * This is a temporary interface as the S-Expr interface - * will be replaced by XML-RPC in the future. However the XML format should - * stay valid over time. + * Convert the disk device part of the domain config into a S-expresssion in buf. * * Returns 0 in case of success, -1 in case of error. */ @@ -1757,12 +1853,15 @@ xenFormatSxprDisk(virDomainDiskDefPtr def, } /** - * xenFormatSxprNet - * @node: node containing the interface description - * @buf: a buffer for the result S-Expr + * xenFormatSxprNet: + * @conn: connection + * @def: the domain config + * @buf: a buffer for the result S-expression + * @hvm: true or 1 if domain is HVM * @xendConfigVersion: xend configuration file format + * @isAttach: create expression for device attach (1). * - * Parse the one interface the XML description and add it to the S-Expr in buf + * Convert the interface description of the domain config into a S-expression in buf. * This is a temporary interface as the S-Expr interface * will be replaced by XML-RPC in the future. However the XML format should * stay valid over time. @@ -1893,6 +1992,15 @@ xenFormatSxprNet(virConnectPtr conn, } +/** + * xenFormatSxprPCI: + * @def: the device config + * @buf: a buffer for the result S-expression + * + * Convert a single PCI device part of the domain config into a S-expresssion in buf. + * + * Returns 0 in case of success, -1 in case of error. + */ static void xenFormatSxprPCI(virDomainHostdevDefPtr def, virBufferPtr buf) @@ -1904,6 +2012,17 @@ xenFormatSxprPCI(virDomainHostdevDefPtr def, def->source.subsys.u.pci.function); } + +/** + * xenFormatSxprOnePCI: + * @def: the device config + * @buf: a buffer for the result S-expression + * @detach: create expression for device detach (1). + * + * Convert a single PCI device part of the domain config into a S-expresssion in buf. + * + * Returns 0 in case of success, -1 in case of error. + */ int xenFormatSxprOnePCI(virDomainHostdevDefPtr def, virBufferPtr buf, @@ -1926,6 +2045,16 @@ xenFormatSxprOnePCI(virDomainHostdevDefPtr def, return 0; } + +/** + * xenFormatSxprAllPCI: + * @def: the domain config + * @buf: a buffer for the result S-expression + * + * Convert all PCI device parts of the domain config into a S-expresssion in buf. + * + * Returns 0 in case of success, -1 in case of error. + */ static int xenFormatSxprAllPCI(virDomainDefPtr def, virBufferPtr buf) @@ -1973,6 +2102,16 @@ xenFormatSxprAllPCI(virDomainDefPtr def, return 0; } + +/** + * xenFormatSxprSound: + * @def: the domain config + * @buf: a buffer for the result S-expression + * + * Convert all sound device parts of the domain config into S-expression in buf. + * + * Returns 0 if successful or -1 if failed. + */ int xenFormatSxprSound(virDomainDefPtr def, virBufferPtr buf) @@ -2001,6 +2140,15 @@ xenFormatSxprSound(virDomainDefPtr def, } +/** + * xenFormatSxprInput: + * @input: the input config + * @buf: a buffer for the result S-expression + * + * Convert all input device parts of the domain config into S-expression in buf. + * + * Returns 0 if successful or -1 if failed. + */ static int xenFormatSxprInput(virDomainInputDefPtr input, virBufferPtr buf) @@ -2033,7 +2181,7 @@ verify(MAX_VIRT_CPUS <= sizeof(1UL) * CHAR_BIT); * @def: domain config definition * @xendConfigVersion: xend configuration file format * - * Generate an SEXPR representing the domain configuration. + * Generate an S-expression representing the domain configuration. * * Returns the 0 terminated S-Expr string or NULL in case of error. * the caller must free() the returned value. -- 1.7.1

2 1

[libvirt] [PATCH RFC 0/4] Allow hibernation on guests
by Michal Privoznik 30 Jan '12

30 Jan '12

As we've added guest agent recently, the whole world of new functionality has opened. As this patch set, which allows domains to enter S4 state. What is needed for this? Patched qemu. As this is not in qemu git, but patches are await to be pushed in very short future. They can be found here: http://lists.gnu.org/archive/html/qemu-devel/2012-01/msg03261.html Despite that, if anybody is willing to give me review if I am going the right way, I'd appreciate it. One thing, that you'll probably notice is this 'set-support-level' command. Basically, it tells GA what qemu version is it running on. Ideally, this should be done as soon as GA starts up. However, that cannot be determined from outside world as GA doesn't emit any events yet. Ideally^2 this command should be left out as it should be qemu who tells its own agent this kind of information. Anyway, I was going to call this command in qemuProcess{Startup, Reconnect,Attach}, but it won't work. We need to un-pause guest CPUs so guest can boot and start GA, but that implies returning from qemuProcess*. So I am setting this just before 'guest-suspend' command, as there is one more thing about GA. It is unable to remember anything upon its restart (GA process). Which has BTW show flaw in our current code with FS freeze & thaw. If we freeze guest FS, and somebody restart GA, the simple FS Thaw will not succeed as GA thinks FS are not frozen. But that's a different cup of tea. Because of what written above, we need to call set-level on every suspend. Michal Privoznik (4): qemu-agent: Allow setting supported level qemu-agent: Create suspend function Create new virDrvDomainSuspendFlags API Wire up qemu agent for suspend include/libvirt/libvirt.h.in | 8 +++ src/driver.h | 4 ++ src/libvirt.c | 55 ++++++++++++++++++++++ src/libvirt_public.syms | 1 + src/qemu/qemu_agent.c | 105 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 13 +++++ src/qemu/qemu_driver.c | 57 +++++++++++++++++++--- src/qemu/qemu_process.c | 45 +++++++++++++++++- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 9 +++- src/remote_protocol-structs | 5 ++ tools/virsh.c | 30 ++++++++++-- 12 files changed, 317 insertions(+), 16 deletions(-) -- 1.7.3.4

6 27

[libvirt] [PATCHv2] simplify block of codes
by ajia＠redhat.com 30 Jan '12

30 Jan '12

From: Alex Jia <ajia(a)redhat.com> Using new function 'virTypedParameterArrayClear' to simplify block of codes. * daemon/remote.c, src/remote/remote_driver.c: simplify codes. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- daemon/remote.c | 6 +----- src/remote/remote_driver.c | 16 ++++------------ 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index cb8423a..e7d9b2f 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -848,11 +848,7 @@ remoteDeserializeTypedParameters(remote_typed_param *args_params_val, cleanup: if (rv < 0) { - int j; - for (j = 0; j < i; ++j) { - if (params[j].type == VIR_TYPED_PARAM_STRING) - VIR_FREE(params[j].value.s); - } + virTypedParameterArrayClear(params, i); VIR_FREE(params); } return params; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 61b96e9..15a20ff 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -46,6 +46,7 @@ #include "virfile.h" #include "command.h" #include "intprops.h" +#include "virtypedparam.h" #define VIR_FROM_THIS VIR_FROM_REMOTE @@ -1417,12 +1418,8 @@ remoteDeserializeTypedParameters(remote_typed_param *ret_params_val, rv = 0; cleanup: - if (rv < 0) { - int j; - for (j = 0; j < i; j++) - if (params[j].type == VIR_TYPED_PARAM_STRING) - VIR_FREE(params[j].value.s); - } + if (rv < 0) + virTypedParameterArrayClear(params, *nparams); return rv; } @@ -2386,12 +2383,7 @@ static int remoteDomainGetCPUStats(virDomainPtr domain, cleanup: if (rv < 0) { int max = nparams * ncpus; - int i; - - for (i = 0; i < max; i++) { - if (params[i].type == VIR_TYPED_PARAM_STRING) - VIR_FREE(params[i].value.s); - } + virTypedParameterArrayClear(params, max); } xdr_free ((xdrproc_t) xdr_remote_domain_get_cpu_stats_ret, (char *) &ret); -- 1.7.1

2 1

[libvirt] [PATCH 0/6] qemu: add suport for "romfile", and associated cleanups
by Laine Stump 30 Jan '12

30 Jan '12

This patchset started out as cleanup to make it easier to add in support for doing PCI passthrough via the <interface> element (to be used to attach a host network device to a guest after performing some network-device-specific setup), but turned out to also make it much easier to add support for QEMU's "romfile" option, as requested in https://bugzilla.redhat.com/show_bug.cgi?id=781562 Patch 1 is trivial, and probably qualifies for pushing under the trivial rule, but it's just as easy to leave it in with the rest. Patches 2-4 reorganize some data definitions, and the code associated with them, with no functional change. Patch 5 expands support for "rombar" to network devices (as long as they attach to the guest PCI bus), and Patch 6 adds support for "romfile" to both generic PCI devices and network devices.

2 18

[libvirt] Segfault fixed
by Hendrik Schwartke 30 Jan '12

30 Jan '12

Hi, there is a segfault in qemu_monitor_text.c. If some error accurs in qemuMonitorTextGetBlockInfo then the cleanup code calls VIR_FREE(info) without ensuring that info is initialized. Patch based on c6ec021b3c19c3ecc97d60d35b12eaa0b94da701: diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index a33d192..fb3309b 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -774,7 +774,7 @@ int qemuMonitorTextGetMemoryStats(qemuMonitorPtr mon, int qemuMonitorTextGetBlockInfo(qemuMonitorPtr mon, virHashTablePtr table) { - struct qemuDomainDiskInfo *info; + struct qemuDomainDiskInfo *info=NULL; char *reply = NULL; int ret = -1; char *dummy;

2 1