- Devel - libvirt List Archives

[libvirt] [PATCH 0/4] Blind rbd driver fixes
by Ján Tomko 12 Jul '19

12 Jul '19

Sadly I haven't had the time to get a working RBD setup but I believe these patches should fix some recently introduced bugs https://bugzilla.redhat.com/show_bug.cgi?id=1724065 https://bugzilla.redhat.com/show_bug.cgi?id=1729292 If you can test them, please do. Ján Tomko (4): storage: rbd: use VIR_REALLOC in the loop storage: rbd: actually index the array when iterating over it Revert "conf: Remove volOptions for VIR_STORAGE_POOL_RBD" docs: RBD pool only supports raw volumes docs/storage.html.in | 2 +- src/conf/storage_conf.c | 5 +++++ src/storage/storage_backend_rbd.c | 4 ++-- tests/storagepoolcapsschemadata/poolcaps-fs.xml | 5 +++++ tests/storagepoolcapsschemadata/poolcaps-full.xml | 5 +++++ 5 files changed, 18 insertions(+), 3 deletions(-) -- 2.20.1

2 8

[libvirt] [PATCH 0/3] virnetworkobj: Couple of small fixes and improvements
by Michal Privoznik 12 Jul '19

12 Jul '19

Almost trivial, not pushed though. Michal Prívozník (3): virnetworkobj: Free retval of virNetworkObjGetPortStatusDir() virnetworkobj: Drop needless cleanup label in virNetworkObjAddPort virnetworkobj: Drop needless cleanup label in virNetworkObjDeletePort src/conf/virnetworkobj.c | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) -- 2.21.0

2 4

[libvirt] Problem configuring selective dropping of root
by Stephan von Krawczynski 12 Jul '19

12 Jul '19

Hello list, I came across a fundamental flaw in the libvirt user configuration lately and try to find a solution now. Here is the problem: I run several qemu instances on arch linux all configured via libvirt. The default config as user nobody:kvm was fine up to the day I tried to use a host filesystem via 9p. If you want to gain all user rights on the guest inside that fs you have to run qemu as root. So far so good. But if you have several qemus running and only one needs to be root, what to do? You can try to give a -runas by using <qemu:args>. But that does not work, qemu instantly crashes. I think this is because to have _one_ root qemu, you have to configure libvirt to use root user. This means all rights to fs and so on are set to root and this is what lets qemu probably go crazy if dropping root by -runas. The whole thing would be a lot easier and more transparent if the user in libvirt wouldn't be a global config, but instead be part of the domain xml. This way every qemu started could use a different user and have different rights. In my case all but one could be nobody:kvm, and one root:root. This should not be to complicated based on whats already there, is it? -- Regards, Stephan

6 17

[libvirt] [PATCH 0/4] qemu: blockdev-related cleanups and refactors (blockdev-add saga)
by Peter Krempa 12 Jul '19

12 Jul '19

Peter Krempa (4): qemu: blockjob: Don't reset state when entering sync blockjob qemu: blockjob: Don't emit traditional disk events for jobs without disk qemu: Refactor variables for extracting flags in qemuDomainBlockCopyCommon qemu: block: Split up qemuBlockStorageSourceAttachApply src/qemu/qemu_block.c | 86 +++++++++++++++++++++++++++++----------- src/qemu/qemu_blockjob.c | 5 ++- src/qemu/qemu_driver.c | 20 +++++----- 3 files changed, 77 insertions(+), 34 deletions(-) -- 2.21.0

2 6

[libvirt] [jenkins-ci PATCH] guests: Always install the freshest point release
by Andrea Bolognani 12 Jul '19

12 Jul '19

Sometimes the original URL might even stop working, as is the case for Ubuntu 16.04 this very moment. We want the lastest point release anyway. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/host_vars/libvirt-debian-10/install.yml | 2 +- guests/host_vars/libvirt-debian-9/install.yml | 2 +- guests/host_vars/libvirt-ubuntu-16/install.yml | 2 +- guests/host_vars/libvirt-ubuntu-18/install.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/guests/host_vars/libvirt-debian-10/install.yml b/guests/host_vars/libvirt-debian-10/install.yml index 0a30571..d6452b6 100644 --- a/guests/host_vars/libvirt-debian-10/install.yml +++ b/guests/host_vars/libvirt-debian-10/install.yml @@ -1,2 +1,2 @@ --- -install_url: http://deb.debian.org/debian/dists/buster/main/installer-amd64/ +install_url: http://deb.debian.org/debian/dists/buster-updates/main/installer-amd64/ diff --git a/guests/host_vars/libvirt-debian-9/install.yml b/guests/host_vars/libvirt-debian-9/install.yml index 7641753..a8c5d25 100644 --- a/guests/host_vars/libvirt-debian-9/install.yml +++ b/guests/host_vars/libvirt-debian-9/install.yml @@ -1,2 +1,2 @@ --- -install_url: http://deb.debian.org/debian/dists/stretch/main/installer-amd64/ +install_url: http://deb.debian.org/debian/dists/stretch-updates/main/installer-amd64/ diff --git a/guests/host_vars/libvirt-ubuntu-16/install.yml b/guests/host_vars/libvirt-ubuntu-16/install.yml index d8ce841..c3edf40 100644 --- a/guests/host_vars/libvirt-ubuntu-16/install.yml +++ b/guests/host_vars/libvirt-ubuntu-16/install.yml @@ -1,2 +1,2 @@ --- -install_url: http://archive.ubuntu.com/ubuntu/dists/xenial/main/installer-amd64/ +install_url: http://archive.ubuntu.com/ubuntu/dists/xenial-updates/main/installer-amd64/ diff --git a/guests/host_vars/libvirt-ubuntu-18/install.yml b/guests/host_vars/libvirt-ubuntu-18/install.yml index 544b3f2..f8a18f6 100644 --- a/guests/host_vars/libvirt-ubuntu-18/install.yml +++ b/guests/host_vars/libvirt-ubuntu-18/install.yml @@ -1,2 +1,2 @@ --- -install_url: http://archive.ubuntu.com/ubuntu/dists/bionic/main/installer-amd64/ +install_url: http://archive.ubuntu.com/ubuntu/dists/bionic-updates/main/installer-amd64/ -- 2.21.0

2 4

[libvirt] [PATCH v4 00/23] Add support for vTPM state encryption
by Stefan Berger 12 Jul '19

12 Jul '19

This series of patches addresses the RFE in BZ 172830: https://bugzilla.redhat.com/show_bug.cgi?id=1728030 This series of patches adds support for vTPM state encryption by passing the read-end of a pipe's file descriptor to 'swtpm_setup' and 'swtpm' where they can read a passphrase from and derive a key from that passphrase. The TPM's domain XML looks to enable state encryption looks like this: <tpm model='tpm-tis'> <backend type='emulator' version='1.2'> <encryption format='vtpm'> <secret type='passphrase' uuid='2c9ceaba-c6ef-4f38-86fd-6e3adb2df5cd'/> </encryption> </backend> <alias name='tpm0'/> </tpm> The vTPM secret holding the passphrase looks like this: <secret ephemeral='no' private='yes'> <uuid>2c9ceaba-c6ef-4f38-86fd-6e3adb2df5cd</uuid> <description>vTPM passphrase example</description> <usage type='vtpm'> <name>vtpm_example</name> </usage> </secret> The swtpm v0.2 (upcoming) is needed that supports the command line option --print-capabilities returning a JSON object that identifies features added since v0.1. One such features is the possibility to pass a passphrase via a file descriptor. The patches do some refactoring of existing code on the way. Stefan v1->v2: - Added Marc-André's R-bs - Addressed comments - Added patches to extend virCommand to be able to write contents of multiple buffers to file descriptors for a spawned process to read from v2->v3: - Fixed some pointer issues following conversion to use VIR_AUTOFREE v3->v4: - Added test case for virCommandSetSendBuffer() to commantest.c - Addressed other issues raised by Marc-André Stefan Berger (23): secret: Add support for usage type vTPM, extend schema and test case tests: Add already existing test case tpm-emulator-tpm2 util: Add VIR_STORAGE_ENCRYPTION_FORMAT_VTPM conf: Extend TPM XML parser with encryption support schema: Extend the TPM XML schema with support for encryption tests: Add test for TPM XML encryption parser and formatter tests: Add tests for QEMU command line generation with encrypted TPM tpm: Move virtpm.c from utils dir to own tpm dir tpm: Move qemuTPMEmulatorInit to virTPMEmulatorInit in virtpm.c tpm: Refactor virTPMEmulatorInit to use loop tpm: Check whether previously found executables were updated tpm: Parse the capabilities supported by swtpm and swtpm_setup utils: Implement function to pass a buffer to send via a fd to virCommand utils: Convert pollfd array to be allocated utils: Write a maximum of MAX_PIPE_WRITE_BYTES into a pipe utils: Mark inpipe as non-blocking utils: Extend virCommandProcessIO to include the send buffers tests: Extend command test to transfer large data to process on multiple fds tpm: Use fd to pass password to swtpm_setup and swtpm tpm: Pass migration key passphrase via fd to swtpm tpm: Check TPM XML device configuration changes after edit docs: Extend Secret XML documentation with vtpm usage type docs: Extend TPM docs with new encryption element docs/formatdomain.html.in | 16 + docs/formatsecret.html.in | 61 +++- docs/schemas/domaincommon.rng | 30 ++ docs/schemas/secret.rng | 10 + include/libvirt/libvirt-secret.h | 1 + po/POTFILES | 2 +- src/Makefile.am | 1 + src/conf/Makefile.inc.am | 7 + src/conf/domain_conf.c | 96 +++++- src/conf/domain_conf.h | 5 + src/conf/secret_conf.c | 13 + src/conf/virtpm_conf.c | 36 ++ src/conf/virtpm_conf.h | 36 ++ src/libvirt_private.syms | 21 +- src/qemu/Makefile.inc.am | 1 + src/qemu/qemu_block.c | 1 + src/qemu/qemu_driver.c | 28 ++ src/qemu/qemu_extdevice.c | 2 +- src/qemu/qemu_extdevice.h | 3 + src/qemu/qemu_tpm.c | 196 ++++++----- src/security/Makefile.inc.am | 1 + src/tpm/Makefile.inc.am | 20 ++ src/tpm/virtpm.c | 326 ++++++++++++++++++ src/{util => tpm}/virtpm.h | 8 + src/util/Makefile.inc.am | 2 - src/util/vircommand.c | 153 +++++++- src/util/vircommand.h | 5 + src/util/virsecret.c | 2 +- src/util/virstorageencryption.c | 2 +- src/util/virstorageencryption.h | 1 + src/util/virtpm.c | 74 ---- tests/Makefile.am | 1 + tests/commandhelper.c | 64 +++- tests/commandtest.c | 112 ++++++ .../tpm-emulator-tpm2-enc.x86_64-latest.args | 35 ++ .../tpm-emulator-tpm2-enc.xml | 34 ++ tests/qemuxml2argvtest.c | 1 + .../tpm-emulator-tpm2-enc.xml | 38 ++ tests/qemuxml2xmltest.c | 2 + tests/secretxml2xmlin/usage-vtpm.xml | 7 + tests/secretxml2xmltest.c | 1 + 41 files changed, 1283 insertions(+), 172 deletions(-) create mode 100644 src/conf/virtpm_conf.c create mode 100644 src/conf/virtpm_conf.h create mode 100644 src/tpm/Makefile.inc.am create mode 100644 src/tpm/virtpm.c rename src/{util => tpm}/virtpm.h (77%) delete mode 100644 src/util/virtpm.c create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.xml create mode 100644 tests/secretxml2xmlin/usage-vtpm.xml -- 2.20.1

3 33

[libvirt] [PATCH v2 00/19] Enable proper use of systemd socket activation with libvirtd
by Daniel P. Berrangé 12 Jul '19

12 Jul '19

The libvirtd daemon has some support for systemd socket activation from: commit 27a7081c2968ca0d7fbd590629b5a5303851f4a3 Author: Martin Kletzander <mkletzan(a)redhat.com> Date: Tue Jul 15 15:28:53 2014 +0200 daemon: support passing FDs from the calling process First FD is the RW unix socket to listen on, second one (if applicable) is the RO unix socket. This was originally intended for use by the libvirt client when doing auto-spawning of libvirtd, but we later deleted that client side code in commit be78814ae07f092d9c4e71fd82dd1947aba2f029 Author: Michal Privoznik <mprivozn(a)redhat.com> Date: Thu Apr 2 14:41:17 2015 +0200 virNetSocketNewConnectUNIX: Use flocks when spawning a daemon We never added systemd socket units before as we need libvirtd to start on boot to perform autostart. It was recently pointed out by Lennart that these two features are not mutually exclusive though. Libvirtd can be set to start on boot, and also have socket unit files. The idea is that we start libvirtd on boot, perform autostart, and then libvirtd can exit if nothing is running. The socket unit files are then there to start it again when a mgmt app connects. This series implements that strategy. In doing so the current socket activation support was rewritten to be more flexible, able to cope with the admin socket and the TCP/TLS sockets, all passed in any order. NB, I don't believe I have got the RPM upgrade procedure right yet. As there are alot of scenario to test for upgrades, I need more validation of that. The series is long enough now though, that it would benefit from code review already This socket activation is also going to be important when we split out the daemons, as we will use the same libvirtd codebase for these new daemons, simply compiled with different options. Changed in v2: - Merge 4 patches already ACKd by Jan - Drop VIR_AUTOSTRUCT patch - Fix patch ordering to be bisectable with "make check" Daniel P. Berrangé (19): rpc: ensure all sockets bind to same port when service is NULL util: add APIs for facilitating use of systemd activation FDs rpc: refactor RPC service constructors to share more code rpc: allow creating RPC service from an array of FDs rpc: avoid unlinking sockets passed in from systemd rpc: add helper APIs for adding services with systemd activation rpc: add API for checking whether an auth scheme is in use on a server remote: simplify libvirtd code for deciding if SASL auth is needed remote: fix handling of systemd activation wrt socket ordering rpc: remove unused API for creating services from FDs remote: add systemd socket units for UNIX/TCP sockets remote: make system libvirtd exit when idle via timeout remote: update config files to note usage wrt systemd socket activation util: remove code spawning with systemd activation env vars locking: convert lock daemon to use systemd activation APIs logging: convert log daemon to use systemd activation APIs util: move code for getting listen FDs into systemd module util: remove unused helper for getting UNIX socket path rpc: remove unused typedef for auto shutdown function callback libvirt.spec.in | 24 +- src/libvirt_private.syms | 8 +- src/libvirt_remote.syms | 6 +- src/locking/lock_daemon.c | 121 ++--- src/logging/log_daemon.c | 121 ++--- src/remote/Makefile.inc.am | 35 ++ src/remote/libvirtd-admin.socket.in | 15 + src/remote/libvirtd-ro.socket.in | 15 + src/remote/libvirtd-tcp.socket.in | 14 + src/remote/libvirtd-tls.socket.in | 14 + src/remote/libvirtd.conf | 31 ++ src/remote/libvirtd.service.in | 16 +- src/remote/libvirtd.socket.in | 13 + src/remote/libvirtd.sysconf | 3 +- src/remote/remote_daemon.c | 255 +++++----- src/rpc/virnetdaemon.h | 2 - src/rpc/virnetserver.c | 162 +++++++ src/rpc/virnetserver.h | 26 ++ src/rpc/virnetserverservice.c | 238 ++++------ src/rpc/virnetserverservice.h | 24 +- src/rpc/virnetsocket.c | 83 +++- src/rpc/virnetsocket.h | 1 + src/util/vircommand.c | 99 ---- src/util/vircommand.h | 2 - src/util/virsystemd.c | 434 ++++++++++++++++++ src/util/virsystemd.h | 32 ++ src/util/virutil.c | 116 ----- src/util/virutil.h | 3 - tests/commanddata/test24.log | 8 - tests/commandtest.c | 58 --- .../input-data-anon-clients.json | 12 +- .../output-data-admin-server-names.json | 24 +- tests/virnetdaemondata/output-data-admin.json | 24 +- .../output-data-anon-clients.json | 12 +- .../output-data-client-auth-pending.json | 12 +- .../output-data-client-ids.json | 12 +- .../output-data-client-timestamp.json | 12 +- .../virnetdaemondata/output-data-initial.json | 12 +- .../output-data-no-keepalive-required.json | 24 +- tests/virsystemdtest.c | 169 +++++++ 40 files changed, 1464 insertions(+), 828 deletions(-) create mode 100644 src/remote/libvirtd-admin.socket.in create mode 100644 src/remote/libvirtd-ro.socket.in create mode 100644 src/remote/libvirtd-tcp.socket.in create mode 100644 src/remote/libvirtd-tls.socket.in create mode 100644 src/remote/libvirtd.socket.in delete mode 100644 tests/commanddata/test24.log -- 2.21.0

2 21

[libvirt] [PATCH v2] logging: ensure virtlogd rollover takes priority over logrotate
by Daniel P. Berrangé 12 Jul '19

12 Jul '19

