- Devel - libvirt List Archives

[libvirt] [PATCH] security_dac: Honor norelabel attribute
by Michal Privoznik 26 Mar '14

26 Mar '14

The inspiration for this patch comes from a question on the list asking if there's a way to not label some disks. Well, in DAC driver there's not. Even if user have requested norelabel: <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/some/dummy/path/test.bin'> <seclabel model='dac' relabel='no'/> </source> <target dev='vdb' bus='virtio'/> <readonly/> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </disk> the DAC driver ignores this completely. When adjusting the code, I realized it's a ragbag with plenty of things that we try to avoid. >From the variety just a few things: callback data were passed as: void params[2]; params[0] = mgr; params[1] = def; Or my favorite - checking for passed pointer being non NULL on each level of the stack, in each callee. As a pattern of readable code the selinux driver was used. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/security/security_dac.c | 244 ++++++++++++++++++++++++-------------------- 1 file changed, 131 insertions(+), 113 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 9f45063..3b8fe04 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -53,6 +53,15 @@ struct _virSecurityDACData { char *baselabel; }; +typedef struct _virSecurityDACCallbackData virSecurityDACCallbackData; +typedef virSecurityDACCallbackData *virSecurityDACCallbackDataPtr; + +struct _virSecurityDACCallbackData { + virSecurityManagerPtr manager; + virSecurityLabelDefPtr secdef; +}; + + /* returns -1 on error, 0 on success */ int virSecurityDACSetUserAndGroup(virSecurityManagerPtr mgr, @@ -81,65 +90,42 @@ virSecurityDACSetDynamicOwnership(virSecurityManagerPtr mgr, /* returns 1 if label isn't found, 0 on success, -1 on error */ static int -virSecurityDACParseIds(virDomainDefPtr def, uid_t *uidPtr, gid_t *gidPtr) +virSecurityDACParseIds(virSecurityLabelDefPtr seclabel, + uid_t *uidPtr, gid_t *gidPtr) { - uid_t uid; - gid_t gid; - virSecurityLabelDefPtr seclabel; - - if (def == NULL) - return 1; - - seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); - if (seclabel == NULL || seclabel->label == NULL) { - VIR_DEBUG("DAC seclabel for domain '%s' wasn't found", def->name); + if (!seclabel || !seclabel->label) return 1; - } - if (virParseOwnershipIds(seclabel->label, &uid, &gid) < 0) + if (virParseOwnershipIds(seclabel->label, uidPtr, gidPtr) < 0) return -1; - if (uidPtr) - *uidPtr = uid; - if (gidPtr) - *gidPtr = gid; - return 0; } static int -virSecurityDACGetIds(virDomainDefPtr def, virSecurityDACDataPtr priv, +virSecurityDACGetIds(virSecurityLabelDefPtr seclabel, + virSecurityDACDataPtr priv, uid_t *uidPtr, gid_t *gidPtr, gid_t **groups, int *ngroups) { int ret; - if (!def && !priv) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Failed to determine default DAC seclabel " - "for an unknown object")); - return -1; - } - if (groups) *groups = priv ? priv->groups : NULL; if (ngroups) *ngroups = priv ? priv->ngroups : 0; - if ((ret = virSecurityDACParseIds(def, uidPtr, gidPtr)) <= 0) + if ((ret = virSecurityDACParseIds(seclabel, uidPtr, gidPtr)) <= 0) return ret; if (!priv) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("DAC seclabel couldn't be determined " - "for domain '%s'"), def->name); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("DAC seclabel couldn't be determined")); return -1; } - if (uidPtr) - *uidPtr = priv->user; - if (gidPtr) - *gidPtr = priv->group; + *uidPtr = priv->user; + *gidPtr = priv->group; return 0; } @@ -147,60 +133,36 @@ virSecurityDACGetIds(virDomainDefPtr def, virSecurityDACDataPtr priv, /* returns 1 if label isn't found, 0 on success, -1 on error */ static int -virSecurityDACParseImageIds(virDomainDefPtr def, +virSecurityDACParseImageIds(virSecurityLabelDefPtr seclabel, uid_t *uidPtr, gid_t *gidPtr) { - uid_t uid; - gid_t gid; - virSecurityLabelDefPtr seclabel; - - if (def == NULL) - return 1; - - seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); - if (seclabel == NULL || seclabel->imagelabel == NULL) { - VIR_DEBUG("DAC imagelabel for domain '%s' wasn't found", def->name); + if (!seclabel || !seclabel->imagelabel) return 1; - } - if (virParseOwnershipIds(seclabel->imagelabel, &uid, &gid) < 0) + if (virParseOwnershipIds(seclabel->imagelabel, uidPtr, gidPtr) < 0) return -1; - if (uidPtr) - *uidPtr = uid; - if (gidPtr) - *gidPtr = gid; - return 0; } static int -virSecurityDACGetImageIds(virDomainDefPtr def, virSecurityDACDataPtr priv, +virSecurityDACGetImageIds(virSecurityLabelDefPtr seclabel, + virSecurityDACDataPtr priv, uid_t *uidPtr, gid_t *gidPtr) { int ret; - if (!def && !priv) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Failed to determine default DAC imagelabel " - "for an unknown object")); - return -1; - } - - if ((ret = virSecurityDACParseImageIds(def, uidPtr, gidPtr)) <= 0) + if ((ret = virSecurityDACParseImageIds(seclabel, uidPtr, gidPtr)) <= 0) return ret; if (!priv) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("DAC imagelabel couldn't be determined " - "for domain '%s'"), def->name); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("DAC imagelabel couldn't be determined")); return -1; } - if (uidPtr) - *uidPtr = priv->user; - if (gidPtr) - *gidPtr = priv->group; + *uidPtr = priv->user; + *gidPtr = priv->group; return 0; } @@ -324,20 +286,32 @@ err: static int -virSecurityDACSetSecurityFileLabel(virDomainDiskDefPtr disk ATTRIBUTE_UNUSED, +virSecurityDACSetSecurityFileLabel(virDomainDiskDefPtr disk, const char *path, size_t depth ATTRIBUTE_UNUSED, void *opaque) { - void **params = opaque; - virSecurityManagerPtr mgr = params[0]; - virDomainDefPtr def = params[1]; + virSecurityDACCallbackDataPtr cbdata = opaque; + virSecurityManagerPtr mgr = cbdata->manager; + virSecurityLabelDefPtr secdef = cbdata->secdef; virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); + virSecurityDeviceLabelDefPtr disk_seclabel; uid_t user; gid_t group; - if (virSecurityDACGetImageIds(def, priv, &user, &group)) - return -1; + disk_seclabel = virDomainDiskDefGetSecurityLabelDef(disk, + SECURITY_DAC_NAME); + + if (disk_seclabel && disk_seclabel->norelabel) + return 0; + + if (disk_seclabel && disk_seclabel->label) { + if (virParseOwnershipIds(disk_seclabel->label, &user, &group) < 0) + return -1; + } else { + if (virSecurityDACGetImageIds(secdef, priv, &user, &group)) + return -1; + } return virSecurityDACSetOwnership(path, user, group); } @@ -349,8 +323,9 @@ virSecurityDACSetSecurityImageLabel(virSecurityManagerPtr mgr, virDomainDiskDefPtr disk) { - void *params[2]; + virSecurityDACCallbackData cbdata; virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); + virSecurityLabelDefPtr secdef; if (!priv->dynamicOwnership) return 0; @@ -358,12 +333,16 @@ virSecurityDACSetSecurityImageLabel(virSecurityManagerPtr mgr, if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK) return 0; - params[0] = mgr; - params[1] = def; + secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); + if (secdef && secdef->norelabel) + return 0; + + cbdata.manager = mgr; + cbdata.secdef = secdef; return virDomainDiskDefForeachPath(disk, false, virSecurityDACSetSecurityFileLabel, - params); + &cbdata); } @@ -428,14 +407,14 @@ static int virSecurityDACSetSecurityHostdevLabelHelper(const char *file, void *opaque) { - void **params = opaque; - virSecurityManagerPtr mgr = params[0]; - virDomainDefPtr def = params[1]; + virSecurityDACCallbackDataPtr cbdata = opaque; + virSecurityManagerPtr mgr = cbdata->manager; + virSecurityLabelDefPtr secdef = cbdata->secdef; virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); uid_t user; gid_t group; - if (virSecurityDACGetIds(def, priv, &user, &group, NULL, NULL)) + if (virSecurityDACGetIds(secdef, priv, &user, &group, NULL, NULL)) return -1; return virSecurityDACSetOwnership(file, user, group); @@ -475,8 +454,8 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr, virDomainHostdevDefPtr dev, const char *vroot) { - void *params[] = {mgr, def}; virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); + virSecurityDACCallbackData cbdata; int ret = -1; if (!priv->dynamicOwnership) @@ -485,7 +464,13 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr, if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) return 0; - switch (dev->source.subsys.type) { + cbdata.manager = mgr; + cbdata.secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); + + if (cbdata.secdef && cbdata.secdef->norelabel) + return 0; + + switch ((enum virDomainHostdevSubsysType) dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { virUSBDevicePtr usb; @@ -498,8 +483,9 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr, if (!usb) goto done; - ret = virUSBDeviceFileIterate(usb, virSecurityDACSetSecurityUSBLabel, - params); + ret = virUSBDeviceFileIterate(usb, + virSecurityDACSetSecurityUSBLabel, + &cbdata); virUSBDeviceFree(usb); break; } @@ -522,11 +508,12 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr, virPCIDeviceFree(pci); goto done; } - ret = virSecurityDACSetSecurityPCILabel(pci, vfioGroupDev, params); + ret = virSecurityDACSetSecurityPCILabel(pci, vfioGroupDev, &cbdata); VIR_FREE(vfioGroupDev); } else { - ret = virPCIDeviceFileIterate(pci, virSecurityDACSetSecurityPCILabel, - params); + ret = virPCIDeviceFileIterate(pci, + virSecurityDACSetSecurityPCILabel, + &cbdata); } virPCIDeviceFree(pci); @@ -546,15 +533,15 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr, if (!scsi) goto done; - ret = virSCSIDeviceFileIterate(scsi, virSecurityDACSetSecuritySCSILabel, - params); + ret = virSCSIDeviceFileIterate(scsi, + virSecurityDACSetSecuritySCSILabel, + &cbdata); virSCSIDeviceFree(scsi); break; } - default: - ret = 0; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: break; } @@ -606,7 +593,7 @@ virSecurityDACRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr, if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) return 0; - switch (dev->source.subsys.type) { + switch ((enum virDomainHostdevSubsysType) dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: { virUSBDevicePtr usb; @@ -684,34 +671,52 @@ done: static int virSecurityDACSetChardevLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, - virDomainChrSourceDefPtr dev) + virDomainChrDefPtr dev, + virDomainChrSourceDefPtr dev_source) { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); + virSecurityLabelDefPtr seclabel; + virSecurityDeviceLabelDefPtr chr_seclabel = NULL; char *in = NULL, *out = NULL; int ret = -1; uid_t user; gid_t group; - if (virSecurityDACGetIds(def, priv, &user, &group, NULL, NULL)) - return -1; + seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); - switch (dev->type) { + if (dev) + chr_seclabel = virDomainChrDefGetSecurityLabelDef(dev, + SECURITY_DAC_NAME); + + if (seclabel->norelabel || (chr_seclabel && chr_seclabel->norelabel)) + return 0; + + if (chr_seclabel && chr_seclabel->label) { + if (virParseOwnershipIds(chr_seclabel->label, &user, &group) < 0) + return -1; + } else { + if (virSecurityDACGetIds(seclabel, priv, &user, &group, NULL, NULL)) + return -1; + } + + switch ((enum virDomainChrType) dev_source->type) { case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_FILE: - ret = virSecurityDACSetOwnership(dev->data.file.path, user, group); + ret = virSecurityDACSetOwnership(dev_source->data.file.path, + user, group); break; case VIR_DOMAIN_CHR_TYPE_PIPE: - if ((virAsprintf(&in, "%s.in", dev->data.file.path) < 0) || - (virAsprintf(&out, "%s.out", dev->data.file.path) < 0)) + if ((virAsprintf(&in, "%s.in", dev_source->data.file.path) < 0) || + (virAsprintf(&out, "%s.out", dev_source->data.file.path) < 0)) goto done; if (virFileExists(in) && virFileExists(out)) { if ((virSecurityDACSetOwnership(in, user, group) < 0) || (virSecurityDACSetOwnership(out, user, group) < 0)) { goto done; } - } else if (virSecurityDACSetOwnership(dev->data.file.path, + } else if (virSecurityDACSetOwnership(dev_source->data.file.path, user, group) < 0) { goto done; } @@ -736,7 +741,7 @@ virSecurityDACRestoreChardevLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, char *in = NULL, *out = NULL; int ret = -1; - switch (dev->type) { + switch ((enum virDomainChrType) dev->type) { case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_FILE: ret = virSecurityDACRestoreSecurityFileLabel(dev->data.file.path); @@ -789,7 +794,7 @@ virSecurityDACSetSecurityTPMFileLabel(virSecurityManagerPtr mgr, switch (tpm->type) { case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: - ret = virSecurityDACSetChardevLabel(mgr, def, + ret = virSecurityDACSetChardevLabel(mgr, def, NULL, &tpm->data.passthrough.source); break; case VIR_DOMAIN_TPM_TYPE_LAST: @@ -885,7 +890,7 @@ virSecurityDACSetChardevCallback(virDomainDefPtr def ATTRIBUTE_UNUSED, { virSecurityManagerPtr mgr = opaque; - return virSecurityDACSetChardevLabel(mgr, def, &dev->source); + return virSecurityDACSetChardevLabel(mgr, def, dev, &dev->source); } @@ -895,13 +900,17 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr, const char *stdin_path ATTRIBUTE_UNUSED) { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); + virSecurityLabelDefPtr secdef; size_t i; uid_t user; gid_t group; - if (!priv->dynamicOwnership) + secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); + + if (!priv->dynamicOwnership || (secdef && secdef->norelabel)) return 0; + for (i = 0; i < def->ndisks; i++) { /* XXX fixme - we need to recursively label the entire tree :-( */ if (def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_DIR) @@ -932,7 +941,7 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr, return -1; } - if (virSecurityDACGetImageIds(def, priv, &user, &group)) + if (virSecurityDACGetImageIds(secdef, priv, &user, &group)) return -1; if (def->os.kernel && @@ -956,11 +965,14 @@ virSecurityDACSetSavedStateLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, const char *savefile) { + virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); + virSecurityLabelDefPtr secdef; uid_t user; gid_t group; - virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); - if (virSecurityDACGetImageIds(def, priv, &user, &group)) + secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); + + if (virSecurityDACGetImageIds(secdef, priv, &user, &group)) return -1; return virSecurityDACSetOwnership(savefile, user, group); @@ -985,13 +997,16 @@ static int virSecurityDACSetProcessLabel(virSecurityManagerPtr mgr, virDomainDefPtr def ATTRIBUTE_UNUSED) { + virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); + virSecurityLabelDefPtr secdef; uid_t user; gid_t group; gid_t *groups; int ngroups; - virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); - if (virSecurityDACGetIds(def, priv, &user, &group, &groups, &ngroups)) + secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); + + if (virSecurityDACGetIds(secdef, priv, &user, &group, &groups, &ngroups)) return -1; VIR_DEBUG("Dropping privileges of DEF to %u:%u, %d supplemental groups", @@ -1009,11 +1024,14 @@ virSecurityDACSetChildProcessLabel(virSecurityManagerPtr mgr, virDomainDefPtr def ATTRIBUTE_UNUSED, virCommandPtr cmd) { + virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); + virSecurityLabelDefPtr secdef; uid_t user; gid_t group; - virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); - if (virSecurityDACGetIds(def, priv, &user, &group, NULL, NULL)) + secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME); + + if (virSecurityDACGetIds(secdef, priv, &user, &group, NULL, NULL)) return -1; VIR_DEBUG("Setting child to drop privileges of DEF to %u:%u", -- 1.9.0

2 1

[libvirt] [PATCH v2] dnsmasq: allowing RFC 2782 compliant SRV records
by Steven Malin 26 Mar '14

26 Mar '14

This patch allows RFC 2782 compliant SRV records in the network config and corrects the documentation. --- docs/formatnetwork.html.in | 6 +++--- src/conf/network_conf.c | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index fc56b42..9d3e525 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -721,7 +721,7 @@ <txt name="example" value="example value" /> <forwarder addr="8.8.8.8"/> <forwarder addr="8.8.4.4"/> - <srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/> + <srv service='_name' protocol='_tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/> <host ip='192.168.122.2'> <hostname>myhost</hostname> <hostname>myhostalias</hostname> @@ -805,8 +805,8 @@ <dd>The <code>dns</code> element can have also 0 or more <code>srv</code> record elements. Each <code>srv</code> record element defines a DNS SRV record and has 2 mandatory and 5 optional attributes. The mandatory attributes - are service name and protocol (tcp, udp) and the optional attributes are - target, port, priority, weight and domain as defined in DNS server SRV + are service name (_name) and protocol (_tcp, _udp) and the optional attributes + are target, port, priority, weight and domain as defined in DNS server SRV RFC (RFC 2782). <span class="since">Since 0.9.9</span> </dd> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index bac0465..c7d55c8 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -961,9 +961,11 @@ virNetworkDNSSrvDefParseXML(const char *networkName, goto error; } - /* Check whether protocol value is the supported one */ + /* Check whether protocol value is supported (allows RFC 2782 compliance) */ if (def->protocol && STRNEQ(def->protocol, "tcp") && - (STRNEQ(def->protocol, "udp"))) { + STRNEQ(def->protocol, "udp") && + STRNEQ(def->protocol, "_tcp") && + STRNEQ(def->protocol, "_udp")) { virReportError(VIR_ERR_XML_DETAIL, _("Invalid protocol attribute value '%s' " "in DNS SRV record of network %s"), -- 1.7.1

2 1

[libvirt] [PATCH 0/5] virCommandRunRegex cleanups
by Ján Tomko 26 Mar '14

26 Mar '14

Simplify the code. This should have no functional change (except for the impossible leak fix in 3/5). Most of this functionality is tested in viriscsitest. Ján Tomko (5): Remove useless 'maxReg' variable Simplify the loop in virCommandRunRegex Free groups in case of a partial match Use VIR_STRNDUP instead of modifying the matched string Shift the for loop over matched vars by one src/util/vircommand.c | 46 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 27 deletions(-) -- 1.8.3.2

2 7

[libvirt] [RFC] VM which uses macvtap will not respond ping request when being migrated
by Wangrui (K) 26 Mar '14

26 Mar '14

A vm which uses macvtap will not respond ping request, when the vm is being migrated. I found that on the destination side the macvtap will send a IPv6 packet at the begin of migration to update the route table in switch, however VM is still on the src. In this case , what can I do to avoid VM's network disconnection Regards, Wangrui

3 3

[libvirt] [PATCH 0/3] v2: qemu: export disk snapshot capability
by Francesco Romani 26 Mar '14

26 Mar '14

This patch series extend the QEMU capabilities XML to report if the underlying QEMU binary supports, or not, the live disk snapshotting. Without this patch series, the only way to know if QEMU has this support is to actually request a disk snapshot and to see what happens. The change is split in three patches: * patch #1 actually adds the new element in the QEMU capabilities XML. formatcaps.html.in wasn't very detailed about the actual XML format, so I've not updated it. Anyone feel free to point out what should be added, and I'll comply. The new element has the form <disksnapshot default='value' toggle='off'> because I'd like to convey two informations: - disk snapshot is supposed to be here, and it is (default='on') - disk snapshot is supposed to be here, and is NOT (default='off') Put in a different way, I tried to help the client as much as possible. This patch was alread reviewed in the first version of this changeset and it is unchanged. * patch #2 Extracts the actual QMEU guest capability inizialitation from the binary probe/capabilities code, in order to isolate the actual initialization from the probing part. I added a new function for the real initialization and left the interface unchanged. Existing code will still call the old code which do the probing and after that calls the new initialization function. The main purpose of this patch is to * allow to write an unit test for this change * make the unit test more robust (with respect the first version of this change) and make it independent from the filesystem layout/qemu availability * patch #3 add a new unit test, aiming to test not only this new feature but also the whole output XML capabilities. Francesco Romani (3): qemu: export disk snapshot support in capabilities qemu: extract guest capabilities initialization qemu: add unit tests for the capabilities xml docs/schemas/capability.rng | 6 + src/qemu/qemu_capabilities.c | 50 +++-- src/qemu/qemu_capabilities.h | 7 + tests/Makefile.am | 10 +- tests/qemucaps2xmldata/all_1.6.0-1.caps | 142 ++++++++++++++ tests/qemucaps2xmldata/all_1.6.0-1.xml | 31 ++++ tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps | 141 ++++++++++++++ tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml | 31 ++++ tests/qemucaps2xmltest.c | 206 +++++++++++++++++++++ 9 files changed, 609 insertions(+), 15 deletions(-) create mode 100644 tests/qemucaps2xmldata/all_1.6.0-1.caps create mode 100644 tests/qemucaps2xmldata/all_1.6.0-1.xml create mode 100644 tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps create mode 100644 tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml create mode 100644 tests/qemucaps2xmltest.c -- 1.8.5.3

2 7

[libvirt] [PATCH v2 0/2] bhyve: add xml2args unittest
by Roman Bogorodskiy 26 Mar '14

26 Mar '14

Changes from v1: - Chase MAC address support by adding virMacAddrGenerate() mock, so we can get a constant MAC address - Add a test for the case when MAC address is specified in the domain xml Roman Bogorodskiy (2): Move virBhyveTapGetRealDeviceName to virnetdevtap bhyve: add xml2args unittest src/bhyve/bhyve_command.c | 70 +--------- src/libvirt_private.syms | 1 + src/util/virnetdevtap.c | 78 +++++++++++ src/util/virnetdevtap.h | 3 + tests/Makefile.am | 25 ++++ .../bhyvexml2argvdata/bhyvexml2argv-acpiapic.args | 3 + tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml | 24 ++++ tests/bhyvexml2argvdata/bhyvexml2argv-base.args | 3 + tests/bhyvexml2argvdata/bhyvexml2argv-base.xml | 20 +++ .../bhyvexml2argv-disk-virtio.args | 3 + .../bhyvexml2argv-disk-virtio.xml | 20 +++ tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args | 3 + tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml | 21 +++ tests/bhyvexml2argvmock.c | 49 +++++++ tests/bhyvexml2argvtest.c | 155 +++++++++++++++++++++ 15 files changed, 409 insertions(+), 69 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-base.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-base.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml create mode 100644 tests/bhyvexml2argvmock.c create mode 100644 tests/bhyvexml2argvtest.c -- 1.8.4.2

2 5

[libvirt] [PATCH] qemuDomainAttachDeviceFlags: Parse device xml as inactive
by Michal Privoznik 26 Mar '14

26 Mar '14

In all other drivers we are doing so. Moreover, we don't want to parse runtime information in attach (even if the attach is meant as live) because we are generating the runtime info ourselves. We can't trust users they supply sane values anyway. ==1140== 9 bytes in 1 blocks are definitely lost in loss record 72 of 1,151 ==1140== at 0x4A06C2B: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==1140== by 0x623C758: xmlStrndup (in /usr/lib64/libxml2.so.2.9.1) ==1140== by 0x50FD763: virXMLPropString (virxml.c:483) ==1140== by 0x510F8B7: virDomainDeviceInfoParseXML (domain_conf.c:3685) ==1140== by 0x511ACFD: virDomainChrDefParseXML (domain_conf.c:7535) ==1140== by 0x5121D13: virDomainDeviceDefParse (domain_conf.c:9918) ==1140== by 0x13AE6313: qemuDomainAttachDeviceFlags (qemu_driver.c:6926) ==1140== by 0x13AE65FA: qemuDomainAttachDevice (qemu_driver.c:7005) ==1140== by 0x51C77DA: virDomainAttachDevice (libvirt.c:10231) ==1140== by 0x127FDD: remoteDispatchDomainAttachDevice (remote_dispatch.h:2404) ==1140== by 0x127EC5: remoteDispatchDomainAttachDeviceHelper (remote_dispatch.h:2382) ==1140== by 0x5241F81: virNetServerProgramDispatchCall (virnetserverprogram.c:437) When doing live attach, we are passing the inactive definition anyway since we are passing the result of virDomainDeviceDefCopy() which does inactive copy by default. Moreover, we are doing the same mistake in qemuhotplugtest. Just a side note - it makes perfect sense to parse the runtime info like alias in qemuDomainDetachDevice and qemuDomainUpdateDeviceFlags() as in some cases the only difference to distinguish two devices can be just their alias. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 6 +----- tests/qemuhotplugtest.c | 7 ++++++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2707bec..8678d24 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6871,7 +6871,7 @@ static int qemuDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, virDomainDefPtr vmdef = NULL; virDomainDeviceDefPtr dev = NULL, dev_copy = NULL; int ret = -1; - unsigned int affect, parse_flags = 0; + unsigned int affect, parse_flags = VIR_DOMAIN_XML_INACTIVE; virQEMUCapsPtr qemuCaps = NULL; qemuDomainObjPrivatePtr priv; virQEMUDriverConfigPtr cfg = NULL; @@ -6919,10 +6919,6 @@ static int qemuDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, goto endjob; } - if ((flags & VIR_DOMAIN_AFFECT_CONFIG) && - !(flags & VIR_DOMAIN_AFFECT_LIVE)) - parse_flags |= VIR_DOMAIN_XML_INACTIVE; - dev = dev_copy = virDomainDeviceDefParse(xml, vm->def, caps, driver->xmlopt, parse_flags); diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 4ef81e0..a7a4065 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -209,6 +209,7 @@ testQemuHotplug(const void *data) const char *const *tmp; bool fail = test->fail; bool keep = test->keep; + unsigned int device_parse_flags = 0; virDomainObjPtr vm = NULL; virDomainDeviceDefPtr dev = NULL; virCapsPtr caps = NULL; @@ -244,8 +245,12 @@ testQemuHotplug(const void *data) goto cleanup; } + if (test->action == ATTACH) + device_parse_flags = VIR_DOMAIN_XML_INACTIVE; + if (!(dev = virDomainDeviceDefParse(device_xml, vm->def, - caps, driver.xmlopt, 0))) + caps, driver.xmlopt, + device_parse_flags))) goto cleanup; /* Now is the best time to feed the spoofed monitor with predefined -- 1.9.0

2 1

[libvirt] [PATCH v5 0/2] fix query-command-line-options
by Amos Kong 26 Mar '14

26 Mar '14

This patchset fixed some issues of query-command-line-options: * some new options that haven't argument can't be queried. (eg: -enable-fips) * some legacy options that have argument can't be queried. (eg: -vnc display) More discussion: http://marc.info/?l=qemu-devel&m=139081830416684&w=2 V2: remove duplicate option tables, update schema (eric) V3: fix typo in commitlog and export qemu_options talbe (eric) V4: avoid the duplicate static table (eric) V5: rename new field, other fix (markus) Thanks for your review! Amos Kong (2): qmp: rename query_option_descs() to get_param_infolist() query-command-line-options: query all the options in qemu-options.hx qapi-schema.json | 9 +++++++-- qemu-options.h | 12 ++++++++++++ util/qemu-config.c | 49 +++++++++++++++++++++++++++++++++++++++---------- vl.c | 19 ++----------------- 4 files changed, 60 insertions(+), 29 deletions(-) -- 1.8.5.3

2 4

[libvirt] [libvirt-java] [PATCH 0/2] Ensure JNA callbacks cannot be GCed
by Chris Ellis 26 Mar '14

26 Mar '14

Hi. This is a small patch set to fix a few issues I've discovered while testing Claudio's patch set. The first patch is trivial, it adds the ConnectionCloseListener interface and corresponding enum, which were missing. The second patch ensures that the JNA callbacks cannot be garbage collected whilst still registered with the libvirt C library. Durring testing, I was finding that events would stop working. Wireshark showed the remote daemon sending the event and some time spent tracing through the libvirt calls led me to discover that the JNA callback objects were being GCed. The JNA documentation states that a reference to the Callback object must be held whilst it is in use by the C layer. This patch updates the map of event listeners to also hold a reference to the callback object. Regards, Chris Chris Ellis (2): Add close listener types Ensure JNA callbacks cannot get GCed src/main/java/org/libvirt/Connect.java | 37 ++++++++++++++-------- .../org/libvirt/event/ConnectionCloseListener.java | 9 ++++++ .../org/libvirt/event/ConnectionCloseReason.java | 8 +++++ 3 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 src/main/java/org/libvirt/event/ConnectionCloseListener.java create mode 100644 src/main/java/org/libvirt/event/ConnectionCloseReason.java -- 1.8.4.5

2 5

[libvirt] question for <interface> in ethernet type and multiple queues in KVM (start VM failed)
by Wangrui (K) 26 Mar '14

26 Mar '14

Hi, I use ethernet vif for VM (libvirt 1.1.0 qemu 1.5.1). xml as such <interface type='ethernet'> <script path='' /> <target dev='tap_mq'/> <mac address='52:54:00:19:9e:4e'/> <model type='virtio' /> <driver name='vhost' queues='2'/> </interface> tap_mq is a tap device with multi_queue property which was created on host by ip command, such as follows #ip tuntap add tap_mq mode tap multi_queue I want to use multiple queue feature for this vif so I set queues='2' in xml. When start VM , an error occurs "error: unsupported configuration: Multiqueue network is not supported for: ethernet". This error is reported from function qemuBuildInterfaceCommandLine /* Currently nothing besides TAP devices supports multiqueue. */ if (net->driver.virtio.queues > 0 && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || actualType == VIR_DOMAIN_NET_TYPE_BRIDGE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Multiqueue network is not supported for: %s"), virDomainNetTypeToString(actualType)); return -1; } The comment specifies that only TAP device supports multiqueue. But VIR_DOMAIN_NET_TYPE_ETHERNET is also TAP device I think. IMHO, libvirt can build qemu commandline as "-device virtio-net,netdev=net1,mq=on,vectors=5,mac=52:54:00:19:9e:4e" "-netdev type=tap,ifname=tap0,id=net1,vhost=on,vhostforce=on,queues=2". Qemu can open tapfds and vhostfds by itself other than libvirt opens and transfers them to qemu in this case. Or there's other way to use multiqueue feature in ethernet tpye ? Regards, Rui

4 4

[libvirt] [PATCH] maint: use $(SED) instead of sed for syntax-check
by Roman Bogorodskiy 26 Mar '14

26 Mar '14

Some syntax-check rules use GNU sed specific regexps, so allow to override which sed would be used to fix 'syntax-check' for non GNU-userland systems. --- cfg.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cfg.mk b/cfg.mk index 207dfeb..bd984bd 100644 --- a/cfg.mk +++ b/cfg.mk @@ -614,7 +614,7 @@ sc_libvirt_unmarked_diagnostics: $(_sc_search_regexp) @{ grep -nE '\<$(func_re) *$.*;$$' $$($(VC_LIST_EXCEPT)); \ grep -A1 -nE '\<$(func_re) *\(.*,$$' $$($(VC_LIST_EXCEPT)); } \ - | sed 's/_("\([^\"]\|\\.$\+"//;s/[ ]"%s"//' \ + | $(SED) 's/_("$[^\"]\|\\.$\+"//;s/[ ]"%s"//' \ | grep '[ ]"' && \ { echo '$(ME): found unmarked diagnostic(s)' 1>&2; \ exit 1; } || : @@ -639,7 +639,7 @@ sc_prohibit_newline_at_end_of_diagnostic: sc_prohibit_diagnostic_without_format: @{ grep -nE '\<$(func_re) *$.*;$$' $$($(VC_LIST_EXCEPT)); \ grep -A2 -nE '\<$(func_re) *\(.*,$$' $$($(VC_LIST_EXCEPT)); } \ - | sed -rn -e ':l; /[,"]$$/ {N;b l;}' \ + | $(SED) -rn -e ':l; /[,"]$$/ {N;b l;}' \ -e '/(xenapiSessionErrorHandler|vah_(error|warning))/d' \ -e '/\<$(func_re) *\([^"]*"([^%"]|"\n[^"]*")*"[,)]/p' \ | grep -vE 'VIR_ERROR' && \ @@ -661,7 +661,7 @@ sc_prohibit_useless_translation: # or \n on one side of the split. sc_require_whitespace_in_translation: @grep -n -A1 '"$$' $$($(VC_LIST_EXCEPT)) \ - | sed -ne ':l; /"$$/ {N;b l;}; s/"\n[^"]*"/""/g; s/\\n/ /g' \ + | $(SED) -ne ':l; /"$$/ {N;b l;}; s/"\n[^"]*"/""/g; s/\\n/ /g' \ -e '/_(.*[^\ ]""[^\ ]/p' | grep . && \ { echo '$(ME): missing whitespace at line split' 1>&2; \ exit 1; } || : @@ -681,11 +681,11 @@ sc_preprocessor_indentation: sc_spec_indentation: @if cppi --version >/dev/null 2>&1; then \ for f in $$($(VC_LIST_EXCEPT) | grep '\.spec\.in$$'); do \ - sed -e 's|#|// #|; s|%ifn*\(arch$* |#if a // |' \ + $(SED) -e 's|#|// #|; s|%ifn*$arch$* |#if a // |' \ -e 's/%$else\|endif\|define$/#\1/' \ -e 's/^$ *$\1\1\1#/#\1/' \ -e 's|^$ *[^#/ ]$|// \1|; s|^$ */[^/]$|// \1|' $$f \ - | cppi -a -c 2>&1 | sed "s|standard input|$$f|"; \ + | cppi -a -c 2>&1 | $(SED) "s|standard input|$$f|"; \ done | { if grep . >&2; then false; else :; fi; } \ || { echo '$(ME): incorrect preprocessor indentation' 1>&2; \ exit 1; }; \ @@ -777,7 +777,7 @@ sc_prohibit_cross_inclusion: # elements added to the enum by using a _LAST marker. sc_require_enum_last_marker: @grep -A1 -nE '^[^#]*VIR_ENUM_IMPL *\(' $$($(VC_LIST_EXCEPT)) \ - | sed -ne '/VIR_ENUM_IMPL[^,]*,$$/N' \ + | $(SED) -ne '/VIR_ENUM_IMPL[^,]*,$$/N' \ -e '/VIR_ENUM_IMPL[^,]*,[^,]*[^_,][^L,][^A,][^S,][^T,],/p' \ -e '/VIR_ENUM_IMPL[^,]*,[^,]\{0,4\},/p' \ | grep . && \ @@ -878,7 +878,7 @@ ifeq (0,$(MAKELEVEL)) # b653eda3ac4864de205419d9f41eec267cb89eeb # # Keep this logic in sync with autogen.sh. - _submodule_hash = sed 's/^[ +-]//;s/ .*//' + _submodule_hash = $(SED) 's/^[ +-]//;s/ .*//' _update_required := $(shell \ cd '$(srcdir)'; \ test -d .git || { echo 0; exit; }; \ -- 1.8.4.3

3 4

[libvirt] [PATCH] qemu: remove redundant virQEMUDriverGetConfig
by Tomoki Sekiyama 26 Mar '14

26 Mar '14

qemuDomainSetSchedulerParametersFlags() calls virQEMUDriverGetConfig() twice and makes the reference counter leak. This removes redundant call. --- src/qemu/qemu_driver.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 76f789e..ca971f3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9050,7 +9050,6 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, if (virDomainSetSchedulerParametersFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; - cfg = virQEMUDriverGetConfig(driver); if (!cfg->privileged) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("CPU tuning is not available in session mode"));

4 3

[libvirt] [PATCH 0/3] Resolve recent/new Coverity warnings
by John Ferlan 26 Mar '14

26 Mar '14

For virlog.c and commandtest.c - it seems recent changes within the modules have allowed Coverity to dig deeper and find different issues. Not sure why Coverity has that "ability"... Since I was making changes, figured I'd clean up the lxc_controller fd leak as well - these should clean the Jenkins build environment. John Ferlan (3): Coverity: Resolve a CHECKED_RETURN message Coverity: Resolve a FORWARD_NULL Coverity: Resolve a RESOURCE_LEAK src/lxc/lxc_controller.c | 14 ++++++++++---- src/util/virlog.c | 2 +- tests/commandtest.c | 1 + 3 files changed, 12 insertions(+), 5 deletions(-) -- 1.8.5.3

3 8

[libvirt] [libvirt-java] [PATCH] Set Java source level in pom
by Chris Ellis 26 Mar '14

26 Mar '14

Hi Simple patch to set the Java source level within the pom, this makes it easier to import the project into Eclipse. I've also added an ignore for a local pom file. I've added plugins to publish the sources and javadocs into Maven. This allows Maven (and IDE integration) to automatically use the javadocs and source. This should make life easier for users of libvirt-java. Regards, Chris Chris Ellis (1): Update pom to include Java source level .gitignore | 1 + pom.xml.in | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) -- 1.8.4.5

