- Devel - libvirt List Archives

[libvirt] [PATCH v10 00/10] incremental backup
by Eric Blake 21 Aug '19

21 Aug '19

This is not the final version of incremental backup - before we can accept this series, it needs a lot of polish to pick up cleanups made possible by Peter's blockdev work, and we need to settle on our Job API addition (so that the return value of BackupBegin and the parameter to BackupGetXMLDesc and BackupEnd use the same representation, whether that be UUID or something else). I also know that Peter left quite a few comments against v9, many of which I have not actually attempted to address yet. But it rebases things on top of the checkpoint work that landed in the 5.6 release, and is still able to perform the pull-mode incremental backups that I demonstrated at KVM Forum 2018. There's still probably crashes in portions of the code that are not exercised by my demo, and I know that we really want to use qemu's blockdev image creation instead of calling out to qemu-img create for preparing the qcow2 scratch image in pull mode. The main point of this posting is to allow further testing before the actual feature lands in an upstream libvirt release. I've pushed a tag backup-v10 to both my libvirt.git and libvirt-python.git repos to match: https://repo.or.cz/libvirt/ericb.git/shortlog/refs/tags/backup-v10 https://repo.or.cz/libvirt-python/ericb.git/shortlog/refs/tags/backup-v10 001/10:[0033] [FC] 'backup: qemu: Implement VIR_DOMAIN_CHECKPOINT_XML_SIZE flag' 002/10:[0002] [FC] 'backup: Document new XML for backups' 003/10:[0010] [FC] 'backup: Introduce virDomainBackup APIs' 004/10:[0031] [FC] 'backup: Implement backup APIs for remote driver' 005/10:[----] [--] 'backup: Parse and output backup XML' 006/10:[----] [--] 'backup: Implement virsh support for backup' 007/10:[0025] [FC] 'backup: qemu: Implement framework for backup job APIs' 008/10:[0002] [FC] 'backup: Wire up qemu full pull backup commands over QMP' 009/10:[----] [--] 'backup: qemu: Wire up qemu full push backup commands over QMP' 010/10:[0017] [FC] 'backup: Implement qemu incremental pull backup' Eric Blake (10): backup: qemu: Implement VIR_DOMAIN_CHECKPOINT_XML_SIZE flag backup: Document new XML for backups backup: Introduce virDomainBackup APIs backup: Implement backup APIs for remote driver backup: Parse and output backup XML backup: Implement virsh support for backup backup: qemu: Implement framework for backup job APIs backup: Wire up qemu full pull backup commands over QMP backup: qemu: Wire up qemu full push backup commands over QMP backup: Implement qemu incremental pull backup include/libvirt/libvirt-domain.h | 41 +- src/conf/backup_conf.h | 94 +++ src/conf/virconftypes.h | 3 + src/driver-hypervisor.h | 14 + src/qemu/qemu_blockjob.h | 1 + src/qemu/qemu_domain.h | 4 + src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.h | 4 + docs/docs.html.in | 3 +- docs/format.html.in | 1 + docs/formatbackup.html.in | 184 +++++ docs/formatcheckpoint.html.in | 12 +- docs/index.html.in | 3 +- docs/schemas/domainbackup.rng | 219 ++++++ examples/c/misc/event-test.c | 3 + libvirt.spec.in | 1 + mingw-libvirt.spec.in | 2 + src/conf/Makefile.inc.am | 2 + src/conf/backup_conf.c | 546 +++++++++++++++ src/conf/domain_conf.c | 2 +- src/libvirt-domain-checkpoint.c | 7 +- src/libvirt-domain.c | 219 ++++++ src/libvirt_private.syms | 8 +- src/libvirt_public.syms | 7 + src/qemu/qemu_blockjob.c | 3 + src/qemu/qemu_domain.c | 35 +- src/qemu/qemu_driver.c | 684 ++++++++++++++++++- src/qemu/qemu_monitor.c | 11 + src/qemu/qemu_monitor_json.c | 84 +++ src/qemu/qemu_process.c | 8 + src/remote/remote_driver.c | 3 + src/remote/remote_protocol.x | 54 +- src/remote_protocol-structs | 28 + tests/Makefile.am | 2 + tests/domainbackupxml2xmlin/backup-pull.xml | 9 + tests/domainbackupxml2xmlin/backup-push.xml | 9 + tests/domainbackupxml2xmlin/empty.xml | 1 + tests/domainbackupxml2xmlout/backup-pull.xml | 9 + tests/domainbackupxml2xmlout/backup-push.xml | 9 + tests/domainbackupxml2xmlout/empty.xml | 7 + tests/virschematest.c | 2 + tools/virsh-domain.c | 253 ++++++- tools/virsh.pod | 49 ++ 43 files changed, 2623 insertions(+), 21 deletions(-) create mode 100644 src/conf/backup_conf.h create mode 100644 docs/formatbackup.html.in create mode 100644 docs/schemas/domainbackup.rng create mode 100644 src/conf/backup_conf.c create mode 100644 tests/domainbackupxml2xmlin/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlin/backup-push.xml create mode 100644 tests/domainbackupxml2xmlin/empty.xml create mode 100644 tests/domainbackupxml2xmlout/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlout/backup-push.xml create mode 100644 tests/domainbackupxml2xmlout/empty.xml -- 2.21.0