The virtlogd config is set to rollover logs every 2 MB. Normally a logrotate config file is also installed to handle cases where virtlogd is disabled. This is set to rollover weekly with no size constraint. As a result logrotate can interfere with virtlogd's, rolling over files that virtlogd has already taken care of. This changes logrotate configs to rollover based on a max size constraint of 2 MB + 1 byte. When virtlogd is running the log files will never get this large, making logrotate a no-op. If the user changes the size in virtlogd's config to something larger, they are responsible for also changing the logrotate config suitably. The LXC driver doesn't use virtlogd, but its logrotate config is altered to match the QEMU driver logrotate, just for the sake of consistency. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/logging/virtlogd.conf | 6 ++++++ src/remote/libvirtd.libxl.logrotate.in | 2 +- src/remote/libvirtd.lxc.logrotate.in | 2 +- src/remote/libvirtd.qemu.logrotate.in | 10 +++++++++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/logging/virtlogd.conf b/src/logging/virtlogd.conf index 72da7f0705..bc41edbc6b 100644 --- a/src/logging/virtlogd.conf +++ b/src/logging/virtlogd.conf @@ -90,6 +90,12 @@ #admin_max_clients = 5 # Maximum file size before rolling over. Defaults to 2 MB +# +# Beware that a logrotate config file might be installed too, +# to handle cases where virtlogd is disabled. To ensure that +# the logrotate config is a no-op when virtlogd is running, +# make sure that max_size here is smaller than size listed +# in the logrotate config. #max_size = 2097152 # Maximum number of backup files to keep. Defaults to 3, diff --git a/src/remote/libvirtd.libxl.logrotate.in b/src/remote/libvirtd.libxl.logrotate.in index cb7f07d846..1461c1efa1 100644 --- a/src/remote/libvirtd.libxl.logrotate.in +++ b/src/remote/libvirtd.libxl.logrotate.in @@ -1,5 +1,5 @@ @localstatedir@/log/libvirt/libxl/*.log { - weekly + size 2097153 missingok rotate 4 compress diff --git a/src/remote/libvirtd.lxc.logrotate.in b/src/remote/libvirtd.lxc.logrotate.in index 2bb9dfba12..b88dabb58e 100644 --- a/src/remote/libvirtd.lxc.logrotate.in +++ b/src/remote/libvirtd.lxc.logrotate.in @@ -1,5 +1,5 @@ @localstatedir@/log/libvirt/lxc/*.log { - weekly + size 2097153 missingok rotate 4 compress diff --git a/src/remote/libvirtd.qemu.logrotate.in b/src/remote/libvirtd.qemu.logrotate.in index cdb399ef23..78f2ca875e 100644 --- a/src/remote/libvirtd.qemu.logrotate.in +++ b/src/remote/libvirtd.qemu.logrotate.in @@ -1,5 +1,13 @@ @localstatedir@/log/libvirt/qemu/*.log { - weekly + # The QEMU driver is configured to use virtlogd by + # default, which will perform log rollover. + # This logrotate config is still installed for cases + # where the user has switched off virtlogd. + # + # If virtlogd is active, ensure that size here is + # larger than 'max_size' in the virtlogd config + # so that logrotate becomes a no-op + size 2097153 missingok rotate 4 compress -- 2.21.0

2 2

[libvirt] [PATCH v2 00/21] Add support for vTPM state encryption
by Stefan Berger 11 Jul '19

11 Jul '19

This series of patches addresses the RFE in BZ 172830: https://bugzilla.redhat.com/show_bug.cgi?id=1728030 This series of patches adds support for vTPM state encryption by passing the read-end of a pipe's file descriptor to 'swtpm_setup' and 'swtpm' where they can read a passphrase from and derive a key from that passphrase. The TPM's domain XML looks to enable state encryption looks like this: <tpm model='tpm-tis'> <backend type='emulator' version='1.2'> <encryption format='vtpm'> <secret type='passphrase' uuid='2c9ceaba-c6ef-4f38-86fd-6e3adb2df5cd'/> </encryption> </backend> <alias name='tpm0'/> </tpm> The vTPM secret holding the passphrase looks like this: <secret ephemeral='no' private='yes'> <uuid>2c9ceaba-c6ef-4f38-86fd-6e3adb2df5cd</uuid> <description>vTPM passphrase example</description> <usage type='vtpm'> <name>vtpm_example</name> </usage> </secret> The swtpm v0.2 (upcoming) is needed that supports the command line option --print-capabilities returning a JSON object that identifies features added since v0.1. One such features is the possibility to pass a passphrase via a file descriptor. The patches do some refactoring of existing code on the way. Stefan v1->v2: - Added Marc-André's R-bs - Addressed comments - Added patches to extend virCommand to be able to write contents of multiple buffers to file descriptors for a spawned process to read from Stefan Berger (21): secret: Add support for usage type vTPM, extend schema and test case tests: Add already existing test case tpm-emulator-tpm2 util: Add VIR_STORAGE_ENCRYPTION_FORMAT_VTPM conf: Extend TPM XML parser with encryption support schema: Extend the TPM XML schema with support for encryption tests: Add test for TPM XML encryption parser and formatter tests: Add tests for QEMU command line generation with encrypted TPM tpm: Move virtpm.c from utils dir to own tpm dir tpm: Move qemuTPMEmulatorInit to virTPMEmulatorInit in virtpm.c tpm: Refactor virTPMEmulatorInit to use loop tpm: Check whether previously found executables were updated tpm: Parse the capabilities supported by swtpm and swtpm_setup utils: Implement function to pass a buffer to send via a fd to virCommand utils: Convert pollfd array to be allocated utils: Write a maximum of MAX_PIPE_FEED_BYTES into a pipe utils: Extend virCommandProcessIO to including the send buffers tpm: Use fd to pass password to swtpm_setup and swtpm tpm: Pass migration key passphrase via fd to swtpm tpm: Check TPM XML device configuration changes after edit docs: Extend Secret XML documentation with vtpm usage type docs: Extend TPM docs with new encryption element docs/formatdomain.html.in | 16 + docs/formatsecret.html.in | 61 +++- docs/schemas/domaincommon.rng | 30 ++ docs/schemas/secret.rng | 10 + include/libvirt/libvirt-secret.h | 1 + po/POTFILES | 2 +- src/Makefile.am | 1 + src/conf/Makefile.inc.am | 7 + src/conf/domain_conf.c | 96 +++++- src/conf/domain_conf.h | 5 + src/conf/secret_conf.c | 13 + src/conf/virtpm_conf.c | 36 ++ src/conf/virtpm_conf.h | 36 ++ src/libvirt_private.syms | 21 +- src/qemu/Makefile.inc.am | 1 + src/qemu/qemu_block.c | 1 + src/qemu/qemu_driver.c | 28 ++ src/qemu/qemu_extdevice.c | 2 +- src/qemu/qemu_extdevice.h | 3 + src/qemu/qemu_tpm.c | 197 ++++++----- src/security/Makefile.inc.am | 1 + src/tpm/Makefile.inc.am | 20 ++ src/tpm/virtpm.c | 325 ++++++++++++++++++ src/{util => tpm}/virtpm.h | 8 + src/util/Makefile.inc.am | 2 - src/util/vircommand.c | 139 +++++++- src/util/vircommand.h | 5 + src/util/virsecret.c | 2 +- src/util/virstorageencryption.c | 2 +- src/util/virstorageencryption.h | 1 + src/util/virtpm.c | 74 ---- tests/Makefile.am | 1 + .../tpm-emulator-tpm2-enc.x86_64-latest.args | 35 ++ .../tpm-emulator-tpm2-enc.xml | 34 ++ tests/qemuxml2argvtest.c | 1 + .../tpm-emulator-tpm2-enc.xml | 38 ++ tests/qemuxml2xmltest.c | 2 + tests/secretxml2xmlin/usage-vtpm.xml | 7 + tests/secretxml2xmltest.c | 1 + 39 files changed, 1099 insertions(+), 166 deletions(-) create mode 100644 src/conf/virtpm_conf.c create mode 100644 src/conf/virtpm_conf.h create mode 100644 src/tpm/Makefile.inc.am create mode 100644 src/tpm/virtpm.c rename src/{util => tpm}/virtpm.h (77%) delete mode 100644 src/util/virtpm.c create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.xml create mode 100644 tests/secretxml2xmlin/usage-vtpm.xml -- 2.20.1

3 30

[libvirt] [PATCH] virsh emulatorpin, vcpupin: omit offline CPUs from affinity map
by Scott Cheloha 11 Jul '19

11 Jul '19

Each host CPU is not necessarily online. Including CPUs that are known to be offline in the default affinity map doesn't make much sense. We can try to omit those CPUs if the host supports CPU bitmaps, i.e. virHostCPUHasBitmap() is true. Otherwise we can return a full map as we do now. For example, given the following lscpu(1): Architecture: ppc64le Byte Order: Little Endian CPU(s): 128 On-line CPU(s) list: 0,8,16,24,32,40,48,56,64,72,80,88,96,104,112,120 Off-line CPU(s) list: 1-7,9-15,17-23,25-31,33-39,41-47,49-55,57-63,65-71,73-79,81-87,89-95,97-103,105-111,113-119,121-127 Thread(s) per core: 1 Core(s) per socket: 4 Socket(s): 4 NUMA node(s): 4 Model: 2.1 (pvr 004b 0201) Model name: POWER8E (raw), altivec supported CPU max MHz: 4322.0000 CPU min MHz: 2061.0000 L1d cache: 64K L1i cache: 32K L2 cache: 512K L3 cache: 8192K NUMA node0 CPU(s): 0,8,16,24 NUMA node1 CPU(s): 32,40,48,56 NUMA node16 CPU(s): 64,72,80,88 NUMA node17 CPU(s): 96,104,112,120 the current behavior for a guest with no VCPU configuration is: $ virsh vcpupin myvm ---------------------------------- 0: 0-127 but this patch instead you get: VCPU CPU Affinity ---------------------------------- 0 0,8,16,24,32,40,48,56,64,72,80,88,96,104,112,120 which is more consistent with the lscpu(1) output. Fixes: ibm bz174632 (rhbz#1434276) Signed-off-by: Scott Cheloha <cheloha(a)linux.vnet.ibm.com> --- I'm unsure whether it's better to automatically fall back to the full map if virHostCPUGetOnlineBitmap() fails, or to fail loudly as I do in this patch. Preferences? src/conf/domain_conf.c | 8 ++++++++ src/qemu/qemu_driver.c | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3323c9a5b1..0ea6f69574 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1989,6 +1989,7 @@ virDomainDefGetVcpuPinInfoHelper(virDomainDefPtr def, int maxvcpus = virDomainDefGetVcpusMax(def); size_t i; VIR_AUTOPTR(virBitmap) allcpumap = NULL; + VIR_AUTOPTR(virBitmap) onlinemap = NULL; if (hostcpus < 0) return -1; @@ -1998,6 +1999,11 @@ virDomainDefGetVcpuPinInfoHelper(virDomainDefPtr def, virBitmapSetAll(allcpumap); + if (virHostCPUHasBitmap()) { + if (!(onlinemap = virHostCPUGetOnlineBitmap())) + return -1; + } + for (i = 0; i < maxvcpus && i < ncpumaps; i++) { virDomainVcpuDefPtr vcpu = virDomainDefGetVcpu(def, i); virBitmapPtr bitmap = NULL; @@ -2009,6 +2015,8 @@ virDomainDefGetVcpuPinInfoHelper(virDomainDefPtr def, bitmap = autoCpuset; else if (def->cpumask) bitmap = def->cpumask; + else if (onlinemap) + bitmap = onlinemap; else bitmap = allcpumap; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5a75f23981..2c59513929 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5377,6 +5377,10 @@ qemuDomainGetEmulatorPinInfo(virDomainPtr dom, } else if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO && autoCpuset) { cpumask = autoCpuset; + } else if (virHostCPUHasBitmap()) { + if (!(bitmap = virHostCPUGetOnlineBitmap())) + goto cleanup; + cpumask = bitmap; } else { if (!(bitmap = virBitmapNew(hostcpus))) goto cleanup; -- 2.20.1

1 0

[libvirt] [jenkins-ci PATCH 0/3] Enable building of the VZ driver on CentOS 7
by Daniel P. Berrangé 11 Jul '19

11 Jul '19

The VZ driver in libvirt periodically gets broken by refactoring in libvirt. This is not noticed either before or after merge because none of our CI tests nor common developer build hosts includ the deps needed for the VZ driver. The OpenVZ project, however, does provide builds of the required packages for RHEL-7. We can use these packages in our CentOS 7 CI VMs to enable build testing of the VZ driver. This closes the only hole we have in driver build coverage for CI. Daniel P. Berrangé (3): guests: add openvz repository on CentOS 7 guests: define mapping for the libprlsdk package guests: add libprlsdk package to libvirt project guests/playbooks/update/tasks/base.yml | 10 ++++++++++ guests/playbooks/update/templates/openvz.repo.j2 | 9 +++++++++ guests/vars/mappings.yml | 4 ++++ guests/vars/projects/libvirt.yml | 1 + 4 files changed, 24 insertions(+) create mode 100644 guests/playbooks/update/templates/openvz.repo.j2 -- 2.21.0

2 6

[libvirt] [jenkins-ci PATCH] guests: Make Java symlink creation conditional
by Andrea Bolognani 11 Jul '19

11 Jul '19

We only install Java for the "jenkins" flavor, which means we need to avoid creating the Java symlink for other flavors because the operation can't succeed there. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. guests/playbooks/update/tasks/kludges.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/guests/playbooks/update/tasks/kludges.yml b/guests/playbooks/update/tasks/kludges.yml index 22d8ce5..8af36ab 100644 --- a/guests/playbooks/update/tasks/kludges.yml +++ b/guests/playbooks/update/tasks/kludges.yml @@ -12,6 +12,7 @@ group: wheel when: - os_name == 'FreeBSD' + - flavor == "jenkins" # FreeBSD compiles bash without defining SSH_SOURCE_BASHRC, which means # it won't try to detect when it's spawned by ssh and source ~/.bashrc -- 2.21.0

1 0

[libvirt] [jenkins-ci PATCH] guests: Create java symlink on FreeBSD
by Andrea Bolognani 11 Jul '19

11 Jul '19

This kludge is necessary because the OpenJDK 11 packages, unlike the OpenJDK 8 packages, install all binaries outside of $PATH. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed so that I could bring the CI environment back online; if people have objections to the approach, we can make the necessary changes as a follow-up. guests/playbooks/update/main.yml | 2 +- guests/playbooks/update/tasks/kludges.yml | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/guests/playbooks/update/main.yml b/guests/playbooks/update/main.yml index 753bac4..e82055b 100644 --- a/guests/playbooks/update/main.yml +++ b/guests/playbooks/update/main.yml @@ -48,10 +48,10 @@ - flavor == "jenkins" # Configure environment. Needs to happen after installing packages + - include: '{{ playbook_base }}/tasks/kludges.yml' - include: '{{ playbook_base }}/tasks/paths.yml' - include: '{{ playbook_base }}/tasks/bootloader.yml' - include: '{{ playbook_base }}/tasks/services.yml' - - include: '{{ playbook_base }}/tasks/kludges.yml' - include: '{{ playbook_base }}/tasks/users.yml' # Configure the Jenkins agent diff --git a/guests/playbooks/update/tasks/kludges.yml b/guests/playbooks/update/tasks/kludges.yml index 3648514..22d8ce5 100644 --- a/guests/playbooks/update/tasks/kludges.yml +++ b/guests/playbooks/update/tasks/kludges.yml @@ -1,4 +1,18 @@ --- +# FreeBSD allows multiple versions of OpenJDK to be installed and used +# in parallel, which is neat but also means they must all live outside +# of $PATH. Create a symlink so that we can still find the main Java +# executable. +- name: Create java symlink + file: + src: /usr/local/openjdk11/bin/java + dest: /usr/local/bin/java + state: link + owner: root + group: wheel + when: + - os_name == 'FreeBSD' + # FreeBSD compiles bash without defining SSH_SOURCE_BASHRC, which means # it won't try to detect when it's spawned by ssh and source ~/.bashrc # when that's the case. Our workaround is setting $BASH_ENV globally -- 2.21.0

1 0

[libvirt] [PATCH] test_driver: consider flags in testDomainSetMemoryFlags
by Ilias Stamatis 11 Jul '19

11 Jul '19

Update the current or max memory, on the persistent or live definition depending on the flags which are currently ignored. Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 51 +++++++++++++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 8 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index c10344f6cd..90910060ed 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2473,24 +2473,59 @@ static int testDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory, unsigned int flags) { - virDomainObjPtr privdom; + virDomainObjPtr vm; + virDomainDefPtr def; int ret = -1; - virCheckFlags(0, -1); + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG | + VIR_DOMAIN_MEM_MAXIMUM, -1); - if (!(privdom = testDomObjFromDomain(domain))) + if (!(vm = testDomObjFromDomain(domain))) return -1; - if (memory > virDomainDefGetMemoryTotal(privdom->def)) { - virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); + if (!(def = virDomainObjGetOneDef(vm, flags))) goto cleanup; + + if (flags & VIR_DOMAIN_MEM_MAXIMUM) { + if (virDomainObjCheckActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("cannot resize the maximum memory on an " + "active domain")); + goto cleanup; + } + + if (virDomainNumaGetNodeCount(def->numa) > 0) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("initial memory size of a domain with NUMA " + "nodes cannot be modified with this API")); + goto cleanup; + } + + if (def->mem.max_memory && def->mem.max_memory < memory) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("cannot set initial memory size greater than " + "the maximum memory size")); + goto cleanup; + } + + virDomainDefSetMemoryTotal(def, memory); + + if (def->mem.cur_balloon > memory) + def->mem.cur_balloon = memory; + } else { + if (memory > virDomainDefGetMemoryTotal(def)) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("cannot set memory higher than max memory")); + goto cleanup; + } + + def->mem.cur_balloon = memory; } - privdom->def->mem.cur_balloon = memory; ret = 0; - cleanup: - virDomainObjEndAPI(&privdom); + virDomainObjEndAPI(&vm); return ret; } -- 2.22.0

