- Devel - libvirt List Archives

[libvirt] [PATCH] test_driver: Fix permissions for test_driver.c
by Ján Tomko 15 Aug '19

15 Aug '19

From: Andrea Bolognani <abologna(a)redhat.com> Introduced in commit 4a6ee53581b3. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> (cherry picked from commit df1b5cf02efd4fee6f01ebe69fd0f1fd24b3947d) Reintroduced-by: fb275b76734ba1c0b18ad1088e3c82fb01961903 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/test/test_driver.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 src/test/test_driver.c diff --git a/src/test/test_driver.c b/src/test/test_driver.c old mode 100755 new mode 100644 -- 2.20.1

1 0

[libvirt] [PATCH] remote_daemon_dispatch.c: typecast ARRAY_CARDINALITY() in remoteDispatchProbeURI()
by Michal Privoznik 15 Aug '19

15 Aug '19

Since users can enable/disable drivers at compile time, it may happen that @drivers array is in fact empty (in both its occurrences within the function). This means that ARRAY_CARDINALITY() returns 0UL which makes gcc unhappy because of loop condition: i < ARRAY_CARDINALITY(drivers) GCC complains that @i is unsigned and comparing an unsigned value against 0 is always false. However, changing the type of @i to ssize_t is not enough, because compiler still sees the unsigned zero. The solution is to typecast the ARRAY_CARDINALITY(). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/remote/remote_daemon_dispatch.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index c8e353ebd3..1bd281dd6d 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -2141,9 +2141,9 @@ remoteDispatchProbeURI(bool readonly, "vbox", # endif }; - size_t i; + ssize_t i; - for (i = 0; i < ARRAY_CARDINALITY(drivers) && !*probeduri; i++) { + for (i = 0; i < (ssize_t) ARRAY_CARDINALITY(drivers) && !*probeduri; i++) { VIR_AUTOFREE(char *) daemonname = NULL; VIR_AUTOFREE(char *) daemonpath = NULL; @@ -2187,9 +2187,9 @@ remoteDispatchProbeURI(bool readonly, "vz", # endif }; - size_t i; + ssize_t i; - for (i = 0; i < ARRAY_CARDINALITY(drivers) && !*probeduri; i++) { + for (i = 0; i < (ssize_t) ARRAY_CARDINALITY(drivers) && !*probeduri; i++) { VIR_AUTOFREE(char *) sockname = NULL; if (virAsprintf(&sockname, "%s/run/libvirt/virt%sd-%s", -- 2.21.0

2 1

[libvirt] [PATCH 0/6] qemu: Allow suppressing some errors in qemu bulk stats code
by Peter Krempa 15 Aug '19

15 Aug '19

There is an bugreport [1] that some Openstack deployments get periodic errors in the log. This is most probably from the bulk stats code which in some cases calls into the storage backends to update some aspects of storage volumes. Since none of the errors are fatal add code to allow skipping them. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1724808 Peter Krempa (6): util: Export virStorageFileSupportsBackingChainTraversal qemu: Allow skipping some errors in qemuDomainStorageOpenStat util: storagefile: Don't report errors from virStorageSourceUpdatePhysicalSize qemu: driver: Improve error suppression in qemuDomainStorageUpdatePhysical qemu: Allow suppressing errors from qemuStorageLimitsRefresh qemu: Don't report some ignored errors in qemuDomainGetStatsOneBlockFallback src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 60 ++++++++++++++++++++++++++++----------- src/util/virstoragefile.c | 16 +++-------- src/util/virstoragefile.h | 1 + 4 files changed, 50 insertions(+), 28 deletions(-) -- 2.21.0

2 12

[libvirt] [PATCH 0/2] Fix the latest virpcitest failure
by Michal Privoznik 15 Aug '19

15 Aug '19

See 2/2 for explanation. Michal Prívozník (2): ci: Allow gdb in containers virpcimock: Mock __open_2() Makefile.ci | 1 + tests/virpcimock.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) -- 2.21.0

3 5

[libvirt] [PATCH] test_driver: implement virConnectCompareCPU
by Ilias Stamatis 15 Aug '19

15 Aug '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- Probably we need to extend the host CPU's capabilities as well along with this patch. Currently virCPUx86Compare reports "unknown host CPU". src/test/test_driver.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index c39eef2d4b..b1037f4eab 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1529,6 +1529,26 @@ static int testConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, return 32; } + +static int +testConnectCompareCPU(virConnectPtr conn, + const char *xmlDesc, + unsigned int flags) +{ + testDriverPtr privconn = conn->privateData; + bool failIncompatible = !!(flags & VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE); + int ret = VIR_CPU_COMPARE_ERROR; + + virCheckFlags(VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE, + VIR_CPU_COMPARE_ERROR); + + ret = virCPUCompareXML(privconn->caps->host.arch, privconn->caps->host.cpu, + xmlDesc, failIncompatible); + + return ret; +} + + static char * testConnectBaselineCPU(virConnectPtr conn ATTRIBUTE_UNUSED, const char **xmlCPUs, @@ -9510,6 +9530,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainRevertToSnapshot = testDomainRevertToSnapshot, /* 1.1.4 */ .domainSnapshotDelete = testDomainSnapshotDelete, /* 1.1.4 */ + .connectCompareCPU = testConnectCompareCPU, /* 5.7.0 */ .connectBaselineCPU = testConnectBaselineCPU, /* 1.2.0 */ .domainCheckpointCreateXML = testDomainCheckpointCreateXML, /* 5.6.0 */ .domainCheckpointGetXMLDesc = testDomainCheckpointGetXMLDesc, /* 5.6.0 */ -- 2.22.0

1 0

[libvirt] [PATCH] docs: Make anchors in API html files clickable/linkable
by Peter Krempa 15 Aug '19

15 Aug '19

Use 'id' instead of 'name' for anchors which adds the hidden clickable headerlink helper so it's way simpler to link to a specific part of the docs. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/newapi.xsl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/newapi.xsl b/docs/newapi.xsl index c808fe5ff8..f9cbcb6323 100644 --- a/docs/newapi.xsl +++ b/docs/newapi.xsl @@ -308,7 +308,7 @@ <xsl:template match="typedef[@type = 'enum']"> <xsl:variable name="name" select="string(@name)"/> - <h3><a name="{$name}"><code><xsl:value-of select="$name"/></code></a></h3> + <h3><a id="{$name}"><code><xsl:value-of select="$name"/></code></a></h3> <div class="api"> <pre> <span class="keyword">enum</span><xsl:text> </xsl:text> @@ -357,7 +357,7 @@ </xsl:template> <xsl:template match="struct"> - <h3><a name="{@name}"><code><xsl:value-of select="@name"/></code></a></h3> + <h3><a id="{@name}"><code><xsl:value-of select="@name"/></code></a></h3> <div class="api"> <pre> <span class="keyword">struct </span> @@ -447,7 +447,7 @@ <xsl:template match="macro"> <xsl:variable name="name" select="string(@name)"/> - <h3><a name="{$name}"><code><xsl:value-of select="$name"/></code></a></h3> + <h3><a id="{$name}"><code><xsl:value-of select="$name"/></code></a></h3> <pre class="api"><span class="directive">#define</span><xsl:text> </xsl:text><xsl:value-of select="$name"/></pre> <div class="description"> <xsl:call-template name="formattext"> @@ -558,7 +558,7 @@ <xsl:variable name="nlen" select="string-length($name)"/> <xsl:variable name="tlen" select="string-length(return/@type)"/> <xsl:variable name="blen" select="(($nlen + 8) - (($nlen + 8) mod 8)) + (($tlen + 8) - (($tlen + 8) mod 8))"/> - <h3><a name="{$name}"><code><xsl:value-of select="$name"/></code></a></h3> + <h3><a id="{$name}"><code><xsl:value-of select="$name"/></code></a></h3> <pre class="api"> <span class="keyword">typedef</span><xsl:text> </xsl:text> <span class="type"> @@ -636,7 +636,7 @@ <xsl:variable name="nlen" select="string-length($name)"/> <xsl:variable name="tlen" select="string-length(return/@type)"/> <xsl:variable name="blen" select="(($nlen + 8) - (($nlen + 8) mod 8)) + (($tlen + 8) - (($tlen + 8) mod 8))"/> - <h3><a name="{$name}"><code><xsl:value-of select="$name"/></code></a></h3> + <h3><a id="{$name}"><code><xsl:value-of select="$name"/></code></a></h3> <pre class="api"> <span class="type"> <xsl:call-template name="dumptext"> -- 2.21.0

2 1

[libvirt] [PATCH 00/12] qemu: Add blockdev support for block copy (blockdev-add saga)
by Peter Krempa 15 Aug '19

15 Aug '19

Add support for running a block-copy with -blockdev. This requires us to format our own images, so this series also adds support for blockdev-create which allows to do such a thing with qemu directly. blockdev-create will also be used with snapshots. Peter Krempa (12): qemu: domain: Allow formatting top source only in qemuDomainObjPrivateXMLFormatBlockjobFormatChain qemu: Fix logic in qemuDomainBlockCopyCommonValidateUserMirrorBackingStore qemu: fix broken handling of shallow flag in qemuDomainBlockCopyCommon util: storage: Refactor logic for using virStorageFileGetBackendForSupportCheck util: storage: Allow checking whether virStorageFileCreate is supported qemu: blockjob: Remove qemuBlockJobDiskRegisterMirror qemu: domain: Add 'break' after formatting commit job status XML conf: domain: Parse backingStore with VIR_DOMAIN_DEF_PARSE_DISK_SOURCE qemu: blockjob: Copy non-detected chain fully in qemuBlockJobRewriteConfigDiskSource qemu: Introduce code for blockdev-create qemu: Add blockdev support for the block copy job qemu: driver: allow remote destinations for block copy src/conf/domain_conf.c | 6 +- src/libvirt_private.syms | 1 + src/qemu/qemu_block.c | 250 ++++++++++++++++++ src/qemu/qemu_block.h | 14 + src/qemu/qemu_blockjob.c | 202 ++++++++++++-- src/qemu/qemu_blockjob.h | 37 ++- src/qemu/qemu_domain.c | 83 ++++-- src/qemu/qemu_driver.c | 184 +++++++++---- src/util/virstoragefile.c | 59 +++-- src/util/virstoragefile.h | 1 + .../blockjob-blockdev-in.xml | 59 +++++ 11 files changed, 786 insertions(+), 110 deletions(-) -- 2.21.0

2 24

[libvirt] [PATCH] util: storage: Fix parsing of 'exportname' from legacy NBD strings
by Peter Krempa 15 Aug '19

15 Aug '19

If the nbd export name contains a colon, our parser would not parse it properly as we split the string by colons. Modify the code to look up the exportname and copy any trailing characters as the export name is supposed to be at the end of the string. https://bugzilla.redhat.com/show_bug.cgi?id=1733044 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virstoragefile.c | 6 ++++-- tests/virstoragetest.c | 8 ++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index a6de6a1e45..ffafeef9d8 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2928,6 +2928,7 @@ virStorageSourceParseNBDColonString(const char *nbdstr, virStorageSourcePtr src) { VIR_AUTOSTRINGLIST backing = NULL; + const char *exportname; if (!(backing = virStringSplit(nbdstr, ":", 0))) return -1; @@ -2975,8 +2976,9 @@ virStorageSourceParseNBDColonString(const char *nbdstr, return -1; } - if (backing[3] && STRPREFIX(backing[3], "exportname=")) { - if (VIR_STRDUP(src->path, backing[3] + strlen("exportname=")) < 0) + if ((exportname = strstr(nbdstr, "exportname="))) { + exportname += strlen("exportname="); + if (VIR_STRDUP(src->path, exportname) < 0) return -1; } diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index ef16b3c6e0..f558eea622 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -1262,6 +1262,14 @@ mymain(void) "<source protocol='nbd' name='blah'>\n" " <host name='example.org' port='6000'/>\n" "</source>\n"); + TEST_BACKING_PARSE("nbd:example.org:6000:exportname=:", + "<source protocol='nbd' name=':'>\n" + " <host name='example.org' port='6000'/>\n" + "</source>\n"); + TEST_BACKING_PARSE("nbd:example.org:6000:exportname=:test", + "<source protocol='nbd' name=':test'>\n" + " <host name='example.org' port='6000'/>\n" + "</source>\n"); TEST_BACKING_PARSE("nbd://example.org:1234", "<source protocol='nbd'>\n" " <host name='example.org' port='1234'/>\n" -- 2.21.0

2 2

[libvirt] [PATCH 0/5] util: open pci config read-only for querying
by Ján Tomko 15 Aug '19

15 Aug '19

A bunch of functions opened the PCI device config as read-write even though they only read from it. Ján Tomko (5): util: introduce virPCIDeviceConfigOpenInternal util: Introduce virPCIDeviceConfigOpenWrite util: introduce readonly attribute to virPCIDeviceConfigOpenInternal util: introduce virPCIDeviceConfigOpenTry util: default to read-only in virPCIDeviceConfigOpen src/util/virpci.c | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) -- 2.20.1

4 8

[libvirt] [PATCH v2 0/2] test_driver: implement virDomainSetLifecycleAction
by Ilias Stamatis 14 Aug '19

14 Aug '19

Ilias Stamatis (2): test_driver: handle different lifecycle actions in testDomainShutdownFlags test_driver: implement virDomainSetLifecycleAction src/test/test_driver.c | 135 +++++++++++++++++++++++++++++++---------- 1 file changed, 103 insertions(+), 32 deletions(-) -- 2.22.0

2 6

[libvirt] [PATCH 0/3] virNetDaemonCallInhibit: check for logind availability
by Ján Tomko 14 Aug '19

14 Aug '19

* get rid of a pointless error logged when system D-Bus is not available * do not send messages on systems without logind * remove four extra dbus calls on libvirtd startup when checking for logind availability Ján Tomko (3): util: introduce virSystemdHasLogind util: cache the result of whether logind is available rpc: make virNetDaemonCallInhibit a no-op with no logind src/libvirt_private.syms | 2 ++ src/rpc/virnetdaemon.c | 3 +++ src/util/virsystemd.c | 37 ++++++++++++++++++++++++++++++++----- src/util/virsystemd.h | 2 ++ src/util/virsystemdpriv.h | 1 + tests/virsystemdtest.c | 3 +++ 6 files changed, 43 insertions(+), 5 deletions(-) -- 2.19.2

2 4

[libvirt] [PATCH 0/3] quietly ignore missing pm-is-supported
by Ján Tomko 14 Aug '19

14 Aug '19

On systems with no logind or pm-is-supported binary, stop spamming the logs about a missing executable. Ján Tomko (3): util: use VIR_AUTOPTR virNodeSuspendSupportsTargetPMUtils util: do not repeat the pm-is-supported string util: be quiet when pm-is-supported is unavailable src/util/virnodesuspend.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) -- 2.19.2

2 7

[libvirt] [PATCH 0/3] qemu: Allow migration with disk cache on
by Jiri Denemark 14 Aug '19

14 Aug '19

QEMU 4.0.0 and newer automatically drops caches at the end of migration, which means we can safely allow migration even if disk/driver/@cache is not none nor directsync. Jiri Denemark (3): qemu: Clarify error message in qemuMigrationSrcIsSafe qemu: Check for drop-cache capability qemu: Allow migration with disk cache on src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_migration.c | 14 +++++++++++--- tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 + 10 files changed, 21 insertions(+), 3 deletions(-) -- 2.22.1

3 5

[libvirt] [PATCH] qemu: Fix crash on incoming migration
by Jiri Denemark 13 Aug '19

13 Aug '19

