- Devel - libvirt List Archives

[libvirt] [PATCH] tests: Fix storagepoolxml2xmltest execution for XML namespaces
by John Ferlan 31 Jan '19

31 Jan '19

Only run the pool-netfs-ns-mountopts if built WITH_STORAGE_FS and only run pool-rbd-ns-configopts if built with WITH_STORAGE_RBD since the namespace support is only enabled if the pool is enabled. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- tests/storagepoolxml2xmltest.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index 90d00a8d9e..acb15f3a2c 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -91,7 +91,9 @@ mymain(void) DO_TEST("pool-netfs-protocol-ver"); DO_TEST("pool-netfs-gluster"); DO_TEST("pool-netfs-cifs"); +#ifdef WITH_STORAGE_FS DO_TEST("pool-netfs-ns-mountopts"); +#endif DO_TEST("pool-scsi"); DO_TEST("pool-scsi-type-scsi-host"); DO_TEST("pool-scsi-type-fc-host"); @@ -106,7 +108,9 @@ mymain(void) DO_TEST("pool-zfs"); DO_TEST("pool-zfs-sourcedev"); DO_TEST("pool-rbd"); +#ifdef WITH_STORAGE_RBD DO_TEST("pool-rbd-ns-configopts"); +#endif DO_TEST("pool-vstorage"); DO_TEST("pool-iscsi-direct-auth"); DO_TEST("pool-iscsi-direct"); -- 2.20.1

2 1

[libvirt] [PATCH] storage: change custom namespace URIs to drop '/source' component
by Daniel P. Berrangé 31 Jan '19

31 Jan '19

The custom namespaces were originally registered against the storage pool source struct, but during review this was changed to the top level storage pool struct. The namespace URIs were not updated to match, so had a redundant '/source' component. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/formatstorage.html.in | 8 ++++---- docs/schemas/storagepool.rng | 4 ++-- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_rbd.c | 2 +- tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml | 2 +- tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml | 2 +- tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml | 2 +- tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index d19bc579a4..6ebd23549f 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -535,7 +535,7 @@ provide the XML namespace attribute syntax as follows: - xmlns:fs='http://libvirt.org/schemas/storagepool/source/fs/1.0' + xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0' @@ -551,7 +551,7 @@ The following XML snippet shows the syntax required in order to utilize for a netfs pool: <pre> -<pool type="netfs" xmlns:fs='http://libvirt.org/schemas/storagepool/source/fs/1.0'> +<pool type="netfs" xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0'> <name>nfsimages</name> ... <source> @@ -580,7 +580,7 @@ syntax as follows: - xmlns:rbd='http://libvirt.org/schemas/storagepool/source/rbd/1.0' + xmlns:rbd='http://libvirt.org/schemas/storagepool/rbd/1.0' @@ -598,7 +598,7 @@ The following XML snippet shows the syntax required in order to utilize <pre> -<pool type="rbd" xmlns:rbd='http://libvirt.org/schemas/storagepool/source/rbd/1.0'> +<pool type="rbd" xmlns:rbd='http://libvirt.org/schemas/storagepool/rbd/1.0'> <name>myrbdpool</name> ... <source> diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index e1944ff8e1..3907f70afe 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -697,7 +697,7 @@ --> <define name="fs_mount_opts"> - <element name="mount_opts" ns="http://libvirt.org/schemas/storagepool/source/fs/1.0"> + <element name="mount_opts" ns="http://libvirt.org/schemas/storagepool/fs/1.0"> <zeroOrMore> <element name="option"> <attribute name='name'> @@ -714,7 +714,7 @@ --> <define name="rbd_config_opts"> - <element name="config_opts" ns="http://libvirt.org/schemas/storagepool/source/rbd/1.0"> + <element name="config_opts" ns="http://libvirt.org/schemas/storagepool/rbd/1.0"> <zeroOrMore> <element name="option"> <attribute name='name'> diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 0ec99c60ed..ddb422d874 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -562,7 +562,7 @@ virStorageBackendFileSystemBuild(virStoragePoolObjPtr pool, #if WITH_STORAGE_FS -# define STORAGE_POOL_FS_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/source/fs/1.0" +# define STORAGE_POOL_FS_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/fs/1.0" /* Backend XML Namespace handling for fs or netfs specific mount options to * be added to the mount -o {options_list} command line that are not otherwise diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 2348f80146..cfbce1ad19 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -59,7 +59,7 @@ struct _virStoragePoolRBDConfigOptionsDef { char **values; }; -#define STORAGE_POOL_RBD_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/source/rbd/1.0" +#define STORAGE_POOL_RBD_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/rbd/1.0" static void virStoragePoolDefRBDNamespaceFree(void *nsdata) diff --git a/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml b/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml index 0434b16eb7..c2777ed29d 100644 --- a/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml +++ b/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml @@ -1,4 +1,4 @@ -<pool type='netfs' xmlns:fs='http://libvirt.org/schemas/storagepool/source/fs/1.0'> +<pool type='netfs' xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0'> <name>nfsimages</name> <uuid>7641d5a8-af11-f730-a34e-0a7dfcede71f</uuid> <capacity>0</capacity> diff --git a/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml b/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml index 6b62aa6f7e..a924fc103d 100644 --- a/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml +++ b/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml @@ -1,4 +1,4 @@ -<pool type='rbd' xmlns:rbd='http://libvirt.org/schemas/storagepool/source/rbd/1.0'> +<pool type='rbd' xmlns:rbd='http://libvirt.org/schemas/storagepool/rbd/1.0'> <name>ceph</name> <uuid>47c1faee-0207-e741-f5ae-d9b019b98fe2</uuid> <source> diff --git a/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml b/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml index 4bd164f220..fdc332087f 100644 --- a/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml +++ b/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml @@ -1,4 +1,4 @@ -<pool type='netfs' xmlns:fs='http://libvirt.org/schemas/storagepool/source/fs/1.0'> +<pool type='netfs' xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0'> <name>nfsimages</name> <uuid>7641d5a8-af11-f730-a34e-0a7dfcede71f</uuid> <capacity unit='bytes'>0</capacity> diff --git a/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml b/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml index 342a0ff74a..7fbcc3e0bc 100644 --- a/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml +++ b/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml @@ -1,4 +1,4 @@ -<pool type='rbd' xmlns:rbd='http://libvirt.org/schemas/storagepool/source/rbd/1.0'> +<pool type='rbd' xmlns:rbd='http://libvirt.org/schemas/storagepool/rbd/1.0'> <name>ceph</name> <uuid>47c1faee-0207-e741-f5ae-d9b019b98fe2</uuid> <capacity unit='bytes'>0</capacity> -- 2.20.1

