- Devel - libvirt List Archives

[libvirt] [PATCH 0/8] test driver: Added new functions.
by Tomáš Ryšavý 15 Sep '16

15 Sep '16

Added few functions into test driver. Tomáš Ryšavý (8): virhostcpu: Expose virHostCPUStatsAssign test driver: Replaced num by a constant. test driver: Implement virConnectGetSysinfo. test driver: Implement virConnectGetType. test driver: Implement testNodeGetCPUStats test driver: Implement testNodeGetFreeMemory test driver: added pages sizes into XML into test driver. test driver: Implement testNodeGetFreePages. src/libvirt_private.syms | 1 + src/test/test_driver.c | 148 +++++++++++++++++++++++++++++++++++++++++++++-- src/util/virhostcpu.c | 2 +- src/util/virhostcpu.h | 4 ++ 4 files changed, 148 insertions(+), 7 deletions(-) -- 2.9.3

3 15

[libvirt] [PATCH v4] virsh: use virConnectGetDomainCapabilities with maxvcpus
by Shivaprasad G Bhat 15 Sep '16

15 Sep '16

virsh maxvcpus --type kvm output is useless on PPC. Also, in commit e6806d79 we documented not rely on virConnectGetMaxVcpus output. Fix the maxvcpus to use virConnectGetDomainCapabilities now to make it useful. The call is made to use the default emulator binary and to check for the host machine and arch which is what the command intends to show anyway. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- tools/virsh-host.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 57f0c0e..dbdf23d 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -606,18 +606,46 @@ static bool cmdMaxvcpus(vshControl *ctl, const vshCmd *cmd) { const char *type = NULL; - int vcpus; + int vcpus = -1; + char *caps = NULL; + const unsigned int flags = 0; /* No flags so far */ + xmlDocPtr xml = NULL; + xmlXPathContextPtr ctxt = NULL; virshControlPtr priv = ctl->privData; if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0) return false; - if ((vcpus = virConnectGetMaxVcpus(priv->conn, type)) < 0) + caps = virConnectGetDomainCapabilities(priv->conn, NULL, NULL, NULL, type, flags); + if (!caps) { + if (last_error && last_error->code != VIR_ERR_NO_SUPPORT) + return false; + + vshResetLibvirtError(); + goto fallback; + } + + xml = virXMLParseStringCtxt(caps, _("(domainCapabilities)"), &ctxt); + if (!xml) { + VIR_FREE(caps); return false; + } - vshPrint(ctl, "%d\n", vcpus); + virXPathInt("string(./vcpu[1]/@max)", ctxt, &vcpus); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + VIR_FREE(caps); + if (vcpus < 0) + goto fallback; + + exit: + vshPrint(ctl, "%d\n", vcpus); return true; + fallback: + if ((vcpus = virConnectGetMaxVcpus(priv->conn, type)) < 0) + return false; + goto exit; } /*

2 3

[libvirt] [PATCH] tests: Use fixedcontent variable
by Martin Kletzander 15 Sep '16

15 Sep '16

Commit ca32929908bbc94116493ad8915e7cd7ae0f57d5 added function virTestCompareToFile(), but forgot to use a fixedcontent value for the actual comparison. That lead to VIR_TEST_DEBUG=1 showing (for some tests) all the actual output from the first error to the end of the string due to the difference being an endline in the end. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as 'trivial'. tests/testutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testutils.c b/tests/testutils.c index 8ea6ab82ad5a..f87628edee68 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -709,7 +709,7 @@ virTestCompareToFile(const char *strcontent, filecontent)) { virTestDifferenceFull(stderr, filecontent, filename, - strcontent, NULL); + fixedcontent, NULL); goto failure; } -- 2.10.0

1 0

Re: [libvirt] [PATCH 8/8] fspools: docs and tests for fspool directory backend
by Olga Krishtal 15 Sep '16

15 Sep '16

Hello again. Please, drop the commit message for this patch. Use the following one: Added XML 2 XML tests for fspool and item. ________________________________ From: Olga Krishtal Sent: Thursday, September 15, 2016 10:39:01 AM To: openstack-devel Cc: Maxim Nestratov; Nikolay Shirokovskiy Subject: Re: [PATCH 8/8] fspools: docs and tests for fspool directory backend On 26/08/16 17:17, Olga Krishtal wrote: Pleas, drop the commit message, test is present for both: item and fspool. > At the moment only pool test is implemented. > You need to inplement item test. > > Signed-off-by: Olga Krishtal <okrishtal(a)virtuozzo.com> > --- > docs/schemas/fsitem.rng | 69 ++++++++++++++ > docs/schemas/fspool.rng | 83 ++++++++++++++++ > tests/fsitemxml2xmltest.c | 105 +++++++++++++++++++++ > .../dir-missing-target-path-invalid.xml | 12 +++ > tests/fspoolxml2xmlin/fspool-dir.xml | 17 ++++ > tests/fspoolxml2xmlout/fspool-dir.xml | 17 ++++ > tests/fspoolxml2xmltest.c | 82 ++++++++++++++++ > 7 files changed, 385 insertions(+) > create mode 100644 docs/schemas/fsitem.rng > create mode 100644 docs/schemas/fspool.rng > create mode 100644 tests/fsitemxml2xmltest.c > create mode 100644 tests/fspoolschemadata/dir-missing-target-path-invalid.xml > create mode 100644 tests/fspoolxml2xmlin/fspool-dir.xml > create mode 100644 tests/fspoolxml2xmlout/fspool-dir.xml > create mode 100644 tests/fspoolxml2xmltest.c > > diff --git a/docs/schemas/fsitem.rng b/docs/schemas/fsitem.rng > new file mode 100644 > index 0000000..a41659c > --- /dev/null > +++ b/docs/schemas/fsitem.rng > @@ -0,0 +1,69 @@ > +<?xml version="1.0"?> > + > +<grammar xmlns="http://relaxng.org/ns/structure/1.0" > + datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> > + <include href='basictypes.rng'/> > + <start> > + <ref name='vol'/> > + </start> > + > + <include href='storagecommon.rng'/> > + > + > + <define name='item'> > + <element name='fsitem'> > + <optional> > + <attribute name='type'> > + <value>dir</value> > + </attribute> > + </optional> > + <interleave> > + <element name='name'> > + <ref name='volName'/> > + </element> > + <optional> > + <element name='key'> > + <text/> > + </element> > + </optional> > + <ref name='sizing'/> > + <ref name='target'/> > + </interleave> > + </element> > + </define> > + > + <define name='sizing'> > + <interleave> > + <optional> > + <element name='capacity'> > + <ref name='scaledInteger'/> > + </element> > + </optional> > + <optional> > + <element name='allocation'> > + <ref name='scaledInteger'/> > + </element> > + </optional> > + </interleave> > + </define> > + > + <define name='target'> > + <element name='target'> > + <interleave> > + <optional> > + <element name='path'> > + <choice> > + <data type='anyURI'/> > + <ref name='absFilePath'/> > + </choice> > + </element> > + </optional> > + <ref name='permissions'/> > + <optional> > + <ref name='fileFormatFeatures'/> > + </optional> > + </interleave> > + </element> > + </define> > + > +</grammar> > diff --git a/docs/schemas/fspool.rng b/docs/schemas/fspool.rng > new file mode 100644 > index 0000000..132b65c > --- /dev/null > +++ b/docs/schemas/fspool.rng > @@ -0,0 +1,83 @@ > +<?xml version="1.0"?> > + > +<grammar xmlns="http://relaxng.org/ns/structure/1.0" > + datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> > + <include href='basictypes.rng'/> > + <include href='storagecommon.rng'/> > + <start> > + <ref name='pool'/> > + </start> > + > + > + <define name='fspool'> > + <element name='fspool'> > + <choice> > + <ref name='fspooldir'/> > + </choice> > + </element> > + </define> > + > + <define name='fspooldir'> > + <attribute name='type'> > + <value>dir</value> > + </attribute> > + <interleave> > + <ref name='commonmetadata'/> > + <ref name='sizing'/> > + <ref name='sourcedir'/> > + <ref name='target'/> > + </interleave> > + </define> > + > + <define name='commonmetadata'> > + <interleave> > + <element name='name'> > + <ref name='genericName'/> > + </element> > + <optional> > + <element name='uuid'> > + <ref name='UUID'/> > + </element> > + </optional> > + </interleave> > + </define> > + > + <define name='sizing'> > + <interleave> > + <optional> > + <element name='capacity'> > + <ref name='scaledInteger'/> > + </element> > + </optional> > + <optional> > + <element name='allocation'> > + <ref name='scaledInteger'/> > + </element> > + </optional> > + <optional> > + <element name='available'> > + <ref name='scaledInteger'/> > + </element> > + </optional> > + </interleave> > + </define> > + > + <define name='target'> > + <element name='target'> > + <interleave> > + <element name='path'> > + <ref name='absFilePath'/> > + </element> > + <ref name='permissions'/> > + </interleave> > + </element> > + </define> > + > + <define name='sourcedir'> > + <optional> > + <element name='source'> > + </element> > + </optional> > + </define> > + > +</grammar> > diff --git a/tests/fsitemxml2xmltest.c b/tests/fsitemxml2xmltest.c > new file mode 100644 > index 0000000..87a24e3 > --- /dev/null > +++ b/tests/fsitemxml2xmltest.c > @@ -0,0 +1,105 @@ > +#include <config.h> > + > +#include <stdio.h> > +#include <stdlib.h> > +#include <unistd.h> > +#include <string.h> > + > +#include <sys/types.h> > +#include <fcntl.h> > + > +#include "internal.h" > +#include "testutils.h" > +#include "storage_conf.h" > +#include "testutilsqemu.h" > +#include "virstring.h" > + > +#define VIR_FROM_THIS VIR_FROM_NONE > + > +static int > +testCompareXMLToXMLFiles(const char *poolxml, const char *inxml, > + const char *outxml, unsigned int flags) > +{ > + char *actual = NULL; > + int ret = -1; > + virFSPoolDefPtr pool = NULL; > + virFSItemDefPtr dev = NULL; > + > + if (!(pool = virFSPoolDefParseFile(poolxml))) > + goto fail; > + > + if (!(dev = virFSItemDefParseFile(pool, inxml, flags))) > + goto fail; > + > + if (!(actual = virFSItemDefFormat(pool, dev))) > + goto fail; > + > + if (virTestCompareToFile(actual, outxml) < 0) > + goto fail; > + > + ret = 0; > + > + fail: > + VIR_FREE(actual); > + virFSPoolDefFree(pool); > + virFSItemDefFree(dev); > + return ret; > +} > + > +struct testInfo { > + const char *pool; > + const char *name; > + unsigned int flags; > +}; > + > +static int > +testCompareXMLToXMLHelper(const void *data) > +{ > + int result = -1; > + const struct testInfo *info = data; > + char *poolxml = NULL; > + char *inxml = NULL; > + char *outxml = NULL; > + > + if (virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", > + abs_srcdir, info->pool) < 0 || > + virAsprintf(&inxml, "%s/storagevolxml2xmlin/%s.xml", > + abs_srcdir, info->name) < 0 || > + virAsprintf(&outxml, "%s/storagevolxml2xmlout/%s.xml", > + abs_srcdir, info->name) < 0) { > + goto cleanup; > + } > + > + result = testCompareXMLToXMLFiles(poolxml, inxml, outxml, info->flags); > + > + cleanup: > + VIR_FREE(poolxml); > + VIR_FREE(inxml); > + VIR_FREE(outxml); > + > + return result; > +} > + > + > +static int > +mymain(void) > +{ > + int ret = 0; > + > +#define DO_TEST_FULL(pool, name, flags) \ > + do { \ > + struct testInfo info = { pool, name, flags }; \ > + if (virTestRun("FS Item XML-2-XML " name, \ > + testCompareXMLToXMLHelper, &info) < 0) \ > + ret = -1; \ > + } \ > + while (0); > + > +#define DO_TEST(pool, name) DO_TEST_FULL(pool, name, 0) > + > + DO_TEST("pool-dir", "vol-file"); > + > + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; > +} > + > +VIRT_TEST_MAIN(mymain) > diff --git a/tests/fspoolschemadata/dir-missing-target-path-invalid.xml b/tests/fspoolschemadata/dir-missing-target-path-invalid.xml > new file mode 100644 > index 0000000..a52bf49 > --- /dev/null > +++ b/tests/fspoolschemadata/dir-missing-target-path-invalid.xml > @@ -0,0 +1,12 @@ > +<fspool type='dir'> > + <name>test</name> > + <source> > + </source> > + <target> > + <permissions> > + <mode>0700</mode> > + <owner>-1</owner> > + <group>-1</group> > + </permissions> > + </target> > +</fspool> > diff --git a/tests/fspoolxml2xmlin/fspool-dir.xml b/tests/fspoolxml2xmlin/fspool-dir.xml > new file mode 100644 > index 0000000..a3a1639 > --- /dev/null > +++ b/tests/fspoolxml2xmlin/fspool-dir.xml > @@ -0,0 +1,17 @@ > +<fspool type='dir'> > + <name>virtfs</name> > + <uuid>5584ee21-db40-4e98-980e-44802c47b62f</uuid> > + <capacity unit='bytes'>0</capacity> > + <allocation unit='bytes'>0</allocation> > + <available unit='bytes'>0</available> > + <source> > + </source> > + <target> > + <path>///var/////lib/libvirt/fs//</path> > + <permissions> > + <mode>0700</mode> > + <owner>-1</owner> > + <group>-1</group> > + </permissions> > + </target> > +</fspool> > diff --git a/tests/fspoolxml2xmlout/fspool-dir.xml b/tests/fspoolxml2xmlout/fspool-dir.xml > new file mode 100644 > index 0000000..30aca89 > --- /dev/null > +++ b/tests/fspoolxml2xmlout/fspool-dir.xml > @@ -0,0 +1,17 @@ > +<fspool type='dir'> > + <name>virtfs</name> > + <uuid> 5584ee21-db40-4e98-980e-44802c47b62f</uuid> > + <capacity unit='bytes'>0</capacity> > + <allocation unit='bytes'>0</allocation> > + <available unit='bytes'>0</available> > + <source> > + </source> > + <target> > + <path>/var/lib/libvirt/fs</path> > + <permissions> > + <mode>0700</mode> > + <owner>-1</owner> > + <group>-1</group> > + </permissions> > + </target> > +</fspool> > diff --git a/tests/fspoolxml2xmltest.c b/tests/fspoolxml2xmltest.c > new file mode 100644 > index 0000000..b66e959 > --- /dev/null > +++ b/tests/fspoolxml2xmltest.c > @@ -0,0 +1,82 @@ > +#include <config.h> > + > +#include <stdio.h> > +#include <stdlib.h> > +#include <unistd.h> > +#include <string.h> > + > +#include <sys/types.h> > +#include <fcntl.h> > + > +#include "internal.h" > +#include "testutils.h" > +#include "fs_conf.h" > +#include "testutilsqemu.h" > +#include "virstring.h" > + > +#define VIR_FROM_THIS VIR_FROM_NONE > + > +static int > +testCompareXMLToXMLFiles(const char *inxml, const char *outxml) > +{ > + char *actual = NULL; > + int ret = -1; > + virFSPoolDefPtr dev = NULL; > + > + if (!(dev = virFSPoolDefParseFile(inxml))) > + goto fail; > + > + if (!(actual = virFSPoolDefFormat(dev))) > + goto fail; > + > + if (virTestCompareToFile(actual, outxml) < 0) > + goto fail; > + > + ret = 0; > + > + fail: > + VIR_FREE(actual); > + virFSPoolDefFree(dev); > + return ret; > +} > + > +static int > +testCompareXMLToXMLHelper(const void *data) > +{ > + int result = -1; > + char *inxml = NULL; > + char *outxml = NULL; > + > + if (virAsprintf(&inxml, "%s/fspoolxml2xmlin/%s.xml", > + abs_srcdir, (const char*)data) < 0 || > + virAsprintf(&outxml, "%s/fspoolxml2xmlout/%s.xml", > + abs_srcdir, (const char*)data) < 0) { > + goto cleanup; > + } > + > + result = testCompareXMLToXMLFiles(inxml, outxml); > + > + cleanup: > + VIR_FREE(inxml); > + VIR_FREE(outxml); > + > + return result; > +} > + > +static int > +mymain(void) > +{ > + int ret = 0; > + > +#define DO_TEST(name) \ > + if (virTestRun("FS Pool XML-2-XML " name, \ > + testCompareXMLToXMLHelper, (name)) < 0) \ > + ret = -1 > + > + DO_TEST("pool-dir"); > +#endif > + > + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; > +} > + > +VIRT_TEST_MAIN(mymain)

1 0

[libvirt] [gnulib PATCH 0/2] Work around glibc 2.25 deprecation warnings
by Eric Blake 15 Sep '16

15 Sep '16

Fedora rawhide builds of libvirt.git at commit d53fa838^ failed due to the new glibc 2.25 deprecation warning for use of major() from just <sys/types.h>; I also found that the same warning is provoked by gnulib's mountlist module. Libvirt commit d53fa838 was a temporary hack to work around the problem, and I will be reverting that and updating to newer gnulib once this goes in. I've tested that libvirt on Fedora rawhide with d53fa838 reverted and gnulib updated to this commit was once again able to build. Comments welcome, particularly for my choice of wording in documentation changes. The final push will differ slightly from this, especially if the autoconf patch going in first changes slightly due to review there, but this should give a good idea of the fix. Eric Blake (2): mountlist: include sysmacros.h for glibc sys_types: avoid glibc 2.25 warnings about major() ChangeLog | 15 +++++++++++++++ doc/glibc-functions/gnu_dev_major.texi | 4 ++++ doc/glibc-functions/gnu_dev_makedev.texi | 4 ++++ doc/glibc-functions/gnu_dev_minor.texi | 4 ++++ doc/posix-headers/sys_types.texi | 6 ++++++ lib/mountlist.c | 6 ++++++ m4/mountlist.m4 | 3 ++- m4/sys_types_h.m4 | 27 ++++++++++++++++++++++++++- 8 files changed, 67 insertions(+), 2 deletions(-) -- 2.7.4

1 2

[libvirt] [PATCH] qemu_driver: pass path of compress prog directly
by Chen Hanxiao 15 Sep '16

15 Sep '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We check compress prog in qemuCompressProgramAvailable, then check it again in virExec. This path will pass compress prog's path directly. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/qemu/qemu_driver.c | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 97e2ffc..9f4e593 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3037,6 +3037,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, const char *path, const char *domXML, int compressed, + const char *compressed_path, bool was_running, unsigned int flags, qemuDomainAsyncJob asyncJob) @@ -3084,7 +3085,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, goto cleanup; /* Perform the migration */ - if (qemuMigrationToFile(driver, vm, fd, qemuCompressProgramName(compressed), + if (qemuMigrationToFile(driver, vm, fd, compressed_path, asyncJob) < 0) goto cleanup; @@ -3137,7 +3138,8 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, static int qemuDomainSaveInternal(virQEMUDriverPtr driver, virDomainPtr dom, virDomainObjPtr vm, const char *path, - int compressed, const char *xmlin, unsigned int flags) + int compressed, const char *compressed_path, + const char *xmlin, unsigned int flags) { char *xml = NULL; bool was_running = false; @@ -3209,7 +3211,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, virDomainPtr dom, goto endjob; } - ret = qemuDomainSaveMemory(driver, vm, path, xml, compressed, + ret = qemuDomainSaveMemory(driver, vm, path, xml, compressed, compressed_path, was_running, flags, QEMU_ASYNC_JOB_SAVE); if (ret < 0) goto endjob; @@ -3250,17 +3252,16 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, virDomainPtr dom, /* Returns true if a compression program is available in PATH */ static bool -qemuCompressProgramAvailable(virQEMUSaveFormat compress) +qemuCompressProgramAvailable(virQEMUSaveFormat compress, char **compressed_path) { - char *path; - - if (compress == QEMU_SAVE_FORMAT_RAW) + if (compress == QEMU_SAVE_FORMAT_RAW) { + *compressed_path = NULL; return true; + } - if (!(path = virFindFileInPath(qemuSaveCompressionTypeToString(compress)))) + if (!(*compressed_path = virFindFileInPath(qemuSaveCompressionTypeToString(compress)))) return false; - VIR_FREE(path); return true; } @@ -3270,6 +3271,7 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *path, const char *dxml, { virQEMUDriverPtr driver = dom->conn->privateData; int compressed = QEMU_SAVE_FORMAT_RAW; + char *compressed_path = NULL; int ret = -1; virDomainObjPtr vm = NULL; virQEMUDriverConfigPtr cfg = NULL; @@ -3287,7 +3289,7 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *path, const char *dxml, "in configuration file")); goto cleanup; } - if (!qemuCompressProgramAvailable(compressed)) { + if (!qemuCompressProgramAvailable(compressed, &compressed_path)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Compression program for image format " "in configuration file isn't available")); @@ -3308,11 +3310,12 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *path, const char *dxml, } ret = qemuDomainSaveInternal(driver, dom, vm, path, compressed, - dxml, flags); + compressed_path, dxml, flags); cleanup: virDomainObjEndAPI(&vm); virObjectUnref(cfg); + VIR_FREE(compressed_path); return ret; } @@ -3343,6 +3346,7 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverConfigPtr cfg = NULL; int compressed = QEMU_SAVE_FORMAT_RAW; + char *compressed_path = NULL; virDomainObjPtr vm; char *name = NULL; int ret = -1; @@ -3377,7 +3381,7 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) "in configuration file")); goto cleanup; } - if (!qemuCompressProgramAvailable(compressed)) { + if (!qemuCompressProgramAvailable(compressed, &compressed_path)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Compression program for image format " "in configuration file isn't available")); @@ -3391,13 +3395,14 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) VIR_INFO("Saving state of domain '%s' to '%s'", vm->def->name, name); ret = qemuDomainSaveInternal(driver, dom, vm, name, - compressed, NULL, flags); + compressed, compressed_path, NULL, flags); if (ret == 0) vm->hasManagedSave = true; cleanup: virDomainObjEndAPI(&vm); VIR_FREE(name); + VIR_FREE(compressed_path); virObjectUnref(cfg); return ret; @@ -3617,6 +3622,7 @@ static virQEMUSaveFormat getCompressionType(virQEMUDriverPtr driver) { int ret = QEMU_SAVE_FORMAT_RAW; + char *compressed_path = NULL; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); /* @@ -3634,7 +3640,7 @@ getCompressionType(virQEMUDriverPtr driver) ret = QEMU_SAVE_FORMAT_RAW; goto cleanup; } - if (!qemuCompressProgramAvailable(ret)) { + if (!qemuCompressProgramAvailable(ret, &compressed_path)) { VIR_WARN("%s", _("Compression program for dump image format " "in configuration file isn't available, " "using raw")); @@ -3644,6 +3650,7 @@ getCompressionType(virQEMUDriverPtr driver) } cleanup: virObjectUnref(cfg); + VIR_FREE(compressed_path); return ret; } @@ -14308,6 +14315,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, bool pmsuspended = false; virQEMUDriverConfigPtr cfg = NULL; int compressed = QEMU_SAVE_FORMAT_RAW; + char *compressed_path = NULL; /* If quiesce was requested, then issue a freeze command, and a * counterpart thaw command when it is actually sent to agent. @@ -14377,7 +14385,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, goto cleanup; } - if (!qemuCompressProgramAvailable(compressed)) { + if (!qemuCompressProgramAvailable(compressed, &compressed_path)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Compression program for image format " "in configuration file isn't available")); @@ -14389,7 +14397,8 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, goto cleanup; if ((ret = qemuDomainSaveMemory(driver, vm, snap->def->file, - xml, compressed, resume, 0, + xml, compressed, compressed_path, + resume, 0, QEMU_ASYNC_JOB_SNAPSHOT)) < 0) goto cleanup; @@ -14459,6 +14468,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, } VIR_FREE(xml); + VIR_FREE(compressed_path); virObjectUnref(cfg); if (memory_unlink && ret < 0) unlink(snap->def->file); -- 1.8.3.1

2 4

[libvirt] [PATCH 0/2] Introduce basic virt-admin-self-test
by Michal Privoznik 14 Sep '16

14 Sep '16

I've realized we do no testing of virt-admin yet while reviewing Erik's patches. Michal Privoznik (2): virsh: Move cmdSelfTest to vsh tests: Self test virt-admin .gitignore | 1 + tests/Makefile.am | 1 + tests/virsh-self-test | 21 ++++++++++++++++----- tests/virt-admin-self-test | 1 + tools/virsh.c | 45 +-------------------------------------------- tools/virt-admin.c | 1 + tools/vsh.c | 38 ++++++++++++++++++++++++++++++++++++++ tools/vsh.h | 11 +++++++++++ 8 files changed, 70 insertions(+), 49 deletions(-) create mode 120000 tests/virt-admin-self-test -- 2.8.4

2 7

[libvirt] [libvirt-perl PATCH 0/2] Updates to support recent upstream changes
by John Ferlan 14 Sep '16

14 Sep '16

Couple of patches to allow build/test to work with upstream top John Ferlan (2): Add support for VIR_SECRET_USAGE_TYPE_TLS Add support for ERR_AGENT_UNSYNCED Changes | 2 ++ Virt.xs | 2 ++ lib/Sys/Virt/Error.pm | 4 ++++ lib/Sys/Virt/Secret.pm | 7 +++++++ 4 files changed, 15 insertions(+) -- 2.7.4

2 4

[libvirt] [PATCH 0/2] Report block jobs more wisely
by Michal Privoznik 14 Sep '16

14 Sep '16

There's been a discussion recently (even here on the list [1]) that Nova is sometimes unable to fetch block job stats properly. Basically, we may report job.cur == job.end == 0 in some cases tricking Nova into thinking job is done when in fact it hasn't even started yet. Michal Privoznik (2): qemuDomainGetBlockJobInfo: Move info translation into separate func virDomainGetBlockJobInfo: Fix corner case when qemu reports no info src/libvirt-domain.c | 7 ++++++ src/qemu/qemu_driver.c | 58 ++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 49 insertions(+), 16 deletions(-) -- 2.8.4

4 11

[libvirt] [PATCH 0/4] Fix incorrect vcpu data refresh on daemon restart after vcpu hotplug
by Peter Krempa 14 Sep '16

14 Sep '16

See patches 3 and 4 for explanation. Peter Krempa (4): qemu: monitor: Use a more obvious iterator name qemu: monitor: qemuMonitorGetCPUInfoHotplug: Add iterator 'anycpu' qemu: monitor: Add vcpu state information to monitor data qemu: domain: Don't infer vcpu state src/qemu/qemu_domain.c | 14 +++--- src/qemu/qemu_monitor.c | 51 ++++++++++++++-------- src/qemu/qemu_monitor.h | 4 ++ .../qemumonitorjson-cpuinfo-ppc64-basic.data | 48 ++++++++++++++++++++ .../qemumonitorjson-cpuinfo-ppc64-hotplug-1.data | 48 ++++++++++++++++++++ .../qemumonitorjson-cpuinfo-ppc64-hotplug-2.data | 48 ++++++++++++++++++++ .../qemumonitorjson-cpuinfo-ppc64-hotplug-4.data | 48 ++++++++++++++++++++ .../qemumonitorjson-cpuinfo-ppc64-no-threads.data | 32 ++++++++++++++ ...emumonitorjson-cpuinfo-x86-basic-pluggable.data | 16 +++++++ .../qemumonitorjson-cpuinfo-x86-full.data | 22 ++++++++++ tests/qemumonitorjsontest.c | 3 ++ 11 files changed, 306 insertions(+), 28 deletions(-) -- 2.10.0

3 11

[libvirt] [PATCH v2 0/3] Introduce aliases for virt-admin's srv-* commands
by Erik Skultety 14 Sep '16

14 Sep '16

the original version: https://www.redhat.com/archives/libvir-list/2016-September/msg00312.html since v1: - tweaked the virsh-self-test so that it also checks the aliased commands instead of skipping them (since there was a good reason for that before the changes this series introduces) - patches 2-3 remained untouched Erik Skultety (3): virt-admin: Tweak command parsing logic so that aliases point to new commands virt-admin: Add some command aliases to provide syntax sugar over ugly commands virt-admin: Replace the (now) aliases with new command names in the man page tools/virsh-nodedev.c | 6 ++---- tools/virsh.c | 10 ++++++---- tools/virsh.pod | 2 -- tools/virt-admin.c | 24 ++++++++++++++++++++++++ tools/virt-admin.pod | 30 +++++++++++++++--------------- tools/vsh.c | 6 ++++++ tools/vsh.h | 1 + 7 files changed, 54 insertions(+), 25 deletions(-) -- 2.5.5

1 4

[libvirt] [PATCH 0/2] Fix vcpu hotplug with memoryless NUMA nodes
by Peter Krempa 14 Sep '16

14 Sep '16

See patch 2. Peter Krempa (2): util: numa: Remove impossible error handling numa: Rename virNumaGetHostNodeset and make it return only nodes with memory src/libvirt_private.syms | 2 +- src/qemu/qemu_cgroup.c | 4 ++-- src/util/virnuma.c | 18 +++++++++++------- src/util/virnuma.h | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) -- 2.10.0

2 3

Re: [libvirt] AC_HEADER_MAJOR vs. glibc 2.25(-to-be)
by Eric Blake 13 Sep '16

13 Sep '16

[adding libvirt list, as this is what sparked my investigations so far today] On 09/13/2016 04:36 PM, Eric Blake wrote: > One other possibility that distros can do is to prime a config.site > file, with $ac_cv_header_sys_types_h_makedev=no, to forcefully bypass > the configure check that is normally done where <sys/types.h> would > warn. It has to be in config.site, because non-glibc systems do not > want to do that. Okay, I have confirmed that this prime-the-cache idea DOES work, using libvirt.git commit 419bc8cf (one commit prior to d53fa838 which installed a hack into libvirt to force the use of -Werror for the duration of AC_HEADER_MAJOR [1]). By itself, './configure' succeeds but leaves MAJOR_IN_SYSMACROS undefined, which results in a build failure later in libvirt; but when run as './configure ac_cv_header_sys_types_h_makedev=no', MAJOR_IN_SYSMACROS gets defined and the build succeeds. I want to remove the libvirt hack (not all compilers understand -Werror, even if libvirt is only ever built by gcc or clang), and my experiment was enough to prove that: 1. distros that provide a config.site file can use this file to avoid the problem, even for packages that have not yet rebuilt with a new-enough autoconf to fix the issue 2. autoconf and gnulib should indeed be fixed to probe for <sys/sysmacros.h> _prior_ to probing for whether makedev() exists in <sys/type.h>, rather than the 2.69 logic of only checking for <sys/sysmacros.h> if makedev() was not found earlier. Of course, the libvirt hack should not be reverted until autoconf and gnulib have the final solution in place. > > Meanwhile, even without an autoconf release scheduled, I am currently > working on patching the existing autoconf macro and documentation to > match the current situation. It sounds to me like we want the following > logic: > > If <sys/sysmacros.h> exists and defines major(), use that, > else if <sys/mkdev.h> exists, use that, > else if <sys/types.h> defines major(), use that, > else not available The current autoconf code assumes that if <sys/sysmacros.h> exists, then it defines major()/minor()/makedev(); I think that assumption is still safe. Where autoconf was wrong was that it was not even probing for the existence of <sys/sysmacros.h> if it found that <sys/types.h> was enough to pollute the namespace with the three macros. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 1

[libvirt] [PATCH] storage_backend_rbd: continue searching when failing in rbd_diff_iterate
by Chen Hanxiao 13 Sep '16

13 Sep '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We try to find a snapshot that had no different between the current state of RBD image. If we failed in rbd_diff_iterate, just continue for the next search iteration. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/storage/storage_backend_rbd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 4dd4b24..2756c83 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -831,9 +831,10 @@ virStorageBackendRBDSnapshotFindNoDiff(rbd_image_t image, #endif if (r < 0) { - virReportSystemError(-r, _("failed to iterate RBD snapshot %s@%s"), - imgname, snaps[i].name); - goto cleanup; + VIR_DEBUG("failed to iterate RBD snapshot %s@%s," + " rbd_diff return %d", + imgname, snaps[i].name, r); + continue; } /* If diff is still set to zero we found a snapshot without deltas */ -- 1.8.3.1

2 2

[libvirt] [PATCH 0/4] Introduce aliases for virt-admin's srv-* commands
by Erik Skultety 13 Sep '16

13 Sep '16

So, as suggested by Martin in [1], this series tweaks the command alias handling logic, so that when creating alias, it is not necessary to duplicate the original command's structure, thus creating a bit more noise. Instead, the new format for an alias structure hints very clearly that it's just an alias for a different command, while linking the alias with the original command's data by using new element '.alias'. [1] https://www.redhat.com/archives/libvir-list/2016-September/msg00129.html Erik Skultety (4): tests: fix incorrect status handling by virsh-self-test virt-admin: Tweak command parsing logic so that aliases point to new commands virt-admin: Add some command aliases to provide syntax sugar over ugly commands virt-admin: Replace the (now) aliases with new command names in the man page tests/virsh-self-test | 2 +- tools/virsh-nodedev.c | 6 ++---- tools/virsh.c | 3 ++- tools/virt-admin.c | 24 ++++++++++++++++++++++++ tools/virt-admin.pod | 30 +++++++++++++++--------------- tools/vsh.c | 6 ++++++ tools/vsh.h | 1 + 7 files changed, 51 insertions(+), 21 deletions(-) -- 2.5.5

2 9

[libvirt] [PATCH] configure: Check for major() more strictly
by Michal Privoznik 13 Sep '16

13 Sep '16

Thing is, in f3f15cc24 I'm trying to adapt libvirt to the newest glibc where major()/minor()/makedev() are moved from sys/types.h to sys/sysmacros.h. However, my commit back then expect autoconf to be fixed too as we already use AC_HEADER_MAJOR to determine which header file the functions are in, but because the header files just trigger a warning and not a compile error, the autoconf macro detects the bad header file. This is just a workaround until autoconf macro is fixed. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index f6076bd..f322c4a 100644 --- a/configure.ac +++ b/configure.ac @@ -144,7 +144,10 @@ AC_TYPE_UID_T dnl Support building Win32 DLLs (must appear *before* AM_PROG_LIBTOOL) AC_LIBTOOL_WIN32_DLL +old_CFLAGS=$CFLAGS +CFLAGS="$CFLAGS -Werror" AC_HEADER_MAJOR +CFLAGS=$old_CFLAGS m4_ifndef([LT_INIT], [ AM_PROG_LIBTOOL -- 2.8.4

2 1

[libvirt] qemu: migration: shall we abort migration while the guest is rebooting？
by Zhangbo (Oscar) 13 Sep '16

13 Sep '16

Hi all: Here's the steps we produce the problem: 1 reboot guest with the flag of VIR_DOMAIN_REBOOT_ACPI_POWER_BTN 2 sleep 1 second (so that the guest is still rebooting, although the API already returned.) 3 migrate the guest The problem is that : the guest failed to migrate to the dest, and crashed on source side. We don't bother to dig further into the problem, the root cause we think is that we migrate a guest while it's rebooting. So, shall we 1 make the reboot JOB LOCK longer enough until the guest has already rebooted(got monitor message from qemu)? 2 let openstack do the mutex work ? (has openstack already done this?) (I checked openstack codes, and found that openstack uses shutdown and create APIs rather than REBOOT to do the reboot work. So it seems that openstack doesn't take care of this problem nowadays. Am I right? --- see: nova/virt/libvirt/driver.py: _soft_reboot) Thanks in advance. Zhang Bo (Oscar)