1 10

[libvirt] [PATCH 00/11] Fix 10 tests on macOS
by Roman Bolshakov 21 Aug '19

21 Aug '19

Hi! This patch series attempts to reduce the number of failing tests on macOS. The fixes involve some funk with macOS dynamic and static linkers, dyld and ld64, respectively. As result, instead of 15 failing tests we get only 5. The tests have been fixed: qemublocktest qemumonitorjsontest viriscsitest virmacmaptest virnetserverclienttest vircryptotest qemufirmwaretest domaincapstest commandtest sockettest The tests are still failing: qemumemlocktest storagepoolxml2argvtest qemuxml2xmltest qemusecuritytest qemuxml2argvtest qemucapsprobe doesn't yet works but I started working on the fix. The failing tests depend on virpcimock that is guarded by ifdefs so no functions are injected and the mock is no-op on macOS. How can we fix the tests that rely on the mock? Should we select only specific tests to run on macOS or we should make virpci mock cross-platform? Skipping them entirely is not an option IMO as I think qemu driver can be used on macOS with qemu/hvf/haxm domains and the tests are helpful for the domains. And as soon as we get working tests and qemucapsprobe I'd want to resend hvf patchset. Best regards, Roman Roman Bolshakov (11): tests: Don't test octal localhost IP in sockettest on macOS tests: Avoid IPv4-translated IPv6 address in sockettest tests: Preload mocks with DYLD_INSERT_LIBRARIES on macOS tests: Add lib- prefix to all mocks tests: Remove -module flag for mocks tests: Drop /private CWD prefix in commandhelper build: Use flat namespace for libvirt on macOS tests: Lookup extended stat/lstat in mocks tests: Use flat namespace on macOS tests: Avoid gnulib replacements in mocks tests: Make references to global symbols indirect in test drivers configure.ac | 1 + src/Makefile.am | 9 +- tests/Makefile.am | 199 +++++++++++++++++---------------- tests/bhyveargv2xmltest.c | 2 +- tests/bhyvexml2argvtest.c | 2 +- tests/bhyvexml2xmltest.c | 2 +- tests/commandhelper.c | 9 ++ tests/domaincapstest.c | 6 +- tests/fchosttest.c | 2 +- tests/libxlxml2domconfigtest.c | 2 +- tests/nsstest.c | 2 +- tests/qemucaps2xmltest.c | 2 +- tests/qemucapsprobe.c | 2 +- tests/qemumemlocktest.c | 3 +- tests/qemumonitorjsontest.c | 2 +- tests/qemuxml2argvtest.c | 8 +- tests/qemuxml2xmltest.c | 6 +- tests/sockettest.c | 6 +- tests/testutils.c | 4 +- tests/testutils.h | 18 ++- tests/vircaps2xmltest.c | 2 +- tests/vircgrouptest.c | 2 +- tests/vircryptotest.c | 2 +- tests/virfilecachetest.c | 2 +- tests/virfiletest.c | 2 +- tests/virfilewrapper.c | 5 + tests/virfirewalltest.c | 2 +- tests/virhostcputest.c | 2 +- tests/virhostdevtest.c | 2 +- tests/viriscsitest.c | 3 +- tests/virmacmaptest.c | 2 +- tests/virmock.h | 10 ++ tests/virmockstathelpers.c | 18 +++ tests/virnetdaemontest.c | 2 +- tests/virnetdevbandwidthtest.c | 2 +- tests/virnetdevtest.c | 2 +- tests/virnetserverclienttest.c | 2 +- tests/virnettlscontexttest.c | 2 +- tests/virnettlssessiontest.c | 2 +- tests/virpcitest.c | 2 +- tests/virpolkittest.c | 2 +- tests/virportallocatortest.c | 2 +- tests/virsystemdtest.c | 2 +- tests/virusbtest.c | 2 +- 44 files changed, 214 insertions(+), 149 deletions(-) -- 2.22.0