3 6

[libvirt] [PATCHv2 0/2] Fix zero cpu shares handling
by Ján Tomko 26 Mar '14

26 Mar '14

Treat 0 as a valid value for cputune shares. v1: https://www.redhat.com/archives/libvir-list/2014-March/msg00215.html v2: squashed the fixup that was sent as a separate patch to the first commit and fixed two more occurences (one of them pointed out by Martin) Ján Tomko (2): Treat zero cpu shares as a valid value Show the real cpu shares value in live xml src/conf/domain_conf.c | 12 ++++---- src/conf/domain_conf.h | 1 + src/lxc/lxc_cgroup.c | 13 ++++++-- src/lxc/lxc_driver.c | 8 ++++- src/lxc/lxc_native.c | 8 +++-- src/parallels/parallels_driver.c | 1 + src/qemu/qemu_cgroup.c | 14 ++++++--- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_driver.c | 13 ++++++-- src/vmx/vmx.c | 3 +- .../qemuxml2argv-cputune-zero-shares.args | 5 ++++ .../qemuxml2argv-cputune-zero-shares.xml | 35 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + 14 files changed, 97 insertions(+), 20 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.xml -- 1.8.3.2

2 5

[libvirt] [libivrt][RFC]Send "netdev_del" command after receive the DEVICE_DELETED event
by x00221466 26 Mar '14