2 4

[libvirt] [PATCH] qemu: Add missing 'p' to qemuCgrouEmulatorAllNodesRestore
by Peter Krempa 13 Sep '16

13 Sep '16

--- Pushed as trivial. src/qemu/qemu_cgroup.c | 6 +++--- src/qemu/qemu_cgroup.h | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index e2b5bab..fe94613 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -1149,7 +1149,7 @@ qemuCgroupEmulatorAllNodesDataFree(qemuCgroupEmulatorAllNodesDataPtr data) * Allows all NUMA nodes for the qemu emulator thread temporarily. This is * necessary when hotplugging cpus since it requires memory allocated in the * DMA region. Afterwards the operation can be reverted by - * qemuCgrouEmulatorAllNodesRestore. + * qemuCgroupEmulatorAllNodesRestore. * * Returns 0 on success -1 on error */ @@ -1196,14 +1196,14 @@ qemuCgroupEmulatorAllNodesAllow(virCgroupPtr cgroup, /** - * qemuCgrouEmulatorAllNodesRestore: + * qemuCgroupEmulatorAllNodesRestore: * @data: data structure created by qemuCgroupEmulatorAllNodesAllow * * Rolls back the setting done by qemuCgroupEmulatorAllNodesAllow and frees the * associated data. */ void -qemuCgrouEmulatorAllNodesRestore(qemuCgroupEmulatorAllNodesDataPtr data) +qemuCgroupEmulatorAllNodesRestore(qemuCgroupEmulatorAllNodesDataPtr data) { virErrorPtr err; diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h index e6ebae0..623823e 100644 --- a/src/qemu/qemu_cgroup.h +++ b/src/qemu/qemu_cgroup.h @@ -66,6 +66,6 @@ struct _qemuCgroupEmulatorAllNodesData { int qemuCgroupEmulatorAllNodesAllow(virCgroupPtr cgroup, qemuCgroupEmulatorAllNodesDataPtr *data); -void qemuCgrouEmulatorAllNodesRestore(qemuCgroupEmulatorAllNodesDataPtr data); +void qemuCgroupEmulatorAllNodesRestore(qemuCgroupEmulatorAllNodesDataPtr data); #endif /* __QEMU_CGROUP_H__ */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 12b84c4..dda82d3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4891,7 +4891,7 @@ qemuDomainSetVcpusLive(virQEMUDriverPtr driver, ret = 0; cleanup: - qemuCgrouEmulatorAllNodesRestore(emulatorCgroup); + qemuCgroupEmulatorAllNodesRestore(emulatorCgroup); virBitmapFree(vcpumap); return ret; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7596579..cecd321 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4925,7 +4925,7 @@ qemuProcessSetupHotpluggableVcpus(virQEMUDriverPtr driver, ret = 0; cleanup: - qemuCgrouEmulatorAllNodesRestore(emulatorCgroup); + qemuCgroupEmulatorAllNodesRestore(emulatorCgroup); VIR_FREE(bootHotplug); virJSONValueFree(vcpuprops); return ret; -- 2.10.0

1 0

[libvirt] [PATCH] Make sure sys/types.h is included after sys/sysmacros.h
by Michal Privoznik 13 Sep '16

13 Sep '16

In the latest glibc, major() and minor() functions are marked as deprecated (glibc commit dbab6577): CC util/libvirt_util_la-vircgroup.lo util/vircgroup.c: In function 'virCgroupGetBlockDevString': util/vircgroup.c:768:5: error: '__major_from_sys_types' is deprecated: In the GNU C Library, `major' is defined by <sys/sysmacros.h>. For historical compatibility, it is currently defined by <sys/types.h> as well, but we plan to remove this soon. To use `major', include <sys/sysmacros.h> directly. If you did not intend to use a system-defined macro `major', you should #undef it after including <sys/types.h>. [-Werror=deprecated-declarations] if (virAsprintf(&ret, "%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)) < 0) ^~ In file included from /usr/include/features.h:397:0, from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdio.h:28, from ../gnulib/lib/stdio.h:43, from util/vircgroup.c:26: /usr/include/sys/sysmacros.h:87:1: note: declared here __SYSMACROS_DEFINE_MAJOR (__SYSMACROS_FST_IMPL_TEMPL) ^ Moreover, in the glibc commit, there's suggestion to keep ordering of including of header files as implemented here. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- This still won't solve the build issue completely as AC_HEADER_MAJOR still reports that major() is defined by sys/types.h instead of sys/sysmacros.h. But once they fix it, we are good too. Or we can use the following workaround in configure.ac: +old_CFLAGS=$CFLAGS +CFLAGS+=" -Werror " AC_HEADER_MAJOR +CFLAGS=$old_CFLAGS src/conf/domain_audit.c | 3 ++- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/util/vircgroup.c | 2 +- src/util/virutil.c | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 53a58ac..52dea02 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -24,7 +24,6 @@ #include <config.h> #include <sys/stat.h> -#include <sys/types.h> #ifdef MAJOR_IN_MKDEV # include <sys/mkdev.h> @@ -32,6 +31,8 @@ # include <sys/sysmacros.h> #endif +#include <sys/types.h> + #include "domain_audit.h" #include "viraudit.h" #include "viruuid.h" diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 825b4d4..8c581df 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -27,7 +27,6 @@ #include <sys/epoll.h> #include <sys/wait.h> #include <sys/socket.h> -#include <sys/types.h> #ifdef MAJOR_IN_MKDEV # include <sys/mkdev.h> @@ -35,6 +34,7 @@ # include <sys/sysmacros.h> #endif +#include <sys/types.h> #include <sys/un.h> #include <sys/personality.h> #include <unistd.h> diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index da98b38..24025d1 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -28,7 +28,6 @@ #include <sched.h> #include <sys/utsname.h> #include <string.h> -#include <sys/types.h> #ifdef MAJOR_IN_MKDEV # include <sys/mkdev.h> @@ -36,6 +35,7 @@ # include <sys/sysmacros.h> #endif +#include <sys/types.h> #include <sys/socket.h> #include <sys/stat.h> #include <sys/un.h> diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index f2477d5..8b52816 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -34,7 +34,6 @@ #include <errno.h> #include <stdlib.h> #include <sys/stat.h> -#include <sys/types.h> #ifdef MAJOR_IN_MKDEV # include <sys/mkdev.h> @@ -42,6 +41,7 @@ # include <sys/sysmacros.h> #endif +#include <sys/types.h> #include <signal.h> #include <dirent.h> #include <unistd.h> diff --git a/src/util/virutil.c b/src/util/virutil.c index 170dd59..b57a195 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -35,7 +35,6 @@ #include <errno.h> #include <poll.h> #include <sys/stat.h> -#include <sys/types.h> #ifdef MAJOR_IN_MKDEV # include <sys/mkdev.h> @@ -43,6 +42,7 @@ # include <sys/sysmacros.h> #endif +#include <sys/types.h> #include <sys/ioctl.h> #include <string.h> #include <termios.h> -- 2.8.4

3 5

[libvirt] [PATCH 0/3] qemu: fix startup of NUMA pinned VM with hotpluggable vcpus
by Peter Krempa 13 Sep '16

13 Sep '16

See patch 2 for explanation. Peter Krempa (3): qemu: cgroup: Extract temporary relaxing of cgroup setting for vcpu hotplug qemu: process: Fix start with unpluggable vcpus with NUMA pinning qemu: driver: Remove unnecessary condition src/qemu/qemu_cgroup.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_cgroup.h | 11 ++++++ src/qemu/qemu_driver.c | 38 +++------------------ src/qemu/qemu_process.c | 6 ++++ 4 files changed, 112 insertions(+), 33 deletions(-) -- 2.10.0

3 5

[libvirt] [PATCH 0/3] add option to keep nvram file on undefine
by Nikolay Shirokovskiy 13 Sep '16

13 Sep '16

There is already a patch [1] on this topic with a different approach - keep nvram file by default. There is also some discussion there. To sum up keeping nvram on undefine could be useful in some usecases so there should be an option to do it. On the other hand there is a danger of leaving domain assets after its undefine and unsing them unintentionally on defining domain with the same name. AFAIU keeping nvram by default was motivated by domain disks behaviour. I think there is a difference as libvirt never create disks for domain as opposed to nvram and managed save and without disks domain will not start so user is quite aware of disks files. On the other hand one can start using nvram file solely putting <nvram> in config and managed save is created on daemon shutdown. So user is much less aware of nvram and managed save existence. Thus one can easily mess up by unaware define $name/using/undefine/define $name again usecase. Thus I vote for keeping said assets only if it is specified explicitly so user knows what he is doing. Adding option to undefine is best solution I come up with. The other options are add checks on define or start and both are impossible. Such a check should be done without any extra flags for it to be useful but this way we break existing users. As this a proof of concept this series does not add extra flag for managed save. [1] https://www.redhat.com/archives/libvir-list/2015-February/msg00915.html Nikolay Shirokovskiy (3): api: add VIR_DOMAIN_UNDEFINE_KEEP_NVRAM flag qemu: add VIR_DOMAIN_UNDEFINE_KEEP_NVRAM support virsh: add --keep-nvram option to undefine command include/libvirt/libvirt-domain.h | 1 + src/qemu/qemu_driver.c | 26 +++++++++++++++++--------- tools/virsh-domain.c | 8 ++++++++ tools/virsh.pod | 6 +++--- 4 files changed, 29 insertions(+), 12 deletions(-) -- 1.8.3.1

5 10

[libvirt] [PATCH] conf: allow hotplugging "legacy PCI" device to manually addressed PCIe slot
by Laine Stump 12 Sep '16

12 Sep '16

In a full domain config, libvirt allows overriding the normal PCI vs. PCI Express rules when a device address is explicitly provided (so, e.g., you can force a legacy PCI device to plug into a PCIe port, although libvirt would never do that on its own). However, due to a bug libvirt doesn't give this same leeway when hotplugging devices. On top of that, current libvirt assumes that *all* devices are legacy PCI. The result of all this is that it's impossible to hotplug a device into a PCIe port, even if you manually add the PCI address. This can all be traced to the function virDomainPCIAddressEnsureAddr(), and the fact that it calls virDomainPCIaddressReserveSlot() for manually set addresses, and that function hardcodes the argument "fromConfig" to false (meaning "this address was auto-assigned, so it should be subject to stricter validation"). Since virDomainPCIAddressReserveSlot() is just a one line simple wrapper around virDomainPCIAddressReserveAddr() (adding in a hardcoded reserveEntireSlot = true and fromConfig = false), all that's needed to solve the problem with no unwanted side effects is to replace that call for virDomainPCIAddressReserveSlot() with a direct call to virDomainPCIAddressReserveAddr(), but with reserveEntireSlot = true, fromConfig = true. That's what this patch does. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1337490 --- src/conf/domain_addr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 79c024f..93026c2 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -507,7 +507,8 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr addrs, addrStr, flags, true)) goto cleanup; - ret = virDomainPCIAddressReserveSlot(addrs, &dev->addr.pci, flags); + ret = virDomainPCIAddressReserveAddr(addrs, &dev->addr.pci, flags, + true, true); } else { ret = virDomainPCIAddressReserveNextSlot(addrs, dev, flags); } -- 2.7.4

