- Devel - libvirt List Archives

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

08 Aug '19

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

2 9

[libvirt] [PATCH] build: Solve mingw build clash with DATADIR
by Eric Blake 08 Aug '19

08 Aug '19

Commit fed58d83 was a hack to fix a mingw build failure due to header inclusion order resulting in a clash over the use of DATADIR, by repeating a trick made several other times in the past of tweaking inclusion order until it goes away. Better is to revert that, and instead use pragmas to avoid the clash in the first place, regardless of header ordering, solving it for everyone in the future. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I tested that both gcc and clang on F29 support this; but it will take a full CI run to see if everywhere else is okay with it. Thus, it is not 5.6 material. src/util/viratomic.h | 3 +++ src/conf/checkpoint_conf.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/util/viratomic.h b/src/util/viratomic.h index 35800dafcd..c6e7668324 100644 --- a/src/util/viratomic.h +++ b/src/util/viratomic.h @@ -218,7 +218,10 @@ VIR_STATIC unsigned int virAtomicIntXor(volatile unsigned int *atomic, # ifdef VIR_ATOMIC_OPS_WIN32 +# pragma push_macro("DATADIR") /* If "configmake.h" was included first */ +# undef DATADIR # include <winsock2.h> +# pragma pop_macro("DATADIR") # include <windows.h> # include <intrin.h> # if !defined(_M_AMD64) && !defined (_M_IA64) && !defined(_M_X64) diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 5ce4cc4853..5f4c275dd8 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -21,8 +21,6 @@ #include <config.h> -#include <unistd.h> - #include "configmake.h" #include "internal.h" #include "virbitmap.h" -- 2.20.1

3 4

[libvirt] [PATCH 0/2] Couple of Coverity fixes
by John Ferlan 07 Aug '19

07 Aug '19

Both from recent changes, it was just as easy for me to post the patches as write the annoying email that someone else needs to generate them ;-). John Ferlan (2): qemu: Fix possible NULL deref in qemuDomainGetResctrlMonData tests: Fix memory leak in mymain src/qemu/qemu_driver.c | 3 ++- tests/virhostdevtest.c | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.20.1

2 3

[libvirt] [PATCH v2 0/2] test_driver: implement virDomainSetTime and update virDomainGetTime
by Ilias Stamatis 07 Aug '19

07 Aug '19

Ilias Stamatis (2): test_driver: make testDomainGetTime read time from vm-private data test_driver: implement virDomainSetTime src/test/test_driver.c | 43 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) -- 2.22.0

2 3

[libvirt] [PATCH 00/17] Refactor virt-login-shell and nss module
by Daniel P. Berrangé 07 Aug '19

07 Aug '19

As previously discussed, it is desirable to move libvirt to a model where we abort-on-OOM, possibly making use of glib2. This would be good for libvirt in general, but it is bad for a couple of libvirt addons. The virt-login-shell setuid program would be ok with abort-on-OOM, but absolutely can never link to glib2 in a setuid setup. The NSS module cannot tolerate abort-on-OOM as it is dyn loaded in to every process on the host, some of which wish to be robust on OOM. It is not practical to restrict abort-on-OOM to only the pieces of code not used by NSS, nor is it practical to conditionally build with & without abort-on-OOM. The solution to both these problems is to refactor the code such that it does not use any common libvirt code. Only direct libc APIs are permitted, and for the NSS module the yajl library. For virt-login-shell this refactoring actually makes the entire solution more pleasant to deal with, so is a win regardless. For the NSS module, the code is a little less attractive by using the lower level libc APIs. The need to use the yajl APIs directly also makes parsing MACs/leases much more verbose. This is still tolerable though, given the benefit of switching the other libvirt code to abort-on-OOM. Daniel P. Berrangé (17): tools: fix crash in virt-login-shell if config doesn't exist tools: fix double error reporting in virt-login-shell tools: rename source for virt-login-shell tools: split virt-login-shell into two binaries build: drop libvirt setuid library build util: get rid of virIsSUID method util: simplify virCommand APIs for env passthrough. util: get rid of virGetEnv{Allow,Block}SUID functions nss: remove use for virDir helper APIs nss: remove use for virString helper APIs nss: remove use for virFile helper APIs nss: refactor code for processing mac addresses nss: custom parser for loading .macs file nss: custom parser for loading .leases file nss: directly use getnameinfo/getaddrinfo nss: remove last usages of libvirt headers nss: only link to yajl library and nothing else .gitignore | 1 + cfg.mk | 25 +- config-post.h | 54 ---- configure.ac | 3 - libvirt.spec.in | 1 + src/Makefile.am | 174 ------------- src/libvirt-admin.c | 2 +- src/libvirt.c | 47 ++-- src/libvirt_private.syms | 6 +- src/lxc/lxc_process.c | 2 +- src/network/leaseshelper.c | 14 +- src/qemu/qemu_command.c | 8 +- src/qemu/qemu_firmware.c | 2 +- src/remote/remote_driver.c | 25 +- src/rpc/virnetlibsshsession.c | 2 +- src/rpc/virnetsocket.c | 16 +- src/rpc/virnettlscontext.c | 2 +- src/util/virauth.c | 2 +- src/util/vircommand.c | 48 +--- src/util/vircommand.h | 8 +- src/util/virfile.c | 7 +- src/util/virlease.c | 4 +- src/util/virlog.c | 15 +- src/util/virsystemd.c | 8 +- src/util/virutil.c | 48 +--- src/util/virutil.h | 4 - src/vbox/vbox_XPCOMCGlue.c | 2 +- src/vbox/vbox_common.c | 2 +- tests/commandtest.c | 8 +- tools/Makefile.am | 43 ++-- tools/nss/libvirt_nss.c | 343 ++++++++----------------- tools/nss/libvirt_nss.h | 24 ++ tools/nss/libvirt_nss_leases.c | 429 +++++++++++++++++++++++++++++++ tools/nss/libvirt_nss_leases.h | 40 +++ tools/nss/libvirt_nss_macs.c | 287 +++++++++++++++++++++ tools/nss/libvirt_nss_macs.h | 29 +++ tools/virsh.c | 2 +- tools/virt-login-shell-helper.c | 439 ++++++++++++++++++++++++++++++++ tools/virt-login-shell.c | 421 ++++-------------------------- tools/vsh.c | 12 +- 40 files changed, 1521 insertions(+), 1088 deletions(-) create mode 100644 tools/nss/libvirt_nss_leases.c create mode 100644 tools/nss/libvirt_nss_leases.h create mode 100644 tools/nss/libvirt_nss_macs.c create mode 100644 tools/nss/libvirt_nss_macs.h create mode 100644 tools/virt-login-shell-helper.c -- 2.21.0

2 18

[libvirt] [PATCH] src: security: Replace bitwise OR with logical OR
by Erik Skultety 07 Aug '19

07 Aug '19

Typo introduced by commit d73f3f58360. https://bugzilla.redhat.com/show_bug.cgi?id=1738483 Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed as trivial. src/security/security_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/security_util.c b/src/security/security_util.c index ad265b0bc5..9d3f483f6b 100644 --- a/src/security/security_util.c +++ b/src/security/security_util.c @@ -268,7 +268,7 @@ virSecurityMoveRememberedLabel(const char *name, VIR_AUTOFREE(char *) attr_name = NULL; VIR_AUTOFREE(char *) attr_value = NULL; - if (!(ref_name = virSecurityGetRefCountAttrName(name)) | + if (!(ref_name = virSecurityGetRefCountAttrName(name)) || !(attr_name = virSecurityGetAttrName(name))) return -1; -- 2.20.1

1 0

[libvirt] [PATCH] test_driver: implement virDomainReset
by Ilias Stamatis 07 Aug '19

07 Aug '19

The qemu and vz implementations don't emit any signals when this API is called, so we can do the same here for now and succeed by doing nothing. Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index d9a7f815d5..6bca4e277f 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2004,6 +2004,28 @@ static int testDomainReboot(virDomainPtr domain, } +static int +testDomainReset(virDomainPtr dom, + unsigned int flags) +{ + virDomainObjPtr vm; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (virDomainObjCheckActive(vm) < 0) + goto cleanup; + + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + static char * testDomainGetHostname(virDomainPtr domain, unsigned int flags) @@ -8878,6 +8900,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainShutdown = testDomainShutdown, /* 0.1.1 */ .domainShutdownFlags = testDomainShutdownFlags, /* 0.9.10 */ .domainReboot = testDomainReboot, /* 0.1.1 */ + .domainReset = testDomainReset, /* 5.7.0 */ .domainDestroy = testDomainDestroy, /* 0.1.1 */ .domainDestroyFlags = testDomainDestroyFlags, /* 4.2.0 */ .domainGetOSType = testDomainGetOSType, /* 0.1.9 */ -- 2.22.0

2 1

[libvirt] [PATCH] test_driver: implement virDomainSetTime and update virDomainGetTime
by Ilias Stamatis 07 Aug '19

07 Aug '19

Until now, testDomainGetTime would always return the same fixed value everytime it was called. By using domain-private data we can make this API return the values previously set with testDomainSetTime, or use the same old fixed value in case testDomainSetTime hasn't been called at all. --- src/test/test_driver.c | 45 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index d9a7f815d5..6a75e63429 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -392,6 +392,11 @@ struct _testDomainObjPrivate { testDriverPtr driver; bool frozen[2]; /* used by file system related calls */ + + + /* used by get/set time APIs */ + long long seconds; + unsigned int nseconds; }; @@ -406,6 +411,9 @@ testDomainObjPrivateAlloc(void *opaque) priv->driver = opaque; priv->frozen[0] = priv->frozen[1] = false; + priv->seconds = 627319920; + priv->nseconds = 0; + return priv; } @@ -2082,6 +2090,7 @@ testDomainGetTime(virDomainPtr dom, unsigned int flags) { virDomainObjPtr vm = NULL; + testDomainObjPrivatePtr priv; int ret = -1; virCheckFlags(0, -1); @@ -2095,8 +2104,39 @@ testDomainGetTime(virDomainPtr dom, goto cleanup; } - *seconds = 627319920; - *nseconds = 0; + priv = vm->privateData; + + *seconds = priv->seconds; + *nseconds = priv->nseconds; + + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + +static int +testDomainSetTime(virDomainPtr dom, + long long seconds, + unsigned int nseconds, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + testDomainObjPrivatePtr priv; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_TIME_SYNC, ret); + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (virDomainObjCheckActive(vm) < 0) + goto cleanup; + + priv = vm->privateData; + priv->seconds = seconds; + priv->nseconds = nseconds; ret = 0; cleanup: @@ -8891,6 +8931,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainGetInfo = testDomainGetInfo, /* 0.1.1 */ .domainGetState = testDomainGetState, /* 0.9.2 */ .domainGetTime = testDomainGetTime, /* 5.4.0 */ + .domainSetTime = testDomainSetTime, /* 5.7.0 */ .domainSave = testDomainSave, /* 0.3.2 */ .domainSaveFlags = testDomainSaveFlags, /* 0.9.4 */ .domainRestore = testDomainRestore, /* 0.3.2 */ -- 2.22.0

2 1

[libvirt] [PATCH 0/7] qemu: use domCaps for validation
by Cole Robinson 07 Aug '19

07 Aug '19

I'm trying to remove some hurdles and pitfalls WRT extending domaincapabilities data. One issue is that it's too easy to add invalid data to it, or let the data become out of date. For example the first two patches of this series add <rng model=X> domcaps reporting. The logic to fill in the domcaps data from qemuCaps is nearly identical to the logic we use to validate rng->model in qemuDomainRNGDefValidate. If just those patches are added, and later a new qemu rng model was introduced, a future patch could easily miss updated domaincapabilities output. This series aims to set up a pattern to prevent these types of issues from sneaking in. A function virDomainCapsDeviceDefValidate is added which will use domcaps data to perform validation against a devicedef. The existing qemu <rng> model validation is moved there. This ensures that any future <rng> model additions, if they want to work in the qemu driver, effectively need to extend domaincapabilities as well. It's also theoretically useful for other drivers too. One issue is that at DomainDefValidate time we don't have domCaps handy, or any cache layer for domCaps assembling. Patch #4 adds a domCapsCache hashtable to the virQEMUCaps class for caching domCaps builds based on the full tuple of emulator+machine+arch+virttype. If qemuCaps need to be regenerated, the domCaps cache is wiped out for us so we don't need to worry about the data being stale, it's tied to the lifetime of a qemuCaps instance. Cole Robinson (7): conf: domcaps: Report device <rng> qemu: capabilities: fill in domcaps <rng> qemu: conf: add virQEMUDriverGetDomainCapabilities qemu: conf: Cache domCaps in qemuCaps conf: domcaps: Add virDomainCapsDeviceDefValidate qemu: domain: Call virDomainCapsDeviceDefValidate qemu: Move rng model validation to domcaps docs/formatdomaincaps.html.in | 35 ++++++++ docs/schemas/domaincaps.rng | 10 +++ src/conf/domain_capabilities.c | 83 ++++++++++++++++++ src/conf/domain_capabilities.h | 14 ++++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 41 +++++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_conf.c | 84 +++++++++++++++++++ src/qemu/qemu_conf.h | 7 ++ src/qemu/qemu_domain.c | 38 +++------ src/qemu/qemu_driver.c | 18 +--- .../qemu_1.7.0.x86_64.xml | 9 ++ .../qemu_2.12.0-virt.aarch64.xml | 11 +++ .../qemu_2.12.0.ppc64.xml | 11 +++ .../qemu_2.12.0.s390x.xml | 11 +++ .../qemu_2.12.0.x86_64.xml | 11 +++ .../qemu_2.6.0-virt.aarch64.xml | 11 +++ .../qemu_2.6.0.aarch64.xml | 11 +++ .../domaincapsschemadata/qemu_2.6.0.ppc64.xml | 11 +++ .../qemu_2.6.0.x86_64.xml | 11 +++ .../domaincapsschemadata/qemu_2.7.0.s390x.xml | 11 +++ .../qemu_2.8.0-tcg.x86_64.xml | 11 +++ .../domaincapsschemadata/qemu_2.8.0.s390x.xml | 11 +++ .../qemu_2.8.0.x86_64.xml | 11 +++ .../qemu_2.9.0-q35.x86_64.xml | 11 +++ .../qemu_2.9.0-tcg.x86_64.xml | 11 +++ .../qemu_2.9.0.x86_64.xml | 11 +++ .../domaincapsschemadata/qemu_3.0.0.s390x.xml | 11 +++ .../qemu_4.0.0.x86_64.xml | 11 +++ 29 files changed, 488 insertions(+), 40 deletions(-) -- 2.21.0

3 16

[libvirt] [PATCH 0/3] Couple of resctrl fixes
by Michal Privoznik 06 Aug '19