2 1

[libvirt] [PATCH] qemu: blockjob: Don't report block job progress at 100% if job isn't ready
by Peter Krempa 31 Jan '19

31 Jan '19

Some clients take the advice to poll virDomainGetBlockJobInfo rather than wait for the ready event. In some cases qemu can get to 100% and still not reach the synchronised phase. Since we are dealing with a computer interacting, the error that the job can't be finalized yet is not handled very well by those specific implementations. Our docs now correctly state to use the event. We already munge the output for the start of the job, so we can do it even here. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 26edbf799f..cf500507da 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17477,6 +17477,14 @@ qemuBlockJobInfoTranslate(qemuMonitorBlockJobInfoPtr rawInfo, } } + /* If qemu reports that it's not ready yet don't make the job go to + * cur == end as some apps wrote code polling this instead of waiting for + * the ready event */ + if (rawInfo->ready == 0 && + info->cur == info->end && + info->cur > 0) + info->cur -= 1; + info->type = rawInfo->type; if (info->type == VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT && disk->mirrorJob == VIR_DOMAIN_BLOCK_JOB_TYPE_ACTIVE_COMMIT) -- 2.20.1

3 4

[libvirt] [PATCH 0/6] A few misc fixes from LGTM static analysis
by Daniel P. Berrangé 31 Jan '19

31 Jan '19

There is an online service call LGTM (Looks Good To Me) which does static analysis of open source projects and I happened to learn that they include coverage of libvirt https://lgtm.com/projects/g/libvirt/libvirt I looked at the alerts they reported. Currently no errors, 41 warnings and 90 recommendations (79 of which are FIXME comments :-). There's nothing particularly important they identify right now, but I felt like addressing a few of them anyway, hence this series. Daniel P. Berrangé (6): conf: remove pointless check on enum value remote: remove variable whose value is a constant storage: pass struct _virStorageBackendQemuImgInfo by reference qemu: pass virDomainDeviceInfo by reference hyperv: remove unused 'total' variable hyperv: use "is None" not "== None" for PEP-8 compliance src/conf/domain_conf.c | 20 ++++++++--------- src/hyperv/hyperv_wmi_generator.py | 3 +-- src/qemu/qemu_command.c | 4 ++-- src/qemu/qemu_domain.c | 10 ++++----- src/qemu/qemu_domain.h | 9 ++++---- src/qemu/qemu_domain_address.c | 2 +- src/remote/remote_daemon_dispatch.c | 8 ++----- src/storage/storage_util.c | 35 ++++++++++++++--------------- 8 files changed, 42 insertions(+), 49 deletions(-) -- 2.20.1

