- Devel - libvirt List Archives

[libvirt] [PATCH v1 1/1] qemu/gluster: add option for tuning debug logging level
by Prasanna Kumar Kalever 16 Sep '16

16 Sep '16

This helps in selecting log level of the gluster gfapi, output to stderr. The option is 'qemu_gfapi_debuglevel', can be tuned by editing '/etc/libvirt/qemu.conf' Debug levels ranges 0-9, with 9 being the most verbose, and 0 representing no debugging output. The default is the same as it was before, which is a level of 4. The current logging levels defined in the gluster gfapi are: 0 - None 1 - Emergency 2 - Alert 3 - Critical 4 - Error 5 - Warning 6 - Notice 7 - Info 8 - Debug 9 - Trace Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever(a)redhat.com> -- v1: Initial post --- src/qemu/qemu.conf | 20 ++++++++++++++++++++ src/qemu/qemu_command.c | 12 +++++++++++- src/qemu/qemu_conf.c | 3 +++ src/qemu/qemu_conf.h | 1 + src/util/virstoragefile.h | 2 ++ 5 files changed, 37 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index e4c2aae..c6c8f3a 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -621,3 +621,23 @@ # rollover when a size limit is hit. # #stdio_handler = "logd" + +# Qemu gluster libgfapi log level, debug levels are 0-9, with 9 being the +# most verbose, and 0 representing no debugging output. +# +# The current logging levels defined in the gluster GFAPI are: +# +# 0 - None +# 1 - Emergency +# 2 - Alert +# 3 - Critical +# 4 - Error +# 5 - Warning +# 6 - Notice +# 7 - Info +# 8 - Debug +# 9 - Trace +# +# Defaults to 4 +# +# qemu_gfapi_debuglevel = 9 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3a61863..650eedc 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -859,6 +859,7 @@ qemuBuildGlusterDriveJSON(virStorageSourcePtr src) /* { driver:"gluster", * volume:"testvol", * path:"/a.img", + * debug:9, * server :[{type:"tcp", host:"1.2.3.4", port:24007}, * {type:"unix", socket:"/tmp/glusterd.socket"}, ...]} */ @@ -866,6 +867,7 @@ qemuBuildGlusterDriveJSON(virStorageSourcePtr src) "s:driver", protocol, "s:volume", src->volume, "s:path", src->path, + "u:debug", src->debug_level, "a:server", servers, NULL) < 0) virJSONValueFree(servers); @@ -2177,6 +2179,7 @@ qemuBuildDriveDevStr(const virDomainDef *def, static int qemuBuildDiskDriveCommandLine(virCommandPtr cmd, + virQEMUDriverConfigPtr cfg, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { @@ -2255,6 +2258,13 @@ qemuBuildDiskDriveCommandLine(virCommandPtr cmd, virCommandAddArg(cmd, "-drive"); + if (disk->src && + disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_GLUSTER) { + if(cfg->qemuGfapiDebugLevel) { + disk->src->debug_level = cfg->qemuGfapiDebugLevel; + } + } + if (!(optstr = qemuBuildDriveStr(disk, driveBoot, qemuCaps))) return -1; virCommandAddArg(cmd, optstr); @@ -9613,7 +9623,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, if (qemuBuildHubCommandLine(cmd, def, qemuCaps) < 0) goto error; - if (qemuBuildDiskDriveCommandLine(cmd, def, qemuCaps) < 0) + if (qemuBuildDiskDriveCommandLine(cmd, cfg, def, qemuCaps) < 0) goto error; if (qemuBuildFSDevCommandLine(cmd, def, qemuCaps) < 0) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index dad8334..d245cec 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -311,6 +311,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->seccompSandbox = -1; cfg->logTimestamp = true; + cfg->qemuGfapiDebugLevel = 4; cfg->stdioLogD = true; #ifdef DEFAULT_LOADER_NVRAM @@ -780,6 +781,8 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, goto cleanup; } } + if (virConfGetValueUInt(conf, "qemu_gfapi_debuglevel", &cfg->qemuGfapiDebugLevel) < 0) + goto cleanup; ret = 0; diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index d8232cc..fe70d9b 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -190,6 +190,7 @@ struct _virQEMUDriverConfig { virFirmwarePtr *firmwares; size_t nfirmwares; + unsigned int qemuGfapiDebugLevel; }; /* Main driver state */ diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 3d09468..9f3add3 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -237,6 +237,8 @@ struct _virStorageSource { virStorageAuthDefPtr auth; virStorageEncryptionPtr encryption; + unsigned int debug_level; + char *driverName; int format; /* virStorageFileFormat in domain backing chains, but * pool-specific enum for storage volumes */ -- 2.7.4

