- Devel - libvirt List Archives

[libvirt] [PATCH] nwfilter: move standard XML configs out of examples dir
by Daniel P. Berrangé 12 Aug '19

12 Aug '19

The nwfilter XML configs are not merely examples, they are data that is actively shipped and used in production by users. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- examples/Makefile.am | 10 ---------- src/nwfilter/Makefile.inc.am | 8 ++++++++ .../xml/nwfilter => src/nwfilter/xml}/allow-arp.xml | 0 .../nwfilter/xml}/allow-dhcp-server.xml | 0 .../xml/nwfilter => src/nwfilter/xml}/allow-dhcp.xml | 0 .../nwfilter/xml}/allow-incoming-ipv4.xml | 0 .../xml/nwfilter => src/nwfilter/xml}/allow-ipv4.xml | 0 .../nwfilter/xml}/clean-traffic-gateway.xml | 0 .../nwfilter => src/nwfilter/xml}/clean-traffic.xml | 0 .../nwfilter/xml}/no-arp-ip-spoofing.xml | 0 .../nwfilter/xml}/no-arp-mac-spoofing.xml | 0 .../nwfilter => src/nwfilter/xml}/no-arp-spoofing.xml | 0 .../nwfilter => src/nwfilter/xml}/no-ip-multicast.xml | 0 .../nwfilter => src/nwfilter/xml}/no-ip-spoofing.xml | 0 .../nwfilter => src/nwfilter/xml}/no-mac-broadcast.xml | 0 .../nwfilter => src/nwfilter/xml}/no-mac-spoofing.xml | 0 .../nwfilter/xml}/no-other-l2-traffic.xml | 0 .../nwfilter/xml}/no-other-rarp-traffic.xml | 0 .../nwfilter/xml}/qemu-announce-self-rarp.xml | 0 .../nwfilter/xml}/qemu-announce-self.xml | 0 20 files changed, 8 insertions(+), 10 deletions(-) rename {examples/xml/nwfilter => src/nwfilter/xml}/allow-arp.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/allow-dhcp-server.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/allow-dhcp.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/allow-incoming-ipv4.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/allow-ipv4.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/clean-traffic-gateway.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/clean-traffic.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/no-arp-ip-spoofing.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/no-arp-mac-spoofing.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/no-arp-spoofing.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/no-ip-multicast.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/no-ip-spoofing.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/no-mac-broadcast.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/no-mac-spoofing.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/no-other-l2-traffic.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/no-other-rarp-traffic.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/qemu-announce-self-rarp.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/qemu-announce-self.xml (100%) diff --git a/examples/Makefile.am b/examples/Makefile.am index 0adb4b42e2..ad635bdcc0 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -16,8 +16,6 @@ ## License along with this library. If not, see ## <http://www.gnu.org/licenses/>. -FILTERS = $(wildcard $(srcdir)/xml/nwfilter/*.xml) - ADMIN_EXAMPLES = \ $(wildcard $(srcdir)/c/admin/*.c) \ $(NULL) @@ -56,7 +54,6 @@ EXTRA_DIST = \ $(STORAGE_XML_EXAMPLES) \ $(SYSTEMTAP_EXAMPLES) \ $(TEST_XML_EXAMPLES) \ - $(FILTERS) \ $(NULL) AM_CPPFLAGS = \ @@ -111,13 +108,6 @@ c_misc_event_test_SOURCES = c/misc/event-test.c c_misc_hellolibvirt_SOURCES = c/misc/hellolibvirt.c c_misc_openauth_SOURCES = c/misc/openauth.c -if WITH_NWFILTER - -nwfilterdir = $(sysconfdir)/libvirt/nwfilter -nwfilter_DATA = $(FILTERS) - -endif WITH_NWFILTER - examplesdir = $(docdir)/examples adminexamplesdir = $(examplesdir)/c/admin diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 277f75a9bd..7693634e29 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -1,5 +1,9 @@ # vim: filetype=automake +NWFILTER_XML_FILES = $(wildcard $(srcdir)/nwfilter/xml/*.xml) + +EXTRA_DIST += $(NWFILTER_XML_FILES) + NWFILTER_DRIVER_SOURCES = \ nwfilter/nwfilter_driver.h \ nwfilter/nwfilter_driver.c \ @@ -19,6 +23,10 @@ STATEFUL_DRIVER_SOURCE_FILES += $(NWFILTER_DRIVER_SOURCES) EXTRA_DIST += $(NWFILTER_DRIVER_SOURCES) if WITH_NWFILTER + +nwfilterxmldir = $(sysconfdir)/libvirt/nwfilter +nwfilterxml_DATA = $(NWFILTER_XML_FILES) + noinst_LTLIBRARIES += libvirt_driver_nwfilter_impl.la libvirt_driver_nwfilter_la_SOURCES = libvirt_driver_nwfilter_la_LIBADD = libvirt_driver_nwfilter_impl.la diff --git a/examples/xml/nwfilter/allow-arp.xml b/src/nwfilter/xml/allow-arp.xml similarity index 100% rename from examples/xml/nwfilter/allow-arp.xml rename to src/nwfilter/xml/allow-arp.xml diff --git a/examples/xml/nwfilter/allow-dhcp-server.xml b/src/nwfilter/xml/allow-dhcp-server.xml similarity index 100% rename from examples/xml/nwfilter/allow-dhcp-server.xml rename to src/nwfilter/xml/allow-dhcp-server.xml diff --git a/examples/xml/nwfilter/allow-dhcp.xml b/src/nwfilter/xml/allow-dhcp.xml similarity index 100% rename from examples/xml/nwfilter/allow-dhcp.xml rename to src/nwfilter/xml/allow-dhcp.xml diff --git a/examples/xml/nwfilter/allow-incoming-ipv4.xml b/src/nwfilter/xml/allow-incoming-ipv4.xml similarity index 100% rename from examples/xml/nwfilter/allow-incoming-ipv4.xml rename to src/nwfilter/xml/allow-incoming-ipv4.xml diff --git a/examples/xml/nwfilter/allow-ipv4.xml b/src/nwfilter/xml/allow-ipv4.xml similarity index 100% rename from examples/xml/nwfilter/allow-ipv4.xml rename to src/nwfilter/xml/allow-ipv4.xml diff --git a/examples/xml/nwfilter/clean-traffic-gateway.xml b/src/nwfilter/xml/clean-traffic-gateway.xml similarity index 100% rename from examples/xml/nwfilter/clean-traffic-gateway.xml rename to src/nwfilter/xml/clean-traffic-gateway.xml diff --git a/examples/xml/nwfilter/clean-traffic.xml b/src/nwfilter/xml/clean-traffic.xml similarity index 100% rename from examples/xml/nwfilter/clean-traffic.xml rename to src/nwfilter/xml/clean-traffic.xml diff --git a/examples/xml/nwfilter/no-arp-ip-spoofing.xml b/src/nwfilter/xml/no-arp-ip-spoofing.xml similarity index 100% rename from examples/xml/nwfilter/no-arp-ip-spoofing.xml rename to src/nwfilter/xml/no-arp-ip-spoofing.xml diff --git a/examples/xml/nwfilter/no-arp-mac-spoofing.xml b/src/nwfilter/xml/no-arp-mac-spoofing.xml similarity index 100% rename from examples/xml/nwfilter/no-arp-mac-spoofing.xml rename to src/nwfilter/xml/no-arp-mac-spoofing.xml diff --git a/examples/xml/nwfilter/no-arp-spoofing.xml b/src/nwfilter/xml/no-arp-spoofing.xml similarity index 100% rename from examples/xml/nwfilter/no-arp-spoofing.xml rename to src/nwfilter/xml/no-arp-spoofing.xml diff --git a/examples/xml/nwfilter/no-ip-multicast.xml b/src/nwfilter/xml/no-ip-multicast.xml similarity index 100% rename from examples/xml/nwfilter/no-ip-multicast.xml rename to src/nwfilter/xml/no-ip-multicast.xml diff --git a/examples/xml/nwfilter/no-ip-spoofing.xml b/src/nwfilter/xml/no-ip-spoofing.xml similarity index 100% rename from examples/xml/nwfilter/no-ip-spoofing.xml rename to src/nwfilter/xml/no-ip-spoofing.xml diff --git a/examples/xml/nwfilter/no-mac-broadcast.xml b/src/nwfilter/xml/no-mac-broadcast.xml similarity index 100% rename from examples/xml/nwfilter/no-mac-broadcast.xml rename to src/nwfilter/xml/no-mac-broadcast.xml diff --git a/examples/xml/nwfilter/no-mac-spoofing.xml b/src/nwfilter/xml/no-mac-spoofing.xml similarity index 100% rename from examples/xml/nwfilter/no-mac-spoofing.xml rename to src/nwfilter/xml/no-mac-spoofing.xml diff --git a/examples/xml/nwfilter/no-other-l2-traffic.xml b/src/nwfilter/xml/no-other-l2-traffic.xml similarity index 100% rename from examples/xml/nwfilter/no-other-l2-traffic.xml rename to src/nwfilter/xml/no-other-l2-traffic.xml diff --git a/examples/xml/nwfilter/no-other-rarp-traffic.xml b/src/nwfilter/xml/no-other-rarp-traffic.xml similarity index 100% rename from examples/xml/nwfilter/no-other-rarp-traffic.xml rename to src/nwfilter/xml/no-other-rarp-traffic.xml diff --git a/examples/xml/nwfilter/qemu-announce-self-rarp.xml b/src/nwfilter/xml/qemu-announce-self-rarp.xml similarity index 100% rename from examples/xml/nwfilter/qemu-announce-self-rarp.xml rename to src/nwfilter/xml/qemu-announce-self-rarp.xml diff --git a/examples/xml/nwfilter/qemu-announce-self.xml b/src/nwfilter/xml/qemu-announce-self.xml similarity index 100% rename from examples/xml/nwfilter/qemu-announce-self.xml rename to src/nwfilter/xml/qemu-announce-self.xml -- 2.21.0