2 13

[libvirt] [PATCH v2 0/2] Enum formating changes
by Peter Krempa 31 Jan '19

31 Jan '19

v2 contains a tweak to the CSS to widen the page slightly and keep borders on narrow screen. Peter Krempa (2): docs: Format bit shift and hex notation for bitwise flag enums docs: css: Make docs page wider while still accomodating narrow screens docs/apibuild.py | 10 ++++++++++ docs/libvirt.css | 9 +++++++-- docs/newapi.xsl | 22 ++++++++++++++++++++-- 3 files changed, 37 insertions(+), 4 deletions(-) -- 2.20.1

3 7

[libvirt] [PATCH 0/7] Add support to list Storage Driver backend capabilities
by John Ferlan 30 Jan '19

30 Jan '19

Although I suppose this could have been an RFC - I just went with a v1. I would think at least the first 4 patches are non controversial. Beyond that it depends on what is "expected" as output for the capabilities output for the storage driver. John Ferlan (7): conf: Extract host XML formatting from virCapabilitiesFormatXML conf: Alter virCapabilitiesFormatHostXML to take virCapsHostPtr conf: Extract guest XML formatting from virCapabilitiesFormatXML conf: Alter virCapabilitiesFormatGuestXML to take virCapsGuestPtr conf: Introduce storage pool functions into capabilities storage: Process storage pool capabilities storage: Add storage backend pool/vol API's to capability output src/conf/capabilities.c | 449 ++++++++++++++++++++++------------ src/conf/capabilities.h | 19 ++ src/conf/virstorageobj.h | 4 + src/libvirt_private.syms | 1 + src/storage/storage_backend.c | 65 +++++ src/storage/storage_backend.h | 3 + src/storage/storage_driver.c | 17 ++ 7 files changed, 400 insertions(+), 158 deletions(-) -- 2.20.1

4 19

[libvirt] list vsock cids allocated to VMs?
by Brian Kroth 30 Jan '19

30 Jan '19

Other than dumping and parsing the config for all running VMs, is there a way to get the current map of vsock cids allocated to their VM domains? Thanks, Brian

2 3

[libvirt] [PATCH 00/11] qemu: Labelling cleanup and fix labelling for block copy pivot (blockdev-add saga)
by Peter Krempa 30 Jan '19

30 Jan '19

Refactor some labelling code and then move out the backing chain labelling from the block copy pivot operation into starting of the job. Peter Krempa (11): qemu: domain: Clarify temp variable scope in qemuDomainDetermineDiskChain qemu: domain: Allow overriding disk source in qemuDomainDetermineDiskChain qemu: cgroup: Change qemu[Setup|Teardown]DiskCgroup to take virStorageSource security: Remove security driver internals for disk labelling qemu: security: Add 'backingChain' flag to qemuSecurity[Set|Restore]ImageLabel qemu: security: Replace and remove qemuSecurity[Set|Restore]DiskLabel security: Remove disk labelling functions and fix callers qemu: driver: Remove disk source munging in qemuDomainBlockPivot locking: Use virDomainLockImage[Attach|Detach] instead of *Disk qemu: hotplug: Refactor qemuHotplugPrepareDiskAccess to work on virStorageSource qemu: Label backing chain of user-provided target of blockCopy when starting the job src/libvirt_private.syms | 4 -- src/libxl/libxl_driver.c | 14 +++--- src/locking/domain_lock.c | 17 ------- src/locking/domain_lock.h | 8 ---- src/lxc/lxc_controller.c | 3 +- src/lxc/lxc_driver.c | 4 +- src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_cgroup.c | 14 +++--- src/qemu/qemu_cgroup.h | 8 ++-- src/qemu/qemu_domain.c | 60 +++++++++++++++--------- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 53 +++++++++------------ src/qemu/qemu_hotplug.c | 79 +++++++++++++------------------- src/qemu/qemu_process.c | 26 ++++++++++- src/qemu/qemu_security.c | 74 +++--------------------------- src/qemu/qemu_security.h | 14 ++---- src/security/security_apparmor.c | 24 ++-------- src/security/security_dac.c | 40 +++++----------- src/security/security_driver.h | 15 ++---- src/security/security_manager.c | 70 ++++------------------------ src/security/security_manager.h | 12 ++--- src/security/security_nop.c | 25 ++-------- src/security/security_selinux.c | 42 +++++------------ src/security/security_stack.c | 50 +++----------------- 24 files changed, 202 insertions(+), 457 deletions(-) -- 2.20.1