4 5

[libvirt] [PATCH v2 1/1] [WIP] qemu/gluster: add option for tuning debug logging level
by Prasanna Kumar Kalever 16 Sep '16

16 Sep '16

This helps in selecting log level of the gluster gfapi, output to stderr. The option is 'qemu_gfapi_debuglevel', can be tuned by editing '/etc/libvirt/qemu.conf' Debug levels ranges 0-9, with 9 being the most verbose, and 0 representing no debugging output. The default is the same as it was before, which is a level of 4. The current logging levels defined in the gluster gfapi are: 0 - None 1 - Emergency 2 - Alert 3 - Critical 4 - Error 5 - Warning 6 - Notice 7 - Info 8 - Debug 9 - Trace Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever(a)redhat.com> -- v2: Modify test cases and syntax check changes as suggested by Peter in v1. Rename qemu_gfapi_debuglevel to glusterfs_debug_level as per Daniel comments. Fix to make debug_level changes effects on URI along with JSON. TODO: * changes in libvirtd_qemu.aug Which I don't understand for now * comment on debug_level variable in storage source Not sure what is the right place * Capablities check v1: Initial post --- src/qemu/qemu.conf | 20 ++++++++++++++++++++ src/qemu/qemu_command.c | 14 +++++++++++++- src/qemu/qemu_conf.c | 3 +++ src/qemu/qemu_conf.h | 1 + src/util/virstoragefile.h | 2 ++ .../qemuargv2xml-disk-drive-network-gluster.args | 7 ++++--- .../qemuxml2argv-disk-drive-network-gluster.args | 12 ++++++------ 7 files changed, 49 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index e4c2aae..a6cdcf3 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -621,3 +621,23 @@ # rollover when a size limit is hit. # #stdio_handler = "logd" + +# Qemu gluster libgfapi log level, debug levels are 0-9, with 9 being the +# most verbose, and 0 representing no debugging output. +# +# The current logging levels defined in the gluster GFAPI are: +# +# 0 - None +# 1 - Emergency +# 2 - Alert +# 3 - Critical +# 4 - Error +# 5 - Warning +# 6 - Notice +# 7 - Info +# 8 - Debug +# 9 - Trace +# +# Defaults to 4 +# +# glusterfs_debug_level = 9 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3a61863..c333795 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1383,6 +1383,11 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk, } virBufferAddLit(buf, ","); + if (disk->src && + disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_GLUSTER) { + virBufferAsprintf(buf, "file.debug=%d,", disk->src->debug_level); + } + if (secinfo && secinfo->type == VIR_DOMAIN_SECRET_INFO_TYPE_AES) { /* NB: If libvirt starts using the more modern option based * syntax to build the command line (e.g., "-drive driver=rbd, @@ -2177,6 +2182,7 @@ qemuBuildDriveDevStr(const virDomainDef *def, static int qemuBuildDiskDriveCommandLine(virCommandPtr cmd, + virQEMUDriverConfigPtr cfg, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { @@ -2255,6 +2261,12 @@ qemuBuildDiskDriveCommandLine(virCommandPtr cmd, virCommandAddArg(cmd, "-drive"); + if (disk->src && + disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_GLUSTER) { + if (cfg->glusterfsDebugLevel) + disk->src->debug_level = cfg->glusterfsDebugLevel; + } + if (!(optstr = qemuBuildDriveStr(disk, driveBoot, qemuCaps))) return -1; virCommandAddArg(cmd, optstr); @@ -9613,7 +9625,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, if (qemuBuildHubCommandLine(cmd, def, qemuCaps) < 0) goto error; - if (qemuBuildDiskDriveCommandLine(cmd, def, qemuCaps) < 0) + if (qemuBuildDiskDriveCommandLine(cmd, cfg, def, qemuCaps) < 0) goto error; if (qemuBuildFSDevCommandLine(cmd, def, qemuCaps) < 0) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index dad8334..ff2b58e 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -311,6 +311,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->seccompSandbox = -1; cfg->logTimestamp = true; + cfg->glusterfsDebugLevel = 4; cfg->stdioLogD = true; #ifdef DEFAULT_LOADER_NVRAM @@ -780,6 +781,8 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, goto cleanup; } } + if (virConfGetValueUInt(conf, "glusterfs_debug_level", &cfg->glusterfsDebugLevel) < 0) + goto cleanup; ret = 0; diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index d8232cc..89d046d 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -190,6 +190,7 @@ struct _virQEMUDriverConfig { virFirmwarePtr *firmwares; size_t nfirmwares; + unsigned int glusterfsDebugLevel; }; /* Main driver state */ diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 3d09468..9f3add3 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -237,6 +237,8 @@ struct _virStorageSource { virStorageAuthDefPtr auth; virStorageEncryptionPtr encryption; + unsigned int debug_level; + char *driverName; int format; /* virStorageFileFormat in domain backing chains, but * pool-specific enum for storage volumes */ diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.args index f560308..deec7a7 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.args +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.args @@ -16,9 +16,10 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=gluster://example.org:6000/Volume1/Image,format=raw,if=virtio \ --drive 'file=gluster+unix:///Volume2/Image?socket=/path/to/sock,format=raw,\ -if=virtio' \ +-drive file=gluster://example.org:6000/Volume1/Image,file.debug=4,format=raw,\ +if=virtio \ +-drive 'file=gluster+unix:///Volume2/Image?socket=/path/to/sock,file.debug=4,\ +format=raw,if=virtio' \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args index 634ed75..cd5294e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args @@ -17,18 +17,18 @@ QEMU_AUDIO_DRV=none \ -no-acpi \ -boot c \ -usb \ --drive file=gluster://example.org:6000/Volume1/Image,format=raw,if=none,\ -id=drive-virtio-disk0 \ +-drive file=gluster://example.org:6000/Volume1/Image,file.debug=4,format=raw,\ +if=none,id=drive-virtio-disk0 \ -device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ id=virtio-disk0 \ --drive 'file=gluster+unix:///Volume2/Image?socket=/path/to/sock,format=raw,\ -if=none,id=drive-virtio-disk1' \ +-drive 'file=gluster+unix:///Volume2/Image?socket=/path/to/sock,file.debug=4,\ +format=raw,if=none,id=drive-virtio-disk1' \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ id=virtio-disk1 \ -drive file.driver=gluster,file.volume=Volume3,file.path=/Image.qcow2,\ file.server.0.type=tcp,file.server.0.host=example.org,file.server.0.port=6000,\ file.server.1.type=tcp,file.server.1.host=example.org,file.server.1.port=24007,\ -file.server.2.type=unix,file.server.2.socket=/path/to/sock,format=qcow2,\ -if=none,id=drive-virtio-disk2 \ +file.server.2.type=unix,file.server.2.socket=/path/to/sock,file.debug=4,\ +format=qcow2,if=none,id=drive-virtio-disk2 \ -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,\ id=virtio-disk2 -- 2.7.4

1 0

[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