2 1

[libvirt] [PATCH] m4: Drop libxml2 version number from configure help
by Andrea Bolognani 11 Aug '19

11 Aug '19

We don't include this information for any other library, and having it there means there are two places we need to change every time the required version is bumped. configure will provide the user with a nice error message, which includes the required version, if libxml2 found on the system is too old. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. m4/virt-libxml.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-libxml.m4 b/m4/virt-libxml.m4 index 9aefbdc3f1..cce54d88fb 100644 --- a/m4/virt-libxml.m4 +++ b/m4/virt-libxml.m4 @@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>. dnl AC_DEFUN([LIBVIRT_ARG_LIBXML], [ - LIBVIRT_ARG_WITH([LIBXML], [libxml-2.0 (>= 2.9.1) location], [check]) + LIBVIRT_ARG_WITH([LIBXML], [libxml-2.0 location], [check]) ]) AC_DEFUN([LIBVIRT_CHECK_LIBXML], [ -- 2.21.0

1 0

[libvirt] [PATCH v2 0/3] test_driver: implement the remaining ManagedSave APIs
by Ilias Stamatis 09 Aug '19

09 Aug '19

Ilias Stamatis (3): test_driver: use domain-private data to store managed image test_driver: implement virDomainManagedSaveGetXMLDesc test_driver: implement virDomainManagedSaveDefineXML src/test/test_driver.c | 93 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 1 deletion(-) -- 2.22.0