2 24

[libvirt] [PATCH 00/10] ci: Several fixes and improvements
by Andrea Bolognani 21 Aug '19

21 Aug '19

See the individual commits for details, but the gist of it is that after this series it's possible for users to hook into the build process and customize it according to their needs; on top of that, the whole thing is made more maintainable in the process. Andrea Bolognani (10): ci: Fix /etc/sub{u,g}id parsing ci: Drop $(CI_SUBMODULES) ci: Move everything to a separate directory ci: Create user's home directory in the container ci: Move source directory under $(CI_USER_HOME) ci: Introduce $(CI_BUILD_SCRIPT) ci: Generalize running commands inside the container ci: Introduce $(CI_PREPARE_SCRIPT) ci: Run $(CI_PREPARE_SCRIPT) as root ci: Stop using --workdir .gitignore | 2 +- .travis.yml | 8 +-- Makefile.am | 6 +- Makefile.ci => ci/Makefile | 109 +++++++++++++++++++------------------ ci/build.sh | 40 ++++++++++++++ ci/prepare.sh | 13 +++++ 6 files changed, 118 insertions(+), 60 deletions(-) rename Makefile.ci => ci/Makefile (79%) create mode 100644 ci/build.sh create mode 100644 ci/prepare.sh -- 2.21.0

2 12

[libvirt] [PATCH v2 0/9] More consistent virDomainUndefine flag handling
by Eric Blake 21 Aug '19

21 Aug '19

Since v1: - use syntax-check rather than dynamic runtime check for API mismatch - fix more stragglers with mismatched API, found by the syntax-check - fix a bug in bhyve no-op flag handling - expand no-op flag handling to other affected drivers Eric Blake (9): vbox: Add various vir*Flags API xenapi: Add various vir*Flags API maint: Enhance check-driverimpls.pl to check for API pairing bhyve: Ignore no-op flag during virDomainUndefine libxl: Ignore no-op flag during virDomainUndefine lxc: Ignore no-op flag during virDomainUndefine openvz: Ignore no-op flag during virDomainUndefine vmware: Ignore no-op flag during virDomainUndefine xenapi: Ignore no-op flag during virDomainUndefine src/bhyve/bhyve_driver.c | 6 +++++- src/check-driverimpls.pl | 33 +++++++++++++++++++++++++++++++-- src/libxl/libxl_driver.c | 4 +++- src/lxc/lxc_driver.c | 5 ++++- src/openvz/openvz_driver.c | 5 ++++- src/vbox/vbox_common.c | 24 ++++++++++++++++++++++-- src/vmware/vmware_driver.c | 5 ++++- src/xenapi/xenapi_driver.c | 28 ++++++++++++++++++++++++---- 8 files changed, 97 insertions(+), 13 deletions(-) -- 2.20.1

2 23

[libvirt] [PATCH 0/5] security: Deal with stale XATTRs
by Michal Privoznik 21 Aug '19

21 Aug '19