In the first stage of incoming migration (qemuMigrationDstPrepareAny) we call qemuMigrationEatCookie when there's no vm object created yet and thus we don't have any private data to pass. Broken by me in commit v5.6.0-109-gbf15b145ec. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration_cookie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index da5bc8d05f..25d3fecd74 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -1507,7 +1507,7 @@ qemuMigrationEatCookie(virQEMUDriverPtr driver, if (cookiein && cookieinlen && qemuMigrationCookieXMLParseStr(mig, driver, - priv->qemuCaps, + priv ? priv->qemuCaps : NULL, cookiein, flags) < 0) goto error; -- 2.22.1

2 1

[libvirt] [PATCH v2 0/2] Revert "configure: Remove --enable-test-coverage"
by Jiri Denemark 13 Aug '19

13 Aug '19

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. 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. I had to do some changes to resolve conflicts. The changes were not too big, but I figured I'd rather resend this patch especially when I originally forgot to Cc the original author of the reverted patch. Jiri Denemark (2): Revert "configure: Remove --enable-test-coverage" Revert "docs: hacking: Add 'Code coverage reports' section" Makefile.am | 20 +++++++++++++++++--- configure.ac | 18 ++++++++++++++++++ docs/hacking.html.in | 29 ----------------------------- src/Makefile.am | 2 ++ src/remote/Makefile.inc.am | 2 ++ tests/Makefile.am | 2 ++ tools/Makefile.am | 6 ++++++ 7 files changed, 47 insertions(+), 32 deletions(-) -- 2.22.1

2 3

[libvirt] [PATCH] test_driver: implement virDomainSetLifecycleAction
by Ilias Stamatis 13 Aug '19

13 Aug '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 58 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index aae9875194..71d6baa3da 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -7404,6 +7404,63 @@ testDomainMemoryPeek(virDomainPtr dom, } +static void +testDomainModifyLifecycleAction(virDomainDefPtr def, + virDomainLifecycle type, + virDomainLifecycleAction action) +{ + switch (type) { + case VIR_DOMAIN_LIFECYCLE_POWEROFF: + def->onPoweroff = action; + break; + case VIR_DOMAIN_LIFECYCLE_REBOOT: + def->onReboot = action; + break; + case VIR_DOMAIN_LIFECYCLE_CRASH: + def->onCrash = action; + break; + case VIR_DOMAIN_LIFECYCLE_LAST: + break; + } +} + + +static int +testDomainSetLifecycleAction(virDomainPtr dom, + unsigned int type, + unsigned int action, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + virDomainDefPtr def = NULL; + virDomainDefPtr persistentDef = NULL; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); + + if (!virDomainDefLifecycleActionAllowed(type, action)) + return -1; + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0) + goto cleanup; + + if (def) + testDomainModifyLifecycleAction(def, type, action); + + if (persistentDef) + testDomainModifyLifecycleAction(persistentDef, type, action); + + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + /* * Snapshot APIs */ @@ -8698,6 +8755,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainHasManagedSaveImage = testDomainHasManagedSaveImage, /* 1.1.4 */ .domainManagedSaveRemove = testDomainManagedSaveRemove, /* 1.1.4 */ .domainMemoryPeek = testDomainMemoryPeek, /* 5.4.0 */ + .domainSetLifecycleAction = testDomainSetLifecycleAction, /* 5.7.0 */ .domainSnapshotNum = testDomainSnapshotNum, /* 1.1.4 */ .domainSnapshotListNames = testDomainSnapshotListNames, /* 1.1.4 */ -- 2.22.0

2 3

[libvirt] [PATCH 0/2] test_driver: implement Get/Set Blkio parameters APIs
by Ilias Stamatis 13 Aug '19

13 Aug '19

This series depends on another series that haven't been merged yet: https://www.redhat.com/archives/libvir-list/2019-July/msg00520.html Ilias Stamatis (2): test_driver: implement virDomainGetBlkioParameters test_driver: implement virDomainSetBlkioParameters src/test/test_driver.c | 123 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) -- 2.22.0

1 2

[libvirt] [PATCH v2]daemon: Fix a crash during virNetlinkEventServiceStopAll
by Liu Haitao 13 Aug '19

13 Aug '19

When reboot the host, a core dump file would be generated. The call traces are: Note.In this case, the main thread is thread 5. (gdb) thread 5 [Switching to thread 5 (LWP 4142)] (gdb) bt 0 0x00007f00a6838273 in futex_wait_cancelable (private=<optimized out>, expected=0, futex_word=0x7f004c0125c0) at /usr/src/debug/glibc/2.24-r0/git/sysdeps/unix/sysv/linux/futex-internal.h:88 1 __pthread_cond_wait_common (abstime=0x0, mutex=0x7f004c012540, cond=0x7f004c012598) at /usr/src/debug/glibc/2.24-r0/git/nptl/pthread_cond_wait.c:502 2 __pthread_cond_wait (cond=0x7f004c012598, mutex=0x7f004c012540) at /usr/src/debug/glibc/2.24-r0/git/nptl/pthread_cond_wait.c:655 3 0x00007f00aa467246 in virCondWait (c=<optimized out>, m=<optimized out>) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/util/virthread.c:154 4 0x00007f00aa467eb0 in virThreadPoolFree (pool=<optimized out>) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/util/virthreadpool.c:286 5 0x00007f0074349f9d in qemuStateCleanup () at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/qemu/qemu_driver.c:1036 6 0x00007f00aa5e9486 in virStateCleanup () at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/libvirt.c:682 7 0x000055a687ab86a4 in main (argc=<optimized out>, argv=<optimized out>) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/remote/remote_daemon.c:1473 (gdb) thread 1 [Switching to thread 1 (LWP 4403)] (gdb) bt 0 __GI___pthread_mutex_lock (mutex=mutex@entry=0x0) at /usr/src/debug/glibc/2.24-r0/git/nptl/pthread_mutex_lock.c:67 1 0x00007f00aa467165 in virMutexLock (m=m@entry=0x0) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/util/virthread.c:89 2 0x00007f00aa43c0f9 in virNetlinkEventServerLock (driver=<optimized out>) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/util/virnetlink.c:799 3 virNetlinkEventRemoveClient (watch=watch@entry=0, macaddr=macaddr@entry=0x7f0088014944, protocol=protocol@entry=0) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/util/virnetlink.c:1197 4 0x00007f00aa4341df in virNetDevMacVLanDeleteWithVPortProfile ( ifname=<optimized out>, macaddr=macaddr@entry=0x7f0088014944, linkdev=0x7f0088014920 "eth1", mode=mode@entry=1, virtPortProfile=virtPortProfile@entry=0x0, stateDir=stateDir@entry=0x7f004c12fa90 "/var/run/libvirt/qemu") at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/util/virnetdevmacvlan.c:1112 5 0x00007f0074312251 in qemuProcessStop (driver=driver@entry=0x7f004c0ecef0, vm=vm@entry=0x7f0088000b00, reason=reason@entry=VIR_DOMAIN_SHUTOFF_SHUTDOWN, asyncJob=asyncJob@entry=QEMU_ASYNC_JOB_NONE, flags=<optimized out>) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/qemu/qemu_process.c:7291 6 0x00007f007437a5ea in processMonitorEOFEvent (vm=0x7f0088000b00, driver=0x7f004c0ecef0) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/qemu/qemu_driver.c:4756 7 qemuProcessEventHandler (data=0x55a687d6df10, opaque=0x7f004c0ecef0) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/qemu/qemu_driver.c:4859 8 0x00007f00aa467c5b in virThreadPoolWorker ( opaque=opaque@entry=0x55a687d6c110) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/util/virthreadpool.c:163 9 0x00007f00aa466fe8 in virThreadHelper (data=<optimized out>) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/util/virthread.c:206 10 0x00007f00a68323f4 in start_thread (arg=0x7f00699df700) at /usr/src/debug/glibc/2.24-r0/git/nptl/pthread_create.c:456 11 0x00007f00a616e10f in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:105 1. The execution flow of main thread (Thread 5 LWP 4142): main() -->virNetDaemonRun() -->virNetDaemonClose(dmn) //cleanup -->virNetlinkEventServiceStopAll() -->virStateCleanup() -->qemuStateCleanup() -->virThreadPoolFree() -->__pthread_cond_wait() virNetDaemonRun() -->virEventRunDefaultImpl -->virEventPollRunOnce -->virEventPollDispatchHandles -->qemuMonitorIO -->qemuProcessHandleMonitorEOF -->processEvent->eventType = QEMU_PROCESS_EVENT_MONITOR_EOF -->virThreadPoolSendJob() After typing reboot command on the host, the main thread would send an event message to another thread. Here it would let thread 1 to handle the shutdown of qemu process. But it could not be executed immediately. virNetlinkEventServiceStopAll() --> virNetlinkEventServiceStop() --> server[protocol] = NULL; // set server to null IN virNetlinkEventServiceStopAll(), some variables related to network are freed, like (static virNetlinkEventSrvPrivatePtr server). virStateCleanup() -->qemuStateCleanup() -->virThreadPoolFree() -->__pthread_cond_wait() In virThreadPoolFree() it will wait other thread to end up. 2. The execution flow of thread 5 (LWP 4403): qemuProcessStop() -->virNetDevMacVLanDeleteWithVPortProfile() -->virNetlinkEventRemoveClient() --> srv = server[protocol] Although the main thread had sent the message to thread 1(4403), it could not be run instantly. It means that the virNetlinkEventServiceStopAll() might be executed earlier than virNetlinkEventRemoveClient(). We could get it from the log file. "" 2019-06-12 00:10:09.230+0000: 4142: info : virNetlinkEventServiceStopAll:941 : stopping all netlink event services 2019-06-12 00:10:09.230+0000: 4142: info : virNetlinkEventServiceStop:904 : stopping netlink event service 2019-06-12 00:10:21.165+0000: 4403: debug : virNetlinkEventRemoveClient:1190 : removing client watch=0, mac=0x7f0088014944. " In virNetlinkEventRemoveClient() the variable server is used again, but now it is null that is freed by virNetlinkEventServiceStopAll().So it would case a crash . The virNetlinkEventServiceStopAll() should be executed behind virStateCleanup(), Signed-off-by: Liu Haitao <haitao.liu(a)windriver.com> --- src/remote/remote_daemon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index c3782971f1..7da20a6644 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -1464,8 +1464,6 @@ int main(int argc, char **argv) { /* Keep cleanup order in inverse order of startup */ virNetDaemonClose(dmn); - virNetlinkEventServiceStopAll(); - if (driversInitialized) { /* NB: Possible issue with timing window between driversInitialized * setting if virNetlinkEventServerStart fails */ @@ -1473,6 +1471,8 @@ int main(int argc, char **argv) { virStateCleanup(); } + virNetlinkEventServiceStopAll(); + virObjectUnref(adminProgram); virObjectUnref(srvAdm); virObjectUnref(qemuProgram); -- 2.21.0

2 3

[libvirt] [PATCH] Revert "tpm: Check TPM XML device configuration changes after edit"
by Ján Tomko 12 Aug '19

12 Aug '19

Redefining a domain via virDomainDefineXML should not give different results based on an already existing definition. Also, there's a crasher somewhere in the code: https://bugzilla.redhat.com/show_bug.cgi?id=1739338 This reverts commit 94b3aa55f83ada33a9fdda66068d58ef1a56c0a5 --- src/conf/domain_conf.c | 56 --------------------------------------- src/conf/domain_conf.h | 3 --- src/libvirt_private.syms | 1 - src/qemu/qemu_driver.c | 28 -------------------- src/qemu/qemu_extdevice.c | 2 +- src/qemu/qemu_extdevice.h | 3 --- 6 files changed, 1 insertion(+), 92 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0456369d55..f54acd0c2a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -31461,59 +31461,3 @@ virDomainGraphicsNeedsAutoRenderNode(const virDomainGraphicsDef *graphics) return true; } - - -static int -virDomainCheckTPMChanges(virDomainDefPtr def, - virDomainDefPtr newDef) -{ - bool oldEnc, newEnc; - - if (!def->tpm) - return 0; - - switch (def->tpm->type) { - case VIR_DOMAIN_TPM_TYPE_EMULATOR: - if (virFileExists(def->tpm->data.emulator.storagepath)) { - /* VM has been started */ - /* Once a VM was started with an encrypted state we allow - * less configuration changes. - */ - oldEnc = def->tpm->data.emulator.hassecretuuid; - if (oldEnc && def->tpm->type != newDef->tpm->type) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Changing the type of TPM is not allowed")); - return -1; - } - if (oldEnc && !newDef->tpm) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Removing an encrypted TPM is not allowed")); - return -1; - } - newEnc = newDef->tpm->data.emulator.hassecretuuid; - if (oldEnc != newEnc) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("TPM state encryption cannot be changed " - "once VM was started")); - return -1; - } - } - break; - case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: - case VIR_DOMAIN_TPM_TYPE_LAST: - break; - } - - return 0; -} - - -int -virDomainCheckDeviceChanges(virDomainDefPtr def, - virDomainDefPtr newDef) -{ - if (!def || !newDef) - return 0; - - return virDomainCheckTPMChanges(def, newDef); -} diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 57ca2a8ad1..2d7350e675 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3641,6 +3641,3 @@ virDomainGraphicsGetRenderNode(const virDomainGraphicsDef *graphics); bool virDomainGraphicsNeedsAutoRenderNode(const virDomainGraphicsDef *graphics); - -int -virDomainCheckDeviceChanges(virDomainDefPtr def, virDomainDefPtr newDef); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index cae8febf8d..7a3feb8efa 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -217,7 +217,6 @@ virDomainBootTypeFromString; virDomainBootTypeToString; virDomainCapabilitiesPolicyTypeToString; virDomainCapsFeatureTypeToString; -virDomainCheckDeviceChanges; virDomainChrConsoleTargetTypeFromString; virDomainChrConsoleTargetTypeToString; virDomainChrDefForeach; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ff83d1c024..0fccf3dc37 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -53,7 +53,6 @@ #include "qemu_migration_params.h" #include "qemu_blockjob.h" #include "qemu_security.h" -#include "qemu_extdevice.h" #include "virerror.h" #include "virlog.h" @@ -7760,30 +7759,6 @@ qemuDomainCreate(virDomainPtr dom) return qemuDomainCreateWithFlags(dom, 0); } -static int -qemuDomainCheckDeviceChanges(virQEMUDriverPtr driver, - virDomainDefPtr def) -{ - virDomainObjPtr vm; - int ret; - - vm = virDomainObjListFindByUUID(driver->domains, def->uuid); - if (!vm) - return 0; - - if (qemuExtDevicesInitPaths(driver, vm->def) < 0) { - ret = -1; - goto cleanup; - } - - ret = virDomainCheckDeviceChanges(vm->def, def); - - cleanup: - virDomainObjEndAPI(&vm); - - return ret; -} - static virDomainPtr qemuDomainDefineXMLFlags(virConnectPtr conn, const char *xml, @@ -7820,9 +7795,6 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0) goto cleanup; - if (qemuDomainCheckDeviceChanges(driver, def) < 0) - goto cleanup; - if (!(vm = virDomainObjListAdd(driver->domains, def, driver->xmlopt, 0, &oldDef))) diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c index af52466421..dc032aa60c 100644 --- a/src/qemu/qemu_extdevice.c +++ b/src/qemu/qemu_extdevice.c @@ -79,7 +79,7 @@ qemuExtDeviceLogCommand(qemuDomainLogContextPtr logCtxt, * stored and we can remove directories and files in case of domain XML * changes. */ -int +static int qemuExtDevicesInitPaths(virQEMUDriverPtr driver, virDomainDefPtr def) { diff --git a/src/qemu/qemu_extdevice.h b/src/qemu/qemu_extdevice.h index 5a53c79f38..039b3e60dd 100644 --- a/src/qemu/qemu_extdevice.h +++ b/src/qemu/qemu_extdevice.h @@ -54,6 +54,3 @@ bool qemuExtDevicesHasDevice(virDomainDefPtr def); int qemuExtDevicesSetupCgroup(virQEMUDriverPtr driver, virDomainDefPtr def, virCgroupPtr cgroup); - -int qemuExtDevicesInitPaths(virQEMUDriverPtr driver, - virDomainDefPtr def); -- 2.19.2

5 6

[libvirt] [PATCH v2 0/5] test_driver: implement IOThread related APIs
by Ilias Stamatis 12 Aug '19

12 Aug '19

Changes since v1: - Use vm-private data for storing iothread parameters and implement virDomainSetIOThreadParams Ilias Stamatis (5): test_driver: implement virDomainAddIOThread test_driver: implement virDomainDelIOThread test_driver: implement virDomainPinIOThread test_driver: implement virDomainGetIOThreadInfo test_driver: implement virDomainSetIOThreadParams src/test/test_driver.c | 362 +++++++++++++++++++++++++++++++++++++++++ src/test/test_driver.h | 11 ++ 2 files changed, 373 insertions(+) -- 2.22.0

1 5

[libvirt] [PATCH v2 0/2] add support for kvm-hint-dedicated performance hint
by Menno Lageman 12 Aug '19

12 Aug '19

v2 of: https://www.redhat.com/archives/libvir-list/2019-August/msg00363.html diff to v1: - reword description in documentation - move check for valid domain config to qemuDomainDefValidate Wim ten Have (2): qemu: support for kvm-hint-dedicated performance hint tests: add tests for kvm-hint-dedicated feature docs/formatdomain.html.in | 7 +++++++ docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 4 ++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 5 +++++ src/qemu/qemu_domain.c | 11 ++++++++++- tests/qemuxml2argvdata/kvm-features-off.xml | 1 + tests/qemuxml2argvdata/kvm-features.args | 4 ++-- tests/qemuxml2argvdata/kvm-features.xml | 4 +++- tests/qemuxml2xmloutdata/kvm-features-off.xml | 1 + tests/qemuxml2xmloutdata/kvm-features.xml | 4 +++- 11 files changed, 42 insertions(+), 5 deletions(-) -- 2.21.0

2 3

[libvirt] [PATCH 0/2] add support for kvm-hint-dedicated performance hint
by Menno Lageman 12 Aug '19

12 Aug '19

QEMU version 2.12.1 introduced a performance feature under commit be7773268d98 ("target-i386: add KVM_HINTS_DEDICATED performance hint") This patch adds a new KVM feature 'hint-dedicated' to set this performance hint for KVM guests. Wim ten Have (2): qemu: support for kvm-hint-dedicated performance hint tests: add tests for kvm-hint-dedicated feature docs/formatdomain.html.in | 7 +++++++ docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 4 ++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 13 +++++++++++++ tests/qemuxml2argvdata/kvm-features-off.xml | 1 + tests/qemuxml2argvdata/kvm-features.args | 4 ++-- tests/qemuxml2argvdata/kvm-features.xml | 4 +++- tests/qemuxml2xmloutdata/kvm-features-off.xml | 1 + tests/qemuxml2xmloutdata/kvm-features.xml | 4 +++- 10 files changed, 40 insertions(+), 4 deletions(-) -- 2.21.0

2 7

[libvirt] [PATCH v2 0/2] test_driver: implement get/set BlockIoTune APIs
by Ilias Stamatis 12 Aug '19

12 Aug '19

Ilias Stamatis (2): test_driver: implement testDomainGetBlockIoTune test_driver: implement virDomainSetBlockIoTune src/test/test_driver.c | 361 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 361 insertions(+) -- 2.22.0

2 5

[libvirt] [PATCH] util: allow tap-based guest interfaces to have MAC address prefix 0xFE
by Laine Stump 12 Aug '19

12 Aug '19

Back in July 2010, commit 6ea90b84 (meant to resolve https://bugzilla.redhat.com/571991 ) added code to set the MAC address of any tap device to the associated guest interface's MAC, but with the first byte replaced with 0xFE. This was done in order to assure that 1) the tap MAC and guest interface MAC were different (otherwise L2 forwarding through the tap would not work, and the kernel would repeatedly issue a warning stating as much). 2) any bridge device that had one of these taps attached would *not* take on the MAC of the tap (leading to network instability as guests started and stopped) A couple years later, https://bugzilla.redhat.com/798467 was filed, complaining that a user could configure a tap-based guest interface to have a MAC address that itself had a first byte of 0xFE, silently (other than the kernel warning messages) resulting in a non-working configuration. This was fixed by commit 5d571045, which logged an error and failed the guest start / interface attach if the MAC's first byte was 0xFE. Although this restriction only reduces the potential pool of MAC addresses from 2^46 (last two bits of byte 1 must be set to 10) by 2^32 (still 4 orders of magnitude larger than the entire IPv4 address space), it also means that management software that autogenerates MAC addresses must have special code to avoid an 0xFE prefix. Now after 7 years, someone has noticed this restriction and requested that we remove it. So instead of failing when 0xFE is found as the first byte, this patch removes the restriction by just replacing the first byte in the tap device MAC with 0xFA if the first byte in the guest interface is 0xFE. 0xFA is the next-highest value that still has 10 as the lowest two bits, and still 2) meets the requirement of "tap MAC must be different from guest interface MAC", and 3) is high enough that there should never be an issue of the attached bridge device taking on the MAC of the tap. The result is that *any* MAC can be chosen by management software (although it would still not work correctly if a multicast MAC (lowest bit of first byte set to 1) was chosen), but that's a different issue). Signed-off-by: Laine Stump <laine(a)redhat.com> --- Yes, I find it slightly problematic that the same setting is in two different places in the code, but 1) that is pre-existing, and 2) if I moved the MAC address setting down one level into virNetDevTapCreate(), the code would *still* need to be duplicated, since there are two different implementations of virNetDevTapCreate(). If anyone is bothered by this, then I can resubmit with an extra patch to add a new virNetDevTapCreate() that just calls a platform-specific virNetDevTapCreateInternal(), then sets the tap mac address. Only by request though :-). src/qemu/qemu_interface.c | 11 ++++++++++- src/util/virnetdevtap.c | 26 ++++++++++++-------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index c8effa68f4..72ed51cb1f 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -444,8 +444,17 @@ qemuInterfaceEthernetConnect(virDomainDefPtr def, } virDomainAuditNetDevice(def, net, tunpath, true); + + /* The tap device's MAC address cannot match the MAC address + * used by the guest. This results in "received packet on + * vnetX with own address as source address" error logs from + * the kernel. + */ virMacAddrSet(&tapmac, &net->mac); - tapmac.addr[0] = 0xFE; + if (tapmac.addr[0] == 0xFE) + tapmac.addr[0] = 0xFA; + else + tapmac.addr[0] = 0xFE; if (virNetDevSetMAC(net->ifname, &tapmac) < 0) goto cleanup; diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index b65c26bee1..4548b51b5b 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -668,7 +668,6 @@ int virNetDevTapCreateInBridgePort(const char *brname, unsigned int flags) { virMacAddr tapmac; - char macaddrstr[VIR_MAC_STRING_BUFLEN]; size_t i; if (virNetDevTapCreate(ifname, tunpath, tapfd, tapfdSize, flags) < 0) @@ -682,19 +681,18 @@ int virNetDevTapCreateInBridgePort(const char *brname, */ virMacAddrSet(&tapmac, macaddr); if (!(flags & VIR_NETDEV_TAP_CREATE_USE_MAC_FOR_BRIDGE)) { - if (macaddr->addr[0] == 0xFE) { - /* For normal use, the tap device's MAC address cannot - * match the MAC address used by the guest. This results - * in "received packet on vnetX with own address as source - * address" error logs from the kernel. - */ - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unable to use MAC address starting with " - "reserved value 0xFE - '%s' - "), - virMacAddrFormat(macaddr, macaddrstr)); - goto error; - } - tapmac.addr[0] = 0xFE; /* Discourage bridge from using TAP dev MAC */ + /* The tap device's MAC address cannot match the MAC address + * used by the guest. This results in "received packet on + * vnetX with own address as source address" error logs from + * the kernel. Making the tap address as high as possible + * discourages the bridge from using this tap's MAC as its own + * (a Linux host bridge will take on the lowest numbered MAC + * of all devices attached to it). + */ + if (tapmac.addr[0] == 0xFE) + tapmac.addr[0] = 0xFA; + else + tapmac.addr[0] = 0xFE; } if (virNetDevSetMAC(*ifname, &tapmac) < 0) -- 2.21.0

2 1

[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 12 Aug '19

12 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

[libvirt] [PATCH 00/10] Pass correct qemuCaps to qemuDomainDefPostParse
by Jiri Denemark 09 Aug '19

09 Aug '19

Since qemuDomain{Device,}DefPostParse callbacks require qemuCaps, we need to make sure they get the capabilities stored in the domain's private data if the domain is running. Passing NULL may cause QEMU capabilities probing to be triggered in case the cached capabilities are not valid anymore. When this happens while a running domain object is locked, QMP event delivered to the domain before QEMU capabilities probing finishes will deadlock the event loop. The funny part is that qemuDomainDeviceDefPostParse and qemuDomainDefPostParse are a callbacks for virDomainDeviceDefPostParse and virDomainDefPostParse respectively and we need to make sure to properly set the parseOpaque pointer in all paths which could eventually go through these general APIs. If you are interested, you can look at the called-by graph for virDomainDeviceDefPostParse at http://people.redhat.com/jdenemar/virDomainDeviceDefPostParse.svg Only a few of those paths were correct. Jiri Denemark (10): qemu: Pass qemuCaps to qemuDomainDefCopy qemu: Pass qemuCaps to qemuDomainDefFormatBufInternal qemu: Pass qemuCaps to qemuDomainSaveImageOpen qemu: Pass qemuCaps to qemuMigrationAnyPrepareDef qemu: Pass correct qemuCaps to virDomainDefParseString qemu: Pass qemuCaps to qemuMigrationCookieXMLParse qemu: Pass correct qemuCaps to virDomainDefCopy qemu: Pass correct qemuCaps to virDomainDefPostParse qemu: Pass correct qemuCaps to virDomainDefParseNode qemu: Pass correct qemuCaps to virDomainDeviceDefPostParse src/conf/checkpoint_conf.c | 9 +- src/conf/checkpoint_conf.h | 1 + src/conf/domain_conf.c | 41 ++++--- src/conf/domain_conf.h | 13 ++- src/conf/snapshot_conf.c | 11 +- src/conf/snapshot_conf.h | 2 + src/esx/esx_driver.c | 2 +- src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 22 ++-- src/libxl/libxl_migration.c | 2 +- src/lxc/lxc_driver.c | 18 +-- src/lxc/lxc_process.c | 2 +- src/openvz/openvz_driver.c | 2 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_domain.c | 53 +++++---- src/qemu/qemu_domain.h | 5 + src/qemu/qemu_driver.c | 149 +++++++++++++++--------- src/qemu/qemu_migration.c | 22 ++-- src/qemu/qemu_migration.h | 1 + src/qemu/qemu_migration_cookie.c | 16 ++- src/qemu/qemu_process.c | 13 ++- src/test/test_driver.c | 7 +- src/vbox/vbox_common.c | 8 +- tests/qemudomaincheckpointxml2xmltest.c | 2 +- tests/qemudomainsnapshotxml2xmltest.c | 2 +- tests/qemuhotplugtest.c | 4 +- 26 files changed, 256 insertions(+), 155 deletions(-) -- 2.22.0

2 11

[libvirt] [PATCH 0/3] Fix NSS issue
by Michal Privoznik 09 Aug '19

09 Aug '19

Haven't spotted it during review of Dan's patches. Long story short, if there's an unexpected key in JSON parsing stops. But in general a key is hot harmful and shouldn't cause parser to stop. See 1/3 for more explanation. Michal Prívozník (3): nss: Don't stop parsing on unexpected key nss: Include stdio.h and define NULLSTR when debugging is enabled nss: Don't leak memory on parse error tests/nssdata/virbr1.status | 1 + tools/nss/libvirt_nss.h | 2 ++ tools/nss/libvirt_nss_leases.c | 9 +++++---- 3 files changed, 8 insertions(+), 4 deletions(-) -- 2.21.0

2 7

[libvirt] [PATCH] docs: formatdomain: explain host-model/host-passthrough requirements
by Paolo Bonzini 09 Aug '19

09 Aug '19

host-passthrough documentation menions that the source and destination hosts are not identical in both hardware and configuration. Configuration actually includes microcode version and QEMU version, but this is not clear so make it explicit Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- docs/formatdomain.html.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f5c882141a..6d084d7c04 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1590,8 +1590,8 @@ hand, the ABI provided to the guest is reproducible. During migration, complete CPU model definition is transferred to the destination host so the migrated guest will see exactly the same CPU - model even if the destination host contains more capable CPUs for - the running instance of the guest; but shutting down and restarting + model for the running instance of the guest, even if the destination + host contains more capable CPUs or newer kernel; but shutting down and restarting the guest may present different hardware to the guest according to the capabilities of the new host. Prior to libvirt 3.2.0 and QEMU 2.9.0 detection of the host CPU model via QEMU is not supported. @@ -1625,10 +1625,10 @@ environment cannot be reproduced on different hardware. Thus, if you hit any bugs, you are on your own. Further details of that CPU can be changed using <code>feature</code> elements. Migration of a guest - using host-passthrough is dangerous if the source and destination - hosts are not identical in both hardware and configuration. If such - a migration is attempted then the guest may hang or crash upon - resuming execution on the destination host.</dd> + using host-passthrough is dangerous if the source and destination hosts + are not identical in both hardware, QEMU version, microcode version + and configuration. If such a migration is attempted then the guest may + hang or crash upon resuming execution on the destination host.</dd> </dl> Both <code>host-model</code> and <code>host-passthrough</code> modes -- 2.21.0

4 5

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

09 Aug '19

Ilias Stamatis (2): test_driver: implement virDomainManagedSaveGetXMLDesc test_driver: implement virDomainManagedSaveDefineXML src/test/test_driver.c | 66 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) -- 2.22.0

2 3

[libvirt] [PATCH] test_driver: implement virDomainGetBlockInfo
by Ilias Stamatis 09 Aug '19

09 Aug '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 6f18baa265..106e8f027e 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -7729,6 +7729,45 @@ testDomainMemoryPeek(virDomainPtr dom, } +static int +testDomainGetBlockInfo(virDomainPtr dom, + const char *path, + virDomainBlockInfoPtr info, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + virDomainDiskDefPtr disk; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (!(disk = virDomainDiskByName(vm->def, path, false))) { + virReportError(VIR_ERR_INVALID_ARG, + _("invalid path %s not assigned to domain"), path); + goto cleanup; + } + + if (virStorageSourceIsEmpty(disk->src)) { + virReportError(VIR_ERR_INVALID_ARG, + _("disk '%s' does not currently have a source assigned"), + path); + goto cleanup; + } + + info->capacity = 1099506450432; + info->allocation = 1099511627776; + info->physical = 1099511627776; + + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + /* * Snapshot APIs */ @@ -9031,6 +9070,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainManagedSaveRemove = testDomainManagedSaveRemove, /* 1.1.4 */ .domainMemoryStats = testDomainMemoryStats, /* 5.7.0 */ .domainMemoryPeek = testDomainMemoryPeek, /* 5.4.0 */ + .domainGetBlockInfo = testDomainGetBlockInfo, /* 5.7.0 */ .domainSnapshotNum = testDomainSnapshotNum, /* 1.1.4 */ .domainSnapshotListNames = testDomainSnapshotListNames, /* 1.1.4 */ -- 2.22.0

2 1

[libvirt] [PATCH v2 00/15] Split and enhancement of virsh completer
by Michal Privoznik 09 Aug '19

09 Aug '19

v2 of: https://www.redhat.com/archives/libvir-list/2019-July/msg01225.html diff to v1: - Rebase and adapt to new checkpoint completer Michal Prívozník (15): tools: s/Nodedev/NodeDevice/ tools: Expose virshCommaStringListComplete() tools: Separate domain related completers into a file tools: Separate storage pool related completers into a file tools: Separate storage volume related completers into a file tools: Separate interface related completers into a file tools: Separate network related completers into a file tools: Separate nodedev related completers into a file tools: Separate nwfilter related completers into a file tools: Separate secret related completers into a file tools: Separate snapshot related completers into a file tools: Separate host related completers into a file tools: Separate checkpoint related completers into a file virsh-completer: Drop needless #include virsh: Introduce virshPoolTypeCompleter tools/Makefile.am | 11 + tools/virsh-completer-checkpoint.c | 78 +++ tools/virsh-completer-checkpoint.h | 27 + tools/virsh-completer-domain.c | 314 +++++++++ tools/virsh-completer-domain.h | 55 ++ tools/virsh-completer-host.c | 148 ++++ tools/virsh-completer-host.h | 31 + tools/virsh-completer-interface.c | 67 ++ tools/virsh-completer-interface.h | 27 + tools/virsh-completer-network.c | 145 ++++ tools/virsh-completer-network.h | 35 + tools/virsh-completer-nodedev.c | 117 ++++ tools/virsh-completer-nodedev.h | 35 + tools/virsh-completer-nwfilter.c | 105 +++ tools/virsh-completer-nwfilter.h | 31 + tools/virsh-completer-pool.c | 120 ++++ tools/virsh-completer-pool.h | 35 + tools/virsh-completer-secret.c | 91 +++ tools/virsh-completer-secret.h | 31 + tools/virsh-completer-snapshot.c | 73 ++ tools/virsh-completer-snapshot.h | 27 + tools/virsh-completer-volume.c | 73 ++ tools/virsh-completer-volume.h | 28 + tools/virsh-completer.c | 1028 +--------------------------- tools/virsh-completer.h | 114 +-- tools/virsh-nodedev.c | 16 +- tools/virsh-nodedev.h | 6 +- tools/virsh-pool.c | 1 + 28 files changed, 1730 insertions(+), 1139 deletions(-) create mode 100644 tools/virsh-completer-checkpoint.c create mode 100644 tools/virsh-completer-checkpoint.h create mode 100644 tools/virsh-completer-domain.c create mode 100644 tools/virsh-completer-domain.h create mode 100644 tools/virsh-completer-host.c create mode 100644 tools/virsh-completer-host.h create mode 100644 tools/virsh-completer-interface.c create mode 100644 tools/virsh-completer-interface.h create mode 100644 tools/virsh-completer-network.c create mode 100644 tools/virsh-completer-network.h create mode 100644 tools/virsh-completer-nodedev.c create mode 100644 tools/virsh-completer-nodedev.h create mode 100644 tools/virsh-completer-nwfilter.c create mode 100644 tools/virsh-completer-nwfilter.h create mode 100644 tools/virsh-completer-pool.c create mode 100644 tools/virsh-completer-pool.h create mode 100644 tools/virsh-completer-secret.c create mode 100644 tools/virsh-completer-secret.h create mode 100644 tools/virsh-completer-snapshot.c create mode 100644 tools/virsh-completer-snapshot.h create mode 100644 tools/virsh-completer-volume.c create mode 100644 tools/virsh-completer-volume.h -- 2.21.0

2 17

[libvirt] [PATCH 0/4] test_driver: implement the remaining VCPUs-related APIs
by Ilias Stamatis 08 Aug '19

08 Aug '19

Ilias Stamatis (4): test_driver: make testDomainGetVcpus report all vcpus test_driver: implement virDomainGetGuestVcpus test_driver: implement virDomainSetVcpu test_driver: implement virDomainSetGuestVcpus src/test/test_driver.c | 167 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 161 insertions(+), 6 deletions(-) -- 2.22.0

1 4

[libvirt] [dockerfiles PATCH v2 0/4] Add libosinfo Dockerfiles
by Fabiano Fidêncio 08 Aug '19

08 Aug '19

This patch series aims to add libosinfo Dockerfiles to this project, so those containers can be used by libosinfo projects' gitlab CI. Please, take a look at each patch for more context of what has been done. Changes since v1: https://www.redhat.com/archives/libvir-list/2019-July/msg01296.html - Update libosinfo Dockerfiles after having libvirt-jenkins-ci's patches related to libosinfo/osinfo-db-tools dependencies merged. Fabiano Fidêncio (4): refresh: Fix typo: ingores -> ignored refresh: Learn how to deal with the project's name refresh: Add libosinfo project Add Dockerfiles for libosinfo project buildenv-libosinfo-centos-7.Dockerfile | 43 +++++++++++++ ...bosinfo-debian-10-cross-aarch64.Dockerfile | 64 +++++++++++++++++++ ...ibosinfo-debian-10-cross-armv6l.Dockerfile | 64 +++++++++++++++++++ ...ibosinfo-debian-10-cross-armv7l.Dockerfile | 64 +++++++++++++++++++ ...-libosinfo-debian-10-cross-i686.Dockerfile | 64 +++++++++++++++++++ ...-libosinfo-debian-10-cross-mips.Dockerfile | 64 +++++++++++++++++++ ...osinfo-debian-10-cross-mips64el.Dockerfile | 64 +++++++++++++++++++ ...ibosinfo-debian-10-cross-mipsel.Dockerfile | 64 +++++++++++++++++++ ...bosinfo-debian-10-cross-ppc64le.Dockerfile | 64 +++++++++++++++++++ ...libosinfo-debian-10-cross-s390x.Dockerfile | 64 +++++++++++++++++++ buildenv-libosinfo-debian-10.Dockerfile | 50 +++++++++++++++ ...ibosinfo-debian-9-cross-aarch64.Dockerfile | 64 +++++++++++++++++++ ...libosinfo-debian-9-cross-armv6l.Dockerfile | 64 +++++++++++++++++++ ...libosinfo-debian-9-cross-armv7l.Dockerfile | 64 +++++++++++++++++++ ...v-libosinfo-debian-9-cross-mips.Dockerfile | 64 +++++++++++++++++++ ...bosinfo-debian-9-cross-mips64el.Dockerfile | 64 +++++++++++++++++++ ...libosinfo-debian-9-cross-mipsel.Dockerfile | 64 +++++++++++++++++++ ...ibosinfo-debian-9-cross-ppc64le.Dockerfile | 64 +++++++++++++++++++ ...-libosinfo-debian-9-cross-s390x.Dockerfile | 64 +++++++++++++++++++ buildenv-libosinfo-debian-9.Dockerfile | 50 +++++++++++++++ ...osinfo-debian-sid-cross-aarch64.Dockerfile | 64 +++++++++++++++++++ ...bosinfo-debian-sid-cross-armv6l.Dockerfile | 64 +++++++++++++++++++ ...bosinfo-debian-sid-cross-armv7l.Dockerfile | 64 +++++++++++++++++++ ...libosinfo-debian-sid-cross-i686.Dockerfile | 64 +++++++++++++++++++ ...libosinfo-debian-sid-cross-mips.Dockerfile | 64 +++++++++++++++++++ ...sinfo-debian-sid-cross-mips64el.Dockerfile | 64 +++++++++++++++++++ ...bosinfo-debian-sid-cross-mipsel.Dockerfile | 64 +++++++++++++++++++ ...osinfo-debian-sid-cross-ppc64le.Dockerfile | 64 +++++++++++++++++++ ...ibosinfo-debian-sid-cross-s390x.Dockerfile | 64 +++++++++++++++++++ buildenv-libosinfo-debian-sid.Dockerfile | 50 +++++++++++++++ buildenv-libosinfo-fedora-29.Dockerfile | 49 ++++++++++++++ buildenv-libosinfo-fedora-30.Dockerfile | 49 ++++++++++++++ buildenv-libosinfo-fedora-rawhide.Dockerfile | 63 ++++++++++++++++++ buildenv-libosinfo-ubuntu-16.Dockerfile | 50 +++++++++++++++ buildenv-libosinfo-ubuntu-18.Dockerfile | 50 +++++++++++++++ ...le => buildenv-libvirt-centos-7.Dockerfile | 0 ...libvirt-debian-10-cross-aarch64.Dockerfile | 0 ...-libvirt-debian-10-cross-armv6l.Dockerfile | 0 ...-libvirt-debian-10-cross-armv7l.Dockerfile | 0 ...nv-libvirt-debian-10-cross-i686.Dockerfile | 0 ...nv-libvirt-debian-10-cross-mips.Dockerfile | 0 ...ibvirt-debian-10-cross-mips64el.Dockerfile | 0 ...-libvirt-debian-10-cross-mipsel.Dockerfile | 0 ...libvirt-debian-10-cross-ppc64le.Dockerfile | 0 ...v-libvirt-debian-10-cross-s390x.Dockerfile | 0 ...e => buildenv-libvirt-debian-10.Dockerfile | 0 ...-libvirt-debian-9-cross-aarch64.Dockerfile | 0 ...v-libvirt-debian-9-cross-armv6l.Dockerfile | 0 ...v-libvirt-debian-9-cross-armv7l.Dockerfile | 0 ...env-libvirt-debian-9-cross-mips.Dockerfile | 0 ...libvirt-debian-9-cross-mips64el.Dockerfile | 0 ...v-libvirt-debian-9-cross-mipsel.Dockerfile | 0 ...-libvirt-debian-9-cross-ppc64le.Dockerfile | 0 ...nv-libvirt-debian-9-cross-s390x.Dockerfile | 0 ...le => buildenv-libvirt-debian-9.Dockerfile | 0 ...ibvirt-debian-sid-cross-aarch64.Dockerfile | 0 ...libvirt-debian-sid-cross-armv6l.Dockerfile | 0 ...libvirt-debian-sid-cross-armv7l.Dockerfile | 0 ...v-libvirt-debian-sid-cross-i686.Dockerfile | 0 ...v-libvirt-debian-sid-cross-mips.Dockerfile | 0 ...bvirt-debian-sid-cross-mips64el.Dockerfile | 0 ...libvirt-debian-sid-cross-mipsel.Dockerfile | 0 ...ibvirt-debian-sid-cross-ppc64le.Dockerfile | 0 ...-libvirt-debian-sid-cross-s390x.Dockerfile | 0 ... => buildenv-libvirt-debian-sid.Dockerfile | 0 ...e => buildenv-libvirt-fedora-29.Dockerfile | 0 ...e => buildenv-libvirt-fedora-30.Dockerfile | 0 ...buildenv-libvirt-fedora-rawhide.Dockerfile | 0 ...e => buildenv-libvirt-ubuntu-16.Dockerfile | 0 ...e => buildenv-libvirt-ubuntu-18.Dockerfile | 0 refresh | 60 +++++++++++++---- 71 files changed, 2166 insertions(+), 12 deletions(-) create mode 100644 buildenv-libosinfo-centos-7.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-aarch64.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-armv6l.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-armv7l.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-i686.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-mips.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-mips64el.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-mipsel.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-ppc64le.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-s390x.Dockerfile create mode 100644 buildenv-libosinfo-debian-10.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-aarch64.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-armv6l.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-armv7l.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-mips.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-mips64el.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-mipsel.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-ppc64le.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-s390x.Dockerfile create mode 100644 buildenv-libosinfo-debian-9.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-aarch64.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-armv6l.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-armv7l.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-i686.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-mips.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-mips64el.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-mipsel.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-ppc64le.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-s390x.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid.Dockerfile create mode 100644 buildenv-libosinfo-fedora-29.Dockerfile create mode 100644 buildenv-libosinfo-fedora-30.Dockerfile create mode 100644 buildenv-libosinfo-fedora-rawhide.Dockerfile create mode 100644 buildenv-libosinfo-ubuntu-16.Dockerfile create mode 100644 buildenv-libosinfo-ubuntu-18.Dockerfile rename buildenv-centos-7.Dockerfile => buildenv-libvirt-centos-7.Dockerfile (100%) rename buildenv-debian-10-cross-aarch64.Dockerfile => buildenv-libvirt-debian-10-cross-aarch64.Dockerfile (100%) rename buildenv-debian-10-cross-armv6l.Dockerfile => buildenv-libvirt-debian-10-cross-armv6l.Dockerfile (100%) rename buildenv-debian-10-cross-armv7l.Dockerfile => buildenv-libvirt-debian-10-cross-armv7l.Dockerfile (100%) rename buildenv-debian-10-cross-i686.Dockerfile => buildenv-libvirt-debian-10-cross-i686.Dockerfile (100%) rename buildenv-debian-10-cross-mips.Dockerfile => buildenv-libvirt-debian-10-cross-mips.Dockerfile (100%) rename buildenv-debian-10-cross-mips64el.Dockerfile => buildenv-libvirt-debian-10-cross-mips64el.Dockerfile (100%) rename buildenv-debian-10-cross-mipsel.Dockerfile => buildenv-libvirt-debian-10-cross-mipsel.Dockerfile (100%) rename buildenv-debian-10-cross-ppc64le.Dockerfile => buildenv-libvirt-debian-10-cross-ppc64le.Dockerfile (100%) rename buildenv-debian-10-cross-s390x.Dockerfile => buildenv-libvirt-debian-10-cross-s390x.Dockerfile (100%) rename buildenv-debian-10.Dockerfile => buildenv-libvirt-debian-10.Dockerfile (100%) rename buildenv-debian-9-cross-aarch64.Dockerfile => buildenv-libvirt-debian-9-cross-aarch64.Dockerfile (100%) rename buildenv-debian-9-cross-armv6l.Dockerfile => buildenv-libvirt-debian-9-cross-armv6l.Dockerfile (100%) rename buildenv-debian-9-cross-armv7l.Dockerfile => buildenv-libvirt-debian-9-cross-armv7l.Dockerfile (100%) rename buildenv-debian-9-cross-mips.Dockerfile => buildenv-libvirt-debian-9-cross-mips.Dockerfile (100%) rename buildenv-debian-9-cross-mips64el.Dockerfile => buildenv-libvirt-debian-9-cross-mips64el.Dockerfile (100%) rename buildenv-debian-9-cross-mipsel.Dockerfile => buildenv-libvirt-debian-9-cross-mipsel.Dockerfile (100%) rename buildenv-debian-9-cross-ppc64le.Dockerfile => buildenv-libvirt-debian-9-cross-ppc64le.Dockerfile (100%) rename buildenv-debian-9-cross-s390x.Dockerfile => buildenv-libvirt-debian-9-cross-s390x.Dockerfile (100%) rename buildenv-debian-9.Dockerfile => buildenv-libvirt-debian-9.Dockerfile (100%) rename buildenv-debian-sid-cross-aarch64.Dockerfile => buildenv-libvirt-debian-sid-cross-aarch64.Dockerfile (100%) rename buildenv-debian-sid-cross-armv6l.Dockerfile => buildenv-libvirt-debian-sid-cross-armv6l.Dockerfile (100%) rename buildenv-debian-sid-cross-armv7l.Dockerfile => buildenv-libvirt-debian-sid-cross-armv7l.Dockerfile (100%) rename buildenv-debian-sid-cross-i686.Dockerfile => buildenv-libvirt-debian-sid-cross-i686.Dockerfile (100%) rename buildenv-debian-sid-cross-mips.Dockerfile => buildenv-libvirt-debian-sid-cross-mips.Dockerfile (100%) rename buildenv-debian-sid-cross-mips64el.Dockerfile => buildenv-libvirt-debian-sid-cross-mips64el.Dockerfile (100%) rename buildenv-debian-sid-cross-mipsel.Dockerfile => buildenv-libvirt-debian-sid-cross-mipsel.Dockerfile (100%) rename buildenv-debian-sid-cross-ppc64le.Dockerfile => buildenv-libvirt-debian-sid-cross-ppc64le.Dockerfile (100%) rename buildenv-debian-sid-cross-s390x.Dockerfile => buildenv-libvirt-debian-sid-cross-s390x.Dockerfile (100%) rename buildenv-debian-sid.Dockerfile => buildenv-libvirt-debian-sid.Dockerfile (100%) rename buildenv-fedora-29.Dockerfile => buildenv-libvirt-fedora-29.Dockerfile (100%) rename buildenv-fedora-30.Dockerfile => buildenv-libvirt-fedora-30.Dockerfile (100%) rename buildenv-fedora-rawhide.Dockerfile => buildenv-libvirt-fedora-rawhide.Dockerfile (100%) rename buildenv-ubuntu-16.Dockerfile => buildenv-libvirt-ubuntu-16.Dockerfile (100%) rename buildenv-ubuntu-18.Dockerfile => buildenv-libvirt-ubuntu-18.Dockerfile (100%) -- 2.21.0

3 7

[libvirt] [dockerfiles PATCH v3 0/3] Add libosinfo Dockerfiles
by Fabiano Fidêncio 08 Aug '19

08 Aug '19

This patch series aims to add libosinfo Dockerfiles to this project, so those containers can be used by libosinfo projects' gitlab CI. Please, take a look at each patch for more context of what has been done. Changes since v2: https://www.redhat.com/archives/libvir-list/2019-July/msg01934.html - Cleaned up the code in order to avoid duplication, as pointed by Andrea; - Raise an Exception in case a file doesn't match any of the existent projects, as pointed by Andrea; Changes since v1: https://www.redhat.com/archives/libvir-list/2019-July/msg01296.html - Update libosinfo Dockerfiles after having libvirt-jenkins-ci's patches related to libosinfo/osinfo-db-tools dependencies merged. Fabiano Fidêncio (3): refresh: Learn how to deal with the project's name refresh: Add libosinfo project Add Dockerfiles for libosinfo project buildenv-libosinfo-centos-7.Dockerfile | 43 +++++++++++++ ...bosinfo-debian-10-cross-aarch64.Dockerfile | 64 +++++++++++++++++++ ...ibosinfo-debian-10-cross-armv6l.Dockerfile | 64 +++++++++++++++++++ ...ibosinfo-debian-10-cross-armv7l.Dockerfile | 64 +++++++++++++++++++ ...-libosinfo-debian-10-cross-i686.Dockerfile | 64 +++++++++++++++++++ ...-libosinfo-debian-10-cross-mips.Dockerfile | 64 +++++++++++++++++++ ...osinfo-debian-10-cross-mips64el.Dockerfile | 64 +++++++++++++++++++ ...ibosinfo-debian-10-cross-mipsel.Dockerfile | 64 +++++++++++++++++++ ...bosinfo-debian-10-cross-ppc64le.Dockerfile | 64 +++++++++++++++++++ ...libosinfo-debian-10-cross-s390x.Dockerfile | 64 +++++++++++++++++++ buildenv-libosinfo-debian-10.Dockerfile | 50 +++++++++++++++ ...ibosinfo-debian-9-cross-aarch64.Dockerfile | 64 +++++++++++++++++++ ...libosinfo-debian-9-cross-armv6l.Dockerfile | 64 +++++++++++++++++++ ...libosinfo-debian-9-cross-armv7l.Dockerfile | 64 +++++++++++++++++++ ...v-libosinfo-debian-9-cross-mips.Dockerfile | 64 +++++++++++++++++++ ...bosinfo-debian-9-cross-mips64el.Dockerfile | 64 +++++++++++++++++++ ...libosinfo-debian-9-cross-mipsel.Dockerfile | 64 +++++++++++++++++++ ...ibosinfo-debian-9-cross-ppc64le.Dockerfile | 64 +++++++++++++++++++ ...-libosinfo-debian-9-cross-s390x.Dockerfile | 64 +++++++++++++++++++ buildenv-libosinfo-debian-9.Dockerfile | 50 +++++++++++++++ ...osinfo-debian-sid-cross-aarch64.Dockerfile | 64 +++++++++++++++++++ ...bosinfo-debian-sid-cross-armv6l.Dockerfile | 64 +++++++++++++++++++ ...bosinfo-debian-sid-cross-armv7l.Dockerfile | 64 +++++++++++++++++++ ...libosinfo-debian-sid-cross-i686.Dockerfile | 64 +++++++++++++++++++ ...libosinfo-debian-sid-cross-mips.Dockerfile | 64 +++++++++++++++++++ ...sinfo-debian-sid-cross-mips64el.Dockerfile | 64 +++++++++++++++++++ ...bosinfo-debian-sid-cross-mipsel.Dockerfile | 64 +++++++++++++++++++ ...osinfo-debian-sid-cross-ppc64le.Dockerfile | 64 +++++++++++++++++++ ...ibosinfo-debian-sid-cross-s390x.Dockerfile | 64 +++++++++++++++++++ buildenv-libosinfo-debian-sid.Dockerfile | 50 +++++++++++++++ buildenv-libosinfo-fedora-29.Dockerfile | 49 ++++++++++++++ buildenv-libosinfo-fedora-30.Dockerfile | 49 ++++++++++++++ buildenv-libosinfo-fedora-rawhide.Dockerfile | 63 ++++++++++++++++++ buildenv-libosinfo-ubuntu-16.Dockerfile | 50 +++++++++++++++ buildenv-libosinfo-ubuntu-18.Dockerfile | 50 +++++++++++++++ ...le => buildenv-libvirt-centos-7.Dockerfile | 0 ...libvirt-debian-10-cross-aarch64.Dockerfile | 0 ...-libvirt-debian-10-cross-armv6l.Dockerfile | 0 ...-libvirt-debian-10-cross-armv7l.Dockerfile | 0 ...nv-libvirt-debian-10-cross-i686.Dockerfile | 0 ...nv-libvirt-debian-10-cross-mips.Dockerfile | 0 ...ibvirt-debian-10-cross-mips64el.Dockerfile | 0 ...-libvirt-debian-10-cross-mipsel.Dockerfile | 0 ...libvirt-debian-10-cross-ppc64le.Dockerfile | 0 ...v-libvirt-debian-10-cross-s390x.Dockerfile | 0 ...e => buildenv-libvirt-debian-10.Dockerfile | 0 ...-libvirt-debian-9-cross-aarch64.Dockerfile | 0 ...v-libvirt-debian-9-cross-armv6l.Dockerfile | 0 ...v-libvirt-debian-9-cross-armv7l.Dockerfile | 0 ...env-libvirt-debian-9-cross-mips.Dockerfile | 0 ...libvirt-debian-9-cross-mips64el.Dockerfile | 0 ...v-libvirt-debian-9-cross-mipsel.Dockerfile | 0 ...-libvirt-debian-9-cross-ppc64le.Dockerfile | 0 ...nv-libvirt-debian-9-cross-s390x.Dockerfile | 0 ...le => buildenv-libvirt-debian-9.Dockerfile | 0 ...ibvirt-debian-sid-cross-aarch64.Dockerfile | 0 ...libvirt-debian-sid-cross-armv6l.Dockerfile | 0 ...libvirt-debian-sid-cross-armv7l.Dockerfile | 0 ...v-libvirt-debian-sid-cross-i686.Dockerfile | 0 ...v-libvirt-debian-sid-cross-mips.Dockerfile | 0 ...bvirt-debian-sid-cross-mips64el.Dockerfile | 0 ...libvirt-debian-sid-cross-mipsel.Dockerfile | 0 ...ibvirt-debian-sid-cross-ppc64le.Dockerfile | 0 ...-libvirt-debian-sid-cross-s390x.Dockerfile | 0 ... => buildenv-libvirt-debian-sid.Dockerfile | 0 ...e => buildenv-libvirt-fedora-29.Dockerfile | 0 ...e => buildenv-libvirt-fedora-30.Dockerfile | 0 ...buildenv-libvirt-fedora-rawhide.Dockerfile | 0 ...e => buildenv-libvirt-ubuntu-16.Dockerfile | 0 ...e => buildenv-libvirt-ubuntu-18.Dockerfile | 0 refresh | 57 +++++++++++++---- 71 files changed, 2163 insertions(+), 12 deletions(-) create mode 100644 buildenv-libosinfo-centos-7.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-aarch64.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-armv6l.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-armv7l.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-i686.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-mips.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-mips64el.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-mipsel.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-ppc64le.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-s390x.Dockerfile create mode 100644 buildenv-libosinfo-debian-10.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-aarch64.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-armv6l.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-armv7l.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-mips.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-mips64el.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-mipsel.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-ppc64le.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-s390x.Dockerfile create mode 100644 buildenv-libosinfo-debian-9.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-aarch64.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-armv6l.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-armv7l.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-i686.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-mips.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-mips64el.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-mipsel.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-ppc64le.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-s390x.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid.Dockerfile create mode 100644 buildenv-libosinfo-fedora-29.Dockerfile create mode 100644 buildenv-libosinfo-fedora-30.Dockerfile create mode 100644 buildenv-libosinfo-fedora-rawhide.Dockerfile create mode 100644 buildenv-libosinfo-ubuntu-16.Dockerfile create mode 100644 buildenv-libosinfo-ubuntu-18.Dockerfile rename buildenv-centos-7.Dockerfile => buildenv-libvirt-centos-7.Dockerfile (100%) rename buildenv-debian-10-cross-aarch64.Dockerfile => buildenv-libvirt-debian-10-cross-aarch64.Dockerfile (100%) rename buildenv-debian-10-cross-armv6l.Dockerfile => buildenv-libvirt-debian-10-cross-armv6l.Dockerfile (100%) rename buildenv-debian-10-cross-armv7l.Dockerfile => buildenv-libvirt-debian-10-cross-armv7l.Dockerfile (100%) rename buildenv-debian-10-cross-i686.Dockerfile => buildenv-libvirt-debian-10-cross-i686.Dockerfile (100%) rename buildenv-debian-10-cross-mips.Dockerfile => buildenv-libvirt-debian-10-cross-mips.Dockerfile (100%) rename buildenv-debian-10-cross-mips64el.Dockerfile => buildenv-libvirt-debian-10-cross-mips64el.Dockerfile (100%) rename buildenv-debian-10-cross-mipsel.Dockerfile => buildenv-libvirt-debian-10-cross-mipsel.Dockerfile (100%) rename buildenv-debian-10-cross-ppc64le.Dockerfile => buildenv-libvirt-debian-10-cross-ppc64le.Dockerfile (100%) rename buildenv-debian-10-cross-s390x.Dockerfile => buildenv-libvirt-debian-10-cross-s390x.Dockerfile (100%) rename buildenv-debian-10.Dockerfile => buildenv-libvirt-debian-10.Dockerfile (100%) rename buildenv-debian-9-cross-aarch64.Dockerfile => buildenv-libvirt-debian-9-cross-aarch64.Dockerfile (100%) rename buildenv-debian-9-cross-armv6l.Dockerfile => buildenv-libvirt-debian-9-cross-armv6l.Dockerfile (100%) rename buildenv-debian-9-cross-armv7l.Dockerfile => buildenv-libvirt-debian-9-cross-armv7l.Dockerfile (100%) rename buildenv-debian-9-cross-mips.Dockerfile => buildenv-libvirt-debian-9-cross-mips.Dockerfile (100%) rename buildenv-debian-9-cross-mips64el.Dockerfile => buildenv-libvirt-debian-9-cross-mips64el.Dockerfile (100%) rename buildenv-debian-9-cross-mipsel.Dockerfile => buildenv-libvirt-debian-9-cross-mipsel.Dockerfile (100%) rename buildenv-debian-9-cross-ppc64le.Dockerfile => buildenv-libvirt-debian-9-cross-ppc64le.Dockerfile (100%) rename buildenv-debian-9-cross-s390x.Dockerfile => buildenv-libvirt-debian-9-cross-s390x.Dockerfile (100%) rename buildenv-debian-9.Dockerfile => buildenv-libvirt-debian-9.Dockerfile (100%) rename buildenv-debian-sid-cross-aarch64.Dockerfile => buildenv-libvirt-debian-sid-cross-aarch64.Dockerfile (100%) rename buildenv-debian-sid-cross-armv6l.Dockerfile => buildenv-libvirt-debian-sid-cross-armv6l.Dockerfile (100%) rename buildenv-debian-sid-cross-armv7l.Dockerfile => buildenv-libvirt-debian-sid-cross-armv7l.Dockerfile (100%) rename buildenv-debian-sid-cross-i686.Dockerfile => buildenv-libvirt-debian-sid-cross-i686.Dockerfile (100%) rename buildenv-debian-sid-cross-mips.Dockerfile => buildenv-libvirt-debian-sid-cross-mips.Dockerfile (100%) rename buildenv-debian-sid-cross-mips64el.Dockerfile => buildenv-libvirt-debian-sid-cross-mips64el.Dockerfile (100%) rename buildenv-debian-sid-cross-mipsel.Dockerfile => buildenv-libvirt-debian-sid-cross-mipsel.Dockerfile (100%) rename buildenv-debian-sid-cross-ppc64le.Dockerfile => buildenv-libvirt-debian-sid-cross-ppc64le.Dockerfile (100%) rename buildenv-debian-sid-cross-s390x.Dockerfile => buildenv-libvirt-debian-sid-cross-s390x.Dockerfile (100%) rename buildenv-debian-sid.Dockerfile => buildenv-libvirt-debian-sid.Dockerfile (100%) rename buildenv-fedora-29.Dockerfile => buildenv-libvirt-fedora-29.Dockerfile (100%) rename buildenv-fedora-30.Dockerfile => buildenv-libvirt-fedora-30.Dockerfile (100%) rename buildenv-fedora-rawhide.Dockerfile => buildenv-libvirt-fedora-rawhide.Dockerfile (100%) rename buildenv-ubuntu-16.Dockerfile => buildenv-libvirt-ubuntu-16.Dockerfile (100%) rename buildenv-ubuntu-18.Dockerfile => buildenv-libvirt-ubuntu-18.Dockerfile (100%) -- 2.21.0

2 4

[libvirt] [PATCH] tests: Fix message for IP parse/format failures
by Roman Bolshakov 08 Aug '19

08 Aug '19

Confusing message is printed when a parse/format sockettest fails. E.g. there's a test that parses/formats ::ffff and the format fails like that: 38) Test format ::ffff family AF_UNSPEC ... Offset 2 Expect [0.0.255.255] Actual [ffff] It should be instead: 38) Test format ::ffff family AF_UNSPEC ... Offset 2 Expect [ffff] Actual [0.0.255.255] Signed-off-by: Roman Bolshakov <r.bolshakov(a)yadro.com> --- tests/sockettest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sockettest.c b/tests/sockettest.c index 0c6c79f2a9..859f02e51e 100644 --- a/tests/sockettest.c +++ b/tests/sockettest.c @@ -50,7 +50,7 @@ static int testFormat(virSocketAddr *addr, const char *addrstr, bool pass) return pass ? -1 : 0; if (STRNEQ(newaddrstr, addrstr)) { - virTestDifference(stderr, newaddrstr, addrstr); + virTestDifference(stderr, addrstr, newaddrstr); VIR_FREE(newaddrstr); return pass ? -1 : 0; } else { -- 2.22.0

2 1

[libvirt] [PATCH] nss: fix build on freebsd
by Daniel P. Berrangé 08 Aug '19

08 Aug '19

The conversion to drop gnulib in the previous patch: commit 8242ce4f45700f326e13e5105accd08fb4b2f0b4 Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Thu Aug 8 10:23:26 2019 +0100 tools: avoid accidentally using files from gnulib Missed a few conversions needed for FreeBSD. In particular netdb.h doesn't pull in sys/socket.h or netinet/in.h Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a CI fix tools/nss/libvirt_nss.c | 12 ++++++++---- tools/nss/libvirt_nss.h | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c index b75f51c560..89f1f3fdac 100644 --- a/tools/nss/libvirt_nss.c +++ b/tools/nss/libvirt_nss.c @@ -26,7 +26,6 @@ #include "libvirt_nss.h" -#include <netinet/in.h> #include <resolv.h> #include <sys/types.h> #include <dirent.h> @@ -541,7 +540,9 @@ aiforaf(const char *name, int af, struct addrinfo *pai, struct addrinfo **aip) } int -_nss_compat_getaddrinfo(void *retval, void *mdata ATTRIBUTE_UNUSED, va_list ap) +_nss_compat_getaddrinfo(void *retval, + void *mdata __attribute__((unused)), + va_list ap) { struct addrinfo sentinel, *cur, *ai; const char *name; @@ -567,7 +568,9 @@ _nss_compat_getaddrinfo(void *retval, void *mdata ATTRIBUTE_UNUSED, va_list ap) } int -_nss_compat_gethostbyname2_r(void *retval, void *mdata ATTRIBUTE_UNUSED, va_list ap) +_nss_compat_gethostbyname2_r(void *retval, + void *mdata __attribute__((unused)), + va_list ap) { int ret; @@ -594,7 +597,8 @@ _nss_compat_gethostbyname2_r(void *retval, void *mdata ATTRIBUTE_UNUSED, va_list } ns_mtab* -nss_module_register(const char *name ATTRIBUTE_UNUSED, unsigned int *size, +nss_module_register(const char *name __attribute__((unused)), + unsigned int *size, nss_module_unregister_fn *unregister) { *size = sizeof(methods) / sizeof(methods[0]); diff --git a/tools/nss/libvirt_nss.h b/tools/nss/libvirt_nss.h index fa4ff892c6..63e1bf0af5 100644 --- a/tools/nss/libvirt_nss.h +++ b/tools/nss/libvirt_nss.h @@ -26,6 +26,8 @@ #pragma once #include <nss.h> +#include <sys/socket.h> +#include <netinet/in.h> #include <netdb.h> -- 2.21.0

1 0

[libvirt] [PATCH 0/7] add virDomainGetGuestInfo()
by Jonathon Jongsma 08 Aug '19

08 Aug '19

This series adds several bits of guest information provided by a new API function virDomainGetGuestInfo(). There is an implementation for qemu using the guest agent. In particular, it adds information about logged-in users, guest OS, and timezone. I had previously submitted a patch series with a dedicated API function for querying guest users that returned an array of structures describing the users. It was suggested that I convert his to a more futureproof design using typed parameters and also combine it with other bits of guest information similar to virDomainListGetStats(). In fact, there were several bugs that requested this information be added to the 'bulk stats' API, but Peter Krempa suggested adding a new API for all data queried from the guest agent (see https://bugzilla.redhat.com/show_bug.cgi?id=1705514) This is that API proposal. It follows the stats API quite closely, and tries to return data in similar ways (for example, the "users.N.*" field name scheme was inspired by various stats fields). I plan to follow this series up with a patch that adds fsinfo to the returned information, but wanted to get comments on this approach now. Here's an example of the output of the virsh command added in this patch: virsh # guestinfo win7 users.count : 1 users.0.name : test users.0.domain : test-PC users.0.login_time : 1564664122706 os.id : mswindows os.name : Microsoft Windows os.pretty-name : Windows 7 Professional os.version : Microsoft Windows 77 os.version-id : os.machine : x86_64 os.variant : client os.variant-id : client os.kernel-release : 7601 os.kernel-version : 6.1 timezone.name : Central Daylight Time timezone.offset : -18000 hostname : TEST-PC Jonathon Jongsma (7): lib: add virDomainGetGuestInfo() remote: implement virDomainGetGuestInfo qemu_agent: add helper for getting guest users qemu_agent: add helper function for querying OS info qemu_agent: add helper for querying timezone info qemu: Implement virDomainGetGuestInfo() virsh: add 'guestinfo' command include/libvirt/libvirt-domain.h | 13 + src/driver-hypervisor.h | 8 + src/libvirt-domain.c | 105 ++++++++ src/libvirt_public.syms | 1 + src/qemu/qemu_agent.c | 190 +++++++++++++++ src/qemu/qemu_agent.h | 4 + src/qemu/qemu_driver.c | 77 ++++++ src/remote/remote_daemon_dispatch.c | 41 ++++ src/remote/remote_driver.c | 53 ++++ src/remote/remote_protocol.x | 21 +- src/remote_protocol-structs | 12 + tests/qemuagenttest.c | 366 ++++++++++++++++++++++++++++ tools/virsh-domain.c | 53 ++++ 13 files changed, 943 insertions(+), 1 deletion(-) -- 2.21.0

3 11

[libvirt] sockettest failures on macOS
by Roman Bolshakov 08 Aug '19

08 Aug '19

Hello dear list, As of now there're two test failures of sockettest on macOS: 38) Test format ::ffff family AF_UNSPEC ... Offset 2 Expect [ffff] Actual [0.0.255.255] ... FAILED 89) Test localhost 0177.0.0.01 ... FAILED The first test possibly hits the following observed [1] behaviour of getnameinfo in macOS: ::ffff is turned into ::0.0.255.255 ::fffe is turned into ::0.0.255.254 ::ffff:0 is turned into ::255.255.0.0 ::fffe:0 is turned into ::255.254.0.0 ::ffff:0:0 is turned into ::ffff:0.0.0.0 ::fffe:0:0 is turned into ::fffe:0:0 So it seems like the addresses with hzeroed upper words are treated like IPv4-translated addresses. The second test fails because getaddrinfo on macOS doesn't interpret octal IPv4 addresses. Only inet_aton can be used for that. The issue was hit by python and dotnet core: https://bugs.python.org/issue27612 https://github.com/dotnet/corefx/issues/8362 Should we implement a workaround for virSocketAddrParseInternal that would determine numeric IPv4 address and parse them using inet_aton? Or may be we should use gnulib's getaddrinfo? POSIX has explicit statement: If the specified address family is AF_INET or AF_UNSPEC, address strings using Internet standard dot notation as specified in inet_addr are valid. I don't know if gnulib implements that properly on macOS but it might worth to give it a try and fix the behavior to match POSIX otherwise. Or we can just skip both tests for __APPLE__? 1. https://gist.github.com/roolebo/1a95e11def1f19caa5bde319c2f9c89a Thank you, Roman

1 0

[libvirt] [PATCH] configmake: Avoid namespace pollution issue on mingw.
by Eric Blake 08 Aug '19

08 Aug '19

Mingw includes a header that declares a struct typedef named DATADIR, pulled in when including <winsock2.h>; compilation fails if DATADIR has already been defined as a macro expanding to a string prior to that inclusion. Although the configmake module documents that it should generally be included only after system headers, it is just as easy to make configmake.h robust to this particular issue by including the system header first if it exists. * modules/configmake (Makefile.am): If the project uses <winsock2.h>, include that header before defining DATADIR. Reported by libvirt: https://lists.gnu.org/archive/html/bug-gnulib/2019-07/msg00089.html --- I'm pushing this under the gnulib maintenance rule, while working on a further gnulib change to make configmake.h nicer on mingw. Lots of gnulib changes in the last 8 months: c8e2eee54 mbrtowc tests: Fix regression on mingw (regression from 2018-02-24). 9f00cc0d8 pthread-h: Fix definitions of types and macros on mingw. d6f9e7e3b autoupdate f9221bccc crypto/gc: Cope with libgcrypt without SM3. 28813cfe4 backupfile: fix resource leak on memory failure 2511ab606 Avoid missing-declarations warning in various tests. 059457123 pthread tests: Avoid missing-declarations warning. 3e75e00c4 parse-datetime: Avoid warnings from bison versions >= 3.3. 56d28ccbb parse-datetime: Require Bison 2.4 or newer. c01635497 areadlink-with-size, xgethostname, xgetdomainname: Fix GCC warning. e6aaa7672 parse-datetime: avoid "%pure-parser" deprecation warning from Bison 3.4 b5a9fa677 update-copyright: Make it work again (regression from 2019-06-15). d60d9c026 doc: Update info about <pthread.h>. 02c673092 pthread_sigmask tests: Use new multithread modules. 3fabe95a0 pthread-tss: Add tests. 6fc3895e9 pthread-cond: Add tests. 16a69219c pthread-rwlock: Add tests. 243f6dbf6 pthread-mutex: Add tests. da2524b31 pthread-once: Add tests. f80da10b7 pthread-thread: Add tests. e7b9404a9 pthread: Turn into a convenience module. 2d853e8b4 pthread-spin: New module. 672c3be2f pthread-tss: New module. e08989ca1 pthread-cond: New module. 0473a3ccc pthread-rwlock: New module. e09ceafdb pthread-mutex: New module. 222a7e6cb pthread-once: New module. fdff0fd12 pthread-thread: New module. 2d8599e9d pthread-h: Prepare for adding new modules. 79e228295 pthread-h: Add declarations of essential pthread functions. 9d925a90f pthread-h: Respect --enable-threads={posix|windows} option on mingw. fba5fd392 pthread-h: Add C++ tests. 30e64672a pthread-h: Add tests. c1c1d4f62 pthread-h: New module. 3fdb19cf7 sched_yield: New module. f76440c5c windows-spin: New module. 306452e7d windows-timedrwlock: New module. 72f60af8e windows-rwlock: New module. 6f520fb1d windows-thread: Add support for creating a thread in detached state. f249808ba windows-*: Rename glwthread_spinlock_t to glwthread_initguard_t. 4af8b82e7 doc: Fix info about pthread API in HP-UX. 26ac95025 Fix typo in comment. 323b506f5 threads-h: Fix generation of threads.h. b417a9c02 striconveh test: Fix a compilation failure when iconv is not available. ee77e5c1f argmatch: adjust columns for help2man. b979980a6 areadlink-with-size: avoid realloc when size==0 0ccc444f3 areadlink-with-size: guess a buffer size with 0 size 32a64c671 Replace manually crafted hex regexes with [:xdigit:] 9c16aa292 error: Fix documentation. 72d255bd3 autoupdate 65b63fdc9 doc: Remove documentation of glibc <= 2.1.x as a supported platform. 952ccf18c doc: Remove documentation of Linux libc5 as a supported platform. 0c2bfb4b5 doc: Remove documentation of Linux libc5 as a supported platform. 76dd681cd doc: Remove documentation of Tandem/NSK as a supported platform. 5b8ebc908 doc: Remove documentation of Mac OS X <= 10.4 as a supported platform. 559f6b729 doc: Remove documentation of AIX 4 as a supported platform. 05cf22754 doc: Remove documentation of HP-UX 10 as a supported platform. 8689a7ffd doc: Remove documentation of Interix 3.5 as a supported platform. 9f933144e doc: Remove documentation of IRIX 6.4 and older as supported platforms. 33fb97d11 doc: Remove documentation of OSF/1 as supported platform. c3566f958 doc: Remove documentation of Interix as a supported platform. 2dfd36adb doc: Remove documentation of BSDI and BSD/OS as supported platforms. 8f999c446 doc: Remove documentation of Solaris 8 and older as supported platforms. 9e7e46b0f doc: Remove documentation of Interix 3.5 as a supported platform. a4b2403ab doc: Remove documentation of BeOS as a supported platform. 7ce5f5c77 thread, lock, cond, tls: Remove support for Pth threads. e58796ff7 thread, lock, cond, tls: Remove support for old Solaris threads. d44241344 getcwd-lgpl, getcwd: Don't call realloc when it is pointless. ac7390ac0 xgetdomainname: Don't return an excessive memory allocation. 98802d166 xgethostname: Don't return an excessive memory allocation. 8f91b5cf3 areadlinkat-with-size: Don't return an excessive memory allocation. eb76defb1 areadlink-with-size: Don't return an excessive memory allocation. d4239808e renameatu: Fix test failure on MSVC. 9ce9be2ef autoupdate d1e92798e mbrtowc: Fix invalid use of mbtowc() on MSVC. 65b3308bb argmatch: don't define _ in the header c88299602 verify: document ‘assume’ better ece9e261a localcharset, nl_langinfo: Fix return value for UTF-8 locales on MSVC. 3e4a348ea getcwd: Fix crash when invoked with size = 0 on MSVC. 7c3bb8672 nonblocking-pipe tests: Fix test failure on MSVC. 54d342c75 usleep: Implement with millisecond resolution on native Windows. 77dc7fb43 lstat tests: Fix test failure on MSVC. 75b56a533 stat tests: Fix test failure on MSVC. 0b40814b8 getaddrinfo tests: Fix test failure on MSVC. d40db5e23 poll: Fix type of timeout pointer passed to select() on mingw x86_64. 9c2e22500 argmatch: Fix compilation errors. fa2256ec9 autoupdate fcd36afd1 Include <stdlib.h> when needed. 3712d6cd2 Include <stdlib.h> when needed. 8c4ec56ee inet_ntop, inet_pton: Avoid conflict with native Windows functions. 6136e9379 inet_ntop, inet_pton: Forward-compatibility with newer Windows versions. 326d9f992 inet_pton: Fix link error on mingw with _WIN32_WINNT >= 0x0600. 1d56a7919 poll: Add comment. a734086a9 poll-h: Fix compilation error on mingw with _WIN32_WINNT >= 0x0600. e597d4b8e accept4: Fix compilation error on OpenIndiana. c299f3dda autoupdate e0d220aa1 strverscmp: sync from glibc bacccb4e5 tss tests: Add tests for destructors and races. d1e821c9a tls tests: Add tests for destructors and races. d6bfe4796 windows-tls: Implement TLS key destructors for native Windows. 14b8ae17a threadlib: Avoid autoconf warning "was expanded before it was required". 47405621b argmatch: remove duplicate const qualifier a6e8a8612 unistd: stddef.h and sys/types.h namespace cleanup 7f7d18ebc maintainer-makefile: restore portability to non-GNU awks 232ba9230 Document setvbuf _IOLBF problem e0ddd0761 Document lseek SEEK_DATA/SEEK_HOLE 7ed70c552 autoupdate 66928dc84 autoupdate 962862267 argmatch: put all the docs member last. 5d00a2ec6 argmatch: add support to generate the usage message 13644a818 thrd: Add comment. d1cb5add4 threads-h: Define 'thread_local' if and only if it actually works. 42b99eaf2 threads-h: Small doc correction. a12c7fd18 threads-h: Define 'thread_local' if and only it actually works. b62933398 threads-h: Simplify link dependencies. 9e6e4c033 threads-h: Fix link error on FreeBSD 11. 316b626d2 threadlib: Fix typo (regression from today). 9e2d1943b windows-thread, windows-tls: Fix compilation error on 32-bit mingw. e9d8b52d0 autoudpate 7614f78d2 tss tests: Small improvement. 0dbc0378b threads: New module. 14a5f1378 tss: Add tests. c94b90fcd cnd: Add tests. 4a440ef9b mtx: Add tests. 6ac18d06d thrd: Add tests. ee2f4139e tss: New module. 36307d84f cnd: New module. 6b4c64f06 mtx: New module. 3696a934e thrd: New module. bf6dd504c threads-h: Add tests. 80d244810 threads-h: New module. 0894f96f8 windows-thread: New module. 7435d61f2 windows-tls: New module. 7b7305f41 windows-cond: New module. f46ac2b2b windows-timedrecmutex: New module. d20c7ec39 windows-timedmutex: New module. 4570a6162 windows-recmutex: New module. 2535ce3ac windows-mutex: New module. 6c3d118e8 windows-once: New module. 7078fef39 lock, cond: Avoid possible counter wraparound on Windows. d4c0a04b4 cond: Make glthread_cond_timedwait more reliable on Windows. 145e16d89 pthread_mutex_timedlock: New module. 79c254530 thread, lock, cond, tls: Recognize C11 multithreaded applications. 97ae53644 tls tests: Small improvements. a06d50500 cond tests: Simplify. e8d62a2ae lock tests: Avoid reference to undefined variable if !ENABLE_LOCKING. 33d1306e3 nanosleep: Relicense under LGPLv2+. a5a93a6e1 Reorder pieces of header in perl scripts. af35f056d verify-tests: work around xlc bug 36bfd5861 Restore Emacs time-stamp hook applicability. c2fdc30cf Fix comments in last commit. a05d5d121 Fix scripts to have valid executable format on Alpine Linux. 5905d8ca9 autoupdate 5dd3e60c5 nproc: Ensure nproc(NPROC_ALL) ≥ nproc(NPROC_CURRENT) with glibc ≥ 2.26. b827d8a6f posix_spawn_file_actions_addchdir: Fix possible use-after-free bug. 765146c33 posix_spawn_file_actions_addopen: Fix possible use-after-free bug. fbb40ec10 posix_spawn_file_actions_addfchdir: Add tests. d822de87e posix_spawn_file_actions_addfchdir: New module. 2ad7a33b8 doc: Document existence of posix_spawn_file_actions_addchdir module. 57dd928ae posix_spawn-internal: Fix module description. 1a329ffba doc: Update and improve documentation of glibc functions. 738720729 doc: Mark functions which exist only on Linux and illumos. b53046a95 doc: Mark functions which exist only on Linux. 741078f98 doc: Some glibc functions also exist on Haiku. 9619fa386 doc: Some glibc functions also exist on BeOS. 16f5083a5 doc: Some glibc functions also exist on FreeBSD. 83b662fd0 doc: Some glibc functions also exist on Solaris 11.4. ad16bd3f9 doc: Some glibc functions also exist on Solaris 11. 1b58309ef doc: Some glibc functions also exist on FreeBSD, Solaris 11. a7b9aec54 doc: Some glibc functions also exist on FreeBSD, AIX, HP-UX, Solaris 11. d3feefc80 doc: Some glibc functions also exist on IRIX 6.5 in 32-bit mode. 851d2d40d doc: Mention posix_spawn_file_actions_add[f]chdir_np. 8d76d88bd doc: Mention getcpu. b8f9745c2 doc: Mention the ISO C11 multithreading header and functions. 532a9cfee doc: Mention statx. 73ccb8584 doc: Mention renameat2. f29d8d685 doc: Mention more ISO TS 18661-1 <math.h> functions. b0bde85a5 doc: Mention pkey_alloc, pkey_set, pkey_get, pkey_free, pkey_mprotect. 8d12e3c69 doc: Mention mlock2. 654a75ec2 doc: Mention memfd_create. 0618b6eff doc: Mention copy_file_range. 7b13182c2 doc: Mention preadv2, pwritev2. 653e99f38 doc: Mention strfromf, strfromd, strfroml. d358d60bd doc: Mention getrandom, getentropy. 95a6c97d2 doc: Mention ISO TS 18661-1 <fenv.h> functions. 5b1e894a9 doc: Mention more ISO TS 18661-1 <math.h> functions. 0fe1b87ed doc: Mention nextdown, nextup. b054fe3d8 doc: Mention pthread_getattr_default_np, pthread_setattr_default_np. 6ef6bf8f3 doc: Mention getauxval. 7a1b7bb09 doc: Mention epoll_create1. a914b7451 doc: Mention timerfd_create, timerfd_gettime, timerfd_settime. 204ab925a doc: Mention signalfd. 4a1d89d40 doc: Mention eventfd, eventfd_read, eventfd_write. f2b106c99 doc: Mention epoll_pwait. 79894315a doc: Mention sync_file_range. 7c132a631 doc: Mention sched_getcpu. b5b0c6853 doc: Mention ppoll. 6f974c280 doc: Mention inotify_* functions. 1ebf5e216 doc: Add references to glibc documentation. 36e84d15d doc: Add references to Linux man pages. c3cd0d5e4 doc: Mention eaccess. fef6e5042 doc: Mention the availability of specific functions in glibc versions. 6019b30b7 doc: Mention that glibc no longer provides h_errno. a782cb37d doc: Remove mention of functions that are gone from glibc. e6d44a356 doc: Remove mention of function vm86 (does not exist on x86_64). 75bd8d8d8 doc: Update after removal of crypt functions from glibc 2.28. 30b621594 copy-file: fix typo b0d998d2e copy-file-range: simplify into a stub a1beabcb1 copy-file: prefer copy_file_range 508eb9919 copy-file-range: new module b8e6ceb71 autoupdate 9c383f22c binary-io: Attempted use of O_BINARY on consoles no longer fails. 1c0e950aa autoupdate e76e3faeb autoupdate 1b7fed3b0 dirent-safer: Make opendir_safer usable from C++. a8f178bd8 canonicalize: Make canonicalize_filename_mode usable from C++. f8bc6615f autoupdate 9bfa2644f prefix-gnulib-mk: Fix CPPFLAGS migration 8f82e3894 flexmember: update comments again 0ffb8fd22 flexmember: update comment 34d712407 autoupdate 661c55d6c setlocale: Improve fallback on macOS. bf5935a7c localename: Fix default on macOS. f56afa9a6 sync texinfo.tex with file on ftp.gnu.org 97e4b2481 maintainer-makefile: catch uses of $< in non-implicit rules 7ded27a6c threadlib: Provide an easy way to avoid mingw's winpthreads library. 64e905db0 pthread_sigmask: Fix compilation error with --enable-threads=windows. 07fb4954d close-stream, closein, closeout: simplify 9bba04193 libtool-next-version: New program. 569b5e106 declared.sh: Fix comment. 03752516b version-etc: Ease translation. d654989d8 gnupload: Explain how to create symlinks. c7d0b4506 fpucw: port to gcc -pedantic de3bb547b crypto/af_alg: port to strict C compilers 0003b0187 base64: Avoid false positive warning from Coverity. 461332525 gettext: Update to gettext 0.20. 8570cb9b7 verify: remove verify_true 89a5b4b82 Support C2X and C++17 static_assert b8068cf09 Fix _GL_HAVE__STATIC_ASSERT typo 620857c4d wcwidth: Ensure width 1, not 2, for ambiguous characters. 3f14b27de Port manywarnings to GCC 9 563c580f6 Sync lib/mktime-internal.h from glibc 4d52476fd autoupdate (removing trailing white space from config.guess) 5b891d3d9 tls tests: Prevent that the test takes too long. a4398f60f lock tests: Prevent that the test takes too long. 00991ec9b localename: Fix crash on mingw (regression from 2018-11-23). 7ffb59a71 Fix gcc warnings on 64-bit mode mingw. 7f9640b56 error: Tweak indentation. d54947bda term-style-control: Fix gcc warning on mingw. 7710ffc1b pipe-filter-gi, pipe-filter-ii: Fix gcc warning. 6c85dbeb3 relocatable-prog: Fix gcc warning on mingw. cff31e5c0 gitsub.sh: New file. 71f2092d2 argmatch: use void* for raw memory pointers 14a920195 prefix-gnulib-mk: fix the support for gnulib-po 22b911f63 di-set: allow free with 'ino_map' being NULL d6af24178 autoupdate faed200ba * lib/str-two-way.h: Fix comment typo. d617a4bb9 x-to-1: Restore ability to use original calling convention. fec2be3ca gettext: Prepare for next gettext release. ab5b2560b x-to-1: Avoid failure due to missing perl modules. ced06e079 openmp-init: New module. c2b2754fd signbit: Fix compilation error when gnulib's math.h exists twice. ba61bd3ba openmp: Fix compilation error on platforms without OpenMP. eb8278fef mountlist: make parsing /proc/self/mountinfo more robust f6225ebbe openmp: Add workaround for 32-bit programs on AIX. 3fbebf8c8 nproc: Fix return value for privileged processes. 91584ed61 Add copyright notices in several files. 834bd58e6 revert texinfo.tex to 2019-03-03.15 per Gavin fc075098d autoupdate a18f7ce3c term-style-control tests: Fix link error. 4a468b774 term-style-control: Fix typo in comment. 7c4dbc521 term-style-control: Add tests. 993d0646c term-style-control: New module. 092288d12 autoupdate 0d8714b7c _Noreturn: beware of C's _Noreturn in C++ pre C++11 453ff9404 Support cross-compilation to musl libc. 66c3c07e0 posix_spawn_file_actions_*: Document musl libc bugs. ec766932d autoupdate 407a19c08 futimens: Document musl libc bug. b6f167d31 Clarify that cross-compilation guesses are guesses. e0de43c19 strtold: Fix typo. da77d28dc noreturn: In C++ mode with clang, use _Noreturn as fallback. 5a929250f libtextstyle-optional: Fix compiler warnings 480e356f0 bitset: fix memory leaks 0f3c79720 bitset: minor changes 7b31451e2 bitset: expose bitset_resize 17c967e57 doc: Document the 'stdnoreturn' and 'noreturn' modules. 85e7bcab4 doc: Document how to use 'static inline'. e4d8618df libtextstyle-optional: Add tests. c23dae8c0 libtextstyle-optional: New module. 4a7bec233 c-stack: Make signal handlers more reliable. cf8abf91b Help making signal handlers more reliable. 661f63a41 _Noreturn: clang and MSVC do support [[noreturn]] in C++11 mode. 03eccb2d0 _Noreturn: GCC 4.7 does not support [[noreturn]] in C++11 mode d6db42193 autoupdate 8bac5eba1 fts: minor simplification b451121ab autoupdate 4d9813bf6 bitset, timevar: Depend on c99 bca971bd8 bitset: a bit (...) more tests 68cc43e4f bitset: fix overflows 3817922f8 bitset: style changes 3cd207e1d fatal-signal: Pass the signal number to the action. eac483310 fatal-signal: Add function that lists the fatal signals. a336be6b8 isatty: Make it return true in Cygwin consoles on native Windows. 050440041 all: Update URLs to msdn.microsoft.com. 7952aabdf gnulib-tool: Clarify the coding style. de6813ed7 autoupdate 426f44034 autoupdate 3bd82a82c strtod: fix clash with strtold 9a943f694 autoupdate 69c4509f3 alloca-opt: Fix conflict mingw's new <alloca.h> file. a40779486 autoupdate fdb2c20b0 tests: Avoid havoc with "gcc -fcheck-pointer-bounds". 011b1a33b uninorm tests: Free allocated memory. 3703dbbe8 di-set: Fix memory leak. 8c96eb80b tests: Free allocated memory. fcf959577 Fix another test failure introduced by the same commit. 613aa429e Fix test failure introduced by last commit. 4c0df5be8 tests: Prepare for using valgrind. 5db7774f1 get-rusage-as, pthread_sigmask tests: Fix -fsanitize=thread findings. 81d0d262d test-userspec.c: don't print NULL 2ba60a9f1 getloadavg: Write NULL for the null pointer. fb48c2507 alloca, tsearch-tests: Write NULL for the null pointer. 363bf26b4 strfmon_l: Fix -fsanitize=address finding. b64bf15ed crypto/des: Fix undefined behaviour. 42254c0a9 Fix undefined behaviour. fa418ebbd unilbrk/u*-possible-linebreaks: Fix undefined behaviour. f6f567a94 unistr/*, uniconv/*: Fix undefined behaviour. 7e7501fa2 unistr/u8-cmp: Fix undefined behaviour. 01ec92af9 unictype/numeric: Fix undefined behaviour. 724a59097 autoupdate 9447bd973 git-version-gen: fix --version copyright year 30f4fdcb5 autoupdate b204bbfc7 relocatable-prog: Use wrapper-free installation on Mac OS X, take 2. d355f9056 relocatable-prog: Revert "Use wrapper-free installation on Mac OS X." 5c04e7191 autoupdate 788db09a9 autoupdate 188d87b05 nstrftime: support the ‘+’ flag 16e6d93c0 autoupdate 82519af2d relocatable-prog: Improve verbose output. c3a4785d3 stat, lstat: Fix conflict with relocatable-prog-wrapper module. e3970fb98 long-options: add parse_gnu_standard_options_only cc42b8c93 relocatable-prog: Update documentation. 95318be14 relocatable-prog: Update documentation. 7039b8937 relocatable-prog: Use wrapper-free installation also on Mac OS X 10.4. 716fac12c nstrftime: tweak arg order 4fe3afa8f relocatable-prog: Use wrapper-free installation also on Mac OS X. 015c30cac relocatable-prog: Use $ORIGIN trick also on GNU/Hurd. ddbd29c30 nstrftime: merge glibc strftime changes 35e462817 relocatable-prog: Use $ORIGIN trick on more platforms. 18f4d4133 progreloc: Speed up executable lookup on various platforms. cd46bf0ca progreloc: Simplify code for Android. f94c70ae4 autoupdate 314e9b692 autoupdate dc135c4fd gnulib-tool: Support --import with just a few tests, not --with-tests. 49137e3bc gnulib-tool: Improve handling of multiple --local-dir options. 341723e1b libtextstyle: New module. 30f8dae4c declared.sh: Fix bug with variables of pointer type. 45ed991d6 Add script for running tests under valgrind. ddba03e40 declared.sh: Fix --version output. 10d0e6a7d Add script for determining the set of symbols to export from a library. 3043e43a7 vla: add commentary about VLA_ELEMS 2f6abcc9f dtoastr,ftoastr,ldtoastr: port to c-strtod changes edacea21c autoupdate 8430fa87e fma: Improve code style. 26201178d *-map tests: Fix compilation error. b39cc7260 c-strtod, c-strtold: Use the bug fixes for strtod, strtold. 97e23d40a strtod, strtold: Use the locale's decimal point. cd825c6d5 strtod, strtold tests: Simplify tests. 376b353f9 strtod, strtold: Avoid unnecessary rounding errors. a908d8969 strtod, strtold: Work around HP-UX 11.31/ia64 bug. 6a7357fe5 autoupdate c39d926ef strtold: Add tests. ebad0cfeb strtold: New module. 0babfcddd strtod: Fix compilation error on IRIX 6.5. a5988c12c Fix build error when building a shared libunistring on Android. ca02ca64f Avoid build errors due to wrong references between modules. e67d5ddc3 tmpfile: Add support for Android, part 2. a7db20edb gperf: Fix error when this module is required by some test module. abdbeff39 tmpfile: Add support for Android. 954d1e36a bitsetv: allow free on NULL. 07ff53ad5 test-framework-sh: Improve maintainability. 52bf7c2b3 tests: Don't assume that /tmp exists. 1968c439d tests: Accommodate a shell that is not in /bin/sh. 4ca4f8f0c tests: Fix some "unused variable" warnings. 188e767b9 unigbrk/uc-grapheme-breaks: Fix build failure. 5d6ca1aee mountlist: Merge two .m4 files. 675d6027e tests: Enable Linux specific tests on Android. fa3e028aa relocatable-prog: Use Linux code on Android. 70152b705 getloadavg: Add support for Android. 79b92f92d vma-iter: Add support for Android. f2ca86eac fts: Optimize on Android. adec7ef4a fts: Add support for Android. a3d1c7849 mountlist: Use Linux code on Android. 29c58de5b localename tests: Fix test failure on Android. 248cb6a24 mountlist: Port better to Android. 90efd9e93 striconveh: Fix use of uninitialized iconv_t. 025b5528c nonblocking-socket-tests: Fix test failure on Android 4.3. 3b5f96342 sh-filename: Add support for Android 4.3. 8a2c831f1 ptsname_r: Work around bug on Android 4.3. 0c4342cb6 ttyname_r: Work around bug on Android 4.3. 3324e9ccf getprogname: Port to Android 4.3. 555ed22dd wcrtomb: Work around bug on Android 4.3. 575971db4 setlocale: Work around bug on Android 4.3. 9462eb64f memchr: Work around bug on Android <= 5.0. 26653040b random: Fix compilation error on Android 4.3. 3215a9f56 mbtowc: Fix compilation error on Android 4.3. ea9062bea fdatasync: Fix compilation error on Android 4.3. dc0f8ce9f unlinkat: Fix compilation error on Android 4.3. 1f9ed3993 renameat: Fix compilation error on Android 4.3. 3c136a2cc fchownat: Fix compilation error on Android 4.3. 425ee4225 gnulib-tool: Support running testdirs on Android. 34881aff4 relocatable-prog: add a comment 376668638 relocatable-prog: avoid warnings from Automake f271b56e1 array-list: Pacify warnings about unused arguments (-Wunused-parameter) 681f1b8b8 threadlib: Revert commit from 2018-06-25. We now have a better fix. cca32830b thread: Force linking with -lpthread, even when --as-needed is in use. 7b56f157a relocatable: avoid compiler warnings (-Wshadow) 6c0f109fb vasnprintf: Don't use %n on Android. 5447f440e *printf: Support cross-compilation to Android. 5ddb2f9d4 autoupdate f986e77af diacrit: Mark deprecated. 1643f0d68 diacrit: Mark deprecated. 5b490ef07 rintl: Override broken implementation on NetBSD. e5462c330 log10l: Work around inaccurate implementation on NetBSD. 27f3a1709 logl: Work around inaccurate implementation on NetBSD. 67df3cffa expm1l: Work around inaccurate implementation on NetBSD. 0ac7b4317 expl: Work around inaccurate implementation on NetBSD. e86cbc464 exp2l: Work around inaccurate implementation on NetBSD. 064adf3d1 floor, floorl: Avoid autoconf warnings. 3b9e41eff Defeat current GCC optimizations in math autoconf tests. 8da562a8a gettext: support disabling use of VLAs d2a3dfe3f autoupdate eac175921 sys_stat: Fix 'implicit declaration of function' warning on OS/2 kLIBC. 2541624fd fcntl: Fix syntax error (regression from 2018-10-05). 34290cb92 autoupdate c66547cdc relocatable: improve documentation b1ca7611d backup: update dependencies c88cf363f getcwd: Fix test failure when building on a Linux 9p file system. 769c6d033 Fix typos found by codespell. d9e8386aa doc: Fix documentation about container data types. 315eb5ffc verify: Enable _GL_HAVE_STATIC_ASSERT for recent G++ versions. 29d802900 getpass: Fix include filename ChangeLog | 6 ++++++ modules/configmake | 3 +++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 644330370..35f870abe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-08-08 Eric Blake <eblake(a)redhat.com> + + configmake: Avoid namespace pollution issue on mingw. + * modules/configmake (Makefile.am): If the project uses + <winsock2.h>, include that header before defining DATADIR. + 2019-07-28 Bruno Haible <bruno(a)clisp.org> mbrtowc tests: Fix regression on mingw (regression from 2018-02-24). diff --git a/modules/configmake b/modules/configmake index 5a60f4f80..0074071fc 100644 --- a/modules/configmake +++ b/modules/configmake @@ -17,6 +17,9 @@ Makefile.am: configmake.h: Makefile $(AM_V_GEN)rm -f $@-t && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + echo '#if HAVE_WINSOCK2_H'; \ + echo '# include <winsock2.h> /* avoid mingw pollution on DATADIR */'; \ + echo '#endif'; \ echo '#define PREFIX "$(prefix)"'; \ echo '#define EXEC_PREFIX "$(exec_prefix)"'; \ echo '#define BINDIR "$(bindir)"'; \ -- 2.20.1

1 1

[libvirt] [PATCH] network: fix ability to use openvswitch with vlans
by Daniel P. Berrangé 08 Aug '19

08 Aug '19

Use the correct enum constant when validating vlan usage. This fixes a merge error in commit 6cb0ec48bd95c95489a987e05a88e8bcf1f9109c Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Mon Sep 3 17:34:22 2018 +0100 network: convert networkAllocateActualDevice to virNetworkPortDef Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/network/bridge_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 41fa89a4af..72e118643f 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -4814,7 +4814,7 @@ networkAllocatePort(virNetworkObjPtr obj, if (!(port->plugtype == VIR_NETWORK_PORT_PLUG_TYPE_HOSTDEV_PCI || (port->plugtype == VIR_NETWORK_PORT_PLUG_TYPE_DIRECT && port->plug.direct.mode == VIR_NETDEV_MACVLAN_MODE_PASSTHRU) || - (port->plugtype == VIR_DOMAIN_NET_TYPE_BRIDGE && + (port->plugtype == VIR_NETWORK_PORT_PLUG_TYPE_BRIDGE && port->virtPortProfile && port->virtPortProfile->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, -- 2.21.0

2 1

[libvirt] [PATCH] tools: avoid accidentally using files from gnulib
by Daniel P. Berrangé 08 Aug '19

08 Aug '19

The AM_CPPFLAGS setting includes the gnulib headers, which means we can get some replacement functions defined. Since virt-login-shell and the NSS module intentionally don't link to gnulib, these replacement functions causes link failures. This was seen cross-compiling on Debian for example: virt-login-shell.o: In function `main': /builds/libvirt/libvirt/build/tools/../../tools/virt-login-shell.c:81: undefined reference to `rpl_strerror' /builds/libvirt/libvirt/build/tools/../../tools/virt-login-shell.c:66: undefined reference to `rpl_strerror' /builds/libvirt/libvirt/build/tools/../../tools/virt-login-shell.c:75: undefined reference to `rpl_strerror' The only way to avoid these replacement gnulib headers is to drop the -Ignulib/lib flags. We do still want to use gnulib for configmake.h and intprops.h, but those can be included via their full path. We must also stop using internal.h, since that expects -Ignulib/lib to be on the include path in order to resolve the verify.h header. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Technically a CI build fix, but waiting for review before pushing since it is larger than most build fixes. cfg.mk | 3 +++ tools/Makefile.am | 10 ++++++++++ tools/nss/libvirt_nss.c | 13 ++++++++++--- tools/nss/libvirt_nss_leases.c | 15 ++++++++------- tools/nss/libvirt_nss_leases.h | 2 +- tools/nss/libvirt_nss_macs.c | 6 +++--- tools/nss/libvirt_nss_macs.h | 2 +- tools/virt-login-shell.c | 8 ++++++-- 8 files changed, 42 insertions(+), 17 deletions(-) diff --git a/cfg.mk b/cfg.mk index cc1f79a051..f082448293 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1345,3 +1345,6 @@ exclude_file_name_regexp--sc_prohibit_cross_inclusion = \ exclude_file_name_regexp--sc_prohibit_dirent_d_type = \ ^(src/util/vircgroup.c)$ + +exclude_file_name_regexp--sc_prohibit_strcmp = \ + ^(tools/nss/libvirt_nss.*\.c) diff --git a/tools/Makefile.am b/tools/Makefile.am index 09cada949b..df3d628bab 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -23,6 +23,12 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ $(NULL) +# We do not want to accidentally include stuff from gnulib +# or the main src/ dir or public API dir. Specific files can +# still be included via their path relative to the root if +# needed +STANDALONE_CPPFLAGS = -I$(top_srcdir) + WARN_CFLAGS += $(STRICT_FRAME_LIMIT_CFLAGS) AM_CFLAGS = \ @@ -199,6 +205,8 @@ virt_host_validate_CFLAGS = \ virt_login_shell_SOURCES = \ virt-login-shell.c +virt_login_shell_CPPFLAGS = $(STANDALONE_CPPFLAGS) + virt_login_shell_helper_SOURCES = \ virt-login-shell-helper.c @@ -486,6 +494,7 @@ noinst_LTLIBRARIES += nss/libnss_libvirt_impl.la nss_libnss_libvirt_impl_la_SOURCES = \ $(LIBVIRT_NSS_SOURCES) +nss_libnss_libvirt_impl_la_CPPFLAGS = $(STANDALONE_CPPFLAGS) nss_libnss_libvirt_impl_la_CFLAGS = \ -DLIBVIRT_NSS \ $(YAJL_CFLAGS) \ @@ -516,6 +525,7 @@ nss_libnss_libvirt_guest_impl_la_SOURCES = \ nss/libvirt_nss_macs.c \ $(NULL) +nss_libnss_libvirt_guest_impl_la_CPPFLAGS = $(STANDALONE_CPPFLAGS) nss_libnss_libvirt_guest_impl_la_CFLAGS = \ -DLIBVIRT_NSS \ -DLIBVIRT_NSS_GUEST \ diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c index 7122065b28..b75f51c560 100644 --- a/tools/nss/libvirt_nss.c +++ b/tools/nss/libvirt_nss.c @@ -32,6 +32,8 @@ #include <dirent.h> #include <arpa/inet.h> #include <stdlib.h> +#include <stdbool.h> +#include <errno.h> #include <string.h> #include <time.h> @@ -40,7 +42,12 @@ # include <nsswitch.h> #endif -#include "configmake.h" +/* + * This gnulib files is used for its macros only, + * so doesn't introduce a link time dep, which we + * must avoid + */ +#include "gnulib/lib/configmake.h" #include "libvirt_nss_leases.h" @@ -131,7 +138,7 @@ findLease(const char *name, char *path; size_t dlen = strlen(entry->d_name); - if (dlen >= 7 && STREQ(entry->d_name + dlen - 7, ".status")) { + if (dlen >= 7 && !strcmp(entry->d_name + dlen - 7, ".status")) { char **tmpLease; if (asprintf(&path, "%s/%s", leaseDir, entry->d_name) < 0) goto cleanup; @@ -142,7 +149,7 @@ findLease(const char *name, leaseFiles = tmpLease; leaseFiles[nleaseFiles++] = path; #if defined(LIBVIRT_NSS_GUEST) - } else if (dlen >= 5 && STREQ(entry->d_name + dlen - 5, ".macs")) { + } else if (dlen >= 5 && !strcmp(entry->d_name + dlen - 5, ".macs")) { if (asprintf(&path, "%s/%s", leaseDir, entry->d_name) < 0) goto cleanup; diff --git a/tools/nss/libvirt_nss_leases.c b/tools/nss/libvirt_nss_leases.c index 48a54d5841..86881641a9 100644 --- a/tools/nss/libvirt_nss_leases.c +++ b/tools/nss/libvirt_nss_leases.c @@ -23,6 +23,7 @@ #include <unistd.h> #include <string.h> #include <stdlib.h> +#include <stdbool.h> #include <fcntl.h> #include <yajl/yajl_gen.h> @@ -60,7 +61,7 @@ typedef struct { static int -appendAddr(const char *name ATTRIBUTE_UNUSED, +appendAddr(const char *name __attribute__((unused)), leaseAddress **tmpAddress, size_t *ntmpAddress, const char *ipAddr, @@ -165,7 +166,7 @@ findLeasesParserInteger(void *ctx, return 0; if (parser->state == FIND_LEASES_STATE_ENTRY) { - if (STRNEQ(parser->key, "expiry-time")) + if (strcmp(parser->key, "expiry-time")) return 0; parser->entry.expiry = val; @@ -190,13 +191,13 @@ findLeasesParserString(void *ctx, return 0; if (parser->state == FIND_LEASES_STATE_ENTRY) { - if (STREQ(parser->key, "ip-address")) { + if (!strcmp(parser->key, "ip-address")) { if (!(parser->entry.ipaddr = strndup((char *)stringVal, stringLen))) return 0; - } else if (STREQ(parser->key, "mac-address")) { + } else if (!strcmp(parser->key, "mac-address")) { if (!(parser->entry.macaddr = strndup((char *)stringVal, stringLen))) return 0; - } else if (STREQ(parser->key, "hostname")) { + } else if (!strcmp(parser->key, "hostname")) { if (!(parser->entry.hostname = strndup((char *)stringVal, stringLen))) return 0; } else { @@ -264,12 +265,12 @@ findLeasesParserEndMap(void *ctx) DEBUG("Check %zu macs", parser->nmacs); for (i = 0; i < parser->nmacs && !found; i++) { DEBUG("Check mac '%s' vs '%s'", parser->macs[i], NULLSTR(parser->entry.macaddr)); - if (STREQ_NULLABLE(parser->macs[i], parser->entry.macaddr)) + if (parser->entry.macaddr && !strcmp(parser->macs[i], parser->entry.macaddr)) found = true; } } else { DEBUG("Check name '%s' vs '%s'", parser->name, NULLSTR(parser->entry.hostname)); - if (STREQ_NULLABLE(parser->name, parser->entry.hostname)) + if (parser->entry.hostname && !strcmp(parser->name, parser->entry.hostname)) found = true; } DEBUG("Found %d", found); diff --git a/tools/nss/libvirt_nss_leases.h b/tools/nss/libvirt_nss_leases.h index e213681e46..c451742152 100644 --- a/tools/nss/libvirt_nss_leases.h +++ b/tools/nss/libvirt_nss_leases.h @@ -20,7 +20,7 @@ #pragma once -#include "internal.h" +#include <sys/types.h> typedef struct { unsigned char addr[16]; diff --git a/tools/nss/libvirt_nss_macs.c b/tools/nss/libvirt_nss_macs.c index fb5526bd7b..26ba4bf515 100644 --- a/tools/nss/libvirt_nss_macs.c +++ b/tools/nss/libvirt_nss_macs.c @@ -67,7 +67,7 @@ findMACsParserString(void *ctx, return 0; if (parser->state == FIND_MACS_STATE_ENTRY) { - if (STRNEQ(parser->key, "domain")) + if (strcmp(parser->key, "domain")) return 0; free(parser->entry.name); @@ -75,7 +75,7 @@ findMACsParserString(void *ctx, return 0; } else if (parser->state == FIND_MACS_STATE_ENTRY_MACS) { char **macs; - if (STRNEQ(parser->key, "macs")) + if (strcmp(parser->key, "macs")) return 0; if (!(macs = realloc(parser->entry.macs, @@ -142,7 +142,7 @@ findMACsParserEndMap(void *ctx) if (parser->state != FIND_MACS_STATE_ENTRY) return 0; - if (STREQ(parser->entry.name, parser->name)) { + if (!strcmp(parser->entry.name, parser->name)) { char **macs = realloc(*parser->macs, sizeof(char *) * ((*parser->nmacs) + parser->entry.nmacs)); if (!macs) diff --git a/tools/nss/libvirt_nss_macs.h b/tools/nss/libvirt_nss_macs.h index 64e291f549..2774f3a9f2 100644 --- a/tools/nss/libvirt_nss_macs.h +++ b/tools/nss/libvirt_nss_macs.h @@ -20,7 +20,7 @@ #pragma once -#include "internal.h" +#include <sys/types.h> int findMACs(const char *file, diff --git a/tools/virt-login-shell.c b/tools/virt-login-shell.c index 41d0b349aa..f92cc0a749 100644 --- a/tools/virt-login-shell.c +++ b/tools/virt-login-shell.c @@ -28,8 +28,12 @@ #include <errno.h> #include <string.h> -#include "configmake.h" -#include "intprops.h" +/* + * These gnulib files are used for their macros only, + * so don't introduce a link time dep, which we must avoid + */ +#include "gnulib/lib/configmake.h" +#include "gnulib/lib/intprops.h" int main(int argc, char **argv) { char uidstr[INT_BUFSIZE_BOUND(uid_t)]; -- 2.21.0

2 1