3 26

[libvirt] [PATCH 0/2] Fix a couple build issues
by John Ferlan 30 Jan '19

30 Jan '19

Recent adjustment to add XML namespace processing for storage pool XML processing broke the mingw* builds: CC storagevolxml2xmltest.o gmake[2]: *** No rule to make target '../src/libvirt_driver_storage_impl.la', needed by 'storagepoolxml2xmltest.exe'. Stop. gmake[2]: *** Waiting for unfinished jobs.... CC storagepoolxml2xmltest.o So looking at things again, I see that other options that include ../src/libvirt_driver_storage_impl.la would be inside a WITH_STORAGE conditional. So move the build to that and alter the ! WITH_STORAGE as well. Seeing this, I also see that I didn't add storagepoolxml2argv.c to the ! WITH_STORAGE either, so that's the second patch. Build works for me, but I have no idea if it'll work for mingw* - I am assuming so based on other examples. Another alternative is to not test the XML namespace processing for storagepoolxml2xml - although given that it seems mingw* doesn't build/support storage anyway, perhaps not the correct alternative. John Ferlan (2): tests: Fix build issue with storagevolxml2xmltest tests: Add storagepoolxml2argvtest source to EXTRA_DIST tests/Makefile.am | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) -- 2.20.1

2 3

[libvirt] [PATCH] tests: Build and run storagevolxml2xmltest iff WITH_STORAGE
by Michal Privoznik 30 Jan '19

30 Jan '19

Commit 7a227688a83880 assumes that libvirt_driver_storage_impl.la is always available. Well it is not. Users have option to turn the storage driver off in which case it isn't build and linking the test with the library then fails. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- And alternative approach might be to move only those test cases that require WITH_STORAGE under #ifdef and link the library again only if WITH_STORAGE is enabled. But this is harder to do properly - I mean for future test cases it will be hard to decide whether to put them inside or outside of WITH_STORAGE section. tests/Makefile.am | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index ab4c716529..c034fe0bf3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -368,6 +368,7 @@ if WITH_STORAGE test_programs += storagevolxml2argvtest test_programs += storagepoolxml2argvtest test_programs += virstorageutiltest +test_programs += storagepoolxml2xmltest endif WITH_STORAGE if WITH_STORAGE_FS @@ -384,7 +385,7 @@ test_programs += nsstest nssguesttest test_libraries += nssmock.la endif WITH_NSS -test_programs += storagevolxml2xmltest storagepoolxml2xmltest +test_programs += storagevolxml2xmltest test_programs += nodedevxml2xmltest @@ -924,9 +925,17 @@ storagepoolxml2argvtest_LDADD = \ ../src/libvirt_util.la \ $(LDADDS) +storagepoolxml2xmltest_SOURCES = \ + storagepoolxml2xmltest.c \ + testutils.c testutils.h +storagepoolxml2xmltest_LDADD = $(LDADDS) \ + ../src/libvirt_driver_storage_impl.la \ + $(GNULIB_LIBS) + else ! WITH_STORAGE EXTRA_DIST += storagevolxml2argvtest.c EXTRA_DIST += virstorageutiltest.c +EXTRA_DIST += storagepoolxml2xmltest.c endif ! WITH_STORAGE storagevolxml2xmltest_SOURCES = \ @@ -934,13 +943,6 @@ storagevolxml2xmltest_SOURCES = \ testutils.c testutils.h storagevolxml2xmltest_LDADD = $(LDADDS) -storagepoolxml2xmltest_SOURCES = \ - storagepoolxml2xmltest.c \ - testutils.c testutils.h -storagepoolxml2xmltest_LDADD = $(LDADDS) \ - ../src/libvirt_driver_storage_impl.la \ - $(GNULIB_LIBS) - nodedevxml2xmltest_SOURCES = \ nodedevxml2xmltest.c \ testutils.c testutils.h -- 2.19.2

2 1