2 3

[libvirt] [PATCH 00/10] qemu: remove json fields from domain and monitor objects
by Ján Tomko 11 Jul '19

11 Jul '19

Applies on top of Peter's removal of commandline parsing https://www.redhat.com/archives/libvir-list/2019-June/msg00405.html After removal of qemuProcessAttach there is no codepath that could possibly set monJSON to false (not that libvirt would be able to much with such domain), so we can finish cleaning it up. Ján Tomko (10): qemu: also delete qemuProcessAttach qemu: assume monJSON is always true qemu: domain: remove monJSON field qemu: stop formatting json='1' in status XML qemu: remove json argument from qemuMonitorOpen qemu: monitor: assume JSON in QEMU_CHECK_MONITOR macro qemu: monitor: remove mon->json checks qemu: monitor: remove the json field qemu: monitor: use VIR_AUTOFREE in qemuMonitor*VideoSize qemu: monitor: s/ret/rc/ in UpdateVideoSize functions src/qemu/qemu_command.c | 8 +- src/qemu/qemu_domain.c | 12 +- src/qemu/qemu_domain.h | 1 - src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_migration.c | 21 +- src/qemu/qemu_monitor.c | 109 ++------ src/qemu/qemu_monitor.h | 2 - src/qemu/qemu_process.c | 247 +----------------- src/qemu/qemu_process.h | 8 - tests/qemuhotplugtest.c | 2 - tests/qemumonitortestutils.c | 1 - .../blockjob-mirror-in.xml | 2 +- .../disk-secinfo-upgrade-out.xml | 2 +- .../migration-in-params-in.xml | 2 +- .../migration-out-nbd-out.xml | 2 +- .../migration-out-nbd-tls-out.xml | 2 +- .../migration-out-params-in.xml | 2 +- tests/qemustatusxml2xmldata/modern-in.xml | 2 +- .../qemustatusxml2xmldata/vcpus-multi-in.xml | 2 +- 19 files changed, 52 insertions(+), 378 deletions(-) -- 2.20.1

2 21

[libvirt] [PATCH 00/23] Enable proper use of systemd socket activation with libvirtd
by Daniel P. Berrangé 11 Jul '19

11 Jul '19

The libvirtd daemon has some support for systemd socket activation from: commit 27a7081c2968ca0d7fbd590629b5a5303851f4a3 Author: Martin Kletzander <mkletzan(a)redhat.com> Date: Tue Jul 15 15:28:53 2014 +0200 daemon: support passing FDs from the calling process First FD is the RW unix socket to listen on, second one (if applicable) is the RO unix socket. This was originally intended for use by the libvirt client when doing auto-spawning of libvirtd, but we later deleted that client side code in commit be78814ae07f092d9c4e71fd82dd1947aba2f029 Author: Michal Privoznik <mprivozn(a)redhat.com> Date: Thu Apr 2 14:41:17 2015 +0200 virNetSocketNewConnectUNIX: Use flocks when spawning a daemon We never added systemd socket units before as we need libvirtd to start on boot to perform autostart. It was recently pointed out by Lennart that these two features are not mutually exclusive though. Libvirtd can be set to start on boot, and also have socket unit files. The idea is that we start libvirtd on boot, perform autostart, and then libvirtd can exit if nothing is running. The socket unit files are then there to start it again when a mgmt app connects. This series implements that strategy. In doing so the current socket activation support was rewritten to be more flexible, able to cope with the admin socket and the TCP/TLS sockets, all passed in any order. NB, I don't believe I have got the RPM upgrade procedure right yet. As there are alot of scenario to test for upgrades, I need more validation of that. The series is long enough now though, that it would benefit from code review already This socket activation is also going to be important when we split out the daemons, as we will use the same libvirtd codebase for these new daemons, simply compiled with different options. Daniel P. Berrangé (23): locking,logging: put a strong dep from admin socket to main socket util: add helper API for getting UNIX path from socket address rpc: add helper API for getting UNIX path from socket object util: add VIR_AUTOSTRUCT for directly calling a struct free function util: add API for resolving socket service names util: add APIs for facilitating use of systemd activation FDs rpc: ensure all sockets bind to same port when service is NULL rpc: refactor RPC service constructors to share more code rpc: allow creating RPC service from an array of FDs rpc: avoid unlinking sockets passed in from systemd rpc: add helper APIs for adding services with systemd activation rpc: add API for checking whether an auth scheme is in use on a server remote: simplify libvirtd code for deciding if SASL auth is needed remote: fix handling of systemd activation wrt socket ordering rpc: remove unused API for creating services from FDs remote: add systemd socket units for UNIX/TCP sockets remote: make system libvirtd exit when idle via timeout remote: update config files to note usage wrt systemd socket activation util: remove code spawning with systemd activation env vars locking: convert lock daemon to use systemd activation APIs logging: convert log daemon to use systemd activation APIs util: move code for getting listen FDs into systemd module util: remove unused helper for getting UNIX socket path libvirt.spec.in | 24 +- src/libvirt_private.syms | 10 +- src/libvirt_remote.syms | 7 +- src/locking/lock_daemon.c | 121 +++---- src/locking/virtlockd-admin.socket.in | 2 + src/logging/log_daemon.c | 121 +++---- src/logging/virtlogd-admin.socket.in | 2 + src/remote/Makefile.inc.am | 35 +++ src/remote/libvirtd-admin.socket.in | 15 + src/remote/libvirtd-ro.socket.in | 15 + src/remote/libvirtd-tcp.socket.in | 14 + src/remote/libvirtd-tls.socket.in | 14 + src/remote/libvirtd.conf | 31 ++ src/remote/libvirtd.service.in | 16 +- src/remote/libvirtd.socket.in | 13 + src/remote/libvirtd.sysconf | 3 +- src/remote/remote_daemon.c | 255 +++++++-------- src/rpc/virnetserver.c | 162 ++++++++++ src/rpc/virnetserver.h | 26 ++ src/rpc/virnetserverservice.c | 238 ++++++-------- src/rpc/virnetserverservice.h | 24 +- src/rpc/virnetsocket.c | 93 ++++-- src/rpc/virnetsocket.h | 2 + src/util/viralloc.h | 13 + src/util/vircommand.c | 99 ------ src/util/vircommand.h | 2 - src/util/virsocketaddr.c | 93 ++++++ src/util/virsocketaddr.h | 4 + src/util/virsystemd.c | 434 ++++++++++++++++++++++++++ src/util/virsystemd.h | 30 ++ src/util/virutil.c | 116 ------- src/util/virutil.h | 3 - tests/commanddata/test24.log | 8 - tests/commandtest.c | 58 ---- tests/virsystemdtest.c | 169 ++++++++++ 35 files changed, 1490 insertions(+), 782 deletions(-) create mode 100644 src/remote/libvirtd-admin.socket.in create mode 100644 src/remote/libvirtd-ro.socket.in create mode 100644 src/remote/libvirtd-tcp.socket.in create mode 100644 src/remote/libvirtd-tls.socket.in create mode 100644 src/remote/libvirtd.socket.in delete mode 100644 tests/commanddata/test24.log -- 2.21.0

3 35

[libvirt] [PATCH 0/5] Implement qemu-ga 'guest-get-users'
by Jonathon Jongsma 11 Jul '19

11 Jul '19

This set of patches adds new API and an implementation for getting the active users for a domain via the guest agent. There is only an implementation for the qemu driver. I've implemented the remote protocol and added support in virsh (new command 'guestusers'). A lot of the implementation was modelled on the implementation of guest-get-fsinfo, which also returns an array of info structures. Since this is my first time adding API or dealing with libvirt RPC stuff, I anticipate several rounds of the series. This series addresses https://bugzilla.redhat.com/show_bug.cgi?id=1704761 Jonathon Jongsma (5): lib: add API to query info about logged-in users remote: implement remote protocol for virDomainGetGuestUsers virsh: add command 'guestusers' implementing VirDomainGetGuestUsers qemu_agent: add helper for getting guest users qemu: implement virDomainGetGuestUsers include/libvirt/libvirt-domain.h | 18 ++++ src/driver-hypervisor.h | 6 ++ src/libvirt-domain.c | 62 ++++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_agent.c | 92 ++++++++++++++++++++ src/qemu/qemu_agent.h | 2 + src/qemu/qemu_driver.c | 38 +++++++++ src/remote/remote_daemon_dispatch.c | 89 ++++++++++++++++++++ src/remote/remote_driver.c | 82 +++++++++++++++++- src/remote/remote_protocol.x | 26 +++++- src/remote_protocol-structs | 17 ++++ tests/qemuagenttest.c | 125 ++++++++++++++++++++++++++++ tools/virsh-domain.c | 76 +++++++++++++++++ tools/virsh.pod | 4 + 14 files changed, 640 insertions(+), 2 deletions(-) -- 2.20.1

3 8

[libvirt] [PATCH] nodedev: add missing include for virFileMakePathWithMode
by Daniel P. Berrangé 11 Jul '19

11 Jul '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a build fix for BSD src/node_device/node_device_hal.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 876e808dce..1920f4566e 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -32,6 +32,7 @@ #include "datatypes.h" #include "viralloc.h" #include "viruuid.h" +#include "virfile.h" #include "virpci.h" #include "virpidfile.h" #include "virlog.h" -- 2.21.0

1 0

[libvirt] [jenkins-ci PATCH 0/2] guests: Use OpenJDK 11 where possible
by Andrea Bolognani 11 Jul '19

11 Jul '19

See commit 2/2 for more information. Andrea Bolognani (2): guests: Add mapping for OpenJDK on Ubuntu guests: Use OpenJDK 11 where possible guests/vars/mappings.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.21.0

2 4

[libvirt] [PATCH v2 0/3] ci: Various updates
by Andrea Bolognani 11 Jul '19

11 Jul '19

These are needed to keep Travis CI and GitLab CI running smoothly. Changes from [v1]: * update tag names in GitLab CI configuration; * move mips64le build off Debian sid. [v1] https://www.redhat.com/archives/libvir-list/2019-July/msg00614.html Andrea Bolognani (3): ci: Use default image tag "latest" ci: Update image list gitlab: Perform some builds on Debian 10 .gitlab-ci.yml | 34 +++++++++++++++++----------------- Makefile.ci | 24 +++++++++++++----------- 2 files changed, 30 insertions(+), 28 deletions(-) -- 2.21.0

2 6

[libvirt] [PATCH 0/3] ci: Various updates
by Andrea Bolognani 11 Jul '19

11 Jul '19

These are needed to keep Travis CI running smoothly. Andrea Bolognani (3): ci: Use default image tag "latest" ci: Update image list gitlab: Perform some builds on Debian 10 .gitlab-ci.yml | 20 ++++++++++---------- Makefile.ci | 24 +++++++++++++----------- 2 files changed, 23 insertions(+), 21 deletions(-) -- 2.21.0

1 4

[libvirt] [PATCH 0/2] qemu and lxc: remove duplicate code and move some definitions to domain_conf
by Ilias Stamatis 11 Jul '19

11 Jul '19

Ilias Stamatis (2): domain_conf: move DomainParseBlkioDeviceStr out of QEMU and LXC drivers domain_conf: move DomainMergeBlkioDevice out of QEMU and LXC drivers src/conf/domain_conf.c | 185 ++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 13 +++ src/libvirt_private.syms | 2 + src/lxc/lxc_driver.c | 184 +--------------------------------- src/qemu/qemu_driver.c | 207 +++------------------------------------ 5 files changed, 218 insertions(+), 373 deletions(-) -- 2.22.0

3 5

[libvirt] [PATCH] storage: Add iscsi-direct pool list type flag
by Han Han 11 Jul '19

11 Jul '19

Add pool list type flag VIR_CONNECT_LIST_STORAGE_POOLS_ISCSI_DIRECT, which was forgotten when introducing iscsi-direct pool at f0bf1be3. https://bugzilla.redhat.com/show_bug.cgi?id=1726609 Signed-off-by: Han Han <hhan(a)redhat.com> --- include/libvirt/libvirt-storage.h | 1 + src/conf/storage_conf.h | 3 ++- src/conf/virstorageobj.c | 4 +++- src/libvirt-storage.c | 1 + tools/virsh-pool.c | 2 +- tools/virsh.pod | 2 +- 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/libvirt/libvirt-storage.h b/include/libvirt/libvirt-storage.h index 5a95b2b139..089e1e0bd1 100644 --- a/include/libvirt/libvirt-storage.h +++ b/include/libvirt/libvirt-storage.h @@ -244,6 +244,7 @@ typedef enum { VIR_CONNECT_LIST_STORAGE_POOLS_GLUSTER = 1 << 16, VIR_CONNECT_LIST_STORAGE_POOLS_ZFS = 1 << 17, VIR_CONNECT_LIST_STORAGE_POOLS_VSTORAGE = 1 << 18, + VIR_CONNECT_LIST_STORAGE_POOLS_ISCSI_DIRECT = 1 << 19, } virConnectListAllStoragePoolsFlags; int virConnectListAllStoragePools(virConnectPtr conn, diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 338e70244d..f399ac6192 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -484,7 +484,8 @@ VIR_ENUM_DECL(virStoragePartedFs); VIR_CONNECT_LIST_STORAGE_POOLS_SHEEPDOG | \ VIR_CONNECT_LIST_STORAGE_POOLS_GLUSTER | \ VIR_CONNECT_LIST_STORAGE_POOLS_ZFS | \ - VIR_CONNECT_LIST_STORAGE_POOLS_VSTORAGE) + VIR_CONNECT_LIST_STORAGE_POOLS_VSTORAGE | \ + VIR_CONNECT_LIST_STORAGE_POOLS_ISCSI_DIRECT) #define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ALL \ (VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE | \ diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 31b5af8e9e..0ac128c4bc 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -1967,7 +1967,9 @@ virStoragePoolObjMatch(virStoragePoolObjPtr obj, (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_ZFS) && (obj->def->type == VIR_STORAGE_POOL_ZFS)) || (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_VSTORAGE) && - (obj->def->type == VIR_STORAGE_POOL_VSTORAGE)))) + (obj->def->type == VIR_STORAGE_POOL_VSTORAGE)) || + (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_ISCSI_DIRECT) && + (obj->def->type == VIR_STORAGE_POOL_ISCSI_DIRECT)))) return false; } diff --git a/src/libvirt-storage.c b/src/libvirt-storage.c index 3bd61dc986..24e28083ed 100644 --- a/src/libvirt-storage.c +++ b/src/libvirt-storage.c @@ -93,6 +93,7 @@ virStoragePoolGetConnect(virStoragePoolPtr pool) * VIR_CONNECT_LIST_STORAGE_POOLS_MPATH * VIR_CONNECT_LIST_STORAGE_POOLS_RBD * VIR_CONNECT_LIST_STORAGE_POOLS_SHEEPDOG + * VIR_CONNECT_LIST_STORAGE_POOLS_ISCSI_DIRECT * * Returns the number of storage pools found or -1 and sets @pools to * NULL in case of error. On success, the array stored into @pools is diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index c56ab2d90a..510d41b508 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -1205,7 +1205,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) flags |= VIR_CONNECT_LIST_STORAGE_POOLS_ISCSI; break; case VIR_STORAGE_POOL_ISCSI_DIRECT: - flags |= VIR_CONNECT_LIST_STORAGE_POOLS_ISCSI; + flags |= VIR_CONNECT_LIST_STORAGE_POOLS_ISCSI_DIRECT; break; case VIR_STORAGE_POOL_SCSI: flags |= VIR_CONNECT_LIST_STORAGE_POOLS_SCSI; diff --git a/tools/virsh.pod b/tools/virsh.pod index dbcac24292..62ffd43ba9 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -4093,7 +4093,7 @@ I<--uuid> and I<--name>. You may also want to list pools with specified types using I<type>, the pool types must be separated by comma, e.g. --type dir,disk. The valid pool types include 'dir', 'fs', 'netfs', 'logical', 'disk', 'iscsi', 'scsi', -'mpath', 'rbd', 'sheepdog' and 'gluster'. +'mpath', 'rbd', 'sheepdog', 'gluster', 'iscsi-direct'. The I<--details> option instructs virsh to additionally display pool persistence and capacity related information where available. -- 2.20.1

1 0

[libvirt] [PATCH 0/8] more snapshot improvements [incremental backup saga]
by Eric Blake 11 Jul '19

11 Jul '19

