- Devel - libvirt List Archives

[libvirt] [ [PATCH v3 0/8] virsh completion for event, secret-event, pool-event and nodedev-event
by Lin Ma 24 May '18

24 May '18

v2 -> v3: Most of patches in original v2 patchset were pushed, only 2 patches left, So create a new patchset for including the 2 patches and 6 new completion patches which about secret-event, pool-event and nodedev-event. (Borrowed code & idea from Michal Privoznik for these patches design) Lin Ma (8): virsh-secret: Rename vshEventCallback to vshSecretEventCallback virsh: Add event name completion to 'secret-event' command virsh: Move vshEventCallback structure definition to virsh-domain.h virsh: Add event name completion to 'event' command virsh-pool: Rename vshEventCallback to vshPoolEventCallback virsh: Add event name completion to 'pool-event' command virsh-nodedev: Rename vshEventCallback to vshNodedevEventCallback virsh: Add event name completion to 'nodedev-event' command tools/virsh-completer.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh-completer.h | 15 ++++++ tools/virsh-domain.c | 9 +--- tools/virsh-domain.h | 8 ++++ tools/virsh-nodedev.c | 19 +++----- tools/virsh-nodedev.h | 8 ++++ tools/virsh-pool.c | 19 +++----- tools/virsh-pool.h | 8 ++++ tools/virsh-secret.c | 18 +++----- tools/virsh-secret.h | 8 ++++ 10 files changed, 189 insertions(+), 42 deletions(-) -- 2.16.2

2 12

[libvirt] [PATCH 00/12] Add support for TPM emulator
by Stefan Berger 24 May '18

24 May '18

This series of patches adds support for the TPM emulator backend that is available in QEMU and based on swtpm + libtpms. It allows to attach a TPM 1.2 or 2 to a QEMU VM. sVirt labels are used for labeling the swtpm process, its Unix socket, and log file with the same label that the QEMU process gets. Besides that swtpm is added to the emulator cgroup to restrict its CPU usage. The device XML can be changed from a TPM 1.2 to a TPM 2 and back to a TPM 1.2. The device state is not removed during those changes but only when the domain is undefined. The swtpm needs persistent storage to store its state. For that I am using the uuid of the VM as part of the path since the name of the VM can be changed. Logfiles, PID files, and socket names are based on the name of the VM, though. Stefan v5->v6: - Addressed John Ferlan's comments - rebased on latest tip - Added patch 12. v4->v5: - Addressed John Ferlan's, Boris Fiuczysnki's and Marc Hartmayer's comments - rebased on latest tip v3->v4: - Addressed John Ferlan's comments - Fixed bugs I found while testing - rebased on latest tip Stefan Berger (12): conf: Add support for external swtpm TPM emulator to domain XML qemu: Extend QEMU capabilities with 'tpm-emulator' util: Implement virFileChownFiles() security: Add DAC and SELinux security for tpm-emulator qemu: Extend qemu_conf with tpm-emulator support qemu: Extend QEMU with external TPM support qemu: Add support for external swtpm TPM emulator tests: Add test cases for external swtpm TPM emulator security: Label the external swtpm with SELinux labels conf: Add support for choosing emulation of a TPM 2 qemu: Add swtpm to emulator cgroup news: Update news with new TPM emulator feature docs/formatdomain.html.in | 43 + docs/news.xml | 9 + docs/schemas/domaincommon.rng | 17 + libvirt.spec.in | 2 + src/conf/domain_audit.c | 2 + src/conf/domain_conf.c | 53 +- src/conf/domain_conf.h | 12 + src/libvirt_private.syms | 3 + src/qemu/Makefile.inc.am | 10 + src/qemu/libvirtd_qemu.aug | 5 + src/qemu/qemu.conf | 8 + src/qemu/qemu_capabilities.c | 5 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_cgroup.c | 36 + src/qemu/qemu_cgroup.h | 2 + src/qemu/qemu_command.c | 34 +- src/qemu/qemu_conf.c | 43 + src/qemu/qemu_conf.h | 6 + src/qemu/qemu_domain.c | 3 + src/qemu/qemu_extdevice.c | 180 ++++ src/qemu/qemu_extdevice.h | 59 ++ src/qemu/qemu_process.c | 16 + src/qemu/qemu_security.c | 69 ++ src/qemu/qemu_security.h | 11 + src/qemu/qemu_tpm.c | 946 +++++++++++++++++++++ src/qemu/qemu_tpm.h | 56 ++ src/qemu/test_libvirtd_qemu.aug.in | 2 + src/security/security_dac.c | 7 + src/security/security_driver.h | 7 + src/security/security_manager.c | 36 + src/security/security_manager.h | 6 + src/security/security_selinux.c | 172 ++++ src/security/security_stack.c | 40 + src/util/virfile.c | 55 ++ src/util/virfile.h | 3 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + .../tpm-emulator-tpm2.x86_64-latest.args | 33 + tests/qemuxml2argvdata/tpm-emulator-tpm2.xml | 30 + .../tpm-emulator.x86_64-latest.args | 33 + tests/qemuxml2argvdata/tpm-emulator.xml | 30 + tests/qemuxml2argvtest.c | 16 +- tests/qemuxml2xmloutdata/tpm-emulator-tpm2.xml | 34 + tests/qemuxml2xmloutdata/tpm-emulator.xml | 34 + tests/qemuxml2xmltest.c | 1 + 48 files changed, 2165 insertions(+), 10 deletions(-) create mode 100644 src/qemu/qemu_extdevice.c create mode 100644 src/qemu/qemu_extdevice.h create mode 100644 src/qemu/qemu_tpm.c create mode 100644 src/qemu/qemu_tpm.h create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2.xml create mode 100644 tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tpm-emulator.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator-tpm2.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator.xml -- 2.14.3

4 29

[libvirt] [REPOSTv3 PATCHv3 0/6] Add support for VM Generation ID (vmgenid)
by John Ferlan 24 May '18

24 May '18

This is the 3rd reposting because of qemu capabilities conflicts, maybe the 3rd time will be the charm. Previous, e.g. REPOSTv2 posting: https://www.redhat.com/archives/libvir-list/2018-May/msg01332.html Cover from the PATCHv3 posting: v2: https://www.redhat.com/archives/libvir-list/2018-April/msg02234.html Changes since v2: * Essentially handle comments from code review of original series from comments received for patch 6: https://www.redhat.com/archives/libvir-list/2018-April/msg02240.html It's a somewhat simplified approach removing the ABI checks and the adjustment to the genid value as part of domain def copy. * (NEW) Patch 5 - add a 'genid' domain capability (similar to how Cole added support for vmcoreinfo). Since the apps need a way to determine whether this is enabled, this seems to be the best way. John Ferlan (6): conf: Add VM Generation ID parse/format support qemu: Add VM Generation ID device capability qemu: Alter VM Generation ID for specific startup/launch transitions qemu: Add VM Generation ID to qemu command line domcaps: Add 'genid' to domain capabilities docs: Add news article for VM Generation ID docs/formatdomain.html.in | 27 +++++++++++ docs/formatdomaincaps.html.in | 7 ++- docs/news.xml | 13 ++++++ docs/schemas/domaincaps.rng | 7 +++ docs/schemas/domaincommon.rng | 8 ++++ src/conf/domain_capabilities.c | 3 ++ src/conf/domain_capabilities.h | 1 + src/conf/domain_conf.c | 54 ++++++++++++++++++++++ src/conf/domain_conf.h | 5 ++ src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 24 ++++++++++ src/qemu/qemu_driver.c | 17 +++++-- src/qemu/qemu_process.c | 46 +++++++++++++++++- src/qemu/qemu_process.h | 1 + tests/domaincapsschemadata/basic.xml | 1 + tests/domaincapsschemadata/bhyve_basic.x86_64.xml | 1 + tests/domaincapsschemadata/bhyve_fbuf.x86_64.xml | 1 + tests/domaincapsschemadata/bhyve_uefi.x86_64.xml | 1 + tests/domaincapsschemadata/full.xml | 1 + tests/domaincapsschemadata/libxl-xenfv-usb.xml | 1 + tests/domaincapsschemadata/libxl-xenfv.xml | 1 + tests/domaincapsschemadata/libxl-xenpv-usb.xml | 1 + tests/domaincapsschemadata/libxl-xenpv.xml | 1 + tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml | 1 + .../qemu_2.12.0-virt.aarch64.xml | 1 + tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml | 1 + tests/domaincapsschemadata/qemu_2.12.0.s390x.xml | 1 + tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml | 1 + .../qemu_2.6.0-virt.aarch64.xml | 1 + tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml | 1 + tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml | 1 + tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.7.0.s390x.xml | 1 + .../domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.8.0.s390x.xml | 1 + tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml | 1 + .../domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml | 1 + .../domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../qemuxml2argvdata/genid-auto.x86_64-latest.args | 30 ++++++++++++ tests/qemuxml2argvdata/genid-auto.xml | 32 +++++++++++++ tests/qemuxml2argvdata/genid.x86_64-latest.args | 30 ++++++++++++ tests/qemuxml2argvdata/genid.xml | 32 +++++++++++++ tests/qemuxml2argvtest.c | 4 ++ tests/qemuxml2xmloutdata/genid-active.xml | 32 +++++++++++++ tests/qemuxml2xmloutdata/genid-auto-active.xml | 32 +++++++++++++ tests/qemuxml2xmloutdata/genid-auto-inactive.xml | 32 +++++++++++++ tests/qemuxml2xmloutdata/genid-inactive.xml | 32 +++++++++++++ tests/qemuxml2xmltest.c | 5 +- 53 files changed, 500 insertions(+), 7 deletions(-) create mode 100644 tests/qemuxml2argvdata/genid-auto.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/genid-auto.xml create mode 100644 tests/qemuxml2argvdata/genid.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/genid.xml create mode 100644 tests/qemuxml2xmloutdata/genid-active.xml create mode 100644 tests/qemuxml2xmloutdata/genid-auto-active.xml create mode 100644 tests/qemuxml2xmloutdata/genid-auto-inactive.xml create mode 100644 tests/qemuxml2xmloutdata/genid-inactive.xml -- 2.14.3

1 6

[libvirt] [PATCH 0/2] cpu: speculative store buffer bypass mitigation (CVE-2018-3639)
by Daniel P. Berrangé 24 May '18

24 May '18

This provides the libvirt part of the mitigations for the speculative store buffer bypass vulnerabilities on the x86 platform[1], and is the companion of the kernel patches merged in: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… And QEMU patches posted at https://lists.gnu.org/archive/html/qemu-devel/2018-05/msg04795.html [1] https://bugs.chromium.org/p/project-zero/issues/detail?id=1528 https://access.redhat.com/security/vulnerabilities/ssbd Daniel P. Berrangé (2): cpu: define the 'ssbd' CPUID feature bit (CVE-2018-3639) cpu: define the 'virt-ssbd' CPUID feature bit (CVE-2018-3639) src/cpu/cpu_map.xml | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.17.0

3 4

[libvirt] [PATCH] news: Add TLS non-shared storage migration
by Peter Krempa 24 May '18

24 May '18

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/news.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 8f2c7d5dff..329b1c7129 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -54,6 +54,16 @@ a QEMU virtual machine. </description> </change> + <change> + <summary> + Add support for migration of QEMU VMs with non-shared storage over TLS + </summary> + <description> + It's now possible to use the VIR_MIGRATE_TLS flag together with + VIR_MIGRATE_NON_SHARED_DISK. The connection is then secured using the + TLS environment which is setup for the migration connection. + </description> + </change> </section> <section title="Improvements"> <change> -- 2.16.2

2 3

[libvirt] [PATCH v2] Edit test capabilities to contain different cell pagesizes.
by Roland Schulz 23 May '18

23 May '18

Signed-off-by: Roland Schulz <schullzroll(a)gmail.com> --- src/test/test_driver.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 467587b19..3fe0c2831 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -322,30 +322,34 @@ testBuildCapabilities(virConnectPtr conn) if (virCapabilitiesAddHostFeature(caps, "nonpae") < 0) goto error; - if (VIR_ALLOC_N(caps->host.pagesSize, 2) < 0) + if (VIR_ALLOC_N(caps->host.pagesSize, 4) < 0) goto error; caps->host.pagesSize[caps->host.nPagesSize++] = 4; + caps->host.pagesSize[caps->host.nPagesSize++] = 8; caps->host.pagesSize[caps->host.nPagesSize++] = 2048; + caps->host.pagesSize[caps->host.nPagesSize++] = 1024 * 1024; for (i = 0; i < privconn->numCells; i++) { virCapsHostNUMACellCPUPtr cpu_cells; virCapsHostNUMACellPageInfoPtr pages; - size_t nPages; + size_t nPages = caps->host.nPagesSize - 1; if (VIR_ALLOC_N(cpu_cells, privconn->cells[i].numCpus) < 0 || - VIR_ALLOC_N(pages, caps->host.nPagesSize) < 0) { + VIR_ALLOC_N(pages, caps->host.nPagesSize - 1) < 0) { VIR_FREE(cpu_cells); goto error; } - - nPages = caps->host.nPagesSize; + if (i == 1) + pages[0].size = caps->host.pagesSize[0]; + else + pages[0].size = caps->host.pagesSize[1]; memcpy(cpu_cells, privconn->cells[i].cpus, sizeof(*cpu_cells) * privconn->cells[i].numCpus); - for (j = 0; j < nPages; j++) - pages[j].size = caps->host.pagesSize[j]; + for (j = 1; j < nPages; j++) + pages[j].size = caps->host.pagesSize[j+1]; pages[0].avail = privconn->cells[i].mem / pages[0].size; -- 2.17.0

2 3

[libvirt] [PATCH 0/8] qemu: Kill text/HMP monitor code
by Peter Krempa 23 May '18

23 May '18

Most of the code is now dead as we support qemu 1.5 and upwards. Remove the unused bits. Peter Krempa (8): qemu: monitor: Drop fallback to text monitor for 'inject-nmi' command qemu: monitor: Drop fallback to text monitor for 'send-key' command qemu: monitor: Remove unused qemuMonitor(Add|Remove)HostNetwork qemu: monitor: Drop QEMU_CHECK_MONITOR_JSON... macros qemu: monitor: Drop JSON versions of savevm/delvm/loadv tests: Drop qemumonitortest qemu: monitor: Drop calls to text monitor impl where possible qemu: monitor: Remove dead code from text monitor src/qemu/qemu_monitor.c | 519 +++------- src/qemu/qemu_monitor.h | 12 - src/qemu/qemu_monitor_json.c | 41 +- src/qemu/qemu_monitor_json.h | 4 - src/qemu/qemu_monitor_text.c | 2166 ------------------------------------------ src/qemu/qemu_monitor_text.h | 150 --- tests/Makefile.am | 11 +- tests/qemumonitortest.c | 203 ---- 8 files changed, 144 insertions(+), 2962 deletions(-) delete mode 100644 tests/qemumonitortest.c -- 2.16.2

2 18

[libvirt] [PATCH] qemu: monitor: Remove diskSecretLookup monitor event
by Peter Krempa 23 May '18

23 May '18

After the text monitor was deleted this event can't be triggered. Remove it and all the unnecessary code. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- This applies on top of the text monitor removal series. I forgot to include it while splitting branches. src/qemu/qemu_monitor.c | 16 ---------------- src/qemu/qemu_monitor.h | 12 ------------ src/qemu/qemu_process.c | 28 ---------------------------- 3 files changed, 56 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index ac1fbddb91..02d2629eb0 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1287,22 +1287,6 @@ qemuMonitorHMPCommandWithFd(qemuMonitorPtr mon, } while (0) -int -qemuMonitorGetDiskSecret(qemuMonitorPtr mon, - const char *path, - char **secret, - size_t *secretLen) -{ - int ret = -1; - *secret = NULL; - *secretLen = 0; - - QEMU_MONITOR_CALLBACK(mon, ret, diskSecretLookup, mon->vm, - path, secret, secretLen); - return ret; -} - - int qemuMonitorEmitEvent(qemuMonitorPtr mon, const char *event, long long seconds, unsigned int micros, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index b3aeb83cf0..212d1e3e16 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -121,12 +121,6 @@ typedef void (*qemuMonitorEofNotifyCallback)(qemuMonitorPtr mon, typedef void (*qemuMonitorErrorNotifyCallback)(qemuMonitorPtr mon, virDomainObjPtr vm, void *opaque); -typedef int (*qemuMonitorDiskSecretLookupCallback)(qemuMonitorPtr mon, - virDomainObjPtr vm, - const char *path, - char **secret, - size_t *secretLen, - void *opaque); typedef int (*qemuMonitorDomainEventCallback)(qemuMonitorPtr mon, virDomainObjPtr vm, const char *event, @@ -285,7 +279,6 @@ struct _qemuMonitorCallbacks { qemuMonitorDestroyCallback destroy; qemuMonitorEofNotifyCallback eofNotify; qemuMonitorErrorNotifyCallback errorNotify; - qemuMonitorDiskSecretLookupCallback diskSecretLookup; qemuMonitorDomainEventCallback domainEvent; qemuMonitorDomainShutdownCallback domainShutdown; qemuMonitorDomainResetCallback domainReset; @@ -369,11 +362,6 @@ int qemuMonitorHMPCommandWithFd(qemuMonitorPtr mon, # define qemuMonitorHMPCommand(mon, cmd, reply) \ qemuMonitorHMPCommandWithFd(mon, cmd, -1, reply) -int qemuMonitorGetDiskSecret(qemuMonitorPtr mon, - const char *path, - char **secret, - size_t *secretLen); - int qemuMonitorEmitEvent(qemuMonitorPtr mon, const char *event, long long seconds, unsigned int micros, const char *details); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 5b73a61962..2ba432630f 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -436,33 +436,6 @@ qemuProcessGetVolumeQcowPassphrase(virDomainDiskDefPtr disk, return ret; } -static int -qemuProcessFindVolumeQcowPassphrase(qemuMonitorPtr mon ATTRIBUTE_UNUSED, - virDomainObjPtr vm, - const char *path, - char **secretRet, - size_t *secretLen, - void *opaque ATTRIBUTE_UNUSED) -{ - virDomainDiskDefPtr disk; - int ret = -1; - - virObjectLock(vm); - if (!(disk = virDomainDiskByName(vm->def, path, true))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("no disk found with path %s"), - path); - goto cleanup; - } - - ret = qemuProcessGetVolumeQcowPassphrase(disk, secretRet, secretLen); - - cleanup: - virObjectUnlock(vm); - return ret; -} - - static int qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm, @@ -1709,7 +1682,6 @@ qemuProcessHandleDumpCompleted(qemuMonitorPtr mon ATTRIBUTE_UNUSED, static qemuMonitorCallbacks monitorCallbacks = { .eofNotify = qemuProcessHandleMonitorEOF, .errorNotify = qemuProcessHandleMonitorError, - .diskSecretLookup = qemuProcessFindVolumeQcowPassphrase, .domainEvent = qemuProcessHandleEvent, .domainShutdown = qemuProcessHandleShutdown, .domainStop = qemuProcessHandleStop, -- 2.16.2

2 1

[libvirt] [PATCH 00/15] qemu: Implement non-shared storage migration via TLS (blockdev-add saga)
by Peter Krempa 23 May '18

23 May '18

Implement the non-shared storage migration when TLS is enabled. This is done by using blockdev-add to add the NBD endpoint with the TLS environment alias configured properly. Peter Krempa (15): qemu: block: Don't nest storage layer properties into format layer conf: domain: Export virDomainStorageSourceParse qemu: migration: Don't access disk members without lock qemu: caps: Add capability for blockdev-add/blockdev-del qemu: monitor: Factor out and document code to format QMP command qemu: monitor: Add implementation for blockdev-add and blockdev-del qemu: monitor: Introduce support for blockdev-mirror qemu: block: Add helpers for hot-adding virStorageSource via blockdev qemu: domain: Extract NBD disk migration private data formatting qemu: domain: Extract parsing of NBD status XML qemu: domain: Add private data for NBD migration storage source definition test: Add status XML test for NBD tls storage migration qemu: migration: Rename NBD migration functions qemu: migration: Extract code responsible for calling drive-mirror qemu: migration: Add support for transporting NBD over TLS src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 6 + src/libvirt_private.syms | 1 + src/qemu/qemu_block.c | 163 +++++++- src/qemu/qemu_block.h | 34 ++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 242 +++++++++-- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_migration.c | 306 ++++++++++---- src/qemu/qemu_monitor.c | 59 +++ src/qemu/qemu_monitor.h | 16 + src/qemu/qemu_monitor_json.c | 164 +++++++- src/qemu/qemu_monitor_json.h | 18 + tests/qemublocktest.c | 11 +- .../xml2json/block-raw-noopts.json | 15 +- .../qemublocktestdata/xml2json/dir-fat-cache.json | 27 +- .../qemublocktestdata/xml2json/dir-fat-floppy.json | 19 +- .../xml2json/dir-fat-readonly.json | 19 +- .../xml2json/file-backing_basic-aio_threads.json | 82 ++-- .../file-backing_basic-cache-directsync.json | 108 ++--- .../xml2json/file-backing_basic-cache-none.json | 108 ++--- .../xml2json/file-backing_basic-cache-unsafe.json | 108 ++--- .../file-backing_basic-cache-writeback.json | 108 ++--- .../file-backing_basic-cache-writethrough.json | 108 ++--- .../xml2json/file-backing_basic-detect.json | 76 ++-- .../xml2json/file-backing_basic-noopts.json | 60 +-- .../xml2json/file-backing_basic-unmap-detect.json | 76 ++-- .../xml2json/file-backing_basic-unmap-ignore.json | 76 ++-- .../xml2json/file-backing_basic-unmap.json | 76 ++-- .../xml2json/file-bochs-noopts.json | 15 +- .../xml2json/file-cloop-noopts.json | 15 +- .../xml2json/file-dmg-noopts.json | 15 +- .../xml2json/file-ploop-noopts.json | 15 +- .../file-qcow2-backing-chain-encryption.json | 30 +- .../xml2json/file-qcow2-backing-chain-noopts.json | 150 +++---- .../file-qcow2-backing-chain-unterminated.json | 30 +- .../xml2json/file-raw-aio_native.json | 25 +- .../qemublocktestdata/xml2json/file-raw-luks.json | 15 +- .../xml2json/file-raw-noopts.json | 15 +- .../xml2json/file-vdi-noopts.json | 15 +- .../xml2json/file-vhd-noopts.json | 15 +- .../xml2json/file-vpc-noopts.json | 15 +- .../network-qcow2-backing-chain-cache-unsafe.json | 74 ++-- ...etwork-qcow2-backing-chain-encryption_auth.json | 64 +-- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../migration-out-nbd-tls-in.xml | 464 +++++++++++++++++++++ .../migration-out-nbd-tls-out.xml | 1 + tests/qemuxml2xmltest.c | 1 + 60 files changed, 2172 insertions(+), 906 deletions(-) create mode 100644 tests/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml create mode 120000 tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml -- 2.16.2

2 19

[libvirt] [PATCH v4 0/4] qemu: Add support for -device hda-output (disable line-in)
by Filip Alac 23 May '18

23 May '18

Add support for hda 'output' codec for ich6 and ich9 sound devices, which allow us to disable line-in for guest. 'hda-output' codec is available since 0.14 version of qemu. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1126641 v1: https://www.redhat.com/archives/libvir-list/2018-May/msg01311.html v2: https://www.redhat.com/archives/libvir-list/2018-May/msg01450.html - Split patch into series of patches - Add description of feature in docs/news.xml - Improve the documentation in docs/formatdomain.html.in - Fixes coding standard errors/inconsistencies v3: https://www.redhat.com/archives/libvir-list/2018-May/msg01506.html - Moved all tests to third patch - Made possible to compile every patch by alone except fourth which depends on the first and on the second patch. v4: - Moved some qemu_command and qemu_capabilities hunks from the first patch into second patch. Filip Alac (4): conf: Introduce codec type 'output' tests: Extend qemu_capabilities with 'hda-output' codec tests: qemu: Extends tests for 'output' codec docs: news: Describe 'output' codec docs/formatdomain.html.in | 15 ++++++++++++--- docs/news.xml | 8 ++++++++ docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 5 ++++- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../migration-in-params-in.xml | 1 + .../migration-out-nbd-in.xml | 1 + .../migration-out-nbd-out.xml | 1 + .../migration-out-params-in.xml | 1 + tests/qemustatusxml2xmldata/modern-in.xml | 1 + tests/qemuxml2argvdata/sound-device.args | 2 ++ tests/qemuxml2argvdata/sound-device.xml | 2 ++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/sound-device.xml | 2 ++ 36 files changed, 62 insertions(+), 5 deletions(-) -- 2.17.0

2 5

[libvirt] [ [PATCH v3 0/8] virsh completion for event, secret-event, pool-event and nodedev-event
by Lin Ma 23 May '18

23 May '18

v2 -> v3: Most of patches in original v2 patchset were pushed, only 2 patches left, So create a new patchset for including the 2 patches and 6 new completion patches which about secret-event, pool-event and nodedev-event. (Borrowed code & idea from Michal Privoznik for these patches design) Lin Ma (8): virsh-secret: Rename vshEventCallback to vshSecretEventCallback virsh: Add event name completion to 'secret-event' command virsh: Move vshEventCallback structure definition to virsh-domain.h virsh: Add event name completion to 'event' command virsh-pool: Rename vshEventCallback to vshPoolEventCallback virsh: Add event name completion to 'pool-event' command virsh-nodedev: Rename vshEventCallback to vshNodedevEventCallback virsh: Add event name completion to 'nodedev-event' command tools/virsh-completer.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh-completer.h | 15 ++++++ tools/virsh-domain.c | 9 +--- tools/virsh-domain.h | 8 ++++ tools/virsh-nodedev.c | 19 +++----- tools/virsh-nodedev.h | 8 ++++ tools/virsh-pool.c | 19 +++----- tools/virsh-pool.h | 8 ++++ tools/virsh-secret.c | 18 +++----- tools/virsh-secret.h | 8 ++++ 10 files changed, 189 insertions(+), 42 deletions(-) -- 2.16.2

1 3

[libvirt] Issue
by Mehdi AROUI 23 May '18

23 May '18

HEllo, I try to install libvirt-python in my windows 10, with version 3.6 of python, but I have the message * pkg-config binary is required to compile libvirt-python* how to fix that. thanks in advance regards.

1 0

[libvirt] [PATCH 0/2] qemu: probe for -sandbox support
by Ján Tomko 22 May '18

22 May '18

There is a patch proposal on qemu-devel that removes the -sandbox option completely without CONFIG_SECCOMP: http://lists.nongnu.org/archive/html/qemu-devel/2018-05/msg03312.html Now that we assume query-command-line-options support, we can probe for it and honor the seccomp_sandbox = 0 qemu.conf option even without passing the -sandbox off option. Ján Tomko (2): Reintroduce QEMU_CAPS_SECCOMP_SANDBOX qemu: only pass -sandbox off if supported src/qemu/qemu_capabilities.c | 1 + src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 3 ++- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + 28 files changed, 29 insertions(+), 2 deletions(-) -- 2.16.1

2 3

[libvirt] [PATCH] qemu: Deny hugepages for non-existent NUMA nodes
by Michal Privoznik 22 May '18

22 May '18

https://bugzilla.redhat.com/show_bug.cgi?id=1534418 Just like ec982f6d929f3c23 denies hugepages for non-existent guest NUMA nodes in case there are some nodes configured. Unfortunately, when there are none, qemuBuildNumaArgStr() is not called and thus we have to have check in qemuBuildMemPathStr() too. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 10 +++++++ tests/qemuxml2argvdata/hugepages-pages8.xml | 41 +++++++++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +++ 3 files changed, 54 insertions(+) create mode 100644 tests/qemuxml2argvdata/hugepages-pages8.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f3724a766b..af0af33bd1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7276,6 +7276,16 @@ qemuBuildMemPathStr(virQEMUDriverConfigPtr cfg, if (!def->mem.nhugepages) return 0; + if (def->mem.hugepages[0].nodemask) { + ssize_t next_bit = virBitmapNextSetBit(def->mem.hugepages[0].nodemask, -1); + if (next_bit >= 0) { + virReportError(VIR_ERR_XML_DETAIL, + _("hugepages: node %zd not found"), + next_bit); + return -1; + } + } + /* There is one special case: if user specified "huge" * pages of regular system pages size. * And there is nothing to do in this case. diff --git a/tests/qemuxml2argvdata/hugepages-pages8.xml b/tests/qemuxml2argvdata/hugepages-pages8.xml new file mode 100644 index 0000000000..4cf4c1a8ad --- /dev/null +++ b/tests/qemuxml2argvdata/hugepages-pages8.xml @@ -0,0 +1,41 @@ +<domain type='qemu'> + <name>SomeDummyHugepagesGuest</name> + <uuid>ef1bdff4-27f3-4e85-a807-5fb4d58463cc</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <memoryBacking> + <hugepages> + <page size='2048' unit='KiB' nodeset='1'/> + </hugepages> + </memoryBacking> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 78454acb1a..19801953e5 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -937,6 +937,9 @@ mymain(void) DO_TEST("hugepages-pages7", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD); + DO_TEST_FAILURE("hugepages-pages8", + QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_OBJECT_MEMORY_FILE, + QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD); DO_TEST("hugepages-memaccess", QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA); -- 2.16.1

2 1

[libvirt] [RFC PATCH 0/4] qemu: Forbid old qcow2 encryption
by Peter Krempa 22 May '18

22 May '18

This applies on top of the text monitor cleanup. See explanation in 3/4 for justification. Peter Krempa (4): tests: qemublock: Switch to qcow2+luks in test files tests: qemu: Modernize/remove qcow2 encryption from tests not related to storage qemu: domain: Forbid storage with old QCOW2 encryption qemu: Remove code for setting up disk passphrases src/qemu/qemu_domain.c | 20 ++-- src/qemu/qemu_monitor.c | 13 --- src/qemu/qemu_monitor.h | 4 - src/qemu/qemu_monitor_json.c | 28 ------ src/qemu/qemu_monitor_json.h | 4 - src/qemu/qemu_process.c | 103 --------------------- .../file-qcow2-backing-chain-encryption.json | 2 +- .../file-qcow2-backing-chain-encryption.xml | 2 +- ...etwork-qcow2-backing-chain-encryption_auth.json | 2 +- ...network-qcow2-backing-chain-encryption_auth.xml | 2 +- tests/qemumonitorjsontest.c | 2 - tests/qemuxml2argvdata/encrypted-disk-usage.args | 8 +- tests/qemuxml2argvdata/encrypted-disk-usage.xml | 2 +- tests/qemuxml2argvdata/encrypted-disk.args | 8 +- tests/qemuxml2argvdata/encrypted-disk.xml | 2 +- tests/qemuxml2argvdata/interface-server.xml | 3 - tests/qemuxml2argvdata/user-aliases.args | 8 +- tests/qemuxml2argvdata/user-aliases.xml | 2 +- tests/qemuxml2argvtest.c | 7 +- tests/qemuxml2xmloutdata/encrypted-disk.xml | 2 +- tests/qemuxml2xmloutdata/interface-server.xml | 3 - tests/qemuxml2xmltest.c | 6 +- 22 files changed, 50 insertions(+), 183 deletions(-) -- 2.16.2

2 6

[libvirt] [PATCH 0/2] Add NUMA support to virshAllocpagesPagesizeCompleter
by Roland Schulz 22 May '18

22 May '18

This is a follow up to my previous patch in which I added virshAllocpagesPagesizeCompleter. These patches will add support for different NUMA cells, which was tried and tested by changing default test capabilities. Roland Schulz (2): Add NUMA support to virshAllocpagesPagesizeCompleter. Edit test capabilities to contain different cell pagesizes. src/test/test_driver.c | 11 +++++++---- tools/virsh-completer.c | 15 ++++++++++++++- tools/virsh-host.c | 2 +- 3 files changed, 22 insertions(+), 6 deletions(-) -- 2.17.0

2 5

[libvirt] [PATCH v5 00/11] Add support for TPM emulator
by Stefan Berger 22 May '18

22 May '18

This series of patches adds support for the TPM emulator backend that is available in QEMU and based on swtpm + libtpms. It allows to attach a TPM 1.2 or 2 to a QEMU VM. sVirt labels are used for labeling the swtpm process, its Unix socket, and log file with the same label that the QEMU process gets. Besides that swtpm is added to the emulator cgroup to restrict its CPU usage. The device XML can be changed from a TPM 1.2 to a TPM 2 and back to a TPM 1.2. The device state is not removed during those changes but only when the domain is undefined. The swtpm needs persistent storage to store its state. For that I am using the uuid of the VM as part of the path since the name of the VM can be changed. Logfiles, PID files, and socket names are based on the name of the VM, though. Stefan v4->v5: - Addressed John Ferlan's, Boris Fiuczysnki's and Marc Hartmayer's comments - rebased on latest tip v3->v4: - Addressed John Ferlan's comments - Fixed bugs I found while testing - rebased on latest tip Stefan Berger (11): conf: Add support for external swtpm TPM emulator to domain XML qemu: Extend QEMU capabilities with 'tpm-emulator' util: Implement virFileChownFiles() security: Add DAC and SELinux security for tpm-emulator qemu: Extend qemu_conf with tpm-emulator support qemu: Extend QEMU with external TPM support qemu: Add support for external swtpm TPM emulator tests: Add test cases for external swtpm TPM emulator security: Label the external swtpm with SELinux labels conf: Add support for choosing emulation of a TPM 2 qemu: Add swtpm to emulator cgroup docs/formatdomain.html.in | 43 + docs/schemas/domaincommon.rng | 17 + libvirt.spec.in | 2 + src/conf/domain_audit.c | 2 + src/conf/domain_conf.c | 53 +- src/conf/domain_conf.h | 12 + src/libvirt_private.syms | 3 + src/qemu/Makefile.inc.am | 10 + src/qemu/libvirtd_qemu.aug | 5 + src/qemu/qemu.conf | 8 + src/qemu/qemu_capabilities.c | 5 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_cgroup.c | 36 + src/qemu/qemu_cgroup.h | 2 + src/qemu/qemu_command.c | 34 +- src/qemu/qemu_conf.c | 43 + src/qemu/qemu_conf.h | 6 + src/qemu/qemu_domain.c | 3 + src/qemu/qemu_extdevice.c | 177 ++++ src/qemu/qemu_extdevice.h | 59 ++ src/qemu/qemu_migration.c | 3 + src/qemu/qemu_process.c | 16 + src/qemu/qemu_security.c | 69 ++ src/qemu/qemu_security.h | 11 + src/qemu/qemu_tpm.c | 946 +++++++++++++++++++++ src/qemu/qemu_tpm.h | 56 ++ src/qemu/test_libvirtd_qemu.aug.in | 2 + src/security/security_dac.c | 7 + src/security/security_driver.h | 7 + src/security/security_manager.c | 36 + src/security/security_manager.h | 6 + src/security/security_selinux.c | 172 ++++ src/security/security_stack.c | 40 + src/util/virfile.c | 55 ++ src/util/virfile.h | 3 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + .../tpm-emulator-tpm2.x86_64-latest.args | 33 + tests/qemuxml2argvdata/tpm-emulator-tpm2.xml | 30 + .../tpm-emulator.x86_64-latest.args | 33 + tests/qemuxml2argvdata/tpm-emulator.xml | 30 + tests/qemuxml2argvtest.c | 16 +- tests/qemuxml2xmloutdata/tpm-emulator-tpm2.xml | 34 + tests/qemuxml2xmloutdata/tpm-emulator.xml | 34 + tests/qemuxml2xmltest.c | 1 + 48 files changed, 2156 insertions(+), 10 deletions(-) create mode 100644 src/qemu/qemu_extdevice.c create mode 100644 src/qemu/qemu_extdevice.h create mode 100644 src/qemu/qemu_tpm.c create mode 100644 src/qemu/qemu_tpm.h create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2.xml create mode 100644 tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tpm-emulator.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator-tpm2.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator.xml -- 2.14.3

2 19

[libvirt] [PATCH 1/1] tests: xmconfigtest: Add test for os.cmdline
by Filip Alac 22 May '18

22 May '18

Add test case for the os cmdline. Check if: 656151bf5dd299322dcf37d06d20534e667a1963 work as expected. Signed-off-by: Filip Alac <filipalac(a)gmail.com> --- tests/xmconfigdata/test-os-cmdline.cfg | 14 +++++++++ tests/xmconfigdata/test-os-cmdline.xml | 40 ++++++++++++++++++++++++++ tests/xmconfigtest.c | 2 ++ 3 files changed, 56 insertions(+) create mode 100644 tests/xmconfigdata/test-os-cmdline.cfg create mode 100644 tests/xmconfigdata/test-os-cmdline.xml diff --git a/tests/xmconfigdata/test-os-cmdline.cfg b/tests/xmconfigdata/test-os-cmdline.cfg new file mode 100644 index 0000000..8ca8179 --- /dev/null +++ b/tests/xmconfigdata/test-os-cmdline.cfg @@ -0,0 +1,14 @@ +name = "test" +uuid = "ab6eec38-06ad-4fa6-aa50-4bb3dac321ef" +maxmem = 128 +memory = 128 +vcpus = 1 +localtime = 0 +on_poweroff = "destroy" +on_reboot = "restart" +on_crash = "restart" +vif = [ "mac=00:16:3e:70:61:00,bridge=xenbr0,script=vif-bridge" ] +kernel = "/boot/vmlinuz-2.6.26-2-xen-amd64" +ramdisk = "/boot/initrd.img-2.6.26-2-xen-amd64" +extra = "root=/dev/xvda2 ro" +disk = [ "file:/opt/xen/domains/test/swap.img,xvda1,w", "file:/opt/xen/domains/test/disk.img,xvda2,w" ] diff --git a/tests/xmconfigdata/test-os-cmdline.xml b/tests/xmconfigdata/test-os-cmdline.xml new file mode 100644 index 0000000..5f85b2e --- /dev/null +++ b/tests/xmconfigdata/test-os-cmdline.xml @@ -0,0 +1,40 @@ +<domain type='xen'> + <name>test</name> + <uuid>ab6eec38-06ad-4fa6-aa50-4bb3dac321ef</uuid> + <memory unit='KiB'>131072</memory> + <currentMemory unit='KiB'>131072</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='xenpv'>linux</type> + <kernel>/boot/vmlinuz-2.6.26-2-xen-amd64</kernel> + <initrd>/boot/initrd.img-2.6.26-2-xen-amd64</initrd> + <cmdline>root=/dev/xvda2 ro</cmdline> + </os> + <clock offset='utc' adjustment='reset'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/opt/xen/domains/test/swap.img'/> + <target dev='xvda1' bus='xen'/> + </disk> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/opt/xen/domains/test/disk.img'/> + <target dev='xvda2' bus='xen'/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:70:61:00'/> + <source bridge='xenbr0'/> + <script path='vif-bridge'/> + </interface> + <console type='pty'> + <target type='xen' port='0'/> + </console> + <input type='mouse' bus='xen'/> + <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> + </devices> +</domain> diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 6851fa7..2820711 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -234,6 +234,8 @@ mymain(void) DO_TEST("disk-drv-blktap-raw"); DO_TEST("disk-drv-blktap2-raw"); + DO_TEST("os-cmdline"); + virObjectUnref(caps); virObjectUnref(xmlopt); -- 2.17.0

3 2

[libvirt] [libvirt-python][PATCH] event-test.py: Sync list of storage lifecycle events
by Michal Privoznik 22 May '18

22 May '18

https://bugzilla.redhat.com/show_bug.cgi?id=1578337 Since libvirt 3.8.0 we have 6 events: defined, undefined, started, stopped, created, deleted. However, the last two were missing in a string list that translates libvirt events (int) into human readable strings. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- examples/event-test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/event-test.py b/examples/event-test.py index 3de333c..281e661 100755 --- a/examples/event-test.py +++ b/examples/event-test.py @@ -605,6 +605,8 @@ def storageEventToString(event): "Undefined", "Started", "Stopped", + "Created", + "Deleted", ) return storageEventStrings[event] -- 2.16.1

2 1

[libvirt] [PATCH 0/5] Introduce virDomainDetachDeviceAlias
by Michal Privoznik 22 May '18

22 May '18

The idea is to allow user to detach device passing only alias. It is enough to uniquely identify a device. Michal Privoznik (5): Introduce virDomainDetachDeviceAlias API remote: Implement virDomainDetachDeviceAlias qemu: Split qemuDomainDetachDeviceLiveAndConfig qemu: Implement virDomainDetachDeviceAlias virsh: Expose virDomainDetachDeviceAlias include/libvirt/libvirt-domain.h | 3 ++ src/driver-hypervisor.h | 6 +++ src/libvirt-domain.c | 46 +++++++++++++++++++++ src/libvirt_public.syms | 5 +++ src/qemu/qemu_driver.c | 87 +++++++++++++++++++++++++++++++++++----- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 16 +++++++- src/remote_protocol-structs | 6 +++ tools/virsh-domain.c | 79 ++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 15 +++++++ 10 files changed, 253 insertions(+), 11 deletions(-) -- 2.16.1

2 10

[libvirt] [PATCH v3 0/4] qemu: Add support for -device hda-output (disable line-in)
by Filip Alac 21 May '18

21 May '18

Add support for hda 'output' codec for ich6 and ich9 sound devices, which allow us to disable line-in for guest. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1126641 v1: https://www.redhat.com/archives/libvir-list/2018-May/msg01311.html v2: - Split patch into series of patches - Add description of feature in docs/news.xml - Improve the documentation in docs/formatdomain.html.in - Fixes coding standard errors/inconsistencies v3: - Moved all tests to third patch - Made possible to compile every patch by alone except fourth which depends on the first and on the second patch. Filip Alac (4): Add 'output' codec in docs, qemu_command and qemu_capabilities tests: Extend qemu_capabilities with 'hda-output' docs: news: Describe 'output' codec tests: qemu: Extends tests for 'output' codec docs/formatdomain.html.in | 15 ++++++++++++--- docs/news.xml | 8 ++++++++ docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 5 ++++- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../migration-in-params-in.xml | 1 + .../migration-out-nbd-in.xml | 1 + .../migration-out-nbd-out.xml | 1 + .../migration-out-params-in.xml | 1 + tests/qemustatusxml2xmldata/modern-in.xml | 1 + tests/qemuxml2argvdata/sound-device.args | 2 ++ tests/qemuxml2argvdata/sound-device.xml | 2 ++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/sound-device.xml | 2 ++ 36 files changed, 62 insertions(+), 5 deletions(-) -- 2.17.0

2 5

[libvirt] [PATCHv1 0/7] Baseline CPU model using QEMU QMP exchanges
by Chris Venteicher 21 May '18

21 May '18

Some architectures (S390) depend on QEMU to compute baseline CPU model. Interacting with QEMU requires starting the QEMU process and completing one or more query-cpu-model-baseline QMP exchanges with QEMU. This patch set depends on qemuMonitorGetCPUModelBaseline function exposed by "query-cpu-model-baseline QMP Command" patch set discussed previously on libvir-list. See "s390x CPU models: exposing features" patch set on Qemu-devel for discussion of QEMU aspects. This is part of resolution of: https://bugzilla.redhat.com/show_bug.cgi?id=1511999 Signed-off-by: Chris Venteicher <cventeic(a)redhat.com> Chris Venteicher (7): qemu_monitor_json: Properties optional in QMP JSON for CPUModelInfo qemu_capabilities: CPUModelInfo: XML/QMP format conversion qemu_capabilities: Start and connect to QEMU qemu_capabilities: Baseline CPUModel via QEMU qemu_capabilities: Find QEMU binary for S390 arch qemu_capabilities: qmperr pointer tracked in QMPCommand qemu_driver: Baseline CPU model using QEMU src/qemu/qemu_capabilities.c | 362 ++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_capabilities.h | 9 ++ src/qemu/qemu_driver.c | 29 ++++ src/qemu/qemu_monitor_json.c | 34 ++-- 4 files changed, 414 insertions(+), 20 deletions(-) -- 2.14.1

3 20

[libvirt] [PATCH] travis: Print test log file from distcheck as well
by Martin Kletzander 21 May '18

21 May '18

Since we started using `make distcheck` in travis, the part that's printing the tests/test-suite.log file is rather pointless. Let's check for both known locations (keeping the previous one there on purpose) so that the output is usable again. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d3f72d46f3d9..f980884dfa1c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -118,8 +118,11 @@ script: after_failure: - echo '============================================================================' - - 'if [ -f $(pwd)/tests/test-suite.log ]; then + - 'ver=$(sed -n "s/AC_INIT(\[libvirt\], \[$[0-9.]*$\],.*/\1/p" configure.ac); + if [ -f $(pwd)/tests/test-suite.log ]; then cat $(pwd)/tests/test-suite.log; + elif [ -f libvirt-$ver/_build/tests/test-suite.log ]; then + cat libvirt-$ver/_build/tests/test-suite.log; else echo "=== NO LOG FILE FOUND ==="; fi' -- 2.17.0

2 3

[libvirt] [PATCH] tools: Tiny clean-ups for two functions in virsh-completer.c
by Martin Kletzander 21 May '18

21 May '18

These two functions were duplicating some cleanup paths, so let's just merge both cleanup and error paths together. To distinguish whether we need to clean-up the return value let's keep it in @tmp until the function is successful in which case we set @ret to the value of @tmp and set @tmp to NULL. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tools/virsh-completer.c | 48 ++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index eb091070c92b..1f9f8e76e90e 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -97,6 +97,7 @@ virshDomainInterfaceCompleter(vshControl *ctl, size_t i; unsigned int domainXMLFlags = 0; char **ret = NULL; + char **tmp = NULL; virCheckFlags(VIRSH_DOMAIN_INTERFACE_COMPLETER_MAC, NULL); @@ -107,39 +108,35 @@ virshDomainInterfaceCompleter(vshControl *ctl, domainXMLFlags = VIR_DOMAIN_XML_INACTIVE; if (virshDomainGetXML(ctl, cmd, domainXMLFlags, &xmldoc, &ctxt) < 0) - goto error; + goto cleanup; ninterfaces = virXPathNodeSet("./devices/interface", ctxt, &interfaces); if (ninterfaces < 0) - goto error; + goto cleanup; - if (VIR_ALLOC_N(ret, ninterfaces + 1) < 0) - goto error; + if (VIR_ALLOC_N(tmp, ninterfaces + 1) < 0) + goto cleanup; for (i = 0; i < ninterfaces; i++) { ctxt->node = interfaces[i]; if (!(flags & VIRSH_DOMAIN_INTERFACE_COMPLETER_MAC) && - (ret[i] = virXPathString("string(./target/@dev)", ctxt))) + (tmp[i] = virXPathString("string(./target/@dev)", ctxt))) continue; /* In case we are dealing with inactive domain XML there's no * <target dev=''/>. Offer MAC addresses then. */ - if (!(ret[i] = virXPathString("string(./mac/@address)", ctxt))) - goto error; + if (!(tmp[i] = virXPathString("string(./mac/@address)", ctxt))) + goto cleanup; } + VIR_STEAL_PTR(ret, tmp); + cleanup: VIR_FREE(interfaces); xmlFreeDoc(xmldoc); xmlXPathFreeContext(ctxt); + virStringListFree(tmp); return ret; - - error: - VIR_FREE(interfaces); - xmlFreeDoc(xmldoc); - xmlXPathFreeContext(ctxt); - virStringListFree(ret); - return NULL; } @@ -154,6 +151,7 @@ virshDomainDiskTargetCompleter(vshControl *ctl, xmlNodePtr *disks = NULL; int ndisks; size_t i; + char **tmp = NULL; char **ret = NULL; virCheckFlags(0, NULL); @@ -162,32 +160,28 @@ virshDomainDiskTargetCompleter(vshControl *ctl, return NULL; if (virshDomainGetXML(ctl, cmd, 0, &xmldoc, &ctxt) < 0) - goto error; + goto cleanup; ndisks = virXPathNodeSet("./devices/disk", ctxt, &disks); if (ndisks < 0) - goto error; + goto cleanup; - if (VIR_ALLOC_N(ret, ndisks + 1) < 0) - goto error; + if (VIR_ALLOC_N(tmp, ndisks + 1) < 0) + goto cleanup; for (i = 0; i < ndisks; i++) { ctxt->node = disks[i]; - if (!(ret[i] = virXPathString("string(./target/@dev)", ctxt))) - goto error; + if (!(tmp[i] = virXPathString("string(./target/@dev)", ctxt))) + goto cleanup; } + VIR_STEAL_PTR(ret, tmp); + cleanup: VIR_FREE(disks); xmlFreeDoc(xmldoc); xmlXPathFreeContext(ctxt); + virStringListFree(tmp); return ret; - - error: - VIR_FREE(disks); - xmlFreeDoc(xmldoc); - xmlXPathFreeContext(ctxt); - virStringListFree(ret); - return NULL; } -- 2.17.0

2 1

[libvirt] [PATCH] Add virshAllocpagesPagesizeCompleter
by Roland Schulz 21 May '18

21 May '18

Returns list of host page sizes from capabilities xml Signed-off-by: Roland Schulz <schullzroll(a)gmail.com> --- tools/virsh-completer.c | 71 +++++++++++++++++++++++++++++++++++++++++ tools/virsh-completer.h | 4 +++ tools/virsh-host.c | 1 + 3 files changed, 76 insertions(+) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index eb091070c..5f8a35b5f 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -27,6 +27,7 @@ #include "virsh-pool.h" #include "virsh-util.h" #include "internal.h" +#include "virutil.h" #include "viralloc.h" #include "virstring.h" #include "virxml.h" @@ -570,3 +571,73 @@ virshSnapshotNameCompleter(vshControl *ctl, virshDomainFree(dom); return NULL; } + +char ** +virshAllocpagesPagesizeCompleter(vshControl *ctl, + const vshCmd *cmd ATTRIBUTE_UNUSED, + unsigned int flags) +{ + unsigned long long byteval = 0; + xmlXPathContextPtr ctxt = NULL; + virshControlPtr priv = ctl->privData; + unsigned int npages = 0; + xmlNodePtr *pages = NULL; + double size = 0; + size_t i = 0; + const char *suffix = NULL; + char *pagesize = NULL; + char *cap_xml = NULL; + char **ret = NULL; + char *unit = NULL; + + virCheckFlags(0, NULL); + + if (!priv->conn || virConnectIsAlive(priv->conn) <= 0) + goto error; + + if (!(cap_xml = virConnectGetCapabilities(priv->conn))) + goto error; + + if (!(virXMLParseStringCtxt(cap_xml, _("capabilities"), &ctxt))) + goto error; + + npages = virXPathNodeSet("/capabilities/host/cpu/pages", ctxt, &pages); + if (npages <= 0) + goto error; + + if (VIR_ALLOC_N(ret, npages + 1) < 0) + goto error; + + for (i = 0; i < npages; i++) { + VIR_FREE(pagesize); + VIR_FREE(unit); + pagesize = virXMLPropString(pages[i], "size"); + unit = virXMLPropString(pages[i], "unit"); + if (virStrToLong_ull(pagesize, NULL, 10, &byteval) < 0) + goto error; + if (virScaleInteger(&byteval, unit, 1024, UINT_MAX) < 0) + goto error; + size = vshPrettyCapacity(byteval, &suffix); + if (virAsprintf(&ret[i], "%.0f%s", size, suffix) < 0) + goto error; + } + + cleanup: + xmlXPathFreeContext(ctxt); + for (i = 0; i < npages; i++) + VIR_FREE(pages[i]); + VIR_FREE(pages); + VIR_FREE(cap_xml); + VIR_FREE(pagesize); + VIR_FREE(unit); + + return ret; + + error: + if (ret) { + for (i = 0; i < npages; i++) + VIR_FREE(ret[i]); + } + VIR_FREE(ret); + goto cleanup; +} diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h index ae9626fea..c7b181879 100644 --- a/tools/virsh-completer.h +++ b/tools/virsh-completer.h @@ -74,4 +74,8 @@ char ** virshSnapshotNameCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); +char ** virshAllocpagesPagesizeCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); + #endif diff --git a/tools/virsh-host.c b/tools/virsh-host.c index ecaf830e3..293f06e9e 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -472,6 +472,7 @@ static const vshCmdOptDef opts_allocpages[] = { {.name = "pagesize", .type = VSH_OT_INT, .flags = VSH_OFLAG_REQ, + .completer = virshAllocpagesPagesizeCompleter, .help = N_("page size (in kibibytes)") }, {.name = "pagecount", -- 2.17.0

2 1