26 Mar '14

Hi all: There maybe a bug about detaching virtual net device（such as virtio nic、 RTL8138、E1000）。 When live detaching the net device, there are some problems: (1)If the Guest OS don't support the hot plugging pci device, detach the virtual network device by Libvirt, the "net device" in Qemu will still exist, but "hostnet"(tap) in Qemu will be removed. so the net device in Guest OS will be of no effect. (2)If reject the nic in Guest OS, Qemu will remove the "net device", then Qemu send DEVICE_DELETED to Libvirt, Libvirt receive the event in event-loop thread and release info of the net device in qemuDomainRemoveNetDevice func. but "hostnet" in Qemu still exist. So next live attaching virtual net device will be failed because of "Duplicate ID". #virsh attach-device win2008_st_r2_64 net.xml --live error: Failed to attach device from net.xml error: internal error: unable to execute QEMU command 'netdev_add': Duplicate ID 'hostnet0' for netdev (3)In addition, in qemuDomainDetachNetDevice, detach net device func, "netdev_del" command will be sent after sending "device_del" command at once. So it is violent to remove the tap device before the net device is completely removed. So I think it's more logical that doing the work of sending Qemu command "netdev_del" after receive the DEVICE_DELETED event. It can avoid the conflict of device info between Libvirt side and Qemu side. I create a thread in qemuDomainRemoveDevice,the handle of DEVICE_DELETED event, to execute QEMU command "netdev_del". But I find there is another problem when sending monitor msg in multiply threads. in "qemuMonitorSend", monitor lock maybe unlocked and locked, so another thread has the opportunity to get the monitor lock, and use the same monitor. It will occur error. I wonder if it is workable that sending "netdev_del" command after receive the DEVICE_DELETED event. Thanks. -xie

1 0

[libvirt] [PATCH python 0/4] setup.py: Don't unconditionally run pkg-config
by Cole Robinson 25 Mar '14

25 Mar '14

This series reorganizes setup.py to not unconditionally call pkg-config. This will allow 'setup.py clean' and 'setup.py --help' to work correctly even if pkg-config or libvirt-devel aren't installed. https://bugzilla.redhat.com/show_bug.cgi?id=1074170 Cole Robinson (4): setup.py: Remove unused import setup.py: Move module list building to its own function setup.py: Make have_libvirt_lxc a function setup.py: Allow running --help or clean without pkg-config setup.py | 144 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 85 insertions(+), 59 deletions(-) -- 1.8.5.3

2 6

[libvirt] [PATCH] bhyve: don't fail on busy tap devices
by Roman Bogorodskiy 25 Mar '14

25 Mar '14

We use virBhyveTapGetRealDeviceName() to map network interface name to a real device path, trying to open possible devices and getting names by ioctl. Make it skip devices that fail to open with EBUSY because they're most likely already used by other VMs. --- src/bhyve/bhyve_command.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 6d64c27..e569aab 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -69,6 +69,8 @@ virBhyveTapGetRealDeviceName(char *name) goto cleanup; } if ((fd = open(devpath, O_RDWR)) < 0) { + if (errno == EBUSY) + continue; virReportSystemError(errno, _("Unable to open '%s'"), devpath); goto cleanup; } -- 1.8.4.2

2 2

[libvirt] [PATCH] libxl: Create log directory earlier
by Stefan Bader 25 Mar '14

25 Mar '14