Various things that I've tweaked while working on addressing Peter's comments about my v8.5 checkpoint series. I'm less certain about patches 7 and 8 (as having multiple ways to spell an operation, but where one way fails with older servers, can be confusing), we may want to drop those two and just take the first 6. Eric Blake (8): snapshot: Rename qemu domain snapshot test files snapshot: Fix virDomainUndefineFlags docs regarding snapshots snapshot: Add internal option to validate XML against schema snapshot: Add VIR_DOMAIN_SNAPSHOT_CREATE_VALIDATE flag snapshot: Factor out redefine cycle validation backup: Add support for filtering based on current moment snapshot: Add ListAll filters for current snapshot snapshot: Expose new filter flags in virsh include/libvirt/libvirt-domain-snapshot.h | 7 +++ src/conf/snapshot_conf.h | 1 + src/conf/virdomainmomentobjlist.h | 14 ++++- src/conf/virdomainsnapshotobjlist.h | 10 +++- src/conf/snapshot_conf.c | 54 +++++++------------ src/conf/virdomainmomentobjlist.c | 49 ++++++++++++++++- src/conf/virdomainsnapshotobjlist.c | 13 +++++ src/libvirt-domain-snapshot.c | 17 +++++- src/libvirt-domain.c | 9 ++-- src/qemu/qemu_driver.c | 6 ++- src/test/test_driver.c | 6 ++- src/vbox/vbox_common.c | 11 ++-- src/vz/vz_driver.c | 5 +- tests/Makefile.am | 14 ++--- .../description_only.xml | 0 .../disk-invalid.xml | 0 .../disk-network-seclabel-invalid.xml | 0 .../disk-seclabel.xml | 0 .../disk_driver_name_null.xml | 0 .../disk_snapshot.xml | 0 .../empty.xml | 0 .../external_vm.xml | 0 .../name_and_description.xml | 0 .../name_only.xml | 0 .../noparent.xml | 0 .../all_parameters.xml | 0 .../disk-seclabel.xml | 0 .../disk_driver_name_null.xml | 0 .../disk_snapshot.xml | 0 .../disk_snapshot_redefine.xml | 0 .../empty.xml | 0 .../external_vm.xml | 0 .../external_vm_redefine.xml | 0 .../full_domain.xml | 0 .../metadata.xml | 0 .../name_and_description.xml | 0 .../noparent.xml | 0 .../noparent_nodescription.xml | 0 .../noparent_nodescription_noactive.xml | 0 ...test.c => qemudomainsnapshotxml2xmltest.c} | 15 +++--- tests/virschematest.c | 4 +- tests/virsh-snapshot | 16 ++++-- tools/virsh-snapshot.c | 25 ++++++++- tools/virsh.pod | 14 +++-- 44 files changed, 213 insertions(+), 77 deletions(-) rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/description_only.xml (100%) rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/disk-invalid.xml (100%) rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/disk-network-seclabel-invalid.xml (100%) rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/disk-seclabel.xml (100%) rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/disk_driver_name_null.xml (100%) rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/disk_snapshot.xml (100%) rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/empty.xml (100%) rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/external_vm.xml (100%) rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/name_and_description.xml (100%) rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/name_only.xml (100%) rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/noparent.xml (100%) rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/all_parameters.xml (100%) rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/disk-seclabel.xml (100%) rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/disk_driver_name_null.xml (100%) rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/disk_snapshot.xml (100%) rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/disk_snapshot_redefine.xml (100%) rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/empty.xml (100%) rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/external_vm.xml (100%) rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/external_vm_redefine.xml (100%) rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/full_domain.xml (100%) rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/metadata.xml (100%) rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/name_and_description.xml (100%) rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/noparent.xml (100%) rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/noparent_nodescription.xml (100%) rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/noparent_nodescription_noactive.xml (100%) rename tests/{domainsnapshotxml2xmltest.c => qemudomainsnapshotxml2xmltest.c} (91%) -- 2.20.1

2 19

[libvirt] [PATCH v3 00/21] Add support for vTPM state encryption
by Stefan Berger 10 Jul '19

10 Jul '19

This series of patches addresses the RFE in BZ 172830: https://bugzilla.redhat.com/show_bug.cgi?id=1728030 This series of patches adds support for vTPM state encryption by passing the read-end of a pipe's file descriptor to 'swtpm_setup' and 'swtpm' where they can read a passphrase from and derive a key from that passphrase. The TPM's domain XML looks to enable state encryption looks like this: <tpm model='tpm-tis'> <backend type='emulator' version='1.2'> <encryption format='vtpm'> <secret type='passphrase' uuid='2c9ceaba-c6ef-4f38-86fd-6e3adb2df5cd'/> </encryption> </backend> <alias name='tpm0'/> </tpm> The vTPM secret holding the passphrase looks like this: <secret ephemeral='no' private='yes'> <uuid>2c9ceaba-c6ef-4f38-86fd-6e3adb2df5cd</uuid> <description>vTPM passphrase example</description> <usage type='vtpm'> <name>vtpm_example</name> </usage> </secret> The swtpm v0.2 (upcoming) is needed that supports the command line option --print-capabilities returning a JSON object that identifies features added since v0.1. One such features is the possibility to pass a passphrase via a file descriptor. The patches do some refactoring of existing code on the way. Stefan v1->v2: - Added Marc-André's R-bs - Addressed comments - Added patches to extend virCommand to be able to write contents of multiple buffers to file descriptors for a spawned process to read from v2->v3: - Fixed some pointer issues following conversion to use VIR_AUTOFREE Stefan Berger (21): secret: Add support for usage type vTPM, extend schema and test case tests: Add already existing test case tpm-emulator-tpm2 util: Add VIR_STORAGE_ENCRYPTION_FORMAT_VTPM conf: Extend TPM XML parser with encryption support schema: Extend the TPM XML schema with support for encryption tests: Add test for TPM XML encryption parser and formatter tests: Add tests for QEMU command line generation with encrypted TPM tpm: Move virtpm.c from utils dir to own tpm dir tpm: Move qemuTPMEmulatorInit to virTPMEmulatorInit in virtpm.c tpm: Refactor virTPMEmulatorInit to use loop tpm: Check whether previously found executables were updated tpm: Parse the capabilities supported by swtpm and swtpm_setup utils: Implement function to pass a buffer to send via a fd to virCommand utils: Convert pollfd array to be allocated utils: Write a maximum of MAX_PIPE_FEED_BYTES into a pipe utils: Extend virCommandProcessIO to include the send buffers tpm: Use fd to pass password to swtpm_setup and swtpm tpm: Pass migration key passphrase via fd to swtpm tpm: Check TPM XML device configuration changes after edit docs: Extend Secret XML documentation with vtpm usage type docs: Extend TPM docs with new encryption element docs/formatdomain.html.in | 16 + docs/formatsecret.html.in | 61 +++- docs/schemas/domaincommon.rng | 30 ++ docs/schemas/secret.rng | 10 + include/libvirt/libvirt-secret.h | 1 + po/POTFILES | 2 +- src/Makefile.am | 1 + src/conf/Makefile.inc.am | 7 + src/conf/domain_conf.c | 96 +++++- src/conf/domain_conf.h | 5 + src/conf/secret_conf.c | 13 + src/conf/virtpm_conf.c | 36 ++ src/conf/virtpm_conf.h | 36 ++ src/libvirt_private.syms | 21 +- src/qemu/Makefile.inc.am | 1 + src/qemu/qemu_block.c | 1 + src/qemu/qemu_driver.c | 28 ++ src/qemu/qemu_extdevice.c | 2 +- src/qemu/qemu_extdevice.h | 3 + src/qemu/qemu_tpm.c | 196 ++++++----- src/security/Makefile.inc.am | 1 + src/tpm/Makefile.inc.am | 20 ++ src/tpm/virtpm.c | 326 ++++++++++++++++++ src/{util => tpm}/virtpm.h | 8 + src/util/Makefile.inc.am | 2 - src/util/vircommand.c | 139 +++++++- src/util/vircommand.h | 5 + src/util/virsecret.c | 2 +- src/util/virstorageencryption.c | 2 +- src/util/virstorageencryption.h | 1 + src/util/virtpm.c | 74 ---- tests/Makefile.am | 1 + .../tpm-emulator-tpm2-enc.x86_64-latest.args | 35 ++ .../tpm-emulator-tpm2-enc.xml | 34 ++ tests/qemuxml2argvtest.c | 1 + .../tpm-emulator-tpm2-enc.xml | 38 ++ tests/qemuxml2xmltest.c | 2 + tests/secretxml2xmlin/usage-vtpm.xml | 7 + tests/secretxml2xmltest.c | 1 + 39 files changed, 1099 insertions(+), 166 deletions(-) create mode 100644 src/conf/virtpm_conf.c create mode 100644 src/conf/virtpm_conf.h create mode 100644 src/tpm/Makefile.inc.am create mode 100644 src/tpm/virtpm.c rename src/{util => tpm}/virtpm.h (77%) delete mode 100644 src/util/virtpm.c create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.xml create mode 100644 tests/secretxml2xmlin/usage-vtpm.xml -- 2.20.1

1 21

[libvirt] [PATCH 00/12] introduce locking into every driver
by Daniel P. Berrangé 10 Jul '19

10 Jul '19

As part of the proposal to introduce an embedded driver feature, we decided we ought to have each driver acquire a lock against the virtual root it is configured to use. This will prevent two apps from running an embedded driver with the same root. https://www.redhat.com/archives/libvir-list/2019-May/msg00467.html It turns out that this will also be useful for the per-driver split daemons work I am working on. In that case libvirtd will exist as a monolithic daemon running all drivers, and we'll also have per-driver daemons like virtqemud, virtnetworkd, etc. It is only valid to run in one setup on the host. ie you must choose libvirtd, or choose per-driver daemons, never both. The per-driver locking will provide very useful protection against mistakes in this respect. Since the locking is functionally independant of both patch series, I'm sending it now. Daniel P. Berrangé (12): qemu: acquire a pidfile in the driver root directory secrets: acquire a pidfile in the driver root directory network: acquire a pidfile in the driver root directory storage: acquire a pidfile in the driver root directory nodedev: acquire a pidfile in the driver root directory interface: acquire a pidfile in the driver root directory nwfilter: acquire a pidfile in the driver root directory libxl: remove obsolete check for xend during driver startup libxl: acquire a pidfile in the driver root directory lxc: acquire a pidfile in the driver root directory vz: acquire a pidfile in the driver root directory bhyve: acquire a pidfile in the driver root directory src/bhyve/bhyve_driver.c | 9 +++++ src/bhyve/bhyve_utils.h | 3 ++ src/conf/virnodedeviceobj.h | 5 +++ src/conf/virnwfilterobj.h | 4 +++ src/conf/virstorageobj.h | 3 ++ src/interface/interface_backend_netcf.c | 45 +++++++++++++++++++++++-- src/interface/interface_backend_udev.c | 44 +++++++++++++++++++++++- src/libxl/libxl_conf.h | 3 ++ src/libxl/libxl_driver.c | 37 ++++++++------------ src/lxc/lxc_conf.h | 3 ++ src/lxc/lxc_driver.c | 9 +++++ src/network/bridge_driver.c | 10 ++++++ src/network/bridge_driver_platform.h | 3 ++ src/node_device/node_device_hal.c | 31 +++++++++++++++++ src/node_device/node_device_udev.c | 32 ++++++++++++++++++ src/nwfilter/nwfilter_driver.c | 19 +++++++++++ src/qemu/qemu_conf.h | 3 ++ src/qemu/qemu_driver.c | 9 +++++ src/secret/secret_driver.c | 44 +++++++++++++++++++----- src/storage/storage_driver.c | 11 ++++++ src/vz/vz_driver.c | 40 +++++++++++++++++++--- 21 files changed, 327 insertions(+), 40 deletions(-) -- 2.21.0

2 15

[libvirt] [PATCH 0/6] virDomainFlagsUndefine cleanups
by Eric Blake 10 Jul '19

10 Jul '19

Pointed out by Peter in response to: https://www.redhat.com/archives/libvir-list/2019-July/msg00277.html Patches 1-5 fix a pre-existing problem in several drivers, then provides a way to ensure we don't encounter it again. Patch 6 is an example of what I plan to do to all the drivers that have virDomainUndefineFlags but not snapshot support. Eric Blake (6): bhyve: Add various vir*Flags API esx: Add various vir*Flags API phyp: Add various vir*Flags API test: Add various vir*Flags API libvirt: Ensure modern APIs are implemented bhyve: Ignore no-op flags during virDomainUndefine src/bhyve/bhyve_driver.c | 41 +++++++++++++++++++++++++++++++++------ src/esx/esx_driver.c | 13 ++++++++++++- src/libvirt.c | 42 ++++++++++++++++++++++++++++++++++++---- src/phyp/phyp_driver.c | 24 +++++++++++++++++++++-- src/test/test_driver.c | 34 ++++++++++++++++++++++++++------ 5 files changed, 135 insertions(+), 19 deletions(-) -- 2.20.1

3 16

[libvirt] [dockerfiles PATCH 0/3] Various updates
by Andrea Bolognani 10 Jul '19

10 Jul '19

All patches pushed under the Dockerfiles refresh and trivial rule. Andrea Bolognani (3): Refresh after recent changes Re-introduce Ubuntu 16.04 Dockerfile Add Debian 10 Dockerfiles buildenv-centos-7.Dockerfile | 151 ++++++------- buildenv-debian-10-cross-aarch64.Dockerfile | 100 +++++++++ buildenv-debian-10-cross-armv6l.Dockerfile | 98 ++++++++ buildenv-debian-10-cross-armv7l.Dockerfile | 99 ++++++++ buildenv-debian-10-cross-i686.Dockerfile | 99 ++++++++ buildenv-debian-10-cross-mips.Dockerfile | 99 ++++++++ buildenv-debian-10-cross-mips64el.Dockerfile | 99 ++++++++ buildenv-debian-10-cross-mipsel.Dockerfile | 99 ++++++++ buildenv-debian-10-cross-ppc64le.Dockerfile | 99 ++++++++ buildenv-debian-10-cross-s390x.Dockerfile | 99 ++++++++ buildenv-debian-10.Dockerfile | 89 ++++++++ buildenv-fedora-29.Dockerfile | 173 +++++++------- buildenv-fedora-30.Dockerfile | 173 +++++++------- buildenv-fedora-rawhide.Dockerfile | 223 ++++++++++--------- buildenv-ubuntu-16.Dockerfile | 91 ++++++++ 15 files changed, 1433 insertions(+), 358 deletions(-) create mode 100644 buildenv-debian-10-cross-aarch64.Dockerfile create mode 100644 buildenv-debian-10-cross-armv6l.Dockerfile create mode 100644 buildenv-debian-10-cross-armv7l.Dockerfile create mode 100644 buildenv-debian-10-cross-i686.Dockerfile create mode 100644 buildenv-debian-10-cross-mips.Dockerfile create mode 100644 buildenv-debian-10-cross-mips64el.Dockerfile create mode 100644 buildenv-debian-10-cross-mipsel.Dockerfile create mode 100644 buildenv-debian-10-cross-ppc64le.Dockerfile create mode 100644 buildenv-debian-10-cross-s390x.Dockerfile create mode 100644 buildenv-debian-10.Dockerfile create mode 100644 buildenv-ubuntu-16.Dockerfile -- 2.21.0

1 3

[libvirt] [PATCH v2] libvirt: support block device storage type in virshParseSnapshotDiskspec
by Liu Dayu 10 Jul '19

10 Jul '19

virsh snapshot-create-as supports 'file' storage type in --diskspec by default. But it doesn't support 'block' storage type in the virshParseSnapshotDiskspec(). So if a snapshot on a block device (e.g. LV) was created, the type of current running storage source in dumpxml is inconsistent with the actual backend storage source. It will check file-system type mismatch failed and return an error message of 'Migration without shared storage is unsafe' when VM performs a live migration after this snapshot. Considering virsh has to be able to work remotely that recognizing a block device by prefix /dev/ or by stat() may be not suitable, so adding a "stype" field for the --diskspec string which will be either "file" or "block". e.g. --diskspec vda,snapshot=external,driver=qcow2,stype=block,file=/dev/xxx. Signed-off-by: Liu Dayu <liu.dayu(a)zte.com.cn> --- Patch v1: https://www.redhat.com/archives/libvir-list/2019-June/msg01248.html Changes in v2: - Adding a "stype" field for the --diskspec string which will indicate a "file" or "block" storage type. --- tools/virsh-snapshot.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index e9f0ee0..ec965b2 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -251,10 +251,12 @@ virshParseSnapshotDiskspec(vshControl *ctl, virBufferPtr buf, const char *str) const char *name = NULL; const char *snapshot = NULL; const char *driver = NULL; + const char *stype = NULL; const char *file = NULL; char **array = NULL; int narray; size_t i; + bool isFile = true; narray = vshStringToArray(str, &array); if (narray <= 0) @@ -266,6 +268,8 @@ virshParseSnapshotDiskspec(vshControl *ctl, virBufferPtr buf, const char *str) snapshot = array[i] + strlen("snapshot="); else if (!driver && STRPREFIX(array[i], "driver=")) driver = array[i] + strlen("driver="); + else if (!stype && STRPREFIX(array[i], "stype=")) + stype = array[i] + strlen("stype="); else if (!file && STRPREFIX(array[i], "file=")) file = array[i] + strlen("file="); else @@ -275,13 +279,26 @@ virshParseSnapshotDiskspec(vshControl *ctl, virBufferPtr buf, const char *str) virBufferEscapeString(buf, "<disk name='%s'", name); if (snapshot) virBufferAsprintf(buf, " snapshot='%s'", snapshot); + if (stype) { + if (STREQ(stype, "block")) { + isFile = false; + } else if (STRNEQ(stype, "file")) { + vshError(ctl, _("Unknown storage type: '%s'"), stype); + goto cleanup; + } + virBufferAsprintf(buf, " type='%s'", stype); + } if (driver || file) { virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); if (driver) virBufferAsprintf(buf, "<driver type='%s'/>\n", driver); - if (file) - virBufferEscapeString(buf, "<source file='%s'/>\n", file); + if (file) { + if (isFile) + virBufferEscapeString(buf, "<source file='%s'/>\n", file); + else + virBufferEscapeString(buf, "<source dev='%s'/>\n", file); + } virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</disk>\n"); } else { @@ -351,7 +368,7 @@ static const vshCmdOptDef opts_snapshot_create_as[] = { }, {.name = "diskspec", .type = VSH_OT_ARGV, - .help = N_("disk attributes: disk[,snapshot=type][,driver=type][,file=name]") + .help = N_("disk attributes: disk[,snapshot=type][,driver=type][,stype=type][,file=name]") }, {.name = NULL} }; -- 1.8.3.1