1 3

[libvirt] [PATCH v2] snapshot: Store both config and live XML in the snapshot domain
by Maxiwell S. Garcia 09 Aug '19

09 Aug '19

The snapshot-create operation of running guests saves the live XML and uses it to replace the active and inactive domain in case of revert. So, the config XML is ignored by the snapshot process. This commit changes it and adds the config XML in the snapshot XML as the <inactiveDomain> entry. In case of offline guest, the behavior remains the same and the config XML is saved in the snapshot XML as <domain> entry. The behavior of older snapshots of running guests, that don't have the new <inactiveDomain>, remains the same too. The revert, in this case, overrides both active and inactive domain with the <domain> entry. So, the <inactiveDomain> in the snapshot XML is not required to snapshot work, but it's useful to preserve the config XML of running guests. Signed-off-by: Maxiwell S. Garcia <maxiwell(a)linux.ibm.com> --- src/conf/moment_conf.c | 1 + src/conf/moment_conf.h | 11 +++++++++ src/conf/snapshot_conf.c | 48 +++++++++++++++++++++++++++++++++++----- src/qemu/qemu_driver.c | 27 +++++++++++++++++----- src/util/virxml.c | 45 +++++++++++++++++++++++++++++++++++++ src/util/virxml.h | 8 +++++++ 6 files changed, 130 insertions(+), 10 deletions(-) diff --git a/src/conf/moment_conf.c b/src/conf/moment_conf.c index fea13f0f97..f54a44b33e 100644 --- a/src/conf/moment_conf.c +++ b/src/conf/moment_conf.c @@ -66,6 +66,7 @@ virDomainMomentDefDispose(void *obj) VIR_FREE(def->description); VIR_FREE(def->parent_name); virDomainDefFree(def->dom); + virDomainDefFree(def->inactiveDom); } /* Provide defaults for creation time and moment name after parsing XML */ diff --git a/src/conf/moment_conf.h b/src/conf/moment_conf.h index 9fdbef2172..70cc47bd70 100644 --- a/src/conf/moment_conf.h +++ b/src/conf/moment_conf.h @@ -36,7 +36,18 @@ struct _virDomainMomentDef { char *parent_name; long long creationTime; /* in seconds */ + /* + * Store the active domain definition in case of online + * guest and the inactive domain definition in case of + * offline guest + */ virDomainDefPtr dom; + + /* + * Store the inactive domain definition in case of online + * guest and leave NULL in case of offline guest + */ + virDomainDefPtr inactiveDom; }; virClassPtr virClassForDomainMomentDef(void); diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 324901a560..8aeac9ab20 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -243,6 +243,8 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, char *memoryFile = NULL; bool offline = !!(flags & VIR_DOMAIN_SNAPSHOT_PARSE_OFFLINE); virSaveCookieCallbacksPtr saveCookie = virDomainXMLOptionGetSaveCookie(xmlopt); + int domainflags = VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; if (!(def = virDomainSnapshotDefNew())) return NULL; @@ -292,8 +294,6 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, * clients will have to decide between best effort * initialization or outright failure. */ if ((tmp = virXPathString("string(./domain/@type)", ctxt))) { - int domainflags = VIR_DOMAIN_DEF_PARSE_INACTIVE | - VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; xmlNodePtr domainNode = virXPathNode("./domain", ctxt); VIR_FREE(tmp); @@ -309,6 +309,20 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, } else { VIR_WARN("parsing older snapshot that lacks domain"); } + + /* /inactiveDomain entry saves the config XML present in a running + * VM. In case of absent, leave parent.inactiveDom NULL and use + * parent.dom for config and live XML. */ + if (virXPathString("string(./inactiveDomain/@type)", ctxt)) { + xmlNodePtr domainNode = virXPathNode("./inactiveDomain", ctxt); + + if (domainNode) { + def->parent.inactiveDom = virDomainDefParseNode(ctxt->node->doc, domainNode, + caps, xmlopt, NULL, domainflags); + if (!def->parent.inactiveDom) + goto cleanup; + } + } } else if (virDomainXMLOptionRunMomentPostParse(xmlopt, &def->parent) < 0) { goto cleanup; } @@ -845,6 +859,10 @@ virDomainSnapshotDefFormatInternal(virBufferPtr buf, { size_t i; int domainflags = VIR_DOMAIN_DEF_FORMAT_INACTIVE; + virBuffer inactivedom_buf = VIR_BUFFER_INITIALIZER; + xmlXPathContextPtr inactivedom_ctxt = NULL; + char *inactivedom_str = NULL; + int ret = -1; if (flags & VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE) domainflags |= VIR_DOMAIN_DEF_FORMAT_SECURE; @@ -903,6 +921,20 @@ virDomainSnapshotDefFormatInternal(virBufferPtr buf, virBufferAddLit(buf, "</domain>\n"); } + if (def->parent.inactiveDom) { + if (virDomainDefFormatInternal(def->parent.inactiveDom, caps, + domainflags, &inactivedom_buf, xmlopt) < 0) + goto error; + + inactivedom_ctxt = virXPathBuildContext(&inactivedom_buf); + if (!(inactivedom_str = virXPathRenameNode("/domain", "inactiveDomain", + inactivedom_ctxt))) + goto error; + + virBufferAddStr(buf, inactivedom_str); + virBufferAddLit(buf, "\n"); + } + if (virSaveCookieFormatBuf(buf, def->cookie, virDomainXMLOptionGetSaveCookie(xmlopt)) < 0) goto error; @@ -917,11 +949,17 @@ virDomainSnapshotDefFormatInternal(virBufferPtr buf, if (virBufferCheckError(buf) < 0) goto error; - return 0; + ret = 0; error: - virBufferFreeAndReset(buf); - return -1; + VIR_FREE(inactivedom_str); + xmlXPathFreeContext(inactivedom_ctxt); + virBufferFreeAndReset(&inactivedom_buf); + + if (ret < 0) + virBufferFreeAndReset(buf); + + return ret; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 482f915b67..9b95e9b766 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15697,6 +15697,13 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) goto endjob; + if (vm->newDef) { + def->parent.inactiveDom = virDomainDefCopy(vm->newDef, caps, + driver->xmlopt, NULL, true); + if (!def->parent.inactiveDom) + goto endjob; + } + if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) { align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; align_match = false; @@ -16231,6 +16238,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, qemuDomainObjPrivatePtr priv; int rc; virDomainDefPtr config = NULL; + virDomainDefPtr inactiveConfig = NULL; virQEMUDriverConfigPtr cfg = NULL; virCapsPtr caps = NULL; bool was_stopped = false; @@ -16331,17 +16339,22 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, * in the failure cases where we know there was no change? */ } - /* Prepare to copy the snapshot inactive xml as the config of this - * domain. - * - * XXX Should domain snapshots track live xml rather - * than inactive xml? */ + /* Prepare to copy the snapshot inactive domain as the config XML + * and the snapshot domain as the live XML. In case of inactive domain + * NULL, both config and live XML will be copied from snapshot domain. + */ if (snap->def->dom) { config = virDomainDefCopy(snap->def->dom, caps, driver->xmlopt, NULL, true); if (!config) goto endjob; } + if (snap->def->inactiveDom) { + inactiveConfig = virDomainDefCopy(snap->def->inactiveDom, caps, + driver->xmlopt, NULL, true); + if (!inactiveConfig) + goto endjob; + } cookie = (qemuDomainSaveCookiePtr) snapdef->cookie; @@ -16592,6 +16605,10 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, goto endjob; } + if (inactiveConfig) { + virDomainDefFree(vm->newDef); + VIR_STEAL_PTR(vm->newDef, inactiveConfig); + } ret = 0; endjob: diff --git a/src/util/virxml.c b/src/util/virxml.c index f55b9a362c..756c0eedbc 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -1408,3 +1408,48 @@ virXPathContextNodeRestore(virXPathContextNodeSavePtr save) save->ctxt->node = save->node; } + + +/** + * virXPathBuildContext: convert an parent buffer to an + * XPath context ptr. The caller has to free the ptr. + */ +xmlXPathContextPtr +virXPathBuildContext(virBufferPtr root) +{ + xmlDocPtr doc; + + if (!root) + return NULL; + + doc = virXMLParseString(virBufferCurrentContent(root), NULL); + if (!doc) + return NULL; + + return xmlXPathNewContext(doc); +} + + +/** + * virXPathRenameNode: get the XML node using the 'xpath' and + * rename it with the 'newname' string. + * + * Returns the XML string of the node found by 'xpath' or NULL + * on error. The caller has to free the string. + */ +char * +virXPathRenameNode(const char *xpath, + const char *newname, + xmlXPathContextPtr ctxt) +{ + xmlNodePtr node; + + if (!xpath || !newname || !ctxt) + return NULL; + + if (!(node = virXPathNode(xpath, ctxt))) + return NULL; + + xmlNodeSetName(node, (xmlChar *) newname); + return virXMLNodeToString(node->doc, node); +} diff --git a/src/util/virxml.h b/src/util/virxml.h index 6208977dd1..48a507c3c1 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -220,6 +220,14 @@ virXMLFormatElement(virBufferPtr buf, virBufferPtr childBuf) ATTRIBUTE_RETURN_CHECK; +xmlXPathContextPtr +virXPathBuildContext(virBufferPtr root); + +char * +virXPathRenameNode(const char *xpath, + const char *newname, + xmlXPathContextPtr ctxt); + struct _virXPathContextNodeSave { xmlXPathContextPtr ctxt; xmlNodePtr node; -- 2.20.1

4 7

[libvirt] [dockerfiles PATCH 0/4] refresh: Some minor cleanups
by Andrea Bolognani 09 Aug '19

09 Aug '19

Andrea Bolognani (4): refresh: Get rid of self.project_name refresh: Improve project handling refresh: Look for project with startswith() refresh: Update comments refresh | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) -- 2.21.0