Commit d9f19c30d054c86b15a304f4118baa4fa75af9d2 moved a lot of the configuration setup into libxlDriverConfigNew(). However that tries to create the libxl/libxl-driver.log before the libxl directory gets created in libxlStateInitialize(). This causes the daemon to fail on systems that have not had the directory created before. Move the code to create the libxl directory into libxlDriverConfigNew(). Signed-off-by: Stefan Bader <stefan.bader(a)canonical.com> --- src/libxl/libxl_conf.c | 8 ++++++++ src/libxl/libxl_driver.c | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index a6bf1cf..56bb84a 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1108,6 +1108,14 @@ libxlDriverConfigNew(void) if (virAsprintf(&log_file, "%s/libxl-driver.log", cfg->logDir) < 0) goto error; + if (virFileMakePath(cfg->logDir) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to create log dir '%s': %s"), + cfg->logDir, + virStrerror(errno, ebuf, sizeof(ebuf))); + goto error; + } + if ((cfg->logger_file = fopen(log_file, "a")) == NULL) { VIR_ERROR(_("Failed to create log file '%s': %s"), log_file, virStrerror(errno, ebuf, sizeof(ebuf))); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 0c6672b..e6316a7 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -306,13 +306,6 @@ libxlStateInitialize(bool privileged, goto error; libxl_driver->config = cfg; - if (virFileMakePath(cfg->logDir) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to create log dir '%s': %s"), - cfg->logDir, - virStrerror(errno, ebuf, sizeof(ebuf))); - goto error; - } if (virFileMakePath(cfg->stateDir) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to create state dir '%s': %s"), -- 1.7.9.5

2 1

[libvirt] [PATCHv2] network: fix problems with SRV records
by Laine Stump 25 Mar '14

25 Mar '14

A patch submitted by Steven Malin last week pointed out a problem with libvirt's DNS SRV record configuration: https://www.redhat.com/archives/libvir-list/2014-March/msg00536.html When searching for that message later, I found another series that had been posted by Guannan Ren back in 2012 that somehow slipped between the cracks: https://www.redhat.com/archives/libvir-list/2012-July/msg00236.html That patch was very much out of date, but also pointed out some real problems. This patch fixes all the noted problems by refactoring virNetworkDNSSrvDefParseXML() and networkDnsmasqConfContents(), then verifies those fixes by added several new records to the test case. Problems fixed: * both service and protocol now have an underscore ("_") prepended on the commandline, as required by RFC2782. <srv service='sip' protocol='udp' domain='example.com' target='tests.example.com' port='5060' priority='10' weight='150'/> before: srv-host=sip.udp.example.com,tests.example.com,5060,10,150 after: srv-host=_sip._udp.example.com,tests.example.com,5060,10,150 * if "domain" wasn't specified in the <srv> element, the extra trailing "." will no longer be added to the dnsmasq commandline. <srv service='sip' protocol='udp' target='tests.example.com' port='5060' priority='10' weight='150'/> before: srv-host=sip.udp.,tests.example.com,5060,10,150 after: srv-host=_sip._udp,tests.example.com,5060,10,150 * when optional attributes aren't specified, the separating comma is also now not placed on the dnsmasq commandline. If optional attributes in the middle of the line are not specified, they are replaced with a default value in the commandline (1 for port, 0 for priority and weight). <srv service='sip' protocol='udp' target='tests.example.com' port='5060'/> before: srv-host=sip.udp.,tests.example.com,5060,, after: srv-host=_sip._udp,tests.example.com,5060 (actually the would have generated an error, because "optional" attributes weren't really optional.) * The allowed characters for both service and protocol are now limited to alphanumerics, plus a few special characters that are found in existing names in /etc/services and /etc/protocols. (One exception is that both of these files contain names with an embedded ".", but "." can't be used in these fields of an SRV record because it is used as a field separator and there is no method to escape a "." into a field.) (Previously only the strings "tcp" and "udp" were allowed for protocol, but this restriction has been removed, since RFC2782 specifically says that it isn't limited to those, and that anyway it is case insensitive.) * the "domain" attribute is no longer required in order to recognize the port, priority, and weight attributes during parsing. Only "target" is required for this. * if "target" isn't specified, port, priority, and weight are not allowed (since they are meaningless - an empty target means "this service is *not available* for this domain"). * port, priority, and weight are now truly optional, as the comments originally suggested, but which was not actually true. --- Changes from V1: https://www.redhat.com/archives/libvir-list/2014-March/msg01172.html src/conf/network_conf.c | 129 ++++++++++++++------- src/network/bridge_driver.c | 80 ++++++++----- .../nat-network-dns-srv-record-minimal.conf | 2 +- .../nat-network-dns-srv-record.conf | 8 +- .../nat-network-dns-srv-record.xml | 8 +- 5 files changed, 149 insertions(+), 78 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 9be06d3..f1e6243 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -924,6 +924,21 @@ error: return -1; } +/* This includes all characters used in the names of current + * /etc/services and /etc/protocols files (on Fedora 20), except ".", + * which we can't allow because it would conflict with the use of "." + * as a field separator in the SRV record, there appears to be no way + * to escape it in, and the protocols/services that use "." in the + * name are obscure and unlikely to be used anyway. + */ +#define PROTOCOL_CHARS \ + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" \ + "-+/" + +#define SERVICE_CHARS \ + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" \ + "_-+/*" + static int virNetworkDNSSrvDefParseXML(const char *networkName, xmlNodePtr node, @@ -931,80 +946,108 @@ virNetworkDNSSrvDefParseXML(const char *networkName, virNetworkDNSSrvDefPtr def, bool partialOkay) { + int ret; + xmlNodePtr save_ctxt = ctxt->node; + + ctxt->node = node; + if (!(def->service = virXMLPropString(node, "service")) && !partialOkay) { virReportError(VIR_ERR_XML_DETAIL, _("Missing required service attribute in DNS SRV record " "of network %s"), networkName); goto error; } - if (def->service && strlen(def->service) > DNS_RECORD_LENGTH_SRV) { - virReportError(VIR_ERR_XML_DETAIL, - _("Service name '%s' in network %s is too long, limit is %d bytes"), - def->service, networkName, DNS_RECORD_LENGTH_SRV); - goto error; + if (def->service) { + if (strlen(def->service) > DNS_RECORD_LENGTH_SRV) { + virReportError(VIR_ERR_XML_DETAIL, + _("service attribute '%s' in network %s is too long, " + "limit is %d bytes"), + def->service, networkName, DNS_RECORD_LENGTH_SRV); + goto error; + } + if (strspn(def->service, SERVICE_CHARS) < strlen(def->service)) { + virReportError(VIR_ERR_XML_DETAIL, + _("invalid character in service attribute '%s' " + "in network %s DNS SRV record"), + def->service, networkName); + goto error; + } } if (!(def->protocol = virXMLPropString(node, "protocol")) && !partialOkay) { virReportError(VIR_ERR_XML_DETAIL, _("Missing required protocol attribute " - "in dns srv record '%s' of network %s"), + "in DNS SRV record '%s' of network %s"), def->service, networkName); goto error; } - - /* Check whether protocol value is the supported one */ - if (def->protocol && STRNEQ(def->protocol, "tcp") && - (STRNEQ(def->protocol, "udp"))) { + if (def->protocol && + strspn(def->protocol, PROTOCOL_CHARS) < strlen(def->protocol)) { virReportError(VIR_ERR_XML_DETAIL, - _("Invalid protocol attribute value '%s' " - "in DNS SRV record of network %s"), + _("invalid character in protocol attribute '%s' " + "in network %s DNS SRV record"), def->protocol, networkName); goto error; } /* Following attributes are optional */ - if ((def->target = virXMLPropString(node, "target")) && - (def->domain = virXMLPropString(node, "domain"))) { - xmlNodePtr save_ctxt = ctxt->node; - - ctxt->node = node; - if (virXPathUInt("string(./@port)", ctxt, &def->port) < 0 || - def->port > 65535) { - virReportError(VIR_ERR_XML_DETAIL, - _("Missing or invalid port attribute " - "in network %s"), networkName); - goto error; - } - - if (virXPathUInt("string(./@priority)", ctxt, &def->priority) < 0 || - def->priority > 65535) { - virReportError(VIR_ERR_XML_DETAIL, - _("Missing or invalid priority attribute " - "in network %s"), networkName); - goto error; - } + def->domain = virXMLPropString(node, "domain"); + def->target = virXMLPropString(node, "target"); - if (virXPathUInt("string(./@weight)", ctxt, &def->weight) < 0 || - def->weight > 65535) { - virReportError(VIR_ERR_XML_DETAIL, - _("Missing or invalid weight attribute " - "in network %s"), networkName); - goto error; - } + ret = virXPathUInt("string(./@port)", ctxt, &def->port); + if (ret >= 0 && !def->target) { + virReportError(VIR_ERR_XML_DETAIL, + _("DNS SRV port attribute not permitted without " + "target for service %s in network %s"), + def->service, networkName); + goto error; + } + if (ret == -2 || (ret >= 0 && (def->port < 1 || def->port > 65535))) { + virReportError(VIR_ERR_XML_DETAIL, + _("Invalid DNS SRV port attribute " + "for service %s in network %s"), + def->service, networkName); + goto error; + } - ctxt->node = save_ctxt; + ret = virXPathUInt("string(./@priority)", ctxt, &def->priority); + if (ret >= 0 && !def->target) { + virReportError(VIR_ERR_XML_DETAIL, + _("DNS SRV priority attribute not permitted without " + "target for service %s in network %s"), + def->service, networkName); + goto error; + } + if (ret == -2 || (ret >= 0 && def->priority > 65535)) { + virReportError(VIR_ERR_XML_DETAIL, + _("Invalid DNS SRV priority attribute " + "for service %s in network %s"), + def->service, networkName); + goto error; } - if (!(def->service || def->protocol)) { + ret = virXPathUInt("string(./@weight)", ctxt, &def->weight); + if (ret >= 0 && !def->target) { virReportError(VIR_ERR_XML_DETAIL, - _("Missing required service attribute or protocol " - "in DNS SRV record of network %s"), networkName); + _("DNS SRV weight attribute not permitted without " + "target for service %s in network %s"), + def->service, networkName); + goto error; + } + if (ret == -2 || (ret >= 0 && def->weight > 65535)) { + virReportError(VIR_ERR_XML_DETAIL, + _("Invalid DNS SRV weight attribute " + "for service %s in network %s"), + def->service, networkName); goto error; } + + ctxt->node = save_ctxt; return 0; error: virNetworkDNSSrvDefClear(def); + ctxt->node = save_ctxt; return -1; } diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 59b6c09..e256dba 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -736,10 +736,6 @@ networkDnsmasqConfContents(virNetworkObjPtr network, int r, ret = -1; int nbleases = 0; size_t i; - char *record = NULL; - char *recordPort = NULL; - char *recordWeight = NULL; - char *recordPriority = NULL; virNetworkDNSDefPtr dns = &network->def->dns; virNetworkIpDefPtr tmpipdef, ipdef, ipv4def, ipv6def; bool ipv6SLAAC; @@ -880,33 +876,57 @@ networkDnsmasqConfContents(virNetworkObjPtr network, } for (i = 0; i < dns->nsrvs; i++) { - if (dns->srvs[i].service && dns->srvs[i].protocol) { - if (dns->srvs[i].port && - virAsprintf(&recordPort, "%d", dns->srvs[i].port) < 0) - goto cleanup; - if (dns->srvs[i].priority && - virAsprintf(&recordPriority, "%d", dns->srvs[i].priority) < 0) - goto cleanup; - if (dns->srvs[i].weight && - virAsprintf(&recordWeight, "%d", dns->srvs[i].weight) < 0) - goto cleanup; + /* service/protocol are required, and should have been validated + * by the parser. + */ + if (!dns->srvs[i].service) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Missing required 'service' " + "attribute in SRV record of network '%s'"), + network->def->name); + goto cleanup; + } + if (!dns->srvs[i].protocol) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Missing required 'service' " + "attribute in SRV record of network '%s'"), + network->def->name); + goto cleanup; + } + /* RFC2782 requires that service and protocol be preceded by + * an underscore. + */ + virBufferAsprintf(&configbuf, "srv-host=_%s._%s", + dns->srvs[i].service, dns->srvs[i].protocol); - if (virAsprintf(&record, "%s.%s.%s,%s,%s,%s,%s", - dns->srvs[i].service, - dns->srvs[i].protocol, - dns->srvs[i].domain ? dns->srvs[i].domain : "", - dns->srvs[i].target ? dns->srvs[i].target : "", - recordPort ? recordPort : "", - recordPriority ? recordPriority : "", - recordWeight ? recordWeight : "") < 0) - goto cleanup; + /* domain is optional - it defaults to the domain of this network */ + if (dns->srvs[i].domain) + virBufferAsprintf(&configbuf, ".%s", dns->srvs[i].domain); - virBufferAsprintf(&configbuf, "srv-host=%s\n", record); - VIR_FREE(record); - VIR_FREE(recordPort); - VIR_FREE(recordWeight); - VIR_FREE(recordPriority); + /* If target is empty or ".", that means "the service is + * decidedly not available at this domain" (RFC2782). In that + * case, any port, priority, or weight is irrelevant. + */ + if (dns->srvs[i].target && STRNEQ(dns->srvs[i].target, ".")) { + + virBufferAsprintf(&configbuf, ",%s", dns->srvs[i].target); + /* port, priority, and weight are optional, but are + * identified by their position in the line. If an item is + * unspecified, but something later in the line *is* + * specified, we need to give the default value for the + * unspecified item. (According to the dnsmasq manpage, + * the default for port is 1). + */ + if (dns->srvs[i].port || + dns->srvs[i].priority || dns->srvs[i].weight) + virBufferAsprintf(&configbuf, ",%d", + dns->srvs[i].port ? dns->srvs[i].port : 1); + if (dns->srvs[i].priority || dns->srvs[i].weight) + virBufferAsprintf(&configbuf, ",%d", dns->srvs[i].priority); + if (dns->srvs[i].weight) + virBufferAsprintf(&configbuf, ",%d", dns->srvs[i].weight); } + virBufferAddLit(&configbuf, "\n"); } /* Find the first dhcp for both IPv4 and IPv6 */ @@ -1082,10 +1102,6 @@ networkDnsmasqConfContents(virNetworkObjPtr network, cleanup: virBufferFreeAndReset(&configbuf); - VIR_FREE(record); - VIR_FREE(recordPort); - VIR_FREE(recordWeight); - VIR_FREE(recordPriority); return ret; } diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf index ce4dd6f..e60411b 100644 --- a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf +++ b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf @@ -12,7 +12,7 @@ listen-address=192.168.123.1 listen-address=fc00:db8:ac10:fe01::1 listen-address=fc00:db8:ac10:fd01::1 listen-address=10.24.10.1 -srv-host=name.tcp.,,,, +srv-host=_name._tcp dhcp-range=192.168.122.2,192.168.122.254 dhcp-no-override dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.conf b/tests/networkxml2confdata/nat-network-dns-srv-record.conf index b47cbe7..16e7dca 100644 --- a/tests/networkxml2confdata/nat-network-dns-srv-record.conf +++ b/tests/networkxml2confdata/nat-network-dns-srv-record.conf @@ -8,7 +8,13 @@ strict-order except-interface=lo bind-dynamic interface=virbr0 -srv-host=name.tcp.test-domain-name,.,1024,10,10 +srv-host=_name._tcp.test-domain-name.com,test.example.com,1111,11,111 +srv-host=_name2._udp,test2.example.com,2222,22,222 +srv-host=_name3._tcp.test3.com,test3.example.com,3333,33 +srv-host=_name4._tcp.test4.com,test4.example.com,4444 +srv-host=_name5._udp,test5.example.com,1,55,555 +srv-host=_name6._tcp.test6.com,test6.example.com,6666,0,666 +srv-host=_name7._tcp.test7.com,test7.example.com,1,0,777 dhcp-range=192.168.122.2,192.168.122.254 dhcp-no-override dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.xml b/tests/networkxml2confdata/nat-network-dns-srv-record.xml index 3dd19e6..d01b331 100644 --- a/tests/networkxml2confdata/nat-network-dns-srv-record.xml +++ b/tests/networkxml2confdata/nat-network-dns-srv-record.xml @@ -6,7 +6,13 @@ </forward> <bridge name='virbr0' stp='on' delay='0'/> <dns> - <srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/> + <srv service='name' protocol='tcp' domain='test-domain-name.com' target='test.example.com' port='1111' priority='11' weight='111'/> + <srv service='name2' protocol='udp' target='test2.example.com' port='2222' priority='22' weight='222'/> + <srv service='name3' protocol='tcp' domain='test3.com' target='test3.example.com' port='3333' priority='33'/> + <srv service='name4' protocol='tcp' domain='test4.com' target='test4.example.com' port='4444'/> + <srv service='name5' protocol='udp' target='test5.example.com' priority='55' weight='555'/> + <srv service='name6' protocol='tcp' domain='test6.com' target='test6.example.com' port='6666' weight='666'/> + <srv service='name7' protocol='tcp' domain='test7.com' target='test7.example.com' weight='777'/> </dns> <ip address='192.168.122.1' netmask='255.255.255.0'> <dhcp> -- 1.8.5.3

2 1

[libvirt] [PATCH 00/24] Indent top-level labels by one space
by Ján Tomko 25 Mar '14

25 Mar '14

3 28

[libvirt] [python PATCHv2 0/2] arbitrary qemu events
by Eric Blake 25 Mar '14

25 Mar '14

Changes since v1: rebase to latest code base, address review comments regarding a leak of dom, add prereq patch to fix bugs that I had been copying and pasting Eric Blake (2): event: fix domain reference bugs qemu: support arbitrary monitor events generator.py | 20 +-- libvirt-override.c | 319 +++++++++++++++++++++++++++++------------------ libvirt-qemu-override.c | 223 ++++++++++++++++++++++++++++++++- libvirt-qemu-override.py | 35 ++++++ 4 files changed, 469 insertions(+), 128 deletions(-) create mode 100644 libvirt-qemu-override.py -- 1.8.5.3

2 4

[libvirt] [libvirt-python PATCH] generator: Add virConnectDomainQemuMonitorEventCallback to skipped_types
by Martin Kletzander 25 Mar '14