There are some ways users can end up in stale XATTRs. One is sudden power loss, the other is stopping libvirt whilst some domains are running and then rebooting the host. And I believe users will find other creative ways to shut down domains without qemuProcessStop() being called. When that happens our XATTRs will be left behind and not reflect the real state of things (e.g. refcounter). To resolve this, record a timestamp within XATTRs too so that host reboots can be detected. Michal Prívozník (5): virUUIDFormat: s/VIR_UUID_RAW_LEN/VIR_UUID_BUFLEN/ in comment security_util: Use more VIR_AUTOFREE() security_util: Document virSecurityMoveRememberedLabel util: Introduce virhostuptime security_util: Remove stale XATTRs src/libvirt_private.syms | 4 + src/security/security_util.c | 293 +++++++++++++++++++++++++++++------ src/util/Makefile.inc.am | 2 + src/util/virhostuptime.c | 61 ++++++++ src/util/virhostuptime.h | 27 ++++ src/util/viruuid.c | 2 +- tests/qemusecuritymock.c | 12 ++ 7 files changed, 353 insertions(+), 48 deletions(-) create mode 100644 src/util/virhostuptime.c create mode 100644 src/util/virhostuptime.h -- 2.21.0

3 11

[libvirt] [PATCH] virt-aa-helper: Drop unnecessary AppArmor rule
by Andrea Bolognani 21 Aug '19

21 Aug '19