06 Aug '19

*** BLURB HERE *** Michal Prívozník (3): qemuDomainGetResctrlMonData: Don't leak @caps qemuDomainGetResctrlMonData: Dereference resctrl monitor iff not NULL qemuDomainGetResctrlMonData: Switch to switch() src/qemu/qemu_driver.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) -- 2.21.0

2 5

[libvirt] [PATCH v2 0/4] test_driver: implement FS-related APIs
by Ilias Stamatis 06 Aug '19

06 Aug '19

Ilias Stamatis (4): test_driver: introduce domain-private data test_driver: implement virDomainFSFreeze test_driver: implement virDomainFSThaw test_driver: implement virDomainFSTrim src/test/test_driver.c | 200 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 199 insertions(+), 1 deletion(-) -- 2.22.0

2 7

[libvirt] [PATCH] daemon: improve Xen support in systemd service
by Jim Fehlig 05 Aug '19

05 Aug '19

The xencommons service provides all the essential services such as xenstored, xenconsoled, etc. needed by the libvirt Xen driver, so libvirtd should be started after xencommons. The xendomains service uses Xen's xl tool to operate on any domains it finds running, even those managed by libvirt. Add a conflicts on the xendomains service to ensure it is not enabled when libvirtd is enabled. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/remote/libvirtd.service.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in index 3ddf0e229b..5dbe7cbe72 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in @@ -15,6 +15,8 @@ After=local-fs.target After=remote-fs.target After=systemd-logind.service After=systemd-machined.service +After=xencommons.service +Conflicts=xendomains.service Documentation=man:libvirtd(8) Documentation=https://libvirt.org -- 2.22.0

2 2

[libvirt] [PATCH] tools: console: Use proper constructor
by Roman Bolshakov 05 Aug '19

05 Aug '19

"virsh console" on macOS cannot attach to a domain and it doesn't matter if it's local or remote domain: $ ~ virsh console vm Connected to domain vm Escape character is ^] error: internal error: unable to wait on console condition The error comes from pthread_cond_wait that fails with EINVAL. The mutex in the parent is not initialized with pthread_mutex_init and it results in silent failure of pthead_mutex_lock and the attach failure. Fixes: 98361cc3b95 ("tools: console: make console virLockableObject") Signed-off-by: Roman Bolshakov <r.bolshakov(a)yadro.com> --- tools/virsh-console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-console.c b/tools/virsh-console.c index 826a4afcb2..e16f841e57 100644 --- a/tools/virsh-console.c +++ b/tools/virsh-console.c @@ -367,7 +367,7 @@ virConsoleNew(void) if (virConsoleInitialize() < 0) return NULL; - if (!(con = virObjectNew(virConsoleClass))) + if (!(con = virObjectLockableNew(virConsoleClass))) return NULL; if (virCondInit(&con->cond) < 0) { -- 2.20.1 (Apple Git-117)

2 1

[libvirt] [PATCH] news.xml: Restore blank news example
by Michal Privoznik 05 Aug '19

05 Aug '19

In v5.6.0-rc1~347 I've mistakenly messed up news.xml as the change I wanted to promote was added into a comment (I blame git rebase for that). Anyway, restore the original state of the comment so it can be copied again. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. docs/news.xml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/docs/news.xml b/docs/news.xml index 3c5cd7d597..a4d727b9c5 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -25,19 +25,6 @@ <section title="New features"> </section> <section title="Improvements"> - <change> - <summary> - Remember original owners and SELinux labels of files - </summary> - <description> - When a domain is starting up libvirt changes DAC and - SELinux labels so that domain can access it. However, - it never remembered the original labels and therefore - the file was returned back to <code>root:root</code>. - With this release, the original labels are remembered - and restored properly. - </description> - </change> </section> <section title="Bug fixes"> </section> -- 2.21.0

1 0

[libvirt] Release of libvirt-5.6.0
by Daniel Veillard 05 Aug '19

05 Aug '19

It's out ! Tagged in git and with signed tarball and source rpm at the usual place: https://libvirt.org/sources/ I also released the 5.6.0 python bindings for the release that can be found at: https://libvirt.org/sources/python/ This release includes a number of new features, notably the checkpoint APIs removes the sxpr xen support and carries a set of improvement and bug fixes as usual: New features: - qemu: Introduce a new video model of type 'bochs' Introduce a new video model type that supports the bochs-display device that was added in qemu version 3.0. - api: new virDomainCheckpoint APIs Introduce several new APIs for creating and managing checkpoints in the test and qemu drivers (the latter requires qcow2 images). Checkpoints serve as a way to tell which portions of a disk have changed since a point in time. - qemu: Add support for overriding max threads per process limit systemd-based systems impose a limit on the number of threads a process can spawn, which in some cases can be exceeded by QEMU processes running VMs. Add a max_threads_per_process option to qemu.conf to override the system default. - Remember original owners and SELinux labels of files When a domain is starting up libvirt changes DAC and SELinux labels so that domain can access it. However, it never remembered the original labels and therefore the file was returned back to root:root. With this release, the original labels are remembered and restored properly. - network: Allow passing arbitrary options to dnsmasq This works similarly to the existing support for passing arbitary options to QEMU, and just like that feature it comes with no support guarantees. Removed features: - xen: Remove sxpr config support Remove the sxpr style config parser and formatter a year after the xend driver was removed. Improvements: - qemu: Allow XML validation for snapshot creation Add flag VIR_DOMAIN_SNAPSHOT_CREATE_VALIDATE to validate snapshot input XML. For virsh, users can use it as virsh snapshot-create --validate. - Support encrypted soft TPM A soft TPM backend could be encrypted with passphrase. Now libvirt supports using a secret object to hold the passphrase, and referring to it via the encryption element of the TPM device. - test driver: Expand API coverage Additional APIs have been implemented in the test driver. - Implement per-driver locking Drivers now acquire a lock when they're loaded, ensuring that there can never be two instances of the same driver active at a time. - nss: Report newer addresses first In some cases, a guest might be assigned a new IP address by DHCP before the previous lease has expired, in which case the NSS plugin will correctly report both addresses; many applications, however, ignore all addresses but the first, and may thus end up trying to connect using a stale address. To prevent that from happening, the NSS plugin will now always report the newest address first. - util: Optimize mass closing of FDs when spawning child processes When the limit on the number of FDs is very high, closing all unwanted FDs after calling fork() can take a lot of time and delay the start of the child process. libvirt will now use an optimized algorithm that minimizes such delays. Bug fixes: - logging: Ensure virtlogd rollover takes priority over logrotate virtlogd implements its own rollover mechanism, but until now logrotate could end up acting on the logs before virtlogd had a chance to do so itself. Thanks everybody who helped with this release, be it with bug reports, patches, reviews, documenation, localization, etc ... Enjoy the release, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] maint: Post-release version bump to 5.7.0
by Michal Privoznik 05 Aug '19

05 Aug '19

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. configure.ac | 2 +- docs/news.xml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d18d427695..109827b89c 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [5.6.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] +AC_INIT([libvirt], [5.7.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff --git a/docs/news.xml b/docs/news.xml index 9d95b827ed..3c5cd7d597 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -52,6 +52,14 @@ --> <libvirt> + <release version="v5.7.0" date="unreleased"> + <section title="New features"> + </section> + <section title="Improvements"> + </section> + <section title="Bug fixes"> + </section> + </release> <release version="v5.6.0" date="2019-08-05"> <section title="New features"> <change> -- 2.21.0

1 0

[libvirt] [PATCH] qemu: support bootindex on vfio-ccw mdev device
by Boris Fiuczynski 05 Aug '19

05 Aug '19

Add support to specify a boot order on vfio-ccw passthrough devices. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> Acked-by: Jason J. Herne <jjherne(a)linux.ibm.com> Reviewed-by: Marc Hartmayer <mhartmay(a)linux.ibm.com> --- src/qemu/qemu_command.c | 27 +++++++++++++---- .../hostdev-subsys-mdev-vfio-ccw-boot.args | 29 +++++++++++++++++++ .../hostdev-subsys-mdev-vfio-ccw-boot.xml | 23 +++++++++++++++ tests/qemuxml2argvtest.c | 4 +++ 4 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.args create mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fee51158a9..36138e2ccf 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5613,6 +5613,9 @@ qemuBuildHostdevMediatedDevStr(const virDomainDef *def, if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0) goto cleanup; + if (dev->info->bootIndex) + virBufferAsprintf(&buf, ",bootindex=%u", dev->info->bootIndex); + if (virBufferCheckError(&buf) < 0) goto cleanup; @@ -5624,6 +5627,22 @@ qemuBuildHostdevMediatedDevStr(const virDomainDef *def, return ret; } +static bool +qemuHostdevSupportsBoot(virDomainHostdevDefPtr hostdev) +{ + if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) { + virDomainHostdevSubsysPtr subsys = &hostdev->source.subsys; + if (subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI || + subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB || + subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI || + (subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV && + subsys->u.mdev.model == VIR_MDEV_MODEL_TYPE_VFIO_CCW)) { + return true; + } + } + return false; +} + static int qemuBuildHostdevCommandLine(virCommandPtr cmd, const virDomainDef *def, @@ -5638,13 +5657,11 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, char *devstr; if (hostdev->info->bootIndex) { - if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || - (subsys->type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI && - subsys->type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB && - subsys->type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI)) { + if (!qemuHostdevSupportsBoot(hostdev)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("booting from assigned devices is only " - "supported for PCI, USB and SCSI devices")); + "supported for PCI, USB, SCSI and MDEV " + "of model vfio-ccw devices")); return -1; } } diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.args new file mode 100644 index 0000000000..6fb22b3014 --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.args @@ -0,0 +1,29 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-name QEMUGuest1 \ +-S \ +-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-m 512 \ +-realtime mlock=off \ +-smp 2,sockets=2,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-device vfio-ccw,id=hostdev0,\ +sysfsdev=/sys/bus/mdev/devices/90c6c135-ad44-41d0-b1b7-bae47de48627,\ +devno=fe.0.0000,bootindex=1 \ +-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.xml b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.xml new file mode 100644 index 0000000000..6cca13c33f --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.xml @@ -0,0 +1,23 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-s390x</emulator> + <hostdev mode='subsystem' type='mdev' model='vfio-ccw'> + <source> + <address uuid='90c6c135-ad44-41d0-b1b7-bae47de48627'/> + </source> + <boot order='1'/> + </hostdev> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c166fd18d6..c30a0c74ca 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1621,6 +1621,10 @@ mymain(void) QEMU_CAPS_CCW, QEMU_CAPS_CCW_CSSID_UNRESTRICTED, QEMU_CAPS_DEVICE_VFIO_CCW); + DO_TEST("hostdev-subsys-mdev-vfio-ccw-boot", + QEMU_CAPS_CCW, + QEMU_CAPS_CCW_CSSID_UNRESTRICTED, + QEMU_CAPS_DEVICE_VFIO_CCW); DO_TEST_FAILURE("hostdev-subsys-mdev-vfio-ccw", QEMU_CAPS_CCW, QEMU_CAPS_CCW_CSSID_UNRESTRICTED); -- 2.17.0

2 2

[libvirt] [PATCH 0/4] Adding resolution properties for QXL device
by jcfaracco＠gmail.com 05 Aug '19

05 Aug '19

From: Julio Faracco <jcfaracco(a)gmail.com> This serie adds 'xres' and 'yres' properties into XML definition for QXL video device to specify a default resolution. This serie covers a simple test case too. Julio Faracco (4): docs: Adding 'xres' and 'yres' into qxl XML definition conf: Adding XML support for 'xres' and 'yres' qemu: Generate 'xres' and 'yres' for qxl device. tests: Add separate tests for 'xres' and 'yres' docs/schemas/domaincommon.rng | 10 +++++ src/conf/domain_conf.c | 26 ++++++++++++ src/conf/domain_conf.h | 2 + src/qemu/qemu_command.c | 4 ++ .../video-qxl-resolution.args | 32 +++++++++++++++ .../qemuxml2argvdata/video-qxl-resolution.xml | 40 +++++++++++++++++++ tests/qemuxml2argvtest.c | 4 ++ .../video-qxl-resolution.xml | 40 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 9 files changed, 159 insertions(+) create mode 100644 tests/qemuxml2argvdata/video-qxl-resolution.args create mode 100644 tests/qemuxml2argvdata/video-qxl-resolution.xml create mode 100644 tests/qemuxml2xmloutdata/video-qxl-resolution.xml -- 2.20.1

5 15

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

05 Aug '19

Ilias Stamatis (2): test_driver: implement virDomainCreateWithFiles test_driver: implement virDomainCreateXMLWithFile src/test/test_driver.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -- 2.22.0

2 3

[libvirt] [PATCH] libxl: Implement domain metadata getter/setter
by Michal Privoznik 05 Aug '19

05 Aug '19