4 3

[libvirt] [PATCH] vz: fix typo that lost the '#' in '#define'
by Daniel P. Berrangé 10 Jul '19

10 Jul '19

Previous commit: commit faceedaf7170903065807e2c37dd0d1bd06a6ef5 Author: Jonathon Jongsma <jjongsma(a)redhat.com> Date: Tue Jun 18 11:13:12 2019 -0500 src/vz: use #pragma once in headers accidentally chomped the "#" in a "#define" when re-indenting Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/vz/vz_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index d9e3ebc30a..f116f9dd1f 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -145,7 +145,7 @@ vzGetDefaultSCSIModel(vzDriverPtr driver, int vzCheckUnsupportedGraphics(virDomainGraphicsDefPtr gr); - define PARALLELS_BLOCK_STATS_FOREACH(OP) \ +#define PARALLELS_BLOCK_STATS_FOREACH(OP) \ OP(rd_req, VIR_DOMAIN_BLOCK_STATS_READ_REQ, "read_requests") \ OP(rd_bytes, VIR_DOMAIN_BLOCK_STATS_READ_BYTES, "read_total") \ OP(wr_req, VIR_DOMAIN_BLOCK_STATS_WRITE_REQ, "write_requests") \ -- 2.21.0

1 0

[libvirt] [PATCH] rpc: always pass "-T -e none" args to ssh
by Daniel P. Berrangé 10 Jul '19

10 Jul '19

Way back in the past, the "no_tty=1" option was added for the remote driver to disable local password prompting by disabling use of the local tty: commit b32f42984994a397441a1c48f1a002e906624c51 Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Fri Sep 21 20:17:09 2007 +0000 Added a no_tty param to remote URIs to stop SSH prompting for password This was done by adding "-T -o BatchMode=yes -e none" args to ssh. This achieved the desired results but is none the less semantically flawed because it is mixing up config parameters for the local tty vs the remote tty. The "-T" arg stops allocation of a TTY on the remote host. This is good for all libvirt SSH tunnels as we never require a TTY for our usage model, so we should have just passed this unconditionally. The "-e none" option disables the escape character for sessions with a TTY. If we pass "-T" this is not required, but it also not harmful to add it, so we should just pass it unconditionally too. Only the "-o BatchMode=yes" option is related to disabling local password prompts and thus needs control via the no_tty URI param. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/rpc/virnetsocket.c | 4 ++-- tests/virnetsockettest.c | 34 ++++++++++++++++++---------------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index bfa1952989..aa46b83da6 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -854,9 +854,9 @@ int virNetSocketNewConnectSSH(const char *nodename, virCommandAddArgList(cmd, "-l", username, NULL); if (keyfile) virCommandAddArgList(cmd, "-i", keyfile, NULL); + virCommandAddArgList(cmd, "-T", "-e", "none", NULL); if (noTTY) - virCommandAddArgList(cmd, "-T", "-o", "BatchMode=yes", - "-e", "none", NULL); + virCommandAddArgList(cmd, "-o", "BatchMode=yes", NULL); if (noVerify) virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL); diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 9c14989287..bb8357f7cd 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -571,12 +571,13 @@ mymain(void) struct testSSHData sshData1 = { .nodename = "somehost", .path = "/tmp/socket", - .expectOut = "-- somehost sh -c 'if 'nc' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " - "ARG=-q0;" - "else " - "ARG=;" - "fi;" - "'nc' $ARG -U /tmp/socket'\n", + .expectOut = "-T -e none -- somehost sh -c '" + "if 'nc' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " + "ARG=-q0;" + "else " + "ARG=;" + "fi;" + "'nc' $ARG -U /tmp/socket'\n", }; if (virTestRun("SSH test 1", testSocketSSH, &sshData1) < 0) ret = -1; @@ -589,7 +590,7 @@ mymain(void) .noTTY = true, .noVerify = false, .path = "/tmp/socket", - .expectOut = "-p 9000 -l fred -T -o BatchMode=yes -e none -- somehost sh -c '" + .expectOut = "-p 9000 -l fred -T -e none -o BatchMode=yes -- somehost sh -c '" "if 'netcat' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " "ARG=-q0;" "else " @@ -608,7 +609,7 @@ mymain(void) .noTTY = false, .noVerify = true, .path = "/tmp/socket", - .expectOut = "-p 9000 -l fred -o StrictHostKeyChecking=no -- somehost sh -c '" + .expectOut = "-p 9000 -l fred -T -e none -o StrictHostKeyChecking=no -- somehost sh -c '" "if 'netcat' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " "ARG=-q0;" "else " @@ -630,7 +631,7 @@ mymain(void) struct testSSHData sshData5 = { .nodename = "crashyhost", .path = "/tmp/socket", - .expectOut = "-- crashyhost sh -c " + .expectOut = "-T -e none -- crashyhost sh -c " "'if 'nc' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " "ARG=-q0;" "else " @@ -647,7 +648,7 @@ mymain(void) .path = "/tmp/socket", .keyfile = "/root/.ssh/example_key", .noVerify = true, - .expectOut = "-i /root/.ssh/example_key -o StrictHostKeyChecking=no -- example.com sh -c '" + .expectOut = "-i /root/.ssh/example_key -T -e none -o StrictHostKeyChecking=no -- example.com sh -c '" "if 'nc' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " "ARG=-q0;" "else " @@ -662,12 +663,13 @@ mymain(void) .nodename = "somehost", .netcat = "nc -4", .path = "/tmp/socket", - .expectOut = "-- somehost sh -c 'if ''nc -4'' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " - "ARG=-q0;" - "else " - "ARG=;" - "fi;" - "''nc -4'' $ARG -U /tmp/socket'\n", + .expectOut = "-T -e none -- somehost sh -c '" + "if ''nc -4'' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " + "ARG=-q0;" + "else " + "ARG=;" + "fi;" + "''nc -4'' $ARG -U /tmp/socket'\n", }; if (virTestRun("SSH test 7", testSocketSSH, &sshData7) < 0) ret = -1; -- 2.21.0

2 1

[libvirt] [PATCH 00/18] Add support for vTPM state encryption
by Stefan Berger 10 Jul '19

10 Jul '19

This series of patches addresses the RFE in BZ 172830: https://bugzilla.redhat.com/show_bug.cgi?id=1728030 This series of patches adds support for vTPM state encryption by passing the read-end of a pipe's file descriptor to 'swtpm_setup' and 'swtpm' where they can read a passphrase from and derive a key from that passphrase. The TPM's domain XML looks to enable state encryption looks like this: <tpm model='tpm-tis'> <backend type='emulator' version='1.2'> <encryption format='vtpm'> <secret type='passphrase' uuid='2c9ceaba-c6ef-4f38-86fd-6e3adb2df5cd'/> </encryption> </backend> <alias name='tpm0'/> </tpm> The vTPM secret holding the passphrase looks like this: <secret ephemeral='no' private='yes'> <uuid>2c9ceaba-c6ef-4f38-86fd-6e3adb2df5cd</uuid> <description>vTPM passphrase example</description> <usage type='vtpm'> <name>vtpm_example</name> </usage> </secret> The swtpm v0.2 (upcoming) is needed that supports the command line option --print-capabilities returning a JSON object that identifies features added since v0.1. One such features is the possibility to pass a passphrase via a file descriptor. The patches do some refactoring of existing code on the way. Stefan Stefan Berger (18): secret: Add support for usage type vTPM tests: Add test for new Secret vTPM usage type tests: Add already existing test case tpm-emulator-tpm2 util: Add VIR_STORAGE_ENCRYPTION_FORMAT_VTPM conf: Extend TPM XML parser with encryption support schema: Extend the TPM XML schema with support for encryption tests: Add test for TPM XML encryption parser and formatter tests: Add tests for QEMU command line generation with encrypted TPM tpm: Move virtpm.c from utils dir to own tpm dir tpm: Move qemuTPMEmulatorInit to virTPMEmulatorInit in virtpm.c tpm: Refactor virTPMEmulatorInit to use loop tpm: Check whether previously found executables were updated tpm: Parse the capabilities supported by swtpm and swtpm_setup tpm: Use fd to pass password to swtpm_setup and swtpm tpm: Pass migration key passphrase via fd to swtpm tpm: Check TPM XML device configuration changes after edit docs: Extend Secret XML documentation with vtpm usage type docs: Extend TPM docs with new encryption element docs/formatdomain.html.in | 16 + docs/formatsecret.html.in | 61 +++- docs/schemas/domaincommon.rng | 30 ++ docs/schemas/secret.rng | 10 + include/libvirt/libvirt-secret.h | 1 + po/POTFILES | 2 +- src/Makefile.am | 1 + src/conf/Makefile.inc.am | 7 + src/conf/domain_conf.c | 96 ++++- src/conf/domain_conf.h | 5 + src/conf/secret_conf.c | 13 + src/conf/virtpm_conf.c | 36 ++ src/conf/virtpm_conf.h | 36 ++ src/libvirt_private.syms | 20 +- src/qemu/Makefile.inc.am | 1 + src/qemu/qemu_block.c | 1 + src/qemu/qemu_driver.c | 28 ++ src/qemu/qemu_extdevice.c | 2 +- src/qemu/qemu_extdevice.h | 3 + src/qemu/qemu_tpm.c | 193 ++++++---- src/security/Makefile.inc.am | 1 + src/tpm/Makefile.inc.am | 20 ++ src/tpm/virtpm.c | 330 ++++++++++++++++++ src/{util => tpm}/virtpm.h | 8 + src/util/Makefile.inc.am | 2 - src/util/virsecret.c | 2 +- src/util/virstorageencryption.c | 2 +- src/util/virstorageencryption.h | 1 + src/util/virtpm.c | 74 ---- tests/Makefile.am | 1 + .../tpm-emulator-tpm2-enc.x86_64-latest.args | 35 ++ .../tpm-emulator-tpm2-enc.xml | 34 ++ tests/qemuxml2argvtest.c | 1 + .../tpm-emulator-tpm2-enc.xml | 38 ++ tests/qemuxml2xmltest.c | 2 + tests/secretxml2xmlin/usage-vtpm.xml | 7 + tests/secretxml2xmltest.c | 1 + 37 files changed, 957 insertions(+), 164 deletions(-) create mode 100644 src/conf/virtpm_conf.c create mode 100644 src/conf/virtpm_conf.h create mode 100644 src/tpm/Makefile.inc.am create mode 100644 src/tpm/virtpm.c rename src/{util => tpm}/virtpm.h (77%) delete mode 100644 src/util/virtpm.c create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.xml create mode 100644 tests/secretxml2xmlin/usage-vtpm.xml -- 2.20.1

3 37

[libvirt] [PATCH v9 00/10] work-in-progress: incremental backup
by Eric Blake 09 Jul '19

09 Jul '19

This is the current state of my incremental backup work on top of the v9 checkpoint patches [1]. While everything compiles and my local tests are able to perform an incremental backup, I already know that the code needs a lot of cleanups before it can be accepted upstream; this is more of a preview post to allow further testing against the APIs while my more immediate focus is on getting checkpoints in. There will be a v10 of this portion of the backup work, but now that checkpoints are nearly ready to go, I'm still aiming to get backups in the same 5.6 release window. [1] https://www.redhat.com/archives/libvir-list/2019-July/msg00236.html I've pushed a tag backup-v9 to both my libvirt.git and libvirt-python.git repos to match: https://repo.or.cz/libvirt/ericb.git/shortlog/refs/tags/backup-v9 https://repo.or.cz/libvirt-python/ericb.git/shortlog/refs/tags/backup-v9 Changes since v8: - lots of rebasing - however, reviews from v8 on this part of the series have not been addressed yet... 001/10:[down] 'backup: qemu: Implement VIR_DOMAIN_CHECKPOINT_XML_SIZE flag' 002/10:[0016] [FC] 'backup: Document new XML for backups' 003/10:[0112] [FC] 'backup: Introduce virDomainBackup APIs' 004/10:[0419] [FC] 'backup: Implement backup APIs for remote driver' 005/10:[0023] [FC] 'backup: Parse and output backup XML' 006/10:[0052] [FC] 'backup: Implement virsh support for backup' 007/10:[0006] [FC] 'backup: qemu: Implement framework for backup job APIs' 008/10:[0010] [FC] 'backup: Wire up qemu full pull backup commands over QMP' 009/10:[----] [-C] 'backup: qemu: Wire up qemu full push backup commands over QMP' 010/10:[down] 'backup: Implement qemu incremental pull backup' Eric Blake (10): backup: qemu: Implement VIR_DOMAIN_CHECKPOINT_XML_SIZE flag backup: Document new XML for backups backup: Introduce virDomainBackup APIs backup: Implement backup APIs for remote driver backup: Parse and output backup XML backup: Implement virsh support for backup backup: qemu: Implement framework for backup job APIs backup: Wire up qemu full pull backup commands over QMP backup: qemu: Wire up qemu full push backup commands over QMP backup: Implement qemu incremental pull backup include/libvirt/libvirt-domain.h | 41 +- src/conf/backup_conf.h | 94 +++ src/conf/virconftypes.h | 3 + src/driver-hypervisor.h | 14 + src/qemu/qemu_blockjob.h | 1 + src/qemu/qemu_domain.h | 4 + src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.h | 3 + docs/docs.html.in | 3 +- docs/format.html.in | 1 + docs/formatbackup.html.in | 184 +++++ docs/formatcheckpoint.html.in | 12 +- docs/index.html.in | 3 +- docs/schemas/domainbackup.rng | 219 ++++++ examples/c/misc/event-test.c | 3 + libvirt.spec.in | 1 + mingw-libvirt.spec.in | 2 + src/conf/Makefile.inc.am | 2 + src/conf/backup_conf.c | 546 ++++++++++++++ src/conf/domain_conf.c | 2 +- src/libvirt-domain-checkpoint.c | 7 +- src/libvirt-domain.c | 219 ++++++ src/libvirt_private.syms | 8 +- src/libvirt_public.syms | 3 + src/qemu/qemu_domain.c | 37 +- src/qemu/qemu_driver.c | 706 ++++++++++++++++++- src/qemu/qemu_monitor.c | 11 + src/qemu/qemu_monitor_json.c | 80 +++ src/qemu/qemu_process.c | 9 + src/remote/remote_driver.c | 3 + src/remote/remote_protocol.x | 53 +- src/remote_protocol-structs | 28 + tests/Makefile.am | 2 + tests/domainbackupxml2xmlin/backup-pull.xml | 9 + tests/domainbackupxml2xmlin/backup-push.xml | 9 + tests/domainbackupxml2xmlin/empty.xml | 1 + tests/domainbackupxml2xmlout/backup-pull.xml | 9 + tests/domainbackupxml2xmlout/backup-push.xml | 9 + tests/domainbackupxml2xmlout/empty.xml | 7 + tests/virschematest.c | 2 + tools/virsh-domain.c | 253 ++++++- tools/virsh.pod | 49 ++ 42 files changed, 2634 insertions(+), 22 deletions(-) create mode 100644 src/conf/backup_conf.h create mode 100644 docs/formatbackup.html.in create mode 100644 docs/schemas/domainbackup.rng create mode 100644 src/conf/backup_conf.c create mode 100644 tests/domainbackupxml2xmlin/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlin/backup-push.xml create mode 100644 tests/domainbackupxml2xmlin/empty.xml create mode 100644 tests/domainbackupxml2xmlout/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlout/backup-push.xml create mode 100644 tests/domainbackupxml2xmlout/empty.xml -- 2.20.1

2 15

[libvirt] [jenkins-ci PATCH] guests: Define package_manager for Ubuntu 16.04
by Andrea Bolognani 09 Jul '19

09 Jul '19

Commit 611b85c2aa70 added this for all operating systems, but at the time we had (mistakenly) dropped support for Ubuntu 16.04, so we need to catch up after the recent revert brought it back. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. guests/host_vars/libvirt-ubuntu-16/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars/libvirt-ubuntu-16/main.yml index 0e38128..179dd03 100644 --- a/guests/host_vars/libvirt-ubuntu-16/main.yml +++ b/guests/host_vars/libvirt-ubuntu-16/main.yml @@ -16,6 +16,7 @@ projects: - virt-viewer package_format: 'deb' +package_manager: 'apt-get' os_name: 'Ubuntu' os_version: '16' -- 2.21.0

1 0

[libvirt] [jenkins-ci PATCH 0/2] Re-introduce Ubuntu 16.04
by Andrea Bolognani 09 Jul '19

09 Jul '19

See commit 1/2 for the explanation. Andrea Bolognani (2): guests: Re-introduce Ubuntu 16.04 Start building on Ubuntu 16.04 once again guests/host_vars/libvirt-ubuntu-16/docker.yml | 2 ++ .../host_vars/libvirt-ubuntu-16/install.yml | 2 ++ guests/host_vars/libvirt-ubuntu-16/main.yml | 22 +++++++++++++++++++ guests/inventory | 1 + guests/playbooks/build/jobs/defaults.yml | 1 + .../playbooks/build/projects/libvirt-dbus.yml | 5 ++++- .../build/projects/libvirt-go-xml.yml | 1 + .../playbooks/build/projects/libvirt-go.yml | 1 + .../build/projects/libvirt-ocaml.yml | 1 + .../build/projects/libvirt-sandbox.yml | 1 + .../playbooks/build/projects/libvirt-tck.yml | 1 + guests/playbooks/build/projects/libvirt.yml | 1 + guests/playbooks/build/projects/osinfo-db.yml | 1 + .../playbooks/build/projects/virt-manager.yml | 4 +++- guests/vars/mappings.yml | 3 +++ 15 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 guests/host_vars/libvirt-ubuntu-16/docker.yml create mode 100644 guests/host_vars/libvirt-ubuntu-16/install.yml create mode 100644 guests/host_vars/libvirt-ubuntu-16/main.yml -- 2.21.0

