June 2019 - Devel - libvirt List Archives

[libvirt] [PATCH v2] test_driver: properly handle DHCP ranges and IPv6 networks in testDomainInterfaceAddresses
by Ilias Stamatis 21 Jun '19

21 Jun '19

testDomainInterfaceAddresses always returns the same hard-coded addresses. Change the behavior such as if there is a DHCP range defined, addresses are returned from that pool. The specific address returned depends on both the domain id and the specific guest interface in an attempt to return unique addresses *most of the time*. Additionally, properly handle IPv6 networks which were previously ignored completely. Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 44 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 2a0ffbc6c5..21bd95941e 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3414,6 +3414,10 @@ static int testDomainBlockStats(virDomainPtr domain, return ret; } + +static virNetworkObjPtr testNetworkObjFindByName(testDriverPtr privconn, const char *name); + + static int testDomainInterfaceAddresses(virDomainPtr dom, virDomainInterfacePtr **ifaces, @@ -3422,11 +3426,15 @@ testDomainInterfaceAddresses(virDomainPtr dom, { size_t i; size_t ifaces_count = 0; + size_t addr_offset; int ret = -1; char macaddr[VIR_MAC_STRING_BUFLEN]; virDomainObjPtr vm = NULL; virDomainInterfacePtr iface = NULL; virDomainInterfacePtr *ifaces_ret = NULL; + virSocketAddr addr; + virNetworkObjPtr net = NULL; + virNetworkDefPtr net_def = NULL; virCheckFlags(0, -1); @@ -3447,6 +3455,12 @@ testDomainInterfaceAddresses(virDomainPtr dom, goto cleanup; for (i = 0; i < vm->def->nnets; i++) { + if (!(net = testNetworkObjFindByName(dom->conn->privateData, + vm->def->nets[i]->data.network.name))) + goto cleanup; + + net_def = virNetworkObjGetDef(net); + if (VIR_ALLOC(iface) < 0) goto cleanup; @@ -3460,14 +3474,33 @@ testDomainInterfaceAddresses(virDomainPtr dom, if (VIR_ALLOC(iface->addrs) < 0) goto cleanup; - iface->addrs[0].type = VIR_IP_ADDR_TYPE_IPV4; - iface->addrs[0].prefix = 24; - if (virAsprintf(&iface->addrs[0].addr, "192.168.0.%zu", 1 + i) < 0) - goto cleanup; - iface->naddrs = 1; + iface->addrs[0].prefix = virSocketAddrGetIPPrefix(&net_def->ips->address, + &net_def->ips->netmask, + net_def->ips->prefix); + + if (net_def->ips->nranges > 0) + addr = net_def->ips->ranges[0].start; + else + addr = net_def->ips->address; + + /* try using different addresses per different inf and domain */ + addr_offset = 20 * (vm->def->id - 1) + i + 1; + + if (net_def->ips->family && STREQ(net_def->ips->family, "ipv6")) { + iface->addrs[0].type = VIR_IP_ADDR_TYPE_IPV6; + addr.data.inet6.sin6_addr.s6_addr[15] += addr_offset; + } else { + iface->addrs[0].type = VIR_IP_ADDR_TYPE_IPV4; + addr.data.inet4.sin_addr.s_addr = \ + htonl(ntohl(addr.data.inet4.sin_addr.s_addr) + addr_offset); + } + + if (!(iface->addrs[0].addr = virSocketAddrFormat(&addr))) + goto cleanup; VIR_APPEND_ELEMENT_INPLACE(ifaces_ret, ifaces_count, iface); + virNetworkObjEndAPI(&net); } VIR_STEAL_PTR(*ifaces, ifaces_ret); @@ -3475,6 +3508,7 @@ testDomainInterfaceAddresses(virDomainPtr dom, cleanup: virDomainObjEndAPI(&vm); + virNetworkObjEndAPI(&net); if (ifaces_ret) { for (i = 0; i < ifaces_count; i++) -- 2.22.0

2 5

[libvirt] [PATCH 0/4] cgroups: add support for BFQ scheduler
by Pavel Hrdina 21 Jun '19

21 Jun '19

Pavel Hrdina (4): util: vircgroup: introduce virCgroup(Get|Set)ValueRaw util: vircgroup: move virCgroupGetValueStr out of virCgroupGetValueForBlkDev util: vircgroupv1: add support for BFQ blkio files util: vircgroupv2: add support for BFQ files src/util/vircgroup.c | 70 +++++++++------- src/util/vircgrouppriv.h | 12 ++- src/util/vircgroupv1.c | 174 +++++++++++++++++++++++++++++---------- src/util/vircgroupv2.c | 156 +++++++++++++++++++++++++---------- 4 files changed, 292 insertions(+), 120 deletions(-) -- 2.21.0

2 5

[libvirt] [PATCH] docs: Space out entries in news.html
by Peter Krempa 21 Jun '19

21 Jun '19

The header for the news entry blends together with the text and other entries. This patch tries to space them out somewhat for better visual separation. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- You can see the difference here: https://github.com/pipo/libvirt/blob/screenshots/before.png https://github.com/pipo/libvirt/blob/screenshots/after.png docs/libvirt.css | 15 +++++++++++++++ docs/news-html.xsl | 13 +++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/docs/libvirt.css b/docs/libvirt.css index 4c7afc4042..e44ef616d8 100644 --- a/docs/libvirt.css +++ b/docs/libvirt.css @@ -591,3 +591,18 @@ td.enumvalue { .deprecatedhv { color: darkred; } + +ul.news-section { + margin-top: 0.5em; +} + +ul.news-section li dl dt { + margin: 0; +} + +ul.news-section li dl dd { + margin-left: 1em; + margin-right: 0; + margin-top: 0.5em; + margin-bottom: 0.5em; +} diff --git a/docs/news-html.xsl b/docs/news-html.xsl index 4d40798028..fb0178f9e2 100644 --- a/docs/news-html.xsl +++ b/docs/news-html.xsl @@ -58,7 +58,7 @@ <xsl:value-of select="@title"/> </strong> <xsl:if test="*"> - <ul> + <ul class="news-section"> <xsl:apply-templates select="change"/> </ul> </xsl:if> @@ -68,8 +68,14 @@  <xsl:template match="change"> <li> - <xsl:apply-templates select="summary"/> - <xsl:apply-templates select="description"/> + <dl> + <dt> + <xsl:apply-templates select="summary"/> + </dt> + <dd> + <xsl:apply-templates select="description"/> + </dd> + </dl> </li> </xsl:template> @@ -80,7 +86,6 @@  <xsl:template match="description"> - <br/> <xsl:apply-templates/> </xsl:template> -- 2.21.0

3 2

[libvirt] [PATCH] Revert "news: Document removal of qemu commandline parsing"
by Peter Krempa 21 Jun '19

21 Jun '19

Jano probably based his branch on top of mine and didn't notice when I moved the section up slightly and thus git applied it again. Keep only the instance followin the new features section. This reverts commit 9c68bb4a5c2c8c050e531533e5188a637ba1dd9f. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed under the trivial rule. docs/news.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/docs/news.xml b/docs/news.xml index 681e9a60a3..cada389092 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -67,18 +67,6 @@ </section> <section title="Bug fixes"> </section> - <section title="Removed features"> - <change> - <summary> - qemu: Remove support for virDomainQemuAttach and virConnectDomainXMLFromNative APIs - </summary> - <description> - The qemu implementations for the APIs mentioned above were removed - and the APIs now return error. The implementation was stale for a - long time and did not allow working with moder use of qemu in libvirt. - </description> - </change> - </section> </release> <release version="v5.4.0" date="2019-06-03"> <section title="Security"> -- 2.21.0

2 1

[libvirt] [PATCH] rpc: virnetlibsshsession: update deprecated functions
by Pavel Hrdina 21 Jun '19

21 Jun '19

In libssh 0.9.0 functions ssh_is_server_known and ssh_write_knownhost are marked as deprecated. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1722735 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- m4/virt-libssh.m4 | 8 ++++++++ src/rpc/virnetlibsshsession.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/m4/virt-libssh.m4 b/m4/virt-libssh.m4 index 01c3b75c72..132447da16 100644 --- a/m4/virt-libssh.m4 +++ b/m4/virt-libssh.m4 @@ -33,6 +33,14 @@ AC_DEFUN([LIBVIRT_CHECK_LIBSSH],[ [], [AC_DEFINE_UNQUOTED([ssh_get_server_publickey], [ssh_get_publickey], [ssh_get_publickey is deprecated and replaced by ssh_get_server_publickey.])]) + AC_CHECK_FUNC([ssh_session_is_known_server], + [], + [AC_DEFINE_UNQUOTED([ssh_session_is_known_server], [ssh_is_server_known], + [ssh_is_server_known is deprecated and replaced by ssh_session_is_known_server.])]) + AC_CHECK_FUNC([ssh_session_update_known_hosts], + [], + [AC_DEFINE_UNQUOTED([ssh_session_update_known_hosts], [ssh_write_knownhost], + [ssh_write_knownhost is deprecated and replaced by ssh_session_update_known_hosts.])]) CFLAGS="$old_CFLAGS" LIBS="$old_LIBS" fi diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 486437e7bf..093ac29071 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -284,7 +284,7 @@ virNetLibsshCheckHostKey(virNetLibsshSessionPtr sess) if (sess->hostKeyVerify == VIR_NET_LIBSSH_HOSTKEY_VERIFY_IGNORE) return 0; - state = ssh_is_server_known(sess->session); + state = ssh_session_is_known_server(sess->session); switch (state) { case SSH_SERVER_KNOWN_OK: @@ -378,7 +378,7 @@ virNetLibsshCheckHostKey(virNetLibsshSessionPtr sess) /* write the host key file, if specified */ if (sess->knownHostsFile) { - if (ssh_write_knownhost(sess->session) < 0) { + if (ssh_session_update_known_hosts(sess->session) < 0) { errmsg = ssh_get_error(sess->session); virReportError(VIR_ERR_LIBSSH, _("failed to write known_host file '%s': %s"), -- 2.21.0

3 3

[libvirt] [PATCH] Fix 'validate' typo in comments
by Jonathon Jongsma 21 Jun '19

21 Jun '19

Signed-off-by: Jonathon Jongsma <jjongsma(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 d06e094b11..8604ba63d4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21375,7 +21375,7 @@ virDomainObjParseXML(xmlDocPtr xml, if (virDomainDefPostParse(obj->def, caps, flags, xmlopt, parseOpaque) < 0) goto error; - /* valdiate configuration */ + /* validate configuration */ if (virDomainDefValidate(obj->def, caps, flags, xmlopt) < 0) goto error; @@ -21465,7 +21465,7 @@ virDomainDefParseNode(xmlDocPtr xml, if (virDomainDefPostParse(def, caps, flags, xmlopt, parseOpaque) < 0) goto cleanup; - /* valdiate configuration */ + /* validate configuration */ if (virDomainDefValidate(def, caps, flags, xmlopt) < 0) goto cleanup; -- 2.20.1

2 1

[libvirt] [PATCH 0/3] snapshots: Allow <seclabel> for snapshot disk source
by Peter Krempa 20 Jun '19

20 Jun '19

This is just a schema improvement, the code actually already does everything. Peter Krempa (3): docs: snapshot: Encourage people ot use disk 'target' to refer to disks docs: schemas: Add 'seclabel' for external disk snapshot tests: domainsnapshotxml2xml: make 'disk-seclabel' test operational docs/formatsnapshot.html.in | 18 +++++++++++++++--- docs/schemas/domainsnapshot.rng | 6 ++++++ ...-seclabel-invalid.xml => disk-seclabel.xml} | 0 .../domainsnapshotxml2xmlout/disk-seclabel.xml | 15 +++++++++++++++ tests/domainsnapshotxml2xmltest.c | 1 + 5 files changed, 37 insertions(+), 3 deletions(-) rename tests/domainsnapshotxml2xmlin/{disk-seclabel-invalid.xml => disk-seclabel.xml} (100%) create mode 100644 tests/domainsnapshotxml2xmlout/disk-seclabel.xml -- 2.21.0

3 6

[libvirt] [PATCH 00/15] qemu: Add possibility to control qemu capabilities for debug (blockdev-add saga spin-off)
by Peter Krempa 20 Jun '19

20 Jun '19

While this is not strictly required for blockdev to work it was created as a part of the testing (and possibly regression mitigation) effort. These patches introduce the option to add or remove qemu capabilities via the qemu XML namespace custom elements and remove features via qemu.conf. This series depends (very slightly) on the series deleting qemu parsing. To make applying it easy I'd sugges you fetrch everything needed by: git fetch https://github.com/pipo/libvirt.git features-filter Peter Krempa (15): qemu: Rename qemuDomainCmdlineDefPtr to qemuDomainXmlNsDefPtr qemu: Move qemuDomainXmlNsDef(Free) from qemu_conf.(ch) qemu: domain: Use virStringListFreeCount in qemuDomainXmlNsDefFree qemu: Extract parsing of qemu namespace arguments into separate function qemu: Extract parsing of qemu namespace env vars into separate function qemu: Refactor qemuDomainDefNamespaceParse qemu: domain: Split out commandline namespace data formatting conf: Add taint flag for custom hypervisor features qemu: Add support for controling qemu capabilities via the qemu XML namespace qemu: domain: Add support for modifying qemu capability list via qemu namespace tests: qemuxml2argv: Modernize and fork 'qemu-ns' test tests: qemuxml2argv: Test qemu namespace capability tweaking qemu: Remove unused var 'corestr' from virQEMUDriverConfigLoadFile qemu: conf: Add debug option to allow disabling qemu capabilities qemu: Implement support for 'capability_filters' config option docs/drvqemu.html.in | 30 ++ docs/schemas/domaincommon.rng | 19 ++ src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/qemu/libvirtd_qemu.aug | 3 + src/qemu/qemu.conf | 7 + src/qemu/qemu_command.c | 16 +- src/qemu/qemu_conf.c | 39 ++- src/qemu/qemu_conf.h | 17 +- src/qemu/qemu_domain.c | 285 +++++++++++++----- src/qemu/qemu_domain.h | 19 ++ src/qemu/qemu_process.c | 55 ++++ src/qemu/test_libvirtd_qemu.aug.in | 3 + tests/qemuxml2argvdata/qemu-ns.args | 33 -- .../qemu-ns.x86_64-4.0.0.args | 41 +++ .../qemu-ns.x86_64-latest.args | 41 +++ tests/qemuxml2argvdata/qemu-ns.xml | 5 + tests/qemuxml2argvtest.c | 3 +- 18 files changed, 458 insertions(+), 160 deletions(-) delete mode 100644 tests/qemuxml2argvdata/qemu-ns.args create mode 100644 tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args create mode 100644 tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args -- 2.21.0

2 30

[libvirt] [PATCH] docs: Fix Blog Planet links
by Martin Kletzander 20 Jun '19

20 Jun '19

They were pointing to the blogs instead, now they point the articles. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial-and-thoroughly-tested. docs/js/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/js/main.js b/docs/js/main.js index e48e95075cf6..2edc62830453 100644 --- a/docs/js/main.js +++ b/docs/js/main.js @@ -116,10 +116,10 @@ function fetchRSS() { var name = e.querySelector("author > name").textContent; var title = e.querySelector("title").textContent; var updated = e.querySelector("updated").textContent; - var uri = e.querySelector("author > uri").textContent; + var link = e.querySelector("link").attributes.href.textContent; var a = document.createElement("a"); - a.href = uri; + a.href = link; a.innerText = title; var dt = document.createElement("dt"); -- 2.22.0

1 0

[libvirt] [PATCH] remote: refactor how unprivileged user session connection is identified
by Daniel P. Berrangé 20 Jun '19

20 Jun '19

Currently the VIR_DRV_OPEN_REMOTE_USER flag is only set when we identify that we're connecting to a local libvirtd daemon. We would like to be able to set that even if connecting to a remote libvirtd daemon. This entails refactoring the conditional check. One subtle change is that the VIR_DRV_OPEN_REMOTE_USER is now set when the test+XXX:// URI is used, even if a servername is present. This has no effect in this patch, but will later. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/remote/remote_driver.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index a95781a797..e1eaa56230 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1390,25 +1390,35 @@ remoteConnectOpen(virConnectPtr conn, rflags |= VIR_DRV_OPEN_REMOTE_RO; /* - * If no servername is given, and no +XXX - * transport is listed, or transport is unix, - * and path is /session, and uid is unprivileged - * then auto-spawn a daemon. + * User session daemon is used for + * + * - Any URI with /session suffix + * - Test driver, if a protocol is given + * + * provided we are running non-root */ if (conn->uri && - !conn->uri->server && conn->uri->path && conn->uri->scheme && - (transport == NULL || STREQ(transport, "unix")) && (STREQ(conn->uri->path, "/session") || STRPREFIX(conn->uri->scheme, "test+")) && geteuid() > 0) { - VIR_DEBUG("Auto-spawn user daemon instance"); + VIR_DEBUG("User session daemon required"); rflags |= VIR_DRV_OPEN_REMOTE_USER; + + /* + * Furthermore if no servername is given, and no +XXX + * transport is listed, or transport is unix, + * and uid is unprivileged then auto-spawn a daemon. + */ if (!virIsSUID() && + !conn->uri->server && + (transport == NULL || STREQ(transport, "unix")) && (!autostart || - STRNEQ(autostart, "0"))) + STRNEQ(autostart, "0"))) { + VIR_DEBUG("Try daemon autostart"); rflags |= VIR_DRV_OPEN_REMOTE_AUTOSTART; + } } /* -- 2.21.0

2 1