2 5

[libvirt] [PATCH v2] qemu: check if numa cell's cpu range match with cpu topology count
by Maxiwell S. Garcia 09 Aug '19

09 Aug '19

QEMU shows a warning message if partial NUMA mapping is set. This patch adds a warning message in libvirt when editing the XML. It must be an error in future, when QEMU remove this ability. Signed-off-by: Maxiwell S. Garcia <maxiwell(a)linux.ibm.com> --- src/qemu/qemu_domain.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 0555caa6ab..62dd428fca 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4621,15 +4621,24 @@ qemuDomainDefValidate(const virDomainDef *def, if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS)) { unsigned int topologycpus; unsigned int granularity; + unsigned int numacpus; /* Starting from QEMU 2.5, max vCPU count and overall vCPU topology * must agree. We only actually enforce this with QEMU 2.7+, due * to the capability check above */ - if (virDomainDefGetVcpusTopology(def, &topologycpus) == 0 && - topologycpus != virDomainDefGetVcpusMax(def)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("CPU topology doesn't match maximum vcpu count")); - goto cleanup; + if (virDomainDefGetVcpusTopology(def, &topologycpus) == 0) { + if (topologycpus != virDomainDefGetVcpusMax(def)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("CPU topology doesn't match maximum vcpu count")); + goto cleanup; + } + + numacpus = virDomainNumaGetCPUCountTotal(def->numa); + if ((numacpus != 0) && (topologycpus != numacpus)) { + VIR_WARN("CPU topology doesn't match numa CPU count; " + "partial NUMA mapping is obsoleted and will " + "be removed in future"); + } } /* vCPU hotplug granularity must be respected */ -- 2.20.1