2 3

[libvirt] [PATCH] logging: ensure virtlogd rollover takes priority over logrotate
by Daniel P. Berrangé 09 Jul '19

09 Jul '19

The virtlogd config is set to rollover logs every 2 MB. Normally a logrotate config file is also installed to handle cases where virtlogd is disabled. This is set to rollover weekly with no size constraint. As a result logrotate can interfere with virtlogd's, rolling over files that virtlogd has already taken care of. This changes logrotate configs to rollover based on a max size constraint of 2 MB + 1 byte. When virtlogd is running the log files will never get this large, making logrotate a no-op. If the user changes the size in virtlogd's config to something larger, they are responsible for also changing the logrotate config suitably. The LXC driver doesn't use virtlogd, but its logrotate config is altered to match the QEMU driver logrotate, just for the sake of consistency. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/logging/virtlogd.conf | 6 ++++++ src/remote/libvirtd.lxc.logrotate.in | 2 +- src/remote/libvirtd.qemu.logrotate.in | 12 +++++++++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/logging/virtlogd.conf b/src/logging/virtlogd.conf index 72da7f0705..bc41edbc6b 100644 --- a/src/logging/virtlogd.conf +++ b/src/logging/virtlogd.conf @@ -90,6 +90,12 @@ #admin_max_clients = 5 # Maximum file size before rolling over. Defaults to 2 MB +# +# Beware that a logrotate config file might be installed too, +# to handle cases where virtlogd is disabled. To ensure that +# the logrotate config is a no-op when virtlogd is running, +# make sure that max_size here is smaller than size listed +# in the logrotate config. #max_size = 2097152 # Maximum number of backup files to keep. Defaults to 3, diff --git a/src/remote/libvirtd.lxc.logrotate.in b/src/remote/libvirtd.lxc.logrotate.in index 2bb9dfba12..b88dabb58e 100644 --- a/src/remote/libvirtd.lxc.logrotate.in +++ b/src/remote/libvirtd.lxc.logrotate.in @@ -1,5 +1,5 @@ @localstatedir@/log/libvirt/lxc/*.log { - weekly + size 2097153 missingok rotate 4 compress diff --git a/src/remote/libvirtd.qemu.logrotate.in b/src/remote/libvirtd.qemu.logrotate.in index cdb399ef23..9b9db716ab 100644 --- a/src/remote/libvirtd.qemu.logrotate.in +++ b/src/remote/libvirtd.qemu.logrotate.in @@ -1,8 +1,14 @@ @localstatedir@/log/libvirt/qemu/*.log { - weekly + # The QEMU driver is configured to use virtlogd by + # default, which will perform log rollover. + # This logrotate config is still installed for cases + # where the user has switched off virtlogd. + # + # If virtlogd is active, ensure that size here is + # larger than 'max_size' in the virtlogd config + # so that logrotate becomes a no-op + size 2097153 missingok rotate 4 - compress - delaycompress copytruncate } -- 2.21.0

2 1

[libvirt] [PATCH] util: assume modern CPU_ALLOC macros always exist
by Daniel P. Berrangé 09 Jul '19

09 Jul '19

Support for the modern CPU_ALLOC macros was added 10 years ago in commit a73cd93b2428adbbc62bb919b6cf5ffd27728040 Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Mon Nov 16 16:08:29 2009 +0000 Alternate CPU affinity impl to cope with NR_CPUS > 1024 This is long enough that we can assume it always exists and drop the back compat code. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/util/virprocess.c | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index f2533f639f..66834d37d3 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -422,8 +422,6 @@ int virProcessSetAffinity(pid_t pid, virBitmapPtr map) { size_t i; VIR_DEBUG("Set process affinity on %lld", (long long)pid); -# ifdef CPU_ALLOC - /* New method dynamically allocates cpu mask, allowing unlimted cpus */ int numcpus = 1024; size_t masklen; cpu_set_t *mask; @@ -462,22 +460,6 @@ int virProcessSetAffinity(pid_t pid, virBitmapPtr map) return -1; } CPU_FREE(mask); -# else - /* Legacy method uses a fixed size cpu mask, only allows up to 1024 cpus */ - cpu_set_t mask; - - CPU_ZERO(&mask); - for (i = 0; i < virBitmapSize(map); i++) { - if (virBitmapIsBitSet(map, i)) - CPU_SET(i, &mask); - } - - if (sched_setaffinity(pid, sizeof(mask), &mask) < 0) { - virReportSystemError(errno, - _("cannot set CPU affinity on process %d"), pid); - return -1; - } -# endif return 0; } @@ -491,7 +473,6 @@ virProcessGetAffinity(pid_t pid) size_t ncpus; virBitmapPtr ret = NULL; -# ifdef CPU_ALLOC /* 262144 cpus ought to be enough for anyone */ ncpus = 1024 << 8; masklen = CPU_ALLOC_SIZE(ncpus); @@ -503,14 +484,6 @@ virProcessGetAffinity(pid_t pid) } CPU_ZERO_S(masklen, mask); -# else - ncpus = 1024; - if (VIR_ALLOC(mask) < 0) - return NULL; - - masklen = sizeof(*mask); - CPU_ZERO(mask); -# endif if (sched_getaffinity(pid, masklen, mask) < 0) { virReportSystemError(errno, @@ -522,22 +495,13 @@ virProcessGetAffinity(pid_t pid) goto cleanup; for (i = 0; i < ncpus; i++) { -# ifdef CPU_ALLOC /* coverity[overrun-local] */ if (CPU_ISSET_S(i, masklen, mask)) ignore_value(virBitmapSetBit(ret, i)); -# else - if (CPU_ISSET(i, mask)) - ignore_value(virBitmapSetBit(ret, i)); -# endif } cleanup: -# ifdef CPU_ALLOC CPU_FREE(mask); -# else - VIR_FREE(mask); -# endif return ret; } -- 2.21.0

2 2

[libvirt] [PATCH] libxl_driver: Drop needless variable
by Michal Privoznik 09 Jul '19

09 Jul '19

The @oldDef variable in libxlAddDom0() is not used really. Drop it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libxl/libxl_driver.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 7c236383e4..731700ded6 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -606,7 +606,6 @@ libxlAddDom0(libxlDriverPrivatePtr driver) libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); virDomainDefPtr def = NULL; virDomainObjPtr vm = NULL; - virDomainDefPtr oldDef = NULL; libxl_dominfo d_info; unsigned long long maxmem; int ret = -1; @@ -636,7 +635,7 @@ libxlAddDom0(libxlDriverPrivatePtr driver) if (!(vm = virDomainObjListAdd(driver->domains, def, driver->xmlopt, 0, - &oldDef))) + NULL))) goto cleanup; def = NULL; @@ -657,7 +656,6 @@ libxlAddDom0(libxlDriverPrivatePtr driver) cleanup: libxl_dominfo_dispose(&d_info); virDomainDefFree(def); - virDomainDefFree(oldDef); virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; -- 2.21.0

2 1

[libvirt] [PATCH] maint: Typo fix for whether
by Eric Blake 09 Jul '19