2 2

[libvirt] [PATCH] audit: Audit information about shmem devices
by Martin Kletzander 12 Sep '16

12 Sep '16

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1218603 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/auditlog.html.in | 19 +++++++++++++++++++ src/conf/domain_audit.c | 43 +++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_audit.h | 4 ++++ src/libvirt_private.syms | 1 + 4 files changed, 67 insertions(+) diff --git a/docs/auditlog.html.in b/docs/auditlog.html.in index 012d0680a87b..7348948feb7a 100644 --- a/docs/auditlog.html.in +++ b/docs/auditlog.html.in @@ -352,5 +352,24 @@ <dd>The name of the cgroup controller</dd> </dl> + + <h4><a name="typeresourceshmem">console/serial/parallel/channel</a></h4> + <p> + The <code>msg</code> field will include the following sub-fields + </p> + + <dl> + <dt><code>resrc</code></dt> + <dd>The type of resource assigned. Set to <code>shmem</code></dd> + <dt><code>reason</code></dt> + <dd>The reason which caused the resource to be assigned to happen</dd> + <dt><code>size</code></dt> + <dd>The size of the shared memory region</dd> + <dt><code>shmem</code></dt> + <dd>Name of the shared memory region</dd> + <dt><code>source</code></dt> + <dd>Path of the backing character device for given emulated device</dd> + </dl> + </body> </html> diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 53a58ac4c88c..cf9c03dee749 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -889,6 +889,9 @@ virDomainAuditStart(virDomainObjPtr vm, const char *reason, bool success) if (vm->def->tpm) virDomainAuditTPM(vm, vm->def->tpm, "start", true); + for (i = 0; i < vm->def->nshmems; i++) + virDomainAuditShmem(vm, vm->def->shmems[i], "start", true); + virDomainAuditMemory(vm, 0, virDomainDefGetMemoryTotal(vm->def), "start", true); virDomainAuditVcpu(vm, 0, virDomainDefGetVcpus(vm->def), "start", true); @@ -963,3 +966,43 @@ virDomainAuditSecurityLabel(virDomainObjPtr vm, bool success) VIR_FREE(vmname); } + +void +virDomainAuditShmem(virDomainObjPtr vm, + virDomainShmemDefPtr def, + const char *reason, bool success) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + char *vmname = virAuditEncode("vm", vm->def->name); + const char *srcpath = virDomainAuditChardevPath(&def->server.chr); + char *src = virAuditEncode("server", VIR_AUDIT_STR(srcpath)); + char *shmem = virAuditEncode("shmem", VIR_AUDIT_STR(def->name)); + const char *virt = virDomainVirtTypeToString(vm->def->virtType); + char *size = NULL; + + ignore_value(virAsprintfQuiet(&size, "%llu", def->size)); + virUUIDFormat(vm->def->uuid, uuidstr); + if (!vmname || !src || !size || !shmem || !size) + goto no_memory; + + if (!virt) { + VIR_WARN("Unexpected virt type %d while encoding audit message", + vm->def->virtType); + virt = "?"; + } + + VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, + "virt=%s resrc=shmem reason=%s %s uuid=%s size=%s %s %s", + virt, reason, vmname, uuidstr, size ?: "?", shmem, src); + + cleanup: + VIR_FREE(vmname); + VIR_FREE(src); + VIR_FREE(size); + VIR_FREE(shmem); + return; + + no_memory: + VIR_WARN("OOM while encoding audit message"); + goto cleanup; +} diff --git a/src/conf/domain_audit.h b/src/conf/domain_audit.h index 97dadca5aae7..8cb585dc7d96 100644 --- a/src/conf/domain_audit.h +++ b/src/conf/domain_audit.h @@ -129,6 +129,10 @@ void virDomainAuditRNG(virDomainObjPtr vm, const char *reason, bool success) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4); +void virDomainAuditShmem(virDomainObjPtr vm, + virDomainShmemDefPtr def, + const char *reason, bool success) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); #endif /* __VIR_DOMAIN_AUDIT_H__ */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a5fa30562f0c..1555f60ffda4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -146,6 +146,7 @@ virDomainAuditNetDevice; virDomainAuditRedirdev; virDomainAuditRNG; virDomainAuditSecurityLabel; +virDomainAuditShmem; virDomainAuditStart; virDomainAuditStop; virDomainAuditVcpu; -- 2.10.0