2 1

[libvirt] [PATCH v3 0/5] Add support for Direct Mode for Hyper-V Synthetic timers
by Vitaly Kuznetsov 09 Aug '19

09 Aug '19

Changes since v2: - Post 5.6.0 rebase, patches 1-3 are dropped as they were already merged. Original description: QEMU-4.1 will bring us Direct Mode for Hyper-V Synthetic timers support, we need to support it in libvirt too. As this is not a new enlightenment but rather an enhancement of an existing one ('stimer'), support it in <stimer state='on'> <direct state='on'/> </stimer> form. Backwards compatibility is (hopefully) preserved. Vitaly Kuznetsov (5): cpu_x86: add Edx to KVM_FEATURE_DEF() conf: change the way how Hyper-V features are printed out conf: add support for Direct Mode for Hyper-V Synthetic timers qemu: add support for Direct Mode for Hyper-V Synthetic timers news: mention Direct Mode for Hyper-V Synthetic timers support docs/formatdomain.html.in | 10 ++-- docs/news.xml | 9 ++++ docs/schemas/domaincommon.rng | 16 +++++- src/conf/domain_conf.c | 77 ++++++++++++++++++++++++++--- src/conf/domain_conf.h | 1 + src/cpu/cpu_x86.c | 33 +++++++------ src/cpu/cpu_x86_data.h | 2 + src/qemu/qemu_command.c | 12 +++-- src/qemu/qemu_process.c | 20 +++++++- tests/qemuxml2argvdata/hyperv.args | 4 +- tests/qemuxml2argvdata/hyperv.xml | 4 +- tests/qemuxml2xmloutdata/hyperv.xml | 4 +- 12 files changed, 155 insertions(+), 37 deletions(-) -- 2.20.1