09 Jul '19

Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under trivial rule. src/driver.h | 4 ++-- docs/news-2014.html.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/driver.h b/src/driver.h index 3fcea0d629..898fb96df4 100644 --- a/src/driver.h +++ b/src/driver.h @@ -78,9 +78,9 @@ typedef struct _virConnectDriver virConnectDriver; typedef virConnectDriver *virConnectDriverPtr; struct _virConnectDriver { - /* Wether driver permits a server in the URI */ + /* Whether driver permits a server in the URI */ bool localOnly; - /* Wether driver needs a server in the URI */ + /* Whether driver needs a server in the URI */ bool remoteOnly; /* * NULL terminated list of supported URI schemes. diff --git a/docs/news-2014.html.in b/docs/news-2014.html.in index 91a4f2f26f..2dbbe070de 100644 --- a/docs/news-2014.html.in +++ b/docs/news-2014.html.in @@ -2041,7 +2041,7 @@ build: avoid compiler warning on shadowed name (Jean-Baptiste Rouault),<br/> tests: link against libxml2 (Guido Günther),<br/> tests: build viridentitytest only WITH_ATTR. (Jincheng Miao),<br/> - maint: Correctly detect wether "gluster" cli tool is accessible (Peter Krempa),<br/> + maint: Correctly detect whether "gluster" cli tool is accessible (Peter Krempa),<br/> libvirt-guests: avoid bashism (Guido Günther),<br/> Use the force flag for mkfs -t xfs (Ján Tomko)<br/> </li> -- 2.20.1

1 0

[libvirt] [PATCH] tests: Add getuid() to virnetdevbandwidthmock
by Andrea Bolognani 09 Jul '19

09 Jul '19

When only geteuid() is mocked, the test crashes on Debian 10. Fatal: failed to reset uid: No such file or directory Program received signal SIGABRT, Aborted. __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 50 ../sysdeps/unix/sysv/linux/raise.c: No such file or directory. (gdb) t a a bt Thread 1 (Thread 0x7ffff3b3e080 (LWP 12003)): #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 #1 0x00007ffff7798535 in __GI_abort () at abort.c:79 #2 0x00007ffff485ca20 in _gcry_logv (level=level@entry=40, fmt=fmt@entry=0x7ffff4929126 "failed to reset uid: %s\n", arg_ptr=arg_ptr@entry=0x7fffffffe4a0) at ../../src/misc.c:142 #3 0x00007ffff485cd61 in _gcry_log_fatal (fmt=fmt@entry=0x7ffff4929126 "failed to reset uid: %s\n") at ../../src/misc.c:218 #4 0x00007ffff48639d1 in lock_pool_pages (n=<optimized out>, p=<optimized out>) at ../../src/secmem.c:340 #5 _gcry_secmem_init_internal (n=<optimized out>) at ../../src/secmem.c:563 #6 0x00007ffff4863d78 in _gcry_secmem_init (n=4096) at ../../src/secmem.c:581 #7 0x00007ffff485e4e6 in _gcry_vcontrol (cmd=<optimized out>, arg_ptr=arg_ptr@entry=0x7fffffffe5e0) at ../../src/global.c:506 #8 0x00007ffff485a789 in gcry_control (cmd=cmd@entry=GCRYCTL_INIT_SECMEM) at ../../src/visibility.c:79 #9 0x00007ffff71af10f in ssh_crypto_init () at ./src/libgcrypt.c:621 #10 0x00007ffff7193796 in _ssh_init (constructor=constructor@entry=1) at ./src/init.c:79 #11 0x00007ffff71834de in libssh_constructor () at ./src/init.c:116 #12 0x00007ffff7fe437a in call_init (l=<optimized out>, argc=argc@entry=1, argv=argv@entry=0x7fffffffe778, env=env@entry=0x7fffffffe788) at dl-init.c:72 #13 0x00007ffff7fe4476 in call_init (env=0x7fffffffe788, argv=0x7fffffffe778, argc=1, l=<optimized out>) at dl-init.c:30 #14 _dl_init (main_map=0x7ffff7ffe190, argc=1, argv=0x7fffffffe778, env=0x7fffffffe788) at dl-init.c:119 #15 0x00007ffff7fd60ca in _dl_start_user () from /lib64/ld-linux-x86-64.so.2 #16 0x0000000000000001 in ?? () #17 0x00007fffffffea26 in ?? () #18 0x0000000000000000 in ?? () Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tests/virnetdevbandwidthmock.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/virnetdevbandwidthmock.c b/tests/virnetdevbandwidthmock.c index cb48933447..f0c6b22c5f 100644 --- a/tests/virnetdevbandwidthmock.c +++ b/tests/virnetdevbandwidthmock.c @@ -24,3 +24,8 @@ uid_t geteuid(void) { return 0; } + +uid_t getuid(void) +{ + return 0; +} -- 2.21.0

2 3

[libvirt] [PATCHv2] Do not keep empty log files for deleted domains
by Jan Zerebecki 09 Jul '19

09 Jul '19

With logrotates copytruncate when e.g. domain1 doesn't exist anymore /var/log/libvirt/qemu/domain1.log will still exist after rotation even though it will never be written to. When new domain names keep getting used this leads to a lot of empty logfiles. This may lead to slowdown or lack of free disk space / inodes. Fix this by replacing copytruncate with the apropriate postrotate command to reopen log files. Thus after the apropriate time log files for deleted domains will be gone. This also has the advantage that the chance for loss of a few lines during copytruncate is gone. This only fixes the issue for qemu domains, others still have the same problem unfixed. Signed-off-by: Jan Zerebecki <jan.suse(a)zerebecki.de> --- v2: drop changes to other logrotate confis src/remote/libvirtd.qemu.logrotate.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/remote/libvirtd.qemu.logrotate.in b/src/remote/libvirtd.qemu.logrotate.in index cdb399ef23..95407cec1a 100644 --- a/src/remote/libvirtd.qemu.logrotate.in +++ b/src/remote/libvirtd.qemu.logrotate.in @@ -4,5 +4,7 @@ rotate 4 compress delaycompress - copytruncate + postrotate + /usr/bin/killall -USR1 virtlogd + endscript } -- 2.20.1

3 6

[libvirt] [PATCH v4 00/25] Fix and enable owner remembering
by Michal Privoznik 09 Jul '19

09 Jul '19

This is meant for next release to have the most time possible for testing. Some of the patches were ACKed in v3 already but since they don't make sense on their own I haven't pushed them. v4 of: https://www.redhat.com/archives/libvir-list/2019-March/msg01948.html As usual, you can find (not only these) patches on my github: https://github.com/zippy2/libvirt branch xattr_fixes_v4 diff to v3: - Some new patches (qemusecuritytest and qemusecuritymock) - Some other fixes raised by Cole in review of v3 (like double error reporting and others) - Remembering is done only for paths that cannot be shared between domains. This renders refcounting needless because the refcounter can't ever be greater than one. Nevertheless, I'm keeping it in because in the long run I might come up with a solution to the problem of shared resources and having refcounters might help. Michal Prívozník (25): qemusecuritymock: Mock virProcessRunInFork qemusecuritymock: Fix bit arithmetic qemusecuritymock: Actually set error on failure qemusecuritymock: Introduce and use freePaths() qemusecuritytest: Drop unused variable qemusecuritytest: Use AUTOFREE/AUTOUNREF qemusecuritytest: Fix capabilities loading tools: Slightly rework libvirt_recover_xattrs.sh virSecuritySELinuxRestoreAllLabel: Print @migrated in the debug message too virfile: Make virFileGetXAttr report errors virFileSetXAttr: Report error on failure virFileRemoveXAttr: Report error on failure security: Don't skip label restore on file systems lacking XATTRs security: Document @restore member of transaction list security_dac: Allow caller to suppress owner remembering security_selinux: Allow caller to suppress owner remembering qemusecuritymock: Allow some paths to be not restored security: Don't remember owner for shared resources security: Introduce virSecurityManagerMoveImageMetadata security_util: Introduce virSecurityMoveRememberedLabel security_dac: Implement virSecurityManagerMoveImageMetadata security_selinux: Implement virSecurityManagerMoveImageMetadata qemu_security: Implement qemuSecurityMoveImageMetadata qemu: Move image security metadata on snapshot activity Revert "qemu: Temporary disable owner remembering" docs/news.xml | 13 ++ src/libvirt_private.syms | 2 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 5 + src/qemu/qemu_blockjob.c | 6 + src/qemu/qemu_conf.c | 4 + src/qemu/qemu_driver.c | 17 +- src/qemu/qemu_security.c | 19 +++ src/qemu/qemu_security.h | 5 + src/qemu/test_libvirtd_qemu.aug.in | 1 + src/security/security_dac.c | 171 +++++++++++++++---- src/security/security_driver.h | 5 + src/security/security_manager.c | 39 +++++ src/security/security_manager.h | 4 + src/security/security_nop.c | 10 ++ src/security/security_selinux.c | 263 ++++++++++++++++++++--------- src/security/security_stack.c | 20 +++ src/security/security_util.c | 73 +++++++- src/security/security_util.h | 5 + src/util/virfile.c | 78 +++++++-- src/util/virfile.h | 5 + src/util/virprocess.h | 3 +- tests/qemusecuritymock.c | 76 +++++++-- tests/qemusecuritytest.c | 146 ++++++++++------ tests/qemusecuritytest.h | 4 +- tools/libvirt_recover_xattrs.sh | 50 +++--- 26 files changed, 802 insertions(+), 223 deletions(-) -- 2.21.0

4 64

[libvirt] [PATCH Rust v2 1/6] ci workaround when running integration tests
by Sahid Orentino Ferdjaoui 09 Jul '19

09 Jul '19

Due to an issue fixed in libvirt master we should not consider running integration tests in parallel. https://www.redhat.com/archives/libvir-list/2019-July/msg00287.html Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui(a)canonical.com> --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c52f745..54f3c24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,4 +41,7 @@ install: script: - cargo test --verbose - - cargo test --verbose -- --ignored + # Due to an issue fixed in master we should not consider running + # integration tests in parallel. + # see: https://www.redhat.com/archives/libvir-list/2019-July/msg00287.html + - cargo test --verbose -- --ignored --test-threads=1 -- 2.17.1

2 11

[libvirt] [PATCH] po: Drop src/xenconfig/xen_sxpr.c from POTFILES
by Peter Krempa 09 Jul '19

09 Jul '19

Commit 2f1c909991291b40 forgot this change. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed under the build-breaker rule. po/POTFILES | 1 - 1 file changed, 1 deletion(-) diff --git a/po/POTFILES b/po/POTFILES index 23f24ed76f..ab582ffbe9 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -290,7 +290,6 @@ src/vz/vz_utils.h src/xenapi/xenapi_driver.c src/xenapi/xenapi_utils.c src/xenconfig/xen_common.c -src/xenconfig/xen_sxpr.c src/xenconfig/xen_xl.c src/xenconfig/xen_xm.c tests/virpolkittest.c -- 2.21.0

1 0

[libvirt] [jenkins-ci PATCH 0/5] guests: Add Debian 10
by Andrea Bolognani 09 Jul '19

09 Jul '19

It was released, like, two full days ago! Let's get with the times already! :P Note that the libvirt-check job currently fails on Debian 10, but I have already posted a libvirt patch[1] addressing that issue. [1] https://www.redhat.com/archives/libvir-list/2019-July/msg00318.html Andrea Bolognani (5): guests: Update mappings for perl-Digest guests: Update mappings for sheepdog guests: Add Debian 10 guests: Build on Debian 10 jenkins: Build on Debian 10 guests/host_vars/libvirt-debian-10/docker.yml | 2 + .../host_vars/libvirt-debian-10/install.yml | 2 + guests/host_vars/libvirt-debian-10/main.yml | 24 ++++++ guests/inventory | 1 + guests/playbooks/build/jobs/defaults.yml | 1 + .../playbooks/build/projects/libvirt-dbus.yml | 3 + .../build/projects/libvirt-go-xml.yml | 1 + .../playbooks/build/projects/libvirt-go.yml | 1 + .../build/projects/libvirt-ocaml.yml | 1 + .../build/projects/libvirt-sandbox.yml | 1 + .../playbooks/build/projects/libvirt-tck.yml | 1 + guests/playbooks/build/projects/libvirt.yml | 1 + .../build/projects/osinfo-db-tools.yml | 1 + guests/playbooks/build/projects/osinfo-db.yml | 1 + .../playbooks/build/projects/virt-manager.yml | 2 + guests/vars/mappings.yml | 7 +- guests/vars/vault.yml | 78 ++++++++++--------- jenkins/jobs/defaults.yaml | 1 + jenkins/projects/libvirt-dbus.yaml | 3 + jenkins/projects/libvirt-go-xml.yaml | 1 + jenkins/projects/libvirt-go.yaml | 1 + jenkins/projects/libvirt-ocaml.yaml | 1 + jenkins/projects/libvirt-sandbox.yaml | 1 + jenkins/projects/libvirt-tck.yaml | 1 + jenkins/projects/libvirt.yaml | 1 + jenkins/projects/osinfo-db-tools.yaml | 1 + jenkins/projects/osinfo-db.yaml | 1 + jenkins/projects/virt-manager.yaml | 2 + 28 files changed, 102 insertions(+), 40 deletions(-) create mode 100644 guests/host_vars/libvirt-debian-10/docker.yml create mode 100644 guests/host_vars/libvirt-debian-10/install.yml create mode 100644 guests/host_vars/libvirt-debian-10/main.yml -- 2.21.0

2 12

[libvirt] [PATCH 00/14] xen: Remove sexpr parsing and formatting support
by Peter Krempa 09 Jul '19

09 Jul '19

The formatter support was unused from the time we dropped xend support. Let's drop the formatter too along with all the unused code. Peter Krempa (14): tests: Remove xml2sexprtest xenconfig: Drop sxpr formatter xenconfig: Move guts of xenFormatSxprSound into xenFormatSound xen: Move xenFormatSxprChr to xen_common libxl: Drop support for parsing sxpr format in libxlConnectDomainXMLFromNative tests: Drop sexpr2xmltest xenconfig: Drop unused sexpr parsing infrastructure xenconfig: Remove pointless label in xenParseSxprSound xen: Inline xenParseSxprSound into the only caller xen: Move xenParseSxprVifRate to xen_common xen: Move xenParseSxprChar to xen_common xen: drop xen_sxpr.(c|h) util: Drop virsexpr module news: Mention drop of xen sxpr support docs/drvxen.html.in | 3 +- docs/news.xml | 11 + po/POTFILES | 1 - src/libvirt_private.syms | 18 - src/libvirt_xenconfig.syms | 15 - src/libxl/libxl_driver.c | 14 +- src/util/Makefile.inc.am | 2 - src/util/virsexpr.c | 608 ---- src/util/virsexpr.h | 66 - src/xenconfig/Makefile.inc.am | 2 - src/xenconfig/xen_common.c | 390 ++- src/xenconfig/xen_sxpr.c | 2486 ----------------- src/xenconfig/xen_sxpr.h | 66 - src/xenconfig/xenxs_private.h | 1 - tests/Makefile.am | 16 +- tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr | 6 - tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 30 - .../sexpr2xml-bridge-ipaddr.sexpr | 10 - .../sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 38 - tests/sexpr2xmldata/sexpr2xml-curmem.sexpr | 50 - tests/sexpr2xmldata/sexpr2xml-curmem.xml | 44 - .../sexpr2xml-disk-block-shareable.sexpr | 6 - .../sexpr2xml-disk-block-shareable.xml | 36 - .../sexpr2xmldata/sexpr2xml-disk-block.sexpr | 8 - tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 31 - .../sexpr2xml-disk-drv-blktap-qcow.sexpr | 8 - .../sexpr2xml-disk-drv-blktap-qcow.xml | 31 - .../sexpr2xml-disk-drv-blktap-raw.sexpr | 8 - .../sexpr2xml-disk-drv-blktap-raw.xml | 31 - .../sexpr2xml-disk-drv-blktap2-raw.sexpr | 8 - .../sexpr2xml-disk-drv-blktap2-raw.xml | 31 - tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr | 8 - tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 31 - .../sexpr2xmldata/sexpr2xml-fv-autoport.sexpr | 86 - tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 59 - .../sexpr2xml-fv-empty-kernel.sexpr | 11 - .../sexpr2xml-fv-empty-kernel.xml | 52 - .../sexpr2xml-fv-force-hpet.sexpr | 11 - .../sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 55 - .../sexpr2xml-fv-force-nohpet.sexpr | 11 - .../sexpr2xml-fv-force-nohpet.xml | 55 - tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr | 9 - tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 36 - .../sexpr2xml-fv-legacy-vfb.sexpr | 70 - .../sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml | 37 - .../sexpr2xml-fv-localtime.sexpr | 10 - .../sexpr2xmldata/sexpr2xml-fv-localtime.xml | 52 - .../sexpr2xml-fv-net-netfront.sexpr | 11 - .../sexpr2xml-fv-net-netfront.xml | 53 - .../sexpr2xml-fv-parallel-tcp.sexpr | 10 - .../sexpr2xml-fv-parallel-tcp.xml | 57 - .../sexpr2xml-fv-serial-dev-2-ports.sexpr | 12 - .../sexpr2xml-fv-serial-dev-2-ports.xml | 64 - .../sexpr2xml-fv-serial-dev-2nd-port.sexpr | 11 - .../sexpr2xml-fv-serial-dev-2nd-port.xml | 60 - .../sexpr2xml-fv-serial-file.sexpr | 12 - .../sexpr2xml-fv-serial-file.xml | 60 - .../sexpr2xml-fv-serial-null.sexpr | 10 - .../sexpr2xml-fv-serial-null.xml | 58 - .../sexpr2xml-fv-serial-pipe.sexpr | 12 - .../sexpr2xml-fv-serial-pipe.xml | 60 - .../sexpr2xml-fv-serial-pty.sexpr | 11 - .../sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 58 - .../sexpr2xml-fv-serial-stdio.sexpr | 10 - .../sexpr2xml-fv-serial-stdio.xml | 58 - .../sexpr2xml-fv-serial-tcp-telnet.sexpr | 11 - .../sexpr2xml-fv-serial-tcp-telnet.xml | 62 - .../sexpr2xml-fv-serial-tcp.sexpr | 11 - .../sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 62 - .../sexpr2xml-fv-serial-udp.sexpr | 11 - .../sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 62 - .../sexpr2xml-fv-serial-unix.sexpr | 11 - .../sexpr2xml-fv-serial-unix.xml | 60 - .../sexpr2xml-fv-sound-all.sexpr | 11 - .../sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 54 - tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr | 10 - tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 54 - .../sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr | 10 - tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 53 - .../sexpr2xml-fv-usbtablet.sexpr | 10 - .../sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 53 - tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr | 11 - tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 52 - tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr | 9 - tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 52 - tests/sexpr2xmldata/sexpr2xml-fv.sexpr | 11 - tests/sexpr2xmldata/sexpr2xml-fv.xml | 52 - .../sexpr2xmldata/sexpr2xml-net-bridged.sexpr | 9 - tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 37 - tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr | 10 - tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 38 - .../sexpr2xmldata/sexpr2xml-net-routed.sexpr | 10 - tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 37 - .../sexpr2xml-no-source-cdrom.sexpr | 66 - .../sexpr2xml-no-source-cdrom.xml | 58 - tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr | 10 - tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 43 - .../sexpr2xml-pv-bootloader-cmdline.sexpr | 5 - .../sexpr2xml-pv-bootloader-cmdline.xml | 31 - .../sexpr2xml-pv-bootloader.sexpr | 5 - .../sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 30 - .../sexpr2xml-pv-localtime.sexpr | 8 - .../sexpr2xmldata/sexpr2xml-pv-localtime.xml | 31 - tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr | 8 - tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 31 - .../sexpr2xml-pv-vfb-new-vncdisplay.sexpr | 10 - .../sexpr2xml-pv-vfb-new-vncdisplay.xml | 37 - .../sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr | 9 - tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 37 - .../sexpr2xml-pv-vfb-type-crash.sexpr | 83 - .../sexpr2xml-pv-vfb-type-crash.xml | 42 - tests/sexpr2xmldata/sexpr2xml-pv.sexpr | 8 - tests/sexpr2xmldata/sexpr2xml-pv.xml | 31 - tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr | 11 - tests/sexpr2xmldata/sexpr2xml-vif-rate.xml | 56 - tests/sexpr2xmltest.c | 170 -- tests/virschematest.c | 4 +- tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr | 6 - tests/xml2sexprdata/xml2sexpr-boot-grub.xml | 21 - .../xml2sexpr-bridge-ipaddr.sexpr | 12 - .../xml2sexprdata/xml2sexpr-bridge-ipaddr.xml | 29 - tests/xml2sexprdata/xml2sexpr-curmem.sexpr | 7 - tests/xml2sexprdata/xml2sexpr-curmem.xml | 23 - .../xml2sexpr-disk-block-shareable.sexpr | 9 - .../xml2sexpr-disk-block-shareable.xml | 31 - .../xml2sexprdata/xml2sexpr-disk-block.sexpr | 10 - tests/xml2sexprdata/xml2sexpr-disk-block.xml | 22 - .../xml2sexpr-disk-drv-blkback.sexpr | 10 - .../xml2sexpr-disk-drv-blkback.xml | 23 - .../xml2sexpr-disk-drv-blktap-qcow.sexpr | 10 - .../xml2sexpr-disk-drv-blktap-qcow.xml | 23 - .../xml2sexpr-disk-drv-blktap-raw.sexpr | 10 - .../xml2sexpr-disk-drv-blktap-raw.xml | 23 - .../xml2sexpr-disk-drv-blktap.sexpr | 10 - .../xml2sexpr-disk-drv-blktap.xml | 23 - .../xml2sexpr-disk-drv-blktap2-raw.sexpr | 10 - .../xml2sexpr-disk-drv-blktap2-raw.xml | 23 - .../xml2sexpr-disk-drv-blktap2.sexpr | 10 - .../xml2sexpr-disk-drv-blktap2.xml | 23 - .../xml2sexpr-disk-drv-loop.sexpr | 10 - .../xml2sexprdata/xml2sexpr-disk-drv-loop.xml | 23 - tests/xml2sexprdata/xml2sexpr-disk-file.sexpr | 10 - tests/xml2sexprdata/xml2sexpr-disk-file.xml | 22 - tests/xml2sexprdata/xml2sexpr-escape.sexpr | 11 - tests/xml2sexprdata/xml2sexpr-escape.xml | 24 - .../xml2sexpr-fv-force-hpet.sexpr | 12 - .../xml2sexprdata/xml2sexpr-fv-force-hpet.xml | 39 - .../xml2sexpr-fv-force-nohpet.sexpr | 12 - .../xml2sexpr-fv-force-nohpet.xml | 39 - tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr | 12 - tests/xml2sexprdata/xml2sexpr-fv-kernel.xml | 24 - .../xml2sexpr-fv-localtime.sexpr | 12 - .../xml2sexprdata/xml2sexpr-fv-localtime.xml | 37 - .../xml2sexpr-fv-net-many-models.sexpr | 1 - .../xml2sexpr-fv-net-many-models.xml | 43 - .../xml2sexpr-fv-net-netfront.sexpr | 10 - .../xml2sexpr-fv-net-netfront.xml | 31 - .../xml2sexprdata/xml2sexpr-fv-net-rate.sexpr | 10 - tests/xml2sexprdata/xml2sexpr-fv-net-rate.xml | 34 - .../xml2sexpr-fv-parallel-tcp.sexpr | 12 - .../xml2sexpr-fv-parallel-tcp.xml | 40 - .../xml2sexpr-fv-serial-dev-2-ports.sexpr | 13 - .../xml2sexpr-fv-serial-dev-2-ports.xml | 44 - .../xml2sexpr-fv-serial-dev-2nd-port.sexpr | 12 - .../xml2sexpr-fv-serial-dev-2nd-port.xml | 40 - .../xml2sexpr-fv-serial-file.sexpr | 13 - .../xml2sexpr-fv-serial-file.xml | 40 - .../xml2sexpr-fv-serial-null.sexpr | 12 - .../xml2sexpr-fv-serial-null.xml | 39 - .../xml2sexpr-fv-serial-pipe.sexpr | 13 - .../xml2sexpr-fv-serial-pipe.xml | 40 - .../xml2sexpr-fv-serial-pty.sexpr | 12 - .../xml2sexprdata/xml2sexpr-fv-serial-pty.xml | 39 - .../xml2sexpr-fv-serial-stdio.sexpr | 12 - .../xml2sexpr-fv-serial-stdio.xml | 39 - .../xml2sexpr-fv-serial-tcp-telnet.sexpr | 13 - .../xml2sexpr-fv-serial-tcp-telnet.xml | 41 - .../xml2sexpr-fv-serial-tcp.sexpr | 13 - .../xml2sexprdata/xml2sexpr-fv-serial-tcp.xml | 40 - .../xml2sexpr-fv-serial-udp.sexpr | 13 - .../xml2sexprdata/xml2sexpr-fv-serial-udp.xml | 41 - .../xml2sexpr-fv-serial-unix.sexpr | 13 - .../xml2sexpr-fv-serial-unix.xml | 40 - tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr | 12 - tests/xml2sexprdata/xml2sexpr-fv-sound.xml | 38 - .../xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr | 12 - tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml | 37 - .../xml2sexpr-fv-usbtablet.sexpr | 10 - .../xml2sexprdata/xml2sexpr-fv-usbtablet.xml | 36 - tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr | 12 - tests/xml2sexprdata/xml2sexpr-fv-utc.xml | 37 - tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr | 11 - .../xml2sexpr-fv-vncunused.sexpr | 11 - .../xml2sexprdata/xml2sexpr-fv-vncunused.xml | 36 - tests/xml2sexprdata/xml2sexpr-fv.sexpr | 12 - tests/xml2sexprdata/xml2sexpr-fv.xml | 36 - .../xml2sexprdata/xml2sexpr-net-bridged.sexpr | 11 - tests/xml2sexprdata/xml2sexpr-net-bridged.xml | 28 - tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr | 11 - tests/xml2sexprdata/xml2sexpr-net-e1000.xml | 29 - .../xml2sexprdata/xml2sexpr-net-routed.sexpr | 11 - tests/xml2sexprdata/xml2sexpr-net-routed.xml | 28 - .../xml2sexpr-no-source-cdrom.sexpr | 10 - .../xml2sexpr-no-source-cdrom.xml | 37 - tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr | 10 - tests/xml2sexprdata/xml2sexpr-pci-devs.xml | 32 - .../xml2sexpr-pv-bootloader-cmdline.sexpr | 6 - .../xml2sexpr-pv-bootloader-cmdline.xml | 22 - .../xml2sexpr-pv-bootloader.sexpr | 7 - .../xml2sexprdata/xml2sexpr-pv-bootloader.xml | 18 - .../xml2sexpr-pv-localtime.sexpr | 8 - .../xml2sexprdata/xml2sexpr-pv-localtime.xml | 25 - tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr | 9 - tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml | 22 - .../xml2sexpr-pv-vfb-new-auto.sexpr | 11 - .../xml2sexpr-pv-vfb-new-auto.xml | 23 - .../xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr | 11 - tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml | 23 - tests/xml2sexprdata/xml2sexpr-pv.sexpr | 9 - tests/xml2sexprdata/xml2sexpr-pv.xml | 22 - tests/xml2sexprtest.c | 167 -- 221 files changed, 393 insertions(+), 8907 deletions(-) delete mode 100644 src/util/virsexpr.c delete mode 100644 src/util/virsexpr.h delete mode 100644 src/xenconfig/xen_sxpr.c delete mode 100644 src/xenconfig/xen_sxpr.h delete mode 100644 tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-boot-grub.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-curmem.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-curmem.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-block.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-block.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-file.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-sound.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-utc.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-v2.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-bridged.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-bridged.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-e1000.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-routed.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-routed.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pci-devs.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-localtime.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-vif-rate.xml delete mode 100644 tests/sexpr2xmltest.c delete mode 100644 tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-boot-grub.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-curmem.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-curmem.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-block-shareable.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-block.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-block.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-loop.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-file.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-file.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-escape.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-escape.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-hpet.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-kernel.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-localtime.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-many-models.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-many-models.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-netfront.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-rate.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-rate.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-file.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-null.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-pty.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-udp.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-unix.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-sound.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-usbtablet.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-utc.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-vncunused.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-bridged.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-e1000.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-routed.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-routed.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-pci-devs.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-localtime.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv.xml delete mode 100644 tests/xml2sexprtest.c -- 2.21.0

4 31

[libvirt] [PATCH v2] docs: introduce a "knowledge base" for task oriented guides
by Daniel P. Berrangé 08 Jul '19

08 Jul '19

The previously added AMD SEV doc was not linked from anywhere on the website. Address this by introducing a new "Knowledge base" section that can hold task oriented guide to various features. Moving the SEV, disk locking and secure usage guides under this section. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/Makefile.am | 15 +++++++++++- docs/docs.html.in | 9 ++----- docs/kbase.html.in | 25 ++++++++++++++++++++ docs/{ => kbase}/launch_security_sev.html.in | 0 docs/{ => kbase}/locking-lockd.html.in | 0 docs/{ => kbase}/locking-sanlock.html.in | 0 docs/{ => kbase}/locking.html.in | 0 docs/{ => kbase}/secureusage.html.in | 0 8 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 docs/kbase.html.in rename docs/{ => kbase}/launch_security_sev.html.in (100%) rename docs/{ => kbase}/locking-lockd.html.in (100%) rename docs/{ => kbase}/locking-sanlock.html.in (100%) rename docs/{ => kbase}/locking.html.in (100%) rename docs/{ => kbase}/secureusage.html.in (100%) diff --git a/docs/Makefile.am b/docs/Makefile.am index 977be471ad..1cfa38dc80 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -132,6 +132,10 @@ internals_html_in = \ $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/internals/*.html.in)) internals_html = $(internals_html_in:%.html.in=%.html) +kbase_html_in = \ + $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/kbase/*.html.in)) +kbase_html = $(kbase_html_in:%.html.in=%.html) + # Since we ship pre-built html in the tarball, we must also # ship the sources, even when those sources are themselves # generated. @@ -187,6 +191,7 @@ EXTRA_DIST= \ $(xml) $(qemu_xml) $(lxc_xml) $(admin_xml) $(fig) $(png) $(css) \ $(javascript) $(logofiles) \ $(internals_html_in) $(internals_html) $(fonts) \ + $(kbase_html_in) $(kbase_html) \ aclperms.htmlinc \ hvsupport.pl \ $(schema_DATA) @@ -202,6 +207,7 @@ MAINTAINERCLEANFILES = \ $(addprefix $(srcdir)/,$(apihtml)) \ $(addprefix $(srcdir)/,$(devhelphtml)) \ $(addprefix $(srcdir)/,$(internals_html)) \ + $(addprefix $(srcdir)/,$(kbase_html)) \ $(srcdir)/hvsupport.html.in $(srcdir)/aclperms.htmlinc timestamp="$(shell if test -n "$$SOURCE_DATE_EPOCH"; \ @@ -218,7 +224,8 @@ qemu_api: $(srcdir)/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-refs.xml lxc_api: $(srcdir)/libvirt-lxc-api.xml $(srcdir)/libvirt-lxc-refs.xml admin_api: $(srcdir)/libvirt-admin-api.xml $(srcdir)/libvirt-admin-refs.xml -web: $(dot_html) $(internals_html) html/index.html devhelp/index.html +web: $(dot_html) $(internals_html) $(kbase_html) \ + html/index.html devhelp/index.html hvsupport.html: $(srcdir)/hvsupport.html.in @@ -381,6 +388,9 @@ install-data-local: $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/internals for f in $(internals_html); do \ $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR)/internals; done + $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/kbase + for f in $(kbase_html); do \ + $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR)/kbase; done $(mkinstalldirs) $(DESTDIR)$(DEVHELP_DIR) for file in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ $(INSTALL) -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \ @@ -405,6 +415,9 @@ uninstall-local: for f in $(internals_html); do \ rm -f $(DESTDIR)$(HTML_DIR)/$$f; \ done + for f in $(kbase_html); do \ + rm -f $(DESTDIR)$(HTML_DIR)/$$f; \ + done for f in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ rm -f $(DESTDIR)$(DEVHELP_DIR)/$$(basename $$f); \ done diff --git a/docs/docs.html.in b/docs/docs.html.in index c8674e1457..9e1ef6be41 100644 --- a/docs/docs.html.in +++ b/docs/docs.html.in @@ -86,11 +86,6 @@ <dt><a href="uri.html">URI format</a></dt> <dd>The URI formats used for connecting to libvirt</dd> - <dt><a href="locking.html">Disk locking</a></dt> - <dd>Ensuring exclusive guest access to disks with - <a href="locking-lockd.html">virtlockd</a> or - <a href="locking-sanlock.html">Sanlock</a></dd> - <dt><a href="cgroups.html">CGroups</a></dt> <dd>Control groups integration</dd> @@ -120,8 +115,8 @@ <dt><a href="hvsupport.html">Driver support</a></dt> <dd>matrix of API support per hypervisor per release</dd> - <dt><a href="secureusage.html">Secure usage</a></dt> - <dd>Secure usage of the libvirt APIs</dd> + <dt><a href="kbase.html">Knowledge Base</a></dt> + <dd>Task oriented guides to key features</dd> </dl> </div> diff --git a/docs/kbase.html.in b/docs/kbase.html.in new file mode 100644 index 0000000000..78f2a4e0c5 --- /dev/null +++ b/docs/kbase.html.in @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html> +<html xmlns="http://www.w3.org/1999/xhtml"> + <body class="docs"> + <h2>Knowledge base</h2> + + <div class="panel"> + <dl> + <dt><a href="kbase/locking.html">Disk locking</a></dt> + <dd>Ensuring exclusive guest access to disks with + <a href="kbase/locking-lockd.html">virtlockd</a> or + <a href="kbase/locking-sanlock.html">Sanlock</a></dd> + + <dt><a href="kbase/secureusage.html">Secure usage</a></dt> + <dd>Secure usage of the libvirt APIs</dd> + + <dt><a href="kbase/launch_security_sev.html">Launch security</a></dt> + <dd>Securely launching VMs with AMD SEV</dd> + </dl> + </div> + + <br class="clear"/> + + </body> +</html> diff --git a/docs/launch_security_sev.html.in b/docs/kbase/launch_security_sev.html.in similarity index 100% rename from docs/launch_security_sev.html.in rename to docs/kbase/launch_security_sev.html.in diff --git a/docs/locking-lockd.html.in b/docs/kbase/locking-lockd.html.in similarity index 100% rename from docs/locking-lockd.html.in rename to docs/kbase/locking-lockd.html.in diff --git a/docs/locking-sanlock.html.in b/docs/kbase/locking-sanlock.html.in similarity index 100% rename from docs/locking-sanlock.html.in rename to docs/kbase/locking-sanlock.html.in diff --git a/docs/locking.html.in b/docs/kbase/locking.html.in similarity index 100% rename from docs/locking.html.in rename to docs/kbase/locking.html.in diff --git a/docs/secureusage.html.in b/docs/kbase/secureusage.html.in similarity index 100% rename from docs/secureusage.html.in rename to docs/kbase/secureusage.html.in -- 2.21.0

2 2

[libvirt] New Feature: Identify Intel SGX support
by Carvalho, Larkins L 08 Jul '19

08 Jul '19

Hello Team, Greetings! We want to identify if the platform is Intel Software Guard Extensions<https://software.intel.com/en-us/sgx> (SGX) capable. The management platform (ex. Openstack) can use this information to launch VM that can run secure application code and data. Intel(r) SGX offers hardware-based memory encryption that isolates specific application code and data in memory. Regards, Larkins Carvalho Intel Corp.

2 2

[libvirt] [PATCH] rpc: ensure thread safe initialization of SASL library
by Daniel P. Berrangé 08 Jul '19

08 Jul '19

Neither the sasl_client_init or sasl_server_init methods are even remotely threadsafe. They do a bunch of one-time initialization and merely use a simple integer counter to avoid repeated work, not even using atomic increment/reads on the counter. This can easily race in a threaded program. Protect the calls using a virOnce initializer function which is guaranteed threadsafe at least from libvirt's POV. If the application using libvirt also uses another library that makes use of SASL then the race still exists. It is impossible to fix that fully except in SASL code itself. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/rpc/virnetsaslcontext.c | 50 ++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c index f49340f033..62b103a428 100644 --- a/src/rpc/virnetsaslcontext.c +++ b/src/rpc/virnetsaslcontext.c @@ -77,22 +77,46 @@ VIR_ONCE_GLOBAL_INIT(virNetSASLContext); VIR_WARNINGS_NO_DEPRECATED #endif -virNetSASLContextPtr virNetSASLContextNewClient(void) +static int virNetSASLContextClientOnceInit(void) { - virNetSASLContextPtr ctxt; - int err; + int err = sasl_client_init(NULL); + if (err != SASL_OK) { + virReportError(VIR_ERR_AUTH_FAILED, + _("failed to initialize SASL library: %d (%s)"), + err, sasl_errstring(err, NULL, NULL)); + return -1; + } + + return 0; +} + +VIR_ONCE_GLOBAL_INIT(virNetSASLContextClient); - if (virNetSASLContextInitialize() < 0) - return NULL; - err = sasl_client_init(NULL); +static int virNetSASLContextServerOnceInit(void) +{ + int err = sasl_server_init(NULL, "libvirt"); if (err != SASL_OK) { virReportError(VIR_ERR_AUTH_FAILED, _("failed to initialize SASL library: %d (%s)"), err, sasl_errstring(err, NULL, NULL)); - return NULL; + return -1; } + return 0; +} + +VIR_ONCE_GLOBAL_INIT(virNetSASLContextServer); + + +virNetSASLContextPtr virNetSASLContextNewClient(void) +{ + virNetSASLContextPtr ctxt; + + if (virNetSASLContextInitialize() < 0 || + virNetSASLContextClientInitialize() < 0) + return NULL; + if (!(ctxt = virObjectLockableNew(virNetSASLContextClass))) return NULL; @@ -102,19 +126,11 @@ virNetSASLContextPtr virNetSASLContextNewClient(void) virNetSASLContextPtr virNetSASLContextNewServer(const char *const*usernameWhitelist) { virNetSASLContextPtr ctxt; - int err; - if (virNetSASLContextInitialize() < 0) + if (virNetSASLContextInitialize() < 0 || + virNetSASLContextServerInitialize() < 0) return NULL; - err = sasl_server_init(NULL, "libvirt"); - if (err != SASL_OK) { - virReportError(VIR_ERR_AUTH_FAILED, - _("failed to initialize SASL library: %d (%s)"), - err, sasl_errstring(err, NULL, NULL)); - return NULL; - } - if (!(ctxt = virObjectLockableNew(virNetSASLContextClass))) return NULL; -- 2.21.0

3 3

[libvirt] [PATCH] docs: introduce a "knowledge base" for task oriented guides
by Daniel P. Berrangé 08 Jul '19

08 Jul '19

The previously added AMD SEV doc was not linked from anywhere on the website. Address this by introducing a new "Knowledge base" section that can hold task oriented guide to various features. Moving the SEV, disk locking and secure usage guides under this section. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/Makefile.am | 15 ++++++++++++++- docs/docs.html.in | 9 ++------- docs/{ => kbase}/launch_security_sev.html.in | 0 docs/{ => kbase}/locking-lockd.html.in | 0 docs/{ => kbase}/locking-sanlock.html.in | 0 docs/{ => kbase}/locking.html.in | 0 docs/{ => kbase}/secureusage.html.in | 0 7 files changed, 16 insertions(+), 8 deletions(-) rename docs/{ => kbase}/launch_security_sev.html.in (100%) rename docs/{ => kbase}/locking-lockd.html.in (100%) rename docs/{ => kbase}/locking-sanlock.html.in (100%) rename docs/{ => kbase}/locking.html.in (100%) rename docs/{ => kbase}/secureusage.html.in (100%) diff --git a/docs/Makefile.am b/docs/Makefile.am index 977be471ad..1cfa38dc80 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -132,6 +132,10 @@ internals_html_in = \ $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/internals/*.html.in)) internals_html = $(internals_html_in:%.html.in=%.html) +kbase_html_in = \ + $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/kbase/*.html.in)) +kbase_html = $(kbase_html_in:%.html.in=%.html) + # Since we ship pre-built html in the tarball, we must also # ship the sources, even when those sources are themselves # generated. @@ -187,6 +191,7 @@ EXTRA_DIST= \ $(xml) $(qemu_xml) $(lxc_xml) $(admin_xml) $(fig) $(png) $(css) \ $(javascript) $(logofiles) \ $(internals_html_in) $(internals_html) $(fonts) \ + $(kbase_html_in) $(kbase_html) \ aclperms.htmlinc \ hvsupport.pl \ $(schema_DATA) @@ -202,6 +207,7 @@ MAINTAINERCLEANFILES = \ $(addprefix $(srcdir)/,$(apihtml)) \ $(addprefix $(srcdir)/,$(devhelphtml)) \ $(addprefix $(srcdir)/,$(internals_html)) \ + $(addprefix $(srcdir)/,$(kbase_html)) \ $(srcdir)/hvsupport.html.in $(srcdir)/aclperms.htmlinc timestamp="$(shell if test -n "$$SOURCE_DATE_EPOCH"; \ @@ -218,7 +224,8 @@ qemu_api: $(srcdir)/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-refs.xml lxc_api: $(srcdir)/libvirt-lxc-api.xml $(srcdir)/libvirt-lxc-refs.xml admin_api: $(srcdir)/libvirt-admin-api.xml $(srcdir)/libvirt-admin-refs.xml -web: $(dot_html) $(internals_html) html/index.html devhelp/index.html +web: $(dot_html) $(internals_html) $(kbase_html) \ + html/index.html devhelp/index.html hvsupport.html: $(srcdir)/hvsupport.html.in @@ -381,6 +388,9 @@ install-data-local: $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/internals for f in $(internals_html); do \ $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR)/internals; done + $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/kbase + for f in $(kbase_html); do \ + $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR)/kbase; done $(mkinstalldirs) $(DESTDIR)$(DEVHELP_DIR) for file in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ $(INSTALL) -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \ @@ -405,6 +415,9 @@ uninstall-local: for f in $(internals_html); do \ rm -f $(DESTDIR)$(HTML_DIR)/$$f; \ done + for f in $(kbase_html); do \ + rm -f $(DESTDIR)$(HTML_DIR)/$$f; \ + done for f in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ rm -f $(DESTDIR)$(DEVHELP_DIR)/$$(basename $$f); \ done diff --git a/docs/docs.html.in b/docs/docs.html.in index c8674e1457..9e1ef6be41 100644 --- a/docs/docs.html.in +++ b/docs/docs.html.in @@ -86,11 +86,6 @@ <dt><a href="uri.html">URI format</a></dt> <dd>The URI formats used for connecting to libvirt</dd> - <dt><a href="locking.html">Disk locking</a></dt> - <dd>Ensuring exclusive guest access to disks with - <a href="locking-lockd.html">virtlockd</a> or - <a href="locking-sanlock.html">Sanlock</a></dd> - <dt><a href="cgroups.html">CGroups</a></dt> <dd>Control groups integration</dd> @@ -120,8 +115,8 @@ <dt><a href="hvsupport.html">Driver support</a></dt> <dd>matrix of API support per hypervisor per release</dd> - <dt><a href="secureusage.html">Secure usage</a></dt> - <dd>Secure usage of the libvirt APIs</dd> + <dt><a href="kbase.html">Knowledge Base</a></dt> + <dd>Task oriented guides to key features</dd> </dl> </div> diff --git a/docs/launch_security_sev.html.in b/docs/kbase/launch_security_sev.html.in similarity index 100% rename from docs/launch_security_sev.html.in rename to docs/kbase/launch_security_sev.html.in diff --git a/docs/locking-lockd.html.in b/docs/kbase/locking-lockd.html.in similarity index 100% rename from docs/locking-lockd.html.in rename to docs/kbase/locking-lockd.html.in diff --git a/docs/locking-sanlock.html.in b/docs/kbase/locking-sanlock.html.in similarity index 100% rename from docs/locking-sanlock.html.in rename to docs/kbase/locking-sanlock.html.in diff --git a/docs/locking.html.in b/docs/kbase/locking.html.in similarity index 100% rename from docs/locking.html.in rename to docs/kbase/locking.html.in diff --git a/docs/secureusage.html.in b/docs/kbase/secureusage.html.in similarity index 100% rename from docs/secureusage.html.in rename to docs/kbase/secureusage.html.in -- 2.21.0

2 2