2 2

[libvirt] [PATCH] qemu: fix improper initialization of cgroupControllers bitmap
by Laine Stump 12 Sep '16

12 Sep '16

virQEMUDriverConfigNew() always initializes the bitmap in its cgroupControllers member to -1 (i.e. all 1's). Prior to commit a9331394, if qemu.conf had a line with "cgroup_controllers", cgroupControllers would get reset to 0 before going through a loop setting a bit for each named cgroup controller. commit a9331394 left out the "reset to 0" part, so cgroupControllers would always be -1; if you didn't want a controller included, there was no longer a way to make that happen. This was discovered by users who were using qemu commandline passthrough to use the "input-linux" method of directing keyboard/mouse input to a virtual machine: https://www.redhat.com/archives/vfio-users/2016-April/msg00105.html Here's the first report I found of the problem encountered after upgrading libvirt beyond v2.0.0: https://www.redhat.com/archives/vfio-users/2016-August/msg00053.html Thanks to sL1pKn07 SpinFlo <sl1pkn07(a)gmail.com> for bringing the problem up in IRC, and then taking the time to do a git bisect and find the patch that started the problem. --- src/qemu/qemu_conf.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index e7b2d8d..dad8334 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -613,15 +613,18 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, &controllers) < 0) goto cleanup; - for (i = 0; controllers != NULL && controllers[i] != NULL; i++) { - int ctl; - if ((ctl = virCgroupControllerTypeFromString(controllers[i])) < 0) { - virReportError(VIR_ERR_CONF_SYNTAX, - _("Unknown cgroup controller '%s'"), - controllers[i]); - goto cleanup; + if (controllers) { + cfg-> cgroupControllers = 0; + for (i = 0; controllers[i] != NULL; i++) { + int ctl; + if ((ctl = virCgroupControllerTypeFromString(controllers[i])) < 0) { + virReportError(VIR_ERR_CONF_SYNTAX, + _("Unknown cgroup controller '%s'"), + controllers[i]); + goto cleanup; + } + cfg->cgroupControllers |= (1 << ctl); } - cfg->cgroupControllers |= (1 << ctl); } if (virConfGetValueStringList(conf, "cgroup_device_acl", false, -- 2.7.4

2 1

[libvirt] [PATCH] qemu: avoid parameter named 'listen'
by Daniel P. Berrange 12 Sep '16

12 Sep '16

previous commit: commit 2c3223785c121eafbdd503f11549d7964461934f Author: John Ferlan <jferlan(a)redhat.com> Date: Mon Jun 13 12:30:34 2016 -0400 qemu: Add the ability to hotplug the TLS X.509 environment added a parameter "bool listen" in some methods. This unfortunately clashes with the listen() method, causing compile failures on certain platforms (RHEL-6 for example) Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a CI build fix src/qemu/qemu_command.c | 8 ++++---- src/qemu/qemu_command.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e0b0401..3a61863 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -692,7 +692,7 @@ qemuBuildRBDSecinfoURI(virBufferPtr buf, */ int qemuBuildTLSx509BackendProps(const char *tlspath, - bool listen, + bool isListen, bool verifypeer, virQEMUCapsPtr qemuCaps, virJSONValuePtr *propsret) @@ -714,7 +714,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath, if (virJSONValueObjectCreate(propsret, "s:dir", path, - "s:endpoint", (listen ? "server": "client"), + "s:endpoint", (isListen ? "server": "client"), "b:verify-peer", verifypeer, NULL) < 0) goto cleanup; @@ -743,7 +743,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath, static int qemuBuildTLSx509CommandLine(virCommandPtr cmd, const char *tlspath, - bool listen, + bool isListen, bool verifypeer, const char *inalias, virQEMUCapsPtr qemuCaps) @@ -753,7 +753,7 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd, virJSONValuePtr props = NULL; char *tmp = NULL; - if (qemuBuildTLSx509BackendProps(tlspath, listen, verifypeer, + if (qemuBuildTLSx509BackendProps(tlspath, isListen, verifypeer, qemuCaps, &props) < 0) return -1; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index b7c59bb..0c0b8f1 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -67,7 +67,7 @@ int qemuBuildSecretInfoProps(qemuDomainSecretInfoPtr secinfo, /* Generate the object properties for a tls-creds-x509 */ int qemuBuildTLSx509BackendProps(const char *tlspath, - bool listen, + bool isListen, bool verifypeer, virQEMUCapsPtr qemuCaps, virJSONValuePtr *propsret); -- 2.7.4

1 0