25 Mar '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: pushed as a build-breaker generator.py | 1 + 1 file changed, 1 insertion(+) diff --git a/generator.py b/generator.py index 0e9600f..e409921 100755 --- a/generator.py +++ b/generator.py @@ -273,6 +273,7 @@ skipped_types = { 'virConnectDomainEventWatchdogCallback': "No function types in python", 'virConnectDomainEventIOErrorCallback': "No function types in python", 'virConnectDomainEventGraphicsCallback': "No function types in python", + 'virConnectDomainQemuMonitorEventCallback': "No function types in python", 'virStreamEventCallback': "No function types in python", 'virEventHandleCallback': "No function types in python", 'virEventTimeoutCallback': "No function types in python", -- 1.9.1

1 0

[libvirt] [PATCH 0/2] sanlock: Forbid unsupported lock failure actions
by Jiri Denemark 25 Mar '14

25 Mar '14

Some lock failure actions do not make any sense in combination with sanlock driver. Let's just report an error if someone tries to use them instead of causing unexpected and possibly quite bad thing to happen. Jiri Denemark (2): sanlock: Forbid VIR_DOMAIN_LOCK_FAILURE_IGNORE sanlock: Forbid VIR_DOMAIN_LOCK_FAILURE_RESTART src/locking/lock_driver_sanlock.c | 12 +++++++++++- src/locking/sanlock_helper.c | 28 +++------------------------- 2 files changed, 14 insertions(+), 26 deletions(-) -- 1.9.1

2 4

[libvirt] [PATCH 0/4] bhyve integration: pie, blk, MAC, host API
by Wojciech Macek 25 Mar '14

25 Mar '14

Hi, I'm working on enabling OpenStack/libvirt support for FreeBSD hosts. Please look into some patches I'd like to submit for rewiev. 1. PIE-flag: on some FreeBSD-10 the clang toolchain is broken and cannot build executables with PIE option, so I added the flag to let the user choose. 2. bhyve MAC: add MAC address configuration for bhyve virtio network adapter 3. bhyve blk: add support for up to 8 blk devices, atapi/sata/virtio bus with file/block backend 4. bhyve host API: initial support for "host" functions on FreeBSD Regards, Wojtek Wojciech Macek (4): pie: add Position-Independent-Executable flag bhyve: MAC address configuration bhyve: multiple virtio-blk devices support bhyve: host API support configure.ac | 14 +++++++- src/bhyve/bhyve_command.c | 92 ++++++++++++++++++++++++++++++----------------- src/bhyve/bhyve_command.h | 8 +++++ src/bhyve/bhyve_driver.c | 66 ++++++++++++++++++++++++++++++++++ src/nodeinfo.c | 19 ++++++++++ 5 files changed, 165 insertions(+), 34 deletions(-) -- 1.9.0

4 13

[libvirt] [PATCHv2] gluster: Fix "key" attribute for gluster volumes
by Peter Krempa 25 Mar '14

25 Mar '14