Fortunately, the code that handles metadata getting or setting is driver agnostic, so all that is needed from individual hypervisor drivers is to call the right functions. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1732306 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libxl/libxl_driver.c | 67 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 492028c487..ca01f620c7 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -6515,6 +6515,70 @@ libxlConnectBaselineCPU(virConnectPtr conn, return cpustr; } +static int +libxlDomainSetMetadata(virDomainPtr dom, + int type, + const char *metadata, + const char *key, + const char *uri, + unsigned int flags) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + VIR_AUTOUNREF(libxlDriverConfigPtr) cfg = libxlDriverConfigGet(driver); + virDomainObjPtr vm = NULL; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); + + if (!(vm = libxlDomObjFromDomain(dom))) + return -1; + + if (virDomainSetMetadataEnsureACL(dom->conn, vm->def, flags) < 0) + goto cleanup; + + if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + goto cleanup; + + ret = virDomainObjSetMetadata(vm, type, metadata, key, uri, cfg->caps, + driver->xmlopt, cfg->stateDir, + cfg->configDir, flags); + + if (ret == 0) { + virObjectEventPtr ev = NULL; + ev = virDomainEventMetadataChangeNewFromObj(vm, type, uri); + virObjectEventStateQueue(driver->domainEventState, ev); + } + + libxlDomainObjEndJob(driver, vm); + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + +static char * +libxlDomainGetMetadata(virDomainPtr dom, + int type, + const char *uri, + unsigned int flags) +{ + virDomainObjPtr vm; + char *ret = NULL; + + if (!(vm = libxlDomObjFromDomain(dom))) + return NULL; + + if (virDomainGetMetadataEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + ret = virDomainObjGetMetadata(vm, type, uri, flags); + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + static virHypervisorDriver libxlHypervisorDriver = { .name = LIBXL_DRIVER_NAME, .connectURIProbe = libxlConnectURIProbe, @@ -6628,6 +6692,9 @@ static virHypervisorDriver libxlHypervisorDriver = { .connectGetDomainCapabilities = libxlConnectGetDomainCapabilities, /* 2.0.0 */ .connectCompareCPU = libxlConnectCompareCPU, /* 2.3.0 */ .connectBaselineCPU = libxlConnectBaselineCPU, /* 2.3.0 */ + .domainSetMetadata = libxlDomainSetMetadata, /* 5.7.0 */ + .domainGetMetadata = libxlDomainGetMetadata, /* 5.7.0 */ + }; static virConnectDriver libxlConnectDriver = { -- 2.21.0

2 1

[libvirt] [PATCH 0/4] test_driver: implement FS-related APIs
by Ilias Stamatis 04 Aug '19

04 Aug '19

Ilias Stamatis (4): test_driver: introduce domain-private data test_driver: implement virDomainFSFreeze test_driver: implement virDomainFSThaw test_driver: implement virDomainFSTrim src/test/test_driver.c | 191 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 190 insertions(+), 1 deletion(-) -- 2.22.0

2 10

[libvirt] [PATCH] news: Update for 5.6.0 release
by Andrea Bolognani 03 Aug '19

03 Aug '19

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/news.xml | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 9483172335..dbc72c7c66 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -85,6 +85,29 @@ option to qemu.conf to override the system default. </description> </change> + <change> + <summary> + Remember original owners and SELinux labels of files + </summary> + <description> + When a domain is starting up libvirt changes DAC and + SELinux labels so that domain can access it. However, + it never remembered the original labels and therefore + the file was returned back to <code>root:root</code>. + With this release, the original labels are remembered + and restored properly. + </description> + </change> + <change> + <summary> + network: Allow passing arbitrary options to dnsmasq + </summary> + <description> + This works similarly to the existing support for passing arbitary + options to QEMU, and just like that feature it comes with no + support guarantees. + </description> + </change> </section> <section title="Removed features"> <change> @@ -119,8 +142,59 @@ TPM device. </description> </change> + <change> + <summary> + test driver: Expand API coverage + </summary> + <description> + Additional APIs have been implemented in the test driver. + </description> + </change> + <change> + <summary> + Implement per-driver locking + </summary> + <description> + Drivers now acquire a lock when they're loaded, ensuring that there + can never be two instances of the same driver active at a time. + </description> + </change> + <change> + <summary> + nss: Report newer addresses first + </summary> + <description> + In some cases, a guest might be assigned a new IP address by DHCP + before the previous lease has expired, in which case the NSS plugin + will correctly report both addresses; many applications, however, + ignore all addresses but the first, and may thus end up trying to + connect using a stale address. To prevent that from happening, the + NSS plugin will now always report the newest address first. + </description> + </change> + <change> + <summary> + util: Optimize mass closing of FDs when spawning child processes + </summary> + <description> + When the limit on the number of FDs is very high, closing all + unwanted FDs after calling <code>fork()</code> can take a lot of + time and delay the start of the child process. libvirt will now + use an optimized algorithm that minimizes such delays. + </description> + </change> </section> <section title="Bug fixes"> + <change> + <summary> + logging: Ensure virtlogd rollover takes priority over logrotate + </summary> + <description> + virtlogd implements its own rollover mechanism, but until now + logrotate could end up acting on the logs before virtlogd had a + chance to do so itself. + </description> + </change> </section> </release> <release version="v5.5.0" date="2019-07-02"> -- 2.21.0

2 2

[libvirt] Entering freeze for libvirt 5.6.0
by Daniel Veillard 02 Aug '19

02 Aug '19

I completely forgot to send plans for this and already a bit late for release schedule, so I just tagged RC1 in git and pushed the signed tarball and source rpm to the usual place: https://libvirt.org/sources/ Seems okay in my very limited tests here, there is a few red tests on jenkins but nothing looking like core libvirt issues https://ci.centos.org/view/libvirt/ I will try to cut RC2 once I'm back in Europe Thursday, and then get the final release by the w.e. or Monday. In the meantime, please give it some testing ! thanks, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] [PATCH v1 00/31] Introduce NVMe support
by Michal Privoznik 02 Aug '19

02 Aug '19

These patches introduce a support for NVMe disks into libvirt. Note that even without them it is possible to use NVMe disks for your domains in two ways: 1) <hostdev/> - This is regular PCI assignment with all the drawbacks (no migration, no snapshots, ...) 2) <disk/> - Since NVMe disks are accessible via /dev/nvme* they can be assigned to domains. Problem is, because qemu is accessing /dev/nvme* the host kernel's storage stack is involved which adds significant latency [1]. Solution to this problem is to combine 1) and 2) together: - Bypass host kernel's storage stack by detaching the NVMe disk from the host (and attaching it to VFIO driver), and - Plug the NVMe disk into qemu's block layer so that all fancy features can be supported. On qemu command line this is done via: -drive file.driver=nvme,file.device=0000:01:00.0,file.namespace=1,format=raw,\ if=none,id=drive-virtio-disk0 \ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ id=virtio-disk0,bootindex=1 \ You can find my patches also on my github [2]. 1: https://www.linux-kvm.org/images/4/4c/Userspace_NVMe_driver_in_QEMU_-_Fam_Z… 2: https://github.com/zippy2/libvirt/commits/nvme Michal Prívozník (31): virHostdevPreparePCIDevices: Separate out function body virHostdevReAttachPCIDevices: Separate out function body virpcimock: Move actions checking one level up Revert "virpcitest: Test virPCIDeviceDetach failure" virpcimock: Create driver_override file in device dirs virPCIDeviceAddressEqual: Fix const correctness virPCIDeviceAddressAsString: Fix const correctness virpci: Introduce virPCIDeviceAddressCopy qemuDomainDeviceDefValidateDisk: Reorder some checks schemas: Introduce disk type NVMe conf: Format and parse NVMe type disk util: Introduce virNVMeDevice module virhostdev: Include virNVMeDevice module virhostdevtest: Don't proceed to test cases if init failed virhostdevtest: s/CHECK_LIST_COUNT/CHECK_PCI_LIST_COUNT/ virpcimock: Introduce NVMe driver and devices virhostdevtest: Test virNVMeDevice assignment qemu: prepare NVMe devices too qemu: Take NVMe disks into account when calculating memlock limit virstoragefile: Introduce virStorageSourceChainHasNVMe domain_conf: Introduce virDomainDefHasNVMeDisk qemu_domain: Separate VFIO code qemu_domain: Introduce NVMe path getting helpers qemu: Create NVMe disk in domain namespace qemu: Allow NVMe disk in CGroups security_selinux: Simplify virSecuritySELinuxSetImageLabelInternal virSecuritySELinuxRestoreImageLabelInt: Don't skip non-local storage qemu_capabilities: Introduce QEMU_CAPS_DRIVE_NVME qemu: Generate command line of NVMe disks qemu: Don't leak storage perms on failure in qemuDomainAttachDiskGeneric qemu_hotplug: Prepare NVMe disks on hotplug docs/formatdomain.html.in | 45 +- docs/schemas/domaincommon.rng | 32 ++ src/conf/domain_conf.c | 160 +++++++ src/conf/domain_conf.h | 6 + src/libvirt_private.syms | 26 ++ src/qemu/qemu_block.c | 24 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_cgroup.c | 59 ++- src/qemu/qemu_command.c | 4 + src/qemu/qemu_domain.c | 115 ++++- src/qemu/qemu_domain.h | 6 + src/qemu/qemu_driver.c | 4 + src/qemu/qemu_hostdev.c | 49 ++- src/qemu/qemu_hostdev.h | 10 + src/qemu/qemu_hotplug.c | 76 +++- src/qemu/qemu_migration.c | 1 + src/qemu/qemu_process.c | 7 + src/security/security_dac.c | 38 ++ src/security/security_selinux.c | 95 ++-- src/util/Makefile.inc.am | 2 + src/util/virhostdev.c | 350 +++++++++++++-- src/util/virhostdev.h | 25 ++ src/util/virnvme.c | 412 ++++++++++++++++++ src/util/virnvme.h | 89 ++++ src/util/virpci.c | 12 +- src/util/virpci.h | 8 +- src/util/virstoragefile.c | 73 ++++ src/util/virstoragefile.h | 17 + src/xenconfig/xen_xl.c | 1 + .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../caps_3.0.0.riscv32.xml | 1 + .../caps_3.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../disk-nvme.x86_64-latest.args | 52 +++ tests/qemuxml2argvdata/disk-nvme.xml | 63 +++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/disk-nvme.xml | 1 + tests/qemuxml2xmltest.c | 1 + tests/virhostdevtest.c | 185 ++++++-- tests/virpcimock.c | 76 +++- tests/virpcitest.c | 32 -- tests/virpcitestdata/0000-01-00.0.config | Bin 0 -> 4096 bytes tests/virpcitestdata/0000-02-00.0.config | Bin 0 -> 4096 bytes 58 files changed, 1978 insertions(+), 204 deletions(-) create mode 100644 src/util/virnvme.c create mode 100644 src/util/virnvme.h create mode 100644 tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-nvme.xml create mode 120000 tests/qemuxml2xmloutdata/disk-nvme.xml create mode 100644 tests/virpcitestdata/0000-01-00.0.config create mode 100644 tests/virpcitestdata/0000-02-00.0.config -- 2.21.0

2 75

[libvirt] [PATCH] tests: Fix virsh-snapshot/checkpoint without libreadline-devel
by Eric Blake 02 Aug '19

02 Aug '19

libreadline-devel is an optional build dependency; when it is not present, the output of 'virsh <<EOF ... EOF' is different in that the input provided by the user is not echoed, and prompts become interleaved on the same line as actual output, which in turn causes the sed doing prompt filtering to mess up: | ./virsh-snapshot | --- exp 2019-07-31 18:42:31.107399428 -0300 | +++ out.cooked 2019-07-31 18:42:31.108399437 -0300 | @@ -1,8 +1,3 @@ | - | - | -Domain snapshot s3 created from 's3.xml' | -Domain snapshot s2 created from 's2.xml' | -Name: s2 | Domain: test | Current: yes | State: running Maybe we should fix virsh in interactive mode to echo regardless of whether libreadline-devel was used, but the quicker fix is to make the test use 'virsh "..."' rather than reading its input from stdin. Reported-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'm tempted to push this as a fix to a build-breaker, but as I did not actually build without libreadline-devel, I'd appreciate an ACK from Daniel that this fixes the problem on his setup. tests/virsh-checkpoint | 7 +++---- tests/virsh-snapshot | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/virsh-checkpoint b/tests/virsh-checkpoint index 75bdc293be..92962d2205 100755 --- a/tests/virsh-checkpoint +++ b/tests/virsh-checkpoint @@ -140,7 +140,7 @@ EOF compare exp err || fail=1 # Restore state with redefine -$abs_top_builddir/tools/virsh -c test:///default >out 2>err <<EOF || fail=1 +$abs_top_builddir/tools/virsh -c test:///default >out 2>err ' # Redefine must be in topological order; this will fail checkpoint-create test --redefine c2.xml echo --err marker @@ -149,7 +149,7 @@ $abs_top_builddir/tools/virsh -c test:///default >out 2>err <<EOF || fail=1 checkpoint-create test --redefine c2.xml checkpoint-list test --leaves --name checkpoint-info test c2 -EOF +' || fail=1 cat <<\EOF > exp || fail=1 @@ -165,8 +165,7 @@ Children: 0 Descendants: 0 EOF -sed '1,/^virsh #/d; /virsh #/d' < out > out.cooked || fail=1 -compare exp out.cooked || fail=1 +compare exp out || fail=1 cat <<EOF > exp || fail=1 error: invalid argument: parent c3 for moment c2 not found diff --git a/tests/virsh-snapshot b/tests/virsh-snapshot index 20ff966a51..473e3b3f2d 100755 --- a/tests/virsh-snapshot +++ b/tests/virsh-snapshot @@ -191,7 +191,7 @@ EOF compare exp err || fail=1 # Restore state with redefine -$abs_top_builddir/tools/virsh -c test:///default >out 2>err <<EOF || fail=1 +$abs_top_builddir/tools/virsh -c test:///default >out 2>err ' # Redefine must be in topological order; this will fail snapshot-create test --redefine s2.xml --validate echo --err marker @@ -199,7 +199,7 @@ $abs_top_builddir/tools/virsh -c test:///default >out 2>err <<EOF || fail=1 snapshot-create test --redefine s3.xml --validate snapshot-create test --redefine s2.xml --current --validate snapshot-info test --current -EOF +' || fail=1 cat <<\EOF > exp || fail=1 @@ -217,8 +217,7 @@ Descendants: 0 Metadata: yes EOF -sed '1,/^virsh #/d; /virsh #/d' < out > out.cooked || fail=1 -compare exp out.cooked || fail=1 +compare exp out || fail=1 cat <<EOF > exp || fail=1 error: invalid argument: parent s3 for moment s2 not found -- 2.20.1

2 1

[libvirt] [PATCH 1/1] tests/virsh-checkpoint/snapshot: changing 'sed' out filtering
by Daniel Henrique Barboza 02 Aug '19

02 Aug '19

There is a chance that the current sed filtering used in these new tests might fail in some machines due to the repetition of the 'virsh #' prompt at the same line, together with valid output that shouldn't be filtered. This is output of virsh-snapshot test in my T480 dev box: ./virsh-snapshot --- exp 2019-07-31 18:42:31.107399428 -0300 +++ out.cooked 2019-07-31 18:42:31.108399437 -0300 @@ -1,8 +1,3 @@ - - -Domain snapshot s3 created from 's3.xml' -Domain snapshot s2 created from 's2.xml' -Name: s2 Domain: test Current: yes State: running There are 3 valid lines missing. This is the unfiltered output: === out === Welcome to lt-virsh, the virtualization interactive terminal. Type: 'help' for help with commands 'quit' to quit virsh # virsh # virsh # virsh # virsh # Domain snapshot s3 created from 's3.xml' virsh # Domain snapshot s2 created from 's2.xml' virsh # Name: s2 Domain: test Current: yes State: running Location: internal Parent: s3 Children: 0 Descendants: 0 Metadata: yes virsh # ============ We can see that the 3 lines being erased are being followed by the 'virsh #' prompt and the filtering is erasing those. A similar situation happens with virsh-checkpoint as well. This patch makes the 'sed' filtering less elegant and more crude than the current version, but more reliable to these outputs that may vary from each dev machine. We're also removing the blank lines in the expected output to make it less prone to errors as well. Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- Eric, feel free to accept this patch, tweak it, discard it and try something else or whatever. I was going to send the commit msg as a reply to your query in the ML, then realized that I might as well propose a fix for it. tests/virsh-checkpoint | 6 +----- tests/virsh-snapshot | 6 ++---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/tests/virsh-checkpoint b/tests/virsh-checkpoint index 75bdc293be..a3cad74f74 100755 --- a/tests/virsh-checkpoint +++ b/tests/virsh-checkpoint @@ -152,20 +152,16 @@ $abs_top_builddir/tools/virsh -c test:///default >out 2>err <<EOF || fail=1 EOF cat <<\EOF > exp || fail=1 - - Domain checkpoint c3 created from 'c3.xml' Domain checkpoint c2 created from 'c2.xml' c2 - Name: c2 Domain: test Parent: c3 Children: 0 Descendants: 0 - EOF -sed '1,/^virsh #/d; /virsh #/d' < out > out.cooked || fail=1 +sed '1,/^virsh #/d; s/virsh #\s//g; /^$/d' < out > out.cooked || fail=1 compare exp out.cooked || fail=1 cat <<EOF > exp || fail=1 diff --git a/tests/virsh-snapshot b/tests/virsh-snapshot index 20ff966a51..874093ea3c 100755 --- a/tests/virsh-snapshot +++ b/tests/virsh-snapshot @@ -201,9 +201,8 @@ $abs_top_builddir/tools/virsh -c test:///default >out 2>err <<EOF || fail=1 snapshot-info test --current EOF -cat <<\EOF > exp || fail=1 - +cat <<\EOF > exp || fail=1 Domain snapshot s3 created from 's3.xml' Domain snapshot s2 created from 's2.xml' Name: s2 @@ -215,9 +214,8 @@ Parent: s3 Children: 0 Descendants: 0 Metadata: yes - EOF -sed '1,/^virsh #/d; /virsh #/d' < out > out.cooked || fail=1 +sed '1,/^virsh #/d; s/virsh #\s//g; /^$/d' < out > out.cooked || fail=1 compare exp out.cooked || fail=1 cat <<EOF > exp || fail=1 -- 2.21.0

2 7

[libvirt] [PATCH] RFC: security: Make sure to decrease ref count label value
by Stefan Berger 02 Aug '19

02 Aug '19

I noticed that if a domain fails to restore, the ref count in the xattr 'trusted.libvirt.security.ref_selinux' keeps on increasing indefinitely and the VM will never restore even if the root cause for the restore failure has been removed. The reason seems to be that the code to decrease the ref count never gets called because the block above it fails due to virSecuritySELinuxTransactionAppend() failing. The simple solution seems to be to revert the order in which things are done. Signed-off-by: Stefan Berger <stefanb(a)linux.ibm.com> --- src/security/security_selinux.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index ea20373a90..9fd29e9bca 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1499,14 +1499,9 @@ virSecuritySELinuxRestoreFileLabel(virSecurityManagerPtr mgr, goto cleanup; } - if ((rc = virSecuritySELinuxTransactionAppend(path, NULL, - false, recall, true)) < 0) { - goto cleanup; - } else if (rc > 0) { - ret = 0; - goto cleanup; - } - + /* Recall the label so the ref count label decreases its counter + * even if transaction append below fails. + */ if (recall) { rc = virSecuritySELinuxRecallLabel(newpath, &fcon); if (rc == -2) { @@ -1519,6 +1514,14 @@ virSecuritySELinuxRestoreFileLabel(virSecurityManagerPtr mgr, } } + if ((rc = virSecuritySELinuxTransactionAppend(path, NULL, + false, recall, true)) < 0) { + goto cleanup; + } else if (rc > 0) { + ret = 0; + goto cleanup; + } + if (!recall || rc == -2) { if (stat(newpath, &buf) != 0) { VIR_WARN("cannot stat %s: %s", newpath, -- 2.20.1

3 3

[libvirt] [PATCH v3 0/2] test_driver: implement virDomainMemoryStats
by Ilias Stamatis 02 Aug '19

02 Aug '19

Ilias Stamatis (2): test_driver: add a memballoon device in the default config test_driver: implement virDomainMemoryStats src/test/test_driver.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) -- 2.22.0

2 4

[libvirt] [PATCH v2] test_driver: implement virDomainMemoryStats
by Ilias Stamatis 02 Aug '19

02 Aug '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index aae9875194..0e0acf2baf 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -7367,6 +7367,59 @@ testDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags) return 0; } + +static int +testDomainMemoryStats(virDomainPtr dom, + virDomainMemoryStatPtr stats, + unsigned int nr_stats, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + int cur_memory; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (virDomainObjCheckActive(vm) < 0) + goto cleanup; + + cur_memory = vm->def->mem.cur_balloon; + ret = 0; + +#define STATS_SET_PARAM(name, value) \ + if (ret < nr_stats) { \ + stats[ret].tag = name; \ + stats[ret].val = value; \ + ret++; \ + } + + if (virDomainDefHasMemballoon(vm->def)) { + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_ACTUAL_BALLOON, cur_memory); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_SWAP_IN, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_SWAP_OUT, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_MAJOR_FAULT, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_MINOR_FAULT, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_UNUSED, cur_memory / 2); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_AVAILABLE, cur_memory); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_USABLE, cur_memory / 2); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE, 627319920); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_DISK_CACHES, cur_memory / 10); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_HUGETLB_PGALLOC, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_HUGETLB_PGFAIL, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_RSS, cur_memory); + } + +#undef STATS_SET_PARAM + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + static int testDomainMemoryPeek(virDomainPtr dom, unsigned long long start, @@ -8697,6 +8750,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainManagedSave = testDomainManagedSave, /* 1.1.4 */ .domainHasManagedSaveImage = testDomainHasManagedSaveImage, /* 1.1.4 */ .domainManagedSaveRemove = testDomainManagedSaveRemove, /* 1.1.4 */ + .domainMemoryStats = testDomainMemoryStats, /* 5.7.0 */ .domainMemoryPeek = testDomainMemoryPeek, /* 5.4.0 */ .domainSnapshotNum = testDomainSnapshotNum, /* 1.1.4 */ -- 2.22.0

2 1

[libvirt] [PATCH] vircgroup: fix partition creation for cgroups v2 without systemd
by Pavel Hrdina 02 Aug '19

02 Aug '19

On hosts without systemd libvirt is responsible for creating cgroups topology. With cgroups v2 the logic changed a bit. If we need to create new directory the detection of controllers fails because the directory doesn't exists so there is no cgroup.controllers file. To fix that issue we need to have a parent cgroup where we can look into cgroup.subtree_control to get a list of enabled controllers. To fix the issue reorder the operations to get a parent group fist so we can use it to create a new partition. <https://www.redhat.com/archives/libvir-list/2019-July/msg01309.html> Reported-by: Raghav Gururajan <rvgn(a)disroot.org> Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/util/vircgroup.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 825f62a97b..0789630b47 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -842,6 +842,7 @@ virCgroupNewPartition(const char *path, virCgroupPtr *group) { int ret = -1; + char *tmp; VIR_AUTOFREE(char *) parentPath = NULL; VIR_AUTOFREE(char *) newPath = NULL; virCgroupPtr parent = NULL; @@ -858,25 +859,27 @@ virCgroupNewPartition(const char *path, if (virCgroupSetPartitionSuffix(path, &newPath) < 0) goto cleanup; - if (virCgroupNew(-1, newPath, NULL, controllers, group) < 0) + if (STREQ(newPath, "/")) { + ret = 0; goto cleanup; - - if (STRNEQ(newPath, "/")) { - char *tmp; - if (VIR_STRDUP(parentPath, newPath) < 0) - goto cleanup; - - tmp = strrchr(parentPath, '/'); - tmp++; - *tmp = '\0'; - - if (virCgroupNew(-1, parentPath, NULL, controllers, &parent) < 0) - goto cleanup; - - if (virCgroupMakeGroup(parent, *group, create, VIR_CGROUP_NONE) < 0) - goto cleanup; } + if (VIR_STRDUP(parentPath, newPath) < 0) + goto cleanup; + + tmp = strrchr(parentPath, '/'); + tmp++; + *tmp = '\0'; + + if (virCgroupNew(-1, parentPath, NULL, controllers, &parent) < 0) + goto cleanup; + + if (virCgroupNew(-1, newPath, parent, controllers, group) < 0) + goto cleanup; + + if (virCgroupMakeGroup(parent, *group, create, VIR_CGROUP_NONE) < 0) + goto cleanup; + ret = 0; cleanup: if (ret != 0) -- 2.21.0

1 0

[libvirt] virtio pmem support in libvirt
by Pankaj Gupta 01 Aug '19

01 Aug '19

Hi all, Virtio-pmem support has been added to kernel[1] and qemu[2] upstream. User document[3] has more details on how to use this new device. We now need support in libvirt. Required support would be a subset of features already implemented for emulated nvdimm. We will use new virtio-pmem-pci device and don't require advance ACPI configurations. Can libvirt upstream community implement libvirt support for virtio pmem to complete the entire stack. Thank you in advance. Best regards, Pankaj [1] http://lkml.iu.edu/hypermail/linux/kernel/1907.2/02509.html [2] https://lists.sr.ht/~philmd/qemu/%3C20190702150606.24851-1-mst%40redhat.com… [3] https://lists.gnu.org/archive/html/qemu-devel/2019-07/msg06535.html

2 2

[libvirt] [PATCH] news: add entry for new max_threads_per_process option in qemu.conf
by Jim Fehlig 01 Aug '19

01 Aug '19

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- docs/news.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 82a4ec9c84..3a20f95a0d 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -74,6 +74,17 @@ which portions of a disk have changed since a point in time. </description> </change> + <change> + <summary> + qemu: Add support for overriding max threads per process limit + </summary> + <description> + systemd-based systems impose a limit on the number of threads a + process can spawn, which in some cases can be exceeded by qemu + processes running VMs. Add a <code>max_threads_per_process</code> + option to qemu.conf to override the system default. + </description> + </change> </section> <section title="Removed features"> <change> -- 2.22.0

2 1

[libvirt] [jenkins-ci PATCH 0/6] Update libosinfo (& friends) dependencies
by Fabiano Fidêncio 31 Jul '19

31 Jul '19

libsoup & mingw-libsoup are new dependencies for both libosinfo & osinfo-db-tools since v1.6.0 release libcurl & mingw-curl are no longer a dependency for libosinfo since v1.5.0 release Fabiano Fidêncio (6): mappings: Add mingw*-libsoup mingw*-libosinfo: Add mingw*-libsoup as dependency mingw*-osinfo-db-tools: Add mingw*-libsoup as dependency osinfo-db-tools: Add libsoup as dependency mingw*-libosinfo: Remove mingw*-curl dependency ibosinfo: Remove libcurl dependency guests/vars/mappings.yml | 6 ++++++ guests/vars/projects/libosinfo+mingw32.yml | 2 +- guests/vars/projects/libosinfo+mingw64.yml | 2 +- guests/vars/projects/libosinfo.yml | 1 - guests/vars/projects/osinfo-db-tools+mingw32.yml | 1 + guests/vars/projects/osinfo-db-tools+mingw64.yml | 1 + guests/vars/projects/osinfo-db-tools.yml | 1 + 7 files changed, 11 insertions(+), 3 deletions(-) -- 2.21.0

3 14

[libvirt] [PATCH v2 0/3] misc virhostdevs cleanups
by Daniel Henrique Barboza 31 Jul '19

31 Jul '19

changes in v2: - changed the parameter order in the function calls - gave up on moving virPCIDeviceSetX(pci, true) calls to virPCIDeviceReattach(). The attributes being set changes the behavior of virPCIDeviceReattach() in a more complex way than I expected. I still believe a simplification can be done there, but it became out of scope for a more simplistic cleanup such as this one. These are cleanups that I made together with an attempt to enable parcial PCI Multifunction assignment with managed=true. That work will be scrapped after discussions with Laine in [1], but these cleanups kind of make sense on their own, so here they are. [1] https://www.redhat.com/archives/libvir-list/2019-July/msg01175.html *** BLURB HERE *** Daniel Henrique Barboza (3): virhostdev: introduce virHostdevResetAllPCIDevices virhostdev: remove virHostdevReattachPCIDevice virhostdev: introduce virHostdevReattachAllPCIDevices src/util/virhostdev.c | 148 +++++++++++++++++------------------------- src/util/virpci.c | 14 ++++ 2 files changed, 75 insertions(+), 87 deletions(-) -- 2.21.0

2 6

[libvirt] [PATCH v2 0/2] News for snapshot validation and vtpm encryption
by Han Han 31 Jul '19

31 Jul '19

v1: https://www.redhat.com/archives/libvir-list/2019-July/msg01897.html Han Han (2): news: Allow xml validation for snapshot creation news: Support encrypted soft tpm docs/news.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) -- 2.20.1

3 6

[libvirt] [PATCH] backup: Add news entry for checkpoints
by Eric Blake 31 Jul '19

31 Jul '19

Checkpoints are definitely a news-worthy addition, even if the virDomainBackup API is not going to make it until a later release. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- docs/news.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 1134309ec2..c7ac960523 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -63,6 +63,17 @@ <code>bochs-display</code> device that was added in qemu version 3.0. </description> </change> + <change> + <summary> + api: new virDomainCheckpoint APIs + </summary> + <description> + Introduce several new APIs for creating and managing + checkpoints in the test and qemu drivers (the latter + requires qcow2 images). Checkpoints serve as a way to tell + which portions of a disk have changed since a point in time. + </description> + </change> </section> <section title="Removed features"> <change> -- 2.20.1

2 1

[libvirt] [PATCH 0/6] Relax PCI domain limitation
by Michal Privoznik 31 Jul '19

31 Jul '19

As reported here [1], a PCI domain can be just any number. Well, not in case of traditional 32-bit PCI, bit in case of PCI-X (64-bit PCI; not to be confused with PCI Express), the PCI domain number can really be just anything. I wanted to download the specification from PCI SIG web but it's paid (why on earth would somebody create a standard and then make it not widely available is beyond me). 1: https://www.redhat.com/archives/libvir-list/2019-July/msg01732.html Michal Prívozník (6): qemuBuildPCIHostdevDevStr: Always format PCI domain onto cmd line virPCIDeviceNew: Prefer VIR_RETURN_PTR virPCIDevice: Make @name dynamically allocated lib: Unify PCI address formatting lib: Format PCI address differently virpci: Allow greater PCI domain value in virPCIDeviceAddressIsValid docs/schemas/basictypes.rng | 2 +- src/conf/device_conf.c | 4 +- src/conf/domain_addr.c | 10 ++-- src/conf/domain_audit.c | 3 +- src/conf/domain_conf.c | 12 ++--- src/conf/node_device_conf.c | 12 ++--- src/libxl/libxl_driver.c | 14 +++-- src/qemu/qemu_command.c | 9 ++-- src/qemu/qemu_hotplug.c | 5 +- src/util/virpci.c | 52 +++++++++---------- src/util/virpci.h | 2 + .../hostdev-pci-address-device.args | 2 +- .../qemuxml2argvdata/hostdev-pci-address.args | 2 +- .../hostdev-vfio-zpci-autogenerate.args | 2 +- .../hostdev-vfio-zpci-boundaries.args | 2 +- tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 2 +- tests/qemuxml2argvdata/hostdev-vfio.args | 2 +- .../net-hostdev-bootorder.args | 3 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/net-hostdev.args | 2 +- tests/qemuxml2argvdata/pci-domain-invalid.xml | 2 +- tests/qemuxml2argvdata/pci-rom.args | 4 +- tools/virsh-domain.c | 4 +- 23 files changed, 81 insertions(+), 73 deletions(-) -- 2.21.0

3 11

[libvirt] [PATCH] gitdm: Add some more companies
by Andrea Bolognani 31 Jul '19

31 Jul '19

Employees from these companies have made contributions to libvirt over the past few releases. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. docs/gitdm/companies/others | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/gitdm/companies/others b/docs/gitdm/companies/others index 440397df3d..db2c0061bd 100644 --- a/docs/gitdm/companies/others +++ b/docs/gitdm/companies/others @@ -14,6 +14,7 @@ citrix.com Citrix cloudwatt.com Cloudwatt codethink.co.uk Codethink cumulusnetworks.com Cumulus Networks +dataductus.se Data Ductus datagravity.com DataGravity dell.com Dell diateam.net DIATEAM @@ -67,6 +68,7 @@ otb.bg Open Technologies Bulgaria outscale.com OUTSCALE parallels.com Parallels petalogix.com PetaLogix +quobyte.com Quobyte ravellosystems.com Ravello Systems samsung.com Samsung sde.cz SDE @@ -89,6 +91,7 @@ virtualopensystems.com Virtual Open Systems websense.com Websense wiktel.com Wikstrom Telephone Company windriver.com Wind River +winhong.com Winhong xmission.com XMission xs4all.nl XS4ALL yadro.com YADRO -- 2.21.0

1 0

[libvirt] PCI domain space need be enlarge to support domain great than FFFF
by Changlimin 31 Jul '19

31 Jul '19

For some servers, PCI domain is great than FFFF # lspci 10000:00:00.0 PCI bridge: Intel Corporation Sky Lake-E PCI Express Root Port A (rev 04) 10000:00:01.0 PCI bridge: Intel Corporation Sky Lake-E PCI Express Root Port B (rev 04) 10000:00:02.0 PCI bridge: Intel Corporation Sky Lake-E PCI Express Root Port C (rev 04) 10000:00:03.0 PCI bridge: Intel Corporation Sky Lake-E PCI Express Root Port D (rev 04) 10000:01:00.0 Non-Volatile memory controller: Samsung Electronics Co Ltd NVMe SSD Controller SM961/PM961 10000:02:00.0 Non-Volatile memory controller: Samsung Electronics Co Ltd NVMe SSD Controller SM961/PM961 So some code need to match the larger domain. #define PCI_ADDR_LEN 13 /* "XXXX:XX:XX.X" */ snprintf(dev->name, sizeof(dev->name), "%.4x:%.2x:%.2x.%.1x", domain, bus, slot, function) if (addr->domain > 0xFFFF) {

2 1

[libvirt] [PATCH] news: Allow xml validation for snapshot creation
by Han Han 31 Jul '19

31 Jul '19

Signed-off-by: Han Han <hhan(a)redhat.com> --- docs/news.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 1134309ec2..6d90ea8389 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -76,6 +76,16 @@ </change> </section> <section title="Improvements"> + <change> + <summary> + qemu: Allow to validate xml for snapshot creation + </summary> + <description> + Add flag <code>VIR_DOMAIN_SNAPSHOT_CREATE_VALIDATE</code> to validate + snapshot input xml. For virsh, users can use it as <code>virsh + snapshot-create --validate</code>. + </description> + </change> </section> <section title="Bug fixes"> </section> -- 2.20.1

1 0

[libvirt] [PATCH] build: bump min required gcc to 4.8
by Daniel P. Berrangé 30 Jul '19

30 Jul '19

The previous bump to 4.4 was done in: commit 24241c236e5e0b0b51a33ba539b40f5429a0df0e Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Wed Jul 5 10:35:32 2017 +0100 Require use of GCC 4.4 or CLang compilers with 4.4 picked due to RHEL-6. Since we dropped RHEL-6, the next oldest distros are RHEL-7 (4.8.5) or Debian Jessie (4.9.2). Thus we pick 4.8 as the new min. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- config-post.h | 6 ++-- m4/virt-compile-warnings.m4 | 71 ++----------------------------------- src/internal.h | 44 +++++++---------------- src/util/virbuffer.c | 3 -- src/util/virstring.c | 3 -- src/util/virsysinfo.c | 4 --- 6 files changed, 19 insertions(+), 112 deletions(-) diff --git a/config-post.h b/config-post.h index 093f84a7ce..f928e19273 100644 --- a/config-post.h +++ b/config-post.h @@ -71,7 +71,7 @@ #endif /* LIBVIRT_NSS */ #ifndef __GNUC__ -# error "Libvirt requires GCC >= 4.4, or CLang" +# error "Libvirt requires GCC >= 4.8, or CLang" #endif /* @@ -86,6 +86,6 @@ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) #endif -#if !(__GNUC_PREREQ(4, 4) || defined(__clang__)) -# error "Libvirt requires GCC >= 4.4, or CLang" +#if !(__GNUC_PREREQ(4, 8) || defined(__clang__)) +# error "Libvirt requires GCC >= 4.8, or CLang" #endif diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index fc185aef38..f9460e82ba 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -68,61 +68,8 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ # Source: https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html dontwarn="$dontwarn -Wdisabled-optimization" - # gcc 4.2 treats attribute(format) as an implicit attribute(nonnull), - # which triggers spurious warnings for our usage - AC_CACHE_CHECK([whether the C compiler's -Wformat allows NULL strings], - [lv_cv_gcc_wformat_null_works], [ - save_CFLAGS=$CFLAGS - CFLAGS='-Wunknown-pragmas -Werror -Wformat' - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <stddef.h> - static __attribute__ ((__format__ (__printf__, 1, 2))) int - foo (const char *fmt, ...) { return !fmt; } - ]], [[ - return foo(NULL); - ]])], - [lv_cv_gcc_wformat_null_works=yes], - [lv_cv_gcc_wformat_null_works=no]) - CFLAGS=$save_CFLAGS]) - - # Gnulib uses '#pragma GCC diagnostic push' to silence some - # warnings, but older gcc doesn't support this. - AC_CACHE_CHECK([whether pragma GCC diagnostic push works], - [lv_cv_gcc_pragma_push_works], [ - save_CFLAGS=$CFLAGS - CFLAGS='-Wunknown-pragmas -Werror' - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #pragma GCC diagnostic push - #pragma GCC diagnostic pop - ]])], - [lv_cv_gcc_pragma_push_works=yes], - [lv_cv_gcc_pragma_push_works=no]) - CFLAGS=$save_CFLAGS]) - if test $lv_cv_gcc_pragma_push_works = no; then - dontwarn="$dontwarn -Wmissing-prototypes" - dontwarn="$dontwarn -Wmissing-declarations" - dontwarn="$dontwarn -Wcast-align" - else - AC_DEFINE_UNQUOTED([WORKING_PRAGMA_PUSH], 1, - [Define to 1 if gcc supports pragma push/pop]) - fi - - dnl Check whether strchr(s, char variable) causes a bogus compile - dnl warning, which is the case with GCC < 4.6 on some glibc - AC_CACHE_CHECK([whether the C compiler's -Wlogical-op gives bogus warnings], - [lv_cv_gcc_wlogical_op_broken], [ - save_CFLAGS="$CFLAGS" - CFLAGS="-O2 -Wlogical-op -Werror" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <string.h> - ]], [[ - const char *haystack; - char needle; - return strchr(haystack, needle) == haystack;]])], - [lv_cv_gcc_wlogical_op_broken=no], - [lv_cv_gcc_wlogical_op_broken=yes]) - CFLAGS="$save_CFLAGS"]) - + # Broken in 6.0 and later + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602 AC_CACHE_CHECK([whether gcc gives bogus warnings for -Wlogical-op], [lv_cv_gcc_wlogical_op_equal_expr_broken], [ save_CFLAGS="$CFLAGS" @@ -188,14 +135,8 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ wantwarn="$wantwarn -Wswitch-enum" # GNULIB turns on -Wformat=2 which implies -Wformat-nonliteral, - # so we need to manually re-exclude it. Also, older gcc 4.2 - # added an implied ATTRIBUTE_NONNULL on any parameter marked - # ATTRIBUTE_FMT_PRINT, which causes -Wformat failure on our - # intentional use of virReportError(code, NULL). + # so we need to manually re-exclude it. wantwarn="$wantwarn -Wno-format-nonliteral" - if test $lv_cv_gcc_wformat_null_works = no; then - wantwarn="$wantwarn -Wno-format" - fi # -Wformat enables this by default, and we should keep it, # but need to rewrite various areas of code first @@ -283,12 +224,6 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ #endif ]) - if test "$gl_cv_warn_c__Wlogical_op" = yes && - test "$lv_cv_gcc_wlogical_op_broken" = yes; then - AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP_STRCHR], 1, - [Define to 1 if gcc -Wlogical-op reports false positives on strchr]) - fi - if test "$gl_cv_warn_c__Wlogical_op" = yes && test "$lv_cv_gcc_wlogical_op_equal_expr_broken" = yes; then AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP_EQUAL_EXPR], 1, diff --git a/src/internal.h b/src/internal.h index f718895460..adc1e3f496 100644 --- a/src/internal.h +++ b/src/internal.h @@ -185,54 +185,36 @@ # endif #endif -#if WORKING_PRAGMA_PUSH -# define VIR_WARNINGS_NO_CAST_ALIGN \ +#define VIR_WARNINGS_NO_CAST_ALIGN \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wcast-align\"") -# define VIR_WARNINGS_NO_DEPRECATED \ +#define VIR_WARNINGS_NO_DEPRECATED \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wdeprecated-declarations\"") -# if HAVE_SUGGEST_ATTRIBUTE_FORMAT -# define VIR_WARNINGS_NO_PRINTF \ +#if HAVE_SUGGEST_ATTRIBUTE_FORMAT +# define VIR_WARNINGS_NO_PRINTF \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=format\"") -# else -# define VIR_WARNINGS_NO_PRINTF \ +#else +# define VIR_WARNINGS_NO_PRINTF \ _Pragma ("GCC diagnostic push") -# endif +#endif /* Workaround bogus GCC 6.0 for logical 'or' equal expression warnings. * (GCC bz 69602) */ -# if BROKEN_GCC_WLOGICALOP_EQUAL_EXPR -# define VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR \ +#if BROKEN_GCC_WLOGICALOP_EQUAL_EXPR +# define VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wlogical-op\"") -# else -# define VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR \ - _Pragma ("GCC diagnostic push") -# endif - -# define VIR_WARNINGS_RESET \ - _Pragma ("GCC diagnostic pop") #else -# define VIR_WARNINGS_NO_CAST_ALIGN -# define VIR_WARNINGS_NO_DEPRECATED -# define VIR_WARNINGS_NO_PRINTF -# define VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR -# define VIR_WARNINGS_RESET -#endif - -/* Workaround bogus GCC < 4.6 that produces false -Wlogical-op warnings for - * strchr(). Those old GCCs don't support push/pop. */ -#if BROKEN_GCC_WLOGICALOP_STRCHR -# define VIR_WARNINGS_NO_WLOGICALOP_STRCHR \ - _Pragma ("GCC diagnostic ignored \"-Wlogical-op\"") -#else -# define VIR_WARNINGS_NO_WLOGICALOP_STRCHR +# define VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR \ + _Pragma ("GCC diagnostic push") #endif +#define VIR_WARNINGS_RESET \ + _Pragma ("GCC diagnostic pop") /* * Use this when passing possibly-NULL strings to printf-a-likes. diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c index ac03b15a61..12b33f8bd6 100644 --- a/src/util/virbuffer.c +++ b/src/util/virbuffer.c @@ -421,9 +421,6 @@ virBufferVasprintf(virBufferPtr buf, const char *format, va_list argptr) } -VIR_WARNINGS_NO_WLOGICALOP_STRCHR - - /** * virBufferEscapeString: * @buf: the buffer to append to diff --git a/src/util/virstring.c b/src/util/virstring.c index 95bd7d225e..bd269e98fe 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1350,9 +1350,6 @@ virStringHasControlChars(const char *str) } -VIR_WARNINGS_NO_WLOGICALOP_STRCHR - - /** * virStringStripControlChars: * @str: the string to strip diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 5be5e5133d..af26e0bab9 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -478,10 +478,6 @@ virSysinfoReadARM(void) return NULL; } - - -VIR_WARNINGS_NO_WLOGICALOP_STRCHR - static char * virSysinfoParseS390Delimited(const char *base, const char *name, char **value, char delim1, char delim2) -- 2.21.0

2 1

[libvirt] [PATCH] test_driver: implement virDomainMemoryStats
by Ilias Stamatis 30 Jul '19

30 Jul '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index fcb80c9e47..55976eedf1 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -6845,6 +6845,57 @@ testDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags) return 0; } + +static int +testDomainMemoryStats(virDomainPtr dom, + virDomainMemoryStatPtr stats, + unsigned int nr_stats, + unsigned int flags) +{ + virDomainObjPtr vm; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (virDomainObjCheckActive(vm) < 0) + goto cleanup; + + ret = 0; + +#define STATS_SET_PARAM(name, value) \ + if (ret < nr_stats) { \ + stats[ret].tag = name; \ + stats[ret].val = value; \ + ret++; \ + } + + if (virDomainDefHasMemballoon(vm->def)) { + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_ACTUAL_BALLOON, 1024000); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_SWAP_IN, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_SWAP_OUT, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_MAJOR_FAULT, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_MINOR_FAULT, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_UNUSED, 791584); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_AVAILABLE, 977816); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_USABLE, 726244); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE, 627319920); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_DISK_CACHES, 164964); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_HUGETLB_PGALLOC, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_HUGETLB_PGFAIL, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_RSS, 1131076); + } + +#undef STATS_SET_PARAM + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + static int testDomainMemoryPeek(virDomainPtr dom, unsigned long long start, @@ -7799,6 +7850,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainManagedSave = testDomainManagedSave, /* 1.1.4 */ .domainHasManagedSaveImage = testDomainHasManagedSaveImage, /* 1.1.4 */ .domainManagedSaveRemove = testDomainManagedSaveRemove, /* 1.1.4 */ + .domainMemoryStats = testDomainMemoryStats, /* 5.6.0 */ .domainMemoryPeek = testDomainMemoryPeek, /* 5.4.0 */ .domainSnapshotNum = testDomainSnapshotNum, /* 1.1.4 */ -- 2.22.0

2 3

[libvirt] [PATCH] cpu: Drop CPUID definition for hv-spinlocks
by Jiri Denemark 30 Jul '19

30 Jul '19

hv-spinlocks is not a CPUID feature and should not be checked as such. While starting a domain with hv-spinlocks enabled, we would report a warning about unsupported hyperv spinlocks feature even though it was set properly. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu_x86.c | 3 --- src/qemu/qemu_process.c | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 387c365512..b58eb2c9d8 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -84,8 +84,6 @@ KVM_FEATURE_DEF(VIR_CPU_x86_HV_STIMER, 0x40000003, 0x00000008); KVM_FEATURE_DEF(VIR_CPU_x86_HV_RELAXED, 0x40000003, 0x00000020); -KVM_FEATURE_DEF(VIR_CPU_x86_HV_SPINLOCKS, - 0x40000003, 0x00000022); KVM_FEATURE_DEF(VIR_CPU_x86_HV_VAPIC, 0x40000003, 0x00000030); KVM_FEATURE_DEF(VIR_CPU_x86_HV_VPINDEX, @@ -110,7 +108,6 @@ static virCPUx86Feature x86_kvm_features[] = KVM_FEATURE(VIR_CPU_x86_HV_SYNIC), KVM_FEATURE(VIR_CPU_x86_HV_STIMER), KVM_FEATURE(VIR_CPU_x86_HV_RELAXED), - KVM_FEATURE(VIR_CPU_x86_HV_SPINLOCKS), KVM_FEATURE(VIR_CPU_x86_HV_VAPIC), KVM_FEATURE(VIR_CPU_x86_HV_VPINDEX), KVM_FEATURE(VIR_CPU_x86_HV_RESET), diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 0ee97e2296..0ba04b48e6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4098,7 +4098,8 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def, for (i = 0; i < VIR_DOMAIN_HYPERV_LAST; i++) { /* always supported string property */ - if (i == VIR_DOMAIN_HYPERV_VENDOR_ID) + if (i == VIR_DOMAIN_HYPERV_VENDOR_ID || + i == VIR_DOMAIN_HYPERV_SPINLOCKS) continue; if (def->hyperv_features[i] != VIR_TRISTATE_SWITCH_ON) @@ -4119,7 +4120,6 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def, switch ((virDomainHyperv) i) { case VIR_DOMAIN_HYPERV_RELAXED: case VIR_DOMAIN_HYPERV_VAPIC: - case VIR_DOMAIN_HYPERV_SPINLOCKS: VIR_WARN("host doesn't support hyperv '%s' feature", virDomainHypervTypeToString(i)); break; @@ -4140,6 +4140,7 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def, return -1; /* coverity[dead_error_begin] */ + case VIR_DOMAIN_HYPERV_SPINLOCKS: case VIR_DOMAIN_HYPERV_VENDOR_ID: case VIR_DOMAIN_HYPERV_LAST: break; -- 2.22.0

2 1

[libvirt] UID/GID during kvm/qemu migrate
by Stephan von Krawczynski 30 Jul '19

30 Jul '19

Hello, is there some immanent code in libvirt that forces UID/GID of the libvirt standard user to be the same on two boxes migrating qemu vms against each other? The migration itself uses root obviously (password is requested). But if a vm xml does not contain any definition regarding UID/GID what else could prevent this from working? I believe I ran into such a problem trying to migrate and ending up in an error, a vm still working on original host but its fs (netfs pool (nfs/raw)) being switched to read-only... -- Regards, Stephan

2 4

[libvirt] [PATCH v2 0/8] Add support for Direct Mode for Hyper-V Synthetic timers
by Vitaly Kuznetsov 30 Jul '19

30 Jul '19

Changes since v1: - Rebase - Add Ján's R-b tags. - Hardcode 'direct' as the only stimer feature to avoid over-engineering [Ján Tomko] - Split 'conf' patch into three [Ján Tomko] - Minor fixes [Ján Tomko] QEMU-4.1 will bring us Direct Mode for Hyper-V Synthetic timers support, we need to support it in libvirt too. As this is not a new enlightenment but rather an enhancement of an existing one ('stimer'), support it in <stimer state='on'> <direct state='on'/> </stimer> form. Backwards compatibility is (hopefully) preserved. Vitaly Kuznetsov (8): docs: formatdomain: add stimer flag to the example xml docs: formatdomain: fix 'SynIC' spelling docs: formatdomain: move 'msrs' out of Hyper-V Enlightenments cpu_x86: add Edx to KVM_FEATURE_DEF() conf: change the way how Hyper-V features are printed out conf: add support for Direct Mode for Hyper-V Synthetic timers qemu: add support for Direct Mode for Hyper-V Synthetic timers news: mention Direct Mode for Hyper-V Synthetic timers support docs/formatdomain.html.in | 13 +++-- docs/news.xml | 9 ++++ docs/schemas/domaincommon.rng | 16 +++++- src/conf/domain_conf.c | 77 ++++++++++++++++++++++++++--- src/conf/domain_conf.h | 1 + src/cpu/cpu_x86.c | 35 +++++++------ src/cpu/cpu_x86_data.h | 2 + src/qemu/qemu_command.c | 12 +++-- src/qemu/qemu_process.c | 20 +++++++- tests/qemuxml2argvdata/hyperv.args | 4 +- tests/qemuxml2argvdata/hyperv.xml | 4 +- tests/qemuxml2xmloutdata/hyperv.xml | 4 +- 12 files changed, 158 insertions(+), 39 deletions(-) -- 2.20.1

2 9

[libvirt] [PATCH 00/41] Split the libvirtd daemon into per-driver daemons
by Daniel P. Berrangé 30 Jul '19

30 Jul '19

This is what all the driver refactoring I've done has been about enabling. We gain new daemons for each driver, for the primary virt drivers: virtlibxld virtlxcd virtqemud virtvboxd virtvzd And again for the secondary drivers virtinterfaced virtnetworkd virtnodedevd virtnwfilterd virtsecretd virtstoraged Finally to support IP connectivity, and also the legacy lbivirtd UNIX domain socket (for the old libvirt remote driver SSH tunnelling): virtproxyd The the sake of facilitating upgrades, the existing libvirtd still exists and works the same way it always has. You either run libvirtd, or you run the per-driver daemons, never both. The remote driver will look to see whether libvirtd is running to figure out whether to connect to libvirtd or the new per-driver daemons. When auto-spawning daemons for nonroot users, we default to spawning the per-driver daemons. This can be controlled with a UR parameter "?mode=direct|legacy|auto", where 'direct' means per-driver and 'legacy' means libvirtd (or indirect via virtproxyd if that's running). Changed in v2: - Added systemd unit files for service & sockets, ensuring conflicts with libvirtd - Fixed proxy to actually handle probing of URIs (still not quite perfect) - Renamed virtlibxld to virtxend as "xen" is the user facing name of the URI - Lazy loading of secondary drivers, so connecting to virtqemud does't auto-spawn all secondary driver daemons, until a relevant API is actually invoked - Actually generated config files / augeas files per daemon - Abort daemon startup if driver fails to load - Many other fixes Still a few things to do.... Important: - Tweak virtxend to not start unless on a xen host - Identity forwarding so that when connecting to virtproxyd the apps identity is sent onto virtqemud. Without this, virtqemud would see the client as "root" and so polkit would allow all access. Opps Nice to have - MAYBE make it possible to disable build of libvirtd, or of the per-driver daemons so downstream vendors can decide which to ship. Alternatively they can just not include the binary in the package file list ? - Tuning of the daemon defaults for worker threads to better suit the fact that we have per-driver daemons - More work on RPM packaging to allow install of per-driver daemosn without pulling in libvirtd too - Hopefully not much else. Daniel P. Berrangé (41): build: make augeas-gentest.pl write to stdout build: create all augeas test files in same dir as their source build: collapse rules adding augeas tests to CLEANFILES build: use a common rule for checking augeas test data files build: centralize rule for handling generated config files remote: stop trying to print help as giant blocks of text remote: conditionalize socket names in libvirtd daemon remote: conditionalize daemon name in libvirtd daemon remote: conditionalize driver loading in libvirtd daemon remote: conditionalize IP socket usage in libvirtd daemon remote: conditionalize IP socket config in libvirtd.conf remote: conditionalize IP socket config in augeas definitions remote: refactor & rename variables for building libvirtd remote: don't hardcode /etc in the systemd units remote: reduce duplication in systemd unit file make rules into one remote: conditionalize systemd socket unit files remote: refactor how list of systemd unit files is built remote: in per-driver daemons ensure that state initialize succeeds remote: introduce virtproxyd daemon to handle IP connectivity secret: introduce virtsecretd daemon network: introduce virtnetworkd daemon interface: introduce virtinterfaced daemon storage: introduce virtstoraged daemon nodedev: introduce virtnodedevd daemon nwfilter: introduce virtnwfilterd daemon libxl: introduce virtxend daemon qemu: introduce virtqemud daemon lxc: introduce virtlxcd daemon vbox: introduce virtvboxd daemon bhyve: introduce virtbhyved daemon vz: introduce virtvzd daemon admin: add ability to connect to the per-driver daemon sockets remote: get rid of bogus ATTRIBUTE_UNUSED annotation client param remote: change generated methods to not directly access connection remote: change hand written methods to not directly access connection remote: open secondary drivers via remote driver if needed remote: handle autoprobing of driver within virtproxyd remote: use enum helpers for parsing remote driver transport remote: refactor the code for choosing the UNIX socket path remote: switch to connect to per-driver daemons by default libvirt: correctly print out URI returned from probing .gitignore | 62 +- build-aux/augeas-gentest.pl | 22 +- libvirt.spec.in | 91 ++ m4/virt-driver-remote.m4 | 15 + src/Makefile.am | 26 +- src/admin/admin_server_dispatch.c | 9 + src/bhyve/Makefile.inc.am | 55 +- src/bhyve/bhyve_driver.c | 10 +- src/driver-state.h | 8 +- src/driver.h | 2 + src/interface/Makefile.inc.am | 62 + src/interface/interface_backend_netcf.c | 8 +- src/interface/interface_backend_udev.c | 4 +- src/interface/virtinterfaced.service.in | 24 + src/libvirt-admin.c | 32 +- src/libvirt.c | 42 +- src/libvirt_internal.h | 1 + src/libxl/Makefile.inc.am | 79 +- src/libxl/libxl_driver.c | 10 +- src/libxl/virtxend.service.in | 24 + src/locking/Makefile.inc.am | 76 +- src/logging/Makefile.inc.am | 22 +- src/lxc/Makefile.inc.am | 77 +- src/lxc/lxc_driver.c | 12 +- src/lxc/virtlxcd.service.in | 24 + src/network/Makefile.inc.am | 61 + src/network/bridge_driver.c | 4 +- src/network/virtnetworkd.service.in | 24 + src/node_device/Makefile.inc.am | 62 + src/node_device/node_device_hal.c | 12 +- src/node_device/node_device_udev.c | 8 +- src/node_device/virtnodedevd.service.in | 24 + src/nwfilter/Makefile.inc.am | 62 + src/nwfilter/nwfilter_driver.c | 12 +- src/nwfilter/virtnwfilterd.service.in | 24 + src/qemu/Makefile.inc.am | 76 +- src/qemu/qemu_driver.c | 8 +- src/qemu/virtqemud.service.in | 24 + src/remote/Makefile.inc.am | 281 ++-- src/remote/libvirtd-admin.socket.in | 15 +- src/remote/libvirtd-ro.socket.in | 15 +- src/remote/libvirtd-tcp.socket.in | 13 +- src/remote/libvirtd-tls.socket.in | 13 +- src/remote/{libvirtd.aug => libvirtd.aug.in} | 26 +- .../{libvirtd.conf => libvirtd.conf.in} | 42 +- src/remote/libvirtd.service.in | 2 +- src/remote/libvirtd.socket.in | 11 +- src/remote/remote_daemon.c | 291 ++-- src/remote/remote_daemon.h | 13 + src/remote/remote_daemon_config.c | 47 +- src/remote/remote_daemon_config.h | 9 +- src/remote/remote_daemon_dispatch.c | 1205 +++++++++-------- src/remote/remote_driver.c | 396 ++++-- src/remote/remote_driver.h | 4 - src/remote/test_libvirtd.aug.in | 16 +- src/remote/virtproxyd.service.in | 24 + src/rpc/gendispatch.pl | 96 +- src/secret/Makefile.inc.am | 62 + src/secret/secret_driver.c | 8 +- src/secret/virtsecretd.service.in | 24 + src/storage/Makefile.inc.am | 61 + src/storage/storage_driver.c | 8 +- src/storage/virtstoraged.service.in | 24 + src/vbox/Makefile.inc.am | 62 + src/vbox/virtvboxd.service.in | 24 + src/vz/Makefile.inc.am | 62 + src/vz/virtvzd.service.in | 24 + src/vz/vz_driver.c | 14 +- 68 files changed, 2832 insertions(+), 1258 deletions(-) create mode 100644 src/interface/virtinterfaced.service.in create mode 100644 src/libxl/virtxend.service.in create mode 100644 src/lxc/virtlxcd.service.in create mode 100644 src/network/virtnetworkd.service.in create mode 100644 src/node_device/virtnodedevd.service.in create mode 100644 src/nwfilter/virtnwfilterd.service.in create mode 100644 src/qemu/virtqemud.service.in rename src/remote/{libvirtd.aug => libvirtd.aug.in} (89%) rename src/remote/{libvirtd.conf => libvirtd.conf.in} (95%) create mode 100644 src/remote/virtproxyd.service.in create mode 100644 src/secret/virtsecretd.service.in create mode 100644 src/storage/virtstoraged.service.in create mode 100644 src/vbox/virtvboxd.service.in create mode 100644 src/vz/virtvzd.service.in -- 2.21.0

3 108

[libvirt] [python PATCH v7] Add virDomainCheckpoint APIs
by Eric Blake 29 Jul '19

29 Jul '19

Copies heavily from existing virDomainSnapshot handling, regarding what special cases the generator has to be taught and what overrides need to be written. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Python counterparts to my incremental backup patches. An earlier version was already reviewed by Dan; the main diff here is the addition of virDomainSnapshotCreateXML2 handling. HACKING | 2 + MANIFEST.in | 1 + generator.py | 37 ++++++++-- libvirt-override-api.xml | 12 ++++ libvirt-override-virDomain.py | 13 ++++ libvirt-override-virDomainCheckpoint.py | 19 +++++ libvirt-override.c | 96 +++++++++++++++++++++++++ sanitytest.py | 11 +-- typewrappers.c | 13 ++++ typewrappers.h | 10 +++ 10 files changed, 206 insertions(+), 8 deletions(-) create mode 100644 libvirt-override-virDomainCheckpoint.py diff --git a/HACKING b/HACKING index 6eeb9e6..39e7cd3 100644 --- a/HACKING +++ b/HACKING @@ -28,6 +28,8 @@ hand written source files the virConnect class - libvirt-override-virDomain.py - high level overrides in the virDomain class + - libvirt-override-virDomainCheckpoint.py - high level overrides in + the virDomainCheckpoint class - libvirt-override-virDomainSnapshot.py - high level overrides in the virDomainSnapshot class - libvirt-override-virStoragePool.py - high level overrides in diff --git a/MANIFEST.in b/MANIFEST.in index b6788f4..5d2f559 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -23,6 +23,7 @@ include libvirt-override.c include libvirt-override.py include libvirt-override-virConnect.py include libvirt-override-virDomain.py +include libvirt-override-virDomainCheckpoint.py include libvirt-override-virDomainSnapshot.py include libvirt-override-virStoragePool.py include libvirt-override-virStream.py diff --git a/generator.py b/generator.py index ffa3ce5..a16f9b1 100755 --- a/generator.py +++ b/generator.py @@ -35,6 +35,7 @@ libvirt_headers = [ "libvirt", "libvirt-common", "libvirt-domain", + "libvirt-domain-checkpoint", "libvirt-domain-snapshot", "libvirt-event", "libvirt-host", @@ -364,6 +365,10 @@ py_types = { 'virStream *': ('O', "virStream", "virStreamPtr", "virStreamPtr"), 'const virStream *': ('O', "virStream", "virStreamPtr", "virStreamPtr"), + 'virDomainCheckpointPtr': ('O', "virDomainCheckpoint", "virDomainCheckpointPtr", "virDomainCheckpointPtr"), + 'virDomainCheckpoint *': ('O', "virDomainCheckpoint", "virDomainCheckpointPtr", "virDomainCheckpointPtr"), + 'const virDomainCheckpoint *': ('O', "virDomainCheckpoint", "virDomainCheckpointPtr", "virDomainCheckpointPtr"), + 'virDomainSnapshotPtr': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"), 'virDomainSnapshot *': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"), 'const virDomainSnapshot *': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"), @@ -536,6 +541,8 @@ skip_function = ( 'virSaveLastError', # We have our own python error wrapper 'virFreeError', # Only needed if we use virSaveLastError 'virConnectListAllDomains', # overridden in virConnect.py + 'virDomainListAllCheckpoints', # overridden in virDomain.py + 'virDomainCheckpointListAllChildren', # overridden in virDomainCheckpoint.py 'virDomainListAllSnapshots', # overridden in virDomain.py 'virDomainSnapshotListAllChildren', # overridden in virDomainSnapshot.py 'virConnectListAllStoragePools', # overridden in virConnect.py @@ -582,6 +589,7 @@ skip_function = ( "virStoragePoolRef", "virStorageVolRef", "virStreamRef", + "virDomainCheckpointRef", "virDomainSnapshotRef", # This functions shouldn't be called via the bindings (and even the docs @@ -594,6 +602,8 @@ skip_function = ( "virNWFilterGetConnect", "virStoragePoolGetConnect", "virStorageVolGetConnect", + "virDomainCheckpointGetConnect", + "virDomainCheckpointGetDomain", "virDomainSnapshotGetConnect", "virDomainSnapshotGetDomain", @@ -1023,6 +1033,8 @@ classes_type = { "virStream *": ("._o", "virStream(self, _obj=%s)", "virStream"), "virConnectPtr": ("._o", "virConnect(_obj=%s)", "virConnect"), "virConnect *": ("._o", "virConnect(_obj=%s)", "virConnect"), + "virDomainCheckpointPtr": ("._o", "virDomainCheckpoint(self,_obj=%s)", "virDomainCheckpoint"), + "virDomainCheckpoint *": ("._o", "virDomainCheckpoint(self, _obj=%s)", "virDomainCheckpoint"), "virDomainSnapshotPtr": ("._o", "virDomainSnapshot(self,_obj=%s)", "virDomainSnapshot"), "virDomainSnapshot *": ("._o", "virDomainSnapshot(self, _obj=%s)", "virDomainSnapshot"), } @@ -1031,7 +1043,7 @@ primary_classes = ["virDomain", "virNetwork", "virInterface", "virStoragePool", "virStorageVol", "virConnect", "virNodeDevice", "virSecret", "virNWFilter", "virNWFilterBinding", - "virStream", "virDomainSnapshot"] + "virStream", "virDomainCheckpoint", "virDomainSnapshot"] classes_destructors = { "virDomain": "virDomainFree", @@ -1043,6 +1055,7 @@ classes_destructors = { "virSecret": "virSecretFree", "virNWFilter": "virNWFilterFree", "virNWFilterBinding": "virNWFilterBindingFree", + "virDomainCheckpoint": "virDomainCheckpointFree", "virDomainSnapshot": "virDomainSnapshotFree", # We hand-craft __del__ for this one #"virStream": "virStreamFree", @@ -1053,6 +1066,7 @@ class_skip_connect_impl = { } class_domain_impl = { + "virDomainCheckpoint": True, "virDomainSnapshot": True, } @@ -1171,6 +1185,18 @@ def nameFixup(name, classe, type, file): elif name[0:12] == "virDomainGet": func = name[12:] func = func[0:1].lower() + func[1:] + elif name[0:31] == "virDomainCheckpointLookupByName": + func = name[9:] + func = func[0:1].lower() + func[1:] + elif name[0:28] == "virDomainCheckpointCreateXML": + func = name[9:] + func = func[0:1].lower() + func[1:] + elif name[0:26] == "virDomainCheckpointCurrent": + func = name[9:] + func = func[0:1].lower() + func[1:] + elif name[0:19] == "virDomainCheckpoint": + func = name[19:] + func = func[0:1].lower() + func[1:] elif name[0:29] == "virDomainSnapshotLookupByName": func = name[9:] func = func[0:1].lower() + func[1:] @@ -1183,6 +1209,9 @@ def nameFixup(name, classe, type, file): elif name[0:20] == "virDomainSnapshotNum": func = name[9:] func = func[0:1].lower() + func[1:] + elif name[0:27] == "virDomainSnapshotCreateXML2": + func = name[9:] + func = func[0:1].lower() + func[1:] elif name[0:26] == "virDomainSnapshotCreateXML": func = name[9:] func = func[0:1].lower() + func[1:] @@ -1501,7 +1530,7 @@ def buildWrappers(module): "virStorageVol", "virNodeDevice", "virSecret","virStream", "virNWFilter", "virNWFilterBinding" ]: classes.write(" def __init__(self, conn, _obj=None):\n") - elif classname in [ 'virDomainSnapshot' ]: + elif classname in [ "virDomainCheckpoint", "virDomainSnapshot" ]: classes.write(" def __init__(self, dom, _obj=None):\n") else: classes.write(" def __init__(self, _obj=None):\n") @@ -1513,7 +1542,7 @@ def buildWrappers(module): classes.write(" self._conn = conn\n" + \ " if not isinstance(conn, virConnect):\n" + \ " self._conn = conn._conn\n") - elif classname in [ "virDomainSnapshot" ]: + elif classname in [ "virDomainCheckpoint", "virDomainSnapshot" ]: classes.write(" self._dom = dom\n") classes.write(" self._conn = dom.connect()\n") classes.write(" if type(_obj).__name__ not in [\"PyCapsule\", \"PyCObject\"]:\n") @@ -1641,7 +1670,7 @@ def buildWrappers(module): classes.write( " if ret is None:raise libvirtError('%s() failed', vol=self)\n" % (name)) - elif classname == "virDomainSnapshot": + elif classname in [ "virDomainCheckpoint", "virDomainSnapshot"]: classes.write( " if ret is None:raise libvirtError('%s() failed', dom=self._dom)\n" % (name)) diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index 7f578e0..1edf0c5 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -576,6 +576,18 @@ <arg name='flags' type='unsigned int' info='flags'/> <return type='int' info="0 on success, -1 on error"/> </function> + <function name='virDomainListAllCheckpoints' file='python'> + <info>returns the list of checkpoints for the given domain</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='flags' type='unsigned int' info='flags'/> + <return type='char *' info='the list of checkpoints or None in case of error'/> + </function> + <function name='virDomainCheckpointListAllChildren' file='python'> + <info>collect the list of child checkpoint names for the given checkpoint</info> + <arg name='checkpoint' type='virDomainCheckpointPtr' info='pointer to the checkpoint'/> + <arg name='flags' type='unsigned int' info='flags'/> + <return type='char *' info='the list of checkpoints or None in case of error'/> + </function> <function name='virDomainGetBlockJobInfo' file='python'> <info>Get progress information for a block job</info> <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> diff --git a/libvirt-override-virDomain.py b/libvirt-override-virDomain.py index 7c417b8..7ce34f1 100644 --- a/libvirt-override-virDomain.py +++ b/libvirt-override-virDomain.py @@ -11,6 +11,19 @@ return retlist + def listAllCheckpoints(self, flags=0): + """List all checkpoints and returns a list of checkpoint objects""" + ret = libvirtmod.virDomainListAllCheckpoints(self._o, flags) + if ret is None: + raise libvirtError("virDomainListAllCheckpoints() failed", conn=self) + + retlist = list() + for chkptr in ret: + retlist.append(virDomainCheckpoint(self, _obj=chkptr)) + + return retlist + + def createWithFiles(self, files, flags=0): """Launch a defined domain. If the call succeeds the domain moves from the defined to the running domains pools. diff --git a/libvirt-override-virDomainCheckpoint.py b/libvirt-override-virDomainCheckpoint.py new file mode 100644 index 0000000..371b0fd --- /dev/null +++ b/libvirt-override-virDomainCheckpoint.py @@ -0,0 +1,19 @@ + def getConnect(self): + """Get the connection that owns the domain that a checkpoint was created for""" + return self.connect() + + def getDomain(self): + """Get the domain that a checkpoint was created for""" + return self.domain() + + def listAllChildren(self, flags=0): + """List all child checkpoints and returns a list of checkpoint objects""" + ret = libvirtmod.virDomainCheckpointListAllChildren(self._o, flags) + if ret is None: + raise libvirtError("virDomainCheckpointListAllChildren() failed", conn=self) + + retlist = list() + for chkptr in ret: + retlist.append(virDomainCheckpoint(self, _obj=chkptr)) + + return retlist diff --git a/libvirt-override.c b/libvirt-override.c index c5e2908..777f533 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -2325,6 +2325,98 @@ libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; } +#if LIBVIR_CHECK_VERSION(5, 1, 0) +static PyObject * +libvirt_virDomainListAllCheckpoints(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *py_retval = NULL; + virDomainCheckpointPtr *chks = NULL; + int c_retval; + ssize_t i; + virDomainPtr dom; + PyObject *pyobj_dom; + unsigned int flags; + + if (!PyArg_ParseTuple(args, (char *)"OI:virDomainListAllCheckpoints", + &pyobj_dom, &flags)) + return NULL; + dom = (virDomainPtr) PyvirDomain_Get(pyobj_dom); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainListAllCheckpoints(dom, &chks, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval < 0) + return VIR_PY_NONE; + + if (!(py_retval = PyList_New(c_retval))) + goto cleanup; + + for (i = 0; i < c_retval; i++) { + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_virDomainCheckpointPtrWrap(chks[i]), error); + chks[i] = NULL; + } + + cleanup: + for (i = 0; i < c_retval; i++) + if (chks[i]) + virDomainCheckpointFree(chks[i]); + VIR_FREE(chks); + return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; +} + +static PyObject * +libvirt_virDomainCheckpointListAllChildren(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *py_retval = NULL; + virDomainCheckpointPtr *chks = NULL; + int c_retval; + ssize_t i; + virDomainCheckpointPtr parent; + PyObject *pyobj_parent; + unsigned int flags; + + if (!PyArg_ParseTuple(args, (char *)"OI:virDomainCheckpointListAllChildren", + &pyobj_parent, &flags)) + return NULL; + parent = (virDomainCheckpointPtr) PyvirDomainCheckpoint_Get(pyobj_parent); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainCheckpointListAllChildren(parent, &chks, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval < 0) + return VIR_PY_NONE; + + if (!(py_retval = PyList_New(c_retval))) + goto cleanup; + + for (i = 0; i < c_retval; i++) { + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_virDomainCheckpointPtrWrap(chks[i]), error); + chks[i] = NULL; + } + + cleanup: + for (i = 0; i < c_retval; i++) + if (chks[i]) + virDomainCheckpointFree(chks[i]); + VIR_FREE(chks); + return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; +} +#endif /* LIBVIR_CHECK_VERSION(5, 1, 0) */ + static PyObject * libvirt_virDomainSnapshotListNames(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -10100,6 +10192,10 @@ static PyMethodDef libvirtMethods[] = { #if LIBVIR_CHECK_VERSION(1, 0, 3) {(char *) "virDomainGetJobStats", libvirt_virDomainGetJobStats, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(1, 0, 3) */ +#if LIBVIR_CHECK_VERSION(5, 1, 0) + {(char *) "virDomainListAllCheckpoints", libvirt_virDomainListAllCheckpoints, METH_VARARGS, NULL}, + {(char *) "virDomainCheckpointListAllChildren", libvirt_virDomainCheckpointListAllChildren, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(5, 1, 0) */ {(char *) "virDomainSnapshotListNames", libvirt_virDomainSnapshotListNames, METH_VARARGS, NULL}, #if LIBVIR_CHECK_VERSION(0, 9, 13) {(char *) "virDomainListAllSnapshots", libvirt_virDomainListAllSnapshots, METH_VARARGS, NULL}, diff --git a/sanitytest.py b/sanitytest.py index 68dde6b..b044231 100644 --- a/sanitytest.py +++ b/sanitytest.py @@ -249,13 +249,13 @@ for name in sorted(basicklassmap): # Remove 'Get' prefix from most APIs, except those in virConnect # and virDomainSnapshot namespaces which stupidly used a different # convention which we now can't fix without breaking API - if func[0:3] == "Get" and klass not in ["virConnect", "virDomainSnapshot", "libvirt"]: + if func[0:3] == "Get" and klass not in ["virConnect", "virDomainCheckpoint", "virDomainSnapshot", "libvirt"]: if func not in ["GetCPUStats", "GetTime"]: func = func[3:] # The object creation and lookup APIs all have to get re-mapped # into the parent class - if func in ["CreateXML", "CreateLinux", "CreateXMLWithFiles", + if func in ["CreateXML", "CreateXML2", "CreateLinux", "CreateXMLWithFiles", "DefineXML", "CreateXMLFrom", "LookupByUUID", "LookupByUUIDString", "LookupByVolume" "LookupByName", "LookupByID", "LookupByName", "LookupByKey", "LookupByPath", @@ -266,7 +266,7 @@ for name in sorted(basicklassmap): if klass != "virDomain": func = klass[3:] + func - if klass == "virDomainSnapshot": + if klass in [ "virDomainCheckpoint", "virDomainSnapshot"]: klass = "virDomain" func = func[6:] elif klass == "virStorageVol" and func in ["StorageVolCreateXMLFrom", "StorageVolCreateXML"]: @@ -297,10 +297,13 @@ for name in sorted(basicklassmap): if func[0:6] == "Change": klass = "virConnect" - # Need to special case the snapshot APIs + # Need to special case the checkpoint and snapshot APIs if klass == "virDomainSnapshot" and func in ["Current", "ListNames", "Num"]: klass = "virDomain" func = "snapshot" + func + elif klass == "virDomainCheckpoint" and func == "Current": + klass = "virDomain" + func = "checkpoint" + func # Names should start with lowercase letter... func = func[0:1].lower() + func[1:] diff --git a/typewrappers.c b/typewrappers.c index 9ba14b4..cd7a70b 100644 --- a/typewrappers.c +++ b/typewrappers.c @@ -568,6 +568,19 @@ libvirt_virStreamPtrWrap(virStreamPtr node) return ret; } +PyObject * +libvirt_virDomainCheckpointPtrWrap(virDomainCheckpointPtr node) +{ + PyObject *ret; + + if (node == NULL) { + return VIR_PY_NONE; + } + + ret = libvirt_buildPyObject(node, "virDomainCheckpointPtr", NULL); + return ret; +} + PyObject * libvirt_virDomainSnapshotPtrWrap(virDomainSnapshotPtr node) { diff --git a/typewrappers.h b/typewrappers.h index 4423774..198397b 100644 --- a/typewrappers.h +++ b/typewrappers.h @@ -128,6 +128,15 @@ typedef struct { } PyvirStream_Object; +#define PyvirDomainCheckpoint_Get(v) (((v) == Py_None) ? NULL : \ + (((PyvirDomainCheckpoint_Object *)(v))->obj)) + +typedef struct { + PyObject_HEAD + virDomainCheckpointPtr obj; +} PyvirDomainCheckpoint_Object; + + #define PyvirDomainSnapshot_Get(v) (((v) == Py_None) ? NULL : \ (((PyvirDomainSnapshot_Object *)(v))->obj)) @@ -204,6 +213,7 @@ PyObject * libvirt_virSecretPtrWrap(virSecretPtr node); PyObject * libvirt_virNWFilterPtrWrap(virNWFilterPtr node); PyObject * libvirt_virNWFilterBindingPtrWrap(virNWFilterBindingPtr node); PyObject * libvirt_virStreamPtrWrap(virStreamPtr node); +PyObject * libvirt_virDomainCheckpointPtrWrap(virDomainCheckpointPtr node); PyObject * libvirt_virDomainSnapshotPtrWrap(virDomainSnapshotPtr node); -- 2.20.1

2 2

[libvirt] [PATCH] build: Fix checkpoint_conf on mingw
by Eric Blake 29 Jul '19

29 Jul '19

CI flagged a failing mingw build, due to: In file included from ../../src/conf/checkpoint_conf.c:24: ../gnulib/lib/configmake.h:8:17: error: expected identifier or '(' before string constant 8 | #define DATADIR "/usr/i686-w64-mingw32/sys-root/mingw/share" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ As previously learned in commits bd205a90 and 976abdf6, gnulib's configmake.h header does #define DATADIR "string...", while mingw's <winsock2.h> expects to declare a type named DATADIR. As long as the mingw system header is included first before configmake.h, the two uses do not conflict, but until gnulib is patched to make configmake.h automatically work around the issue, our immediate fix is the workaround of rearranging our include order to insure no conflict. Copy the paradigm used in domain_conf.c of using <unistd.h> to trigger the indirect inclusion of <winsock2.h> on mingw. Fixes: 1a4df34a Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule src/conf/checkpoint_conf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 5f4c275dd8..5ce4cc4853 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -21,6 +21,8 @@ #include <config.h> +#include <unistd.h> + #include "configmake.h" #include "internal.h" #include "virbitmap.h" -- 2.20.1

1 0

[libvirt] [PATCH] util: Fix comment for virGetEnvAllowSUID()
by Andrea Bolognani 29 Jul '19

29 Jul '19

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. src/util/virutil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index 019009be8c..84ccc1a546 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1738,7 +1738,7 @@ const char *virGetEnvBlockSUID(const char *name) /** - * virGetEnvBlockSUID: + * virGetEnvAllowSUID: * @name: the environment variable name * * Obtain an environment variable which is safe to -- 2.21.0

1 0

[libvirt] [PATCH v10 00/19] Checkpoint APIs (incremental backup saga)
by Eric Blake 29 Jul '19

29 Jul '19

This is a subset of v10 of incremental backup, fixing Peter's review comments from v9 (and even some from v8 that I had missed earlier). There's still a lot more rebasing churn to resolve in the backup portion of the series before I can post a full backup-v10 label. There's still a decision to make: do we want this series in 5.6 (possibly with the addition of just patch 2/10 at [1] to introduce the backup API to make it possible for downstream to backport features without bumping .so)? This series has checkpoint support for test and qemu drivers, and I think is probably clean enough to finally satisfy everything Peter has been pointing out; but while the backup API itself seems reasonable, the qemu implementation will likely miss 5.6 (as that half of the v9 posting was further behind, and still has a lot of rebase churn to resolve). Or do we delay the checkpoint API to 5.7, to only go in with backup API? There's also still an outstanding question of whether the backup API needs a tweak to use 'const char *' instead of 'int' for the job identifier, given that Peter has a proposal for overhauling the representation of libvirt jobs. [1] https://www.redhat.com/archives/libvir-list/2019-July/msg00330.html Here's a comparison of these patches to v9: - rebase on top of master - use more VIR_AUTOFREE and friends (but probably still missed some spots where it would be worthwhile) - split several patches - add in a new patch to ensure the node names are learned at domain startup (but I didn't play enough with hotplug to see if that also has problems); necessary in order to... - get rid of detecting node names in checkpoint code - completely got rid of the notion of a current checkpoint in the public API (the internal code still has one, but solely to track which checkpoint becomes the parent of a new one to maintain a linear chain; when loading checkpoints on libvirtd restart, there should be at most one leaf node which becomes the internal current node) - improved code for handling partial checkpoints (the code now correctly handles: c1: disks A, B; c2: disks B, C; c3: disks A, B) 001/19:[down] 'snapshot: Don't leak moment obj list metaroot to callers' 002/19:[down] 'snapshot: Saner error message for duplicate create' 003/19:[down] 'snapshot: Documentation and comment improvements' 004/19:[down] 'backup: qemu: Detect node names at domain startup' 005/19:[0101] [FC] 'backup: Document new XML for checkpoints' 006/19:[0031] [FC] 'backup: Introduce virDomainCheckpoint APIs' 007/19:[0051] [FC] 'backup: Document nuances between different state capture APIs' 008/19:[0189] [FC] 'backup: Parse and output checkpoint XML' 009/19:[0066] [FC] 'backup: Allow for lists of checkpoint objects' 010/19:[----] [--] 'backup: Add new domain:checkpoint access control' 011/19:[----] [--] 'backup: Implement checkpoint APIs for remote driver' 012/19:[0161] [FC] 'backup: Implement virsh support for checkpoints' 013/19:[0047] [FC] 'backup: test: Implement metadata tracking for checkpoint APIs' 014/19:[0044] [FC] 'backup: Add virsh-checkpoints test' 015/19:[down] 'backup: qemu: Add directory for tracking checkpoints' 016/19:[0193] [FC] 'backup: qemu: Implement metadata tracking for checkpoint APIs' 017/19:[down] 'backup: qemu: Add helper API for looking up node name' 018/19:[0119] [FC] 'backup: Wire up qemu checkpoint commands over QMP' 019/19:[down] 'backup: Prevent snapshots and checkpoints at same time' Eric Blake (19): snapshot: Don't leak moment obj list metaroot to callers snapshot: Saner error message for duplicate create snapshot: Documentation and comment improvements backup: qemu: Detect node names at domain startup backup: Document new XML for checkpoints backup: Introduce virDomainCheckpoint APIs backup: Document nuances between different state capture APIs backup: Parse and output checkpoint XML backup: Allow for lists of checkpoint objects backup: Add new domain:checkpoint access control backup: Implement checkpoint APIs for remote driver backup: Implement virsh support for checkpoints backup: test: Implement metadata tracking for checkpoint APIs backup: Add virsh-checkpoints test backup: qemu: Add directory for tracking checkpoints backup: qemu: Implement metadata tracking for checkpoint APIs backup: qemu: Add helper API for looking up node name backup: Wire up qemu checkpoint commands over QMP backup: Prevent snapshots and checkpoints at same time include/libvirt/libvirt-domain-checkpoint.h | 137 ++ include/libvirt/libvirt-domain.h | 6 + include/libvirt/libvirt.h | 5 +- src/access/viraccessperm.h | 6 + src/conf/checkpoint_conf.h | 91 ++ src/conf/domain_conf.h | 2 + src/conf/virconftypes.h | 9 + src/conf/virdomaincheckpointobjlist.h | 72 + src/conf/virdomainmomentobjlist.h | 10 +- src/conf/virdomainobjlist.h | 7 +- src/conf/virdomainsnapshotobjlist.h | 2 + src/driver-hypervisor.h | 38 + src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.h | 18 + tools/virsh-checkpoint.h | 26 + tools/virsh-completer.h | 4 + tools/virsh-util.h | 3 + tools/virsh.h | 1 + docs/Makefile.am | 3 + docs/apibuild.py | 2 + docs/docs.html.in | 4 +- docs/format.html.in | 1 + docs/formatcheckpoint.html.in | 196 +++ docs/formatsnapshot.html.in | 14 +- docs/index.html.in | 3 +- docs/kbase.html.in | 5 + docs/kbase/domainstatecapture.html.in | 303 +++++ docs/schemas/domaincheckpoint.rng | 94 ++ libvirt.spec.in | 2 + mingw-libvirt.spec.in | 4 + po/POTFILES | 3 + src/Makefile.am | 2 + src/access/viraccessperm.c | 3 +- src/conf/Makefile.inc.am | 4 + src/conf/checkpoint_conf.c | 597 +++++++++ src/conf/domain_conf.c | 6 + src/conf/virdomaincheckpointobjlist.c | 243 ++++ src/conf/virdomainmomentobjlist.c | 55 +- src/conf/virdomainobjlist.c | 11 + src/conf/virdomainsnapshotobjlist.c | 9 + src/libvirt-domain-checkpoint.c | 567 ++++++++ src/libvirt-domain.c | 19 +- src/libvirt_private.syms | 29 +- src/libvirt_public.syms | 16 + src/qemu/qemu_conf.c | 5 + src/qemu/qemu_domain.c | 190 +++ src/qemu/qemu_driver.c | 731 ++++++++++- src/qemu/qemu_process.c | 5 + src/remote/remote_daemon_dispatch.c | 20 + src/remote/remote_driver.c | 24 +- src/remote/remote_protocol.x | 123 +- src/remote_protocol-structs | 69 + src/rpc/gendispatch.pl | 32 +- src/test/test_driver.c | 386 +++++- tests/Makefile.am | 12 +- .../disk-default.xml | 7 + .../disk-invalid.xml | 8 + tests/qemudomaincheckpointxml2xmlin/empty.xml | 1 + .../name-invalid.xml | 4 + .../qemudomaincheckpointxml2xmlin/sample.xml | 7 + tests/qemudomaincheckpointxml2xmlin/size.xml | 4 + .../disk-default.xml | 11 + .../qemudomaincheckpointxml2xmlout/empty.xml | 7 + .../internal-active-invalid.xml | 53 + .../internal-inactive-invalid.xml | 53 + .../redefine.xml | 63 + .../qemudomaincheckpointxml2xmlout/sample.xml | 12 + tests/qemudomaincheckpointxml2xmlout/size.xml | 11 + tests/qemudomaincheckpointxml2xmltest.c | 213 +++ tests/virschematest.c | 2 + tests/virsh-checkpoint | 174 +++ tests/virsh-snapshot | 15 +- tools/Makefile.am | 1 + tools/virsh-checkpoint.c | 1153 +++++++++++++++++ tools/virsh-completer.c | 51 + tools/virsh-domain-monitor.c | 23 + tools/virsh-domain.c | 7 + tools/virsh-util.c | 11 + tools/virsh.c | 2 + tools/virsh.pod | 201 ++- 80 files changed, 6262 insertions(+), 63 deletions(-) create mode 100644 include/libvirt/libvirt-domain-checkpoint.h create mode 100644 src/conf/checkpoint_conf.h create mode 100644 src/conf/virdomaincheckpointobjlist.h create mode 100644 tools/virsh-checkpoint.h create mode 100644 docs/formatcheckpoint.html.in create mode 100644 docs/kbase/domainstatecapture.html.in create mode 100644 docs/schemas/domaincheckpoint.rng create mode 100644 src/conf/checkpoint_conf.c create mode 100644 src/conf/virdomaincheckpointobjlist.c create mode 100644 src/libvirt-domain-checkpoint.c create mode 100644 tests/qemudomaincheckpointxml2xmlin/disk-default.xml create mode 100644 tests/qemudomaincheckpointxml2xmlin/disk-invalid.xml create mode 100644 tests/qemudomaincheckpointxml2xmlin/empty.xml create mode 100644 tests/qemudomaincheckpointxml2xmlin/name-invalid.xml create mode 100644 tests/qemudomaincheckpointxml2xmlin/sample.xml create mode 100644 tests/qemudomaincheckpointxml2xmlin/size.xml create mode 100644 tests/qemudomaincheckpointxml2xmlout/disk-default.xml create mode 100644 tests/qemudomaincheckpointxml2xmlout/empty.xml create mode 100644 tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml create mode 100644 tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml create mode 100644 tests/qemudomaincheckpointxml2xmlout/redefine.xml create mode 100644 tests/qemudomaincheckpointxml2xmlout/sample.xml create mode 100644 tests/qemudomaincheckpointxml2xmlout/size.xml create mode 100644 tests/qemudomaincheckpointxml2xmltest.c create mode 100755 tests/virsh-checkpoint create mode 100644 tools/virsh-checkpoint.c -- 2.20.1

3 47