2 15

[libvirt] [PATCH] admin: Fix missing filters of debug msg for virAdmConnectSetLoggingFilters
by Han Han 09 Aug '19

09 Aug '19

Signed-off-by: Han Han <hhan(a)redhat.com> --- src/libvirt-admin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index 4ae50b188f..cf40ea122e 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -1236,7 +1236,7 @@ virAdmConnectSetLoggingFilters(virAdmConnectPtr conn, { int ret = -1; - VIR_DEBUG("conn=%p, flags=0x%x", conn, flags); + VIR_DEBUG("conn=%p, filters=%s, flags=0x%x", conn, filters, flags); virResetLastError(); virCheckAdmConnectReturn(conn, -1); -- 2.20.1

2 1

[libvirt] [PATCH] conf: code comment fix for TPM version
by marcandre.lureau＠redhat.com 09 Aug '19

09 Aug '19

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Since its introduction in commit 8737578d115b8328f59f3342377b0c7ac06f658a, the TPM version format is "2.0" and not "2". Signed-off-by: Marc-André Lureau <marcandre.lureau(a)redhat.com> --- src/conf/domain_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0456369d55..e4c280e0d5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13053,13 +13053,13 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr xmlopt, * or like this: * * <tpm model='tpm-tis'> - * <backend type='emulator' version='2'/> + * <backend type='emulator' version='2.0'/> * </tpm> * * Emulator state encryption is supported with the following: * * <tpm model='tpm-tis'> - * <backend type='emulator' version='2'> + * <backend type='emulator' version='2.0'> * <encryption uuid='32ee7e76-2178-47a1-ab7b-269e6e348015'/> * </backend> * </tpm> -- 2.23.0.rc1

3 2

[libvirt] [PATCH] Revert "configure: Remove --enable-test-coverage"
by Jiri Denemark 09 Aug '19

09 Aug '19

This reverts commit f38d553e2d6ec2f041cb7947b5eafcdd3b26ae65. Gnulib's make coverage (or init-coverage, build-coverage, gen-coverage) is not a 1-1 replacement for the original configure option. Our old --enable-test-coverage seems to be close to gnulib's make build-coverage except gnulib runs lcov in that phase and the build actually fails for me even before lcov is run. And since we want to be able to just build libvirt without running lcov, I suggest reverting to our own implementation. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Notes: I admit the best solution would be to somehow make gnulib support what we need (and fix the actual build), but I don't feel brave enough to do that. Eric? :-) Also if we ever switch to glib and drop gnulib completely, we would need to reintroduce our own implementation anyway. Makefile.am | 20 +++++++++++++++++--- configure.ac | 18 ++++++++++++++++++ src/Makefile.am | 3 ++- src/remote/Makefile.inc.am | 2 ++ tests/Makefile.am | 2 ++ tools/Makefile.am | 6 ++++++ 6 files changed, 47 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index dedd8d2ff8..27c49280c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,15 +16,15 @@ ## License along with this library. If not, see ## <http://www.gnu.org/licenses/>. +LCOV = lcov +GENHTML = genhtml + SUBDIRS = . gnulib/lib include/libvirt src tools docs gnulib/tests \ tests po examples XZ_OPT ?= -v -T0 export XZ_OPT -# have gnulib 'make coverage' output to 'cov' dir -COVERAGE_OUT = "cov" - ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = \ @@ -87,6 +87,20 @@ check-local: all tests check-access: all @($(MAKE) $(AM_MAKEFLAGS) -C tests check-access) +cov: clean-cov + $(MKDIR_P) $(top_builddir)/coverage + $(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp \ + -d $(top_builddir)/src \ + -d $(top_builddir)/tests + $(LCOV) -r $(top_builddir)/coverage/libvirt.info.tmp \ + -o $(top_builddir)/coverage/libvirt.info + rm $(top_builddir)/coverage/libvirt.info.tmp + $(GENHTML) --show-details -t "libvirt" -o $(top_builddir)/coverage \ + --legend $(top_builddir)/coverage/libvirt.info + +clean-cov: + rm -rf $(top_builddir)/coverage + MAINTAINERCLEANFILES = .git-module-status dist-hook: gen-AUTHORS diff --git a/configure.ac b/configure.ac index ebb2e24e21..f41c6d5d86 100644 --- a/configure.ac +++ b/configure.ac @@ -726,6 +726,23 @@ fi AC_SUBST([VIR_TEST_EXPENSIVE_DEFAULT]) AM_CONDITIONAL([WITH_EXPENSIVE_TESTS], [test $VIR_TEST_EXPENSIVE_DEFAULT = 1]) +LIBVIRT_ARG_ENABLE([TEST_COVERAGE], [turn on code coverage instrumentation], [no]) +case "$enable_test_coverage" in + yes|no) ;; + *) AC_MSG_ERROR([bad value ${enable_test_coverga} for test-coverage option]) ;; +esac + +if test "$enable_test_coverage" = yes; then + save_WARN_CFLAGS=$WARN_CFLAGS + WARN_CFLAGS= + gl_WARN_ADD([-fprofile-arcs]) + gl_WARN_ADD([-ftest-coverage]) + COVERAGE_FLAGS=$WARN_CFLAGS + AC_SUBST([COVERAGE_CFLAGS], [$COVERAGE_FLAGS]) + AC_SUBST([COVERAGE_LDFLAGS], [$COVERAGE_FLAGS]) + WARN_CFLAGS=$save_WARN_CFLAGS +fi + LIBVIRT_ARG_ENABLE([TEST_OOM], [memory allocation failure checking], [no]) case "$enable_test_oom" in yes|no) ;; @@ -1011,6 +1028,7 @@ LIBVIRT_WIN_RESULT_WINDRES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Test suite]) AC_MSG_NOTICE([]) +AC_MSG_NOTICE([ Coverage: $enable_test_coverage]) AC_MSG_NOTICE([ Alloc OOM: $enable_test_oom]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) diff --git a/src/Makefile.am b/src/Makefile.am index f111b2a1b4..5ddc06f629 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,8 +37,9 @@ AM_CFLAGS = $(LIBXML_CFLAGS) \ $(WARN_CFLAGS) \ $(LOCK_CHECKING_CFLAGS) \ $(WIN32_EXTRA_CFLAGS) \ - $(NULL) + $(COVERAGE_CFLAGS) AM_LDFLAGS = $(DRIVER_MODULES_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ $(RELRO_LDFLAGS) \ $(NO_INDIRECT_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) \ diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 0cf00cb902..4d3a450461 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -145,6 +145,7 @@ libvirtd_CFLAGS = \ $(LIBNL_CFLAGS) \ $(WARN_CFLAGS) \ $(PIE_CFLAGS) \ + $(COVERAGE_CFLAGS) \ -I$(srcdir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/rpc \ @@ -153,6 +154,7 @@ libvirtd_CFLAGS = \ libvirtd_LDFLAGS = \ $(RELRO_LDFLAGS) \ $(PIE_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ $(NO_INDIRECT_LDFLAGS) \ $(NO_UNDEFINED_LDFLAGS) \ $(NULL) diff --git a/tests/Makefile.am b/tests/Makefile.am index 1c92e3ca6f..23e7c422ea 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -41,6 +41,7 @@ AM_CFLAGS = \ $(SELINUX_CFLAGS) \ $(APPARMOR_CFLAGS) \ $(YAJL_CFLAGS) \ + $(COVERAGE_CFLAGS) \ $(XDR_CFLAGS) \ $(WARN_CFLAGS) @@ -267,6 +268,7 @@ endif WITH_SECDRIVER_SELINUX # This is a fake SSH we use from virnetsockettest ssh_SOURCES = ssh.c +ssh_LDADD = $(COVERAGE_LDFLAGS) if WITH_LIBXL test_programs += xlconfigtest \ diff --git a/tools/Makefile.am b/tools/Makefile.am index df3d628bab..9cf6baf35b 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -33,6 +33,7 @@ WARN_CFLAGS += $(STRICT_FRAME_LIMIT_CFLAGS) AM_CFLAGS = \ $(WARN_CFLAGS) \ + $(COVERAGE_CFLAGS) \ $(PIE_CFLAGS) \ $(LIBXML_CFLAGS) \ $(NULL) @@ -143,6 +144,7 @@ libvirt_shell_la_CFLAGS = \ libvirt_shell_la_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ $(NULL) libvirt_shell_la_LIBADD = \ ../src/libvirt.la \ @@ -188,6 +190,7 @@ endif ! WITH_BHYVE virt_host_validate_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ $(NULL) virt_host_validate_LDADD = \ @@ -213,6 +216,7 @@ virt_login_shell_helper_SOURCES = \ virt_login_shell_helper_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ $(NULL) virt_login_shell_helper_LDADD = \ ../src/libvirt.la \ @@ -245,6 +249,7 @@ virsh_SOURCES = \ virsh_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ $(NULL) virsh_LDADD = \ $(STATIC_BINARIES) \ @@ -262,6 +267,7 @@ virt_admin_SOURCES = \ virt_admin_LDFLAGS = \ $(AM_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ $(STATIC_BINARIES) \ $(PIE_LDFLAGS) \ $(NULL) -- 2.22.0

2 1