Apparently /proc/self is automatically converted to /proc/@{pid} before checking rules, which makes spelling it out explicitly redundant. Suggested-by: Jamie Strandboge <jamie(a)canonical.com> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/security/apparmor/usr.lib.libvirt.virt-aa-helper | 1 - 1 file changed, 1 deletion(-) diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper index 64772f0756..11e9c039ca 100644 --- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper +++ b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper @@ -18,7 +18,6 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper { @{PROC}/filesystems r, # Used when internally running another command (namely apparmor_parser) - @{PROC}/self/fd/ r, @{PROC}/@{pid}/fd/ r, /etc/libnl-3/classid r, -- 2.21.0

2 1

[libvirt] [PATCH v3 0/2] snapshot: Store both config and live XML in the snapshot domain
by Maxiwell S. Garcia 21 Aug '19

21 Aug '19

This patchset store both config and live XML in the snapshot XML. To avoid nest 'config' XML one level deeper ('inactive/domain'), it was necessary change the virDomainDefFormatInternal() to use 'domain' or 'inactiveDomain' in the root node. Maxiwell S. Garcia (2): qemu: formatting XML from domain def choosing the root name snapshot: Store both config and live XML in the snapshot domain src/conf/domain_conf.c | 13 ++++++++++--- src/conf/domain_conf.h | 1 + src/conf/moment_conf.c | 1 + src/conf/moment_conf.h | 11 +++++++++++ src/conf/snapshot_conf.c | 23 +++++++++++++++++++++-- src/qemu/qemu_driver.c | 37 ++++++++++++++++++++++++++++--------- 6 files changed, 72 insertions(+), 14 deletions(-) -- 2.20.1

3 5

[libvirt] [PATCH] virDomainGetAutostart takes a pointer that it writes the output value to
by Sage Imel 21 Aug '19

21 Aug '19

The current version of get_autostart seg faults. This patch correctly passes a pointer to an int to virDomainGetAutostart and returns a result based on the value of that int Signed-off-by: sage Imel <sage(a)cat.pdx.edu> --- src/domain.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/domain.rs b/src/domain.rs index 11ecb3c..acb9e6e 100644 --- a/src/domain.rs +++ b/src/domain.rs @@ -136,7 +136,7 @@ extern "C" { fn virDomainGetHostname(ptr: sys::virDomainPtr, flags: libc::c_uint) -> *mut libc::c_char; fn virDomainGetUUIDString(ptr: sys::virDomainPtr, uuid: *mut libc::c_char) -> libc::c_int; fn virDomainGetXMLDesc(ptr: sys::virDomainPtr, flags: libc::c_uint) -> *mut libc::c_char; - fn virDomainGetAutostart(ptr: sys::virDomainPtr) -> libc::c_int; + fn virDomainGetAutostart(ptr: sys::virDomainPtr, autostart: *mut libc::c_int) -> libc::c_int; fn virDomainSetAutostart(ptr: sys::virDomainPtr, autostart: libc::c_uint) -> libc::c_int; fn virDomainGetID(ptr: sys::virDomainPtr) -> libc::c_uint; fn virDomainSetMaxMemory(ptr: sys::virDomainPtr, memory: libc::c_ulong) -> libc::c_int; @@ -1036,11 +1036,12 @@ impl Domain { pub fn get_autostart(&self) -> Result<bool, Error> { unsafe { - let ret = virDomainGetAutostart(self.as_ptr()); + let mut autostart: libc::c_int = 0; + let ret = virDomainGetAutostart(self.as_ptr(), &mut autostart); if ret == -1 { return Err(Error::new()); } - return Ok(ret == 1); + return Ok(autostart == 1); } } -- 2.17.1

2 3

[libvirt] [PATCH] virDomainGetAutostart takes a pointer that it writes the output value to
by Sage Imel 21 Aug '19

21 Aug '19

--- src/domain.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/domain.rs b/src/domain.rs index 11ecb3c..acb9e6e 100644 --- a/src/domain.rs +++ b/src/domain.rs @@ -136,7 +136,7 @@ extern "C" { fn virDomainGetHostname(ptr: sys::virDomainPtr, flags: libc::c_uint) -> *mut libc::c_char; fn virDomainGetUUIDString(ptr: sys::virDomainPtr, uuid: *mut libc::c_char) -> libc::c_int; fn virDomainGetXMLDesc(ptr: sys::virDomainPtr, flags: libc::c_uint) -> *mut libc::c_char; - fn virDomainGetAutostart(ptr: sys::virDomainPtr) -> libc::c_int; + fn virDomainGetAutostart(ptr: sys::virDomainPtr, autostart: *mut libc::c_int) -> libc::c_int; fn virDomainSetAutostart(ptr: sys::virDomainPtr, autostart: libc::c_uint) -> libc::c_int; fn virDomainGetID(ptr: sys::virDomainPtr) -> libc::c_uint; fn virDomainSetMaxMemory(ptr: sys::virDomainPtr, memory: libc::c_ulong) -> libc::c_int; @@ -1036,11 +1036,12 @@ impl Domain { pub fn get_autostart(&self) -> Result<bool, Error> { unsafe { - let ret = virDomainGetAutostart(self.as_ptr()); + let mut autostart: libc::c_int = 0; + let ret = virDomainGetAutostart(self.as_ptr(), &mut autostart); if ret == -1 { return Err(Error::new()); } - return Ok(ret == 1); + return Ok(autostart == 1); } } -- 2.17.1

3 3

[libvirt] [PATCH] xml: namespaces: use uri instead of href
by Ján Tomko 21 Aug '19

21 Aug '19

Store the namespace URI as const char*, instead of in a function. Suggested-by: Jiri Denemark <jdenemar(a)redhat.com> Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/bhyve/bhyve_domain.c | 11 ++--------- src/lxc/lxc_domain.c | 9 +-------- src/network/bridge_driver.c | 11 +---------- src/qemu/qemu_domain.c | 10 +--------- src/storage/storage_backend_fs.c | 9 +-------- src/storage/storage_backend_rbd.c | 11 +---------- src/test/test_driver.c | 11 ++--------- src/util/virxml.c | 6 +++--- src/util/virxml.h | 2 +- src/vmx/vmx.c | 8 +------- 10 files changed, 14 insertions(+), 74 deletions(-) diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index ea4bd54969..ed281d7c68 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -31,8 +31,6 @@ VIR_LOG_INIT("bhyve.bhyve_domain"); -#define BHYVE_NAMESPACE_HREF "http://libvirt.org/schemas/domain/bhyve/1.0" - static void * bhyveDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED) { @@ -258,16 +256,11 @@ bhyveDomainDefNamespaceFormatXML(virBufferPtr buf, return 0; } -static const char * -bhyveDomainDefNamespaceHref(void) -{ - return BHYVE_NAMESPACE_HREF; -} - virXMLNamespace virBhyveDriverDomainXMLNamespace = { .parse = bhyveDomainDefNamespaceParse, .free = bhyveDomainDefNamespaceFree, .format = bhyveDomainDefNamespaceFormatXML, .prefix = "bhyve", - .href = bhyveDomainDefNamespaceHref, + .uri = "http://libvirt.org/schemas/domain/bhyve/1.0", + }; diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index 00362e4c7f..c4360f25f6 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -34,7 +34,6 @@ #include "virinitctl.h" #define VIR_FROM_THIS VIR_FROM_LXC -#define LXC_NAMESPACE_HREF "http://libvirt.org/schemas/domain/lxc/1.0" VIR_ENUM_IMPL(virLXCDomainJob, LXC_JOB_LAST, @@ -302,19 +301,13 @@ lxcDomainDefNamespaceFormatXML(virBufferPtr buf, return 0; } -static const char * -lxcDomainDefNamespaceHref(void) -{ - return LXC_NAMESPACE_HREF; -} - virXMLNamespace virLXCDriverDomainXMLNamespace = { .parse = lxcDomainDefNamespaceParse, .free = lxcDomainDefNamespaceFree, .format = lxcDomainDefNamespaceFormatXML, .prefix = "lxc", - .href = lxcDomainDefNamespaceHref, + .uri = "http://libvirt.org/schemas/domain/lxc/1.0", }; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index dd4f111cc0..86e2035b85 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -83,8 +83,6 @@ VIR_LOG_INIT("network.bridge_driver"); -#define DNSMASQ_NAMESPACE_HREF "http://libvirt.org/schemas/network/dnsmasq/1.0" - static virNetworkDriverStatePtr network_driver; @@ -231,19 +229,12 @@ networkDnsmasqDefNamespaceFormatXML(virBufferPtr buf, } -static const char * -networkDnsmasqDefNamespaceHref(void) -{ - return DNSMASQ_NAMESPACE_HREF; -} - - virXMLNamespace networkDnsmasqXMLNamespace = { .parse = networkDnsmasqDefNamespaceParse, .free = networkDnsmasqDefNamespaceFree, .format = networkDnsmasqDefNamespaceFormatXML, .prefix = "dnsmasq", - .href = networkDnsmasqDefNamespaceHref, + .uri = "http://libvirt.org/schemas/network/dnsmasq/1.0", }; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6d770d3c13..8a3755c6fe 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -81,8 +81,6 @@ VIR_LOG_INIT("qemu.qemu_domain"); -#define QEMU_NAMESPACE_HREF "http://libvirt.org/schemas/domain/qemu/1.0" - VIR_ENUM_IMPL(qemuDomainJob, QEMU_JOB_LAST, "none", @@ -3713,19 +3711,13 @@ qemuDomainDefNamespaceFormatXML(virBufferPtr buf, return 0; } -static const char * -qemuDomainDefNamespaceHref(void) -{ - return QEMU_NAMESPACE_HREF; -} - virXMLNamespace virQEMUDriverDomainXMLNamespace = { .parse = qemuDomainDefNamespaceParse, .free = qemuDomainDefNamespaceFree, .format = qemuDomainDefNamespaceFormatXML, .prefix = "qemu", - .href = qemuDomainDefNamespaceHref, + .uri = "http://libvirt.org/schemas/domain/qemu/1.0", }; diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index d947beac2c..d793ac19e8 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -528,7 +528,6 @@ virStorageBackendFileSystemBuild(virStoragePoolObjPtr pool, #if WITH_STORAGE_FS -# 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 @@ -624,12 +623,6 @@ virStoragePoolDefFSNamespaceFormatXML(virBufferPtr buf, } -static const char * -virStoragePoolDefFSNamespaceHref(void) -{ - return STORAGE_POOL_FS_NAMESPACE_HREF; -} - #endif /* WITH_STORAGE_FS */ @@ -697,7 +690,7 @@ static virXMLNamespace virStoragePoolFSXMLNamespace = { .free = virStoragePoolDefFSNamespaceFree, .format = virStoragePoolDefFSNamespaceFormatXML, .prefix = "fs", - .href = virStoragePoolDefFSNamespaceHref, + .uri = "http://libvirt.org/schemas/storagepool/fs/1.0", }; #endif /* WITH_STORAGE_FS */ diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 22caa189d7..c4781debd8 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -58,8 +58,6 @@ struct _virStoragePoolRBDConfigOptionsDef { char **values; }; -#define STORAGE_POOL_RBD_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/rbd/1.0" - static void virStoragePoolDefRBDNamespaceFree(void *nsdata) { @@ -166,13 +164,6 @@ virStoragePoolDefRBDNamespaceFormatXML(virBufferPtr buf, } -static const char * -virStoragePoolDefRBDNamespaceHref(void) -{ - return STORAGE_POOL_RBD_NAMESPACE_HREF; -} - - static int virStorageBackendRBDRADOSConfSet(rados_t cluster, const char *option, @@ -1538,7 +1529,7 @@ static virXMLNamespace virStoragePoolRBDXMLNamespace = { .free = virStoragePoolDefRBDNamespaceFree, .format = virStoragePoolDefRBDNamespaceFormatXML, .prefix = "rbd", - .href = virStoragePoolDefRBDNamespaceHref, + .uri = "http://libvirt.org/schemas/storagepool/rbd/1.0", }; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 57d54c05b3..6a694d8b1f 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -167,8 +167,6 @@ testDriverDispose(void *obj) virObjectUnref(driver->eventState); } -#define TEST_NAMESPACE_HREF "http://libvirt.org/schemas/domain/test/1.0" - typedef struct _testDomainNamespaceDef testDomainNamespaceDef; typedef testDomainNamespaceDef *testDomainNamespaceDefPtr; struct _testDomainNamespaceDef { @@ -180,12 +178,6 @@ struct _testDomainNamespaceDef { xmlNodePtr *snap_nodes; }; -static const char* -testDomainDefNamespaceHref(void) -{ - return TEST_NAMESPACE_HREF; -} - static void testDomainDefNamespaceFree(void *data) { @@ -427,7 +419,8 @@ testDriverNew(void) .parse = testDomainDefNamespaceParse, .free = testDomainDefNamespaceFree, .prefix = "test", - .href = testDomainDefNamespaceHref, + .uri = "http://libvirt.org/schemas/domain/test/1.0", + }; virDomainDefParserConfig config = { .features = VIR_DOMAIN_DEF_FEATURE_MEMORY_HOTPLUG | diff --git a/src/util/virxml.c b/src/util/virxml.c index 84b824f432..f9c117dd58 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -1416,7 +1416,7 @@ void virXMLNamespaceFormatNS(virBufferPtr buf, virXMLNamespace const *ns) { - virBufferAsprintf(buf, " xmlns:%s='%s'", ns->prefix, ns->href()); + virBufferAsprintf(buf, " xmlns:%s='%s'", ns->prefix, ns->uri); } @@ -1426,10 +1426,10 @@ virXMLNamespaceRegister(xmlXPathContextPtr ctxt, { if (xmlXPathRegisterNs(ctxt, BAD_CAST ns->prefix, - BAD_CAST ns->href()) < 0) { + BAD_CAST ns->uri) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to register xml namespace '%s'"), - ns->href()); + ns->uri); return -1; } diff --git a/src/util/virxml.h b/src/util/virxml.h index be2abd23f7..30cc895436 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -257,7 +257,7 @@ struct _virXMLNamespace { virXMLNamespaceFree free; virXMLNamespaceFormat format; const char *prefix; - virXMLNamespaceHref href; + const char *uri; }; typedef struct _virXMLNamespace virXMLNamespace; typedef virXMLNamespace *virXMLNamespacePtr; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index c4e90537f8..2cc0995783 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -597,18 +597,12 @@ virVMXDomainDefNamespaceFormatXML(virBufferPtr buf, void *nsdata) return 0; } -static const char * -virVMXDomainDefNamespaceHref(void) -{ - return "http://libvirt.org/schemas/domain/vmware/1.0"; -} - static virXMLNamespace virVMXDomainXMLNamespace = { .parse = NULL, .free = virVMXDomainDefNamespaceFree, .format = virVMXDomainDefNamespaceFormatXML, .prefix = "vmware", - .href = virVMXDomainDefNamespaceHref, + .uri = "http://libvirt.org/schemas/domain/vmware/1.0", }; virDomainXMLOptionPtr -- 2.19.2

2 1