- Devel - libvirt List Archives

[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 10 Jul '19

10 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 10 Jul '19

10 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