According to our documentation the "key" value has the following meaning: "Providing an identifier for the volume which identifies a single volume." The currently used keys for gluster volumes consist of the gluster volume name and file path. This can't be considered unique as a different storage server can serve a volume with the same name. Unfortunately I wasn't able to figure out a way to retrieve the gluster volume UUID which would avoid the possibility of having two distinct keys identifying a single volume. Use the full URI as the key for the volume to avoid the more critical ambiguity problem and document the possible change to UUID. --- docs/storage.html.in | 6 ++++-- src/storage/storage_backend_gluster.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/docs/storage.html.in b/docs/storage.html.in index 2706bc5..f75996a 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -711,8 +711,10 @@ correspond to the files that can be found when mounting the gluster volume. The <code>name</code> is the path relative to the effective mount specified for the pool; and - the <code>key</code> is a path including the gluster volume - name and any subdirectory specified by the pool.</p> + the <code>key</code> is a string that identifies a single volume + uniquely. Currently the <code>key</code> attribute consists of the + URI of the volume but it may be changed to an UUID of the volume + in the future.</p> <pre> <volume> <name>myfile</name> diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index a22b23a..06292fa 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -187,6 +187,7 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state, const char *name) { int ret = -1; + char *path = NULL; char *tmp; VIR_FREE(vol->key); @@ -201,12 +202,12 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state, goto cleanup; } - if (virAsprintf(&vol->key, "%s%s%s", state->volname, state->dir, + if (virAsprintf(&path, "%s%s%s", state->volname, state->dir, vol->name) < 0) goto cleanup; tmp = state->uri->path; - if (virAsprintf(&state->uri->path, "/%s", vol->key) < 0) { + if (virAsprintf(&state->uri->path, "/%s", path) < 0) { state->uri->path = tmp; goto cleanup; } @@ -218,9 +219,14 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state, VIR_FREE(state->uri->path); state->uri->path = tmp; + /* the path is unique enough to serve as a volume key */ + if (VIR_STRDUP(vol->key, vol->target.path) < 0) + goto cleanup; + ret = 0; cleanup: + VIR_FREE(path); return ret; } -- 1.9.0

1 1

[libvirt] [PATCH] util: Sanitize ATTRIBUTE_NONNULL use in viriscsi.h
by Peter Krempa 25 Mar '14

25 Mar '14

Some of the function attributes marked as nonnull actually explicitly handle the arguments for NULL. All changed functions handle missing "initiatoriqn" argument well and virISCSIScanTargets also handles well if the return pointers are missing. Remove some of the liberaly used ATTRIBUTE_NONNULLs as coverity and possibly other compilers that honor the attribute fail to compile the code. Flaw introduced in commit 5e1d5dde --- src/util/viriscsi.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/util/viriscsi.h b/src/util/viriscsi.h index b2dd3f1..f4093f7 100644 --- a/src/util/viriscsi.h +++ b/src/util/viriscsi.h @@ -33,14 +33,14 @@ int virISCSIConnectionLogin(const char *portal, const char *initiatoriqn, const char *target) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; int virISCSIConnectionLogout(const char *portal, const char *initiatoriqn, const char *target) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; int @@ -52,8 +52,7 @@ virISCSIScanTargets(const char *portal, const char *initiatoriqn, size_t *ntargetsret, char ***targetsret) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virISCSINodeUpdate(const char *portal, -- 1.9.0

2 2

[libvirt] [RFC PATCH] Behaviour of topology, vcpus and maxcpus
by Nikunj Dadhania 25 Mar '14

25 Mar '14

I have observed the following with libvirt xml: <vcpu>6</vcpu> <cpu> <topology sockets='1' cores='4' threads='2'/> </cpu> So according to the topology maximum supported is 8 vcpus, while the libvirt sets that to 6 - specified in <vcpu> tag. Shouldn't libvirt error this out as the mismatch between the topology definition and the vcpu count? There is an upper bound check already in place where if we have maxcpu > topology-supported cpus, that errors out. For eg. <vcpu>12</vcpu> <cpu> <topology sockets='1' cores='4' threads='2'/> </cpu> The below patch make sures that libvirt does the lower bound check as well. Regards Nikunj diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f96110b..aa25940 100644 [ 0001-Behaviour-of-topology-vcpus-and-maxcpus.patch: inline patch (as text/x-diff) ] --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12933,6 +12933,14 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } + if (def->cpu->sockets && + def->maxvcpus < + def->cpu->sockets * def->cpu->cores * def->cpu->threads) { + virReportError(VIR_ERR_XML_DETAIL, "%s", + _("CPUs provided is less than topology")); + goto error; + } + if (def->cpu->cells_cpus > def->maxvcpus) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Number of CPUs in <numa> exceeds the"

1 0

[libvirt] [PATCH v3 0/5] Expose FSFreeze/FSThaw within the guest as API
by Tomoki Sekiyama 25 Mar '14

25 Mar '14

This is patchset v3 to add FSFreeze/FSThaw API for custom disk snapshotting. Changes to v2: * use "@acl: domain:fs_freeze" in remote driver (also applied to VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE flag) * added 'quiesced' attribute in live XML to preserve domains' quiesced state across libvirtd restarts * rebased to latest tree (v2: https://www.redhat.com/archives/libvir-list/2014-March/msg00306.html ) === Description === Currently FSFreeze and FSThaw are supported by qemu guest agent and they are used internally in snapshot-create command with --quiesce option. However, when users want to utilize the native snapshot feature of storage devices (such as LVM over iSCSI, enterprise storage appliances, etc.), they need to issue fsfreeze command separately from libvirt-driven snapshots. (OpenStack cinder provides these storages' snapshot feature, but it cannot quiesce the guest filesystems automatically for now.) Although virDomainQemuGuestAgent() API could be used for this purpose, it is only for debugging and is not supported officially. This patchset adds virDomainFSFreeze()/virDomainFSThaw() APIs and virsh domfsfreeze/domfsthaw commands to enable the users to freeze and thaw domain's filesystems cleanly. The APIs have flags option currently unsupported for future extension. --- Tomoki Sekiyama (5): Introduce virDomainFSFreeze() and virDomainFSThaw() public API remote: Implement virDomainFSFreeze and virDomainFSThaw qemu: Track domain quiesced status qemu: Implement virDomainFSFreeze and virDomainFSThaw virsh: Expose new virDomainFSFreeze and virDomainFSThaw API include/libvirt/libvirt.h.in | 6 ++ src/access/viraccessperm.c | 2 - src/access/viraccessperm.h | 6 ++ src/driver.h | 10 +++ src/libvirt.c | 70 ++++++++++++++++++++ src/libvirt_public.syms | 5 + src/qemu/qemu_domain.c | 5 + src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 144 ++++++++++++++++++++++++++++++++++++++---- src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 25 +++++++ src/remote_protocol-structs | 9 +++ src/rpc/gendispatch.pl | 2 + tools/virsh-domain.c | 92 +++++++++++++++++++++++++++ tools/virsh.pod | 15 ++++ 15 files changed, 379 insertions(+), 16 deletions(-)

2 6

[libvirt] [PATCH] Add utility functions for storing uninstalled location
by Nehal J Wani 24 Mar '14

24 Mar '14

When libvirtd is run from a build directory without being installed, it should not depend on files from a libvirt package installed in the system. Currently, APIs defined in src/ don't know whether libvirtd is being run from the build dir or the installed dir. The following additions provide the functionality to do so: src/util/virutil.c *virSetUninstalledDir *virGetUninstalledDir Example usage (utility = lxc|iohelper): char *path_tmp = virGetUninstalledDir(); if (path_tmp) /* do stuff with ("%s/../../src/libvirt_<utility>", path_tmp) */ else /* do stuff with (LIBEXECDIR "/libvirt_<utility>") */ --- daemon/libvirtd.c | 1 + src/libvirt_private.syms | 2 ++ src/util/virutil.c | 25 +++++++++++++++++++++++++ src/util/virutil.h | 3 +++ 4 files changed, 31 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 4179147..dc3da2a 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1165,6 +1165,7 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } *tmp = '\0'; + virSetUninstalledDir(argv[0]); char *driverdir; if (virAsprintfQuiet(&driverdir, "%s/../../src/.libs", argv[0]) < 0 || virAsprintfQuiet(&cpumap, "%s/../../src/cpu/cpu_map.xml", diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5904036..a112e6e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1989,6 +1989,7 @@ virGetGroupList; virGetGroupName; virGetHostname; virGetSelfLastChanged; +virGetUninstalledDir; virGetUnprivSGIOSysfsPath; virGetUserCacheDirectory; virGetUserConfigDirectory; @@ -2017,6 +2018,7 @@ virSetInherit; virSetNonBlock; virSetUIDGID; virSetUIDGIDWithCaps; +virSetUninstalledDir; virStrIsPrint; virUpdateSelfLastChanged; virValidateWWN; diff --git a/src/util/virutil.c b/src/util/virutil.c index 733cdff..46f6c75 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -2204,3 +2204,28 @@ void virUpdateSelfLastChanged(const char *path) selfLastChanged = sb.st_ctime; } } + +static char *uninstalledDir = NULL; +/** + * virSetUninstalledDir: + * @path: location from which libvirtd is running without + * installation + * + * Set a pointer to the path which can be accessed by all + * other APIs using virGetUninstalledDir(). + */ +void virSetUninstalledDir(char *path) +{ + uninstalledDir = path; +} + +/** + * virGetUninstalledDir: + * + * If libvirtd is running without installation, return the + * path from which it was invoked, otherwise, return NULL + */ +char *virGetUninstalledDir(void) +{ + return uninstalledDir; +} diff --git a/src/util/virutil.h b/src/util/virutil.h index 1f2efd5..3e6ba47 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -202,4 +202,7 @@ bool virIsSUID(void); time_t virGetSelfLastChanged(void); void virUpdateSelfLastChanged(const char *path); +void virSetUninstalledDir(char *path); +char *virGetUninstalledDir(void); + #endif /* __VIR_UTIL_H__ */ -- 1.7.1

2 3

[libvirt] [TCK][PATCH] Remove whitespace differences in network tmp files
by Mike Latimer 24 Mar '14

24 Mar '14

The network/100-apply-verify-host.t test compares the results of various network commands (route, iptables, ebtables, etc...) against known, valid results. Depending on the versions of these tools, minor whitespace differences in command output can result in the failure of the test. This patch resolves the problem by removing trailing spaces and replacing three or more concurrent spaces with just two. These changes are only made to the temporary files involved with the tests. --- scripts/networks/networkApplyTest.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/networks/networkApplyTest.sh b/scripts/networks/networkApplyTest.sh index 3e93c0a..924130f 100644 --- a/scripts/networks/networkApplyTest.sh +++ b/scripts/networks/networkApplyTest.sh @@ -142,6 +142,11 @@ checkExpectedOutput() { break fi + # Remove trailing whitespace, replace multiple spaces with just two + for file in ${tmpfile} ${tmpfile2}; do + sed -i -e 's/ *$//' -e 's/ */ /g' $file + done + diff "${tmpfile}" "${tmpfile2}" >/dev/null if [ $? -ne 0 ]; then -- 1.8.4.5

2 2

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 24 Mar '14

24 Mar '14

While we aren't impacted by most of upstream's changes this month, at least the regex improvement looks useful. * gnulib: Synchronize to upstream. --- Pushing under trivial rule before we go into freeze. * .gnulib 72fb907...ce457d6 (16): > gitlog-to-changelog: include a dummy git-log-fix file > autoupdate > update from texinfo > gitlog-to-changelog: also include the file, git-log-fix > autoupdate > regex: port to OS X 10.8.5 en_US.UTF-8 locale > maint: fix ChangeLog to match commit record > stdint, read-file: fix missing SIZE_MAX on Android (tiny change) > parse-datetime: fix crash or infloop in TZ="" parsing > * NEWS: Recent changes are not that important. > savedir: new symbol for fast-read version > unistd: port readlink to Mac OS X 10.3.9 > * NEWS: Document recent change to diffseq. > diffseq: remove TOO_EXPENSIVE heuristic > savedir: simplify by using stpcpy > spawn: fix link error on uclibc .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 72fb907..ce457d6 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 72fb9075b2812765d2ce55a1a26c3764392377cb +Subproject commit ce457d622d947d8aa3e325d98a2818d097e7fec9 -- 1.8.5.3

1 0

[libvirt] [TCK][PATCH] Rename .pl tests to .t
by Mike Latimer 24 Mar '14

24 Mar '14

Commit 97c6a506 added several storage tests with a .pl extension. Rather than enable .pl tests, this patch simply renames these tests to .t. --- scripts/storage/{400-vol-download.pl => 400-vol-download.t} | 0 scripts/storage/{405-vol-download-all.pl => 405-vol-download-all.t} | 0 .../storage/{410-vol-download-nonblock.pl => 410-vol-download-nonblock.t} | 0 scripts/storage/{415-vol-upload.pl => 415-vol-upload.t} | 0 scripts/storage/{420-vol-upload-all.pl => 420-vol-upload-all.t} | 0 scripts/storage/{425-vol-upload-nonblock.pl => 425-vol-upload-nonblock.t} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename scripts/storage/{400-vol-download.pl => 400-vol-download.t} (100%) rename scripts/storage/{405-vol-download-all.pl => 405-vol-download-all.t} (100%) rename scripts/storage/{410-vol-download-nonblock.pl => 410-vol-download-nonblock.t} (100%) rename scripts/storage/{415-vol-upload.pl => 415-vol-upload.t} (100%) rename scripts/storage/{420-vol-upload-all.pl => 420-vol-upload-all.t} (100%) rename scripts/storage/{425-vol-upload-nonblock.pl => 425-vol-upload-nonblock.t} (100%) diff --git a/scripts/storage/400-vol-download.pl b/scripts/storage/400-vol-download.t similarity index 100% rename from scripts/storage/400-vol-download.pl rename to scripts/storage/400-vol-download.t diff --git a/scripts/storage/405-vol-download-all.pl b/scripts/storage/405-vol-download-all.t similarity index 100% rename from scripts/storage/405-vol-download-all.pl rename to scripts/storage/405-vol-download-all.t diff --git a/scripts/storage/410-vol-download-nonblock.pl b/scripts/storage/410-vol-download-nonblock.t similarity index 100% rename from scripts/storage/410-vol-download-nonblock.pl rename to scripts/storage/410-vol-download-nonblock.t diff --git a/scripts/storage/415-vol-upload.pl b/scripts/storage/415-vol-upload.t similarity index 100% rename from scripts/storage/415-vol-upload.pl rename to scripts/storage/415-vol-upload.t diff --git a/scripts/storage/420-vol-upload-all.pl b/scripts/storage/420-vol-upload-all.t similarity index 100% rename from scripts/storage/420-vol-upload-all.pl rename to scripts/storage/420-vol-upload-all.t diff --git a/scripts/storage/425-vol-upload-nonblock.pl b/scripts/storage/425-vol-upload-nonblock.t similarity index 100% rename from scripts/storage/425-vol-upload-nonblock.pl rename to scripts/storage/425-vol-upload-nonblock.t -- 1.8.4.5

2 1

[libvirt] [python PATCH 1/2] qemu: support arbitrary monitor events
by Eric Blake 24 Mar '14

24 Mar '14

Wrap the new virConnectDomainQemuMonitorEventRegister function being added in libvirt 1.2.2. This patch copies heavily from network events (commit 6ea5be0) and from event loop callbacks in libvirt-override.c, since in the libvirt_qemu module, we must expose top-level functions rather than class members. * generator.py (qemu_skip_function): Don't generate event code. (qemuBuildWrappers): Delay manual portion until after imports. * libvirt-qemu-override.py (qemuMonitorEventRegister) (qemuMonitorEventDeregister): New file. * libvirt-qemu-override.c (libvirt_qemu_virConnectDomainQemuMonitorEventFreeFunc) (libvirt_qemu_virConnectDomainQemuMonitorEventCallback) (libvirt_qemu_virConnectDomainQemuMonitorEventRegister) (libvirt_qemu_virConnectDomainQemuMonitorEventDeregister) (libvirt_qemu_lookupPythonFunc, getLibvirtQemuDictObject) (getLibvirtQemuModuleObject): New functions. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- generator.py | 20 +++-- libvirt-qemu-override.c | 221 ++++++++++++++++++++++++++++++++++++++++++++++- libvirt-qemu-override.py | 36 ++++++++ 3 files changed, 268 insertions(+), 9 deletions(-) create mode 100644 libvirt-qemu-override.py diff --git a/generator.py b/generator.py index 42f3913..e2325b0 100755 --- a/generator.py +++ b/generator.py @@ -570,6 +570,8 @@ lxc_skip_function = ( ) qemu_skip_function = ( #"virDomainQemuAttach", + 'virConnectDomainQemuMonitorEventRegister', # overridden in -qemu.py + 'virConnectDomainQemuMonitorEventDeregister', # overridden in -qemu.py ) # Generate C code, but skip python impl @@ -1803,16 +1805,8 @@ def qemuBuildWrappers(module): fd.write("#\n") fd.write("# WARNING WARNING WARNING WARNING\n") fd.write("#\n") - if extra is not None: - fd.writelines(extra.readlines()) - fd.write("#\n") - fd.write("# WARNING WARNING WARNING WARNING\n") - fd.write("#\n") fd.write("# Automatically written part of python bindings for libvirt\n") fd.write("#\n") - fd.write("# WARNING WARNING WARNING WARNING\n") - if extra is not None: - extra.close() fd.write("try:\n") fd.write(" import libvirtmod_qemu\n") @@ -1826,6 +1820,16 @@ def qemuBuildWrappers(module): fd.write(" raise lib_e\n\n") fd.write("import libvirt\n\n") + fd.write("# WARNING WARNING WARNING WARNING\n") + fd.write("#\n") + if extra is not None: + fd.writelines(extra.readlines()) + fd.write("#\n") + if extra is not None: + extra.close() + + fd.write("# WARNING WARNING WARNING WARNING\n") + fd.write("#\n") fd.write("#\n# Functions from module %s\n#\n\n" % module) # # Generate functions directly, no classes diff --git a/libvirt-qemu-override.c b/libvirt-qemu-override.c index 480a7d3..0abcd3f 100644 --- a/libvirt-qemu-override.c +++ b/libvirt-qemu-override.c @@ -4,7 +4,7 @@ * entry points where an automatically generated stub is * unpractical * - * Copyright (C) 2011-2012 Red Hat, Inc. + * Copyright (C) 2011-2014 Red Hat, Inc. * * Daniel Veillard <veillard(a)redhat.com> */ @@ -54,6 +54,76 @@ extern void initcygvirtmod_qemu(void); #define VIR_PY_INT_FAIL (libvirt_intWrap(-1)) #define VIR_PY_INT_SUCCESS (libvirt_intWrap(0)) +/******************************************* + * Helper functions to avoid importing modules + * for every callback + *******************************************/ +#if LIBVIR_CHECK_VERSION(1, 2, 2) +static PyObject *libvirt_qemu_module; +static PyObject *libvirt_qemu_dict; + +static PyObject * +getLibvirtQemuModuleObject(void) +{ + if (libvirt_qemu_module) + return libvirt_qemu_module; + + // PyImport_ImportModule returns a new reference + /* Bogus (char *) cast for RHEL-5 python API brokenness */ + libvirt_qemu_module = PyImport_ImportModule((char *)"libvirt_qemu"); + if (!libvirt_qemu_module) { + DEBUG("%s Error importing libvirt_qemu module\n", __FUNCTION__); + PyErr_Print(); + return NULL; + } + + return libvirt_qemu_module; +} + +static PyObject * +getLibvirtQemuDictObject(void) +{ + if (libvirt_qemu_dict) + return libvirt_qemu_dict; + + // PyModule_GetDict returns a borrowed reference + libvirt_qemu_dict = PyModule_GetDict(getLibvirtQemuModuleObject()); + if (!libvirt_qemu_dict) { + DEBUG("%s Error importing libvirt_qemu dictionary\n", __FUNCTION__); + PyErr_Print(); + return NULL; + } + + Py_INCREF(libvirt_qemu_dict); + return libvirt_qemu_dict; +} + + +static PyObject * +libvirt_qemu_lookupPythonFunc(const char *funcname) +{ + PyObject *python_cb; + + /* Lookup the python callback */ + python_cb = PyDict_GetItemString(getLibvirtQemuDictObject(), funcname); + + if (!python_cb) { + DEBUG("%s: Error finding %s\n", __FUNCTION__, funcname); + PyErr_Print(); + PyErr_Clear(); + return NULL; + } + + if (!PyCallable_Check(python_cb)) { + DEBUG("%s: %s is not callable\n", __FUNCTION__, funcname); + return NULL; + } + + return python_cb; +} +#endif /* LIBVIR_CHECK_VERSION(1, 2, 2) */ + + /************************************************************************ * * * Statistics * @@ -122,6 +192,151 @@ libvirt_qemu_virDomainQemuAgentCommand(PyObject *self ATTRIBUTE_UNUSED, PyObject } #endif /* LIBVIR_CHECK_VERSION(0, 10, 0) */ + +#if LIBVIR_CHECK_VERSION(1, 2, 2) +static void +libvirt_qemu_virConnectDomainQemuMonitorEventFreeFunc(void *opaque) +{ + PyObject *pyobj_conn = (PyObject*)opaque; + LIBVIRT_ENSURE_THREAD_STATE; + Py_DECREF(pyobj_conn); + LIBVIRT_RELEASE_THREAD_STATE; +} + +static void +libvirt_qemu_virConnectDomainQemuMonitorEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *event, + long long seconds, + unsigned int micros, + const char *details, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_dom; + PyObject *pyobj_ret; + PyObject *pyobj_conn; + PyObject *dictKey; + PyObject *pyobj_cb; + + LIBVIRT_ENSURE_THREAD_STATE; + + pyobj_cb = libvirt_qemu_lookupPythonFunc("_dispatchQemuMonitorEventCallback"); + if (!pyobj_cb) { + goto cleanup; + } + + dictKey = libvirt_constcharPtrWrap("conn"); + if (!dictKey) + return; + pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); + Py_DECREF(dictKey); + + /* Create a python instance of this virDomainPtr */ + virDomainRef(dom); + pyobj_dom = libvirt_virDomainPtrWrap(dom); + Py_INCREF(pyobj_cbData); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallFunction(pyobj_cb, + (char *)"OOsLIsO", + pyobj_conn, pyobj_dom, event, seconds, + micros, details, pyobj_cbData); + + Py_DECREF(pyobj_cbData); + Py_DECREF(pyobj_dom); + + if (!pyobj_ret) { + DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); + PyErr_Print(); + } else { + Py_DECREF(pyobj_ret); + } + +cleanup: + LIBVIRT_RELEASE_THREAD_STATE; +} + + +static PyObject * +libvirt_qemu_virConnectDomainQemuMonitorEventRegister(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *py_retval; + PyObject *pyobj_conn; + PyObject *pyobj_dom; + PyObject *pyobj_cbData; + const char *event; + virConnectPtr conn; + int ret = 0; + virConnectDomainQemuMonitorEventCallback cb = NULL; + virDomainPtr dom; + unsigned int flags; + + if (!PyArg_ParseTuple + (args, (char *) "OOzOI", + &pyobj_conn, &pyobj_dom, &event, &pyobj_cbData, &flags)) { + DEBUG("%s failed parsing tuple\n", __FUNCTION__); + return VIR_PY_INT_FAIL; + } + + DEBUG("libvirt_qemu_virConnectDomainQemuMonitorEventRegister(%p %p %s %p %x) called\n", + pyobj_conn, pyobj_dom, NULLSTR(event), pyobj_cbData, flags); + conn = PyvirConnect_Get(pyobj_conn); + if (pyobj_dom == Py_None) + dom = NULL; + else + dom = PyvirDomain_Get(pyobj_dom); + + cb = libvirt_qemu_virConnectDomainQemuMonitorEventCallback; + + Py_INCREF(pyobj_cbData); + + LIBVIRT_BEGIN_ALLOW_THREADS; + ret = virConnectDomainQemuMonitorEventRegister(conn, dom, event, + cb, pyobj_cbData, + libvirt_qemu_virConnectDomainQemuMonitorEventFreeFunc, + flags); + LIBVIRT_END_ALLOW_THREADS; + + if (ret < 0) + Py_DECREF(pyobj_cbData); + + py_retval = libvirt_intWrap(ret); + return py_retval; +} + + +static PyObject * +libvirt_qemu_virConnectDomainQemuMonitorEventDeregister(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *py_retval; + PyObject *pyobj_conn; + int callbackID; + virConnectPtr conn; + int ret = 0; + + if (!PyArg_ParseTuple + (args, (char *) "Oi:virConnectDomainQemuMonitorEventDeregister", + &pyobj_conn, &callbackID)) + return NULL; + + DEBUG("libvirt_qemu_virConnectDomainQemuMonitorEventDeregister(%p) called\n", + pyobj_conn); + + conn = PyvirConnect_Get(pyobj_conn); + + LIBVIRT_BEGIN_ALLOW_THREADS; + + ret = virConnectDomainQemuMonitorEventDeregister(conn, callbackID); + + LIBVIRT_END_ALLOW_THREADS; + py_retval = libvirt_intWrap(ret); + return py_retval; +} +#endif /* LIBVIR_CHECK_VERSION(1, 2, 2) */ + /************************************************************************ * * * The registration stuff * @@ -133,6 +348,10 @@ static PyMethodDef libvirtQemuMethods[] = { #if LIBVIR_CHECK_VERSION(0, 10, 0) {(char *) "virDomainQemuAgentCommand", libvirt_qemu_virDomainQemuAgentCommand, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(0, 10, 0) */ +#if LIBVIR_CHECK_VERSION(1, 2, 2) + {(char *) "virConnectDomainQemuMonitorEventRegister", libvirt_qemu_virConnectDomainQemuMonitorEventRegister, METH_VARARGS, NULL}, + {(char *) "virConnectDomainQemuMonitorEventDeregister", libvirt_qemu_virConnectDomainQemuMonitorEventDeregister, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(1, 2, 2) */ {NULL, NULL, 0, NULL} }; diff --git a/libvirt-qemu-override.py b/libvirt-qemu-override.py new file mode 100644 index 0000000..ab48bec --- /dev/null +++ b/libvirt-qemu-override.py @@ -0,0 +1,36 @@ +# Manually written part of python bindings for libvirt-qemu + +def _dispatchQemuMonitorEventCallback(conn, dom, event, seconds, micros, details, cbData): + """Dispatches events to python user qemu monitor event callbacks + """ + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(conn, libvirt.virDomain(conn, _obj=dom), event, seconds, micros, details, opaque) + return 0 + +def qemuMonitorEventDeregister(conn, callbackID): + """Removes a qemu monitor event callback. De-registering for a callback + will disable delivery of this event type""" + try: + ret = libvirtmod_qemu.virConnectDomainQemuMonitorEventDeregister(conn._o, callbackID) + if ret == -1: raise libvirt.libvirtError ('virConnectDomainQemuMonitorEventDeregister() failed') + del conn.qemuMonitorEventCallbackID[callbackID] + except AttributeError: + pass + +def qemuMonitorEventRegister(conn, dom, event, cb, opaque, flags=0): + """Adds a qemu monitor event callback. Registering for a monitor + callback will enable delivery of the events""" + if not hasattr(conn, 'qemuMonitorEventCallbackID'): + conn.qemuMonitorEventCallbackID = {} + cbData = { "cb": cb, "conn": conn, "opaque": opaque } + if dom is None: + ret = libvirtmod_qemu.virConnectDomainQemuMonitorEventRegister(conn._o, None, event, cbData, flags) + else: + ret = libvirtmod_qemu.virConnectDomainQemuMonitorEventRegister(conn._o, dom._o, event, cbData, flags) + if ret == -1: + raise libvirt.libvirtError ('virConnectDomainQemuMonitorEventRegister() failed') + conn.qemuMonitorEventCallbackID[ret] = opaque + return ret + -- 1.8.5.3

3 6

[libvirt] [PATCH v8 resend 0/4] support dumping guest memory in compressed format
by Wen Congyang 24 Mar '14

24 Mar '14

From: Qiao Nuohan <qiaonuohan(a)cn.fujitsu.com> dumping guest's memory is introduced without compression supported, but now qemu can dump guest's memory in kdump-compressed format. This patchset is used to add support in libvirt side to let qemu do the dump in compressed format and please refer the following address to see implementation of the qemu side, the lastest version of qemu side is v9. http://lists.nongnu.org/archive/html/qemu-devel/2014-02/msg03016.html ChangLog: Changes from v7 to v8: 1. add test for qemuMonitorGetDumpGuestMemoryCapability 2. fix a bug when dumping a elf core with the an older version of qemu Changes from v6 to v7: 1. revert changing dumpformat of virDomainCoreDumpWithFormat back to an enum Changes from v5 to v6: 1. add qemuMonitorGetDumpGuestMemoryCapability API to check the available dump format Changes from v4 to v5: 1. modify some restriction check Changes from v3 to v4: 1. dropping patch "add dump_memory_format in qemu.conf" 2. fix to follow some conventions Changes from v2 to v3: 1. address Jiri Denemark's comment about adding a new public API instead of changing an old one. Changes from v1 to v2: 1. address Daniel P. Berrange's comment about using a new parameter to replace flags like VIR_DUMP_COMPRESS_ZLIB. Qiao Nuohan (4): add new virDomainCoreDumpWithFormat API qemu: add qemuMonitorGetDumpGuestMemoryCapability qemu: add support for virDomainCoreDumpWithFormat API allow "virsh dump --memory-only" specify dump format include/libvirt/libvirt.h.in | 31 ++++++++++++++ src/driver.h | 7 ++++ src/libvirt.c | 98 ++++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 5 +++ src/qemu/qemu_driver.c | 75 ++++++++++++++++++++++++++++----- src/qemu/qemu_monitor.c | 27 ++++++++++-- src/qemu/qemu_monitor.h | 6 ++- src/qemu/qemu_monitor_json.c | 85 +++++++++++++++++++++++++++++++++++--- src/qemu/qemu_monitor_json.h | 6 ++- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 15 ++++++- src/remote_protocol-structs | 7 ++++ src/test/test_driver.c | 22 ++++++++-- tests/qemumonitorjsontest.c | 45 +++++++++++++++++++- tools/virsh-domain.c | 47 +++++++++++++++++++-- tools/virsh.pod | 6 +++ 16 files changed, 454 insertions(+), 29 deletions(-) -- 1.8.5.3

2 6

[libvirt] [PATCHv2] maint: balance {} usage
by Eric Blake 24 Mar '14

24 Mar '14

Emacs gets lost when finding function boundaries when #ifdef sections do not have balanced {}. * libvirt-override.c (libvirt_PyString_Check): New define. (virPyDictToTypedParams): Avoid unbalanced {} across ifdef. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v2: Hoisting #ifdefs outside of function bodies makes it nicer libvirt-override.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 2532400..6a85d24 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -4,7 +4,7 @@ * entry points where an automatically generated stub is * unpractical * - * Copyright (C) 2005, 2007-2013 Red Hat, Inc. + * Copyright (C) 2005, 2007-2014 Red Hat, Inc. * * Daniel Veillard <veillard(a)redhat.com> */ @@ -272,6 +272,12 @@ typedef struct { } virPyTypedParamsHint; typedef virPyTypedParamsHint *virPyTypedParamsHintPtr; +# if PY_MAJOR_VERSION > 2 +# define libvirt_PyString_Check PyUnicode_Check +# else +# define libvirt_PyString_Check PyString_Check +# endif + /* Automatically convert dict into type parameters based on types reported * by python. All integer types are converted into LLONG (in case of a negative * value) or ULLONG (in case of a positive value). If you need different @@ -321,11 +327,7 @@ virPyDictToTypedParams(PyObject *dict, } if (type == -1) { -#if PY_MAJOR_VERSION > 2 - if (PyUnicode_Check(value)) { -#else - if (PyString_Check(value)) { -#endif + if (libvirt_PyString_Check(value)) { type = VIR_TYPED_PARAM_STRING; } else if (PyBool_Check(value)) { type = VIR_TYPED_PARAM_BOOLEAN; -- 1.8.5.3

2 2

[libvirt] [PATCH] apparmor: Fix build after split of disk source metadata
by Peter Krempa 24 Mar '14

24 Mar '14

Commit 4f20226664b2d4d9e9496ec1e05c9280581a1ca0 breaks build with AppArmor enabled as it missed the refactor to the new accessors. --- Notes: Pushed under the build-breaker rule. src/security/security_apparmor.c | 13 ++++++++----- src/security/virt-aa-helper.c | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index f7b67ba..6dca476 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -688,7 +688,7 @@ AppArmorRestoreSecurityImageLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, virDomainDiskDefPtr disk) { - if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK) + if (virDomainDiskGetType(disk) == VIR_DOMAIN_DISK_TYPE_NETWORK) return 0; return reload_profile(mgr, def, NULL, false); @@ -710,14 +710,16 @@ AppArmorSetSecurityImageLabel(virSecurityManagerPtr mgr, if (secdef->norelabel) return 0; - if (!disk->src || disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK) + if (!virDomainDiskGetSource(disk) || + virDomainDiskGetType(disk) == VIR_DOMAIN_DISK_TYPE_NETWORK) return 0; if (secdef->imagelabel) { /* if the device doesn't exist, error out */ - if (!virFileExists(disk->src)) { + if (!virFileExists(virDomainDiskGetSource(disk))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("\'%s\' does not exist"), disk->src); + _("\'%s\' does not exist"), + virDomainDiskGetSource(disk)); return rc; } @@ -726,7 +728,8 @@ AppArmorSetSecurityImageLabel(virSecurityManagerPtr mgr, /* update the profile only if it is loaded */ if (profile_loaded(secdef->imagelabel) >= 0) { - if (load_profile(mgr, secdef->imagelabel, def, disk->src, + if (load_profile(mgr, secdef->imagelabel, def, + virDomainDiskGetSource(disk), false) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot update AppArmor profile " diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index b8b0610..ddfcb0a 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -948,8 +948,8 @@ get_files(vahControl * ctl) */ if (!disk->backingChain) { bool probe = ctl->allowDiskFormatProbing; - disk->backingChain = virStorageFileGetMetadata(disk->src, - disk->format, + disk->backingChain = virStorageFileGetMetadata(virDomainDiskGetSource(disk), + virDomainDiskGetFormat(disk), -1, -1, probe); } -- 1.9.0

1 0

[libvirt] [python PATCH] maint: Add ctags configuration file and ignore the output
by Peter Krempa 24 Mar '14

24 Mar '14

Add the config file to ease creation of tags to help navigation in editors. --- .ctags | 2 ++ .gitignore | 1 + 2 files changed, 3 insertions(+) create mode 100644 .ctags diff --git a/.ctags b/.ctags new file mode 100644 index 0000000..21ac79a --- /dev/null +++ b/.ctags @@ -0,0 +1,2 @@ +--recurse +--exclude=*.orig diff --git a/.gitignore b/.gitignore index f47e786..a28e63c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ MANIFEST *#*# *.#*# *.pyc +tags -- 1.9.0

2 2

[libvirt] [PATCH 00/18] split virDomainDiskDef
by Eric Blake 24 Mar '14

24 Mar '14

I still have quite a bit of work to consolidate util/virStorageFile, conf/snapshot_conf.c, and the new struct in this series to all share the same common struct (basically, moving the struct created in this series over to util). But by refactoring the most common accesses to go through functions instead of direct field access, I've limited the amount of code that is actually impacted by using the new struct. In general, this series should not be changing any behavior. Eric Blake (18): conf: accessors for common source information conf: use disk source accessors in conf/ conf: use disk source accessors in bhyve/ conf: use disk source accessors in esx/ conf: use disk source accessors in libxl/ conf: use disk source accessors in locking/ conf: use disk source accessors in lxc/ conf: use disk source accessors in parallels/ conf: use disk source accessors in phyp/ conf: use disk source accessors in qemu/ conf: use disk source accessors in security/ conf: use disk source accessors in uml/ conf: use disk source accessors in vbox/ conf: use disk source accessors in vmware/ conf: use disk source accessors in vmx/ conf: use disk source accessors in xen/ conf: use disk source accessors in xenxs/ conf: prepare to track multiple host source files per <disk> src/bhyve/bhyve_command.c | 9 +- src/conf/domain_audit.c | 7 +- src/conf/domain_conf.c | 253 +++++++++++++++++++++----------- src/conf/domain_conf.h | 47 ++++-- src/conf/snapshot_conf.c | 2 +- src/esx/esx_driver.c | 26 ++-- src/libvirt_private.syms | 8 + src/libxl/libxl_conf.c | 50 ++++--- src/libxl/libxl_driver.c | 26 ++-- src/locking/domain_lock.c | 19 ++- src/lxc/lxc_cgroup.c | 6 +- src/lxc/lxc_controller.c | 77 +++++----- src/lxc/lxc_driver.c | 35 +++-- src/parallels/parallels_driver.c | 31 ++-- src/phyp/phyp_driver.c | 10 +- src/qemu/qemu_command.c | 308 ++++++++++++++++++++------------------- src/qemu/qemu_conf.c | 108 +++++++------- src/qemu/qemu_domain.c | 60 ++++---- src/qemu/qemu_driver.c | 203 +++++++++++++------------- src/qemu/qemu_hotplug.c | 116 ++++++++------- src/qemu/qemu_migration.c | 21 +-- src/qemu/qemu_process.c | 19 +-- src/security/security_dac.c | 17 ++- src/security/security_selinux.c | 20 +-- src/storage/storage_driver.c | 8 +- src/uml/uml_conf.c | 4 +- src/uml/uml_driver.c | 5 +- src/vbox/vbox_tmpl.c | 137 +++++++++-------- src/vmware/vmware_conf.c | 18 ++- src/vmware/vmware_conf.h | 6 +- src/vmx/vmx.c | 113 ++++++++------ src/xen/xend_internal.c | 11 +- src/xenxs/xen_sxpr.c | 111 +++++++------- src/xenxs/xen_xm.c | 113 +++++++------- tests/securityselinuxlabeltest.c | 8 +- 35 files changed, 1119 insertions(+), 893 deletions(-) -- 1.8.5.3

3 29

[libvirt] [python PATCH] maint: balance {} usage
by Eric Blake 24 Mar '14

24 Mar '14

Emacs gets lost when finding function boundaries when #ifdef sections do not have balanced {}. * libvirt-override.c (virPyDictToTypedParams): Avoid unbalanced {} across ifdef. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- This feels trivial, but it's also hacky enough that I'll wait for a review. libvirt-override.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index aecf25d..3a21bcc 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -321,10 +321,12 @@ virPyDictToTypedParams(PyObject *dict, } if (type == -1) { + if (false) { + /* hack to keep balanced {} */ #if PY_MAJOR_VERSION > 2 - if (PyUnicode_Check(value)) { + } else if (PyUnicode_Check(value)) { #else - if (PyString_Check(value)) { + } else if (PyString_Check(value)) { #endif type = VIR_TYPED_PARAM_STRING; } else if (PyBool_Check(value)) { -- 1.8.5.3

2 2

[libvirt] [libvirt-python PATCH] setup: Make libvirt API XML path configurable
by Martin Kletzander 24 Mar '14

24 Mar '14

Adding a support for LIBVIRT_API_PATH evironment variable, which can control where the script should look for the 'libvirt-api.xml' file. This allows building libvirt-python against different libvirt than the one installed in the system. This may be used for example in autotest or by packagers without the need to install libvirt into the system. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- setup.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 17b4722..566c210 100755 --- a/setup.py +++ b/setup.py @@ -109,7 +109,17 @@ class my_build(build): """Check with pkg-config that libvirt is present and extract the API XML file paths we need from it""" - libvirt_api = get_pkgconfig_data(["--variable", "libvirt_api"], "libvirt") + libvirt_api = os.getenv("LIBVIRT_API_PATH") + + if libvirt_api: + if not libvirt_api.endswith("-api.xml"): + raise ValueError("Invalid path '%s' for API XML" % libvirt_api) + if not os.path.exists(libvirt_api): + raise ValueError("API XML '%s' does not exist, " + "have you built libvirt?" % libvirt_api) + else: + libvirt_api = get_pkgconfig_data(["--variable", "libvirt_api"], + "libvirt") offset = libvirt_api.index("-api.xml") libvirt_qemu_api = libvirt_api[0:offset] + "-qemu-api.xml" -- 1.8.4.3

3 7

[libvirt] Error while running event-test.c from libvirt
by Avanti Ajay 24 Mar '14

24 Mar '14

Hi.. I compiled event-test.c as : gcc event-test.c -o events -lvirt and then running as : ./events But I am getting this output and the code terminates without detecting events : main:471: Registering domain event cbs myFreeFunc: Freeing [tray change] libvir: XML-RPC error : internal error unsupported event ID 10 myFreeFunc: Freeing [pmwakeup] libvir: XML-RPC error : internal error unsupported event ID 11 myFreeFunc: Freeing [pmsuspend] libvir: XML-RPC error : internal error unsupported event ID 12 myFreeFunc: Freeing [callback balloonchange] libvir: XML-RPC error : internal error unsupported event ID 13 main:580: Closing connection done Please help Thank you avanti

3 2

[libvirt] [TCK][PATCH] Enable tests with a .pl extension
by Mike Latimer 24 Mar '14

24 Mar '14

The main libvirt-tck script only executes tests using the default (.t) extension. This patch adds .t and .pl as valid extensions using the --ext parameter. This is required to enable storage tests added in commit 97c6a506. --- Build.PL | 2 +- bin/libvirt-tck | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Build.PL b/Build.PL index e682c3a..c93637d 100644 --- a/Build.PL +++ b/Build.PL @@ -29,7 +29,7 @@ sub process_pkgdata_files { my $name = $File::Find::name; if (-d) { $tck_dirs{$name} = []; - } elsif (-f && /\.(t|sh|fwall|xml|dat)$/) { + } elsif (-f && /\.(t|sh|fwall|xml|dat|pl)$/) { push @{$tck_dirs{$dir}}, $name; } }; diff --git a/bin/libvirt-tck b/bin/libvirt-tck index 816234b..6261538 100644 --- a/bin/libvirt-tck +++ b/bin/libvirt-tck @@ -214,6 +214,11 @@ if ($timer) { push @newargv, "--timer"; } +# Run tests ending in both .t and .pl extensions +foreach my $extension ('.t', '.pl') { + push @newargv, "--ext=$extension"; +} + # This env variable is the only way to pass config into # the Sys::Virt::TCK module from here $ENV{LIBVIRT_TCK_CONFIG} = $config; -- 1.8.4.5

2 2

[libvirt] ownership change for <readonly> disks
by Jim Fehlig 24 Mar '14

24 Mar '14

Noticed the qemu driver will change owner:group for <readonly> disks. I suspect this is intentional, but for reasons that elude me ATM. Any hints? :-) Regards, Jim

2 1

[libvirt] [python PATCH] maint: set up preferred emacs settings
by Eric Blake 24 Mar '14

24 Mar '14

Copy the relevant settings from libvirt.git, so that emacs users maintain the style previously used before the two repos split. * .dir-locals.el: New file. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. .dir-locals.el | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .dir-locals.el diff --git a/.dir-locals.el b/.dir-locals.el new file mode 100644 index 0000000..7c483d2 --- /dev/null +++ b/.dir-locals.el @@ -0,0 +1,8 @@ +( + (c-mode . ( + (c-file-style . "K&R") + (indent-tabs-mode . nil) + (c-indent-level . 4) + (c-basic-offset . 4) + )) + ) -- 1.8.5.3

1 0

[libvirt] [PATCH] qemuDomainGetImageIds: Skip <seclabel/> without label
by Michal Privoznik 24 Mar '14

24 Mar '14

It's easy to shed the daemon these days. With this XML snippet: <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/some/dummy/path/test.bin'> <seclabel model='dac' relabel='no'/> </source> <target dev='vdb' bus='virtio'/> <readonly/> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </disk> I get the SIGSEGV when starting the domain. The thing is, when starting a domain, we check for its disk presence. For some reason, when determining the disk chain, we parse the <seclabel/> (don't ask me why). However, there's no label attribute in the XML, so we end up calling virParseOwnershipIds() over NULL string: [Switching to Thread 0x7ffff10c4700 (LWP 30956)] __strchr_sse42 () at ../sysdeps/x86_64/multiarch/strchr.S:136 136 ../sysdeps/x86_64/multiarch/strchr.S: No such file or directory. (gdb) bt #0 __strchr_sse42 () at ../sysdeps/x86_64/multiarch/strchr.S:136 #1 0x00007ffff749f800 in virParseOwnershipIds (label=0x0, uidPtr=uidPtr@entry=0x7ffff10c2df0, gidPtr=gidPtr@entry=0x7ffff10c2df4) at util/virutil.c:2115 #2 0x00007fffe929f006 in qemuDomainGetImageIds (gid=0x7ffff10c2df4, uid=0x7ffff10c2df0, disk=0x7fffe40cb000, vm=0x7fffe40a6410, cfg=0x7fffe409ae00) at qemu/qemu_domain.c:2385 #3 qemuDomainDetermineDiskChain (driver=driver@entry=0x7fffe40120e0, vm=vm@entry=0x7fffe40a6410, disk=disk@entry=0x7fffe40cb000, force=force@entry=false) at qemu/qemu_domain.c:2414 #4 0x00007fffe929f128 in qemuDomainCheckDiskPresence (driver=driver@entry=0x7fffe40120e0, vm=vm@entry=0x7fffe40a6410, cold_boot=cold_boot@entry=true) at qemu/qemu_domain.c:2250 #5 0x00007fffe92b6fc8 in qemuProcessStart (conn=conn@entry=0x7fffd4000b60, driver=driver@entry=0x7fffe40120e0, vm=vm@entry=0x7fffe40a6410, migrateFrom=migrateFrom@entry=0x0, stdin_fd=stdin_fd@entry=-1, stdin_path=stdin_path@entry=0x0, snapshot=snapshot@entry=0x0, vmop=vmop@entry=VIR_NETDEV_VPORT_PROFILE_OP_CREATE, flags=flags@entry=1) at qemu/qemu_process.c:3813 #6 0x00007fffe93087e8 in qemuDomainObjStart (conn=0x7fffd4000b60, driver=driver@entry=0x7fffe40120e0, vm=vm@entry=0x7fffe40a6410, flags=flags@entry=0) at qemu/qemu_driver.c:6051 #7 0x00007fffe9308e32 in qemuDomainCreateWithFlags (dom=0x7fffcc000d50, flags=0) at qemu/qemu_driver.c:6105 #8 0x00007ffff753c5cc in virDomainCreate (domain=domain@entry=0x7fffcc000d50) at libvirt.c:8861 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7d375e5..c76b872 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2381,7 +2381,8 @@ qemuDomainGetImageIds(virQEMUDriverConfigPtr cfg, if (vm && (vmlabel = virDomainDefGetSecurityLabelDef(vm->def, "dac"))) virParseOwnershipIds(vmlabel->label, uid, gid); - if ((disklabel = virDomainDiskDefGetSecurityLabelDef(disk, "dac"))) + if ((disklabel = virDomainDiskDefGetSecurityLabelDef(disk, "dac")) && + disklabel->label) virParseOwnershipIds(disklabel->label, uid, gid); } -- 1.9.0

2 1

[libvirt] [PATCH] bhyve: add domainCreateWithFlags support
by Michal Privoznik 24 Mar '14

24 Mar '14

From: Roman Bogorodskiy <bogorodskiy(a)gmail.com> The only supported flag for now is 'autodestroy'. In order to support 'autodestroy', add support for close callbacks. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/bhyve/bhyve_driver.c | 28 ++++++++++++++++++++++++--- src/bhyve/bhyve_process.c | 49 +++++++++++++++++++++++++++++++++++------------ src/bhyve/bhyve_process.h | 7 ++++++- src/bhyve/bhyve_utils.h | 3 +++ 4 files changed, 71 insertions(+), 16 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 1cf3be2..a524d35 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -178,6 +178,9 @@ bhyveConnectOpen(virConnectPtr conn, static int bhyveConnectClose(virConnectPtr conn) { + bhyveConnPtr privconn = conn->privateData; + + virCloseCallbacksRun(privconn->closeCallbacks, conn, privconn->domains, privconn); conn->privateData = NULL; return 0; @@ -530,16 +533,23 @@ cleanup: } static int -bhyveDomainCreate(virDomainPtr dom) +bhyveDomainCreateWithFlags(virDomainPtr dom, + unsigned int flags) { bhyveConnPtr privconn = dom->conn->privateData; virDomainObjPtr vm; + unsigned int start_flags = 0; int ret = -1; + virCheckFlags(VIR_DOMAIN_START_AUTODESTROY, -1); + + if (flags & VIR_DOMAIN_START_AUTODESTROY) + start_flags |= VIR_BHYVE_PROCESS_START_AUTODESTROY; + if (!(vm = bhyveDomObjFromDomain(dom))) goto cleanup; - if (virDomainCreateEnsureACL(dom->conn, vm->def) < 0) + if (virDomainCreateWithFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; if (virDomainObjIsActive(vm)) { @@ -549,7 +559,8 @@ bhyveDomainCreate(virDomainPtr dom) } ret = virBhyveProcessStart(dom->conn, privconn, vm, - VIR_DOMAIN_RUNNING_BOOTED); + VIR_DOMAIN_RUNNING_BOOTED, + start_flags); cleanup: virObjectUnlock(vm); @@ -557,6 +568,12 @@ cleanup: } static int +bhyveDomainCreate(virDomainPtr dom) +{ + return bhyveDomainCreateWithFlags(dom, 0); +} + +static int bhyveDomainDestroy(virDomainPtr dom) { bhyveConnPtr privconn = dom->conn->privateData; @@ -629,6 +646,7 @@ bhyveStateCleanup(void) virObjectUnref(bhyve_driver->domains); virObjectUnref(bhyve_driver->caps); virObjectUnref(bhyve_driver->xmlopt); + virObjectUnref(bhyve_driver->closeCallbacks); virMutexDestroy(&bhyve_driver->lock); VIR_FREE(bhyve_driver); @@ -655,6 +673,9 @@ bhyveStateInitialize(bool priveleged ATTRIBUTE_UNUSED, return -1; } + if (!(bhyve_driver->closeCallbacks = virCloseCallbacksNew())) + goto cleanup; + if (!(bhyve_driver->caps = bhyveBuildCapabilities())) goto cleanup; @@ -773,6 +794,7 @@ static virDriver bhyveDriver = { .connectListDefinedDomains = bhyveConnectListDefinedDomains, /* 1.2.2 */ .connectNumOfDefinedDomains = bhyveConnectNumOfDefinedDomains, /* 1.2.2 */ .domainCreate = bhyveDomainCreate, /* 1.2.2 */ + .domainCreateWithFlags = bhyveDomainCreateWithFlags, /* 1.2.3 */ .domainDestroy = bhyveDomainDestroy, /* 1.2.2 */ .domainLookupByUUID = bhyveDomainLookupByUUID, /* 1.2.2 */ .domainLookupByName = bhyveDomainLookupByName, /* 1.2.2 */ diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index f5433f3..423185a 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -46,11 +46,29 @@ VIR_LOG_INIT("bhyve.bhyve_process"); +static virDomainObjPtr +bhyveProcessAutoDestroy(virDomainObjPtr vm, + virConnectPtr conn ATTRIBUTE_UNUSED, + void *opaque) +{ + bhyveConnPtr driver = opaque; + + virBhyveProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED); + + if (!vm->persistent) { + virDomainObjListRemove(driver->domains, vm); + vm = NULL; + } + + return vm; +} + int virBhyveProcessStart(virConnectPtr conn, bhyveConnPtr driver, virDomainObjPtr vm, - virDomainRunningReason reason) + virDomainRunningReason reason, + unsigned int flags) { char *logfile = NULL; int logfd = -1; @@ -121,21 +139,25 @@ virBhyveProcessStart(virConnectPtr conn, /* Now we can start the domain */ VIR_DEBUG("Starting domain '%s'", vm->def->name); - ret = virCommandRun(cmd, NULL); + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; - if (ret == 0) { - if (virPidFileReadPath(privconn->pidfile, &vm->pid) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Domain %s didn't show up"), vm->def->name); - goto cleanup; - } - - vm->def->id = vm->pid; - virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, reason); - } else { + if (virPidFileReadPath(privconn->pidfile, &vm->pid) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Domain %s didn't show up"), vm->def->name); goto cleanup; } + if (flags & VIR_BHYVE_PROCESS_START_AUTODESTROY && + virCloseCallbacksSet(driver->closeCallbacks, vm, + conn, bhyveProcessAutoDestroy) < 0) + goto cleanup; + + vm->def->id = vm->pid; + virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, reason); + + ret = 0; + cleanup: if (ret < 0) { virCommandPtr destroy_cmd; @@ -203,6 +225,9 @@ virBhyveProcessStop(bhyveConnPtr driver, ret = 0; + virCloseCallbacksUnset(driver->closeCallbacks, vm, + bhyveProcessAutoDestroy); + virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, reason); vm->pid = -1; vm->def->id = -1; diff --git a/src/bhyve/bhyve_process.h b/src/bhyve/bhyve_process.h index 66548ae..f91504e 100644 --- a/src/bhyve/bhyve_process.h +++ b/src/bhyve/bhyve_process.h @@ -27,10 +27,15 @@ int virBhyveProcessStart(virConnectPtr conn, bhyveConnPtr driver, virDomainObjPtr vm, - virDomainRunningReason reason); + virDomainRunningReason reason, + unsigned int flags); int virBhyveProcessStop(bhyveConnPtr driver, virDomainObjPtr vm, virDomainShutoffReason reason); +typedef enum { + VIR_BHYVE_PROCESS_START_AUTODESTROY = 1 << 0, +} bhyveProcessStartFlags; + #endif /* __BHYVE_PROCESS_H__ */ diff --git a/src/bhyve/bhyve_utils.h b/src/bhyve/bhyve_utils.h index 0810caa..6c76770 100644 --- a/src/bhyve/bhyve_utils.h +++ b/src/bhyve/bhyve_utils.h @@ -26,6 +26,7 @@ # include "domain_conf.h" # include "configmake.h" # include "virthread.h" +# include "virclosecallbacks.h" # define BHYVE_AUTOSTART_DIR SYSCONFDIR "/libvirt/bhyve/autostart" # define BHYVE_CONFIG_DIR SYSCONFDIR "/libvirt/bhyve" @@ -38,6 +39,8 @@ struct _bhyveConn { virCapsPtr caps; virDomainXMLOptionPtr xmlopt; char *pidfile; + + virCloseCallbacksPtr closeCallbacks; }; typedef struct _bhyveConn bhyveConn; -- 1.9.0

1 1

[libvirt] [libvirt-java][PATCH] make Flags used to manipulate Domain accessible from outside of the package
by Yoshikazu Nojima 24 Mar '14

24 Mar '14

Hi, I'd like to submit a small patch to libvirt-java. This patch make Flags used to manipulate Domain accessible from outside of the package I'm new to libvirt-java development process, please let me know if I miss something. Thanks! Yoshikazu Nojima <mail(a)ynojima.net>

2 1

[libvirt] Memory allocation/usage
by Vikas Kokare 24 Mar '14

24 Mar '14

We are trying to understand the memory allocation and usage for a KVM guest using the libvirt java API version 0.5.0. A certain memoryStats(int) on the Domain class allows you to fetch MemoryStatistic values. Each of this statistic has a tag and a value. In our case, the values returned were [tag: 6 val:8388608 , tag:7 val:8466792 ] What are these tag values(6 and 7) representative of? Do they mean memory allocated and memory used. If yes, how can we confirm that?

2 1

[libvirt] [PATCH v2] bhyve: add console support through nmdm device
by Roman Bogorodskiy 23 Mar '14

23 Mar '14

Changes from v1: Switch over from implicit slave device path, i.e. guessing from <source path='/dev/nmdm0A'/> that the slave is '/dev/nmdm0B', to explicit master and slave device specification using <source master='/dev/nmdm0A' slave='/dev/nmdm0B'/>. Roman Bogorodskiy (1): bhyve: add console support through nmdm device src/bhyve/bhyve_command.c | 34 +++++++++++++++++++++++++ src/bhyve/bhyve_driver.c | 45 +++++++++++++++++++++++++++++++++ src/conf/domain_audit.c | 1 + src/conf/domain_conf.c | 59 +++++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 5 ++++ src/qemu/qemu_command.c | 1 + src/qemu/qemu_monitor_json.c | 1 + 7 files changed, 145 insertions(+), 1 deletion(-) -- 1.8.4.2

1 1