- Devel - libvirt List Archives

[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

[libvirt] nwfilter deadlock with libpcap and TPACKET_V3
by Daniel P. Berrangé 21 May '18

21 May '18

I've just found a deadlock in nwfilter caused by something in libpcap. There are 2 VMs running with the nwfilter stress test, but the deadlock in fact only involves VM VM. Three threads in libvirtd Thread 1 (Thread 0x7f3a26f726c0 (LWP 15384)): #0 __lll_lock_wait () at ../sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 #1 0x00007f3a22ae1cc4 in __GI___pthread_mutex_lock (mutex=0x7f39fc023de0) at ../nptl/pthread_mutex_lock.c:78 #2 0x00007f3a264817f5 in virMutexLock (m=<optimized out>) at util/virthread.c:89 #3 0x00007f3a2645c34b in virObjectLock (anyobj=anyobj@entry=0x7f39fc023dd0) at util/virobject.c:429 #4 0x00007f39deca2b93 in qemuProcessHandleEvent (mon=<optimized out>, vm=0x7f39fc023dd0, eventName=0x5601c3940500 "SHUTDOWN", seconds=1526658178, micros=453867, details=0x5601c3a468b0 "{\"guest\":false}", opaque=0x7f39ac11ba20) at qemu/qemu_process.c:630 #5 0x00007f39decc2686 in qemuMonitorEmitEvent (mon=mon@entry=0x7f39fc049d70, event=event@entry=0x5601c3940500 "SHUTDOWN", seconds=1526658178, micros=453867, details=0x5601c3a468b0 "{\"guest\":false}") at qemu/qemu_monitor.c:1336 #6 0x00007f39decd6cce in qemuMonitorJSONIOProcessEvent (obj=0x5601c391fcc0, mon=0x7f39fc049d70) at qemu/qemu_monitor_json.c:174 #7 qemuMonitorJSONIOProcessLine (mon=mon@entry=0x7f39fc049d70, line=<optimized out>, msg=msg@entry=0x0) at qemu/qemu_monitor_json.c:211 #8 0x00007f39decd6f59 in qemuMonitorJSONIOProcess (mon=mon@entry=0x7f39fc049d70, data=0x5601c3964670 "{\"timestamp\": {\"seconds\": 1526658178, \"microseconds\": 453867}, \"event\": \"SHUTDOWN\", \"data\": {\"guest\": false}}\r\n", len=111, msg=msg@entry=0x0) at qemu/qemu_monitor_json.c:253 #9 0x00007f39decc11fc in qemuMonitorIOProcess (mon=0x7f39fc049d70) at qemu/qemu_monitor.c:446 #10 qemuMonitorIO (watch=watch@entry=323, fd=<optimized out>, events=0, events@entry=1, opaque=opaque@entry=0x7f39fc049d70) at qemu/qemu_monitor.c:706 #11 0x00007f3a26425743 in virEventPollDispatchHandles (fds=0x5601c39a3410, nfds=<optimized out>) at util/vireventpoll.c:508 #12 virEventPollRunOnce () at util/vireventpoll.c:657 #13 0x00007f3a26423e71 in virEventRunDefaultImpl () at util/virevent.c:327 #14 0x00007f3a26549ff5 in virNetDaemonRun (dmn=0x5601c38cd1b0) at rpc/virnetdaemon.c:850 #15 0x00005601c281544a in main (argc=<optimized out>, argv=<optimized out>) at remote/remote_daemon.c:1483 Thread 4 (Thread 0x7f3a0e011700 (LWP 15400)): #0 __lll_lock_wait () at ../sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 #1 0x00007f3a22ae1d64 in __GI___pthread_mutex_lock (mutex=0x7f39ac1cb3e0) at ../nptl/pthread_mutex_lock.c:113 #2 0x00007f3a264817f5 in virMutexLock (m=<optimized out>) at util/virthread.c:89 ---Type <return> to continue, or q <return> to quit--- #3 0x00007f39f518653f in virNWFilterLockIface (ifname=ifname@entry=0x7f39fc025b60 "tck-vm2-if0") at nwfilter/nwfilter_learnipaddr.c:197 #4 0x00007f39f517aae5 in _virNWFilterTeardownFilter (ifname=0x7f39fc025b60 "tck-vm2-if0") at nwfilter/nwfilter_gentech_driver.c:1021 #5 0x00007f39f517b5fc in virNWFilterTeardownFilter (net=0x7f39fc044f80) at nwfilter/nwfilter_gentech_driver.c:1039 #6 0x00007f3a264da77c in virDomainConfVMNWFilterTeardown (vm=vm@entry=0x7f39fc023dd0) at conf/domain_nwfilter.c:65 #7 0x00007f39decab77a in qemuProcessStop (driver=driver@entry=0x7f39ac11ba20, vm=0x7f39fc023dd0, reason=reason@entry=VIR_DOMAIN_SHUTOFF_DESTROYED, asyncJob=asyncJob@entry=QEMU_ASYNC_JOB_NONE, flags=0) at qemu/qemu_process.c:6767 #8 0x00007f39decfd47e in qemuDomainDestroyFlags (dom=<optimized out>, flags=<optimized out>) at qemu/qemu_driver.c:2237 #9 0x00007f3a2661c593 in virDomainDestroy (domain=domain@entry=0x7f39f00191e0) at libvirt-domain.c:475 #10 0x00005601c284052a in remoteDispatchDomainDestroy (server=0x5601c38cd240, msg=0x5601c3a189e0, args=<optimized out>, rerr=0x7f3a0e010b60, client=0x5601c393d9f0) at remote/remote_daemon_dispatch_stubs.h:4615 #11 remoteDispatchDomainDestroyHelper (server=0x5601c38cd240, client=0x5601c393d9f0, msg=0x5601c3a189e0, rerr=0x7f3a0e010b60, args=<optimized out>, ret=0x7f39f0004970) at remote/remote_daemon_dispatch_stubs.h:4591 #12 0x00007f3a265443f4 in virNetServerProgramDispatchCall (msg=0x5601c3a189e0, client=0x5601c393d9f0, server=0x5601c38cd240, prog=0x5601c3938d70) at rpc/virnetserverprogram.c:437 #13 virNetServerProgramDispatch (prog=0x5601c3938d70, server=server@entry=0x5601c38cd240, client=0x5601c393d9f0, msg=0x5601c3a189e0) at rpc/virnetserverprogram.c:304 #14 0x00007f3a2654a778 in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x5601c38cd240) at rpc/virnetserver.c:145 #15 virNetServerHandleJob (jobOpaque=<optimized out>, opaque=0x5601c38cd240) at rpc/virnetserver.c:166 #16 0x00007f3a264822f0 in virThreadPoolWorker (opaque=opaque@entry=0x5601c38d9da0) at util/virthreadpool.c:167 #17 0x00007f3a26481678 in virThreadHelper (data=<optimized out>) at util/virthread.c:206 #18 0x00007f3a22adf564 in start_thread (arg=<optimized out>) at pthread_create.c:463 #19 0x00007f3a2281331f in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95 Thread 19 (Thread 0x7f39ceacb700 (LWP 17216)): #0 0x00007f3a22808929 in __GI___poll (fds=fds@entry=0x7f39ceaca930, nfds=nfds@entry=1, timeout=-1) at ../sysdeps/unix/sysv/linux/poll.c:29 #1 0x00007f39f4f3409d in poll (__timeout=<optimized out>, __nfds=1, __fds=0x7f39ceaca930) at /usr/include/bits/poll2.h:46 #2 pcap_wait_for_frames_mmap (handle=handle@entry=0x7f39ac1a7260) at ./pcap-linux.c:4561 #3 0x00007f39f4f38b98 in pcap_read_linux_mmap_v3 (handle=0x7f39ac1a7260, max_packets=1, callback=0x7f39f4f339f0 <pcap_oneshot_mmap>, user=0x7f39ceaca9d0 "@\252\254\316\071\177") at ./pcap-linux.c:5059 #4 0x00007f39f4f3d632 in pcap_next (p=p@entry=0x7f39ac1a7260, h=h@entry=0x7f39ceacaa40) at ./pcap.c:243 #5 0x00007f39f5186ace in learnIPAddressThread (arg=0x7f39fc058f10) at nwfilter/nwfilter_learnipaddr.c:486 #6 0x00007f3a264816a2 in virThreadHelper (data=<optimized out>) at util/virthread.c:206 #7 0x00007f3a22adf564 in start_thread (arg=<optimized out>) at pthread_create.c:463 #8 0x00007f3a2281331f in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95 So in summary: Thread 1 is responding to QEMU SHUTDOWN event Waiting on lock VM mutex due to thread 4 Thread 4 is responding to virDomainDestroy Holds lock on VM mutex Holds lock on nwfilter update mutex Waiting on lock interface mutex due to thread 19 Thread 19 is doing nwfilter address learning Holds lock on interface mutex Thread 19 is using libpcap to capture packets, and has told it to use a 500ms timeout. So it is in pcap_next() while holding the interface lock waiting in poll(). The code is written such that pcap_next() is expected to return on hitting the 500ms timeout and check for a request for learning to terminate. Whereupon it would release the interface lock allowing thread 4 to continnue. As we can see from the stack trace though, pcap_next() is not honouring our 500ms timeout, and has done poll() with an infinite timeout. This seems to be intentional behaviour from libpcap to ignore our requested timeout.... } else if (handlep->timeout > 0) { #ifdef HAVE_TPACKET3 /* * For TPACKET_V3, the timeout is handled by the kernel, * so block forever; that way, we don't get extra timeouts. * Don't do that if we have a broken TPACKET_V3, though. */ if (handlep->tp_version == TPACKET_V3 && !broken_tpacket_v3) handlep->poll_timeout = -1; /* block forever, let TPACKET_V3 wake us up */ else #endif handlep->poll_timeout = handlep->timeout; /* block for that amount of time */ We've taken the path tp_version == TPACKET_V3 && !broken_tpacket_v3. This is the case for anything with kernel >= 3.19 /* * OK, that was a valid minor version. * Is this 3.19 or newer? */ if (major >= 4 || (major == 3 && minor >= 19)) { /* Yes. TPACKET_V3 works correctly. */ broken_tpacket_v3 = 0; } I've no clue what it is about TPACKET_V3 that is supposed to wake us up from poll, but it clearly isn't happening :-( Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

2 2

[libvirt] [PATCH] qemu: clarify message about block peek format restriction
by Daniel P. Berrangé 21 May '18

21 May '18

Include the actual disk format in the error message to help the user see what is wrong. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_driver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e61af23870..3a328e5d46 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11544,8 +11544,9 @@ qemuDomainBlockPeek(virDomainPtr dom, } if (disk->src->format != VIR_STORAGE_FILE_RAW) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("peeking is supported only for RAW disks")); + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("peeking is only supported for disk with 'raw' format not '%s'"), + virStorageFileFormatTypeToString(disk->src->format)); goto cleanup; } -- 2.17.0

2 1

[libvirt] [PATCH v2 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 Filip Alac (4): Add 'output' codec in docs, conf and xml2xmltest qemu: Extend qemu_capabilities with 'hda-output' qemu: Extend qemu_command with 'hda-output' docs: news: Describe the '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 7

[libvirt] [PATCH 00/12][v2] Introduce network-backed loader & nvram.
by Prerna Saxena 21 May '18

21 May '18

Libvirt domain XML today only allows local filepaths that can be used to specify a loader element or its matching NVRAM disk. Given that Vms may themselves move across hypervisor hosts, it should be possible to allocate loaders/NVRAM disks on network storage for uninterrupted access. This series extends the firmware loader & NVRAM disks to be hosted over network-backed disks, for high availability. It achieves this by embedding virStorageSource elements for loader & nvram into _virDomainLoaderDef, as discussed in https://www.redhat.com/archives/libvir-list/2018-March/msg01721.html. Currently, the source type is annotated by introducing a new attribute "backing" for both 'loader' and 'nvram' elements. Hence, a sample XML with new annotation looks like this: <loader readonly='yes' type='pflash' backing='file'> <source file='/usr/share/OVMF/OVMF_CODE.fd'/> </loader> <nvram backing='network'> <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool/0'> <host name='example.com' port='6000'/> </source> References: ---------- v0 / Proposal: https://www.redhat.com/archives/libvir-list/2018-March/msg01721.html. v1 : https://www.redhat.com/archives/libvir-list/2018-April/msg02024.html Changelog: --------- Changes since v1: 1. Split up the patch into smaller units. 2. Added doc snippet & tests. 3. Changed the formatting code in patch 4 to format a domain's XML in the style that was read. I found that encryption seems to be a property of the storage volume. I didnt include that in this series since it does not use backing type as volume. Will include that later once the basic network support patches get done. Looking forward to feedback, Prerna Prerna Saxena (12): Schema: Introduce XML schema for network-backed loader and nvram elements. Loader: Add a more elaborate definition. Parse domain XML to generate virDomainLoaderDef & virDomainNvramDef. Format the loader source appropriately. Plumb the loader source into generation of QEMU command line. Fix the domain def inference logic to correctly account for network-backed pflash devices. Bhyve: Fix command line generation to correctly pick up local loader path. virt-aa-helper: Adjust references to loader & nvram elements to correctly parse the virStorageSource types. Vbox: Adjust references to 'loader' and 'nvram' elements given that these are now represented by virStorageSourcePtr. Xen: Adjust all references to loader & nvram elements given that they are now backed by virStorageSourcePtr Test: Add a test snippet to evaluate command line generation for loader/nvram specified via virStorageSource Documentation: Add a blurb for the newly added XML snippets for loader and nvram. docs/formatdomain.html.in | 36 ++++- docs/schemas/domaincommon.rng | 108 ++++++++++--- src/bhyve/bhyve_command.c | 6 +- src/conf/domain_conf.c | 215 +++++++++++++++++++++++-- src/conf/domain_conf.h | 11 +- src/qemu/qemu_cgroup.c | 13 +- src/qemu/qemu_command.c | 21 ++- src/qemu/qemu_domain.c | 31 ++-- src/qemu/qemu_driver.c | 7 +- src/qemu/qemu_parse_command.c | 30 +++- src/qemu/qemu_process.c | 42 +++-- src/security/security_dac.c | 6 +- src/security/security_selinux.c | 6 +- src/security/virt-aa-helper.c | 14 +- src/vbox/vbox_common.c | 11 +- src/xenapi/xenapi_driver.c | 4 +- src/xenconfig/xen_sxpr.c | 19 ++- src/xenconfig/xen_xm.c | 9 +- tests/qemuxml2argvdata/bios-nvram-network.args | 31 ++++ tests/qemuxml2argvdata/bios-nvram-network.xml | 42 +++++ tests/qemuxml2argvtest.c | 1 + 21 files changed, 562 insertions(+), 101 deletions(-) create mode 100644 tests/qemuxml2argvdata/bios-nvram-network.args create mode 100644 tests/qemuxml2argvdata/bios-nvram-network.xml -- 1.8.1.2

5 16

[libvirt] Fwd: Abandoning php-virt-control project
by Michal Novotny 21 May '18

21 May '18

>On Mon, May 21, 2018 at 11:05:13AM +0200, Michal Novotny wrote: >> Hi Dan, >> thanks and I completely understand. I was funding the domain name from my >> own resources for several years already. If somebody is interested in >> taking over the domain it would be great however if nobody is interested >> the domain will expire and cease to exist. As already said I'm willing to >> prolong the domain by 1 years till June 27 2019 but it would be nice if >> somebody can take over the domain ownership and the funding. As far as I >> know the project php-virt-control.org is basically an alias for the same >> server hosting libvirt.org so just the domain cease to exist but the git >> will still be available at [1]. > > Yes, that's correct the git will always be available there, and it also > gets auto-mirrored to both github and gitlab, so essentially it will > exist forever. > Ok, I'm glad to hear that :-) >> Is it worth it prolonging the domain by 1 year as mentioned above or should >> I let the domain expire if nobody is interested in taking it over >> considering the fact it will still remain on the server? > I'm terrible at making decisions like this - I still keep renewing domains > for personal project's I've long since abandoned, because I hate the idea > of domain squatters grabbing them and extorting money :-( > > Since I've not seen anyone actively sending patches for php-virt-control, > I fear you're unlikely to see anyone volunteer to take the domain name. > I guess you've got a month still you can wait though for anyone to take > interest until you need to decide. You are most likely right about that. Maybe it' s better to let the domain expire in one month if nobody takes it over because the project will still exist on the libvirt.org site. That said I won't prolong the domain name anymore and I'll let it expire if nobody is interested in taking over the domain. Regards, Michal > > > Regards, > Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

1 0

[libvirt] Abandoning php-virt-control project
by Michal Novotny 21 May '18

21 May '18

Hi, since I'm pretty busy last few months and I didn't do any commit to the php-virt-control project [1] for a pretty long time it's time to hand over this project to somebody that is interested in continuing the project so please if anyone is interested please tell me. It's essentially the PHP binding to the libvirt virtualization API so you can check the php-virt-control website however I no longer have access to the site and I think Dan P. Berrange (CC'ed) owns this server so he can grant access to the server hosting the project. It would be a pitty if this project dies entirely when I'm no longer having any time for the project as I've been receiving many replies of people liking the project. Also I'm the owner of the domain ([1]) and it expires on June 27 2018. Although I'm willing to prolong the domain by 1 year (till June 27 2019) it would be nice if I can also hand over the domain to somebody else. Please tell me if you're interested in taking over the project and/or the domain so we could faciliate the change (usually by domain ownership transfer done by link going to my mailbox). Thanks, Michal [1] http://php-virt-control.org/

2 1

[libvirt] [PATCH 0/8] Fix some issues with rng grammar for output XML's
by John Ferlan 21 May '18

21 May '18

The storagevol, capability, and nodedev output grammar files had some issues. Details noted in each patch. John Ferlan (8): schema: Add physical sizing grammer for storagevol grammar schema: Remove xenmigr from host migrate transport capability schema,tests: Use vpxmigr for host migrate transport capability schema: Add rdma for host migrate transport capability schema: Add vzmigr for host migrate transport capability schema: Add microcode to capability grammar schema: Fix capability grammar for pagesElem schema: Add missing block data for nodedev docs/schemas/capability.rng | 42 +++++++++++++++++++++++++++++------------- docs/schemas/nodedev.rng | 13 +++++++++++++ docs/schemas/storagevol.rng | 5 +++++ tests/vmx2xmltest.c | 2 +- 4 files changed, 48 insertions(+), 14 deletions(-) -- 2.14.3

2 9

[libvirt] [PATCH] spec: Fix build without QEMU
by Jiri Denemark 21 May '18

21 May '18

libvirt_qemu_probes.stp is only generated when QEMU driver is enabled. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 9ea5e6b32a..0e4a84c98c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1412,8 +1412,11 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} libvirt-docs %ifarch %{power64} s390x x86_64 ia64 alpha sparc64 mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \ $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes-64.stp + + %if %{with_qemu} mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \ $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes-64.stp + %endif %endif %check @@ -1994,8 +1997,10 @@ exit 0 %{_bindir}/virt-host-validate %{_datadir}/systemtap/tapset/libvirt_probes*.stp -%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp %{_datadir}/systemtap/tapset/libvirt_functions.stp +%if %{with_qemu} +%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp +%endif %if %{with_bash_completion} %{_datadir}/bash-completion/completions/virsh -- 2.17.0

2 1

[libvirt] [PATCH] Remove type_sep parameter from qemuBuildHostNetStr
by Ján Tomko 18 May '18

18 May '18

The last caller not passing a comma was removed by: commit ad8a7c4f8599bd58608500a72cdfec18a6bf2318 Author: Ján Tomko <jtomko(a)redhat.com> CommitDate: 2018-04-12 17:17:16 +0200 qemu: deprecate QEMU_CAPS_NETDEV Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_command.c | 28 +++++++++++----------------- src/qemu/qemu_command.h | 1 - src/qemu/qemu_hotplug.c | 2 +- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f3724a766b..9da2d609e8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3546,7 +3546,6 @@ qemuBuildNicDevStr(virDomainDefPtr def, char * qemuBuildHostNetStr(virDomainNetDefPtr net, virQEMUDriverPtr driver, - char type_sep, int vlan, char **tapfd, size_t tapfdSize, @@ -3578,7 +3577,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_ETHERNET: - virBufferAsprintf(&buf, "tap%c", type_sep); + virBufferAddLit(&buf, "tap,"); /* for one tapfd 'fd=' shall be used, * for more than one 'fds=' is the right choice */ if (tapfdSize == 1) { @@ -3596,30 +3595,26 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, break; case VIR_DOMAIN_NET_TYPE_CLIENT: - virBufferAsprintf(&buf, "socket%cconnect=%s:%d,", - type_sep, + virBufferAsprintf(&buf, "socket,connect=%s:%d,", net->data.socket.address, net->data.socket.port); break; case VIR_DOMAIN_NET_TYPE_SERVER: - virBufferAsprintf(&buf, "socket%clisten=%s:%d,", - type_sep, + virBufferAsprintf(&buf, "socket,listen=%s:%d,", net->data.socket.address ? net->data.socket.address : "", net->data.socket.port); break; case VIR_DOMAIN_NET_TYPE_MCAST: - virBufferAsprintf(&buf, "socket%cmcast=%s:%d,", - type_sep, + virBufferAsprintf(&buf, "socket,mcast=%s:%d,", net->data.socket.address, net->data.socket.port); break; case VIR_DOMAIN_NET_TYPE_UDP: - virBufferAsprintf(&buf, "socket%cudp=%s:%d,localaddr=%s:%d,", - type_sep, + virBufferAsprintf(&buf, "socket,udp=%s:%d,localaddr=%s:%d,", net->data.socket.address, net->data.socket.port, net->data.socket.localaddr, @@ -3627,7 +3622,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, break; case VIR_DOMAIN_NET_TYPE_USER: - virBufferAsprintf(&buf, "user%c", type_sep); + virBufferAddLit(&buf, "user,"); for (i = 0; i < net->guestIP.nips; i++) { const virNetDevIPAddr *ip = net->guestIP.ips[i]; const char *prefix = ""; @@ -3649,12 +3644,11 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, break; case VIR_DOMAIN_NET_TYPE_INTERNAL: - virBufferAsprintf(&buf, "user%c", type_sep); + virBufferAddLit(&buf, "user,"); break; case VIR_DOMAIN_NET_TYPE_VHOSTUSER: - virBufferAsprintf(&buf, "vhost-user%cchardev=char%s,", - type_sep, + virBufferAsprintf(&buf, "vhost-user,chardev=char%s,", net->info.alias); if (net->driver.virtio.queues > 1) virBufferAsprintf(&buf, "queues=%u,", @@ -8086,7 +8080,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, } if (!(netdev = qemuBuildHostNetStr(net, driver, - ',', -1, + -1, NULL, 0, NULL, 0))) goto error; @@ -8387,7 +8381,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, if (qemuDomainSupportsNicdev(def, net)) { if (!(host = qemuBuildHostNetStr(net, driver, - ',', vlan, + vlan, tapfdName, tapfdSize, vhostfdName, vhostfdSize))) goto cleanup; @@ -8403,7 +8397,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, virCommandAddArgList(cmd, "-net", nic, NULL); if (!(host = qemuBuildHostNetStr(net, driver, - ',', vlan, + vlan, tapfdName, tapfdSize, vhostfdName, vhostfdSize))) goto cleanup; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 28bc33558b..bbbf152660 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -80,7 +80,6 @@ qemuBuildChrDeviceStr(char **deviceStr, /* With vlan == -1, use netdev syntax, else old hostnet */ char *qemuBuildHostNetStr(virDomainNetDefPtr net, virQEMUDriverPtr driver, - char type_sep, int vlan, char **tapfd, size_t tapfdSize, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1933a966e5..b35594be5f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1120,7 +1120,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, } if (!(netstr = qemuBuildHostNetStr(net, driver, - ',', -1, + -1, tapfdName, tapfdSize, vhostfdName, vhostfdSize))) goto cleanup; -- 2.16.1

2 1

[libvirt] [PATCH] qemu: include kernel version in QEMU log file
by Daniel P. Berrangé 18 May '18

18 May '18

We currently print the libvirt and qemu version strings into the per-guest logfile. It would be useful to know what kernel is running too, so add that. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_process.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 5b73a61962..174d932ae7 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -32,6 +32,8 @@ # include <sys/cpuset.h> #endif +#include <sys/utsname.h> + #include "qemu_process.h" #include "qemu_processpriv.h" #include "qemu_alias.h" @@ -4283,17 +4285,21 @@ qemuLogOperation(virDomainObjPtr vm, int qemuVersion = virQEMUCapsGetVersion(priv->qemuCaps); const char *package = virQEMUCapsGetPackage(priv->qemuCaps); char *hostname = virGetHostname(); + struct utsname uts; + + uname(&uts); if ((timestamp = virTimeStringNow()) == NULL) goto cleanup; if (qemuDomainLogContextWrite(logCtxt, - "%s: %s %s, qemu version: %d.%d.%d%s, hostname: %s\n", + "%s: %s %s, qemu version: %d.%d.%d%s, kernel: %s, hostname: %s\n", timestamp, msg, VIR_LOG_VERSION_STRING, (qemuVersion / 1000000) % 1000, (qemuVersion / 1000) % 1000, qemuVersion % 1000, package ? package : "", + uts.release, hostname ? hostname : "") < 0) goto cleanup; -- 2.17.0

3 3

[libvirt] [PATCH] set default seccompSandbox as 0 for qemu
by zhenwei pi 18 May '18

18 May '18

start qemu fail : qemu-system-x86_64: -sandbox on,obsolete=deny, elevateprivileges=deny,spawn=deny,resourcecontrol=deny: seccomp support is disabled libvirt version : 4.3 qemu version : 2.12 reproducer : recompile qemu with ./configure --disable-seccomp, or remove libseccomp package. with default seccompSandbox -1, libvirt try to get config from qemu cmdline. if qemu disables seccomp (or misses seccomp package), qemu still reports sandbox help message. libvirt mistakens about qemu real capability. set default seccompSandbox as 0 in code, and still get user conf from qemu.conf. if user wants to enable seccomp, he should check qemu firstly, then use the right qemu.conf. Signed-off-by: zhenwei pi <zhenwei.pi(a)youruncloud.com> --- src/qemu/qemu_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 277ab83..d17b4b1 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -313,7 +313,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->keepAliveInterval = 5; cfg->keepAliveCount = 5; - cfg->seccompSandbox = -1; + cfg->seccompSandbox = 0; cfg->logTimestamp = true; cfg->glusterDebugLevel = 4; -- 2.7.4

2 2

[libvirt] [PATCH v1] Loop through all resolved addresses in virNetSocketNewListenTCP
by Olaf Hering 17 May '18

17 May '18

Currently virNetSocketNewListenTCP bails out early under the following conditions: - the hostname resolves to at least one IPv4 and at least one IPv6 address - the local interfaces have that one IPv4 address assigned, but not any of the IPv6 addresses - the local interfaces have just IPv6 link-local addresses In this case the resolver returns not only the IPv4 addreses but also IPv6. Binding the IPv6 address will obviously fail. But this terminates the entire loop, even if binding to IPv4 succeeded. To fix this error, just keep going and loop through all returned addresses. In case none of the attempts to bind to some address succeeded, try to report the appropriate error. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- src/rpc/virnetsocket.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 7087abec9c..0ee5e3604f 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -382,11 +382,8 @@ int virNetSocketNewListenTCP(const char *nodename, #endif if (bind(fd, runp->ai_addr, runp->ai_addrlen) < 0) { - if (errno != EADDRINUSE) { - virReportSystemError(errno, "%s", _("Unable to bind to port")); - goto error; - } - addrInUse = true; + if (errno == EADDRINUSE) + addrInUse = true; VIR_FORCE_CLOSE(fd); runp = runp->ai_next; continue; @@ -409,14 +406,14 @@ int virNetSocketNewListenTCP(const char *nodename, fd = -1; } - if (nsocks == 0 && familyNotSupported) { - virReportSystemError(EAFNOSUPPORT, "%s", _("Unable to bind to port")); - goto error; - } - - if (nsocks == 0 && - addrInUse) { - virReportSystemError(EADDRINUSE, "%s", _("Unable to bind to port")); + if (nsocks == 0) { + if (familyNotSupported) + errno = EAFNOSUPPORT; + else if(addrInUse) + errno = EADDRINUSE; + else + errno = EDESTADDRREQ; + virReportSystemError(errno, "%s", _("Unable to bind to port")); goto error; }

2 3

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

17 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 Signed-off-by: Filip Alac <filipalac(a)gmail.com> --- docs/formatdomain.html.in | 5 +++-- 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 + tests/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 + tests/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 + tests/qemustatusxml2xmldata/migration-in-params-in.xml | 1 + tests/qemustatusxml2xmldata/migration-out-nbd-in.xml | 1 + tests/qemustatusxml2xmldata/migration-out-nbd-out.xml | 1 + tests/qemustatusxml2xmldata/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 ++ 35 files changed, 45 insertions(+), 4 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0d0fd3b9..8ab45e1c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -7388,8 +7388,9 @@ qemu-kvm -net nic,model=? /dev/null sub-elements <code><codec></code> to attach various audio codecs to the audio device. If not specified, a default codec will be attached to allow playback and recording. Valid values - are 'duplex' (advertise a line-in and a line-out) and 'micro' - (advertise a speaker and a microphone). + are 'duplex' (advertise a line-in and a line-out), 'micro' + (advertise a speaker and a microphone) and 'output' + (advertise a speaker). </p> <pre> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 71ac3d07..f16e1573 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3824,6 +3824,7 @@ <choice> <value>duplex</value> <value>micro</value> + <value>output</value> </choice> </attribute> </element> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3689ac0a..f12c87d2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -529,7 +529,8 @@ VIR_ENUM_IMPL(virDomainSmartcard, VIR_DOMAIN_SMARTCARD_TYPE_LAST, VIR_ENUM_IMPL(virDomainSoundCodec, VIR_DOMAIN_SOUND_CODEC_TYPE_LAST, "duplex", - "micro") + "micro", + "output") VIR_ENUM_IMPL(virDomainSoundModel, VIR_DOMAIN_SOUND_MODEL_LAST, "sb16", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a78fdee4..ee3285a9 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1335,6 +1335,7 @@ struct _virDomainInputDef { typedef enum { VIR_DOMAIN_SOUND_CODEC_TYPE_DUPLEX, VIR_DOMAIN_SOUND_CODEC_TYPE_MICRO, + VIR_DOMAIN_SOUND_CODEC_TYPE_OUTPUT, VIR_DOMAIN_SOUND_CODEC_TYPE_LAST } virDomainSoundCodecType; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a5cb24fe..ba085a9e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -486,6 +486,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, /* 300 */ "sdl-gl", + "hda-output", ); @@ -1015,6 +1016,7 @@ struct virQEMUCapsStringFlags virQEMUCapsEvents[] = { struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "hda-duplex", QEMU_CAPS_HDA_DUPLEX }, { "hda-micro", QEMU_CAPS_HDA_MICRO }, + { "hda-output", QEMU_CAPS_HDA_OUTPUT}, { "ccid-card-emulated", QEMU_CAPS_CCID_EMULATED }, { "ccid-card-passthru", QEMU_CAPS_CCID_PASSTHRU }, { "piix3-usb-uhci", QEMU_CAPS_PIIX3_USB_UHCI }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index d23c34c2..3e9a8b30 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -470,6 +470,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 300 */ QEMU_CAPS_SDL_GL, /* -sdl gl */ + QEMU_CAPS_HDA_OUTPUT, /* -device hda-output*/ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c4237339..aee5bde5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -139,7 +139,8 @@ VIR_ENUM_DECL(qemuSoundCodec) VIR_ENUM_IMPL(qemuSoundCodec, VIR_DOMAIN_SOUND_CODEC_TYPE_LAST, "hda-duplex", - "hda-micro"); + "hda-micro", + "hda-output"); VIR_ENUM_DECL(qemuControllerModelUSB) @@ -4172,6 +4173,8 @@ qemuSoundCodecTypeToCaps(int type) return QEMU_CAPS_HDA_DUPLEX; case VIR_DOMAIN_SOUND_CODEC_TYPE_MICRO: return QEMU_CAPS_HDA_MICRO; + case VIR_DOMAIN_SOUND_CODEC_TYPE_OUTPUT: + return QEMU_CAPS_HDA_OUTPUT; default: return -1; } diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index e7c2e9a1..2b13ebc1 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -105,6 +105,7 @@ <flag name='query-cpu-definitions'/> <flag name='kernel-irqchip'/> <flag name='isa-serial'/> + <flag name='hda-output'/> <version>1005003</version> <kvmVersion>0</kvmVersion> <microcodeVersion>46523</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index e57dec32..ecd31293 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -110,6 +110,7 @@ <flag name='query-cpu-definitions'/> <flag name='kernel-irqchip'/> <flag name='isa-serial'/> + <flag name='hda-output'/> <version>1006000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>44752</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 39ec8f9b..c31a9721 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -112,6 +112,7 @@ <flag name='query-cpu-definitions'/> <flag name='kernel-irqchip'/> <flag name='isa-serial'/> + <flag name='hda-output'/> <version>1007000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>50196</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index afe0882d..07cb2a37 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -128,6 +128,7 @@ <flag name='query-named-block-nodes'/> <flag name='kernel-irqchip'/> <flag name='isa-serial'/> + <flag name='hda-output'/> <version>2001001</version> <kvmVersion>0</kvmVersion> <microcodeVersion>58992</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 59043068..e11c1122 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -155,6 +155,7 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>303541</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 2912c8d6..21d91c8d 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -154,6 +154,7 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>382824</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 77ca3013..7821144e 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -197,6 +197,7 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>344938</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index cabe4f2f..e4f22684 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -162,6 +162,7 @@ <flag name='qom-list-properties'/> <flag name='memory-backend-file.discard-data'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>343099</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index bffe3b3b..3e393633 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -159,6 +159,7 @@ <flag name='qom-list-properties'/> <flag name='memory-backend-file.discard-data'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>419968</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 4247afeb..35eadc18 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -200,6 +200,7 @@ <flag name='qom-list-properties'/> <flag name='memory-backend-file.discard-data'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>390813</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 871eb5e4..56861723 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -154,6 +154,7 @@ <flag name='virtio-gpu.max_outputs'/> <flag name='isa-serial'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2004000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>75406</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 90dce5a7..e86fce9f 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -160,6 +160,7 @@ <flag name='virtio-gpu.max_outputs'/> <flag name='isa-serial'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2005000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>216528</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 42985489..e5268eda 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -142,6 +142,7 @@ <flag name='dump-completed'/> <flag name='nbd-tls'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2006000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>228241</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 07cdc49b..7e514be6 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -137,6 +137,7 @@ <flag name='dump-completed'/> <flag name='nbd-tls'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2006000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>263005</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 4c6371a6..0d542b87 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -172,6 +172,7 @@ <flag name='dump-completed'/> <flag name='nbd-tls'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2006000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>227332</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index c322d18d..5795bc95 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -177,6 +177,7 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2007000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>239029</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 7c329ad4..bd467d27 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -179,6 +179,7 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2008000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>255684</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index cfc94050..1e6d0cc3 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -146,6 +146,7 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2009000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>346538</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 0701c244..7e45b311 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -192,6 +192,7 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2009000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>320947</microcodeVersion> diff --git a/tests/qemustatusxml2xmldata/migration-in-params-in.xml b/tests/qemustatusxml2xmldata/migration-in-params-in.xml index b0caa34e..03f18b4f 100644 --- a/tests/qemustatusxml2xmldata/migration-in-params-in.xml +++ b/tests/qemustatusxml2xmldata/migration-in-params-in.xml @@ -236,6 +236,7 @@ <flag name='iscsi.password-secret'/> <flag name='isa-serial'/> <flag name='dump-completed'/> + <flag name='hda-output'/> </qemuCaps> <job type='none' async='migration in' phase='prepare' flags='0x900'> <migParams> diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-in.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-in.xml index 6d87c1ec..636accf0 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-in.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-in.xml @@ -229,6 +229,7 @@ <flag name='iscsi.password-secret'/> <flag name='isa-serial'/> <flag name='dump-completed'/> + <flag name='hda-output'/> </qemuCaps> <job type='none' async='migration out' phase='perform3'> <disk dev='vdb' migrating='yes'/> diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml index 05da1f81..315d8e4c 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml @@ -229,6 +229,7 @@ <flag name='iscsi.password-secret'/> <flag name='isa-serial'/> <flag name='dump-completed'/> + <flag name='hda-output'/> </qemuCaps> <job type='none' async='migration out' phase='perform3' flags='0x0'> <disk dev='vdb' migrating='yes'/> diff --git a/tests/qemustatusxml2xmldata/migration-out-params-in.xml b/tests/qemustatusxml2xmldata/migration-out-params-in.xml index 17649796..ae206483 100644 --- a/tests/qemustatusxml2xmldata/migration-out-params-in.xml +++ b/tests/qemustatusxml2xmldata/migration-out-params-in.xml @@ -236,6 +236,7 @@ <flag name='iscsi.password-secret'/> <flag name='isa-serial'/> <flag name='dump-completed'/> + <flag name='hda-output'/> </qemuCaps> <job type='none' async='migration out' phase='perform3' flags='0x802'> <disk dev='vda' migrating='no'/> diff --git a/tests/qemustatusxml2xmldata/modern-in.xml b/tests/qemustatusxml2xmldata/modern-in.xml index d63fcf79..5b7e2a34 100644 --- a/tests/qemustatusxml2xmldata/modern-in.xml +++ b/tests/qemustatusxml2xmldata/modern-in.xml @@ -232,6 +232,7 @@ <flag name='iscsi.password-secret'/> <flag name='isa-serial'/> <flag name='dump-completed'/> + <flag name='hda-output'/> </qemuCaps> <devices> <device alias='rng0'/> diff --git a/tests/qemuxml2argvdata/sound-device.args b/tests/qemuxml2argvdata/sound-device.args index ee8313bf..f97050a0 100644 --- a/tests/qemuxml2argvdata/sound-device.args +++ b/tests/qemuxml2argvdata/sound-device.args @@ -33,10 +33,12 @@ server,nowait \ -device intel-hda,id=sound5,bus=pci.0,addr=0x6 \ -device hda-micro,id=sound5-codec0,bus=sound5.0,cad=0 \ -device hda-duplex,id=sound5-codec1,bus=sound5.0,cad=1 \ +-device hda-output,id=sound5-codec2,bus=sound5.0,cad=2 \ -device ich9-intel-hda,id=sound6,bus=pci.0,addr=0x7 \ -device hda-duplex,id=sound6-codec0,bus=sound6.0,cad=0 \ -device ich9-intel-hda,id=sound7,bus=pci.0,addr=0x8 \ -device hda-micro,id=sound7-codec0,bus=sound7.0,cad=0 \ -device hda-duplex,id=sound7-codec1,bus=sound7.0,cad=1 \ +-device hda-output,id=sound7-codec2,bus=sound7.0,cad=2 \ -device usb-audio,id=sound8,bus=usb.0,port=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x9 diff --git a/tests/qemuxml2argvdata/sound-device.xml b/tests/qemuxml2argvdata/sound-device.xml index bceb9d1f..c544e931 100644 --- a/tests/qemuxml2argvdata/sound-device.xml +++ b/tests/qemuxml2argvdata/sound-device.xml @@ -32,11 +32,13 @@ <sound model='ich6'> <codec type='micro'/> <codec type='duplex'/> + <codec type='output'/> </sound> <sound model='ich9'/> <sound model='ich9'> <codec type='micro'/> <codec type='duplex'/> + <codec type='output'/> </sound> <sound model='usb'/> <memballoon model='virtio'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 07e5ba1d..ff32347f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1515,6 +1515,7 @@ mymain(void) DO_TEST("sound", NONE); DO_TEST("sound-device", QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_HDA_MICRO, + QEMU_CAPS_HDA_OUTPUT, QEMU_CAPS_DEVICE_ICH9_INTEL_HDA, QEMU_CAPS_OBJECT_USB_AUDIO); DO_TEST("fs9p", NONE); diff --git a/tests/qemuxml2xmloutdata/sound-device.xml b/tests/qemuxml2xmloutdata/sound-device.xml index 62336a8c..cbf4d179 100644 --- a/tests/qemuxml2xmloutdata/sound-device.xml +++ b/tests/qemuxml2xmloutdata/sound-device.xml @@ -43,6 +43,7 @@ <sound model='ich6'> <codec type='micro'/> <codec type='duplex'/> + <codec type='output'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </sound> <sound model='ich9'> @@ -51,6 +52,7 @@ <sound model='ich9'> <codec type='micro'/> <codec type='duplex'/> + <codec type='output'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> </sound> <sound model='usb'/> -- 2.17.0

4 3

[libvirt] [PATCH 0/2] qemu: Enable multihead screendumps
by Michal Privoznik 17 May '18

17 May '18

There's one small problem. QEMU might crash: https://lists.gnu.org/archive/html/qemu-devel/2018-05/msg04113.html But apart from that, works like charm. Michal Privoznik (2): qemu: Introduce QEMU_CAPS_SCREENDUMP_DEVICE qemu: Implement multiple screen support for virDomainScreenshot src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 38 ++++++++++++++++++---- src/qemu/qemu_monitor.c | 4 ++- src/qemu/qemu_monitor.h | 2 ++ src/qemu/qemu_monitor_json.c | 4 +++ src/qemu/qemu_monitor_json.h | 2 ++ 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/qemumonitorjsontest.c | 2 +- 12 files changed, 50 insertions(+), 9 deletions(-) -- 2.16.1

2 4

[libvirt] [PATCH 0/4] qemu: TLS cleanup and fix of path escaping
by Peter Krempa 17 May '18

17 May '18

Clean up some code and fix wrong escaping of TLS certificate path. Peter Krempa (4): qemu: command: Optimize formatting of 'passwordid' in qemuBuildTLSx509BackendProps tests: qemuxml2argv: Test TLS certificate path containing a comma qemu: command: Fix formatting of TLS backend properties qemu: command: Remove qemuBuildHasMasterKey src/qemu/qemu_command.c | 40 +++------------------- .../disk-drive-network-tlsx509-vxhs.args | 8 ++--- tests/qemuxml2argvtest.c | 2 +- 3 files changed, 10 insertions(+), 40 deletions(-) -- 2.16.2

2 5

[libvirt] [jenkins-ci PATCH] lcitool: Use Perl to generate password hashes
by Andrea Bolognani 17 May '18

17 May '18

We claim to be using Python 2 at the moment: however, we rely on crypt.mksalt(), which was introduced in Python 3 and has only been backported to Python 2 in RHEL and Fedora, so the script will only work on those operating systems. We could move to Python 3, but the CI nodes are running on a CentOS 7 machine, where it can't be installed without pulling in third-party repositories and dealing with awkward naming; moreover, Ansible itself is still tied to Python 2, so we would be requiring both to be available. Perl to the rescue! The script ends up being only marginally more verbose and obscure as a result, the indentation is significantly better, and it should finally run on pretty much any platform. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/lcitool | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/guests/lcitool b/guests/lcitool index 5b2efb9..568e52c 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -18,11 +18,11 @@ die() { hash_file() { PASS_FILE="$1" - python2 -c " -import crypt -password = open('$PASS_FILE', 'r').read().strip() -print(crypt.crypt(password, - crypt.mksalt(crypt.METHOD_SHA512)))" + perl -le ' + my @chars = ("A".."Z", "a".."z", "0".."9"); + my $salt; $salt .= $chars[rand @chars] for 1..16; + open(my $handle, "'"$PASS_FILE"'"); my $pass = <$handle>; chomp $pass; + print crypt("$pass", "\$6\$$salt\$");' } # yaml_var FILE VAR -- 2.17.0

2 5

[libvirt] [tck PATCH] Stop deleting MANIFEST file when making release dists
by Daniel P. Berrangé 17 May '18

17 May '18

The MANIFEST file is now pre-created rather than auto-generated Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as trivial + build fix prepare-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prepare-release.sh b/prepare-release.sh index ad29f16..ef5d7b8 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -16,7 +16,7 @@ NAME=Sys-Virt-TCK set -e -rm -rf MANIFEST blib _build Build +rm -rf blib _build Build perl Build.PL install_base=$HOME/builder -- 2.17.0

1 0

[libvirt] [PATCH 0/9] RISC-V Guest Support
by Lubomir Rintel 17 May '18

17 May '18

Hello, here's patches I've used in order to be able to run RISC-V guests with libvirtd. In case you're interested in having RISC-V support you may want to have a look. There are some problems I am aware of, though not really able to address. I might be wrong about some points -- whoever is more familiar with QEMU, RISC-V or libvirt please correct me: * Essentially only the "virt" machine is useful, because others don't seem to support storage or network (as of qemu-2.12). It is not default though, so creating a reasonable guest configuration is not intuitive. * The serial port used by the "virt" machine is NS16550A connected to the platform bus, but it doesn't seem to appear in the QEMU device model. I hardcoded it in qemuChrIsPlatformDevice() and qemuDomainChrDefPostParse() so that we end up defaulting to the correct one for the virt machine. * The tests were in a large part cargo-culted. I made some effort to cover what I thought was important, but it likely needs a better pair of eyes than mine. More in the idividual patches. In any case, I am able to boot Fedora and things seem to work well in general. I'll be thankful for feedback (and even more thankful if anyone more familiar with libvirtd picks up the patchset :). Hope this is useful, Lubo Diffstat follows. Lubomir Rintel (9): conf: add an option to specify a NS16550A serial port qemu: enable GIC only on AArch64 qemu: rename qemuDomainAssignARMVirtioMMIOAddresses() util: add RISC-V support tests/capabilitiestest: add RISC-V capability tests tests/util: add RISC-V capabilities tests/captest: check RISC-V capabilities lookup tests/qemuxml2argvtest: test RISC-V virt machine arguments tests/virschematest: add RISC-V to capabilityschemadata/caps-qemu-kvm docs/schemas/basictypes.rng | 2 + docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 17 +- src/qemu/qemu_domain.c | 24 +- src/qemu/qemu_domain_address.c | 27 +- src/util/virarch.c | 3 + src/util/virarch.h | 6 + tests/capabilityschemadata/caps-qemu-kvm.xml | 36 + .../caps_2.12.0.riscv32.replies | 14420 ++++++++++++++++ .../caps_2.12.0.riscv32.xml | 119 + .../caps_2.12.0.riscv64.replies | 14420 ++++++++++++++++ .../caps_2.12.0.riscv64.xml | 119 + tests/qemucapabilitiestest.c | 2 + tests/qemuxml2argvdata/riscv64-virt.args | 29 + tests/qemuxml2argvdata/riscv64-virt.xml | 34 + tests/qemuxml2argvtest.c | 2 + .../riscv64-virt.xml | 37 + tests/testutilsqemu.c | 72 + tests/vircapstest.c | 6 + 21 files changed, 29354 insertions(+), 24 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.riscv32.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.riscv32.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.riscv64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.riscv64.xml create mode 100644 tests/qemuxml2argvdata/riscv64-virt.args create mode 100644 tests/qemuxml2argvdata/riscv64-virt.xml create mode 100644 tests/qemuxml2startupxmloutdata/riscv64-virt.xml -- 2.17.0

2 13

[libvirt] [jenkins-ci PATCH] projects: set TEST_MAINTAINER for libvirt-perl build job too
by Daniel P. Berrangé 17 May '18

17 May '18

The TEST_MAINTAINER=1 env variable will effect running of Build.PL, causing it to turn on many more GCC warning flags to validate the build. So we need to set it for build job as well as test job. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- projects/libvirt-perl.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/libvirt-perl.yaml b/projects/libvirt-perl.yaml index 5cbe04c..28288e8 100644 --- a/projects/libvirt-perl.yaml +++ b/projects/libvirt-perl.yaml @@ -6,6 +6,8 @@ jobs: - perl-modulebuild-build-job: parent_jobs: 'libvirt-master-build' + local_env: | + export TEST_MAINTAINER=1 - perl-modulebuild-check-job: parent_jobs: 'libvirt-perl-master-build' local_env: | -- 2.17.0

2 1

[libvirt] [PATCH] docs: Fix copy-paste error in formatdomaincaps
by Martin Kletzander 17 May '18

17 May '18

Reported-instead-of-fixing-immediately-by: Jiri Denemark <jdenemar(a)redhat.com> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/formatdomaincaps.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomaincaps.html.in b/docs/formatdomaincaps.html.in index 86c9ce8c5c23..b68ae4b4f1f3 100644 --- a/docs/formatdomaincaps.html.in +++ b/docs/formatdomaincaps.html.in @@ -208,7 +208,7 @@ </dd> </dl> - <h3><a id="elementsIothread">CPU configuration</a></h3> + <h3><a id="elementsIothreads">I/O Threads</a></h3> <p> The <code>iothread</code> elements indicates whether or not -- 2.17.0

2 1

[libvirt] [PATCH REBASE 0/5] qemu: fix domain object wait to handle monitor errors
by Nikolay Shirokovskiy 17 May '18

17 May '18

Main patch is 4th, others are misc. Nikolay Shirokovskiy (5): qemu: erase synchronous block job cancel mentions in comments qemu: monitor: set error flag even in OOM conditions utils: export virCopyError qemu: fix domain object wait to handle monitor errors qemu: fix races in beingDestroyed usage src/conf/domain_conf.c | 43 --------------------------------------- src/conf/domain_conf.h | 3 --- src/libvirt_private.syms | 3 +-- src/qemu/qemu_domain.c | 45 +++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 7 +++++-- src/qemu/qemu_driver.c | 27 +++++++++++++++---------- src/qemu/qemu_hotplug.c | 4 ++-- src/qemu/qemu_migration.c | 12 +++++------ src/qemu/qemu_monitor.c | 5 +++++ src/qemu/qemu_process.c | 51 +++++++++++++++++++++++++++++++---------------- src/util/virerror.c | 12 ++++++++--- src/util/virerror.h | 1 + 12 files changed, 124 insertions(+), 89 deletions(-) -- 1.8.3.1

2 24

[libvirt] [PATCHv3 00/13] Switch from yajl to Jansson
by Ján Tomko 17 May '18

17 May '18

Per the discussion here: https://www.redhat.com/archives/libvir-list/2017-November/msg00225.html Switch from using yajl to Jansson. v1: https://www.redhat.com/archives/libvir-list/2018-March/msg01781.html v2: https://www.redhat.com/archives/libvir-list/2018-May/msg00695.html Patches 3-9 are meant to be squashed together before pushing, but are posted separately here in hope it will make reviewing them easier. v3: separated the removal of yajl functions, also removed WITH_YAJL from config-post.h and split the virt-driver-qemu.m4 changes into two patches, now with AC_REQUIRE for the CHECK_JANSSON dependency Ján Tomko (13): build: add --with-jansson build: undef WITH_JANSSON for SETUID_RPC_CLIENT Switch from yajl to Jansson FIXUP: fix tests FIXUP: Deprecate building --with-yajl FIXUP: make nss depend on Jansson instead of yajl FIXUP: compile and link with Jansson instead of yajl FIXUP: s/WITH_YAJL/WITH_JANSSON/ FIXUP: libvirt.spec: use jansson instead of yajl Remove functions using yajl build: remove references to WITH_YAJL for SETUID_RPC_CLIENT build: switch --with-qemu default from yes to check build: require Jansson if QEMU driver is enabled config-post.h | 3 +- configure.ac | 3 + libvirt.spec.in | 4 +- m4/virt-driver-qemu.m4 | 9 +- m4/virt-jansson.m4 | 29 ++ m4/virt-nss.m4 | 4 +- m4/virt-yajl.m4 | 27 +- src/Makefile.am | 8 +- src/qemu/qemu_driver.c | 2 +- src/util/Makefile.inc.am | 4 +- src/util/virjson.c | 597 ++++++++----------------------- tests/Makefile.am | 12 +- tests/cputest.c | 16 +- tests/libxlxml2domconfigtest.c | 4 +- tests/qemuagenttest.c | 2 +- tests/qemublocktest.c | 1 + tests/qemucapabilitiestest.c | 2 +- tests/qemucaps2xmltest.c | 2 +- tests/qemucommandutiltest.c | 2 +- tests/qemuhotplugtest.c | 2 +- tests/qemumigparamsdata/empty.json | 4 +- tests/qemumigparamsdata/unsupported.json | 4 +- tests/qemumigparamstest.c | 2 +- tests/qemumonitorjsontest.c | 2 +- tests/virmacmaptestdata/empty.json | 4 +- tests/virmocklibxl.c | 4 +- tests/virnetdaemontest.c | 2 +- tests/virstoragetest.c | 4 +- 28 files changed, 227 insertions(+), 532 deletions(-) create mode 100644 m4/virt-jansson.m4 -- 2.16.1

4 42

[libvirt] [jenkins-ci PATCH 0/3] Various fixes to Perl jobs
by Andrea Bolognani 17 May '18

17 May '18

Andrea Bolognani (3): jobs: Run commands after loading environments jobs: Use local_env for Perl test arguments jobs: Use *-check for Perl jobs too jobs/perl-makemaker.yaml | 11 +++++------ jobs/perl-modulebuild.yaml | 6 +++--- projects/libvirt-perl.yaml | 7 ++++--- projects/libvirt-tck.yaml | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) -- 2.17.0

2 7

[libvirt] [jenkins-ci PATCH] projects: switch libvirt-perl over to using Module::Build
by Daniel P. Berrangé 17 May '18

17 May '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- jobs/perl-makemaker.yaml | 136 ------------------------------------- projects/libvirt-perl.yaml | 6 +- 2 files changed, 3 insertions(+), 139 deletions(-) delete mode 100644 jobs/perl-makemaker.yaml diff --git a/jobs/perl-makemaker.yaml b/jobs/perl-makemaker.yaml deleted file mode 100644 index 84b368e..0000000 --- a/jobs/perl-makemaker.yaml +++ /dev/null @@ -1,136 +0,0 @@ - -- job-template: - id: perl-makemaker-build-job - name: '{name}-{branch}-build{variant}' - project-type: matrix - description: '{title} Build' - autogen_args: '' - workspace: '{name}-{branch}{variant}' - child-workspace: '.' - block-downstream: true - block-upstream: true - wrappers: - - timeout: - abort: true - type: absolute - timeout: 90 - write-description: 'Aborted build after 90 minutes' - properties: - - build-discarder: - days-to-keep: 30 - num-to-keep: 1000 - scm: - - git: - url: git://n64.pufty.ci.centos.org/{name}.git - branches: - - origin/{branch} - clean: - after: true - skip-tag: true - wipe-workspace: false - triggers: - - reverse: - jobs: '{obj:parent_jobs}' - - pollscm: - cron: "H/20 * * * *" - axes: - - axis: - name: systems - type: slave - values: '{obj:machines}' - builders: - - shell: | - perl Makefile.PL PREFIX="$VIRT_PREFIX" - {global_env} - {local_env} - $MAKE - $MAKE -j{smp} install - $MAKE -j{smp} manifest - publishers: - - email: - recipients: '{obj:spam}' - notify-every-unstable-build: true - send-to-individuals: false - - -- job-template: - id: perl-makemaker-test-job - name: '{name}-{branch}-test{variant}' - project-type: matrix - description: '{title} Test' - test_args: '' - workspace: '{name}-{branch}{variant}' - child-workspace: '.' - block-downstream: true - block-upstream: true - wrappers: - - timeout: - abort: true - type: absolute - timeout: 90 - write-description: 'Aborted build after 90 minutes' - properties: - - build-discarder: - days-to-keep: 30 - num-to-keep: 1000 - triggers: - - reverse: - jobs: '{obj:parent_jobs}' - axes: - - axis: - name: systems - type: slave - values: '{obj:machines}' - builders: - - shell: | - {global_env} - {local_env} - $MAKE -j{smp} test {test_args} - publishers: - - email: - recipients: '{obj:spam}' - notify-every-unstable-build: true - send-to-individuals: false - -- job-template: - id: perl-makemaker-rpm-job - name: '{name}-{branch}-rpm{variant}' - project-type: matrix - description: '{title} RPM' - archive_format: gz - workspace: '{name}-{branch}{variant}' - child-workspace: '.' - block-downstream: true - block-upstream: true - wrappers: - - timeout: - abort: true - type: absolute - timeout: 90 - write-description: 'Aborted build after 90 minutes' - properties: - - build-discarder: - days-to-keep: 30 - num-to-keep: 1000 - triggers: - - reverse: - jobs: '{obj:parent_jobs}' - axes: - - axis: - name: systems - type: slave - values: '{obj:machines}' - builders: - - shell: | - {global_env} - {local_env} - sed -i -e 's/BuildRequires: *perl-Sys-Virt.*//' *.spec - sed -i -e 's/BuildRequires: *libvirt.*devel.*//' *.spec - rm -f *.tar.{archive_format} - $MAKE -j{smp} dist - rpmbuild --define "_topdir `pwd`/rpmbuild" -ta *.tar.{archive_format} - publishers: - - email: - recipients: '{obj:spam}' - notify-every-unstable-build: true - send-to-individuals: false diff --git a/projects/libvirt-perl.yaml b/projects/libvirt-perl.yaml index 0a6f648..37b48ff 100644 --- a/projects/libvirt-perl.yaml +++ b/projects/libvirt-perl.yaml @@ -4,11 +4,11 @@ machines: '{all_machines}' title: Libvirt Perl jobs: - - perl-makemaker-build-job: + - perl-modulebuild-build-job: parent_jobs: 'libvirt-master-build' - - perl-makemaker-test-job: + - perl-modulebuild-test-job: parent_jobs: 'libvirt-perl-master-build' test_args: 'TEST_MAINTAINER=1' - - perl-makemaker-rpm-job: + - perl-modulebuild-rpm-job: parent_jobs: 'libvirt-perl-master-test' machines: '{rpm_machines}' -- 2.17.0

2 2

[libvirt] [REPOST PATCH] tests: Update x86_64 replies, caps to QEMU 2.12
by John Ferlan 17 May '18

17 May '18

Using a QEMU 2.12 tagged tree build and full build, used: tests/qemucapsprobe /home/qemu/x86_64-softmmu/qemu-system-x86_64 > \ tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies VIR_TEST_REGENERATE_OUTPUT=1 tests/qemucapabilitiestest VIR_TEST_REGENERATE_OUTPUT=1 tests/domaincapstest Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Reposting : https://www.redhat.com/archives/libvir-list/2018-May/msg00738.html with recent updates through commit id fe8a0679 tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml | 14 +- .../caps_2.12.0.x86_64.replies | 328 +++++++++++++-------- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 57 ++-- 3 files changed, 235 insertions(+), 164 deletions(-) diff --git a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml index d0e2866c49..9d752a0146 100644 --- a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml @@ -23,10 +23,11 @@ <cpu> <mode name='host-passthrough' supported='yes'/> <mode name='host-model' supported='yes'> - <model fallback='forbid'>Haswell-noTSX</model> + <model fallback='forbid'>Haswell-noTSX-IBRS</model> <vendor>Intel</vendor> <feature policy='require' name='vme'/> <feature policy='require' name='ss'/> + <feature policy='require' name='vmx'/> <feature policy='require' name='f16c'/> <feature policy='require' name='rdrand'/> <feature policy='require' name='hypervisor'/> @@ -36,6 +37,7 @@ <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='abm'/> <feature policy='require' name='invtsc'/> + <feature policy='require' name='ibpb'/> </mode> <mode name='custom' supported='yes'> <model usable='yes'>qemu64</model> @@ -51,13 +53,13 @@ <model usable='yes'>core2duo</model> <model usable='no'>athlon</model> <model usable='yes'>Westmere</model> - <model usable='no'>Westmere-IBRS</model> + <model usable='yes'>Westmere-IBRS</model> <model usable='no'>Skylake-Server</model> <model usable='no'>Skylake-Server-IBRS</model> <model usable='no'>Skylake-Client</model> <model usable='no'>Skylake-Client-IBRS</model> <model usable='yes'>SandyBridge</model> - <model usable='no'>SandyBridge-IBRS</model> + <model usable='yes'>SandyBridge-IBRS</model> <model usable='yes'>Penryn</model> <model usable='no'>Opteron_G5</model> <model usable='no'>Opteron_G4</model> @@ -65,12 +67,12 @@ <model usable='yes'>Opteron_G2</model> <model usable='yes'>Opteron_G1</model> <model usable='yes'>Nehalem</model> - <model usable='no'>Nehalem-IBRS</model> + <model usable='yes'>Nehalem-IBRS</model> <model usable='yes'>IvyBridge</model> - <model usable='no'>IvyBridge-IBRS</model> + <model usable='yes'>IvyBridge-IBRS</model> <model usable='no'>Haswell</model> <model usable='yes'>Haswell-noTSX</model> - <model usable='no'>Haswell-noTSX-IBRS</model> + <model usable='yes'>Haswell-noTSX-IBRS</model> <model usable='no'>Haswell-IBRS</model> <model usable='no'>EPYC</model> <model usable='no'>EPYC-IBPB</model> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies index c40046beef..eb45f23cb8 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -2,14 +2,13 @@ "QMP": { "version": { "qemu": { - "micro": 90, - "minor": 11, + "micro": 0, + "minor": 12, "major": 2 }, - "package": "v2.12.0-rc0" + "package": "v2.12.0" }, "capabilities": [ - "oob" ] } } @@ -23,11 +22,11 @@ { "return": { "qemu": { - "micro": 90, - "minor": 11, + "micro": 0, + "minor": 12, "major": 2 }, - "package": "v2.12.0-rc0" + "package": "v2.12.0" }, "id": "libvirt-2" } @@ -536,7 +535,7 @@ { "return": { - "fd": 19, + "fd": 17, "fdset-id": 0 }, "id": "libvirt-5" @@ -735,6 +734,10 @@ "name": "virtio-keyboard-pci", "parent": "virtio-input-hid-pci" }, + { + "name": "xen-sysbus", + "parent": "bus" + }, { "name": "i440FX", "parent": "pci-device" @@ -767,6 +770,10 @@ "name": "chardev-pty", "parent": "chardev" }, + { + "name": "xen-apic", + "parent": "apic-common" + }, { "name": "SUNW,fdtwo", "parent": "base-sysbus-fdc" @@ -1023,6 +1030,10 @@ "name": "pc-testdev", "parent": "isa-device" }, + { + "name": "xen-backend", + "parent": "xen-sysdev" + }, { "name": "Haswell-noTSX-IBRS-x86_64-cpu", "parent": "x86_64-cpu" @@ -1063,6 +1074,10 @@ "name": "virtio-balloon-pci", "parent": "virtio-pci" }, + { + "name": "chardev-socket", + "parent": "chardev" + }, { "name": "iothread", "parent": "object" @@ -1072,13 +1087,9 @@ "parent": "isa-device" }, { - "name": "chardev-socket", + "name": "chardev-mux", "parent": "chardev" }, - { - "name": "486-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "pc-q35-2.7-machine", "parent": "generic-pc-machine" @@ -1088,8 +1099,8 @@ "parent": "generic-pc-machine" }, { - "name": "chardev-mux", - "parent": "chardev" + "name": "486-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "filter-redirector", @@ -1223,14 +1234,14 @@ "name": "chardev-msmouse", "parent": "chardev" }, - { - "name": "pc-q35-2.9-machine", - "parent": "generic-pc-machine" - }, { "name": "chardev-pipe", "parent": "chardev-fd" }, + { + "name": "pc-q35-2.9-machine", + "parent": "generic-pc-machine" + }, { "name": "pc-i440fx-1.7-machine", "parent": "generic-pc-machine" @@ -1419,6 +1430,10 @@ "name": "chardev-file", "parent": "chardev-fd" }, + { + "name": "xen-sysdev", + "parent": "sys-bus-device" + }, { "name": "intel-iommu", "parent": "x86-iommu" @@ -1483,6 +1498,10 @@ "name": "ccid-bus", "parent": "bus" }, + { + "name": "xenpv-machine", + "parent": "machine" + }, { "name": "EPYC-IBPB-x86_64-cpu", "parent": "x86_64-cpu" @@ -1815,6 +1834,10 @@ "name": "pc-i440fx-2.2-machine", "parent": "generic-pc-machine" }, + { + "name": "xen-pci-passthrough", + "parent": "pci-device" + }, { "name": "cryptodev-backend", "parent": "object" @@ -1947,10 +1970,18 @@ "name": "virtio-scsi-pci", "parent": "virtio-pci" }, + { + "name": "piix3-ide", + "parent": "pci-ide" + }, { "name": "ES1370", "parent": "pci-device" }, + { + "name": "xen-pvdevice", + "parent": "pci-device" + }, { "name": "virtio-pci-bus", "parent": "virtio-bus" @@ -1960,8 +1991,8 @@ "parent": "pcie-port" }, { - "name": "piix3-ide", - "parent": "pci-ide" + "name": "xenfv-machine", + "parent": "generic-pc-machine" }, { "name": "pci-testdev", @@ -2015,6 +2046,10 @@ "name": "pc-i440fx-2.6-machine", "parent": "generic-pc-machine" }, + { + "name": "xen-platform", + "parent": "pci-device" + }, { "name": "chardev-serial", "parent": "chardev-fd" @@ -2111,6 +2146,10 @@ "name": "isa-applesmc", "parent": "isa-device" }, + { + "name": "xen-accel", + "parent": "accel" + }, { "name": "secret", "parent": "object" @@ -3192,102 +3231,93 @@ { "return": [ { - "name": "serial", - "type": "str" - }, - { - "name": "port_index", + "name": "min_io_size", "type": "uint16" }, { - "name": "dpofua", + "name": "removable", "description": "on/off", "type": "bool" }, { - "name": "bootindex", - "type": "int32" - }, - { - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" + "name": "channel", + "type": "uint32" }, { - "name": "discard_granularity", - "type": "uint32" + "name": "serial", + "type": "str" }, { "name": "lun", "type": "uint32" }, { - "name": "max_unmap_size", - "type": "uint64" + "name": "dpofua", + "description": "on/off", + "type": "bool" }, { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", + "name": "ver", "type": "str" }, { - "name": "port_wwn", - "type": "uint64" - }, - { - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "share-rw", - "type": "bool" - }, - { - "name": "opt_io_size", + "name": "scsi-id", "type": "uint32" }, { - "name": "min_io_size", + "name": "logical_block_size", + "description": "A power of two between 512 and 32768", "type": "uint16" }, { - "name": "product", + "name": "drive", + "description": "Node name or ID of a block device to use as a backend", "type": "str" }, { - "name": "scsi-id", - "type": "uint32" + "name": "scsi_version", + "type": "int32" }, { - "name": "channel", + "name": "werror", + "description": "Error handling policy, report/ignore/enospc/stop/auto", + "type": "BlockdevOnError" + }, + { + "name": "discard_granularity", "type": "uint32" }, { - "name": "vendor", - "type": "str" + "name": "port_wwn", + "type": "uint64" }, { - "name": "wwn", + "name": "max_unmap_size", "type": "uint64" }, { - "name": "werror", + "name": "rerror", "description": "Error handling policy, report/ignore/enospc/stop/auto", "type": "BlockdevOnError" }, { - "name": "removable", - "description": "on/off", + "name": "max_io_size", + "type": "uint64" + }, + { + "name": "wwn", + "type": "uint64" + }, + { + "name": "share-rw", "type": "bool" }, { - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" + "name": "product", + "type": "str" }, { - "name": "ver", + "name": "vendor", "type": "str" }, { @@ -3296,8 +3326,21 @@ "type": "uint16" }, { - "name": "max_io_size", - "type": "uint64" + "name": "port_index", + "type": "uint16" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "write-cache", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "name": "opt_io_size", + "type": "uint32" } ], "id": "libvirt-19" @@ -4103,6 +4146,11 @@ "name": "vectors", "type": "uint32" }, + { + "name": "iommu_platform", + "description": "on/off", + "type": "bool" + }, { "name": "x-pcie-extcap-init", "description": "on/off", @@ -4120,13 +4168,18 @@ "name": "x-ignore-backend-features", "type": "bool" }, + { + "name": "stats", + "description": "on/off", + "type": "bool" + }, { "name": "notify_on_empty", "description": "on/off", "type": "bool" }, { - "name": "iommu_platform", + "name": "virtio-pci-bus-master-bug-migration", "description": "on/off", "type": "bool" }, @@ -4136,7 +4189,7 @@ "type": "bool" }, { - "name": "virtio-pci-bus-master-bug-migration", + "name": "virgl", "description": "on/off", "type": "bool" }, @@ -4174,19 +4227,29 @@ "name": "yres", "type": "uint32" }, + { + "name": "stats", + "description": "on/off", + "type": "bool" + }, { "name": "iommu_platform", "description": "on/off", "type": "bool" }, { - "name": "max_outputs", + "name": "xres", "type": "uint32" }, { - "name": "xres", + "name": "max_outputs", "type": "uint32" }, + { + "name": "virgl", + "description": "on/off", + "type": "bool" + }, { "name": "max_hostmem", "type": "size" @@ -4711,6 +4774,11 @@ "name": "pc-i440fx-2.7", "cpu-max": 255 }, + { + "hotpluggable-cpus": true, + "name": "xenfv", + "cpu-max": 128 + }, { "hotpluggable-cpus": true, "name": "pc-i440fx-2.3", @@ -4752,6 +4820,11 @@ "cpu-max": 288, "alias": "q35" }, + { + "hotpluggable-cpus": false, + "name": "xenpv", + "cpu-max": 1 + }, { "hotpluggable-cpus": true, "name": "pc-q35-2.10", @@ -5001,7 +5074,6 @@ "name": "Westmere-IBRS", "typename": "Westmere-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -5051,7 +5123,6 @@ "avx512cd", "avx512bw", "avx512vl", - "spec-ctrl", "3dnowprefetch", "xsavec", "xgetbv1", @@ -5093,7 +5164,6 @@ "rdseed", "adx", "smap", - "spec-ctrl", "3dnowprefetch", "xsavec", "xgetbv1", @@ -5115,7 +5185,6 @@ "name": "SandyBridge-IBRS", "typename": "SandyBridge-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -5193,7 +5262,6 @@ "name": "Nehalem-IBRS", "typename": "Nehalem-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -5210,7 +5278,6 @@ "name": "IvyBridge-IBRS", "typename": "IvyBridge-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -5237,7 +5304,6 @@ "name": "Haswell-noTSX-IBRS", "typename": "Haswell-noTSX-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -5247,8 +5313,7 @@ "typename": "Haswell-IBRS-x86_64-cpu", "unavailable-features": [ "hle", - "rtm", - "spec-ctrl" + "rtm" ], "static": false, "migration-safe": true @@ -5291,7 +5356,6 @@ "misalignsse", "3dnowprefetch", "osvw", - "ibpb", "xsavec", "xgetbv1" ], @@ -5339,7 +5403,6 @@ "rdseed", "adx", "smap", - "spec-ctrl", "3dnowprefetch" ], "static": false, @@ -5354,7 +5417,6 @@ "rdseed", "adx", "smap", - "spec-ctrl", "3dnowprefetch" ], "static": false, @@ -5516,6 +5578,14 @@ }, { "parameters": [ + { + "name": "rendernode", + "type": "string" + }, + { + "name": "gl", + "type": "boolean" + }, { "name": "head", "type": "number" @@ -6217,6 +6287,10 @@ }, { "parameters": [ + { + "name": "x-oob", + "type": "boolean" + }, { "name": "pretty", "type": "boolean" @@ -14363,9 +14437,9 @@ "type": "int" }, { - "name": "static", + "name": "preallocation", "default": null, - "type": "bool" + "type": "356" } ], "meta-type": "object" @@ -18199,7 +18273,7 @@ "pge": true, "avx512bitalg": false, "pdcm": false, - "model": 63, + "model": 60, "movbe": true, "nrip-save": false, "ssse3": true, @@ -18210,7 +18284,7 @@ "fma": true, "cx16": true, "de": true, - "stepping": 2, + "stepping": 3, "xsave": true, "clflush": true, "skinit": false, @@ -18224,13 +18298,13 @@ "osvw": false, "apic": true, "pmm": false, - "spec-ctrl": false, + "spec-ctrl": true, "tsc-adjust": true, "kvm-steal-time": true, "kvmclock": true, "lwp": false, "xop": false, - "ibpb": false, + "ibpb": true, "avx": true, "ospke": false, "acpi": false, @@ -18245,7 +18319,7 @@ "vaes": false, "xsaves": false, "lm": true, - "umip": false, + "umip": true, "pse": true, "avx2": true, "sep": true, @@ -18269,22 +18343,22 @@ "fxsr-opt": false, "xstore": false, "rtm": false, - "kvm-hint-dedicated": true, + "kvm-hint-dedicated": false, "lmce": true, "perfctr-nb": false, "rdrand": true, "rdseed": false, "avx512-4vnniw": false, "vme": true, - "vmx": false, + "vmx": true, "dtes64": false, "mtrr": true, "rdtscp": true, "pse36": true, - "kvm-pv-tlb-flush": false, + "kvm-pv-tlb-flush": true, "tbm": false, "wdt": false, - "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz", + "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz", "sha-ni": false, "abm": true, "avx512pf": false, @@ -18314,6 +18388,7 @@ "xsavec": false, "intel-pt": false, "osxsave": false, + "hv-frequencies": false, "tsc-frequency": 0, "xd": true, "hv-vendor-id": "", @@ -18426,7 +18501,7 @@ "nodeid_msr": false, "pdcm": false, "movbe": true, - "model": 63, + "model": 60, "nrip_save": false, "nrip-save": false, "kvm_pv_unhalt": true, @@ -18439,7 +18514,7 @@ "cx16": true, "de": true, "enforce": false, - "stepping": 2, + "stepping": 3, "xsave": true, "clflush": true, "skinit": false, @@ -18458,7 +18533,7 @@ "pmu": false, "pmm": false, "apic": true, - "spec-ctrl": false, + "spec-ctrl": true, "min-xlevel2": 0, "tsc-adjust": true, "tsc_adjust": true, @@ -18467,7 +18542,7 @@ "kvmclock": true, "l3-cache": true, "lwp": false, - "ibpb": false, + "ibpb": true, "xop": false, "avx": true, "ospke": false, @@ -18485,7 +18560,7 @@ "xsaves": false, "tcg-cpuid": true, "lm": true, - "umip": false, + "umip": true, "pse": true, "avx2": true, "sep": true, @@ -18519,7 +18594,7 @@ "hv-synic": false, "xstore": false, "fxsr_opt": false, - "kvm-hint-dedicated": true, + "kvm-hint-dedicated": false, "rtm": false, "lmce": true, "hv-time": false, @@ -18529,18 +18604,18 @@ "rdrand": true, "rdseed": false, "avx512-4vnniw": false, - "vmx": false, + "vmx": true, "vme": true, "dtes64": false, "mtrr": true, "rdtscp": true, "pse36": true, - "kvm-pv-tlb-flush": false, + "kvm-pv-tlb-flush": true, "tbm": false, "wdt": false, "pause_filter": false, "sha-ni": false, - "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz", + "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz", "abm": true, "avx512pf": false, "xstore-en": false @@ -18644,7 +18719,7 @@ "pge": true, "avx512bitalg": false, "pdcm": false, - "model": 63, + "model": 60, "movbe": true, "nrip-save": false, "ssse3": true, @@ -18655,7 +18730,7 @@ "fma": true, "cx16": true, "de": true, - "stepping": 2, + "stepping": 3, "xsave": true, "clflush": true, "skinit": false, @@ -18669,13 +18744,13 @@ "osvw": false, "apic": true, "pmm": false, - "spec-ctrl": false, + "spec-ctrl": true, "tsc-adjust": true, "kvm-steal-time": true, "kvmclock": true, "lwp": false, "xop": false, - "ibpb": false, + "ibpb": true, "avx": true, "ospke": false, "acpi": false, @@ -18690,7 +18765,7 @@ "vaes": false, "xsaves": false, "lm": true, - "umip": false, + "umip": true, "pse": true, "avx2": true, "sep": true, @@ -18714,22 +18789,22 @@ "fxsr-opt": false, "xstore": false, "rtm": false, - "kvm-hint-dedicated": true, + "kvm-hint-dedicated": false, "lmce": true, "perfctr-nb": false, "rdrand": true, "rdseed": false, "avx512-4vnniw": false, "vme": true, - "vmx": false, + "vmx": true, "dtes64": false, "mtrr": true, "rdtscp": true, "pse36": true, - "kvm-pv-tlb-flush": false, + "kvm-pv-tlb-flush": true, "tbm": false, "wdt": false, - "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz", + "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz", "sha-ni": false, "abm": true, "avx512pf": false, @@ -18759,6 +18834,7 @@ "xsavec": false, "intel-pt": false, "osxsave": false, + "hv-frequencies": false, "tsc-frequency": 0, "xd": true, "hv-vendor-id": "", @@ -18871,7 +18947,7 @@ "nodeid_msr": false, "pdcm": false, "movbe": true, - "model": 63, + "model": 60, "nrip_save": false, "nrip-save": false, "kvm_pv_unhalt": true, @@ -18884,7 +18960,7 @@ "cx16": true, "de": true, "enforce": false, - "stepping": 2, + "stepping": 3, "xsave": true, "clflush": true, "skinit": false, @@ -18903,7 +18979,7 @@ "pmu": false, "pmm": false, "apic": true, - "spec-ctrl": false, + "spec-ctrl": true, "min-xlevel2": 0, "tsc-adjust": true, "tsc_adjust": true, @@ -18912,7 +18988,7 @@ "kvmclock": true, "l3-cache": true, "lwp": false, - "ibpb": false, + "ibpb": true, "xop": false, "avx": true, "ospke": false, @@ -18930,7 +19006,7 @@ "xsaves": false, "tcg-cpuid": true, "lm": true, - "umip": false, + "umip": true, "pse": true, "avx2": true, "sep": true, @@ -18964,7 +19040,7 @@ "hv-synic": false, "xstore": false, "fxsr_opt": false, - "kvm-hint-dedicated": true, + "kvm-hint-dedicated": false, "rtm": false, "lmce": true, "hv-time": false, @@ -18974,18 +19050,18 @@ "rdrand": true, "rdseed": false, "avx512-4vnniw": false, - "vmx": false, + "vmx": true, "vme": true, "dtes64": false, "mtrr": true, "rdtscp": true, "pse36": true, - "kvm-pv-tlb-flush": false, + "kvm-pv-tlb-flush": true, "tbm": false, "wdt": false, "pause_filter": false, "sha-ni": false, - "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz", + "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz", "abm": true, "avx512pf": false, "xstore-en": false @@ -19798,6 +19874,7 @@ "xsavec": false, "intel-pt": false, "osxsave": false, + "hv-frequencies": false, "tsc-frequency": 0, "xd": true, "hv-vendor-id": "", @@ -20243,6 +20320,7 @@ "xsavec": false, "intel-pt": false, "osxsave": false, + "hv-frequencies": false, "tsc-frequency": 0, "xd": true, "hv-vendor-id": "", diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 4247afeb31..060aad6152 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -122,6 +122,7 @@ <flag name='gic-version'/> <flag name='incoming-defer'/> <flag name='virtio-gpu'/> + <flag name='virtio-gpu.virgl'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> @@ -132,6 +133,7 @@ <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> + <flag name='spice-gl'/> <flag name='qxl.vram64_size_mb'/> <flag name='chardev-logfile'/> <flag name='debug-threads'/> @@ -161,6 +163,7 @@ <flag name='drive-iotune-group'/> <flag name='query-cpu-model-expansion'/> <flag name='virtio-net.host_mtu'/> + <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> @@ -200,10 +203,10 @@ <flag name='qom-list-properties'/> <flag name='memory-backend-file.discard-data'/> <flag name='sdl-gl'/> - <version>2011090</version> + <version>2012000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>390813</microcodeVersion> - <package>v2.12.0-rc0</package> + <microcodeVersion>392232</microcodeVersion> + <package>v2.12.0</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='phys-bits' type='number' value='0'/> @@ -220,6 +223,7 @@ <property name='xsavec' type='boolean' value='false'/> <property name='intel-pt' type='boolean' value='false'/> <property name='osxsave' type='boolean' value='false'/> + <property name='hv-frequencies' type='boolean' value='false'/> <property name='tsc-frequency' type='number' value='0'/> <property name='xd' type='boolean' value='true' migratable='yes'/> <property name='hv-vendor-id' type='string' value=''/> @@ -332,7 +336,7 @@ <property name='nodeid_msr' type='boolean' value='false'/> <property name='pdcm' type='boolean' value='false'/> <property name='movbe' type='boolean' value='true' migratable='yes'/> - <property name='model' type='number' value='63'/> + <property name='model' type='number' value='60'/> <property name='nrip_save' type='boolean' value='false'/> <property name='nrip-save' type='boolean' value='false'/> <property name='kvm_pv_unhalt' type='boolean' value='true' migratable='yes'/> @@ -345,7 +349,7 @@ <property name='cx16' type='boolean' value='true' migratable='yes'/> <property name='de' type='boolean' value='true' migratable='yes'/> <property name='enforce' type='boolean' value='false'/> - <property name='stepping' type='number' value='2'/> + <property name='stepping' type='number' value='3'/> <property name='xsave' type='boolean' value='true' migratable='yes'/> <property name='clflush' type='boolean' value='true' migratable='yes'/> <property name='skinit' type='boolean' value='false'/> @@ -364,7 +368,7 @@ <property name='pmu' type='boolean' value='false'/> <property name='pmm' type='boolean' value='false'/> <property name='apic' type='boolean' value='true' migratable='yes'/> - <property name='spec-ctrl' type='boolean' value='false'/> + <property name='spec-ctrl' type='boolean' value='true' migratable='yes'/> <property name='min-xlevel2' type='number' value='0'/> <property name='tsc-adjust' type='boolean' value='true' migratable='yes'/> <property name='tsc_adjust' type='boolean' value='true' migratable='yes'/> @@ -373,7 +377,7 @@ <property name='kvmclock' type='boolean' value='true' migratable='yes'/> <property name='l3-cache' type='boolean' value='true' migratable='yes'/> <property name='lwp' type='boolean' value='false'/> - <property name='ibpb' type='boolean' value='false'/> + <property name='ibpb' type='boolean' value='true' migratable='yes'/> <property name='xop' type='boolean' value='false'/> <property name='avx' type='boolean' value='true' migratable='yes'/> <property name='ospke' type='boolean' value='false'/> @@ -391,7 +395,7 @@ <property name='xsaves' type='boolean' value='false'/> <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/> <property name='lm' type='boolean' value='true' migratable='yes'/> - <property name='umip' type='boolean' value='false'/> + <property name='umip' type='boolean' value='true' migratable='yes'/> <property name='pse' type='boolean' value='true' migratable='yes'/> <property name='avx2' type='boolean' value='true' migratable='yes'/> <property name='sep' type='boolean' value='true' migratable='yes'/> @@ -425,7 +429,7 @@ <property name='hv-synic' type='boolean' value='false'/> <property name='xstore' type='boolean' value='false'/> <property name='fxsr_opt' type='boolean' value='false'/> - <property name='kvm-hint-dedicated' type='boolean' value='true' migratable='yes'/> + <property name='kvm-hint-dedicated' type='boolean' value='false'/> <property name='rtm' type='boolean' value='false'/> <property name='lmce' type='boolean' value='true' migratable='yes'/> <property name='hv-time' type='boolean' value='false'/> @@ -435,18 +439,18 @@ <property name='rdrand' type='boolean' value='true' migratable='yes'/> <property name='rdseed' type='boolean' value='false'/> <property name='avx512-4vnniw' type='boolean' value='false'/> - <property name='vmx' type='boolean' value='false'/> + <property name='vmx' type='boolean' value='true' migratable='yes'/> <property name='vme' type='boolean' value='true' migratable='yes'/> <property name='dtes64' type='boolean' value='false'/> <property name='mtrr' type='boolean' value='true' migratable='yes'/> <property name='rdtscp' type='boolean' value='true' migratable='yes'/> <property name='pse36' type='boolean' value='true' migratable='yes'/> - <property name='kvm-pv-tlb-flush' type='boolean' value='false'/> + <property name='kvm-pv-tlb-flush' type='boolean' value='true' migratable='yes'/> <property name='tbm' type='boolean' value='false'/> <property name='wdt' type='boolean' value='false'/> <property name='pause_filter' type='boolean' value='false'/> <property name='sha-ni' type='boolean' value='false'/> - <property name='model-id' type='string' value='Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz'/> + <property name='model-id' type='string' value='Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz'/> <property name='abm' type='boolean' value='true' migratable='yes'/> <property name='avx512pf' type='boolean' value='false'/> <property name='xstore-en' type='boolean' value='false'/> @@ -466,6 +470,7 @@ <property name='xsavec' type='boolean' value='false'/> <property name='intel-pt' type='boolean' value='false'/> <property name='osxsave' type='boolean' value='false'/> + <property name='hv-frequencies' type='boolean' value='false'/> <property name='tsc-frequency' type='number' value='0'/> <property name='xd' type='boolean' value='true' migratable='yes'/> <property name='hv-vendor-id' type='string' value=''/> @@ -724,9 +729,7 @@ <blocker name='3dnow'/> </cpu> <cpu type='kvm' name='Westmere' usable='yes'/> - <cpu type='kvm' name='Westmere-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='Westmere-IBRS' usable='yes'/> <cpu type='kvm' name='Skylake-Server' usable='no'> <blocker name='hle'/> <blocker name='rtm'/> @@ -763,7 +766,6 @@ <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> - <blocker name='spec-ctrl'/> <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='xgetbv1'/> @@ -793,7 +795,6 @@ <blocker name='rdseed'/> <blocker name='adx'/> <blocker name='smap'/> - <blocker name='spec-ctrl'/> <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='xgetbv1'/> @@ -801,9 +802,7 @@ <blocker name='mpx'/> </cpu> <cpu type='kvm' name='SandyBridge' usable='yes'/> - <cpu type='kvm' name='SandyBridge-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='SandyBridge-IBRS' usable='yes'/> <cpu type='kvm' name='Penryn' usable='yes'/> <cpu type='kvm' name='Opteron_G5' usable='no'> <blocker name='sse4a'/> @@ -827,25 +826,18 @@ <cpu type='kvm' name='Opteron_G2' usable='yes'/> <cpu type='kvm' name='Opteron_G1' usable='yes'/> <cpu type='kvm' name='Nehalem' usable='yes'/> - <cpu type='kvm' name='Nehalem-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='Nehalem-IBRS' usable='yes'/> <cpu type='kvm' name='IvyBridge' usable='yes'/> - <cpu type='kvm' name='IvyBridge-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='IvyBridge-IBRS' usable='yes'/> <cpu type='kvm' name='Haswell' usable='no'> <blocker name='hle'/> <blocker name='rtm'/> </cpu> <cpu type='kvm' name='Haswell-noTSX' usable='yes'/> - <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='yes'/> <cpu type='kvm' name='Haswell-IBRS' usable='no'> <blocker name='hle'/> <blocker name='rtm'/> - <blocker name='spec-ctrl'/> </cpu> <cpu type='kvm' name='EPYC' usable='no'> <blocker name='rdseed'/> @@ -876,7 +868,6 @@ <blocker name='misalignsse'/> <blocker name='3dnowprefetch'/> <blocker name='osvw'/> - <blocker name='ibpb'/> <blocker name='xsavec'/> <blocker name='xgetbv1'/> </cpu> @@ -899,7 +890,6 @@ <blocker name='rdseed'/> <blocker name='adx'/> <blocker name='smap'/> - <blocker name='spec-ctrl'/> <blocker name='3dnowprefetch'/> </cpu> <cpu type='kvm' name='Broadwell-IBRS' usable='no'> @@ -908,7 +898,6 @@ <blocker name='rdseed'/> <blocker name='adx'/> <blocker name='smap'/> - <blocker name='spec-ctrl'/> <blocker name='3dnowprefetch'/> </cpu> <cpu type='kvm' name='486' usable='yes'/> @@ -1214,6 +1203,7 @@ <machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> + <machine name='xenfv' hotplugCpus='yes' maxCpus='128'/> <machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> @@ -1222,6 +1212,7 @@ <machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/> <machine name='pc-q35-2.12' alias='q35' hotplugCpus='yes' maxCpus='288'/> + <machine name='xenpv' maxCpus='1'/> <machine name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/> <machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/> -- 2.14.3

4 6

Re: [libvirt] [Qemu-devel] [PATCH v2 0/5] Removal of deprecated -no-kvm* options
by Thomas Huth 16 May '18

16 May '18

On 07.05.2018 19:01, Paolo Bonzini wrote: > On 07/05/2018 18:50, Markus Armbruster wrote: >> Paolo Bonzini <pbonzini(a)redhat.com> writes: >> >>> On 07/05/2018 13:56, Markus Armbruster wrote: >>>> Adding more and more ways to do the same stuff does not improve an >>>> interface. Interface design needs to be *opinionated*. If we decide >>>> -machine accel=tcg isn't a nice interface, by all means create a better >>>> one, but as replacement[*], not as addition. >>>> >>>> Furthermore: >>>> >>>> tcg: add options for enabling MTTCG >>>> >>>> We know there will be cases where MTTCG won't work until additional work >>>> is done in the front/back ends to support. It will however be useful to >>>> be able to turn it on. >>>> >>>> As a result MTTCG will default to off unless the combination is >>>> supported. However the user can turn it on for the sake of testing. >>>> >>>> Signed-off-by: KONRAD Frederic <fred.konrad(a)greensocs.com> >>>> [AJB: move to -accel tcg,thread=multi|single, defaults] >>>> Signed-off-by: Alex Bennée <alex.bennee(a)linaro.org> >>>> Reviewed-by: Richard Henderson <rth(a)twiddle.net> >>>> >>>> I'm sorry, but this us sub-par. Yes, the commit is also about "enabling >>>> MTTCG", but it also adds a new way to select accelerators, without ever >>>> spelling that out. It should've been split, and properly described. >>> >>> Perhaps we can deprecate "-M accel" then, and also while we're at it >>> move kernel_irqchip from -machine to "-accel kvm" where it belongs? >> >> Sounds good to me. > > Thomas, here's one for you! :) I like the idea of deprecating "-machine accel=xxx" - but that will also be a bigger change, since "-accel" is internally setting the accel option of the machine again... Also libvirt is still using "-machine accel=..." as far as I know, so we've got to make sure that this gets changed there, too... Thomas

1 0

[libvirt] Libvirt daemon split / VM shim progress
by Daniel P. Berrangé 16 May '18

16 May '18

A update on progress splitting libvirtd into multiple daemons.... * General refactoring of the RPC client/server This is about allowing libvirtd daemon to forward API calls to other daemons when there is no built-in driver. It also involves the remote client learning how to connect to other daemons. Working proof of concept which splits the secret driver into a separate daemon is available: https://www.redhat.com/archives/libvir-list/2018-April/msg01977.html The storage driver, interface driver and nodedev drivers can all also be split at this time. The nwfilter & network drivers require some work before they can be split. Still needs work around config files, and creating daemons for other drivers. I'm not proposing to merge this until all drivers are ready. I want to avoid a hybrid state where some drivers are split and some are not as that will be confusing and make upgrade path harder. Need to also consider if we'll mandate splitting of libvirtd, or provide a compile time option to continue building a monolithic driver. We'll probably need the latter for at least a few years to avoid forcing a major architectural change on long-life distros that like to rebase. * Untangle storage driver from virt drivers This involved more the storage file code into separate loadable modules. This is merged and working https://www.redhat.com/archives/libvir-list/2018-April/msg02423.html * Untangle nwfilter driver from the virt drivers This involved creating new public APIs to provide the concept of a filter binding. This allows nwfilter driver to track all filters it has created. The virt drivers only talk to the nwfilter driver via the public API after this is done. Latest patch series is here: https://www.redhat.com/archives/libvir-list/2018-May/msg01145.html A few loose ends and testing needed, but largely feature complete and hopefully soon mergable * Untangle network driver from virt driver The virt drivers currently call into the network driver via a back channel using callbacks, rather than the public API. We will need to define some public APIs to allow creation and deletion of "network ports" from the virt driver. This will allow unprivilegd virt drivers to have real network access via privileged network driver. Also likely want to make the network driver responsible to setting up network filters when this is done. ie the virt driver will no longer directly use the nwfilter driver, instead the network driver will talk to the nwfilter driver. This will allow privileged network driver to enforce the use of nwfilters when giving ports to unprivileged virt drivers. No work started, but this what I'll tackle now the nwfilter stuff is largely wrapped up. * Move host device tracking into the node dev driver Currently we have a src/util/virhostdev.c file that tracks the state of SCSI, SCIVHost PCI, MDev, USB devices that are assigned to guests. This is part of the virt driver and needs to move into the node device driver in some way. Principally this will allow an unprivileged virt driver to use host devices via a privileged nodedev driver. Probably will involve creating some new virNodeDeviceXXXX APIs to deal with the operations required. Unclear exactly what they will look like, but need to be much simpler than the huge number of APIs that are in virhostdev.h currently. No work started, but Laine has indicated an interest in working on it. If not, I'll work on it once network stuff is under control With all the above done we'll be able to have many daemons, one per driver, with split privilege levels. The virt driver daemons, however, would still be monolithic. The step after that would be to look at how to allow a launching VMs via a simple shim daemon, that then associates with the main virt daemon. We had done some POC demos around that in the past, with some positive results https://www.redhat.com/archives/libvir-list/2017-December/msg00728.html With the splitting of libvirtd, the need for a shim feels less urgent, because the penalty of running one virtqemud per guest is lower than the penalty of running one libvirtd per guest. None the less I still think we want to try to build a shim, so that apps can directly connect to the shim to run API operations, and just use the virtqemud for central aggregation views. I'm not expecting todo anything on this until the libvirtd is split, because that makes it easier todo the shim without loosing functionality in the shim. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

1 0

[libvirt] [PATCH] tests: Update caps for QEMU 2.12.0 on s390x
by Shalini Chellathurai Saroja 16 May '18

16 May '18

Let us update the existing xml and replies files for QEMU 2.12.0 on s390x. Signed-off-by: Shalini Chellathurai Saroja <shalini(a)linux.vnet.ibm.com> --- tests/domaincapsschemadata/qemu_2.12.0.s390x.xml | 99 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 5001 +++++++++++--------- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 113 +- 3 files changed, 2974 insertions(+), 2239 deletions(-) diff --git a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml index 4bacb879fe..1475451e68 100644 --- a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml +++ b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml @@ -22,8 +22,103 @@ </os> <cpu> <mode name='host-passthrough' supported='yes'/> - <mode name='host-model' supported='no'/> - <mode name='custom' supported='no'/> + <mode name='host-model' supported='yes'> + <model fallback='forbid'>z14-base</model> + <feature policy='require' name='aen'/> + <feature policy='require' name='aefsi'/> + <feature policy='require' name='msa8'/> + <feature policy='require' name='msa7'/> + <feature policy='require' name='msa6'/> + <feature policy='require' name='msa5'/> + <feature policy='require' name='msa4'/> + <feature policy='require' name='msa3'/> + <feature policy='require' name='msa2'/> + <feature policy='require' name='msa1'/> + <feature policy='require' name='sthyi'/> + <feature policy='require' name='edat'/> + <feature policy='require' name='ri'/> + <feature policy='require' name='edat2'/> + <feature policy='require' name='vx'/> + <feature policy='require' name='ipter'/> + <feature policy='require' name='vxeh'/> + <feature policy='require' name='vxpd'/> + <feature policy='require' name='esop'/> + <feature policy='require' name='iep'/> + <feature policy='require' name='cte'/> + <feature policy='require' name='gs'/> + <feature policy='require' name='ppa15'/> + <feature policy='require' name='zpci'/> + <feature policy='require' name='sea_esop2'/> + <feature policy='require' name='te'/> + <feature policy='require' name='cmm'/> + </mode> + <mode name='custom' supported='yes'> + <model usable='yes'>z890.2</model> + <model usable='yes'>z990.4</model> + <model usable='yes'>z10BC.2</model> + <model usable='yes'>z196.2</model> + <model usable='yes'>z14</model> + <model usable='yes'>z9BC-base</model> + <model usable='yes'>zEC12-base</model> + <model usable='yes'>z196-base</model> + <model usable='yes'>z13-base</model> + <model usable='yes'>z990.3</model> + <model usable='yes'>z9EC</model> + <model usable='yes'>zBC12</model> + <model usable='yes'>z9EC.3</model> + <model usable='yes'>z196.2-base</model> + <model usable='no'>qemu</model> + <model usable='yes'>zEC12.2-base</model> + <model usable='yes'>z800-base</model> + <model usable='yes'>z9EC.2</model> + <model usable='yes'>z900.2-base</model> + <model usable='yes'>z900.3</model> + <model usable='yes'>z890-base</model> + <model usable='yes'>z890</model> + <model usable='yes'>z990.4-base</model> + <model usable='yes'>z10BC.2-base</model> + <model usable='yes'>z900.2</model> + <model usable='yes'>z9BC.2-base</model> + <model usable='yes'>z800</model> + <model usable='yes'>z114</model> + <model usable='yes'>z13</model> + <model usable='yes'>z13s-base</model> + <model usable='yes'>z990</model> + <model usable='yes'>z990.2</model> + <model usable='yes'>z14-base</model> + <model usable='yes'>z890.2-base</model> + <model usable='yes'>z196</model> + <model usable='yes'>z10EC</model> + <model usable='yes'>z13s</model> + <model usable='yes'>z900</model> + <model usable='yes'>z10EC.3</model> + <model usable='yes'>z10EC.2-base</model> + <model usable='yes'>z114-base</model> + <model usable='yes'>z990.2-base</model> + <model usable='yes'>z9EC.2-base</model> + <model usable='yes'>z890.3</model> + <model usable='yes'>z900.3-base</model> + <model usable='yes'>z9BC.2</model> + <model usable='yes'>z10BC</model> + <model usable='yes'>z990.5</model> + <model usable='yes'>zEC12.2</model> + <model usable='yes'>z10EC-base</model> + <model usable='yes'>z9EC-base</model> + <model usable='yes'>z9EC.3-base</model> + <model usable='yes'>zEC12</model> + <model usable='yes'>z990.5-base</model> + <model usable='yes'>z10BC-base</model> + <model usable='yes'>z900-base</model> + <model usable='yes'>z13.2</model> + <model usable='yes'>z890.3-base</model> + <model usable='yes'>zBC12-base</model> + <model usable='yes'>z13.2-base</model> + <model usable='yes'>z990-base</model> + <model usable='yes'>z10EC.2</model> + <model usable='yes'>z9BC</model> + <model usable='yes'>z10EC.3-base</model> + <model usable='yes'>z990.3-base</model> + </mode> </cpu> <devices> <disk supported='yes'> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies index a93e5984c6..29c3403550 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies @@ -2,14 +2,13 @@ "QMP": { "version": { "qemu": { - "micro": 90, - "minor": 11, + "micro": 0, + "minor": 12, "major": 2 }, - "package": "v2.12.0-rc0" + "package": "" }, "capabilities": [ - "oob" ] } } @@ -23,11 +22,11 @@ { "return": { "qemu": { - "micro": 90, - "minor": 11, + "micro": 0, + "minor": 12, "major": 2 }, - "package": "v2.12.0-rc0" + "package": "" }, "id": "libvirt-2" } @@ -530,7 +529,7 @@ { "return": { - "fd": 17, + "fd": 18, "fdset-id": 0 }, "id": "libvirt-5" @@ -546,7 +545,7 @@ { "return": { - "enabled": false, + "enabled": true, "present": true }, "id": "libvirt-7" @@ -1241,10 +1240,6 @@ "name": "fw_cfg_io", "parent": "fw_cfg" }, - { - "name": "chardev-file", - "parent": "chardev-fd" - }, { "name": "s390-ccw-virtio-2.10-machine", "parent": "s390-ccw-machine" @@ -1258,8 +1253,8 @@ "parent": "s390x-cpu" }, { - "name": "chardev-braille", - "parent": "chardev" + "name": "chardev-file", + "parent": "chardev-fd" }, { "name": "chardev-wctablet", @@ -2904,102 +2899,93 @@ { "return": [ { - "name": "serial", - "type": "str" - }, - { - "name": "port_index", + "name": "min_io_size", "type": "uint16" }, { - "name": "dpofua", + "name": "removable", "description": "on/off", "type": "bool" }, { - "name": "bootindex", - "type": "int32" - }, - { - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" + "name": "channel", + "type": "uint32" }, { - "name": "discard_granularity", - "type": "uint32" + "name": "serial", + "type": "str" }, { "name": "lun", "type": "uint32" }, { - "name": "max_unmap_size", - "type": "uint64" + "name": "dpofua", + "description": "on/off", + "type": "bool" }, { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", + "name": "ver", "type": "str" }, { - "name": "port_wwn", - "type": "uint64" - }, - { - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "share-rw", - "type": "bool" - }, - { - "name": "opt_io_size", + "name": "scsi-id", "type": "uint32" }, { - "name": "min_io_size", + "name": "logical_block_size", + "description": "A power of two between 512 and 32768", "type": "uint16" }, { - "name": "product", + "name": "drive", + "description": "Node name or ID of a block device to use as a backend", "type": "str" }, { - "name": "scsi-id", - "type": "uint32" + "name": "scsi_version", + "type": "int32" }, { - "name": "channel", + "name": "werror", + "description": "Error handling policy, report/ignore/enospc/stop/auto", + "type": "BlockdevOnError" + }, + { + "name": "discard_granularity", "type": "uint32" }, { - "name": "vendor", - "type": "str" + "name": "port_wwn", + "type": "uint64" }, { - "name": "wwn", + "name": "max_unmap_size", "type": "uint64" }, { - "name": "werror", + "name": "rerror", "description": "Error handling policy, report/ignore/enospc/stop/auto", "type": "BlockdevOnError" }, { - "name": "removable", - "description": "on/off", + "name": "max_io_size", + "type": "uint64" + }, + { + "name": "wwn", + "type": "uint64" + }, + { + "name": "share-rw", "type": "bool" }, { - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" + "name": "product", + "type": "str" }, { - "name": "ver", + "name": "vendor", "type": "str" }, { @@ -3008,8 +2994,21 @@ "type": "uint16" }, { - "name": "max_io_size", - "type": "uint64" + "name": "port_index", + "type": "uint16" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "write-cache", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "name": "opt_io_size", + "type": "uint32" } ], "id": "libvirt-20" @@ -3747,18 +3746,6 @@ "name": "z890.2", "typename": "z890.2-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "hfpm" ], "static": false, "migration-safe": true @@ -3767,18 +3754,6 @@ "name": "z990.4", "typename": "z990.4-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "hfpm" ], "static": false, "migration-safe": true @@ -3787,32 +3762,6 @@ "name": "z10BC.2", "typename": "z10BC.2-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "cmm", - "dateh2", - "sthyi", - "pfpo", - "dfphp", - "dfp", - "parseh", - "hfpue", - "hfpm", - "csske", - "edat", - "asnlxr", - "msa2", - "msa1", - "tods" ], "static": false, "migration-safe": true @@ -3821,122 +3770,6 @@ "name": "z196.2", "typename": "z196.2-s390x-cpu", "unavailable-features": [ - "pcc-xts-eaes-256", - "pcc-xts-eaes-128", - "pcc-xts-aes-256", - "pcc-xts-aes-128", - "pcc-cmac-eaes-256", - "pcc-cmac-eaes-192", - "pcc-cmac-eaes-128", - "pcc-cmac-eaes-256", - "pcc-cmac-aes-192", - "pcc-cmac-aes-128", - "pcc-cmac-etdea-192", - "pcc-cmac-etdea-128", - "pcc-cmac-edea", - "pcc-cmac-tdea-192", - "pcc-cmac-tdea-128", - "pcc-cmac-dea", - "kmo-eaes-256", - "kmo-eaes-192", - "kmo-eaes-128", - "kmo-aes-256", - "kmo-aes-192", - "kmo-aes-128", - "kmo-etdea-192", - "kmo-etdea-128", - "kmo-edea", - "kmo-tdea-192", - "kmo-tdea-128", - "kmo-dea", - "kmf-eaes-256", - "kmf-eaes-192", - "kmf-eaes-128", - "kmf-aes-256", - "kmf-aes-192", - "kmf-aes-128", - "kmf-etdea-192", - "kmf-etdea-128", - "kmf-edea", - "kmf-tdea-192", - "kmf-tdea-128", - "kmf-dea", - "kmctr-eaes-256", - "kmctr-eaes-192", - "kmctr-eaes-128", - "kmctr-aes-256", - "kmctr-aes-192", - "kmctr-aes-128", - "kmctr-etdea-192", - "kmctr-etdea-128", - "kmctr-edea", - "kmctr-tdea-192", - "kmctr-tdea-128", - "kmctr-dea", - "pckmo-aes-256", - "pckmo-aes-192", - "pckmo-aes-128", - "pckmo-etdea-192", - "pckmo-etdea-128", - "pckmo-edea", - "klmd-sha-1", - "kimd-ghash", - "kimd-sha-1", - "km-xts-eaes-256", - "km-xts-eaes-128", - "km-xts-aes-256", - "km-xts-aes-128", - "km-eaes-256", - "km-eaes-192", - "km-eaes-128", - "km-etdea-192", - "km-etdea-128", - "km-edea", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-eaes-256", - "kmc-eaes-192", - "kmc-eaes-128", - "kmc-etdea-192", - "kmc-etdea-128", - "kmc-edea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-eaes-256", - "kmac-eaes-192", - "kmac-eaes-128", - "kmac-aes-256", - "kmac-aes-192", - "kmac-aes-128", - "kmac-etdea-192", - "kmac-etdea-128", - "kmac-edea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "cmm", - "dateh2", - "aefsi", - "sthyi", - "cmpsceh", - "pfpo", - "dfphp", - "dfp", - "fpe", - "emon", - "parseh", - "hfpue", - "hfpm", - "nonqks", - "ipter", - "csske", - "edat", - "asnlxr", - "msa2", - "msa1", - "tods" ], "static": false, "migration-safe": true @@ -3945,152 +3778,6 @@ "name": "z14", "typename": "z14-s390x-cpu", "unavailable-features": [ - "kma-gcm-eaes-256", - "kma-gcm-eaes-192", - "kma-gcm-eaes-128", - "kma-gcm-aes-256", - "kma-gcm-aes-192", - "kma-gcm-aes-128", - "ppno-sha-512-drng", - "pcc-xts-eaes-256", - "pcc-xts-eaes-128", - "pcc-xts-aes-256", - "pcc-xts-aes-128", - "pcc-cmac-eaes-256", - "pcc-cmac-eaes-192", - "pcc-cmac-eaes-128", - "pcc-cmac-eaes-256", - "pcc-cmac-aes-192", - "pcc-cmac-aes-128", - "pcc-cmac-etdea-192", - "pcc-cmac-etdea-128", - "pcc-cmac-edea", - "pcc-cmac-tdea-192", - "pcc-cmac-tdea-128", - "pcc-cmac-dea", - "kmo-eaes-256", - "kmo-eaes-192", - "kmo-eaes-128", - "kmo-aes-256", - "kmo-aes-192", - "kmo-aes-128", - "kmo-etdea-192", - "kmo-etdea-128", - "kmo-edea", - "kmo-tdea-192", - "kmo-tdea-128", - "kmo-dea", - "kmf-eaes-256", - "kmf-eaes-192", - "kmf-eaes-128", - "kmf-aes-256", - "kmf-aes-192", - "kmf-aes-128", - "kmf-etdea-192", - "kmf-etdea-128", - "kmf-edea", - "kmf-tdea-192", - "kmf-tdea-128", - "kmf-dea", - "kmctr-eaes-256", - "kmctr-eaes-192", - "kmctr-eaes-128", - "kmctr-aes-256", - "kmctr-aes-192", - "kmctr-aes-128", - "kmctr-etdea-192", - "kmctr-etdea-128", - "kmctr-edea", - "kmctr-tdea-192", - "kmctr-tdea-128", - "kmctr-dea", - "pckmo-aes-256", - "pckmo-aes-192", - "pckmo-aes-128", - "pckmo-etdea-192", - "pckmo-etdea-128", - "pckmo-edea", - "klmd-sha-1", - "kimd-ghash", - "kimd-sha-1", - "km-xts-eaes-256", - "km-xts-eaes-128", - "km-xts-aes-256", - "km-xts-aes-128", - "km-eaes-256", - "km-eaes-192", - "km-eaes-128", - "km-etdea-192", - "km-etdea-128", - "km-edea", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-eaes-256", - "kmc-eaes-192", - "kmc-eaes-128", - "kmc-etdea-192", - "kmc-etdea-128", - "kmc-edea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-eaes-256", - "kmac-eaes-192", - "kmac-eaes-128", - "kmac-aes-256", - "kmac-aes-192", - "kmac-aes-128", - "kmac-etdea-192", - "kmac-etdea-128", - "kmac-edea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "cmm", - "dateh2", - "esop", - "msa8-base", - "vxeh", - "vxpd", - "gs", - "sea_esop2", - "iep", - "vx", - "dfppc", - "edat2", - "aefsi", - "sthyi", - "te", - "ri", - "tsi", - "sema", - "minste2", - "eec", - "cte", - "dfpzc", - "cmpsceh", - "pfpo", - "dfphp", - "dfp", - "opc", - "fpe", - "emon", - "parseh", - "hfpue", - "hfpm", - "nonqks", - "ipter", - "csske", - "edat", - "asnlxr", - "msa7", - "msa6", - "msa2", - "msa1", - "gen13ptff", - "tods", - "type" ], "static": false, "migration-safe": true @@ -4099,22 +3786,6 @@ "name": "z9BC-base", "typename": "z9BC-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "dateh2", - "hfpue", - "hfpm", - "asnlxr", - "tods" ], "static": true, "migration-safe": true @@ -4123,32 +3794,6 @@ "name": "zEC12-base", "typename": "zEC12-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "dateh2", - "dfpzc", - "cmpsceh", - "pfpo", - "dfphp", - "dfp", - "fpe", - "emon", - "parseh", - "hfpue", - "hfpm", - "nonqks", - "csske", - "asnlxr", - "tods" ], "static": true, "migration-safe": true @@ -4157,31 +3802,6 @@ "name": "z196-base", "typename": "z196-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "dateh2", - "cmpsceh", - "pfpo", - "dfphp", - "dfp", - "fpe", - "emon", - "parseh", - "hfpue", - "hfpm", - "nonqks", - "csske", - "asnlxr", - "tods" ], "static": true, "migration-safe": true @@ -4190,35 +3810,6 @@ "name": "z13-base", "typename": "z13-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "dateh2", - "dfppc", - "dfpzc", - "cmpsceh", - "pfpo", - "dfphp", - "dfp", - "fpe", - "emon", - "parseh", - "hfpue", - "hfpm", - "nonqks", - "csske", - "asnlxr", - "gen13ptff", - "tods", - "type" ], "static": true, "migration-safe": true @@ -4227,18 +3818,6 @@ "name": "z990.3", "typename": "z990.3-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "hfpm" ], "static": false, "migration-safe": true @@ -4246,6 +3825,8 @@ { "name": "host", "typename": "host-s390x-cpu", + "unavailable-features": [ + ], "static": false, "migration-safe": false }, @@ -4253,25 +3834,6 @@ "name": "z9EC", "typename": "z9EC-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "cmm", - "dateh2", - "sthyi", - "hfpue", - "hfpm", - "asnlxr", - "msa1", - "tods" ], "static": false, "migration-safe": true @@ -4280,129 +3842,6 @@ "name": "zBC12", "typename": "zBC12-s390x-cpu", "unavailable-features": [ - "pcc-xts-eaes-256", - "pcc-xts-eaes-128", - "pcc-xts-aes-256", - "pcc-xts-aes-128", - "pcc-cmac-eaes-256", - "pcc-cmac-eaes-192", - "pcc-cmac-eaes-128", - "pcc-cmac-eaes-256", - "pcc-cmac-aes-192", - "pcc-cmac-aes-128", - "pcc-cmac-etdea-192", - "pcc-cmac-etdea-128", - "pcc-cmac-edea", - "pcc-cmac-tdea-192", - "pcc-cmac-tdea-128", - "pcc-cmac-dea", - "kmo-eaes-256", - "kmo-eaes-192", - "kmo-eaes-128", - "kmo-aes-256", - "kmo-aes-192", - "kmo-aes-128", - "kmo-etdea-192", - "kmo-etdea-128", - "kmo-edea", - "kmo-tdea-192", - "kmo-tdea-128", - "kmo-dea", - "kmf-eaes-256", - "kmf-eaes-192", - "kmf-eaes-128", - "kmf-aes-256", - "kmf-aes-192", - "kmf-aes-128", - "kmf-etdea-192", - "kmf-etdea-128", - "kmf-edea", - "kmf-tdea-192", - "kmf-tdea-128", - "kmf-dea", - "kmctr-eaes-256", - "kmctr-eaes-192", - "kmctr-eaes-128", - "kmctr-aes-256", - "kmctr-aes-192", - "kmctr-aes-128", - "kmctr-etdea-192", - "kmctr-etdea-128", - "kmctr-edea", - "kmctr-tdea-192", - "kmctr-tdea-128", - "kmctr-dea", - "pckmo-aes-256", - "pckmo-aes-192", - "pckmo-aes-128", - "pckmo-etdea-192", - "pckmo-etdea-128", - "pckmo-edea", - "klmd-sha-1", - "kimd-ghash", - "kimd-sha-1", - "km-xts-eaes-256", - "km-xts-eaes-128", - "km-xts-aes-256", - "km-xts-aes-128", - "km-eaes-256", - "km-eaes-192", - "km-eaes-128", - "km-etdea-192", - "km-etdea-128", - "km-edea", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-eaes-256", - "kmc-eaes-192", - "kmc-eaes-128", - "kmc-etdea-192", - "kmc-etdea-128", - "kmc-edea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-eaes-256", - "kmac-eaes-192", - "kmac-eaes-128", - "kmac-aes-256", - "kmac-aes-192", - "kmac-aes-128", - "kmac-etdea-192", - "kmac-etdea-128", - "kmac-edea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "cmm", - "dateh2", - "esop", - "sea_esop2", - "edat2", - "aefsi", - "sthyi", - "te", - "ri", - "cte", - "dfpzc", - "cmpsceh", - "pfpo", - "dfphp", - "dfp", - "fpe", - "emon", - "parseh", - "hfpue", - "hfpm", - "nonqks", - "ipter", - "csske", - "edat", - "asnlxr", - "msa2", - "msa1", - "tods" ], "static": false, "migration-safe": true @@ -4411,25 +3850,6 @@ "name": "z9EC.3", "typename": "z9EC.3-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "cmm", - "dateh2", - "sthyi", - "hfpue", - "hfpm", - "asnlxr", - "msa1", - "tods" ], "static": false, "migration-safe": true @@ -4438,31 +3858,6 @@ "name": "z196.2-base", "typename": "z196.2-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "dateh2", - "cmpsceh", - "pfpo", - "dfphp", - "dfp", - "fpe", - "emon", - "parseh", - "hfpue", - "hfpm", - "nonqks", - "csske", - "asnlxr", - "tods" ], "static": true, "migration-safe": true @@ -4471,6 +3866,7 @@ "name": "qemu", "typename": "qemu-s390x-cpu", "unavailable-features": [ + "ais" ], "static": false, "migration-safe": true @@ -4479,32 +3875,6 @@ "name": "zEC12.2-base", "typename": "zEC12.2-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "dateh2", - "dfpzc", - "cmpsceh", - "pfpo", - "dfphp", - "dfp", - "fpe", - "emon", - "parseh", - "hfpue", - "hfpm", - "nonqks", - "csske", - "asnlxr", - "tods" ], "static": true, "migration-safe": true @@ -4521,25 +3891,6 @@ "name": "z9EC.2", "typename": "z9EC.2-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "cmm", - "dateh2", - "sthyi", - "hfpue", - "hfpm", - "asnlxr", - "msa1", - "tods" ], "static": false, "migration-safe": true @@ -4564,18 +3915,6 @@ "name": "z890-base", "typename": "z890-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "hfpm" ], "static": true, "migration-safe": true @@ -4584,18 +3923,6 @@ "name": "z890", "typename": "z890-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "hfpm" ], "static": false, "migration-safe": true @@ -4604,18 +3931,6 @@ "name": "z990.4-base", "typename": "z990.4-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "hfpm" ], "static": true, "migration-safe": true @@ -4624,27 +3939,6 @@ "name": "z10BC.2-base", "typename": "z10BC.2-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "dateh2", - "pfpo", - "dfphp", - "dfp", - "parseh", - "hfpue", - "hfpm", - "csske", - "asnlxr", - "tods" ], "static": true, "migration-safe": true @@ -4661,22 +3955,6 @@ "name": "z9BC.2-base", "typename": "z9BC.2-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "dateh2", - "hfpue", - "hfpm", - "asnlxr", - "tods" ], "static": true, "migration-safe": true @@ -4693,122 +3971,6 @@ "name": "z114", "typename": "z114-s390x-cpu", "unavailable-features": [ - "pcc-xts-eaes-256", - "pcc-xts-eaes-128", - "pcc-xts-aes-256", - "pcc-xts-aes-128", - "pcc-cmac-eaes-256", - "pcc-cmac-eaes-192", - "pcc-cmac-eaes-128", - "pcc-cmac-eaes-256", - "pcc-cmac-aes-192", - "pcc-cmac-aes-128", - "pcc-cmac-etdea-192", - "pcc-cmac-etdea-128", - "pcc-cmac-edea", - "pcc-cmac-tdea-192", - "pcc-cmac-tdea-128", - "pcc-cmac-dea", - "kmo-eaes-256", - "kmo-eaes-192", - "kmo-eaes-128", - "kmo-aes-256", - "kmo-aes-192", - "kmo-aes-128", - "kmo-etdea-192", - "kmo-etdea-128", - "kmo-edea", - "kmo-tdea-192", - "kmo-tdea-128", - "kmo-dea", - "kmf-eaes-256", - "kmf-eaes-192", - "kmf-eaes-128", - "kmf-aes-256", - "kmf-aes-192", - "kmf-aes-128", - "kmf-etdea-192", - "kmf-etdea-128", - "kmf-edea", - "kmf-tdea-192", - "kmf-tdea-128", - "kmf-dea", - "kmctr-eaes-256", - "kmctr-eaes-192", - "kmctr-eaes-128", - "kmctr-aes-256", - "kmctr-aes-192", - "kmctr-aes-128", - "kmctr-etdea-192", - "kmctr-etdea-128", - "kmctr-edea", - "kmctr-tdea-192", - "kmctr-tdea-128", - "kmctr-dea", - "pckmo-aes-256", - "pckmo-aes-192", - "pckmo-aes-128", - "pckmo-etdea-192", - "pckmo-etdea-128", - "pckmo-edea", - "klmd-sha-1", - "kimd-ghash", - "kimd-sha-1", - "km-xts-eaes-256", - "km-xts-eaes-128", - "km-xts-aes-256", - "km-xts-aes-128", - "km-eaes-256", - "km-eaes-192", - "km-eaes-128", - "km-etdea-192", - "km-etdea-128", - "km-edea", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-eaes-256", - "kmc-eaes-192", - "kmc-eaes-128", - "kmc-etdea-192", - "kmc-etdea-128", - "kmc-edea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-eaes-256", - "kmac-eaes-192", - "kmac-eaes-128", - "kmac-aes-256", - "kmac-aes-192", - "kmac-aes-128", - "kmac-etdea-192", - "kmac-etdea-128", - "kmac-edea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "cmm", - "dateh2", - "aefsi", - "sthyi", - "cmpsceh", - "pfpo", - "dfphp", - "dfp", - "fpe", - "emon", - "parseh", - "hfpue", - "hfpm", - "nonqks", - "ipter", - "csske", - "edat", - "asnlxr", - "msa2", - "msa1", - "tods" ], "static": false, "migration-safe": true @@ -4817,134 +3979,6 @@ "name": "z13", "typename": "z13-s390x-cpu", "unavailable-features": [ - "ppno-sha-512-drng", - "pcc-xts-eaes-256", - "pcc-xts-eaes-128", - "pcc-xts-aes-256", - "pcc-xts-aes-128", - "pcc-cmac-eaes-256", - "pcc-cmac-eaes-192", - "pcc-cmac-eaes-128", - "pcc-cmac-eaes-256", - "pcc-cmac-aes-192", - "pcc-cmac-aes-128", - "pcc-cmac-etdea-192", - "pcc-cmac-etdea-128", - "pcc-cmac-edea", - "pcc-cmac-tdea-192", - "pcc-cmac-tdea-128", - "pcc-cmac-dea", - "kmo-eaes-256", - "kmo-eaes-192", - "kmo-eaes-128", - "kmo-aes-256", - "kmo-aes-192", - "kmo-aes-128", - "kmo-etdea-192", - "kmo-etdea-128", - "kmo-edea", - "kmo-tdea-192", - "kmo-tdea-128", - "kmo-dea", - "kmf-eaes-256", - "kmf-eaes-192", - "kmf-eaes-128", - "kmf-aes-256", - "kmf-aes-192", - "kmf-aes-128", - "kmf-etdea-192", - "kmf-etdea-128", - "kmf-edea", - "kmf-tdea-192", - "kmf-tdea-128", - "kmf-dea", - "kmctr-eaes-256", - "kmctr-eaes-192", - "kmctr-eaes-128", - "kmctr-aes-256", - "kmctr-aes-192", - "kmctr-aes-128", - "kmctr-etdea-192", - "kmctr-etdea-128", - "kmctr-edea", - "kmctr-tdea-192", - "kmctr-tdea-128", - "kmctr-dea", - "pckmo-aes-256", - "pckmo-aes-192", - "pckmo-aes-128", - "pckmo-etdea-192", - "pckmo-etdea-128", - "pckmo-edea", - "klmd-sha-1", - "kimd-ghash", - "kimd-sha-1", - "km-xts-eaes-256", - "km-xts-eaes-128", - "km-xts-aes-256", - "km-xts-aes-128", - "km-eaes-256", - "km-eaes-192", - "km-eaes-128", - "km-etdea-192", - "km-etdea-128", - "km-edea", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-eaes-256", - "kmc-eaes-192", - "kmc-eaes-128", - "kmc-etdea-192", - "kmc-etdea-128", - "kmc-edea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-eaes-256", - "kmac-eaes-192", - "kmac-eaes-128", - "kmac-aes-256", - "kmac-aes-192", - "kmac-aes-128", - "kmac-etdea-192", - "kmac-etdea-128", - "kmac-edea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "cmm", - "dateh2", - "esop", - "sea_esop2", - "vx", - "dfppc", - "edat2", - "aefsi", - "sthyi", - "te", - "ri", - "cte", - "dfpzc", - "cmpsceh", - "pfpo", - "dfphp", - "dfp", - "fpe", - "emon", - "parseh", - "hfpue", - "hfpm", - "nonqks", - "ipter", - "csske", - "edat", - "asnlxr", - "msa2", - "msa1", - "gen13ptff", - "tods", - "type" ], "static": false, "migration-safe": true @@ -4953,35 +3987,6 @@ "name": "z13s-base", "typename": "z13s-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "dateh2", - "dfppc", - "dfpzc", - "cmpsceh", - "pfpo", - "dfphp", - "dfp", - "fpe", - "emon", - "parseh", - "hfpue", - "hfpm", - "nonqks", - "csske", - "asnlxr", - "gen13ptff", - "tods", - "type" ], "static": true, "migration-safe": true @@ -4990,18 +3995,6 @@ "name": "z990", "typename": "z990-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "hfpm" ], "static": false, "migration-safe": true @@ -5010,18 +4003,6 @@ "name": "z990.2", "typename": "z990.2-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "hfpm" ], "static": false, "migration-safe": true @@ -5030,40 +4011,6 @@ "name": "z14-base", "typename": "z14-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "dateh2", - "dfppc", - "tsi", - "sema", - "minste2", - "eec", - "dfpzc", - "cmpsceh", - "pfpo", - "dfphp", - "dfp", - "opc", - "fpe", - "emon", - "parseh", - "hfpue", - "hfpm", - "nonqks", - "csske", - "asnlxr", - "gen13ptff", - "tods", - "type" ], "static": true, "migration-safe": true @@ -5072,18 +4019,6 @@ "name": "z890.2-base", "typename": "z890.2-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "hfpm" ], "static": true, "migration-safe": true @@ -5092,122 +4027,6 @@ "name": "z196", "typename": "z196-s390x-cpu", "unavailable-features": [ - "pcc-xts-eaes-256", - "pcc-xts-eaes-128", - "pcc-xts-aes-256", - "pcc-xts-aes-128", - "pcc-cmac-eaes-256", - "pcc-cmac-eaes-192", - "pcc-cmac-eaes-128", - "pcc-cmac-eaes-256", - "pcc-cmac-aes-192", - "pcc-cmac-aes-128", - "pcc-cmac-etdea-192", - "pcc-cmac-etdea-128", - "pcc-cmac-edea", - "pcc-cmac-tdea-192", - "pcc-cmac-tdea-128", - "pcc-cmac-dea", - "kmo-eaes-256", - "kmo-eaes-192", - "kmo-eaes-128", - "kmo-aes-256", - "kmo-aes-192", - "kmo-aes-128", - "kmo-etdea-192", - "kmo-etdea-128", - "kmo-edea", - "kmo-tdea-192", - "kmo-tdea-128", - "kmo-dea", - "kmf-eaes-256", - "kmf-eaes-192", - "kmf-eaes-128", - "kmf-aes-256", - "kmf-aes-192", - "kmf-aes-128", - "kmf-etdea-192", - "kmf-etdea-128", - "kmf-edea", - "kmf-tdea-192", - "kmf-tdea-128", - "kmf-dea", - "kmctr-eaes-256", - "kmctr-eaes-192", - "kmctr-eaes-128", - "kmctr-aes-256", - "kmctr-aes-192", - "kmctr-aes-128", - "kmctr-etdea-192", - "kmctr-etdea-128", - "kmctr-edea", - "kmctr-tdea-192", - "kmctr-tdea-128", - "kmctr-dea", - "pckmo-aes-256", - "pckmo-aes-192", - "pckmo-aes-128", - "pckmo-etdea-192", - "pckmo-etdea-128", - "pckmo-edea", - "klmd-sha-1", - "kimd-ghash", - "kimd-sha-1", - "km-xts-eaes-256", - "km-xts-eaes-128", - "km-xts-aes-256", - "km-xts-aes-128", - "km-eaes-256", - "km-eaes-192", - "km-eaes-128", - "km-etdea-192", - "km-etdea-128", - "km-edea", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-eaes-256", - "kmc-eaes-192", - "kmc-eaes-128", - "kmc-etdea-192", - "kmc-etdea-128", - "kmc-edea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-eaes-256", - "kmac-eaes-192", - "kmac-eaes-128", - "kmac-aes-256", - "kmac-aes-192", - "kmac-aes-128", - "kmac-etdea-192", - "kmac-etdea-128", - "kmac-edea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "cmm", - "dateh2", - "aefsi", - "sthyi", - "cmpsceh", - "pfpo", - "dfphp", - "dfp", - "fpe", - "emon", - "parseh", - "hfpue", - "hfpm", - "nonqks", - "ipter", - "csske", - "edat", - "asnlxr", - "msa2", - "msa1", - "tods" ], "static": false, "migration-safe": true @@ -5216,32 +4035,6 @@ "name": "z10EC", "typename": "z10EC-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "cmm", - "dateh2", - "sthyi", - "pfpo", - "dfphp", - "dfp", - "parseh", - "hfpue", - "hfpm", - "csske", - "edat", - "asnlxr", - "msa2", - "msa1", - "tods" ], "static": false, "migration-safe": true @@ -5250,134 +4043,6 @@ "name": "z13s", "typename": "z13s-s390x-cpu", "unavailable-features": [ - "ppno-sha-512-drng", - "pcc-xts-eaes-256", - "pcc-xts-eaes-128", - "pcc-xts-aes-256", - "pcc-xts-aes-128", - "pcc-cmac-eaes-256", - "pcc-cmac-eaes-192", - "pcc-cmac-eaes-128", - "pcc-cmac-eaes-256", - "pcc-cmac-aes-192", - "pcc-cmac-aes-128", - "pcc-cmac-etdea-192", - "pcc-cmac-etdea-128", - "pcc-cmac-edea", - "pcc-cmac-tdea-192", - "pcc-cmac-tdea-128", - "pcc-cmac-dea", - "kmo-eaes-256", - "kmo-eaes-192", - "kmo-eaes-128", - "kmo-aes-256", - "kmo-aes-192", - "kmo-aes-128", - "kmo-etdea-192", - "kmo-etdea-128", - "kmo-edea", - "kmo-tdea-192", - "kmo-tdea-128", - "kmo-dea", - "kmf-eaes-256", - "kmf-eaes-192", - "kmf-eaes-128", - "kmf-aes-256", - "kmf-aes-192", - "kmf-aes-128", - "kmf-etdea-192", - "kmf-etdea-128", - "kmf-edea", - "kmf-tdea-192", - "kmf-tdea-128", - "kmf-dea", - "kmctr-eaes-256", - "kmctr-eaes-192", - "kmctr-eaes-128", - "kmctr-aes-256", - "kmctr-aes-192", - "kmctr-aes-128", - "kmctr-etdea-192", - "kmctr-etdea-128", - "kmctr-edea", - "kmctr-tdea-192", - "kmctr-tdea-128", - "kmctr-dea", - "pckmo-aes-256", - "pckmo-aes-192", - "pckmo-aes-128", - "pckmo-etdea-192", - "pckmo-etdea-128", - "pckmo-edea", - "klmd-sha-1", - "kimd-ghash", - "kimd-sha-1", - "km-xts-eaes-256", - "km-xts-eaes-128", - "km-xts-aes-256", - "km-xts-aes-128", - "km-eaes-256", - "km-eaes-192", - "km-eaes-128", - "km-etdea-192", - "km-etdea-128", - "km-edea", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-eaes-256", - "kmc-eaes-192", - "kmc-eaes-128", - "kmc-etdea-192", - "kmc-etdea-128", - "kmc-edea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-eaes-256", - "kmac-eaes-192", - "kmac-eaes-128", - "kmac-aes-256", - "kmac-aes-192", - "kmac-aes-128", - "kmac-etdea-192", - "kmac-etdea-128", - "kmac-edea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "cmm", - "dateh2", - "esop", - "sea_esop2", - "vx", - "dfppc", - "edat2", - "aefsi", - "sthyi", - "te", - "ri", - "cte", - "dfpzc", - "cmpsceh", - "pfpo", - "dfphp", - "dfp", - "fpe", - "emon", - "parseh", - "hfpue", - "hfpm", - "nonqks", - "ipter", - "csske", - "edat", - "asnlxr", - "msa2", - "msa1", - "gen13ptff", - "tods", - "type" ], "static": false, "migration-safe": true @@ -5394,32 +4059,6 @@ "name": "z10EC.3", "typename": "z10EC.3-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "cmm", - "dateh2", - "sthyi", - "pfpo", - "dfphp", - "dfp", - "parseh", - "hfpue", - "hfpm", - "csske", - "edat", - "asnlxr", - "msa2", - "msa1", - "tods" ], "static": false, "migration-safe": true @@ -5428,27 +4067,6 @@ "name": "z10EC.2-base", "typename": "z10EC.2-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "dateh2", - "pfpo", - "dfphp", - "dfp", - "parseh", - "hfpue", - "hfpm", - "csske", - "asnlxr", - "tods" ], "static": true, "migration-safe": true @@ -5457,31 +4075,6 @@ "name": "z114-base", "typename": "z114-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "dateh2", - "cmpsceh", - "pfpo", - "dfphp", - "dfp", - "fpe", - "emon", - "parseh", - "hfpue", - "hfpm", - "nonqks", - "csske", - "asnlxr", - "tods" ], "static": true, "migration-safe": true @@ -5490,18 +4083,6 @@ "name": "z990.2-base", "typename": "z990.2-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "hfpm" ], "static": true, "migration-safe": true @@ -5510,22 +4091,6 @@ "name": "z9EC.2-base", "typename": "z9EC.2-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "dateh2", - "hfpue", - "hfpm", - "asnlxr", - "tods" ], "static": true, "migration-safe": true @@ -5534,18 +4099,6 @@ "name": "z890.3", "typename": "z890.3-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "hfpm" ], "static": false, "migration-safe": true @@ -5562,25 +4115,6 @@ "name": "z9BC.2", "typename": "z9BC.2-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "cmm", - "dateh2", - "sthyi", - "hfpue", - "hfpm", - "asnlxr", - "msa1", - "tods" ], "static": false, "migration-safe": true @@ -5589,32 +4123,6 @@ "name": "z10BC", "typename": "z10BC-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "cmm", - "dateh2", - "sthyi", - "pfpo", - "dfphp", - "dfp", - "parseh", - "hfpue", - "hfpm", - "csske", - "edat", - "asnlxr", - "msa2", - "msa1", - "tods" ], "static": false, "migration-safe": true @@ -5623,18 +4131,6 @@ "name": "z990.5", "typename": "z990.5-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "hfpm" ], "static": false, "migration-safe": true @@ -5643,129 +4139,6 @@ "name": "zEC12.2", "typename": "zEC12.2-s390x-cpu", "unavailable-features": [ - "pcc-xts-eaes-256", - "pcc-xts-eaes-128", - "pcc-xts-aes-256", - "pcc-xts-aes-128", - "pcc-cmac-eaes-256", - "pcc-cmac-eaes-192", - "pcc-cmac-eaes-128", - "pcc-cmac-eaes-256", - "pcc-cmac-aes-192", - "pcc-cmac-aes-128", - "pcc-cmac-etdea-192", - "pcc-cmac-etdea-128", - "pcc-cmac-edea", - "pcc-cmac-tdea-192", - "pcc-cmac-tdea-128", - "pcc-cmac-dea", - "kmo-eaes-256", - "kmo-eaes-192", - "kmo-eaes-128", - "kmo-aes-256", - "kmo-aes-192", - "kmo-aes-128", - "kmo-etdea-192", - "kmo-etdea-128", - "kmo-edea", - "kmo-tdea-192", - "kmo-tdea-128", - "kmo-dea", - "kmf-eaes-256", - "kmf-eaes-192", - "kmf-eaes-128", - "kmf-aes-256", - "kmf-aes-192", - "kmf-aes-128", - "kmf-etdea-192", - "kmf-etdea-128", - "kmf-edea", - "kmf-tdea-192", - "kmf-tdea-128", - "kmf-dea", - "kmctr-eaes-256", - "kmctr-eaes-192", - "kmctr-eaes-128", - "kmctr-aes-256", - "kmctr-aes-192", - "kmctr-aes-128", - "kmctr-etdea-192", - "kmctr-etdea-128", - "kmctr-edea", - "kmctr-tdea-192", - "kmctr-tdea-128", - "kmctr-dea", - "pckmo-aes-256", - "pckmo-aes-192", - "pckmo-aes-128", - "pckmo-etdea-192", - "pckmo-etdea-128", - "pckmo-edea", - "klmd-sha-1", - "kimd-ghash", - "kimd-sha-1", - "km-xts-eaes-256", - "km-xts-eaes-128", - "km-xts-aes-256", - "km-xts-aes-128", - "km-eaes-256", - "km-eaes-192", - "km-eaes-128", - "km-etdea-192", - "km-etdea-128", - "km-edea", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-eaes-256", - "kmc-eaes-192", - "kmc-eaes-128", - "kmc-etdea-192", - "kmc-etdea-128", - "kmc-edea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-eaes-256", - "kmac-eaes-192", - "kmac-eaes-128", - "kmac-aes-256", - "kmac-aes-192", - "kmac-aes-128", - "kmac-etdea-192", - "kmac-etdea-128", - "kmac-edea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "cmm", - "dateh2", - "esop", - "sea_esop2", - "edat2", - "aefsi", - "sthyi", - "te", - "ri", - "cte", - "dfpzc", - "cmpsceh", - "pfpo", - "dfphp", - "dfp", - "fpe", - "emon", - "parseh", - "hfpue", - "hfpm", - "nonqks", - "ipter", - "csske", - "edat", - "asnlxr", - "msa2", - "msa1", - "tods" ], "static": false, "migration-safe": true @@ -5774,27 +4147,6 @@ "name": "z10EC-base", "typename": "z10EC-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "dateh2", - "pfpo", - "dfphp", - "dfp", - "parseh", - "hfpue", - "hfpm", - "csske", - "asnlxr", - "tods" ], "static": true, "migration-safe": true @@ -5803,22 +4155,6 @@ "name": "z9EC-base", "typename": "z9EC-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "dateh2", - "hfpue", - "hfpm", - "asnlxr", - "tods" ], "static": true, "migration-safe": true @@ -5827,22 +4163,6 @@ "name": "z9EC.3-base", "typename": "z9EC.3-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "dateh2", - "hfpue", - "hfpm", - "asnlxr", - "tods" ], "static": true, "migration-safe": true @@ -5851,129 +4171,6 @@ "name": "zEC12", "typename": "zEC12-s390x-cpu", "unavailable-features": [ - "pcc-xts-eaes-256", - "pcc-xts-eaes-128", - "pcc-xts-aes-256", - "pcc-xts-aes-128", - "pcc-cmac-eaes-256", - "pcc-cmac-eaes-192", - "pcc-cmac-eaes-128", - "pcc-cmac-eaes-256", - "pcc-cmac-aes-192", - "pcc-cmac-aes-128", - "pcc-cmac-etdea-192", - "pcc-cmac-etdea-128", - "pcc-cmac-edea", - "pcc-cmac-tdea-192", - "pcc-cmac-tdea-128", - "pcc-cmac-dea", - "kmo-eaes-256", - "kmo-eaes-192", - "kmo-eaes-128", - "kmo-aes-256", - "kmo-aes-192", - "kmo-aes-128", - "kmo-etdea-192", - "kmo-etdea-128", - "kmo-edea", - "kmo-tdea-192", - "kmo-tdea-128", - "kmo-dea", - "kmf-eaes-256", - "kmf-eaes-192", - "kmf-eaes-128", - "kmf-aes-256", - "kmf-aes-192", - "kmf-aes-128", - "kmf-etdea-192", - "kmf-etdea-128", - "kmf-edea", - "kmf-tdea-192", - "kmf-tdea-128", - "kmf-dea", - "kmctr-eaes-256", - "kmctr-eaes-192", - "kmctr-eaes-128", - "kmctr-aes-256", - "kmctr-aes-192", - "kmctr-aes-128", - "kmctr-etdea-192", - "kmctr-etdea-128", - "kmctr-edea", - "kmctr-tdea-192", - "kmctr-tdea-128", - "kmctr-dea", - "pckmo-aes-256", - "pckmo-aes-192", - "pckmo-aes-128", - "pckmo-etdea-192", - "pckmo-etdea-128", - "pckmo-edea", - "klmd-sha-1", - "kimd-ghash", - "kimd-sha-1", - "km-xts-eaes-256", - "km-xts-eaes-128", - "km-xts-aes-256", - "km-xts-aes-128", - "km-eaes-256", - "km-eaes-192", - "km-eaes-128", - "km-etdea-192", - "km-etdea-128", - "km-edea", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-eaes-256", - "kmc-eaes-192", - "kmc-eaes-128", - "kmc-etdea-192", - "kmc-etdea-128", - "kmc-edea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-eaes-256", - "kmac-eaes-192", - "kmac-eaes-128", - "kmac-aes-256", - "kmac-aes-192", - "kmac-aes-128", - "kmac-etdea-192", - "kmac-etdea-128", - "kmac-edea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "cmm", - "dateh2", - "esop", - "sea_esop2", - "edat2", - "aefsi", - "sthyi", - "te", - "ri", - "cte", - "dfpzc", - "cmpsceh", - "pfpo", - "dfphp", - "dfp", - "fpe", - "emon", - "parseh", - "hfpue", - "hfpm", - "nonqks", - "ipter", - "csske", - "edat", - "asnlxr", - "msa2", - "msa1", - "tods" ], "static": false, "migration-safe": true @@ -5982,18 +4179,6 @@ "name": "z990.5-base", "typename": "z990.5-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "hfpm" ], "static": true, "migration-safe": true @@ -6002,27 +4187,6 @@ "name": "z10BC-base", "typename": "z10BC-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "dateh2", - "pfpo", - "dfphp", - "dfp", - "parseh", - "hfpue", - "hfpm", - "csske", - "asnlxr", - "tods" ], "static": true, "migration-safe": true @@ -6039,134 +4203,6 @@ "name": "z13.2", "typename": "z13.2-s390x-cpu", "unavailable-features": [ - "ppno-sha-512-drng", - "pcc-xts-eaes-256", - "pcc-xts-eaes-128", - "pcc-xts-aes-256", - "pcc-xts-aes-128", - "pcc-cmac-eaes-256", - "pcc-cmac-eaes-192", - "pcc-cmac-eaes-128", - "pcc-cmac-eaes-256", - "pcc-cmac-aes-192", - "pcc-cmac-aes-128", - "pcc-cmac-etdea-192", - "pcc-cmac-etdea-128", - "pcc-cmac-edea", - "pcc-cmac-tdea-192", - "pcc-cmac-tdea-128", - "pcc-cmac-dea", - "kmo-eaes-256", - "kmo-eaes-192", - "kmo-eaes-128", - "kmo-aes-256", - "kmo-aes-192", - "kmo-aes-128", - "kmo-etdea-192", - "kmo-etdea-128", - "kmo-edea", - "kmo-tdea-192", - "kmo-tdea-128", - "kmo-dea", - "kmf-eaes-256", - "kmf-eaes-192", - "kmf-eaes-128", - "kmf-aes-256", - "kmf-aes-192", - "kmf-aes-128", - "kmf-etdea-192", - "kmf-etdea-128", - "kmf-edea", - "kmf-tdea-192", - "kmf-tdea-128", - "kmf-dea", - "kmctr-eaes-256", - "kmctr-eaes-192", - "kmctr-eaes-128", - "kmctr-aes-256", - "kmctr-aes-192", - "kmctr-aes-128", - "kmctr-etdea-192", - "kmctr-etdea-128", - "kmctr-edea", - "kmctr-tdea-192", - "kmctr-tdea-128", - "kmctr-dea", - "pckmo-aes-256", - "pckmo-aes-192", - "pckmo-aes-128", - "pckmo-etdea-192", - "pckmo-etdea-128", - "pckmo-edea", - "klmd-sha-1", - "kimd-ghash", - "kimd-sha-1", - "km-xts-eaes-256", - "km-xts-eaes-128", - "km-xts-aes-256", - "km-xts-aes-128", - "km-eaes-256", - "km-eaes-192", - "km-eaes-128", - "km-etdea-192", - "km-etdea-128", - "km-edea", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-eaes-256", - "kmc-eaes-192", - "kmc-eaes-128", - "kmc-etdea-192", - "kmc-etdea-128", - "kmc-edea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-eaes-256", - "kmac-eaes-192", - "kmac-eaes-128", - "kmac-aes-256", - "kmac-aes-192", - "kmac-aes-128", - "kmac-etdea-192", - "kmac-etdea-128", - "kmac-edea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "cmm", - "dateh2", - "esop", - "sea_esop2", - "vx", - "dfppc", - "edat2", - "aefsi", - "sthyi", - "te", - "ri", - "cte", - "dfpzc", - "cmpsceh", - "pfpo", - "dfphp", - "dfp", - "fpe", - "emon", - "parseh", - "hfpue", - "hfpm", - "nonqks", - "ipter", - "csske", - "edat", - "asnlxr", - "msa2", - "msa1", - "gen13ptff", - "tods", - "type" ], "static": false, "migration-safe": true @@ -6175,18 +4211,6 @@ "name": "z890.3-base", "typename": "z890.3-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "hfpm" ], "static": true, "migration-safe": true @@ -6195,32 +4219,6 @@ "name": "zBC12-base", "typename": "zBC12-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "dateh2", - "dfpzc", - "cmpsceh", - "pfpo", - "dfphp", - "dfp", - "fpe", - "emon", - "parseh", - "hfpue", - "hfpm", - "nonqks", - "csske", - "asnlxr", - "tods" ], "static": true, "migration-safe": true @@ -6229,35 +4227,6 @@ "name": "z13.2-base", "typename": "z13.2-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "dateh2", - "dfppc", - "dfpzc", - "cmpsceh", - "pfpo", - "dfphp", - "dfp", - "fpe", - "emon", - "parseh", - "hfpue", - "hfpm", - "nonqks", - "csske", - "asnlxr", - "gen13ptff", - "tods", - "type" ], "static": true, "migration-safe": true @@ -6266,18 +4235,6 @@ "name": "z990-base", "typename": "z990-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "hfpm" ], "static": true, "migration-safe": true @@ -6286,32 +4243,6 @@ "name": "z10EC.2", "typename": "z10EC.2-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "cmm", - "dateh2", - "sthyi", - "pfpo", - "dfphp", - "dfp", - "parseh", - "hfpue", - "hfpm", - "csske", - "edat", - "asnlxr", - "msa2", - "msa1", - "tods" ], "static": false, "migration-safe": true @@ -6320,25 +4251,6 @@ "name": "z9BC", "typename": "z9BC-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "cmm", - "dateh2", - "sthyi", - "hfpue", - "hfpm", - "asnlxr", - "msa1", - "tods" ], "static": false, "migration-safe": true @@ -6347,27 +4259,6 @@ "name": "z10EC.3-base", "typename": "z10EC.3-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "dateh2", - "pfpo", - "dfphp", - "dfp", - "parseh", - "hfpue", - "hfpm", - "csske", - "asnlxr", - "tods" ], "static": true, "migration-safe": true @@ -6376,18 +4267,6 @@ "name": "z990.3-base", "typename": "z990.3-base-s390x-cpu", "unavailable-features": [ - "klmd-sha-1", - "kimd-sha-1", - "km-tdea-192", - "km-tdea-128", - "km-dea", - "kmc-tdea-192", - "kmc-tdea-128", - "kmc-dea", - "kmac-tdea-192", - "kmac-tdea-128", - "kmac-dea", - "hfpm" ], "static": true, "migration-safe": true @@ -6411,41 +4290,6 @@ { "return": [ - { - "parameters": [ - { - "name": "timeout", - "help": "Request timeout in seconds (default 0 = no timeout)", - "type": "number" - }, - { - "name": "initiator-name", - "help": "Initiator iqn name to use when connecting", - "type": "string" - }, - { - "name": "header-digest", - "help": "HeaderDigest setting. {CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}", - "type": "string" - }, - { - "name": "password-secret", - "help": "ID of the secret providing password for CHAP authentication to target", - "type": "string" - }, - { - "name": "password", - "help": "password for CHAP authentication to target", - "type": "string" - }, - { - "name": "user", - "help": "username for CHAP authentication to target", - "type": "string" - } - ], - "option": "iscsi" - }, { "parameters": [ { @@ -7107,6 +4951,10 @@ }, { "parameters": [ + { + "name": "x-oob", + "type": "boolean" + }, { "name": "pretty", "type": "boolean" @@ -15253,9 +13101,9 @@ "type": "int" }, { - "name": "static", + "name": "preallocation", "default": null, - "type": "bool" + "type": "356" } ], "meta-type": "object" @@ -18996,7 +16844,2708 @@ } { - "id": "libvirt-44", + "return": { + "model": { + "name": "z14-base", + "props": { + "aen": true, + "aefsi": true, + "msa8": true, + "msa7": true, + "msa6": true, + "msa5": true, + "msa4": true, + "msa3": true, + "msa2": true, + "msa1": true, + "sthyi": true, + "edat": true, + "ri": true, + "edat2": true, + "vx": true, + "ipter": true, + "vxeh": true, + "vxpd": true, + "esop": true, + "iep": true, + "cte": true, + "gs": true, + "ppa15": true, + "zpci": true, + "sea_esop2": true, + "te": true, + "cmm": true + } + } + }, + "id": "libvirt-44" +} + +{ + "id": "libvirt-45", + "error": { + "class": "GenericError", + "desc": "Property '.migratable' not found" + } +} + +{ + "return": { + }, + "id": "libvirt-1" +} + +{ + "return": [ + { + "name": "z890.2", + "typename": "z890.2-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "hfpm" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z990.4", + "typename": "z990.4-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "hfpm" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z10BC.2", + "typename": "z10BC.2-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "cmm", + "dateh2", + "sthyi", + "pfpo", + "dfphp", + "dfp", + "parseh", + "hfpue", + "hfpm", + "csske", + "edat", + "asnlxr", + "msa2", + "msa1", + "tods" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z196.2", + "typename": "z196.2-s390x-cpu", + "unavailable-features": [ + "pcc-xts-eaes-256", + "pcc-xts-eaes-128", + "pcc-xts-aes-256", + "pcc-xts-aes-128", + "pcc-cmac-eaes-256", + "pcc-cmac-eaes-192", + "pcc-cmac-eaes-128", + "pcc-cmac-eaes-256", + "pcc-cmac-aes-192", + "pcc-cmac-aes-128", + "pcc-cmac-etdea-192", + "pcc-cmac-etdea-128", + "pcc-cmac-edea", + "pcc-cmac-tdea-192", + "pcc-cmac-tdea-128", + "pcc-cmac-dea", + "kmo-eaes-256", + "kmo-eaes-192", + "kmo-eaes-128", + "kmo-aes-256", + "kmo-aes-192", + "kmo-aes-128", + "kmo-etdea-192", + "kmo-etdea-128", + "kmo-edea", + "kmo-tdea-192", + "kmo-tdea-128", + "kmo-dea", + "kmf-eaes-256", + "kmf-eaes-192", + "kmf-eaes-128", + "kmf-aes-256", + "kmf-aes-192", + "kmf-aes-128", + "kmf-etdea-192", + "kmf-etdea-128", + "kmf-edea", + "kmf-tdea-192", + "kmf-tdea-128", + "kmf-dea", + "kmctr-eaes-256", + "kmctr-eaes-192", + "kmctr-eaes-128", + "kmctr-aes-256", + "kmctr-aes-192", + "kmctr-aes-128", + "kmctr-etdea-192", + "kmctr-etdea-128", + "kmctr-edea", + "kmctr-tdea-192", + "kmctr-tdea-128", + "kmctr-dea", + "pckmo-aes-256", + "pckmo-aes-192", + "pckmo-aes-128", + "pckmo-etdea-192", + "pckmo-etdea-128", + "pckmo-edea", + "klmd-sha-1", + "kimd-ghash", + "kimd-sha-1", + "km-xts-eaes-256", + "km-xts-eaes-128", + "km-xts-aes-256", + "km-xts-aes-128", + "km-eaes-256", + "km-eaes-192", + "km-eaes-128", + "km-etdea-192", + "km-etdea-128", + "km-edea", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-eaes-256", + "kmc-eaes-192", + "kmc-eaes-128", + "kmc-etdea-192", + "kmc-etdea-128", + "kmc-edea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-eaes-256", + "kmac-eaes-192", + "kmac-eaes-128", + "kmac-aes-256", + "kmac-aes-192", + "kmac-aes-128", + "kmac-etdea-192", + "kmac-etdea-128", + "kmac-edea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "cmm", + "dateh2", + "aefsi", + "sthyi", + "cmpsceh", + "pfpo", + "dfphp", + "dfp", + "fpe", + "emon", + "parseh", + "hfpue", + "hfpm", + "nonqks", + "ipter", + "csske", + "edat", + "asnlxr", + "msa2", + "msa1", + "tods" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z14", + "typename": "z14-s390x-cpu", + "unavailable-features": [ + "ppno-sha-512-drng", + "pcc-xts-eaes-256", + "pcc-xts-eaes-128", + "pcc-xts-aes-256", + "pcc-xts-aes-128", + "pcc-cmac-eaes-256", + "pcc-cmac-eaes-192", + "pcc-cmac-eaes-128", + "pcc-cmac-eaes-256", + "pcc-cmac-aes-192", + "pcc-cmac-aes-128", + "pcc-cmac-etdea-192", + "pcc-cmac-etdea-128", + "pcc-cmac-edea", + "pcc-cmac-tdea-192", + "pcc-cmac-tdea-128", + "pcc-cmac-dea", + "kmo-eaes-256", + "kmo-eaes-192", + "kmo-eaes-128", + "kmo-aes-256", + "kmo-aes-192", + "kmo-aes-128", + "kmo-etdea-192", + "kmo-etdea-128", + "kmo-edea", + "kmo-tdea-192", + "kmo-tdea-128", + "kmo-dea", + "kmf-eaes-256", + "kmf-eaes-192", + "kmf-eaes-128", + "kmf-aes-256", + "kmf-aes-192", + "kmf-aes-128", + "kmf-etdea-192", + "kmf-etdea-128", + "kmf-edea", + "kmf-tdea-192", + "kmf-tdea-128", + "kmf-dea", + "kmctr-eaes-256", + "kmctr-eaes-192", + "kmctr-eaes-128", + "kmctr-aes-256", + "kmctr-aes-192", + "kmctr-aes-128", + "kmctr-etdea-192", + "kmctr-etdea-128", + "kmctr-edea", + "kmctr-tdea-192", + "kmctr-tdea-128", + "kmctr-dea", + "pckmo-aes-256", + "pckmo-aes-192", + "pckmo-aes-128", + "pckmo-etdea-192", + "pckmo-etdea-128", + "pckmo-edea", + "klmd-sha-1", + "kimd-ghash", + "kimd-sha-1", + "km-xts-eaes-256", + "km-xts-eaes-128", + "km-xts-aes-256", + "km-xts-aes-128", + "km-eaes-256", + "km-eaes-192", + "km-eaes-128", + "km-etdea-192", + "km-etdea-128", + "km-edea", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-eaes-256", + "kmc-eaes-192", + "kmc-eaes-128", + "kmc-etdea-192", + "kmc-etdea-128", + "kmc-edea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-eaes-256", + "kmac-eaes-192", + "kmac-eaes-128", + "kmac-aes-256", + "kmac-aes-192", + "kmac-aes-128", + "kmac-etdea-192", + "kmac-etdea-128", + "kmac-edea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "cmm", + "dateh2", + "esop", + "vxeh", + "vxpd", + "gs", + "sea_esop2", + "iep", + "vx", + "dfppc", + "edat2", + "aefsi", + "sthyi", + "te", + "ri", + "tsi", + "sema", + "minste2", + "eec", + "cte", + "dfpzc", + "cmpsceh", + "pfpo", + "dfphp", + "dfp", + "opc", + "fpe", + "emon", + "parseh", + "hfpue", + "hfpm", + "nonqks", + "ipter", + "csske", + "edat", + "asnlxr", + "msa8", + "msa7", + "msa6", + "msa2", + "msa1", + "gen13ptff", + "tods", + "type" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z9BC-base", + "typename": "z9BC-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "dateh2", + "hfpue", + "hfpm", + "asnlxr", + "tods" + ], + "static": true, + "migration-safe": true + }, + { + "name": "zEC12-base", + "typename": "zEC12-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "dateh2", + "dfpzc", + "cmpsceh", + "pfpo", + "dfphp", + "dfp", + "fpe", + "emon", + "parseh", + "hfpue", + "hfpm", + "nonqks", + "csske", + "asnlxr", + "tods" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z196-base", + "typename": "z196-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "dateh2", + "cmpsceh", + "pfpo", + "dfphp", + "dfp", + "fpe", + "emon", + "parseh", + "hfpue", + "hfpm", + "nonqks", + "csske", + "asnlxr", + "tods" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z13-base", + "typename": "z13-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "dateh2", + "dfppc", + "dfpzc", + "cmpsceh", + "pfpo", + "dfphp", + "dfp", + "fpe", + "emon", + "parseh", + "hfpue", + "hfpm", + "nonqks", + "csske", + "asnlxr", + "gen13ptff", + "tods", + "type" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z990.3", + "typename": "z990.3-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "hfpm" + ], + "static": false, + "migration-safe": true + }, + { + "name": "host", + "typename": "host-s390x-cpu", + "static": false, + "migration-safe": false + }, + { + "name": "z9EC", + "typename": "z9EC-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "cmm", + "dateh2", + "sthyi", + "hfpue", + "hfpm", + "asnlxr", + "msa1", + "tods" + ], + "static": false, + "migration-safe": true + }, + { + "name": "zBC12", + "typename": "zBC12-s390x-cpu", + "unavailable-features": [ + "pcc-xts-eaes-256", + "pcc-xts-eaes-128", + "pcc-xts-aes-256", + "pcc-xts-aes-128", + "pcc-cmac-eaes-256", + "pcc-cmac-eaes-192", + "pcc-cmac-eaes-128", + "pcc-cmac-eaes-256", + "pcc-cmac-aes-192", + "pcc-cmac-aes-128", + "pcc-cmac-etdea-192", + "pcc-cmac-etdea-128", + "pcc-cmac-edea", + "pcc-cmac-tdea-192", + "pcc-cmac-tdea-128", + "pcc-cmac-dea", + "kmo-eaes-256", + "kmo-eaes-192", + "kmo-eaes-128", + "kmo-aes-256", + "kmo-aes-192", + "kmo-aes-128", + "kmo-etdea-192", + "kmo-etdea-128", + "kmo-edea", + "kmo-tdea-192", + "kmo-tdea-128", + "kmo-dea", + "kmf-eaes-256", + "kmf-eaes-192", + "kmf-eaes-128", + "kmf-aes-256", + "kmf-aes-192", + "kmf-aes-128", + "kmf-etdea-192", + "kmf-etdea-128", + "kmf-edea", + "kmf-tdea-192", + "kmf-tdea-128", + "kmf-dea", + "kmctr-eaes-256", + "kmctr-eaes-192", + "kmctr-eaes-128", + "kmctr-aes-256", + "kmctr-aes-192", + "kmctr-aes-128", + "kmctr-etdea-192", + "kmctr-etdea-128", + "kmctr-edea", + "kmctr-tdea-192", + "kmctr-tdea-128", + "kmctr-dea", + "pckmo-aes-256", + "pckmo-aes-192", + "pckmo-aes-128", + "pckmo-etdea-192", + "pckmo-etdea-128", + "pckmo-edea", + "klmd-sha-1", + "kimd-ghash", + "kimd-sha-1", + "km-xts-eaes-256", + "km-xts-eaes-128", + "km-xts-aes-256", + "km-xts-aes-128", + "km-eaes-256", + "km-eaes-192", + "km-eaes-128", + "km-etdea-192", + "km-etdea-128", + "km-edea", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-eaes-256", + "kmc-eaes-192", + "kmc-eaes-128", + "kmc-etdea-192", + "kmc-etdea-128", + "kmc-edea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-eaes-256", + "kmac-eaes-192", + "kmac-eaes-128", + "kmac-aes-256", + "kmac-aes-192", + "kmac-aes-128", + "kmac-etdea-192", + "kmac-etdea-128", + "kmac-edea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "cmm", + "dateh2", + "esop", + "sea_esop2", + "edat2", + "aefsi", + "sthyi", + "te", + "ri", + "cte", + "dfpzc", + "cmpsceh", + "pfpo", + "dfphp", + "dfp", + "fpe", + "emon", + "parseh", + "hfpue", + "hfpm", + "nonqks", + "ipter", + "csske", + "edat", + "asnlxr", + "msa2", + "msa1", + "tods" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z9EC.3", + "typename": "z9EC.3-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "cmm", + "dateh2", + "sthyi", + "hfpue", + "hfpm", + "asnlxr", + "msa1", + "tods" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z196.2-base", + "typename": "z196.2-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "dateh2", + "cmpsceh", + "pfpo", + "dfphp", + "dfp", + "fpe", + "emon", + "parseh", + "hfpue", + "hfpm", + "nonqks", + "csske", + "asnlxr", + "tods" + ], + "static": true, + "migration-safe": true + }, + { + "name": "qemu", + "typename": "qemu-s390x-cpu", + "unavailable-features": [ + ], + "static": false, + "migration-safe": true + }, + { + "name": "zEC12.2-base", + "typename": "zEC12.2-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "dateh2", + "dfpzc", + "cmpsceh", + "pfpo", + "dfphp", + "dfp", + "fpe", + "emon", + "parseh", + "hfpue", + "hfpm", + "nonqks", + "csske", + "asnlxr", + "tods" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z800-base", + "typename": "z800-base-s390x-cpu", + "unavailable-features": [ + ], + "static": true, + "migration-safe": true + }, + { + "name": "z9EC.2", + "typename": "z9EC.2-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "cmm", + "dateh2", + "sthyi", + "hfpue", + "hfpm", + "asnlxr", + "msa1", + "tods" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z900.2-base", + "typename": "z900.2-base-s390x-cpu", + "unavailable-features": [ + ], + "static": true, + "migration-safe": true + }, + { + "name": "z900.3", + "typename": "z900.3-s390x-cpu", + "unavailable-features": [ + ], + "static": false, + "migration-safe": true + }, + { + "name": "z890-base", + "typename": "z890-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "hfpm" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z890", + "typename": "z890-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "hfpm" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z990.4-base", + "typename": "z990.4-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "hfpm" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z10BC.2-base", + "typename": "z10BC.2-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "dateh2", + "pfpo", + "dfphp", + "dfp", + "parseh", + "hfpue", + "hfpm", + "csske", + "asnlxr", + "tods" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z900.2", + "typename": "z900.2-s390x-cpu", + "unavailable-features": [ + ], + "static": false, + "migration-safe": true + }, + { + "name": "z9BC.2-base", + "typename": "z9BC.2-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "dateh2", + "hfpue", + "hfpm", + "asnlxr", + "tods" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z800", + "typename": "z800-s390x-cpu", + "unavailable-features": [ + ], + "static": false, + "migration-safe": true + }, + { + "name": "z114", + "typename": "z114-s390x-cpu", + "unavailable-features": [ + "pcc-xts-eaes-256", + "pcc-xts-eaes-128", + "pcc-xts-aes-256", + "pcc-xts-aes-128", + "pcc-cmac-eaes-256", + "pcc-cmac-eaes-192", + "pcc-cmac-eaes-128", + "pcc-cmac-eaes-256", + "pcc-cmac-aes-192", + "pcc-cmac-aes-128", + "pcc-cmac-etdea-192", + "pcc-cmac-etdea-128", + "pcc-cmac-edea", + "pcc-cmac-tdea-192", + "pcc-cmac-tdea-128", + "pcc-cmac-dea", + "kmo-eaes-256", + "kmo-eaes-192", + "kmo-eaes-128", + "kmo-aes-256", + "kmo-aes-192", + "kmo-aes-128", + "kmo-etdea-192", + "kmo-etdea-128", + "kmo-edea", + "kmo-tdea-192", + "kmo-tdea-128", + "kmo-dea", + "kmf-eaes-256", + "kmf-eaes-192", + "kmf-eaes-128", + "kmf-aes-256", + "kmf-aes-192", + "kmf-aes-128", + "kmf-etdea-192", + "kmf-etdea-128", + "kmf-edea", + "kmf-tdea-192", + "kmf-tdea-128", + "kmf-dea", + "kmctr-eaes-256", + "kmctr-eaes-192", + "kmctr-eaes-128", + "kmctr-aes-256", + "kmctr-aes-192", + "kmctr-aes-128", + "kmctr-etdea-192", + "kmctr-etdea-128", + "kmctr-edea", + "kmctr-tdea-192", + "kmctr-tdea-128", + "kmctr-dea", + "pckmo-aes-256", + "pckmo-aes-192", + "pckmo-aes-128", + "pckmo-etdea-192", + "pckmo-etdea-128", + "pckmo-edea", + "klmd-sha-1", + "kimd-ghash", + "kimd-sha-1", + "km-xts-eaes-256", + "km-xts-eaes-128", + "km-xts-aes-256", + "km-xts-aes-128", + "km-eaes-256", + "km-eaes-192", + "km-eaes-128", + "km-etdea-192", + "km-etdea-128", + "km-edea", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-eaes-256", + "kmc-eaes-192", + "kmc-eaes-128", + "kmc-etdea-192", + "kmc-etdea-128", + "kmc-edea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-eaes-256", + "kmac-eaes-192", + "kmac-eaes-128", + "kmac-aes-256", + "kmac-aes-192", + "kmac-aes-128", + "kmac-etdea-192", + "kmac-etdea-128", + "kmac-edea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "cmm", + "dateh2", + "aefsi", + "sthyi", + "cmpsceh", + "pfpo", + "dfphp", + "dfp", + "fpe", + "emon", + "parseh", + "hfpue", + "hfpm", + "nonqks", + "ipter", + "csske", + "edat", + "asnlxr", + "msa2", + "msa1", + "tods" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z13", + "typename": "z13-s390x-cpu", + "unavailable-features": [ + "ppno-sha-512-drng", + "pcc-xts-eaes-256", + "pcc-xts-eaes-128", + "pcc-xts-aes-256", + "pcc-xts-aes-128", + "pcc-cmac-eaes-256", + "pcc-cmac-eaes-192", + "pcc-cmac-eaes-128", + "pcc-cmac-eaes-256", + "pcc-cmac-aes-192", + "pcc-cmac-aes-128", + "pcc-cmac-etdea-192", + "pcc-cmac-etdea-128", + "pcc-cmac-edea", + "pcc-cmac-tdea-192", + "pcc-cmac-tdea-128", + "pcc-cmac-dea", + "kmo-eaes-256", + "kmo-eaes-192", + "kmo-eaes-128", + "kmo-aes-256", + "kmo-aes-192", + "kmo-aes-128", + "kmo-etdea-192", + "kmo-etdea-128", + "kmo-edea", + "kmo-tdea-192", + "kmo-tdea-128", + "kmo-dea", + "kmf-eaes-256", + "kmf-eaes-192", + "kmf-eaes-128", + "kmf-aes-256", + "kmf-aes-192", + "kmf-aes-128", + "kmf-etdea-192", + "kmf-etdea-128", + "kmf-edea", + "kmf-tdea-192", + "kmf-tdea-128", + "kmf-dea", + "kmctr-eaes-256", + "kmctr-eaes-192", + "kmctr-eaes-128", + "kmctr-aes-256", + "kmctr-aes-192", + "kmctr-aes-128", + "kmctr-etdea-192", + "kmctr-etdea-128", + "kmctr-edea", + "kmctr-tdea-192", + "kmctr-tdea-128", + "kmctr-dea", + "pckmo-aes-256", + "pckmo-aes-192", + "pckmo-aes-128", + "pckmo-etdea-192", + "pckmo-etdea-128", + "pckmo-edea", + "klmd-sha-1", + "kimd-ghash", + "kimd-sha-1", + "km-xts-eaes-256", + "km-xts-eaes-128", + "km-xts-aes-256", + "km-xts-aes-128", + "km-eaes-256", + "km-eaes-192", + "km-eaes-128", + "km-etdea-192", + "km-etdea-128", + "km-edea", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-eaes-256", + "kmc-eaes-192", + "kmc-eaes-128", + "kmc-etdea-192", + "kmc-etdea-128", + "kmc-edea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-eaes-256", + "kmac-eaes-192", + "kmac-eaes-128", + "kmac-aes-256", + "kmac-aes-192", + "kmac-aes-128", + "kmac-etdea-192", + "kmac-etdea-128", + "kmac-edea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "cmm", + "dateh2", + "esop", + "sea_esop2", + "vx", + "dfppc", + "edat2", + "aefsi", + "sthyi", + "te", + "ri", + "cte", + "dfpzc", + "cmpsceh", + "pfpo", + "dfphp", + "dfp", + "fpe", + "emon", + "parseh", + "hfpue", + "hfpm", + "nonqks", + "ipter", + "csske", + "edat", + "asnlxr", + "msa2", + "msa1", + "gen13ptff", + "tods", + "type" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z13s-base", + "typename": "z13s-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "dateh2", + "dfppc", + "dfpzc", + "cmpsceh", + "pfpo", + "dfphp", + "dfp", + "fpe", + "emon", + "parseh", + "hfpue", + "hfpm", + "nonqks", + "csske", + "asnlxr", + "gen13ptff", + "tods", + "type" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z990", + "typename": "z990-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "hfpm" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z990.2", + "typename": "z990.2-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "hfpm" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z14-base", + "typename": "z14-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "dateh2", + "dfppc", + "tsi", + "sema", + "minste2", + "eec", + "dfpzc", + "cmpsceh", + "pfpo", + "dfphp", + "dfp", + "opc", + "fpe", + "emon", + "parseh", + "hfpue", + "hfpm", + "nonqks", + "csske", + "asnlxr", + "gen13ptff", + "tods", + "type" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z890.2-base", + "typename": "z890.2-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "hfpm" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z196", + "typename": "z196-s390x-cpu", + "unavailable-features": [ + "pcc-xts-eaes-256", + "pcc-xts-eaes-128", + "pcc-xts-aes-256", + "pcc-xts-aes-128", + "pcc-cmac-eaes-256", + "pcc-cmac-eaes-192", + "pcc-cmac-eaes-128", + "pcc-cmac-eaes-256", + "pcc-cmac-aes-192", + "pcc-cmac-aes-128", + "pcc-cmac-etdea-192", + "pcc-cmac-etdea-128", + "pcc-cmac-edea", + "pcc-cmac-tdea-192", + "pcc-cmac-tdea-128", + "pcc-cmac-dea", + "kmo-eaes-256", + "kmo-eaes-192", + "kmo-eaes-128", + "kmo-aes-256", + "kmo-aes-192", + "kmo-aes-128", + "kmo-etdea-192", + "kmo-etdea-128", + "kmo-edea", + "kmo-tdea-192", + "kmo-tdea-128", + "kmo-dea", + "kmf-eaes-256", + "kmf-eaes-192", + "kmf-eaes-128", + "kmf-aes-256", + "kmf-aes-192", + "kmf-aes-128", + "kmf-etdea-192", + "kmf-etdea-128", + "kmf-edea", + "kmf-tdea-192", + "kmf-tdea-128", + "kmf-dea", + "kmctr-eaes-256", + "kmctr-eaes-192", + "kmctr-eaes-128", + "kmctr-aes-256", + "kmctr-aes-192", + "kmctr-aes-128", + "kmctr-etdea-192", + "kmctr-etdea-128", + "kmctr-edea", + "kmctr-tdea-192", + "kmctr-tdea-128", + "kmctr-dea", + "pckmo-aes-256", + "pckmo-aes-192", + "pckmo-aes-128", + "pckmo-etdea-192", + "pckmo-etdea-128", + "pckmo-edea", + "klmd-sha-1", + "kimd-ghash", + "kimd-sha-1", + "km-xts-eaes-256", + "km-xts-eaes-128", + "km-xts-aes-256", + "km-xts-aes-128", + "km-eaes-256", + "km-eaes-192", + "km-eaes-128", + "km-etdea-192", + "km-etdea-128", + "km-edea", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-eaes-256", + "kmc-eaes-192", + "kmc-eaes-128", + "kmc-etdea-192", + "kmc-etdea-128", + "kmc-edea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-eaes-256", + "kmac-eaes-192", + "kmac-eaes-128", + "kmac-aes-256", + "kmac-aes-192", + "kmac-aes-128", + "kmac-etdea-192", + "kmac-etdea-128", + "kmac-edea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "cmm", + "dateh2", + "aefsi", + "sthyi", + "cmpsceh", + "pfpo", + "dfphp", + "dfp", + "fpe", + "emon", + "parseh", + "hfpue", + "hfpm", + "nonqks", + "ipter", + "csske", + "edat", + "asnlxr", + "msa2", + "msa1", + "tods" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z10EC", + "typename": "z10EC-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "cmm", + "dateh2", + "sthyi", + "pfpo", + "dfphp", + "dfp", + "parseh", + "hfpue", + "hfpm", + "csske", + "edat", + "asnlxr", + "msa2", + "msa1", + "tods" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z13s", + "typename": "z13s-s390x-cpu", + "unavailable-features": [ + "ppno-sha-512-drng", + "pcc-xts-eaes-256", + "pcc-xts-eaes-128", + "pcc-xts-aes-256", + "pcc-xts-aes-128", + "pcc-cmac-eaes-256", + "pcc-cmac-eaes-192", + "pcc-cmac-eaes-128", + "pcc-cmac-eaes-256", + "pcc-cmac-aes-192", + "pcc-cmac-aes-128", + "pcc-cmac-etdea-192", + "pcc-cmac-etdea-128", + "pcc-cmac-edea", + "pcc-cmac-tdea-192", + "pcc-cmac-tdea-128", + "pcc-cmac-dea", + "kmo-eaes-256", + "kmo-eaes-192", + "kmo-eaes-128", + "kmo-aes-256", + "kmo-aes-192", + "kmo-aes-128", + "kmo-etdea-192", + "kmo-etdea-128", + "kmo-edea", + "kmo-tdea-192", + "kmo-tdea-128", + "kmo-dea", + "kmf-eaes-256", + "kmf-eaes-192", + "kmf-eaes-128", + "kmf-aes-256", + "kmf-aes-192", + "kmf-aes-128", + "kmf-etdea-192", + "kmf-etdea-128", + "kmf-edea", + "kmf-tdea-192", + "kmf-tdea-128", + "kmf-dea", + "kmctr-eaes-256", + "kmctr-eaes-192", + "kmctr-eaes-128", + "kmctr-aes-256", + "kmctr-aes-192", + "kmctr-aes-128", + "kmctr-etdea-192", + "kmctr-etdea-128", + "kmctr-edea", + "kmctr-tdea-192", + "kmctr-tdea-128", + "kmctr-dea", + "pckmo-aes-256", + "pckmo-aes-192", + "pckmo-aes-128", + "pckmo-etdea-192", + "pckmo-etdea-128", + "pckmo-edea", + "klmd-sha-1", + "kimd-ghash", + "kimd-sha-1", + "km-xts-eaes-256", + "km-xts-eaes-128", + "km-xts-aes-256", + "km-xts-aes-128", + "km-eaes-256", + "km-eaes-192", + "km-eaes-128", + "km-etdea-192", + "km-etdea-128", + "km-edea", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-eaes-256", + "kmc-eaes-192", + "kmc-eaes-128", + "kmc-etdea-192", + "kmc-etdea-128", + "kmc-edea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-eaes-256", + "kmac-eaes-192", + "kmac-eaes-128", + "kmac-aes-256", + "kmac-aes-192", + "kmac-aes-128", + "kmac-etdea-192", + "kmac-etdea-128", + "kmac-edea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "cmm", + "dateh2", + "esop", + "sea_esop2", + "vx", + "dfppc", + "edat2", + "aefsi", + "sthyi", + "te", + "ri", + "cte", + "dfpzc", + "cmpsceh", + "pfpo", + "dfphp", + "dfp", + "fpe", + "emon", + "parseh", + "hfpue", + "hfpm", + "nonqks", + "ipter", + "csske", + "edat", + "asnlxr", + "msa2", + "msa1", + "gen13ptff", + "tods", + "type" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z900", + "typename": "z900-s390x-cpu", + "unavailable-features": [ + ], + "static": false, + "migration-safe": true + }, + { + "name": "z10EC.3", + "typename": "z10EC.3-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "cmm", + "dateh2", + "sthyi", + "pfpo", + "dfphp", + "dfp", + "parseh", + "hfpue", + "hfpm", + "csske", + "edat", + "asnlxr", + "msa2", + "msa1", + "tods" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z10EC.2-base", + "typename": "z10EC.2-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "dateh2", + "pfpo", + "dfphp", + "dfp", + "parseh", + "hfpue", + "hfpm", + "csske", + "asnlxr", + "tods" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z114-base", + "typename": "z114-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "dateh2", + "cmpsceh", + "pfpo", + "dfphp", + "dfp", + "fpe", + "emon", + "parseh", + "hfpue", + "hfpm", + "nonqks", + "csske", + "asnlxr", + "tods" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z990.2-base", + "typename": "z990.2-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "hfpm" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z9EC.2-base", + "typename": "z9EC.2-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "dateh2", + "hfpue", + "hfpm", + "asnlxr", + "tods" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z890.3", + "typename": "z890.3-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "hfpm" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z900.3-base", + "typename": "z900.3-base-s390x-cpu", + "unavailable-features": [ + ], + "static": true, + "migration-safe": true + }, + { + "name": "z9BC.2", + "typename": "z9BC.2-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "cmm", + "dateh2", + "sthyi", + "hfpue", + "hfpm", + "asnlxr", + "msa1", + "tods" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z10BC", + "typename": "z10BC-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "cmm", + "dateh2", + "sthyi", + "pfpo", + "dfphp", + "dfp", + "parseh", + "hfpue", + "hfpm", + "csske", + "edat", + "asnlxr", + "msa2", + "msa1", + "tods" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z990.5", + "typename": "z990.5-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "hfpm" + ], + "static": false, + "migration-safe": true + }, + { + "name": "zEC12.2", + "typename": "zEC12.2-s390x-cpu", + "unavailable-features": [ + "pcc-xts-eaes-256", + "pcc-xts-eaes-128", + "pcc-xts-aes-256", + "pcc-xts-aes-128", + "pcc-cmac-eaes-256", + "pcc-cmac-eaes-192", + "pcc-cmac-eaes-128", + "pcc-cmac-eaes-256", + "pcc-cmac-aes-192", + "pcc-cmac-aes-128", + "pcc-cmac-etdea-192", + "pcc-cmac-etdea-128", + "pcc-cmac-edea", + "pcc-cmac-tdea-192", + "pcc-cmac-tdea-128", + "pcc-cmac-dea", + "kmo-eaes-256", + "kmo-eaes-192", + "kmo-eaes-128", + "kmo-aes-256", + "kmo-aes-192", + "kmo-aes-128", + "kmo-etdea-192", + "kmo-etdea-128", + "kmo-edea", + "kmo-tdea-192", + "kmo-tdea-128", + "kmo-dea", + "kmf-eaes-256", + "kmf-eaes-192", + "kmf-eaes-128", + "kmf-aes-256", + "kmf-aes-192", + "kmf-aes-128", + "kmf-etdea-192", + "kmf-etdea-128", + "kmf-edea", + "kmf-tdea-192", + "kmf-tdea-128", + "kmf-dea", + "kmctr-eaes-256", + "kmctr-eaes-192", + "kmctr-eaes-128", + "kmctr-aes-256", + "kmctr-aes-192", + "kmctr-aes-128", + "kmctr-etdea-192", + "kmctr-etdea-128", + "kmctr-edea", + "kmctr-tdea-192", + "kmctr-tdea-128", + "kmctr-dea", + "pckmo-aes-256", + "pckmo-aes-192", + "pckmo-aes-128", + "pckmo-etdea-192", + "pckmo-etdea-128", + "pckmo-edea", + "klmd-sha-1", + "kimd-ghash", + "kimd-sha-1", + "km-xts-eaes-256", + "km-xts-eaes-128", + "km-xts-aes-256", + "km-xts-aes-128", + "km-eaes-256", + "km-eaes-192", + "km-eaes-128", + "km-etdea-192", + "km-etdea-128", + "km-edea", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-eaes-256", + "kmc-eaes-192", + "kmc-eaes-128", + "kmc-etdea-192", + "kmc-etdea-128", + "kmc-edea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-eaes-256", + "kmac-eaes-192", + "kmac-eaes-128", + "kmac-aes-256", + "kmac-aes-192", + "kmac-aes-128", + "kmac-etdea-192", + "kmac-etdea-128", + "kmac-edea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "cmm", + "dateh2", + "esop", + "sea_esop2", + "edat2", + "aefsi", + "sthyi", + "te", + "ri", + "cte", + "dfpzc", + "cmpsceh", + "pfpo", + "dfphp", + "dfp", + "fpe", + "emon", + "parseh", + "hfpue", + "hfpm", + "nonqks", + "ipter", + "csske", + "edat", + "asnlxr", + "msa2", + "msa1", + "tods" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z10EC-base", + "typename": "z10EC-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "dateh2", + "pfpo", + "dfphp", + "dfp", + "parseh", + "hfpue", + "hfpm", + "csske", + "asnlxr", + "tods" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z9EC-base", + "typename": "z9EC-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "dateh2", + "hfpue", + "hfpm", + "asnlxr", + "tods" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z9EC.3-base", + "typename": "z9EC.3-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "dateh2", + "hfpue", + "hfpm", + "asnlxr", + "tods" + ], + "static": true, + "migration-safe": true + }, + { + "name": "zEC12", + "typename": "zEC12-s390x-cpu", + "unavailable-features": [ + "pcc-xts-eaes-256", + "pcc-xts-eaes-128", + "pcc-xts-aes-256", + "pcc-xts-aes-128", + "pcc-cmac-eaes-256", + "pcc-cmac-eaes-192", + "pcc-cmac-eaes-128", + "pcc-cmac-eaes-256", + "pcc-cmac-aes-192", + "pcc-cmac-aes-128", + "pcc-cmac-etdea-192", + "pcc-cmac-etdea-128", + "pcc-cmac-edea", + "pcc-cmac-tdea-192", + "pcc-cmac-tdea-128", + "pcc-cmac-dea", + "kmo-eaes-256", + "kmo-eaes-192", + "kmo-eaes-128", + "kmo-aes-256", + "kmo-aes-192", + "kmo-aes-128", + "kmo-etdea-192", + "kmo-etdea-128", + "kmo-edea", + "kmo-tdea-192", + "kmo-tdea-128", + "kmo-dea", + "kmf-eaes-256", + "kmf-eaes-192", + "kmf-eaes-128", + "kmf-aes-256", + "kmf-aes-192", + "kmf-aes-128", + "kmf-etdea-192", + "kmf-etdea-128", + "kmf-edea", + "kmf-tdea-192", + "kmf-tdea-128", + "kmf-dea", + "kmctr-eaes-256", + "kmctr-eaes-192", + "kmctr-eaes-128", + "kmctr-aes-256", + "kmctr-aes-192", + "kmctr-aes-128", + "kmctr-etdea-192", + "kmctr-etdea-128", + "kmctr-edea", + "kmctr-tdea-192", + "kmctr-tdea-128", + "kmctr-dea", + "pckmo-aes-256", + "pckmo-aes-192", + "pckmo-aes-128", + "pckmo-etdea-192", + "pckmo-etdea-128", + "pckmo-edea", + "klmd-sha-1", + "kimd-ghash", + "kimd-sha-1", + "km-xts-eaes-256", + "km-xts-eaes-128", + "km-xts-aes-256", + "km-xts-aes-128", + "km-eaes-256", + "km-eaes-192", + "km-eaes-128", + "km-etdea-192", + "km-etdea-128", + "km-edea", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-eaes-256", + "kmc-eaes-192", + "kmc-eaes-128", + "kmc-etdea-192", + "kmc-etdea-128", + "kmc-edea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-eaes-256", + "kmac-eaes-192", + "kmac-eaes-128", + "kmac-aes-256", + "kmac-aes-192", + "kmac-aes-128", + "kmac-etdea-192", + "kmac-etdea-128", + "kmac-edea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "cmm", + "dateh2", + "esop", + "sea_esop2", + "edat2", + "aefsi", + "sthyi", + "te", + "ri", + "cte", + "dfpzc", + "cmpsceh", + "pfpo", + "dfphp", + "dfp", + "fpe", + "emon", + "parseh", + "hfpue", + "hfpm", + "nonqks", + "ipter", + "csske", + "edat", + "asnlxr", + "msa2", + "msa1", + "tods" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z990.5-base", + "typename": "z990.5-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "hfpm" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z10BC-base", + "typename": "z10BC-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "dateh2", + "pfpo", + "dfphp", + "dfp", + "parseh", + "hfpue", + "hfpm", + "csske", + "asnlxr", + "tods" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z900-base", + "typename": "z900-base-s390x-cpu", + "unavailable-features": [ + ], + "static": true, + "migration-safe": true + }, + { + "name": "z13.2", + "typename": "z13.2-s390x-cpu", + "unavailable-features": [ + "ppno-sha-512-drng", + "pcc-xts-eaes-256", + "pcc-xts-eaes-128", + "pcc-xts-aes-256", + "pcc-xts-aes-128", + "pcc-cmac-eaes-256", + "pcc-cmac-eaes-192", + "pcc-cmac-eaes-128", + "pcc-cmac-eaes-256", + "pcc-cmac-aes-192", + "pcc-cmac-aes-128", + "pcc-cmac-etdea-192", + "pcc-cmac-etdea-128", + "pcc-cmac-edea", + "pcc-cmac-tdea-192", + "pcc-cmac-tdea-128", + "pcc-cmac-dea", + "kmo-eaes-256", + "kmo-eaes-192", + "kmo-eaes-128", + "kmo-aes-256", + "kmo-aes-192", + "kmo-aes-128", + "kmo-etdea-192", + "kmo-etdea-128", + "kmo-edea", + "kmo-tdea-192", + "kmo-tdea-128", + "kmo-dea", + "kmf-eaes-256", + "kmf-eaes-192", + "kmf-eaes-128", + "kmf-aes-256", + "kmf-aes-192", + "kmf-aes-128", + "kmf-etdea-192", + "kmf-etdea-128", + "kmf-edea", + "kmf-tdea-192", + "kmf-tdea-128", + "kmf-dea", + "kmctr-eaes-256", + "kmctr-eaes-192", + "kmctr-eaes-128", + "kmctr-aes-256", + "kmctr-aes-192", + "kmctr-aes-128", + "kmctr-etdea-192", + "kmctr-etdea-128", + "kmctr-edea", + "kmctr-tdea-192", + "kmctr-tdea-128", + "kmctr-dea", + "pckmo-aes-256", + "pckmo-aes-192", + "pckmo-aes-128", + "pckmo-etdea-192", + "pckmo-etdea-128", + "pckmo-edea", + "klmd-sha-1", + "kimd-ghash", + "kimd-sha-1", + "km-xts-eaes-256", + "km-xts-eaes-128", + "km-xts-aes-256", + "km-xts-aes-128", + "km-eaes-256", + "km-eaes-192", + "km-eaes-128", + "km-etdea-192", + "km-etdea-128", + "km-edea", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-eaes-256", + "kmc-eaes-192", + "kmc-eaes-128", + "kmc-etdea-192", + "kmc-etdea-128", + "kmc-edea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-eaes-256", + "kmac-eaes-192", + "kmac-eaes-128", + "kmac-aes-256", + "kmac-aes-192", + "kmac-aes-128", + "kmac-etdea-192", + "kmac-etdea-128", + "kmac-edea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "cmm", + "dateh2", + "esop", + "sea_esop2", + "vx", + "dfppc", + "edat2", + "aefsi", + "sthyi", + "te", + "ri", + "cte", + "dfpzc", + "cmpsceh", + "pfpo", + "dfphp", + "dfp", + "fpe", + "emon", + "parseh", + "hfpue", + "hfpm", + "nonqks", + "ipter", + "csske", + "edat", + "asnlxr", + "msa2", + "msa1", + "gen13ptff", + "tods", + "type" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z890.3-base", + "typename": "z890.3-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "hfpm" + ], + "static": true, + "migration-safe": true + }, + { + "name": "zBC12-base", + "typename": "zBC12-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "dateh2", + "dfpzc", + "cmpsceh", + "pfpo", + "dfphp", + "dfp", + "fpe", + "emon", + "parseh", + "hfpue", + "hfpm", + "nonqks", + "csske", + "asnlxr", + "tods" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z13.2-base", + "typename": "z13.2-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "dateh2", + "dfppc", + "dfpzc", + "cmpsceh", + "pfpo", + "dfphp", + "dfp", + "fpe", + "emon", + "parseh", + "hfpue", + "hfpm", + "nonqks", + "csske", + "asnlxr", + "gen13ptff", + "tods", + "type" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z990-base", + "typename": "z990-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "hfpm" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z10EC.2", + "typename": "z10EC.2-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "cmm", + "dateh2", + "sthyi", + "pfpo", + "dfphp", + "dfp", + "parseh", + "hfpue", + "hfpm", + "csske", + "edat", + "asnlxr", + "msa2", + "msa1", + "tods" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z9BC", + "typename": "z9BC-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "cmm", + "dateh2", + "sthyi", + "hfpue", + "hfpm", + "asnlxr", + "msa1", + "tods" + ], + "static": false, + "migration-safe": true + }, + { + "name": "z10EC.3-base", + "typename": "z10EC.3-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "dateh2", + "pfpo", + "dfphp", + "dfp", + "parseh", + "hfpue", + "hfpm", + "csske", + "asnlxr", + "tods" + ], + "static": true, + "migration-safe": true + }, + { + "name": "z990.3-base", + "typename": "z990.3-base-s390x-cpu", + "unavailable-features": [ + "klmd-sha-1", + "kimd-sha-1", + "km-tdea-192", + "km-tdea-128", + "km-dea", + "kmc-tdea-192", + "kmc-tdea-128", + "kmc-dea", + "kmac-tdea-192", + "kmac-tdea-128", + "kmac-dea", + "hfpm" + ], + "static": true, + "migration-safe": true + } + ], + "id": "libvirt-2" +} + +{ + "id": "libvirt-3", "error": { "class": "GenericError", "desc": "The CPU definition 'max' is unknown." diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 607274ebb7..c486340c7d 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -3,7 +3,7 @@ <selfctime>0</selfctime> <selfvers>0</selfvers> <usedQMP/> - <flag name='enable-kvm'/> + <flag name='kvm'/> <flag name='boot-index'/> <flag name='virtio-tx-alg'/> <flag name='virtio-blk-pci.ioeventfd'/> @@ -126,11 +126,108 @@ <flag name='virtual-css-bridge'/> <flag name='virtual-css-bridge.cssid-unrestricted'/> <flag name='vfio-ccw'/> - <version>2011090</version> + <version>2012000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>0</microcodeVersion> - <package>v2.12.0-rc0</package> + <microcodeVersion>371055</microcodeVersion> + <package></package> <arch>s390x</arch> + <hostCPU type='kvm' model='z14-base' migratability='no'> + <property name='aen' type='boolean' value='true'/> + <property name='aefsi' type='boolean' value='true'/> + <property name='msa8' type='boolean' value='true'/> + <property name='msa7' type='boolean' value='true'/> + <property name='msa6' type='boolean' value='true'/> + <property name='msa5' type='boolean' value='true'/> + <property name='msa4' type='boolean' value='true'/> + <property name='msa3' type='boolean' value='true'/> + <property name='msa2' type='boolean' value='true'/> + <property name='msa1' type='boolean' value='true'/> + <property name='sthyi' type='boolean' value='true'/> + <property name='edat' type='boolean' value='true'/> + <property name='ri' type='boolean' value='true'/> + <property name='edat2' type='boolean' value='true'/> + <property name='vx' type='boolean' value='true'/> + <property name='ipter' type='boolean' value='true'/> + <property name='vxeh' type='boolean' value='true'/> + <property name='vxpd' type='boolean' value='true'/> + <property name='esop' type='boolean' value='true'/> + <property name='iep' type='boolean' value='true'/> + <property name='cte' type='boolean' value='true'/> + <property name='gs' type='boolean' value='true'/> + <property name='ppa15' type='boolean' value='true'/> + <property name='zpci' type='boolean' value='true'/> + <property name='sea_esop2' type='boolean' value='true'/> + <property name='te' type='boolean' value='true'/> + <property name='cmm' type='boolean' value='true'/> + </hostCPU> + <cpu type='kvm' name='z890.2' usable='yes'/> + <cpu type='kvm' name='z990.4' usable='yes'/> + <cpu type='kvm' name='z10BC.2' usable='yes'/> + <cpu type='kvm' name='z196.2' usable='yes'/> + <cpu type='kvm' name='z14' usable='yes'/> + <cpu type='kvm' name='z9BC-base' usable='yes'/> + <cpu type='kvm' name='zEC12-base' usable='yes'/> + <cpu type='kvm' name='z196-base' usable='yes'/> + <cpu type='kvm' name='z13-base' usable='yes'/> + <cpu type='kvm' name='z990.3' usable='yes'/> + <cpu type='kvm' name='host' usable='yes'/> + <cpu type='kvm' name='z9EC' usable='yes'/> + <cpu type='kvm' name='zBC12' usable='yes'/> + <cpu type='kvm' name='z9EC.3' usable='yes'/> + <cpu type='kvm' name='z196.2-base' usable='yes'/> + <cpu type='kvm' name='qemu' usable='no'> + <blocker name='ais'/> + </cpu> + <cpu type='kvm' name='zEC12.2-base' usable='yes'/> + <cpu type='kvm' name='z800-base' usable='yes'/> + <cpu type='kvm' name='z9EC.2' usable='yes'/> + <cpu type='kvm' name='z900.2-base' usable='yes'/> + <cpu type='kvm' name='z900.3' usable='yes'/> + <cpu type='kvm' name='z890-base' usable='yes'/> + <cpu type='kvm' name='z890' usable='yes'/> + <cpu type='kvm' name='z990.4-base' usable='yes'/> + <cpu type='kvm' name='z10BC.2-base' usable='yes'/> + <cpu type='kvm' name='z900.2' usable='yes'/> + <cpu type='kvm' name='z9BC.2-base' usable='yes'/> + <cpu type='kvm' name='z800' usable='yes'/> + <cpu type='kvm' name='z114' usable='yes'/> + <cpu type='kvm' name='z13' usable='yes'/> + <cpu type='kvm' name='z13s-base' usable='yes'/> + <cpu type='kvm' name='z990' usable='yes'/> + <cpu type='kvm' name='z990.2' usable='yes'/> + <cpu type='kvm' name='z14-base' usable='yes'/> + <cpu type='kvm' name='z890.2-base' usable='yes'/> + <cpu type='kvm' name='z196' usable='yes'/> + <cpu type='kvm' name='z10EC' usable='yes'/> + <cpu type='kvm' name='z13s' usable='yes'/> + <cpu type='kvm' name='z900' usable='yes'/> + <cpu type='kvm' name='z10EC.3' usable='yes'/> + <cpu type='kvm' name='z10EC.2-base' usable='yes'/> + <cpu type='kvm' name='z114-base' usable='yes'/> + <cpu type='kvm' name='z990.2-base' usable='yes'/> + <cpu type='kvm' name='z9EC.2-base' usable='yes'/> + <cpu type='kvm' name='z890.3' usable='yes'/> + <cpu type='kvm' name='z900.3-base' usable='yes'/> + <cpu type='kvm' name='z9BC.2' usable='yes'/> + <cpu type='kvm' name='z10BC' usable='yes'/> + <cpu type='kvm' name='z990.5' usable='yes'/> + <cpu type='kvm' name='zEC12.2' usable='yes'/> + <cpu type='kvm' name='z10EC-base' usable='yes'/> + <cpu type='kvm' name='z9EC-base' usable='yes'/> + <cpu type='kvm' name='z9EC.3-base' usable='yes'/> + <cpu type='kvm' name='zEC12' usable='yes'/> + <cpu type='kvm' name='z990.5-base' usable='yes'/> + <cpu type='kvm' name='z10BC-base' usable='yes'/> + <cpu type='kvm' name='z900-base' usable='yes'/> + <cpu type='kvm' name='z13.2' usable='yes'/> + <cpu type='kvm' name='z890.3-base' usable='yes'/> + <cpu type='kvm' name='zBC12-base' usable='yes'/> + <cpu type='kvm' name='z13.2-base' usable='yes'/> + <cpu type='kvm' name='z990-base' usable='yes'/> + <cpu type='kvm' name='z10EC.2' usable='yes'/> + <cpu type='kvm' name='z9BC' usable='yes'/> + <cpu type='kvm' name='z10EC.3-base' usable='yes'/> + <cpu type='kvm' name='z990.3-base' usable='yes'/> <cpu type='tcg' name='z890.2' usable='no'> <blocker name='klmd-sha-1'/> <blocker name='kimd-sha-1'/> @@ -306,12 +403,6 @@ <blocker name='tods'/> </cpu> <cpu type='tcg' name='z14' usable='no'> - <blocker name='kma-gcm-eaes-256'/> - <blocker name='kma-gcm-eaes-192'/> - <blocker name='kma-gcm-eaes-128'/> - <blocker name='kma-gcm-aes-256'/> - <blocker name='kma-gcm-aes-192'/> - <blocker name='kma-gcm-aes-128'/> <blocker name='ppno-sha-512-drng'/> <blocker name='pcc-xts-eaes-256'/> <blocker name='pcc-xts-eaes-128'/> @@ -411,7 +502,6 @@ <blocker name='cmm'/> <blocker name='dateh2'/> <blocker name='esop'/> - <blocker name='msa8-base'/> <blocker name='vxeh'/> <blocker name='vxpd'/> <blocker name='gs'/> @@ -445,6 +535,7 @@ <blocker name='csske'/> <blocker name='edat'/> <blocker name='asnlxr'/> + <blocker name='msa8'/> <blocker name='msa7'/> <blocker name='msa6'/> <blocker name='msa2'/> -- 2.14.2

3 5

[libvirt] [jenkins-ci PATCH] jobs: don't create MANIFEST file during build
by Daniel P. Berrangé 16 May '18

16 May '18

Projects have switched to a pre-built MANIFEST Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- jobs/perl-modulebuild.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/jobs/perl-modulebuild.yaml b/jobs/perl-modulebuild.yaml index 60374da..a80d6b8 100644 --- a/jobs/perl-modulebuild.yaml +++ b/jobs/perl-modulebuild.yaml @@ -44,7 +44,6 @@ {local_env} perl Build.PL install_base="$VIRT_PREFIX" perl Build - perl Build manifest perl Build install publishers: - email: -- 2.17.0

1 0

[libvirt] [jenkins-ci PATCH 0/3] guests: Update for Module::Build
by Andrea Bolognani 16 May '18

16 May '18

To be applied along with https://www.redhat.com/archives/libvir-list/2018-May/msg01121.html once libvirt-perl switches to Module::Build. Andrea Bolognani (3): guests: Install Module::Build for libvirt-perl guests: Add Archive::Tar dependency for Perl projects guests: Blacklist perl-ExtUtils-MakeMaker guests/vars/mappings.yml | 6 +++++- guests/vars/projects/blacklist.yml | 1 + guests/vars/projects/libvirt-perl.yml | 3 ++- guests/vars/projects/libvirt-tck.yml | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) -- 2.17.0

2 14

[libvirt] [jenkins-ci PATCH 0/2] Fix archive_format handling
by Andrea Bolognani 16 May '18

16 May '18

Andrea Bolognani (2): jobs: Move archive_format to defaults projects: Define archive_format for osinfo-db jobs/autotools.yaml | 1 - jobs/defaults.yaml | 1 + jobs/generic.yaml | 1 - jobs/perl-makemaker.yaml | 1 - jobs/perl-modulebuild.yaml | 1 - projects/osinfo-db.yaml | 3 ++- 6 files changed, 3 insertions(+), 5 deletions(-) -- 2.17.0

3 6

[libvirt] ANNOUNCE: libvirt-dbus 1.0.0 released
by Pavel Hrdina 16 May '18

16 May '18

I'm happy to announce the release of libvirt-dbus 1.0.0. libvirt-dbus wraps libvirt API to provide high-level object-oriented API better suited for dbus-based applications. You can download it here: https://libvirt.org/sources/dbus/libvirt-dbus-1.0.0.tar.gz * Fist stable release, from now on we will not change existing APIs * New features - Support for almost all relevant domain APIs and events up to libvirt 3.0.0 - Support for all relevant connect APIs up to libvirt 3.0.0 - Support for all relevant network APIs and events up to libvirt 3.0.0 - Support for all relevant storage pool APIs and events up to libvirt 3.0.0 - Support for all relevant secret APIs and evetns up to libvirt 3.0.0 * Improvements - Added org.gtk.GDBus.DocString annotation for D-Bus APIs - Added man page for libvirt-dbus daemon Thanks everybody who contributed! Pavel

1 0

[libvirt] [sandbox PATCH v2 0/4] Remove Test::AutoBuild leftovers
by Andrea Bolognani 16 May '18

16 May '18

Changes from [v1]: * rename the script instead of dropping it; * perform some further clean ups. [v1] https://www.redhat.com/archives/libvir-list/2018-May/msg00220.html Andrea Bolognani (4): maint: Rename autobuild.sh to prepare-release.sh prepare-release: Drop references to MinGW builds prepare-release: Drop references to Test::AutoBuild spec: Drop %{extra_release} autobuild.sh | 71 ----------------------------------------- libvirt-sandbox.spec.in | 2 +- prepare-release.sh | 39 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 72 deletions(-) delete mode 100755 autobuild.sh create mode 100755 prepare-release.sh -- 2.17.0

2 7

[libvirt] [tck PATCH] Use a pre-created MANIFEST file
by Daniel P. Berrangé 16 May '18

16 May '18

Using the MANIFEST.SKIP blacklist approach risks creating tarballs with extra files mistakenly included if the working directory is not clean. Switch to a pre-created MANIFEST file, since maintaining this short list of files is not hard work. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitignore | 1 - MANIFEST | 219 +++++++++++++++++++++++++++++++++++++++++++++ MANIFEST.SKIP | 19 ---- prepare-release.sh | 1 - 4 files changed, 219 insertions(+), 21 deletions(-) create mode 100644 MANIFEST delete mode 100644 MANIFEST.SKIP diff --git a/.gitignore b/.gitignore index cc1470e..ca3e424 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ *.orig *~ Build -MANIFEST META.yml Makefile Makefile.PL diff --git a/MANIFEST b/MANIFEST new file mode 100644 index 0000000..b632328 --- /dev/null +++ b/MANIFEST @@ -0,0 +1,219 @@ +bin/libvirt-tck +Build.PL +conf/default.cfg +docs/intro.pod +docs/writing-tests.pod +lib/Sys/Virt/TCK.pm +lib/Sys/Virt/TCK/Capabilities.pm +lib/Sys/Virt/TCK/DomainBuilder.pm +lib/Sys/Virt/TCK/Hooks.pm +lib/Sys/Virt/TCK/NetworkBuilder.pm +lib/Sys/Virt/TCK/NetworkHelpers.pm +lib/Sys/Virt/TCK/SELinux.pm +lib/Sys/Virt/TCK/StoragePoolBuilder.pm +lib/Sys/Virt/TCK/StorageVolBuilder.pm +lib/Sys/Virt/TCK/TAP/XMLFormatter.pm +lib/Sys/Virt/TCK/TAP/XMLFormatterSession.pm +LICENSE +Makefile.PL +MANIFEST +META.json +META.yml +perl-Sys-Virt-TCK.spec +perl-Sys-Virt-TCK.spec.PL +prepare-release.sh +README +scripts/domain/050-transient-lifecycle.t +scripts/domain/051-transient-autostart.t +scripts/domain/060-persistent-lifecycle.t +scripts/domain/061-persistent-autostart.t +scripts/domain/065-persistent-redefine.t +scripts/domain/070-transient-to-persistent.t +scripts/domain/080-unique-id-define.t +scripts/domain/081-unique-id-create.t +scripts/domain/082-unique-id-caching.t +scripts/domain/090-invalid-ops-when-inactive.t +scripts/domain/100-transient-save-restore.t +scripts/domain/101-persistent-save-restore.t +scripts/domain/102-broken-save-restore.t +scripts/domain/103-blockdev-save-restore.t +scripts/domain/110-memory-balloon.t +scripts/domain/120-disks-stats.t +scripts/domain/121-block-info.t +scripts/domain/130-cpu-hotplug.t +scripts/domain/180-interface-parameters.t +scripts/domain/200-disk-hotplug.t +scripts/domain/202-numa-set-parameters.t +scripts/domain/205-disk-hotplug-ordering.t +scripts/domain/207-disk-media-change.t +scripts/domain/210-nic-hotplug.t +scripts/domain/215-nic-hotplug-many.t +scripts/domain/240-usb-host-hotplug.t +scripts/domain/250-pci-host-hotplug.t +scripts/domain/300-migration.t +scripts/domain/301-migration-max-speed.t +scripts/hooks/051-daemon-hook.t +scripts/hooks/052-domain-hook.t +scripts/networks/050-transient-lifecycle.t +scripts/networks/051-transient-autostart.t +scripts/networks/060-persistent-lifecycle.t +scripts/networks/061-persistent-autostart.t +scripts/networks/065-persistent-redefine.t +scripts/networks/070-transient-to-persistent.t +scripts/networks/080-unique-id-define.t +scripts/networks/081-unique-id-create.t +scripts/networks/082-unique-id-caching.t +scripts/networks/090-invalid-ops-when-inactive.t +scripts/networks/100-apply-verify-host.t +scripts/networks/110-interface-change-transaction.t +scripts/networks/networkApplyTest.sh +scripts/networks/networkxml2hostout/tck-testnet-1.dat +scripts/networks/networkxml2hostout/tck-testnet-1.post.dat +scripts/networks/networkxml2hostout/tck-testnet-2.dat +scripts/networks/networkxml2hostout/tck-testnet-2.post.dat +scripts/networks/networkxml2hostout/tck-testnet-3.dat +scripts/networks/networkxml2hostout/tck-testnet-3.post.dat +scripts/networks/networkxml2xmlin/tck-testnet-1.xml +scripts/networks/networkxml2xmlin/tck-testnet-2.xml +scripts/networks/networkxml2xmlin/tck-testnet-3.xml +scripts/nwfilter/050-apply-verify-host.t +scripts/nwfilter/060-concurrency.t +scripts/nwfilter/100-ping-still-working.t +scripts/nwfilter/210-no-mac-spoofing.t +scripts/nwfilter/220-no-ip-spoofing.t +scripts/nwfilter/230-no-mac-broadcast.t +scripts/nwfilter/240-no-arp-spoofing.t +scripts/nwfilter/300-vsitype.t +scripts/nwfilter/concurrency/chg-vm-filter.sh +scripts/nwfilter/concurrency/start-destroy-vm.sh +scripts/nwfilter/concurrency/tck-vm1-filter1.xml +scripts/nwfilter/concurrency/tck-vm1-filter2.xml +scripts/nwfilter/concurrency/tck-vm1.xml +scripts/nwfilter/concurrency/tck-vm2-filter1.xml +scripts/nwfilter/concurrency/tck-vm2-filter2.xml +scripts/nwfilter/concurrency/tck-vm2.xml +scripts/nwfilter/nwfilter2vmtest.sh +scripts/nwfilter/nwfilter_concurrent.sh +scripts/nwfilter/nwfilterxml2fwallout/ah-ipv6-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/ah-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/all-ipv6-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/all-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/arp-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/comment-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/conntrack-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/esp-ipv6-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/esp-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/example-1.fwall +scripts/nwfilter/nwfilterxml2fwallout/example-2.fwall +scripts/nwfilter/nwfilterxml2fwallout/hex-data-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/icmp-direction-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/icmp-direction2-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/icmp-direction3-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/icmp-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/icmpv6-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/igmp-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/ip-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/ipset-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/ipt-no-macspoof-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/ipv6-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/iter-test1.fwall +scripts/nwfilter/nwfilterxml2fwallout/iter-test2.fwall +scripts/nwfilter/nwfilterxml2fwallout/iter-test3.fwall +scripts/nwfilter/nwfilterxml2fwallout/mac-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/rarp-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/sctp-ipv6-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/sctp-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/stp-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/target-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/target-test2.fwall +scripts/nwfilter/nwfilterxml2fwallout/tcp-ipv6-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/tcp-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/testvm.fwall.dat +scripts/nwfilter/nwfilterxml2fwallout/udp-ipv6-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/udp-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/udplite-ipv6-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/udplite-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/vlan-test.fwall +scripts/nwfilter/nwfilterxml2fwallout/zzz-ipset-cleanup.fwall +scripts/nwfilter/nwfilterxml2xmlin/ah-ipv6-test.xml +scripts/nwfilter/nwfilterxml2xmlin/ah-test.xml +scripts/nwfilter/nwfilterxml2xmlin/all-ipv6-test.xml +scripts/nwfilter/nwfilterxml2xmlin/all-test.xml +scripts/nwfilter/nwfilterxml2xmlin/arp-test.xml +scripts/nwfilter/nwfilterxml2xmlin/comment-test.xml +scripts/nwfilter/nwfilterxml2xmlin/conntrack-test.xml +scripts/nwfilter/nwfilterxml2xmlin/esp-ipv6-test.xml +scripts/nwfilter/nwfilterxml2xmlin/esp-test.xml +scripts/nwfilter/nwfilterxml2xmlin/example-1.xml +scripts/nwfilter/nwfilterxml2xmlin/example-2.xml +scripts/nwfilter/nwfilterxml2xmlin/hex-data-test.xml +scripts/nwfilter/nwfilterxml2xmlin/icmp-direction-test.xml +scripts/nwfilter/nwfilterxml2xmlin/icmp-direction2-test.xml +scripts/nwfilter/nwfilterxml2xmlin/icmp-direction3-test.xml +scripts/nwfilter/nwfilterxml2xmlin/icmp-test.xml +scripts/nwfilter/nwfilterxml2xmlin/icmpv6-test.xml +scripts/nwfilter/nwfilterxml2xmlin/igmp-test.xml +scripts/nwfilter/nwfilterxml2xmlin/ip-test.xml +scripts/nwfilter/nwfilterxml2xmlin/ipset-test.xml +scripts/nwfilter/nwfilterxml2xmlin/ipt-no-macspoof-test.xml +scripts/nwfilter/nwfilterxml2xmlin/ipv6-test.xml +scripts/nwfilter/nwfilterxml2xmlin/iter-test1.xml +scripts/nwfilter/nwfilterxml2xmlin/iter-test2.xml +scripts/nwfilter/nwfilterxml2xmlin/iter-test3.xml +scripts/nwfilter/nwfilterxml2xmlin/mac-test.xml +scripts/nwfilter/nwfilterxml2xmlin/rarp-test.xml +scripts/nwfilter/nwfilterxml2xmlin/ref-rule-test.xml +scripts/nwfilter/nwfilterxml2xmlin/ref-test.xml +scripts/nwfilter/nwfilterxml2xmlin/sctp-ipv6-test.xml +scripts/nwfilter/nwfilterxml2xmlin/sctp-test.xml +scripts/nwfilter/nwfilterxml2xmlin/stp-test.xml +scripts/nwfilter/nwfilterxml2xmlin/target-test.xml +scripts/nwfilter/nwfilterxml2xmlin/target-test2.xml +scripts/nwfilter/nwfilterxml2xmlin/tcp-ipv6-test.xml +scripts/nwfilter/nwfilterxml2xmlin/tcp-test.xml +scripts/nwfilter/nwfilterxml2xmlin/udp-ipv6-test.xml +scripts/nwfilter/nwfilterxml2xmlin/udp-test.xml +scripts/nwfilter/nwfilterxml2xmlin/udplite-ipv6-test.xml +scripts/nwfilter/nwfilterxml2xmlin/udplite-test.xml +scripts/nwfilter/nwfilterxml2xmlin/vlan-test.xml +scripts/nwfilter/nwfilterxml2xmlin/zzz-ipset-cleanup.xml +scripts/nwfilter/README +scripts/qemu/100-disk-encryption.t +scripts/qemu/200-qcow2-single-backing-file.t +scripts/qemu/205-qcow2-double-backing-file.t +scripts/qemu/210-qcow2-auto-probing.t +scripts/qemu/400-save-image-xml.t +scripts/selinux/050-dynamic-relabel-yes.t +scripts/selinux/055-dynamic-base-label.t +scripts/selinux/100-static-relabel-no.t +scripts/selinux/105-static-relabel-fail.t +scripts/selinux/110-static-relabel-yes.t +scripts/storage/050-transient-lifecycle.t +scripts/storage/051-transient-autostart.t +scripts/storage/060-persistent-lifecycle.t +scripts/storage/061-persistent-autostart.t +scripts/storage/065-persistent-redefine.t +scripts/storage/070-transient-to-persistent.t +scripts/storage/080-unique-id-define.t +scripts/storage/081-unique-id-create.t +scripts/storage/082-unique-id-caching.t +scripts/storage/090-invalid-ops-when-inactive.t +scripts/storage/100-create-vol-dir.t +scripts/storage/110-disk-pool.t +scripts/storage/120-get-ops.t +scripts/storage/200-clone-vol-dir.t +scripts/storage/250-vol-qcow2-backing-store.t +scripts/storage/255-vol-qcow2-backing-store-auto.t +scripts/storage/400-vol-download.t +scripts/storage/405-vol-download-all.t +scripts/storage/410-vol-download-nonblock.t +scripts/storage/415-vol-upload.t +scripts/storage/420-vol-upload-all.t +scripts/storage/425-vol-upload-nonblock.t +t/005-pod.t +t/010-pod-coverage.t +t/050-capabilities.t +t/070-domain-builder.t +t/080-network-builder.t +t/090-storage-pool-builder.t +t/100-storage-vol-builder.t diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP deleted file mode 100644 index 8aa28aa..0000000 --- a/MANIFEST.SKIP +++ /dev/null @@ -1,19 +0,0 @@ -.*\.old -.*\.bak -Sys-Virt-TCK- -blib -\.hg -.*~ -\.#.* -#.* -^Makefile$ -.*\.orig -data/ -results/ -^Build$ -^_build/ -^\.git/ -^cover_db/ -^libvirt-tck/ -^MYMETA.yml$ -^MYMETA\.json$ diff --git a/prepare-release.sh b/prepare-release.sh index 75777a8..ad29f16 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -21,7 +21,6 @@ rm -rf MANIFEST blib _build Build perl Build.PL install_base=$HOME/builder ./Build -./Build manifest if [ -z "$USE_COVER" ]; then -- 2.17.0

2 1

[libvirt] [perl PATCH v2] Switch over to using Module::Build
by Daniel P. Berrangé 16 May '18

16 May '18

The Module::Build system is nicer than ExtUtils::MakeMaker as it allows for better cross-platform portability by only relying on Perl, rather than both Perl and system 'make' binary. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitignore | 17 +++---- Build.PL | 102 +++++++++++++++++++++++++++++++++++++ MANIFEST | 73 ++++++++++++++++++++++++++ MANIFEST.SKIP | 20 -------- META.yml.PL | 55 -------------------- Makefile.PL | 85 ------------------------------- Virt.xs => lib/Sys/Virt.xs | 0 perl-Sys-Virt.spec.PL | 45 ++++++++-------- prepare-release.sh | 48 +++-------------- t/030-api-coverage.t | 2 +- 10 files changed, 210 insertions(+), 237 deletions(-) create mode 100755 Build.PL create mode 100644 MANIFEST delete mode 100644 MANIFEST.SKIP delete mode 100644 META.yml.PL delete mode 100644 Makefile.PL rename Virt.xs => lib/Sys/Virt.xs (100%) diff --git a/.gitignore b/.gitignore index dc0ba62..3f08c79 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,12 @@ -*.swp *~ -MANIFEST META.yml +META.json MYMETA.* -Makefile -Makefile.old +Makefile.PL Sys-Virt-*.tar.gz -Virt.bs -Virt.c -Virt.o blib/ -cover_db perl-Sys-Virt.spec -pm_to_blib -results.log -tags +lib/Sys/Virt\.c +lib/Sys/Virt\.o +_build/ +Build diff --git a/Build.PL b/Build.PL new file mode 100755 index 0000000..13a0e4f --- /dev/null +++ b/Build.PL @@ -0,0 +1,102 @@ +#!/usr/bin/perl +# +# Copyright (C) 2009-2018 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +use Module::Build; + +use strict; +use warnings; + +my $libvirtver = "4.4.0"; +my $stat = system "pkg-config --atleast-version=$libvirtver libvirt"; +die "cannot run pkg-config to check libvirt version" if $stat == -1; +die "libvirt >= $libvirtver is required\n" unless $stat == 0; + +my $LIBVIRT_LIBS = `pkg-config --libs libvirt`; +my $LIBVIRT_CFLAGS = `pkg-config --cflags libvirt`; + +my $GCC_CFLAGS = ""; +if ($ENV{TEST_MAINTAINER}) { + $GCC_CFLAGS = qq( + -W -Waddress -Wall -Warray-bounds -Wattributes + -Wbad-function-cast -Wbuiltin-macro-redefined -Wcast-align + -Wchar-subscripts -Wclobbered -Wcomment -Wcomments + -Wcoverage-mismatch -Wcpp -Wdeprecated-declarations + -Wdisabled-optimization -Wdiv-by-zero -Wdouble-promotion + -Wempty-body -Wendif-labels -Wextra -Wformat-contains-nul + -Wformat-extra-args -Wformat-security -Wformat-y2k + -Wformat-zero-length -Wformat=2 -Wfree-nonheap-object + -Wignored-qualifiers -Wimplicit -Wimplicit-function-declaration + -Wimplicit-int -Winit-self -Wint-to-pointer-cast + -Winvalid-memory-model -Winvalid-pch -Wjump-misses-init + -Wlogical-op -Wmain -Wmaybe-uninitialized -Wmissing-braces + -Wmissing-declarations -Wmissing-field-initializers + -Wmissing-format-attribute -Wmissing-include-dirs + -Wmissing-noreturn -Wmissing-parameter-type + -Wmultichar -Wnarrowing -Wnonnull + -Wnormalized=nfc -Wold-style-declaration -Wold-style-definition + -Woverflow -Woverride-init -Wpacked-bitfield-compat -Wparentheses + -Wpointer-arith -Wpointer-sign -Wpointer-to-int-cast -Wpragmas + -Wreturn-type -Wsequence-point -Wno-shadow -Wstrict-aliasing + -Wstrict-prototypes -Wsuggest-attribute=const + -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure -Wswitch + -Wsync-nand -Wtrampolines -Wtrigraphs -Wtype-limits -Wuninitialized + -Wunknown-pragmas -Wunused -Wunused-but-set-parameter + -Wunused-but-set-variable -Wunused-function -Wunused-label + -Wunused-local-typedefs -Wno-unused-parameter -Wunused-result + -Wunused-value -Wunused-variable -Wvariadic-macros + -Wvector-operation-performance -Wvolatile-register-var + -Wwrite-strings -Wno-sign-compare -Wjump-misses-init + -Wno-format-nonliteral -Wframe-larger-than=8192 + -Wno-suggest-attribute=pure -Wno-suggest-attribute=const + -Wno-cast-function-type + ); +} + +my $b = Module::Build->new( + module_name => "Sys::Virt", + license => 'gpl', + configure_requires => { + 'Module::Build' => 0, + }, + create_makefile_pl => 'small', + dist_author => 'Daniel Berrange <dan(a)berrange.com>', + dist_abstract => 'libvirt Perl API', + requires => { + 'perl' => '5.8.0', + }, + extra_compiler_flags => $GCC_CFLAGS . $LIBVIRT_CFLAGS, + extra_linker_flags => $LIBVIRT_LIBS, + build_requires => { + 'ExtUtils::CBuilder' => 0, + 'Sys::Hostname' => 0, + 'Test::CPAN::Changes' => 0, + 'Test::More' => 0, + 'Test::Pod' => '0', + 'Test::Pod::Coverage' => '0', + 'Time::HiRes' => 0, + 'XML::XPath' => 0, + 'XML::XPath::XMLParser' => 0, + }, + script_files => [], + meta_add => { + resources => { + license => "http://www.gnu.org/licenses/gpl.html", + homepage => "http://libvirt.org/", + repository => "https://libvirt.org/git/?p=libvirt-perl.git;a=summary", + MailingList => "http://www.redhat.com/mailman/listinfo/libvir-list", + }, + }, + PL_files => { 'perl-Sys-Virt.spec.PL' => 'perl-Sys-Virt.spec' }, + ); +$b->create_build_script; diff --git a/MANIFEST b/MANIFEST new file mode 100644 index 0000000..3840a5c --- /dev/null +++ b/MANIFEST @@ -0,0 +1,73 @@ +.gitignore +.gitpublish +AUTHORS +Build.PL +Changes +HACKING +INSTALL +LICENSE +README +examples/auth.pl +examples/devices.pl +examples/dhcp-leases.pl +examples/dom-fsinfo.pl +examples/dom-ifinfo.pl +examples/dom-migrate.pl +examples/dom-stats.pl +examples/dump-info.pl +examples/dump-xml.pl +examples/emulator-pin.pl +examples/events.pl +examples/fs-freeze.pl +examples/hv-stat.pl +examples/iothreadinfo.pl +examples/node-alloc.pl +examples/node-cpu.pl +examples/node-devlist.pl +examples/node-info.pl +examples/node-ksm.pl +examples/open-console.pl +examples/save-restore.pl +examples/send-key.pl +examples/vcpuinfo.pl +examples/vol-download-all.pl +examples/vol-download-nonblock.pl +examples/vol-download.pl +examples/vol-sparse.pl +examples/vol-upload-all.pl +examples/vol-upload-nonblock.pl +examples/vol-upload.pl +lib/Sys/Virt.pm +lib/Sys/Virt.xs +lib/Sys/Virt/Domain.pm +lib/Sys/Virt/DomainSnapshot.pm +lib/Sys/Virt/Error.pm +lib/Sys/Virt/Event.pm +lib/Sys/Virt/Interface.pm +lib/Sys/Virt/NWFilter.pm +lib/Sys/Virt/Network.pm +lib/Sys/Virt/NodeDevice.pm +lib/Sys/Virt/Secret.pm +lib/Sys/Virt/StoragePool.pm +lib/Sys/Virt/StorageVol.pm +lib/Sys/Virt/Stream.pm +perl-Sys-Virt.spec +perl-Sys-Virt.spec.PL +prepare-release.sh +Makefile.PL +t/005-pod.t +t/010-pod-coverage.t +t/015-changes.t +t/020-constants.t +t/030-api-coverage.t +t/100-connect.t +t/200-domains.t +t/300-networks.t +t/400-storage-pools.t +t/500-storage-vols.t +t/600-interfaces.t +t/800-events.t +typemap +Makefile.PL +META.yml +META.json diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP deleted file mode 100644 index ebce958..0000000 --- a/MANIFEST.SKIP +++ /dev/null @@ -1,20 +0,0 @@ -pm_to_blib -Virt\.o -Virt\.c -Virt\.bs -Virt\.xsc -.*.old -Sys-Virt- -blib -.*\.bak -CVS -.cvsignore -.*~ -.#.* -#.* -^Makefile$ -^cover_db/ -.hg -.*\.orig -.*\.sh -\.git diff --git a/META.yml.PL b/META.yml.PL deleted file mode 100644 index 0467309..0000000 --- a/META.yml.PL +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright (C) 2008 Daniel Berrange <dan(a)berrange.com> - -use strict; -use warnings; - -die unless (scalar @ARGV == 1); - -open SRC, "lib/Sys/Virt.pm" - or die "lib/Sys/Virt.pm: $!"; - -our $VERSION; -while (<SRC>) { - if (/\$VERSION\s*=\s*'(.*)'/) { - $VERSION=$1; - } -} -close SRC; - -local $/ = undef; -$_ = <DATA>; -s/\@VERSION\@/$VERSION/g; - -open SPEC, ">$ARGV[0]" or die "$!"; -print SPEC $_; -close SPEC; -__DATA__ ---- #YAML:1.0 -name: Sys-Virt -abstract: Extension for the libvirt library -version: @VERSION@ -author: - - Daniel P. Berrange <dan(a)berrange.com> -license: perl -generated_by: ExtUtils::MakeMaker version 6.30 -build_requires: - Test::More: 0 - Test::Pod: 0 - Test::Pod::Coverage: 0 - Test::CPAN::Changes: 0 - XML::XPath: 0 - XML::XPath::XMLParser: 0 - Sys::Hostname: 0 - Time::HiRes: 0 - -resources: - license: http://dev.perl.org/licenses/ - homepage: http://libvirt.org/ - repository: http://libvirt.org/git/?p=libvirt-perl.git;a=summary - MailingList: http://www.redhat.com/mailman/listinfo/libvir-list - -distribution_type: module - -meta-spec: - version: 1.3 - url: http://module-build.sourceforge.net/META-spec-v1.3.html diff --git a/Makefile.PL b/Makefile.PL deleted file mode 100644 index f72e210..0000000 --- a/Makefile.PL +++ /dev/null @@ -1,85 +0,0 @@ -use 5.006; -use ExtUtils::MakeMaker; -# See lib/ExtUtils/MakeMaker.pm for details of how to influence -# the contents of the Makefile that is written. - -my $libvirtver = "4.4.0"; -my $stat = system "pkg-config --atleast-version=$libvirtver libvirt"; -die "cannot run pkg-config to check libvirt version" if $stat == -1; -die "libvirt >= $libvirtver is required\n" unless $stat == 0; - -my $LIBVIRT_LIBS = `pkg-config --libs libvirt`; -my $LIBVIRT_CFLAGS = `pkg-config --cflags libvirt`; - -my $gccflags = "-W -Waddress -Wall -Warray-bounds -Wattributes \\ - -Wbad-function-cast -Wbuiltin-macro-redefined -Wcast-align \\ - -Wchar-subscripts -Wclobbered -Wcomment -Wcomments \\ - -Wcoverage-mismatch -Wcpp -Wdeprecated-declarations \\ - -Wdisabled-optimization -Wdiv-by-zero -Wdouble-promotion \\ - -Wempty-body -Wendif-labels -Wextra -Wformat-contains-nul \\ - -Wformat-extra-args -Wformat-security -Wformat-y2k \\ - -Wformat-zero-length -Wformat=2 -Wfree-nonheap-object \\ - -Wignored-qualifiers -Wimplicit -Wimplicit-function-declaration \\ - -Wimplicit-int -Winit-self -Wint-to-pointer-cast \\ - -Winvalid-memory-model -Winvalid-pch -Wjump-misses-init \\ - -Wlogical-op -Wmain -Wmaybe-uninitialized -Wmissing-braces \\ - -Wmissing-declarations -Wmissing-field-initializers \\ - -Wmissing-format-attribute -Wmissing-include-dirs \\ - -Wmissing-noreturn -Wmissing-parameter-type \\ - -Wmultichar -Wnarrowing -Wnonnull \\ - -Wnormalized=nfc -Wold-style-declaration -Wold-style-definition \\ - -Woverflow -Woverride-init -Wpacked-bitfield-compat -Wparentheses \\ - -Wpointer-arith -Wpointer-sign -Wpointer-to-int-cast -Wpragmas \\ - -Wreturn-type -Wsequence-point -Wno-shadow -Wstrict-aliasing \\ - -Wstrict-prototypes -Wsuggest-attribute=const \\ - -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure -Wswitch \\ - -Wsync-nand -Wtrampolines -Wtrigraphs -Wtype-limits -Wuninitialized \\ - -Wunknown-pragmas -Wunused -Wunused-but-set-parameter \\ - -Wunused-but-set-variable -Wunused-function -Wunused-label \\ - -Wunused-local-typedefs -Wno-unused-parameter -Wunused-result \\ - -Wunused-value -Wunused-variable -Wvariadic-macros \\ - -Wvector-operation-performance -Wvolatile-register-var \\ - -Wwrite-strings -Wno-sign-compare -Wjump-misses-init \\ - -Wno-format-nonliteral -Wframe-larger-than=8192 \\ - -Wno-suggest-attribute=pure -Wno-suggest-attribute=const -Werror"; - -my $cflags; -if ($ENV{TEST_MAINTAINER}) { - $cflags = $gccflags; -} else { - $cflags = "-Wall"; -} - -WriteMakefile( - 'NAME' => 'Sys::Virt', - 'VERSION_FROM' => 'lib/Sys/Virt.pm', - 'PREREQ_PM' => { - 'Test::More' => 0, - 'Test::Pod' => 0, - 'Test::Pod::Coverage' => 0, - 'Test::CPAN::Changes' => 0, - 'Time::HiRes' => 0, - 'XML::XPath' => 0, - }, - 'AUTHOR' => 'Daniel Berrange <dan(a)berrange.com>', - 'LIBS' => [$LIBVIRT_LIBS], - 'INC' => "$cflags $LIBVIRT_CFLAGS", - 'depend' => { - Sys-Virt.spec => '$(VERSION_FROM)', - Makefile => '$(VERSION_FROM)', - }, - 'NO_META' => 1, - 'realclean' => { - FILES => 'Sys-Virt.spec', - }, -); - -package MY; - -sub libscan - { - my ($self, $path) = @_; - ($path =~ /\~$/ || $path =~ m,/CVS/,) ? undef : $path; - } - -__END__ diff --git a/Virt.xs b/lib/Sys/Virt.xs similarity index 100% rename from Virt.xs rename to lib/Sys/Virt.xs diff --git a/perl-Sys-Virt.spec.PL b/perl-Sys-Virt.spec.PL index ffa6c86..e7b4044 100644 --- a/perl-Sys-Virt.spec.PL +++ b/perl-Sys-Virt.spec.PL @@ -6,15 +6,19 @@ use strict; die unless (scalar @ARGV == 1); -unless (do './lib/Sys/Virt.pm') - { - if ($@) { die $@ }; - die "lib/Sys/Virt.pm: $!"; - } +open PM, './lib/Sys/Virt.pm' or die "lib/Sys/Virt.pm: $!"; +my $ver; +while (<PM>) { + if (/our \$VERSION = '(.*)'/) { + $ver = $1; + last; + } +} +die "cannot find version" unless $ver; local $/ = undef; $_ = <DATA>; -s/\@VERSION\@/$Sys::Virt::VERSION/g; +s/\@VERSION\@/$ver/g; open SPEC, ">$ARGV[0]" or die "$!"; print SPEC $_; @@ -29,9 +33,10 @@ Summary: Represent and manage a libvirt hypervisor connection License: GPLv2+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Sys-Virt/ -Source0: http://www.cpan.org/authors/id/D/DA/DANBERR/Sys-Virt-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/D/DA/DANBERR/Sys-Virt-v%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(ExtUtils::CBuilder) +BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) BuildRequires: perl(Test::CPAN::Changes) @@ -46,32 +51,24 @@ machine management APIs. This allows machines running within arbitrary virtualization containers to be managed with a consistent API. %prep -%setup -q -n Sys-Virt-%{version} +%setup -q -n Sys-Virt-v%{version} -sed -i -e '/Sys-Virt\.spec/d' Makefile.PL -sed -i -e '/\.spec\.PL$/d' MANIFEST -rm -f *.spec.PL %build -%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" -make %{?_smp_mflags} +%{__perl} Build.PL installdirs=vendor +./Build %install -rm -rf $RPM_BUILD_ROOT +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT - -find $RPM_BUILD_ROOT -type f $ -name .packlist -o -name '*.bs' -empty $ | - xargs rm -f -find $RPM_BUILD_ROOT -depth -type d -empty -exec rmdir {} \; +#find $RPM_BUILD_ROOT -type f $ -name .packlist -o -name '*.bs' -empty $ | +# xargs rm -f +#find $RPM_BUILD_ROOT -depth -type d -empty -exec rmdir {} \; %{_fixperms} $RPM_BUILD_ROOT/* %check -make test - -%clean -rm -rf $RPM_BUILD_ROOT +./Build test %files %defattr(-,root,root,-) diff --git a/prepare-release.sh b/prepare-release.sh index fea03f4..6850350 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -4,52 +4,18 @@ NAME=Sys-Virt set -e -test -n "$1" && RESULTS=$1 || RESULTS=results.log +rm -rf blib _build Build $NAME-*.tar.gz -make -k realclean ||: -rm -rf MANIFEST blib pm_to_blib +test -z "$AUTOBUILD_INSTALL_ROOT" && AUTOBUILD_INSTALL_ROOT=$HOME/builder export TEST_MAINTAINER=1 -perl Makefile.PL PREFIX=$HOME/builder +perl Build.PL install_base=$AUTOBUILD_INSTALL_ROOT -rm -f MANIFEST - -# Build the RPM. -make -make manifest - -if [ -z "$USE_COVER" ]; then - perl -MDevel::Cover -e '' 1>/dev/null 2>&1 && USE_COVER=1 || USE_COVER=0 -fi - -if [ -z "$SKIP_TESTS" -o "$SKIP_TESTS" = "0" ]; then - if [ "$USE_COVER" = "1" ]; then - cover -delete - export HARNESS_PERL_SWITCHES=-MDevel::Cover - fi - - # set -o pipefail is a bashism; this use of exec is the POSIX alternative - exec 3>&1 - st=$( - exec 4>&1 >&3 - { make test 2>&1 3>&- 4>&-; echo $? >&4; } | tee "$RESULTS" - ) - exec 3>&- - test "$st" = 0 - - if [ "$USE_COVER" = "1" ]; then - cover - mkdir blib/coverage - cp -a cover_db/*.html cover_db/*.css blib/coverage - mv blib/coverage/coverage.html blib/coverage/index.html - fi -fi - -make install - -rm -f $NAME-*.tar.gz -make dist +./Build +./Build test +./Build install +./Build dist if [ -f /usr/bin/rpmbuild ]; then rpmbuild --nodeps -ta --clean $NAME-*.tar.gz diff --git a/t/030-api-coverage.t b/t/030-api-coverage.t index 95bbd11..39d6146 100644 --- a/t/030-api-coverage.t +++ b/t/030-api-coverage.t @@ -48,7 +48,7 @@ foreach my $n ($set->get_nodelist) { push @macros, $n->getData(); } -open XS, "<Virt.xs" or die "cannot read Virt.xs: $!"; +open XS, "<lib/Sys/Virt.xs" or die "cannot read lib/Sys/Virt.xs: $!"; my $xs; { -- 2.17.0

2 2

[libvirt] [PATCH python 0/5] Some fixes and one improvement
by Marc Hartmayer 16 May '18

16 May '18

Boris Fiuczynski (1): libvirt-override.py: fix sparseSendAll Marc Hartmayer (4): libvirt_qemu/lxc: import 'sys' package libvirt_qemu/lxc: fix a namespace issue libvirt-override.py: remove unused import Allow virConnect to be used as a context manager generator.py | 8 ++++++-- libvirt-override-virConnect.py | 6 ++++++ libvirt-override-virStream.py | 2 +- libvirt-override.py | 1 - 4 files changed, 13 insertions(+), 4 deletions(-) -- 2.13.4

2 7

[libvirt] [dbus PATCH v2 0/4] API name fixes
by Pavel Hrdina 16 May '18

16 May '18

changes in v2: - fixed build error for each patch by moving all lifecycle function rename into a single patch Pavel Hrdina (4): domain: Rename (Get|Set)BlkioParameters events: Rename AgentLifecycle event events: Rename IOErrorReason event events: Rename all lifecycle event functions to follow the signal name data/org.libvirt.Domain.xml | 8 +++--- src/domain.c | 32 ++++++++++----------- src/events.c | 56 ++++++++++++++++++------------------- 3 files changed, 48 insertions(+), 48 deletions(-) -- 2.17.0

2 5

[libvirt] [PATCH] travis: Install Jansson instead of yajl
by Andrea Bolognani 16 May '18

16 May '18

libvirt has switched to Jansson as its JSON implementation, so we need it available for builds to succeed. yajl, on the other hand, is no longer needed. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Should be pushed at the same time as Ján's series. .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 140072b801..c3ea9f73b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: - brew uninstall python mercurial postgis sfcgal cgal gdal - brew update - brew upgrade - - brew install python rpcgen yajl + - brew install python rpcgen jansson script: # We can't run make distcheck/syntax-check because they # fail on macOS, but doing 'install' and 'dist' gives us @@ -61,6 +61,7 @@ addons: - libdevmapper-dev - libfuse-dev - libgnutls-dev + - libjansson-dev - libnetcf-dev - libnl-3-dev - libnl-route-3-dev @@ -82,7 +83,6 @@ addons: - libxen-dev - libxml2-dev - libxml2-utils - - libyajl-dev - lvm2 - make # - nfs-common # broken on trusty since build #807 (2018-01-09) -- 2.17.0

2 1

[libvirt] [PATCH v2 0/4] Fix qemu-img qcow[2] encrypted image handling
by John Ferlan 16 May '18

16 May '18

v1: https://www.redhat.com/archives/libvir-list/2018-April/msg01578.html Changes since v1... Rather than disallow, alter the code in order to handle the creation, conversion, and resize of qcow[2] encrypted images. See conversion processing description from review: https://www.redhat.com/archives/libvir-list/2018-April/msg02037.html John Ferlan (4): storage_util: Alter qemu storage encryption arguments storage_util: Fix qemu qcow[2] encryption convert processing storage_util: Don't assume "luks" encryption for resize docs: Update news.xml to describe encrypted image issues docs/formatstorageencryption.html.in | 10 ++ docs/news.xml | 12 ++ src/storage/storage_util.c | 159 +++++++++++++++------ src/storage/storage_util.h | 10 +- src/util/virqemu.c | 10 +- src/util/virqemu.h | 3 +- tests/storagevolxml2argvdata/qcow2-1.1.argv | 4 +- tests/storagevolxml2argvdata/qcow2-compat.argv | 4 +- .../qcow2-from-logical-compat.argv | 12 +- tests/storagevolxml2argvdata/qcow2-lazy.argv | 6 +- .../qcow2-nobacking-convert-prealloc-compat.argv | 13 +- .../qcow2-nobacking-prealloc-compat.argv | 4 +- .../qcow2-nocapacity-convert-prealloc.argv | 14 +- tests/storagevolxml2argvdata/qcow2-nocapacity.argv | 4 +- .../storagevolxml2argvdata/qcow2-nocow-compat.argv | 6 +- tests/storagevolxml2argvdata/qcow2-nocow.argv | 3 +- tests/storagevolxml2argvtest.c | 61 ++++++-- 17 files changed, 255 insertions(+), 80 deletions(-) -- 2.14.3

1 4

[libvirt] [dbus PATCH v2] docs: Introduce man file for libvirt-dbus daemon
by Pavel Hrdina 16 May '18

16 May '18

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- changes in v2: - added pod2man build dependency into spec file .gitignore | 2 ++ Makefile.am | 2 +- configure.ac | 1 + docs/Makefile.am | 13 +++++++++ docs/libvirt-dbus.pod | 66 +++++++++++++++++++++++++++++++++++++++++++ libvirt-dbus.spec.in | 2 ++ 6 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 docs/Makefile.am create mode 100644 docs/libvirt-dbus.pod diff --git a/.gitignore b/.gitignore index c6d9754..0bf09cf 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,8 @@ vgcore.* /data/system/libvirt-dbus.rules /data/system/org.libvirt.conf +/docs/*.1 + /src/.deps/ /src/libvirt-dbus /src/org.libvirt.service diff --git a/Makefile.am b/Makefile.am index 16f57b2..bb5ff5c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = data src tests +SUBDIRS = data docs src tests ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index cc8947c..707a03e 100644 --- a/configure.ac +++ b/configure.ac @@ -74,6 +74,7 @@ AC_CONFIG_FILES([run], [chmod +x,-w run]) AC_OUTPUT(Makefile data/Makefile + docs/Makefile src/Makefile tests/Makefile libvirt-dbus.spec) diff --git a/docs/Makefile.am b/docs/Makefile.am new file mode 100644 index 0000000..c41ffae --- /dev/null +++ b/docs/Makefile.am @@ -0,0 +1,13 @@ +POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" + +PODFILES = libvirt-dbus.pod + +%.8: %.pod + $(AM_V_GEN)$(POD2MAN) -s 8 $< $@ \ + && if grep 'POD ERROR' $@; then rm $@; exit 1; fi + +man8_MANS = libvirt-dbus.8 + +EXTRA_DIST = $(PODFILES) + +CLEANFILES = $(man8_MANS) diff --git a/docs/libvirt-dbus.pod b/docs/libvirt-dbus.pod new file mode 100644 index 0000000..49de044 --- /dev/null +++ b/docs/libvirt-dbus.pod @@ -0,0 +1,66 @@ +=head1 NAME + +libvirt-dbus - D-Bus daemon exporting libvirt API + +=head1 SYNOPSIS + +B<libvirt-dbus> [I<OPTION>]... + +=head1 DESCRIPTION + +libvirt-dbus wraps libvirt API to provide a high-level object-oriented +API better suited for dbus-based applications. + +Normally libvirt-dbus is started by D-Bus daemon on demand. + +=head1 OPTIONS + +=over + +=item B<-h --help> + +Display command line help usage then exit. + +=item B<--system> + +Connect to the system bus. + +=item B<--session> + +Connect to the session bus. + +=item B<-t --threads> I<NUM> + +Configure maximal number of worker threads. + +=back + +=head1 BUGS + +Please report all bugs you discover. This should be done via either: + +=over + +=item a) the mailing list + +L<https://libvirt.org/contact.html> + +=item b) the bug tracker + +L<https://libvirt.org/bugs.html> + +=back + +Alternatively, you may report bugs to your software distribution / vendor. + +=head1 AUTHORS + +Please refer to the AUTHORS file distributed with libvirt-dbus. + +=head1 LICENSE + +libvirt-dbus is Free Software and licenced under LGPLv2+. + +=head1 SEE ALSO + +L<https://libvirt.org/dbus.html>, L<https://libvirt.org/> diff --git a/libvirt-dbus.spec.in b/libvirt-dbus.spec.in index 1543197..db58483 100644 --- a/libvirt-dbus.spec.in +++ b/libvirt-dbus.spec.in @@ -17,6 +17,7 @@ BuildRequires: gcc BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: libvirt-devel >= %{libvirt_version} BuildRequires: libvirt-glib-devel >= %{libvirt_glib_version} +BuildRequires: /usr/bin/pod2man Requires: dbus Requires: glib2 >= %{glib2_version} @@ -55,5 +56,6 @@ exit 0 %{_datadir}/dbus-1/system-services/org.libvirt.service %{_datadir}/dbus-1/system.d/org.libvirt.conf %{_datadir}/dbus-1/interfaces/org.libvirt.*.xml +%{_mandir}/man8/libvirt-dbus.8* %changelog -- 2.17.0

2 1

[libvirt] ANNOUNCE: Plans for the next release
by Pavel Hrdina 16 May '18

16 May '18

Hi, I would like to make the next libvirt-dbus release with stable APIs, there is a lot of them already implemented and other projects can start adapting to use libvirt-dbus. The release version would be 1.0.0 and currently libvirt-dbus will cover APIs up to libvirt-3.0.0 as a start point because that libvirt version is available in all downstream distributions currently supported by libvirt. So I would like to ask everyone to look at the APIs to check whether it make sense and whether something is missing or could be excluded. The idea of libvirt-dbus is not to export every API if there is a better API to do the job, so for example: - all APIs that have both versions with and without flags we will export only the one with flags. - some of the Stats APIs can be omitted since the same values are also exported in the GetStats (virDomainListGetStats) I would like to make the release this week so any help or suggestion is welcome. The API definition is in the data/org.libvirt.*.xml files. Thanks and regards Pavel

2 3

[libvirt] [PATCH v2] log: actually do substring matches with fnmatch
by Daniel P. Berrangé 16 May '18

16 May '18

Historically we matched log filters with strstr(), and when switching to fnmatch in cbb0fd3cfdc287f6f4653ef1f04a7cfb2ea51b27, it was stated that we would continue to match substrings, with "foo" being equivalent to "*foo*". Unfortuntely I forget to provide the code to actually make that happen. This fixes it to prepend and append "*". We don't bother to check if the pattern already has a leading/trailing '*', because "**foo**" will match the same as "*foo*". Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Changed in v2: - Simplify to always append/prepend '*' - Other fixes from Erik src/util/virlog.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index be9fc0cf78..9b63b8e7cd 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -1409,6 +1409,7 @@ virLogFilterNew(const char *match, { virLogFilterPtr ret = NULL; char *mdup = NULL; + size_t mlen = strlen(match); virCheckFlags(VIR_LOG_STACK_TRACE, NULL); @@ -1418,9 +1419,16 @@ virLogFilterNew(const char *match, return NULL; } - if (VIR_STRDUP_QUIET(mdup, match) < 0) + /* We must treat 'foo' as equiv to '*foo*' for fnmatch + * todo substring matches, so add 2 extra bytes */ + */ + if (VIR_ALLOC_N_QUIET(mdup, mlen + 3) < 0) return NULL; + mdup[0] = '*'; + memcpy(mdup + 1, match, mlen); + mdup[mlen + 1] = '*'; + if (VIR_ALLOC_QUIET(ret) < 0) { VIR_FREE(mdup); return NULL; -- 2.17.0

2 1

[libvirt] [jenkins-ci PATCH 0/2] guests: Add Ubuntu 18.04 support
by Andrea Bolognani 16 May '18

16 May '18

Applies cleanly on top of master, but requires [1] in order to successfully install Ubuntu 18.04 guests. [1] https://www.redhat.com/archives/libvir-list/2018-May/msg01105.html Andrea Bolognani (2): guests: Ubuntu 18.04 has python3-libxml2 guests: Add Ubuntu 18.04 support .../host_vars/libvirt-ubuntu-18/install.yml | 3 +++ guests/host_vars/libvirt-ubuntu-18/main.yml | 19 +++++++++++++++++++ guests/vars/mappings.yml | 3 ++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 guests/host_vars/libvirt-ubuntu-18/install.yml create mode 100644 guests/host_vars/libvirt-ubuntu-18/main.yml -- 2.17.0

2 3

[libvirt] [jenkins-ci PATCH 0/8] guests: Various fixes and improvements
by Andrea Bolognani 16 May '18

16 May '18

Andrea Bolognani (8): guests: Fix PERL5LIB on Debian sid guests: Simplify mapping for libtool guests: Prepare Debian and Ubuntu to build more projects guests: libosinfo needs libcurl and wget guests: libvirt-dbus needs python3-gi guests: virt-manager needs gtk-update-icon-cache guests: Remove duplicate native packages guests: Move native packages out of MinGW packages guests/host_vars/libvirt-debian-8/main.yml | 1 + guests/host_vars/libvirt-debian-sid/main.yml | 2 +- guests/host_vars/libvirt-ubuntu-14/main.yml | 1 + guests/host_vars/libvirt-ubuntu-16/main.yml | 2 ++ guests/vars/mappings.yml | 10 ++++++++-- guests/vars/projects/libosinfo+mingw.yml | 2 ++ guests/vars/projects/libosinfo.yml | 2 ++ guests/vars/projects/libvirt+mingw.yml | 2 -- guests/vars/projects/libvirt-dbus.yml | 1 + guests/vars/projects/libvirt-glib+mingw.yml | 4 ---- guests/vars/projects/virt-manager.yml | 1 + guests/vars/projects/virt-viewer+mingw.yml | 3 --- guests/vars/projects/virt-viewer.yml | 1 + 13 files changed, 20 insertions(+), 12 deletions(-) -- 2.17.0

2 23

[libvirt] [dbus PATCH 0/4] API name fixes
by Pavel Hrdina 16 May '18

16 May '18

Pavel Hrdina (4): domain: Rename (Get|Set)BlkioParameters events: Rename AgentLifecycle event events: Rename all lifecycle event functions to follow the signal name events: Rename IOErrorReason event data/org.libvirt.Domain.xml | 8 +++--- src/domain.c | 32 ++++++++++----------- src/events.c | 56 ++++++++++++++++++------------------- 3 files changed, 48 insertions(+), 48 deletions(-) -- 2.17.0

3 8

[libvirt] [PATCH] log: actually do substring matches with fnmatch
by Daniel P. Berrangé 16 May '18

16 May '18

Historically we matched log filters with strstr(), and when switching to fnmatch in cbb0fd3cfdc287f6f4653ef1f04a7cfb2ea51b27, it was stated that we would continue to match substrings, with "foo" being equivalent to "*foo*". Unfortuntely I forget to provide the code to actually make that happen. This fixes it to prepend and append "*" if not already present in the user's pattern. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/util/virlog.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index be9fc0cf78..d548010b10 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -1409,6 +1409,8 @@ virLogFilterNew(const char *match, { virLogFilterPtr ret = NULL; char *mdup = NULL; + size_t mlen = strlen(match); + size_t off = 0; virCheckFlags(VIR_LOG_STACK_TRACE, NULL); @@ -1418,9 +1420,19 @@ virLogFilterNew(const char *match, return NULL; } - if (VIR_STRDUP_QUIET(mdup, match) < 0) + if (VIR_ALLOC_N_QUIET(mdup, mlen + 3) < 0) return NULL; + if (match[0] != '*') { + mdup[off++] = '*'; + } + memcpy(mdup + off, match, mlen + 1); + off += mlen; + if (match[mlen - 1] != '*') { + mdup[off++] = '*'; + mdup[off++] = '\0'; + } + if (VIR_ALLOC_QUIET(ret) < 0) { VIR_FREE(mdup); return NULL; -- 2.17.0

2 2

[libvirt] [perl PATCH] Switch over to using Module::Build
by Daniel P. Berrangé 16 May '18

16 May '18

The Module::Build system is nicer than ExtUtils::MakeMaker as it allows for better cross-platform portability by only relying on Perl, rather than both Perl and system 'make' binary. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitignore | 17 +++---- Build.PL | 102 +++++++++++++++++++++++++++++++++++++ MANIFEST | 73 ++++++++++++++++++++++++++ MANIFEST.SKIP | 20 -------- META.yml.PL | 55 -------------------- Makefile.PL | 85 ------------------------------- autobuild.sh | 55 +++----------------- Virt.xs => lib/Sys/Virt.xs | 0 perl-Sys-Virt.spec.PL | 45 ++++++++-------- t/030-api-coverage.t | 2 +- 10 files changed, 210 insertions(+), 244 deletions(-) create mode 100755 Build.PL create mode 100644 MANIFEST delete mode 100644 MANIFEST.SKIP delete mode 100644 META.yml.PL delete mode 100644 Makefile.PL rename Virt.xs => lib/Sys/Virt.xs (100%) diff --git a/.gitignore b/.gitignore index dc0ba62..3f08c79 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,12 @@ -*.swp *~ -MANIFEST META.yml +META.json MYMETA.* -Makefile -Makefile.old +Makefile.PL Sys-Virt-*.tar.gz -Virt.bs -Virt.c -Virt.o blib/ -cover_db perl-Sys-Virt.spec -pm_to_blib -results.log -tags +lib/Sys/Virt\.c +lib/Sys/Virt\.o +_build/ +Build diff --git a/Build.PL b/Build.PL new file mode 100755 index 0000000..13a0e4f --- /dev/null +++ b/Build.PL @@ -0,0 +1,102 @@ +#!/usr/bin/perl +# +# Copyright (C) 2009-2018 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +use Module::Build; + +use strict; +use warnings; + +my $libvirtver = "4.4.0"; +my $stat = system "pkg-config --atleast-version=$libvirtver libvirt"; +die "cannot run pkg-config to check libvirt version" if $stat == -1; +die "libvirt >= $libvirtver is required\n" unless $stat == 0; + +my $LIBVIRT_LIBS = `pkg-config --libs libvirt`; +my $LIBVIRT_CFLAGS = `pkg-config --cflags libvirt`; + +my $GCC_CFLAGS = ""; +if ($ENV{TEST_MAINTAINER}) { + $GCC_CFLAGS = qq( + -W -Waddress -Wall -Warray-bounds -Wattributes + -Wbad-function-cast -Wbuiltin-macro-redefined -Wcast-align + -Wchar-subscripts -Wclobbered -Wcomment -Wcomments + -Wcoverage-mismatch -Wcpp -Wdeprecated-declarations + -Wdisabled-optimization -Wdiv-by-zero -Wdouble-promotion + -Wempty-body -Wendif-labels -Wextra -Wformat-contains-nul + -Wformat-extra-args -Wformat-security -Wformat-y2k + -Wformat-zero-length -Wformat=2 -Wfree-nonheap-object + -Wignored-qualifiers -Wimplicit -Wimplicit-function-declaration + -Wimplicit-int -Winit-self -Wint-to-pointer-cast + -Winvalid-memory-model -Winvalid-pch -Wjump-misses-init + -Wlogical-op -Wmain -Wmaybe-uninitialized -Wmissing-braces + -Wmissing-declarations -Wmissing-field-initializers + -Wmissing-format-attribute -Wmissing-include-dirs + -Wmissing-noreturn -Wmissing-parameter-type + -Wmultichar -Wnarrowing -Wnonnull + -Wnormalized=nfc -Wold-style-declaration -Wold-style-definition + -Woverflow -Woverride-init -Wpacked-bitfield-compat -Wparentheses + -Wpointer-arith -Wpointer-sign -Wpointer-to-int-cast -Wpragmas + -Wreturn-type -Wsequence-point -Wno-shadow -Wstrict-aliasing + -Wstrict-prototypes -Wsuggest-attribute=const + -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure -Wswitch + -Wsync-nand -Wtrampolines -Wtrigraphs -Wtype-limits -Wuninitialized + -Wunknown-pragmas -Wunused -Wunused-but-set-parameter + -Wunused-but-set-variable -Wunused-function -Wunused-label + -Wunused-local-typedefs -Wno-unused-parameter -Wunused-result + -Wunused-value -Wunused-variable -Wvariadic-macros + -Wvector-operation-performance -Wvolatile-register-var + -Wwrite-strings -Wno-sign-compare -Wjump-misses-init + -Wno-format-nonliteral -Wframe-larger-than=8192 + -Wno-suggest-attribute=pure -Wno-suggest-attribute=const + -Wno-cast-function-type + ); +} + +my $b = Module::Build->new( + module_name => "Sys::Virt", + license => 'gpl', + configure_requires => { + 'Module::Build' => 0, + }, + create_makefile_pl => 'small', + dist_author => 'Daniel Berrange <dan(a)berrange.com>', + dist_abstract => 'libvirt Perl API', + requires => { + 'perl' => '5.8.0', + }, + extra_compiler_flags => $GCC_CFLAGS . $LIBVIRT_CFLAGS, + extra_linker_flags => $LIBVIRT_LIBS, + build_requires => { + 'ExtUtils::CBuilder' => 0, + 'Sys::Hostname' => 0, + 'Test::CPAN::Changes' => 0, + 'Test::More' => 0, + 'Test::Pod' => '0', + 'Test::Pod::Coverage' => '0', + 'Time::HiRes' => 0, + 'XML::XPath' => 0, + 'XML::XPath::XMLParser' => 0, + }, + script_files => [], + meta_add => { + resources => { + license => "http://www.gnu.org/licenses/gpl.html", + homepage => "http://libvirt.org/", + repository => "https://libvirt.org/git/?p=libvirt-perl.git;a=summary", + MailingList => "http://www.redhat.com/mailman/listinfo/libvir-list", + }, + }, + PL_files => { 'perl-Sys-Virt.spec.PL' => 'perl-Sys-Virt.spec' }, + ); +$b->create_build_script; diff --git a/MANIFEST b/MANIFEST new file mode 100644 index 0000000..d425ef1 --- /dev/null +++ b/MANIFEST @@ -0,0 +1,73 @@ +.gitignore +.gitpublish +AUTHORS +Build.PL +Changes +HACKING +INSTALL +LICENSE +README +autobuild.sh +examples/auth.pl +examples/devices.pl +examples/dhcp-leases.pl +examples/dom-fsinfo.pl +examples/dom-ifinfo.pl +examples/dom-migrate.pl +examples/dom-stats.pl +examples/dump-info.pl +examples/dump-xml.pl +examples/emulator-pin.pl +examples/events.pl +examples/fs-freeze.pl +examples/hv-stat.pl +examples/iothreadinfo.pl +examples/node-alloc.pl +examples/node-cpu.pl +examples/node-devlist.pl +examples/node-info.pl +examples/node-ksm.pl +examples/open-console.pl +examples/save-restore.pl +examples/send-key.pl +examples/vcpuinfo.pl +examples/vol-download-all.pl +examples/vol-download-nonblock.pl +examples/vol-download.pl +examples/vol-sparse.pl +examples/vol-upload-all.pl +examples/vol-upload-nonblock.pl +examples/vol-upload.pl +lib/Sys/Virt.pm +lib/Sys/Virt.xs +lib/Sys/Virt/Domain.pm +lib/Sys/Virt/DomainSnapshot.pm +lib/Sys/Virt/Error.pm +lib/Sys/Virt/Event.pm +lib/Sys/Virt/Interface.pm +lib/Sys/Virt/NWFilter.pm +lib/Sys/Virt/Network.pm +lib/Sys/Virt/NodeDevice.pm +lib/Sys/Virt/Secret.pm +lib/Sys/Virt/StoragePool.pm +lib/Sys/Virt/StorageVol.pm +lib/Sys/Virt/Stream.pm +perl-Sys-Virt.spec +perl-Sys-Virt.spec.PL +Makefile.PL +t/005-pod.t +t/010-pod-coverage.t +t/015-changes.t +t/020-constants.t +t/030-api-coverage.t +t/100-connect.t +t/200-domains.t +t/300-networks.t +t/400-storage-pools.t +t/500-storage-vols.t +t/600-interfaces.t +t/800-events.t +typemap +Makefile.PL +META.yml +META.json diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP deleted file mode 100644 index ebce958..0000000 --- a/MANIFEST.SKIP +++ /dev/null @@ -1,20 +0,0 @@ -pm_to_blib -Virt\.o -Virt\.c -Virt\.bs -Virt\.xsc -.*.old -Sys-Virt- -blib -.*\.bak -CVS -.cvsignore -.*~ -.#.* -#.* -^Makefile$ -^cover_db/ -.hg -.*\.orig -.*\.sh -\.git diff --git a/META.yml.PL b/META.yml.PL deleted file mode 100644 index 0467309..0000000 --- a/META.yml.PL +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright (C) 2008 Daniel Berrange <dan(a)berrange.com> - -use strict; -use warnings; - -die unless (scalar @ARGV == 1); - -open SRC, "lib/Sys/Virt.pm" - or die "lib/Sys/Virt.pm: $!"; - -our $VERSION; -while (<SRC>) { - if (/\$VERSION\s*=\s*'(.*)'/) { - $VERSION=$1; - } -} -close SRC; - -local $/ = undef; -$_ = <DATA>; -s/\@VERSION\@/$VERSION/g; - -open SPEC, ">$ARGV[0]" or die "$!"; -print SPEC $_; -close SPEC; -__DATA__ ---- #YAML:1.0 -name: Sys-Virt -abstract: Extension for the libvirt library -version: @VERSION@ -author: - - Daniel P. Berrange <dan(a)berrange.com> -license: perl -generated_by: ExtUtils::MakeMaker version 6.30 -build_requires: - Test::More: 0 - Test::Pod: 0 - Test::Pod::Coverage: 0 - Test::CPAN::Changes: 0 - XML::XPath: 0 - XML::XPath::XMLParser: 0 - Sys::Hostname: 0 - Time::HiRes: 0 - -resources: - license: http://dev.perl.org/licenses/ - homepage: http://libvirt.org/ - repository: http://libvirt.org/git/?p=libvirt-perl.git;a=summary - MailingList: http://www.redhat.com/mailman/listinfo/libvir-list - -distribution_type: module - -meta-spec: - version: 1.3 - url: http://module-build.sourceforge.net/META-spec-v1.3.html diff --git a/Makefile.PL b/Makefile.PL deleted file mode 100644 index f72e210..0000000 --- a/Makefile.PL +++ /dev/null @@ -1,85 +0,0 @@ -use 5.006; -use ExtUtils::MakeMaker; -# See lib/ExtUtils/MakeMaker.pm for details of how to influence -# the contents of the Makefile that is written. - -my $libvirtver = "4.4.0"; -my $stat = system "pkg-config --atleast-version=$libvirtver libvirt"; -die "cannot run pkg-config to check libvirt version" if $stat == -1; -die "libvirt >= $libvirtver is required\n" unless $stat == 0; - -my $LIBVIRT_LIBS = `pkg-config --libs libvirt`; -my $LIBVIRT_CFLAGS = `pkg-config --cflags libvirt`; - -my $gccflags = "-W -Waddress -Wall -Warray-bounds -Wattributes \\ - -Wbad-function-cast -Wbuiltin-macro-redefined -Wcast-align \\ - -Wchar-subscripts -Wclobbered -Wcomment -Wcomments \\ - -Wcoverage-mismatch -Wcpp -Wdeprecated-declarations \\ - -Wdisabled-optimization -Wdiv-by-zero -Wdouble-promotion \\ - -Wempty-body -Wendif-labels -Wextra -Wformat-contains-nul \\ - -Wformat-extra-args -Wformat-security -Wformat-y2k \\ - -Wformat-zero-length -Wformat=2 -Wfree-nonheap-object \\ - -Wignored-qualifiers -Wimplicit -Wimplicit-function-declaration \\ - -Wimplicit-int -Winit-self -Wint-to-pointer-cast \\ - -Winvalid-memory-model -Winvalid-pch -Wjump-misses-init \\ - -Wlogical-op -Wmain -Wmaybe-uninitialized -Wmissing-braces \\ - -Wmissing-declarations -Wmissing-field-initializers \\ - -Wmissing-format-attribute -Wmissing-include-dirs \\ - -Wmissing-noreturn -Wmissing-parameter-type \\ - -Wmultichar -Wnarrowing -Wnonnull \\ - -Wnormalized=nfc -Wold-style-declaration -Wold-style-definition \\ - -Woverflow -Woverride-init -Wpacked-bitfield-compat -Wparentheses \\ - -Wpointer-arith -Wpointer-sign -Wpointer-to-int-cast -Wpragmas \\ - -Wreturn-type -Wsequence-point -Wno-shadow -Wstrict-aliasing \\ - -Wstrict-prototypes -Wsuggest-attribute=const \\ - -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure -Wswitch \\ - -Wsync-nand -Wtrampolines -Wtrigraphs -Wtype-limits -Wuninitialized \\ - -Wunknown-pragmas -Wunused -Wunused-but-set-parameter \\ - -Wunused-but-set-variable -Wunused-function -Wunused-label \\ - -Wunused-local-typedefs -Wno-unused-parameter -Wunused-result \\ - -Wunused-value -Wunused-variable -Wvariadic-macros \\ - -Wvector-operation-performance -Wvolatile-register-var \\ - -Wwrite-strings -Wno-sign-compare -Wjump-misses-init \\ - -Wno-format-nonliteral -Wframe-larger-than=8192 \\ - -Wno-suggest-attribute=pure -Wno-suggest-attribute=const -Werror"; - -my $cflags; -if ($ENV{TEST_MAINTAINER}) { - $cflags = $gccflags; -} else { - $cflags = "-Wall"; -} - -WriteMakefile( - 'NAME' => 'Sys::Virt', - 'VERSION_FROM' => 'lib/Sys/Virt.pm', - 'PREREQ_PM' => { - 'Test::More' => 0, - 'Test::Pod' => 0, - 'Test::Pod::Coverage' => 0, - 'Test::CPAN::Changes' => 0, - 'Time::HiRes' => 0, - 'XML::XPath' => 0, - }, - 'AUTHOR' => 'Daniel Berrange <dan(a)berrange.com>', - 'LIBS' => [$LIBVIRT_LIBS], - 'INC' => "$cflags $LIBVIRT_CFLAGS", - 'depend' => { - Sys-Virt.spec => '$(VERSION_FROM)', - Makefile => '$(VERSION_FROM)', - }, - 'NO_META' => 1, - 'realclean' => { - FILES => 'Sys-Virt.spec', - }, -); - -package MY; - -sub libscan - { - my ($self, $path) = @_; - ($path =~ /\~$/ || $path =~ m,/CVS/,) ? undef : $path; - } - -__END__ diff --git a/autobuild.sh b/autobuild.sh index 8a6d102..597b9bf 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -7,53 +7,18 @@ NAME=Sys-Virt set -e -test -n "$1" && RESULTS=$1 || RESULTS=results.log -: ${AUTOBUILD_INSTALL_ROOT=$HOME/builder} +rm -rf blib _build Build $NAME-*.tar.gz -make -k realclean ||: -rm -rf MANIFEST blib pm_to_blib +test -z "$AUTOBUILD_INSTALL_ROOT" && AUTOBUILD_INSTALL_ROOT=$HOME/builder export TEST_MAINTAINER=1 -perl Makefile.PL PREFIX=$AUTOBUILD_INSTALL_ROOT +perl Build.PL install_base=$AUTOBUILD_INSTALL_ROOT -rm -f MANIFEST - -# Build the RPM. -make -make manifest - -if [ -z "$USE_COVER" ]; then - perl -MDevel::Cover -e '' 1>/dev/null 2>&1 && USE_COVER=1 || USE_COVER=0 -fi - -if [ -z "$SKIP_TESTS" -o "$SKIP_TESTS" = "0" ]; then - if [ "$USE_COVER" = "1" ]; then - cover -delete - export HARNESS_PERL_SWITCHES=-MDevel::Cover - fi - - # set -o pipefail is a bashism; this use of exec is the POSIX alternative - exec 3>&1 - st=$( - exec 4>&1 >&3 - { make test 2>&1 3>&- 4>&-; echo $? >&4; } | tee "$RESULTS" - ) - exec 3>&- - test "$st" = 0 - - if [ "$USE_COVER" = "1" ]; then - cover - mkdir blib/coverage - cp -a cover_db/*.html cover_db/*.css blib/coverage - mv blib/coverage/coverage.html blib/coverage/index.html - fi -fi - -make install - -rm -f $NAME-*.tar.gz -make dist +./Build +./Build test +./Build install +./Build dist if [ -f /usr/bin/rpmbuild ]; then if [ -n "$AUTOBUILD_COUNTER" ]; then @@ -65,10 +30,4 @@ if [ -f /usr/bin/rpmbuild ]; then rpmbuild --nodeps -ta --define "extra_release $EXTRA_RELEASE" --clean $NAME-*.tar.gz fi -# Skip debian pkg for now exit 0 - -if [ -f /usr/bin/fakeroot ]; then - fakeroot debian/rules clean - fakeroot debian/rules DESTDIR=$HOME/packages/debian binary -fi diff --git a/Virt.xs b/lib/Sys/Virt.xs similarity index 100% rename from Virt.xs rename to lib/Sys/Virt.xs diff --git a/perl-Sys-Virt.spec.PL b/perl-Sys-Virt.spec.PL index dbb749d..e5140b6 100644 --- a/perl-Sys-Virt.spec.PL +++ b/perl-Sys-Virt.spec.PL @@ -6,15 +6,19 @@ use strict; die unless (scalar @ARGV == 1); -unless (do './lib/Sys/Virt.pm') - { - if ($@) { die $@ }; - die "lib/Sys/Virt.pm: $!"; - } +open PM, './lib/Sys/Virt.pm' or die "lib/Sys/Virt.pm: $!"; +my $ver; +while (<PM>) { + if (/our \$VERSION = '(.*)'/) { + $ver = $1; + last; + } +} +die "cannot find version" unless $ver; local $/ = undef; $_ = <DATA>; -s/\@VERSION\@/$Sys::Virt::VERSION/g; +s/\@VERSION\@/$ver/g; open SPEC, ">$ARGV[0]" or die "$!"; print SPEC $_; @@ -29,9 +33,10 @@ Summary: Represent and manage a libvirt hypervisor connection License: GPLv2+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Sys-Virt/ -Source0: http://www.cpan.org/authors/id/D/DA/DANBERR/Sys-Virt-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/D/DA/DANBERR/Sys-Virt-v%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(ExtUtils::CBuilder) +BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) BuildRequires: perl(Test::CPAN::Changes) @@ -46,32 +51,24 @@ machine management APIs. This allows machines running within arbitrary virtualization containers to be managed with a consistent API. %prep -%setup -q -n Sys-Virt-%{version} +%setup -q -n Sys-Virt-v%{version} -sed -i -e '/Sys-Virt\.spec/d' Makefile.PL -sed -i -e '/\.spec\.PL$/d' MANIFEST -rm -f *.spec.PL %build -%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" -make %{?_smp_mflags} +%{__perl} Build.PL installdirs=vendor +./Build %install -rm -rf $RPM_BUILD_ROOT +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT - -find $RPM_BUILD_ROOT -type f $ -name .packlist -o -name '*.bs' -empty $ | - xargs rm -f -find $RPM_BUILD_ROOT -depth -type d -empty -exec rmdir {} \; +#find $RPM_BUILD_ROOT -type f $ -name .packlist -o -name '*.bs' -empty $ | +# xargs rm -f +#find $RPM_BUILD_ROOT -depth -type d -empty -exec rmdir {} \; %{_fixperms} $RPM_BUILD_ROOT/* %check -make test - -%clean -rm -rf $RPM_BUILD_ROOT +./Build test %files %defattr(-,root,root,-) diff --git a/t/030-api-coverage.t b/t/030-api-coverage.t index 95bbd11..39d6146 100644 --- a/t/030-api-coverage.t +++ b/t/030-api-coverage.t @@ -48,7 +48,7 @@ foreach my $n ($set->get_nodelist) { push @macros, $n->getData(); } -open XS, "<Virt.xs" or die "cannot read Virt.xs: $!"; +open XS, "<lib/Sys/Virt.xs" or die "cannot read lib/Sys/Virt.xs: $!"; my $xs; { -- 2.17.0

2 6

[libvirt] [jenkins-ci PATCH] projects: Temporarily skip expensive tests on FreeBSD
by Andrea Bolognani 16 May '18

16 May '18

The gnulib issue has been reported upstream, but solving it is taking a bit and all jobs downstream of libvirt-master-check are blocked in the meantime, which is less than ideal. Put a temporary workaround in place. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- projects/libvirt.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/libvirt.yaml b/projects/libvirt.yaml index 6f5464b..3273ebf 100644 --- a/projects/libvirt.yaml +++ b/projects/libvirt.yaml @@ -19,7 +19,11 @@ - autotools-check-job: parent_jobs: 'libvirt-master-syntax-check' local_env: | - export VIR_TEST_EXPENSIVE=1 + # gnulib's test-poll is broken on FreeBSD, so disable expensive + # tests (which include gnulib's test suite) until it's fixed + if [ "$(uname)" != "FreeBSD" ]; then + export VIR_TEST_EXPENSIVE=1 + fi export VIR_TEST_DEBUG=2 - autotools-rpm-job: parent_jobs: 'libvirt-master-check' -- 2.17.0

2 1

[libvirt] [PATCH 0/8] GnuTLS fixes and requirements
by Ján Tomko 16 May '18

16 May '18

The first two patches fix the build and tests without GnuTLS. The third requires GnuTLS 3.2.0 or newer. That means we don't have to worry about gnutls_hash_fast not being present (introduced in GnuTLS 2.10.0). The rest of the patches cleans up the code that deals with older GnuTLS. Ján Tomko (8): virCryptoHashBuf: return the length of the hash in bytes Skip vircryptotest and virfilecachetest without gnutls Require GnuTLS >= 3.2.0 Deprecate GNUTLS_GCRYPT Remove explicit check for gnutls_rnd Remove explicit check for gnutls_cipher_encrypt Fix indentation in virCryptoHaveCipher Remove check for gnutls/crypto.h config-post.h | 2 -- m4/virt-gnutls.m4 | 50 +++------------------------- src/libvirt.c | 83 ---------------------------------------------- src/rpc/virnettlscontext.c | 4 +-- src/util/vircrypto.c | 28 ++++++++-------- src/util/vircrypto.h | 2 +- tests/qemuxml2argvtest.c | 8 ++--- tests/vircryptotest.c | 26 ++++++++++----- tests/virfilecachetest.c | 19 ++++++++--- 9 files changed, 58 insertions(+), 164 deletions(-) -- 2.16.1

2 9

[libvirt] [PATCH] Add a MAINTAINERS file to suggest reviewers for patches
by Daniel P. Berrangé 16 May '18

16 May '18

Currently all patches are simply sent to the main libvirt development mailing list. Sometimes individual developers are also CC'd but this is typically the exception. Libvirt does not follow a subsystem maintainer model, so there is no notion of owners for the different areas of code, but there certainly are people with high levels of expertize in specific areas. This patch thus proposes pulling in QEMU's get_maintainer.pl script and creating MAINTAINERS file to list who the experts are for specific areas. Combined with git-pubish, this will help ensure that patches are brought to the attention of people with direct expertize. For example: $ git show b04629b62934caa8786e73c3db985672422fc662 | \ ./build-aux/get_maintainer.pl Jim Fehlig <jfehlig(a)suse.com> (maintainer:libxl) libvir-list(a)redhat.com (open list:All patches) Or $ git show e7cb9c4e230c3c77e35e72334c261b5b0a2211c6 | \ ./build-aux/get_maintainer.pl Jiri Denemar <jdenemar(a)redhat.com> (maintainer:CPU modelling) libvir-list(a)redhat.com (open list:All patches) Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitpublish | 1 + MAINTAINERS | 67 ++ build-aux/get_maintainer.pl | 2143 +++++++++++++++++++++++++++++++++++ 3 files changed, 2211 insertions(+) create mode 100644 MAINTAINERS create mode 100755 build-aux/get_maintainer.pl diff --git a/.gitpublish b/.gitpublish index 857f0d552c..6f2f9d11fa 100644 --- a/.gitpublish +++ b/.gitpublish @@ -1,3 +1,4 @@ [gitpublishprofile "default"] base = master to = libvir-list(a)redhat.com +cccmd = build-aux/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null diff --git a/MAINTAINERS b/MAINTAINERS new file mode 100644 index 0000000000..5756fd8b00 --- /dev/null +++ b/MAINTAINERS @@ -0,0 +1,67 @@ +Libvirt Maintainers +=================== + +The intention of this file is NOT to establish who owns what portions of the +code base, but to provide a set of names that developers can consult when they +have a question about a particular subset and also to provide a set of names +to be CC'd when submitting a patch to obtain appropriate review. + +In general, if you have a question about inclusion of a patch, you should +consult libvir-list(a)redhat.com and not any specific individual privately. + +Descriptions of section entries: + + M: Mail patches to: FullName <address@domain> + S: Status, one of the following: + Supported: Someone is actually paid to look after this. + Maintained: Someone actually looks after it. + Odd Fixes: It has a maintainer but they don't have time to do + much other than throw the odd patch in. See below. + Orphan: No current maintainer [but maybe you could take the + role as you write your new code]. + Obsolete: Old code. Something tagged obsolete generally means + it has been replaced by a better system and you + should be using that. + F: Files and directories with wildcard patterns. + A trailing slash includes all files and subdirectory files. + F: drivers/net/ all files in and below drivers/net + F: drivers/net/* all files in drivers/net, but not below + F: */net/* all files in "any top level directory"/net + One pattern per line. Multiple F: lines acceptable. + X: Files and directories that are NOT maintained, same rules as F: + Files exclusions are tested before file matches. + Can be useful for excluding a specific subdirectory, for instance: + F: net/ + X: net/ipv6/ + matches all files in and below net excluding net/ipv6/ + K: Keyword perl extended regex pattern to match content in a + patch or file. For instance: + K: of_get_profile + matches patches or files that contain "of_get_profile" + K: \b(printk|pr_(info|err))\b + matches patches or files that contain one or more of the words + printk, pr_info or pr_err + One regex pattern per line. Multiple K: lines acceptable. + + +All patches +L: libvir-list(a)redhat.com +F: * +F: */ + +Common code +----------- + +CPU modelling +M: Jiri Denemar <jdenemar(a)redhat.com> +S: Maintained +F: src/cpu/ + +Driver code +----------- +libxl +M: Jim Fehlig <jfehlig(a)suse.com> +S: Maintained +F: src/libxl/ +F: tests/*libxl* + diff --git a/build-aux/get_maintainer.pl b/build-aux/get_maintainer.pl new file mode 100755 index 0000000000..c94929d4f8 --- /dev/null +++ b/build-aux/get_maintainer.pl @@ -0,0 +1,2143 @@ +#!/usr/bin/env perl +# (c) 2007, Joe Perches <joe(a)perches.com> +# created from checkpatch.pl +# +# Print selected MAINTAINERS information for +# the files modified in a patch or for a file +# +# usage: perl scripts/get_maintainer.pl [OPTIONS] <patch> +# perl scripts/get_maintainer.pl [OPTIONS] -f <file> +# +# Licensed under the terms of the GNU GPL License version 2 + +use strict; +use warnings; + +my $P = $0; +my $V = '0.26'; + +use Getopt::Long qw(:config no_auto_abbrev); + +my $lk_path = "./"; +my $email = 1; +my $email_usename = 1; +my $email_maintainer = 1; +my $email_reviewer = 1; +my $email_list = 1; +my $email_subscriber_list = 0; +my $email_git = 0; +my $email_git_all_signature_types = 0; +my $email_git_blame = 0; +my $email_git_blame_signatures = 1; +my $email_git_fallback = 1; +my $email_git_min_signatures = 1; +my $email_git_max_maintainers = 5; +my $email_git_min_percent = 5; +my $email_git_since = "1-year-ago"; +my $email_hg_since = "-365"; +my $interactive = 0; +my $email_remove_duplicates = 1; +my $email_use_mailmap = 1; +my $output_multiline = 1; +my $output_separator = ", "; +my $output_roles = 0; +my $output_rolestats = 1; +my $scm = 0; +my $web = 0; +my $subsystem = 0; +my $status = 0; +my $keywords = 1; +my $sections = 0; +my $file_emails = 0; +my $from_filename = 0; +my $pattern_depth = 0; +my $version = 0; +my $help = 0; + +my $vcs_used = 0; + +my $exit = 0; + +my %commit_author_hash; +my %commit_signer_hash; + +# Signature types of people who are either +# a) responsible for the code in question, or +# b) familiar enough with it to give relevant feedback +my @signature_tags = (); +push(@signature_tags, "Signed-off-by:"); +push(@signature_tags, "Reviewed-by:"); +push(@signature_tags, "Acked-by:"); + +my $signature_pattern = "$" . join("|", @signature_tags) . "$"; + +# rfc822 email address - preloaded methods go here. +my $rfc822_lwsp = "(?:(?:\\r\\n)?[ \\t])"; +my $rfc822_char = '[\\000-\\377]'; + +# VCS command support: class-like functions and strings + +my %VCS_cmds; + +my %VCS_cmds_git = ( + "execute_cmd" => \&git_execute_cmd, + "available" => '(which("git") ne "") && (-d ".git")', + "find_signers_cmd" => + "git log --no-color --follow --since=\$email_git_since " . + '--format="GitCommit: %H%n' . + 'GitAuthor: %an <%ae>%n' . + 'GitDate: %aD%n' . + 'GitSubject: %s%n' . + '%b%n"' . + " -- \$file", + "find_commit_signers_cmd" => + "git log --no-color " . + '--format="GitCommit: %H%n' . + 'GitAuthor: %an <%ae>%n' . + 'GitDate: %aD%n' . + 'GitSubject: %s%n' . + '%b%n"' . + " -1 \$commit", + "find_commit_author_cmd" => + "git log --no-color " . + '--format="GitCommit: %H%n' . + 'GitAuthor: %an <%ae>%n' . + 'GitDate: %aD%n' . + 'GitSubject: %s%n"' . + " -1 \$commit", + "blame_range_cmd" => "git blame -l -L \$diff_start,+\$diff_length \$file", + "blame_file_cmd" => "git blame -l \$file", + "commit_pattern" => "^GitCommit: ([0-9a-f]{40,40})", + "blame_commit_pattern" => "^([0-9a-f]+) ", + "author_pattern" => "^GitAuthor: (.*)", + "subject_pattern" => "^GitSubject: (.*)", +); + +my %VCS_cmds_hg = ( + "execute_cmd" => \&hg_execute_cmd, + "available" => '(which("hg") ne "") && (-d ".hg")', + "find_signers_cmd" => + "hg log --date=\$email_hg_since " . + "--template='HgCommit: {node}\\n" . + "HgAuthor: {author}\\n" . + "HgSubject: {desc}\\n'" . + " -- \$file", + "find_commit_signers_cmd" => + "hg log " . + "--template='HgSubject: {desc}\\n'" . + " -r \$commit", + "find_commit_author_cmd" => + "hg log " . + "--template='HgCommit: {node}\\n" . + "HgAuthor: {author}\\n" . + "HgSubject: {desc|firstline}\\n'" . + " -r \$commit", + "blame_range_cmd" => "", # not supported + "blame_file_cmd" => "hg blame -n \$file", + "commit_pattern" => "^HgCommit: ([0-9a-f]{40,40})", + "blame_commit_pattern" => "^([ 0-9a-f]+):", + "author_pattern" => "^HgAuthor: (.*)", + "subject_pattern" => "^HgSubject: (.*)", +); + +my $conf = which_conf(".get_maintainer.conf"); +if (-f $conf) { + my @conf_args; + open(my $conffile, '<', "$conf") + or warn "$P: Can't find a readable .get_maintainer.conf file $!\n"; + + while (<$conffile>) { + my $line = $_; + + $line =~ s/\s*\n?$//g; + $line =~ s/^\s*//g; + $line =~ s/\s+/ /g; + + next if ($line =~ m/^\s*#/); + next if ($line =~ m/^\s*$/); + + my @words = split(" ", $line); + foreach my $word (@words) { + last if ($word =~ m/^#/); + push (@conf_args, $word); + } + } + close($conffile); + unshift(@ARGV, @conf_args) if @conf_args; +} + +if (!GetOptions( + 'email!' => \$email, + 'git!' => \$email_git, + 'git-all-signature-types!' => \$email_git_all_signature_types, + 'git-blame!' => \$email_git_blame, + 'git-blame-signatures!' => \$email_git_blame_signatures, + 'git-fallback!' => \$email_git_fallback, + 'git-min-signatures=i' => \$email_git_min_signatures, + 'git-max-maintainers=i' => \$email_git_max_maintainers, + 'git-min-percent=i' => \$email_git_min_percent, + 'git-since=s' => \$email_git_since, + 'hg-since=s' => \$email_hg_since, + 'i|interactive!' => \$interactive, + 'remove-duplicates!' => \$email_remove_duplicates, + 'mailmap!' => \$email_use_mailmap, + 'm!' => \$email_maintainer, + 'r!' => \$email_reviewer, + 'n!' => \$email_usename, + 'l!' => \$email_list, + 's!' => \$email_subscriber_list, + 'multiline!' => \$output_multiline, + 'roles!' => \$output_roles, + 'rolestats!' => \$output_rolestats, + 'separator=s' => \$output_separator, + 'subsystem!' => \$subsystem, + 'status!' => \$status, + 'scm!' => \$scm, + 'web!' => \$web, + 'pattern-depth=i' => \$pattern_depth, + 'k|keywords!' => \$keywords, + 'sections!' => \$sections, + 'fe|file-emails!' => \$file_emails, + 'f|file' => \$from_filename, + 'v|version' => \$version, + 'h|help|usage' => \$help, + )) { + die "$P: invalid argument - use --help if necessary\n"; +} + +if ($help != 0) { + usage(); + exit 0; +} + +if ($version != 0) { + print("${P} ${V}\n"); + exit 0; +} + +if (-t STDIN && !@ARGV) { + # We're talking to a terminal, but have no command line arguments. + die "$P: missing patchfile or -f file - use --help if necessary\n"; +} + +$output_multiline = 0 if ($output_separator ne ", "); +$output_rolestats = 1 if ($interactive); +$output_roles = 1 if ($output_rolestats); + +if ($sections) { + $email = 0; + $email_list = 0; + $scm = 0; + $status = 0; + $subsystem = 0; + $web = 0; + $keywords = 0; + $interactive = 0; +} else { + my $selections = $email + $scm + $status + $subsystem + $web; + if ($selections == 0) { + die "$P: Missing required option: email, scm, status, subsystem or web\n"; + } +} + +if ($email && + ($email_maintainer + $email_reviewer + + $email_list + $email_subscriber_list + + $email_git + $email_git_blame) == 0) { + die "$P: Please select at least 1 email option\n"; +} + +if (!top_of_tree($lk_path)) { + die "$P: The current directory does not appear to be " + . "a libvirt source tree.\n"; +} + +## Read MAINTAINERS for type/value pairs + +my @typevalue = (); +my %keyword_hash; + +open (my $maint, '<', "${lk_path}MAINTAINERS") + or die "$P: Can't open MAINTAINERS: $!\n"; +while (<$maint>) { + my $line = $_; + + if ($line =~ m/^(.):\s*(.*)/) { + my $type = $1; + my $value = $2; + + ##Filename pattern matching + if ($type eq "F" || $type eq "X") { + $value =~ s@\.@\\\.@g; ##Convert . to \. + $value =~ s/\*/\.\*/g; ##Convert * to .* + $value =~ s/\?/\./g; ##Convert ? to . + ##if pattern is a directory and it lacks a trailing slash, add one + if ((-d $value)) { + $value =~ s@([^/])$@$1/@; + } + } elsif ($type eq "K") { + $keyword_hash{@typevalue} = $value; + } + push(@typevalue, "$type:$value"); + } elsif (!/^(\s)*$/) { + $line =~ s/\n$//g; + push(@typevalue, $line); + } +} +close($maint); + + +# +# Read mail address map +# + +my $mailmap; + +read_mailmap(); + +sub read_mailmap { + $mailmap = { + names => {}, + addresses => {} + }; + + return if (!$email_use_mailmap || !(-f "${lk_path}.mailmap")); + + open(my $mailmap_file, '<', "${lk_path}.mailmap") + or warn "$P: Can't open .mailmap: $!\n"; + + while (<$mailmap_file>) { + s/#.*$//; #strip comments + s/^\s+|\s+$//g; #trim + + next if (/^\s*$/); #skip empty lines + #entries have one of the following formats: + # name1 <mail1> + # <mail1> <mail2> + # name1 <mail1> <mail2> + # name1 <mail1> name2 <mail2> + # (see man git-shortlog) + + if (/^([^<]+)<([^>]+)>$/) { + my $real_name = $1; + my $address = $2; + + $real_name =~ s/\s+$//; + ($real_name, $address) = parse_email("$real_name <$address>"); + $mailmap->{names}->{$address} = $real_name; + + } elsif (/^<([^>]+)>\s*<([^>]+)>$/) { + my $real_address = $1; + my $wrong_address = $2; + + $mailmap->{addresses}->{$wrong_address} = $real_address; + + } elsif (/^(.+)<([^>]+)>\s*<([^>]+)>$/) { + my $real_name = $1; + my $real_address = $2; + my $wrong_address = $3; + + $real_name =~ s/\s+$//; + ($real_name, $real_address) = + parse_email("$real_name <$real_address>"); + $mailmap->{names}->{$wrong_address} = $real_name; + $mailmap->{addresses}->{$wrong_address} = $real_address; + + } elsif (/^(.+)<([^>]+)>\s*(.+)\s*<([^>]+)>$/) { + my $real_name = $1; + my $real_address = $2; + my $wrong_name = $3; + my $wrong_address = $4; + + $real_name =~ s/\s+$//; + ($real_name, $real_address) = + parse_email("$real_name <$real_address>"); + + $wrong_name =~ s/\s+$//; + ($wrong_name, $wrong_address) = + parse_email("$wrong_name <$wrong_address>"); + + my $wrong_email = format_email($wrong_name, $wrong_address, 1); + $mailmap->{names}->{$wrong_email} = $real_name; + $mailmap->{addresses}->{$wrong_email} = $real_address; + } + } + close($mailmap_file); +} + +## use the filenames on the command line or find the filenames in the patchfiles + +my @files = (); +my @range = (); +my @keyword_tvi = (); +my @file_emails = (); + +if (!@ARGV) { + push(@ARGV, "&STDIN"); +} + +foreach my $file (@ARGV) { + if ($file ne "&STDIN") { + ##if $file is a directory and it lacks a trailing slash, add one + if ((-d $file)) { + $file =~ s@([^/])$@$1/@; + } elsif (!(stat $file)) { + die "$P: file '${file}' not found: $!\n"; + } + } + if ($from_filename) { + push(@files, $file); + if ($file ne "MAINTAINERS" && -f $file && ($keywords || $file_emails)) { + open(my $f, '<', $file) + or die "$P: Can't open $file: $!\n"; + my $text = do { local($/) ; <$f> }; + close($f); + if ($keywords) { + foreach my $line (keys %keyword_hash) { + if ($text =~ m/$keyword_hash{$line}/x) { + push(@keyword_tvi, $line); + } + } + } + if ($file_emails) { + my @poss_addr = $text =~ m$[A-Za-zÀ-ÿ\"\' \,\.\+-]*\s*[\,]*\s*[$\<\{]{0,1}[A-Za-z0-9_\.\+-]+\(a)[A-Za-z0-9\.-]+\.[A-Za-z0-9]+[$\>\}]{0,1}$g; + push(@file_emails, clean_file_emails(@poss_addr)); + } + } + } else { + my $file_cnt = @files; + my $lastfile; + + open(my $patch, "< $file") + or die "$P: Can't open $file: $!\n"; + + # We can check arbitrary information before the patch + # like the commit message, mail headers, etc... + # This allows us to match arbitrary keywords against any part + # of a git format-patch generated file (subject tags, etc...) + + my $patch_prefix = ""; #Parsing the intro + + while (<$patch>) { + my $patch_line = $_; + if (m/^\+\+\+\s+(\S+)/) { + my $filename = $1; + $filename =~ s@^[^/]*/@@; + $filename =~ s@\n@@; + $lastfile = $filename; + push(@files, $filename); + $patch_prefix = "^[+-].*"; #Now parsing the actual patch + } elsif (m/^\@\@ -(\d+),(\d+)/) { + if ($email_git_blame) { + push(@range, "$lastfile:$1:$2"); + } + } elsif ($keywords) { + foreach my $line (keys %keyword_hash) { + if ($patch_line =~ m/${patch_prefix}$keyword_hash{$line}/x) { + push(@keyword_tvi, $line); + } + } + } + } + close($patch); + + if ($file_cnt == @files) { + warn "$P: file '${file}' doesn't appear to be a patch. " + . "Add -f to options?\n"; + } + @files = sort_and_uniq(@files); + } +} + +@file_emails = uniq(@file_emails); + +my %email_hash_name; +my %email_hash_address; +my @email_to = (); +my %hash_list_to; +my @list_to = (); +my @scm = (); +my @web = (); +my @subsystem = (); +my @status = (); +my %deduplicate_name_hash = (); +my %deduplicate_address_hash = (); + +my @maintainers = get_maintainers(); + +if (@maintainers) { + @maintainers = merge_email(@maintainers); + output(@maintainers); +} + +if ($scm) { + @scm = uniq(@scm); + output(@scm); +} + +if ($status) { + @status = uniq(@status); + output(@status); +} + +if ($subsystem) { + @subsystem = uniq(@subsystem); + output(@subsystem); +} + +if ($web) { + @web = uniq(@web); + output(@web); +} + +exit($exit); + +sub range_is_maintained { + my ($start, $end) = @_; + + for (my $i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ m/^(.):\s*(.*)/) { + my $type = $1; + my $value = $2; + if ($type eq 'S') { + if ($value =~ /(maintain|support)/i) { + return 1; + } + } + } + } + return 0; +} + +sub range_has_maintainer { + my ($start, $end) = @_; + + for (my $i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ m/^(.):\s*(.*)/) { + my $type = $1; + my $value = $2; + if ($type eq 'M') { + return 1; + } + } + } + return 0; +} + +sub get_maintainers { + %email_hash_name = (); + %email_hash_address = (); + %commit_author_hash = (); + %commit_signer_hash = (); + @email_to = (); + %hash_list_to = (); + @list_to = (); + @scm = (); + @web = (); + @subsystem = (); + @status = (); + %deduplicate_name_hash = (); + %deduplicate_address_hash = (); + if ($email_git_all_signature_types) { + $signature_pattern = "(.+?)[Bb][Yy]:"; + } else { + $signature_pattern = "$" . join("|", @signature_tags) . "$"; + } + + # Find responsible parties + + my %exact_pattern_match_hash = (); + + foreach my $file (@files) { + + my %hash; + my $tvi = find_first_section(); + while ($tvi < @typevalue) { + my $start = find_starting_index($tvi); + my $end = find_ending_index($tvi); + my $exclude = 0; + my $i; + + #Do not match excluded file patterns + + for ($i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ m/^(.):\s*(.*)/) { + my $type = $1; + my $value = $2; + if ($type eq 'X') { + if (file_match_pattern($file, $value)) { + $exclude = 1; + last; + } + } + } + } + + if (!$exclude) { + for ($i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ m/^(.):\s*(.*)/) { + my $type = $1; + my $value = $2; + if ($type eq 'F') { + if (file_match_pattern($file, $value)) { + my $value_pd = ($value =~ tr@/@@); + my $file_pd = ($file =~ tr@/@@); + $value_pd++ if (substr($value,-1,1) ne "/"); + $value_pd = -1 if ($value =~ /^\.\*/); + if ($value_pd >= $file_pd && + range_is_maintained($start, $end) && + range_has_maintainer($start, $end)) { + $exact_pattern_match_hash{$file} = 1; + } + if ($pattern_depth == 0 || + (($file_pd - $value_pd) < $pattern_depth)) { + $hash{$tvi} = $value_pd; + } + } + } + } + } + } + $tvi = $end + 1; + } + + foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) { + add_categories($line); + if ($sections) { + my $i; + my $start = find_starting_index($line); + my $end = find_ending_index($line); + for ($i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ /^[FX]:/) { ##Restore file patterns + $line =~ s/([^\\])\.([^\*])/$1\?$2/g; + $line =~ s/([^\\])\.$/$1\?/g; ##Convert . back to ? + $line =~ s/\\\./\./g; ##Convert \. to . + $line =~ s/\.\*/\*/g; ##Convert .* to * + } + $line =~ s/^([A-Z]):/$1:\t/g; + print("$line\n"); + } + print("\n"); + } + } + } + + if ($keywords) { + @keyword_tvi = sort_and_uniq(@keyword_tvi); + foreach my $line (@keyword_tvi) { + add_categories($line); + } + } + + foreach my $email (@email_to, @list_to) { + $email->[0] = deduplicate_email($email->[0]); + } + + if ($email) { + if (! $interactive) { + $email_git_fallback = 0 if @email_to > 0 || $email_git || $email_git_blame; + if ($email_git_fallback) { + print STDERR "get_maintainer.pl: No maintainers found, printing recent contributors.\n"; + print STDERR "get_maintainer.pl: Do not blindly cc: them on patches! Use common sense.\n"; + print STDERR "\n"; + } + } + + foreach my $file (@files) { + if ($email_git || ($email_git_fallback && + !$exact_pattern_match_hash{$file})) { + vcs_file_signoffs($file); + } + if ($email_git_blame) { + vcs_file_blame($file); + } + } + + foreach my $email (@file_emails) { + my ($name, $address) = parse_email($email); + + my $tmp_email = format_email($name, $address, $email_usename); + push_email_address($tmp_email, ''); + add_role($tmp_email, 'in file'); + } + } + + my @to = (); + if ($email || $email_list) { + if ($email) { + @to = (@to, @email_to); + } + if ($email_list) { + @to = (@to, @list_to); + } + } + + if ($interactive) { + @to = interactive_get_maintainers(\@to); + } + + return @to; +} + +sub file_match_pattern { + my ($file, $pattern) = @_; + if (substr($pattern, -1) eq "/") { + if ($file =~ m@^$pattern@) { + return 1; + } + } else { + if ($file =~ m@^$pattern@) { + my $s1 = ($file =~ tr@/@@); + my $s2 = ($pattern =~ tr@/@@); + if ($s1 == $s2) { + return 1; + } + } + } + return 0; +} + +sub usage { + print <<EOT; +usage: $P [options] patchfile + $P [options] -f file|directory +version: $V + +MAINTAINER field selection options: + --email => print email address(es) if any + --git => include recent git \*-by: signers + --git-all-signature-types => include signers regardless of signature type + or use only ${signature_pattern} signers (default: $email_git_all_signature_types) + --git-fallback => use git when no exact MAINTAINERS pattern (default: $email_git_fallback) + --git-min-signatures => number of signatures required (default: $email_git_min_signatures) + --git-max-maintainers => maximum maintainers to add (default: $email_git_max_maintainers) + --git-min-percent => minimum percentage of commits required (default: $email_git_min_percent) + --git-blame => use git blame to find modified commits for patch or file + --git-since => git history to use (default: $email_git_since) + --hg-since => hg history to use (default: $email_hg_since) + --interactive => display a menu (mostly useful if used with the --git option) + --m => include maintainer(s) if any + --r => include reviewer(s) if any + --n => include name 'Full Name <addr\(a)domain.tld>' + --l => include list(s) if any + --s => include subscriber only list(s) if any + --remove-duplicates => minimize duplicate email names/addresses + --roles => show roles (status:subsystem, git-signer, list, etc...) + --rolestats => show roles and statistics (commits/total_commits, %) + --file-emails => add email addresses found in -f file (default: 0 (off)) + --scm => print SCM tree(s) if any + --status => print status if any + --subsystem => print subsystem name if any + --web => print website(s) if any + +Output type options: + --separator [, ] => separator for multiple entries on 1 line + using --separator also sets --nomultiline if --separator is not [, ] + --multiline => print 1 entry per line + +Other options: + --pattern-depth => Number of pattern directory traversals (default: 0 (all)) + --keywords => scan patch for keywords (default: $keywords) + --sections => print all of the subsystem sections with pattern matches + --mailmap => use .mailmap file (default: $email_use_mailmap) + --version => show version + --help => show this help information + +Default options: + [--email --nogit --git-fallback --m --r --n --l --multiline --pattern-depth=0 + --remove-duplicates --rolestats] + +Notes: + Using "-f directory" may give unexpected results: + Used with "--git", git signators for _all_ files in and below + directory are examined as git recurses directories. + Any specified X: (exclude) pattern matches are _not_ ignored. + Used with "--nogit", directory is used as a pattern match, + no individual file within the directory or subdirectory + is matched. + Used with "--git-blame", does not iterate all files in directory + Using "--git-blame" is slow and may add old committers and authors + that are no longer active maintainers to the output. + Using "--roles" or "--rolestats" with git send-email --cc-cmd or any + other automated tools that expect only ["name"] <email address> + may not work because of additional output after <email address>. + Using "--rolestats" and "--git-blame" shows the #/total=% commits, + not the percentage of the entire file authored. # of commits is + not a good measure of amount of code authored. 1 major commit may + contain a thousand lines, 5 trivial commits may modify a single line. + If git is not installed, but mercurial (hg) is installed and an .hg + repository exists, the following options apply to mercurial: + --git, + --git-min-signatures, --git-max-maintainers, --git-min-percent, and + --git-blame + Use --hg-since not --git-since to control date selection + File ".get_maintainer.conf", if it exists in the libvirt source root + directory, can change whatever get_maintainer defaults are desired. + Entries in this file can be any command line argument. + This file is prepended to any additional command line arguments. + Multiple lines and # comments are allowed. +EOT +} + +sub top_of_tree { + my ($lk_path) = @_; + + if ($lk_path ne "" && substr($lk_path,length($lk_path)-1,1) ne "/") { + $lk_path .= "/"; + } + if ( (-f "${lk_path}COPYING") + && (-f "${lk_path}MAINTAINERS") + && (-f "${lk_path}Makefile.am") + && (-d "${lk_path}docs") + && (-f "${lk_path}m4/virt-lib.m4") + && (-f "${lk_path}src/libvirt.c")) { + return 1; + } + return 0; +} + +sub parse_email { + my ($formatted_email) = @_; + + my $name = ""; + my $address = ""; + + if ($formatted_email =~ /^([^<]+)<(.+\@.*)>.*$/) { + $name = $1; + $address = $2; + } elsif ($formatted_email =~ /^\s*<(.+\@\S*)>.*$/) { + $address = $1; + } elsif ($formatted_email =~ /^(.+$a)\S*).*$/) { + $address = $1; + } + + $name =~ s/^\s+|\s+$//g; + $name =~ s/^\"|\"$//g; + $address =~ s/^\s+|\s+$//g; + + if ($name =~ /[^\w \-]/i) { ##has "must quote" chars + $name =~ s/(?<!\$"/\\"/g; ##escape quotes + $name = "\"$name\""; + } + + return ($name, $address); +} + +sub format_email { + my ($name, $address, $usename) = @_; + + my $formatted_email; + + $name =~ s/^\s+|\s+$//g; + $name =~ s/^\"|\"$//g; + $address =~ s/^\s+|\s+$//g; + + if ($name =~ /[^\w \-]/i) { ##has "must quote" chars + $name =~ s/(?<!\\)"/\\"/g; ##escape quotes + $name = "\"$name\""; + } + + if ($usename) { + if ("$name" eq "") { + $formatted_email = "$address"; + } else { + $formatted_email = "$name <$address>"; + } + } else { + $formatted_email = $address; + } + + return $formatted_email; +} + +sub find_first_section { + my $index = 0; + + while ($index < @typevalue) { + my $tv = $typevalue[$index]; + if (($tv =~ m/^(.):\s*(.*)/)) { + last; + } + $index++; + } + + return $index; +} + +sub find_starting_index { + my ($index) = @_; + + while ($index > 0) { + my $tv = $typevalue[$index]; + if (!($tv =~ m/^(.):\s*(.*)/)) { + last; + } + $index--; + } + + return $index; +} + +sub find_ending_index { + my ($index) = @_; + + while ($index < @typevalue) { + my $tv = $typevalue[$index]; + if (!($tv =~ m/^(.):\s*(.*)/)) { + last; + } + $index++; + } + + return $index; +} + +sub get_subsystem_name { + my ($index) = @_; + + my $start = find_starting_index($index); + + my $subsystem = $typevalue[$start]; + if (length($subsystem) > 20) { + $subsystem = substr($subsystem, 0, 17); + $subsystem =~ s/\s*$//; + $subsystem = $subsystem . "..."; + } + return $subsystem; +} + +sub get_maintainer_role { + my ($index) = @_; + + my $i; + my $start = find_starting_index($index); + my $end = find_ending_index($index); + + my $role = "unknown"; + my $subsystem = get_subsystem_name($index); + + for ($i = $start + 1; $i < $end; $i++) { + my $tv = $typevalue[$i]; + if ($tv =~ m/^(.):\s*(.*)/) { + my $ptype = $1; + my $pvalue = $2; + if ($ptype eq "S") { + $role = $pvalue; + } + } + } + + $role = lc($role); + if ($role eq "supported") { + $role = "supporter"; + } elsif ($role eq "maintained") { + $role = "maintainer"; + } elsif ($role eq "odd fixes") { + $role = "odd fixer"; + } elsif ($role eq "orphan") { + $role = "orphan minder"; + } elsif ($role eq "obsolete") { + $role = "obsolete minder"; + } elsif ($role eq "buried alive in reporters") { + $role = "chief penguin"; + } + + return $role . ":" . $subsystem; +} + +sub get_list_role { + my ($index) = @_; + + my $subsystem = get_subsystem_name($index); + + if ($subsystem eq "THE REST") { + $subsystem = ""; + } + + return $subsystem; +} + +sub add_categories { + my ($index) = @_; + + my $i; + my $start = find_starting_index($index); + my $end = find_ending_index($index); + + push(@subsystem, $typevalue[$start]); + + for ($i = $start + 1; $i < $end; $i++) { + my $tv = $typevalue[$i]; + if ($tv =~ m/^(.):\s*(.*)/) { + my $ptype = $1; + my $pvalue = $2; + if ($ptype eq "L") { + my $list_address = $pvalue; + my $list_additional = ""; + my $list_role = get_list_role($i); + + if ($list_role ne "") { + $list_role = ":" . $list_role; + } + if ($list_address =~ m/([^\s]+)\s+(.*)$/) { + $list_address = $1; + $list_additional = $2; + } + if ($list_additional =~ m/subscribers-only/) { + if ($email_subscriber_list) { + if (!$hash_list_to{lc($list_address)}) { + $hash_list_to{lc($list_address)} = 1; + push(@list_to, [$list_address, + "subscriber list${list_role}"]); + } + } + } else { + if ($email_list) { + if (!$hash_list_to{lc($list_address)}) { + $hash_list_to{lc($list_address)} = 1; + if ($list_additional =~ m/moderated/) { + push(@list_to, [$list_address, + "moderated list${list_role}"]); + } else { + push(@list_to, [$list_address, + "open list${list_role}"]); + } + } + } + } + } elsif ($ptype eq "M") { + my ($name, $address) = parse_email($pvalue); + if ($name eq "") { + if ($i > 0) { + my $tv = $typevalue[$i - 1]; + if ($tv =~ m/^(.):\s*(.*)/) { + if ($1 eq "P") { + $name = $2; + $pvalue = format_email($name, $address, $email_usename); + } + } + } + } + if ($email_maintainer) { + my $role = get_maintainer_role($i); + push_email_addresses($pvalue, $role); + } + } elsif ($ptype eq "R") { + my ($name, $address) = parse_email($pvalue); + if ($name eq "") { + if ($i > 0) { + my $tv = $typevalue[$i - 1]; + if ($tv =~ m/^(.):\s*(.*)/) { + if ($1 eq "P") { + $name = $2; + $pvalue = format_email($name, $address, $email_usename); + } + } + } + } + if ($email_reviewer) { + my $subsystem = get_subsystem_name($i); + push_email_addresses($pvalue, "reviewer:$subsystem"); + } + } elsif ($ptype eq "T") { + push(@scm, $pvalue); + } elsif ($ptype eq "W") { + push(@web, $pvalue); + } elsif ($ptype eq "S") { + push(@status, $pvalue); + } + } + } +} + +sub email_inuse { + my ($name, $address) = @_; + + return 1 if (($name eq "") && ($address eq "")); + return 1 if (($name ne "") && exists($email_hash_name{lc($name)})); + return 1 if (($address ne "") && exists($email_hash_address{lc($address)})); + + return 0; +} + +sub push_email_address { + my ($line, $role) = @_; + + my ($name, $address) = parse_email($line); + + if ($address eq "") { + return 0; + } + + if (!$email_remove_duplicates) { + push(@email_to, [format_email($name, $address, $email_usename), $role]); + } elsif (!email_inuse($name, $address)) { + push(@email_to, [format_email($name, $address, $email_usename), $role]); + $email_hash_name{lc($name)}++ if ($name ne ""); + $email_hash_address{lc($address)}++; + } + + return 1; +} + +sub push_email_addresses { + my ($address, $role) = @_; + + my @address_list = (); + + if (rfc822_valid($address)) { + push_email_address($address, $role); + } elsif (@address_list = rfc822_validlist($address)) { + my $array_count = shift(@address_list); + while (my $entry = shift(@address_list)) { + push_email_address($entry, $role); + } + } else { + if (!push_email_address($address, $role)) { + warn("Invalid MAINTAINERS address: '" . $address . "'\n"); + } + } +} + +sub add_role { + my ($line, $role) = @_; + + my ($name, $address) = parse_email($line); + my $email = format_email($name, $address, $email_usename); + + foreach my $entry (@email_to) { + if ($email_remove_duplicates) { + my ($entry_name, $entry_address) = parse_email($entry->[0]); + if (($name eq $entry_name || $address eq $entry_address) + && ($role eq "" || !($entry->[1] =~ m/$role/)) + ) { + if ($entry->[1] eq "") { + $entry->[1] = "$role"; + } else { + $entry->[1] = "$entry->[1],$role"; + } + } + } else { + if ($email eq $entry->[0] + && ($role eq "" || !($entry->[1] =~ m/$role/)) + ) { + if ($entry->[1] eq "") { + $entry->[1] = "$role"; + } else { + $entry->[1] = "$entry->[1],$role"; + } + } + } + } +} + +sub which { + my ($bin) = @_; + + foreach my $path (split(/:/, $ENV{PATH})) { + if (-e "$path/$bin") { + return "$path/$bin"; + } + } + + return ""; +} + +sub which_conf { + my ($conf) = @_; + + foreach my $path (split(/:/, ".:$ENV{HOME}:.scripts")) { + if (-e "$path/$conf") { + return "$path/$conf"; + } + } + + return ""; +} + +sub mailmap_email { + my ($line) = @_; + + my ($name, $address) = parse_email($line); + my $email = format_email($name, $address, 1); + my $real_name = $name; + my $real_address = $address; + + if (exists $mailmap->{names}->{$email} || + exists $mailmap->{addresses}->{$email}) { + if (exists $mailmap->{names}->{$email}) { + $real_name = $mailmap->{names}->{$email}; + } + if (exists $mailmap->{addresses}->{$email}) { + $real_address = $mailmap->{addresses}->{$email}; + } + } else { + if (exists $mailmap->{names}->{$address}) { + $real_name = $mailmap->{names}->{$address}; + } + if (exists $mailmap->{addresses}->{$address}) { + $real_address = $mailmap->{addresses}->{$address}; + } + } + return format_email($real_name, $real_address, 1); +} + +sub mailmap { + my (@addresses) = @_; + + my @mapped_emails = (); + foreach my $line (@addresses) { + push(@mapped_emails, mailmap_email($line)); + } + merge_by_realname(@mapped_emails) if ($email_use_mailmap); + return @mapped_emails; +} + +sub merge_by_realname { + my %address_map; + my (@emails) = @_; + + foreach my $email (@emails) { + my ($name, $address) = parse_email($email); + if (exists $address_map{$name}) { + $address = $address_map{$name}; + $email = format_email($name, $address, 1); + } else { + $address_map{$name} = $address; + } + } +} + +sub git_execute_cmd { + my ($cmd) = @_; + my @lines = (); + + my $output = `$cmd`; + $output =~ s/^\s*//gm; + @lines = split("\n", $output); + + return @lines; +} + +sub hg_execute_cmd { + my ($cmd) = @_; + my @lines = (); + + my $output = `$cmd`; + @lines = split("\n", $output); + + return @lines; +} + +sub extract_formatted_signatures { + my (@signature_lines) = @_; + + my @type = @signature_lines; + + s/\s*(.*):.*/$1/ for (@type); + + # cut -f2- -d":" + s/\s*.*:\s*(.+)\s*/$1/ for (@signature_lines); + +## Reformat email addresses (with names) to avoid badly written signatures + + foreach my $signer (@signature_lines) { + $signer = deduplicate_email($signer); + } + + return (\@type, \@signature_lines); +} + +sub vcs_find_signers { + my ($cmd) = @_; + my $commits; + my @lines = (); + my @signatures = (); + + @lines = &{$VCS_cmds{"execute_cmd"}}($cmd); + + my $pattern = $VCS_cmds{"commit_pattern"}; + + $commits = grep(/$pattern/, @lines); # of commits + + @signatures = grep(/^[ \t]*${signature_pattern}.*\@.*$/, @lines); + + return (0, @signatures) if !@signatures; + + save_commits_by_author(@lines) if ($interactive); + save_commits_by_signer(@lines) if ($interactive); + + my ($types_ref, $signers_ref) = extract_formatted_signatures(@signatures); + + return ($commits, @$signers_ref); +} + +sub vcs_find_author { + my ($cmd) = @_; + my @lines = (); + + @lines = &{$VCS_cmds{"execute_cmd"}}($cmd); + + return @lines if !@lines; + + my @authors = (); + foreach my $line (@lines) { + if ($line =~ m/$VCS_cmds{"author_pattern"}/) { + my $author = $1; + my ($name, $address) = parse_email($author); + $author = format_email($name, $address, 1); + push(@authors, $author); + } + } + + save_commits_by_author(@lines) if ($interactive); + save_commits_by_signer(@lines) if ($interactive); + + return @authors; +} + +sub vcs_save_commits { + my ($cmd) = @_; + my @lines = (); + my @commits = (); + + @lines = &{$VCS_cmds{"execute_cmd"}}($cmd); + + foreach my $line (@lines) { + if ($line =~ m/$VCS_cmds{"blame_commit_pattern"}/) { + push(@commits, $1); + } + } + + return @commits; +} + +sub vcs_blame { + my ($file) = @_; + my $cmd; + my @commits = (); + + return @commits if (!(-f $file)); + + if (@range && $VCS_cmds{"blame_range_cmd"} eq "") { + my @all_commits = (); + + $cmd = $VCS_cmds{"blame_file_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #interpolate $cmd + @all_commits = vcs_save_commits($cmd); + + foreach my $file_range_diff (@range) { + next if (!($file_range_diff =~ m/(.+):(.+):(.+)/)); + my $diff_file = $1; + my $diff_start = $2; + my $diff_length = $3; + next if ("$file" ne "$diff_file"); + for (my $i = $diff_start; $i < $diff_start + $diff_length; $i++) { + push(@commits, $all_commits[$i]); + } + } + } elsif (@range) { + foreach my $file_range_diff (@range) { + next if (!($file_range_diff =~ m/(.+):(.+):(.+)/)); + my $diff_file = $1; + my $diff_start = $2; + my $diff_length = $3; + next if ("$file" ne "$diff_file"); + $cmd = $VCS_cmds{"blame_range_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #interpolate $cmd + push(@commits, vcs_save_commits($cmd)); + } + } else { + $cmd = $VCS_cmds{"blame_file_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #interpolate $cmd + @commits = vcs_save_commits($cmd); + } + + foreach my $commit (@commits) { + $commit =~ s/^\^//g; + } + + return @commits; +} + +my $printed_novcs = 0; +sub vcs_exists { + %VCS_cmds = %VCS_cmds_git; + return 1 if eval $VCS_cmds{"available"}; + %VCS_cmds = %VCS_cmds_hg; + return 2 if eval $VCS_cmds{"available"}; + %VCS_cmds = (); + if (!$printed_novcs) { + warn("$P: No supported VCS found. Add --nogit to options?\n"); + warn("Using a git repository produces better results.\n"); + warn("Try latest git repository using:\n"); + warn("git clone git://libvirt.org/libvirt.git\n"); + $printed_novcs = 1; + } + return 0; +} + +sub vcs_is_git { + vcs_exists(); + return $vcs_used == 1; +} + +sub vcs_is_hg { + return $vcs_used == 2; +} + +sub interactive_get_maintainers { + my ($list_ref) = @_; + my @list = @$list_ref; + + vcs_exists(); + + my %selected; + my %authored; + my %signed; + my $count = 0; + my $maintained = 0; + foreach my $entry (@list) { + $maintained = 1 if ($entry->[1] =~ /^(maintainer|supporter)/i); + $selected{$count} = 1; + $authored{$count} = 0; + $signed{$count} = 0; + $count++; + } + + #menu loop + my $done = 0; + my $print_options = 0; + my $redraw = 1; + while (!$done) { + $count = 0; + if ($redraw) { + printf STDERR "\n%1s %2s %-65s", + "*", "#", "email/list and role:stats"; + if ($email_git || + ($email_git_fallback && !$maintained) || + $email_git_blame) { + print STDERR "auth sign"; + } + print STDERR "\n"; + foreach my $entry (@list) { + my $email = $entry->[0]; + my $role = $entry->[1]; + my $sel = ""; + $sel = "*" if ($selected{$count}); + my $commit_author = $commit_author_hash{$email}; + my $commit_signer = $commit_signer_hash{$email}; + my $authored = 0; + my $signed = 0; + $authored++ for (@{$commit_author}); + $signed++ for (@{$commit_signer}); + printf STDERR "%1s %2d %-65s", $sel, $count + 1, $email; + printf STDERR "%4d %4d", $authored, $signed + if ($authored > 0 || $signed > 0); + printf STDERR "\n %s\n", $role; + if ($authored{$count}) { + my $commit_author = $commit_author_hash{$email}; + foreach my $ref (@{$commit_author}) { + print STDERR " Author: @{$ref}[1]\n"; + } + } + if ($signed{$count}) { + my $commit_signer = $commit_signer_hash{$email}; + foreach my $ref (@{$commit_signer}) { + print STDERR " @{$ref}[2]: @{$ref}[1]\n"; + } + } + + $count++; + } + } + my $date_ref = \$email_git_since; + $date_ref = \$email_hg_since if (vcs_is_hg()); + if ($print_options) { + $print_options = 0; + if (vcs_exists()) { + print STDERR <<EOT + +Version Control options: +g use git history [$email_git] +gf use git-fallback [$email_git_fallback] +b use git blame [$email_git_blame] +bs use blame signatures [$email_git_blame_signatures] +c# minimum commits [$email_git_min_signatures] +%# min percent [$email_git_min_percent] +d# history to use [$$date_ref] +x# max maintainers [$email_git_max_maintainers] +t all signature types [$email_git_all_signature_types] +m use .mailmap [$email_use_mailmap] +EOT + } + print STDERR <<EOT + +Additional options: +0 toggle all +tm toggle maintainers +tg toggle git entries +tl toggle open list entries +ts toggle subscriber list entries +f emails in file [$file_emails] +k keywords in file [$keywords] +r remove duplicates [$email_remove_duplicates] +p# pattern match depth [$pattern_depth] +EOT + } + print STDERR +"\n#(toggle), A#(author), S#(signed) *(all), ^(none), O(options), Y(approve): "; + + my $input = <STDIN>; + chomp($input); + + $redraw = 1; + my $rerun = 0; + my @wish = split(/[, ]+/, $input); + foreach my $nr (@wish) { + $nr = lc($nr); + my $sel = substr($nr, 0, 1); + my $str = substr($nr, 1); + my $val = 0; + $val = $1 if $str =~ /^(\d+)$/; + + if ($sel eq "y") { + $interactive = 0; + $done = 1; + $output_rolestats = 0; + $output_roles = 0; + last; + } elsif ($nr =~ /^\d+$/ && $nr > 0 && $nr <= $count) { + $selected{$nr - 1} = !$selected{$nr - 1}; + } elsif ($sel eq "*" || $sel eq '^') { + my $toggle = 0; + $toggle = 1 if ($sel eq '*'); + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = $toggle; + } + } elsif ($sel eq "0") { + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = !$selected{$i}; + } + } elsif ($sel eq "t") { + if (lc($str) eq "m") { + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = !$selected{$i} + if ($list[$i]->[1] =~ /^(maintainer|supporter)/i); + } + } elsif (lc($str) eq "g") { + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = !$selected{$i} + if ($list[$i]->[1] =~ /^(author|commit|signer)/i); + } + } elsif (lc($str) eq "l") { + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = !$selected{$i} + if ($list[$i]->[1] =~ /^(open list)/i); + } + } elsif (lc($str) eq "s") { + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = !$selected{$i} + if ($list[$i]->[1] =~ /^(subscriber list)/i); + } + } + } elsif ($sel eq "a") { + if ($val > 0 && $val <= $count) { + $authored{$val - 1} = !$authored{$val - 1}; + } elsif ($str eq '*' || $str eq '^') { + my $toggle = 0; + $toggle = 1 if ($str eq '*'); + for (my $i = 0; $i < $count; $i++) { + $authored{$i} = $toggle; + } + } + } elsif ($sel eq "s") { + if ($val > 0 && $val <= $count) { + $signed{$val - 1} = !$signed{$val - 1}; + } elsif ($str eq '*' || $str eq '^') { + my $toggle = 0; + $toggle = 1 if ($str eq '*'); + for (my $i = 0; $i < $count; $i++) { + $signed{$i} = $toggle; + } + } + } elsif ($sel eq "o") { + $print_options = 1; + $redraw = 1; + } elsif ($sel eq "g") { + if ($str eq "f") { + bool_invert(\$email_git_fallback); + } else { + bool_invert(\$email_git); + } + $rerun = 1; + } elsif ($sel eq "b") { + if ($str eq "s") { + bool_invert(\$email_git_blame_signatures); + } else { + bool_invert(\$email_git_blame); + } + $rerun = 1; + } elsif ($sel eq "c") { + if ($val > 0) { + $email_git_min_signatures = $val; + $rerun = 1; + } + } elsif ($sel eq "x") { + if ($val > 0) { + $email_git_max_maintainers = $val; + $rerun = 1; + } + } elsif ($sel eq "%") { + if ($str ne "" && $val >= 0) { + $email_git_min_percent = $val; + $rerun = 1; + } + } elsif ($sel eq "d") { + if (vcs_is_git()) { + $email_git_since = $str; + } elsif (vcs_is_hg()) { + $email_hg_since = $str; + } + $rerun = 1; + } elsif ($sel eq "t") { + bool_invert(\$email_git_all_signature_types); + $rerun = 1; + } elsif ($sel eq "f") { + bool_invert(\$file_emails); + $rerun = 1; + } elsif ($sel eq "r") { + bool_invert(\$email_remove_duplicates); + $rerun = 1; + } elsif ($sel eq "m") { + bool_invert(\$email_use_mailmap); + read_mailmap(); + $rerun = 1; + } elsif ($sel eq "k") { + bool_invert(\$keywords); + $rerun = 1; + } elsif ($sel eq "p") { + if ($str ne "" && $val >= 0) { + $pattern_depth = $val; + $rerun = 1; + } + } elsif ($sel eq "h" || $sel eq "?") { + print STDERR <<EOT + +Interactive mode allows you to select the various maintainers, submitters, +commit signers and mailing lists that could be CC'd on a patch. + +Any *'d entry is selected. + +If you have git or hg installed, you can choose to summarize the commit +history of files in the patch. Also, each line of the current file can +be matched to its commit author and that commits signers with blame. + +Various knobs exist to control the length of time for active commit +tracking, the maximum number of commit authors and signers to add, +and such. + +Enter selections at the prompt until you are satisfied that the selected +maintainers are appropriate. You may enter multiple selections separated +by either commas or spaces. + +EOT + } else { + print STDERR "invalid option: '$nr'\n"; + $redraw = 0; + } + } + if ($rerun) { + print STDERR "git-blame can be very slow, please have patience..." + if ($email_git_blame); + goto &get_maintainers; + } + } + + #drop not selected entries + $count = 0; + my @new_emailto = (); + foreach my $entry (@list) { + if ($selected{$count}) { + push(@new_emailto, $list[$count]); + } + $count++; + } + return @new_emailto; +} + +sub bool_invert { + my ($bool_ref) = @_; + + if ($$bool_ref) { + $$bool_ref = 0; + } else { + $$bool_ref = 1; + } +} + +sub deduplicate_email { + my ($email) = @_; + + my $matched = 0; + my ($name, $address) = parse_email($email); + $email = format_email($name, $address, 1); + $email = mailmap_email($email); + + return $email if (!$email_remove_duplicates); + + ($name, $address) = parse_email($email); + + if ($name ne "" && $deduplicate_name_hash{lc($name)}) { + $name = $deduplicate_name_hash{lc($name)}->[0]; + $address = $deduplicate_name_hash{lc($name)}->[1]; + $matched = 1; + } elsif ($deduplicate_address_hash{lc($address)}) { + $name = $deduplicate_address_hash{lc($address)}->[0]; + $address = $deduplicate_address_hash{lc($address)}->[1]; + $matched = 1; + } + if (!$matched) { + $deduplicate_name_hash{lc($name)} = [ $name, $address ]; + $deduplicate_address_hash{lc($address)} = [ $name, $address ]; + } + $email = format_email($name, $address, 1); + $email = mailmap_email($email); + return $email; +} + +sub save_commits_by_author { + my (@lines) = @_; + + my @authors = (); + my @commits = (); + my @subjects = (); + + foreach my $line (@lines) { + if ($line =~ m/$VCS_cmds{"author_pattern"}/) { + my $author = $1; + $author = deduplicate_email($author); + push(@authors, $author); + } + push(@commits, $1) if ($line =~ m/$VCS_cmds{"commit_pattern"}/); + push(@subjects, $1) if ($line =~ m/$VCS_cmds{"subject_pattern"}/); + } + + for (my $i = 0; $i < @authors; $i++) { + my $exists = 0; + foreach my $ref(@{$commit_author_hash{$authors[$i]}}) { + if (@{$ref}[0] eq $commits[$i] && + @{$ref}[1] eq $subjects[$i]) { + $exists = 1; + last; + } + } + if (!$exists) { + push(@{$commit_author_hash{$authors[$i]}}, + [ ($commits[$i], $subjects[$i]) ]); + } + } +} + +sub save_commits_by_signer { + my (@lines) = @_; + + my $commit = ""; + my $subject = ""; + + foreach my $line (@lines) { + $commit = $1 if ($line =~ m/$VCS_cmds{"commit_pattern"}/); + $subject = $1 if ($line =~ m/$VCS_cmds{"subject_pattern"}/); + if ($line =~ /^[ \t]*${signature_pattern}.*\@.*$/) { + my @signatures = ($line); + my ($types_ref, $signers_ref) = extract_formatted_signatures(@signatures); + my @types = @$types_ref; + my @signers = @$signers_ref; + + my $type = $types[0]; + my $signer = $signers[0]; + + $signer = deduplicate_email($signer); + + my $exists = 0; + foreach my $ref(@{$commit_signer_hash{$signer}}) { + if (@{$ref}[0] eq $commit && + @{$ref}[1] eq $subject && + @{$ref}[2] eq $type) { + $exists = 1; + last; + } + } + if (!$exists) { + push(@{$commit_signer_hash{$signer}}, + [ ($commit, $subject, $type) ]); + } + } + } +} + +sub vcs_assign { + my ($role, $divisor, @lines) = @_; + + my %hash; + my $count = 0; + + return if (@lines <= 0); + + if ($divisor <= 0) { + warn("Bad divisor in " . (caller(0))[3] . ": $divisor\n"); + $divisor = 1; + } + + @lines = mailmap(@lines); + + return if (@lines <= 0); + + @lines = sort(@lines); + + # uniq -c + $hash{$_}++ for @lines; + + # sort -rn + foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) { + my $sign_offs = $hash{$line}; + my $percent = $sign_offs * 100 / $divisor; + + $percent = 100 if ($percent > 100); + $count++; + last if ($sign_offs < $email_git_min_signatures || + $count > $email_git_max_maintainers || + $percent < $email_git_min_percent); + push_email_address($line, ''); + if ($output_rolestats) { + my $fmt_percent = sprintf("%.0f", $percent); + add_role($line, "$role:$sign_offs/$divisor=$fmt_percent%"); + } else { + add_role($line, $role); + } + } +} + +sub vcs_file_signoffs { + my ($file) = @_; + + my @signers = (); + my $commits; + + $vcs_used = vcs_exists(); + return if (!$vcs_used); + + my $cmd = $VCS_cmds{"find_signers_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; # interpolate $cmd + + ($commits, @signers) = vcs_find_signers($cmd); + + foreach my $signer (@signers) { + $signer = deduplicate_email($signer); + } + + vcs_assign("commit_signer", $commits, @signers); +} + +sub vcs_file_blame { + my ($file) = @_; + + my @signers = (); + my @all_commits = (); + my @commits = (); + my $total_commits; + my $total_lines; + + $vcs_used = vcs_exists(); + return if (!$vcs_used); + + @all_commits = vcs_blame($file); + @commits = uniq(@all_commits); + $total_commits = @commits; + $total_lines = @all_commits; + + if ($email_git_blame_signatures) { + if (vcs_is_hg()) { + my $commit_count; + my @commit_signers = (); + my $commit = join(" -r ", @commits); + my $cmd; + + $cmd = $VCS_cmds{"find_commit_signers_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #substitute variables in $cmd + + ($commit_count, @commit_signers) = vcs_find_signers($cmd); + + push(@signers, @commit_signers); + } else { + foreach my $commit (@commits) { + my $commit_count; + my @commit_signers = (); + my $cmd; + + $cmd = $VCS_cmds{"find_commit_signers_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #substitute variables in $cmd + + ($commit_count, @commit_signers) = vcs_find_signers($cmd); + + push(@signers, @commit_signers); + } + } + } + + if ($from_filename) { + if ($output_rolestats) { + my @blame_signers; + if (vcs_is_hg()) {{ # Double brace for last exit + my $commit_count; + my @commit_signers = (); + @commits = uniq(@commits); + @commits = sort(@commits); + my $commit = join(" -r ", @commits); + my $cmd; + + $cmd = $VCS_cmds{"find_commit_author_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #substitute variables in $cmd + + my @lines = (); + + @lines = &{$VCS_cmds{"execute_cmd"}}($cmd); + + last if !@lines; + + my @authors = (); + foreach my $line (@lines) { + if ($line =~ m/$VCS_cmds{"author_pattern"}/) { + my $author = $1; + $author = deduplicate_email($author); + push(@authors, $author); + } + } + + save_commits_by_author(@lines) if ($interactive); + save_commits_by_signer(@lines) if ($interactive); + + push(@signers, @authors); + }} + else { + foreach my $commit (@commits) { + my $i; + my $cmd = $VCS_cmds{"find_commit_author_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #interpolate $cmd + my @author = vcs_find_author($cmd); + next if !@author; + + my $formatted_author = deduplicate_email($author[0]); + + my $count = grep(/$commit/, @all_commits); + for ($i = 0; $i < $count ; $i++) { + push(@blame_signers, $formatted_author); + } + } + } + if (@blame_signers) { + vcs_assign("authored lines", $total_lines, @blame_signers); + } + } + foreach my $signer (@signers) { + $signer = deduplicate_email($signer); + } + vcs_assign("commits", $total_commits, @signers); + } else { + foreach my $signer (@signers) { + $signer = deduplicate_email($signer); + } + vcs_assign("modified commits", $total_commits, @signers); + } +} + +sub uniq { + my (@parms) = @_; + + my %saw; + @parms = grep(!$saw{$_}++, @parms); + return @parms; +} + +sub sort_and_uniq { + my (@parms) = @_; + + my %saw; + @parms = sort @parms; + @parms = grep(!$saw{$_}++, @parms); + return @parms; +} + +sub clean_file_emails { + my (@file_emails) = @_; + my @fmt_emails = (); + + foreach my $email (@file_emails) { + $email =~ s/[$\<\{]{0,1}([A-Za-z0-9_\.\+-]+\(a)[A-Za-z0-9\.-]+)[$\>\}]{0,1}/\<$1\>/g; + my ($name, $address) = parse_email($email); + if ($name eq '"[,\.]"') { + $name = ""; + } + + my @nw = split(/[^A-Za-zÀ-ÿ\'\,\.\+-]/, $name); + if (@nw > 2) { + my $first = $nw[@nw - 3]; + my $middle = $nw[@nw - 2]; + my $last = $nw[@nw - 1]; + + if (((length($first) == 1 && $first =~ m/[A-Za-z]/) || + (length($first) == 2 && substr($first, -1) eq ".")) || + (length($middle) == 1 || + (length($middle) == 2 && substr($middle, -1) eq "."))) { + $name = "$first $middle $last"; + } else { + $name = "$middle $last"; + } + } + + if (substr($name, -1) =~ /[,\.]/) { + $name = substr($name, 0, length($name) - 1); + } elsif (substr($name, -2) =~ /[,\.]"/) { + $name = substr($name, 0, length($name) - 2) . '"'; + } + + if (substr($name, 0, 1) =~ /[,\.]/) { + $name = substr($name, 1, length($name) - 1); + } elsif (substr($name, 0, 2) =~ /"[,\.]/) { + $name = '"' . substr($name, 2, length($name) - 2); + } + + my $fmt_email = format_email($name, $address, $email_usename); + push(@fmt_emails, $fmt_email); + } + return @fmt_emails; +} + +sub merge_email { + my @lines; + my %saw; + + for (@_) { + my ($address, $role) = @$_; + if (!$saw{$address}) { + if ($output_roles) { + push(@lines, "$address ($role)"); + } else { + push(@lines, $address); + } + $saw{$address} = 1; + } + } + + return @lines; +} + +sub output { + my (@parms) = @_; + + if ($output_multiline) { + foreach my $line (@parms) { + print("${line}\n"); + } + } else { + print(join($output_separator, @parms)); + print("\n"); + } +} + +my $rfc822re; + +sub make_rfc822re { +# Basic lexical tokens are specials, domain_literal, quoted_string, atom, and +# comment. We must allow for rfc822_lwsp (or comments) after each of these. +# This regexp will only work on addresses which have had comments stripped +# and replaced with rfc822_lwsp. + + my $specials = '()<>@,;:\\\\".\\[\\]'; + my $controls = '\\000-\\037\\177'; + + my $dtext = "[^\\[\\]\\r\\\\]"; + my $domain_literal = "\\[(?:$dtext|\\\\.)*\\]$rfc822_lwsp*"; + + my $quoted_string = "\"(?:[^\\\"\\r\\\\]|\\\\.|$rfc822_lwsp)*\"$rfc822_lwsp*"; + +# Use zero-width assertion to spot the limit of an atom. A simple +# $rfc822_lwsp* causes the regexp engine to hang occasionally. + my $atom = "[^$specials $controls]+(?:$rfc822_lwsp+|\\Z|(?=[\\[\"$specials]))"; + my $word = "(?:$atom|$quoted_string)"; + my $localpart = "$word(?:\\.$rfc822_lwsp*$word)*"; + + my $sub_domain = "(?:$atom|$domain_literal)"; + my $domain = "$sub_domain(?:\\.$rfc822_lwsp*$sub_domain)*"; + + my $addr_spec = "$localpart\@$rfc822_lwsp*$domain"; + + my $phrase = "$word*"; + my $route = "(?:\@$domain(?:,\@$rfc822_lwsp*$domain)*:$rfc822_lwsp*)"; + my $route_addr = "\\<$rfc822_lwsp*$route?$addr_spec\\>$rfc822_lwsp*"; + my $mailbox = "(?:$addr_spec|$phrase$route_addr)"; + + my $group = "$phrase:$rfc822_lwsp*(?:$mailbox(?:,\\s*$mailbox)*)?;\\s*"; + my $address = "(?:$mailbox|$group)"; + + return "$rfc822_lwsp*$address"; +} + +sub rfc822_strip_comments { + my $s = shift; +# Recursively remove comments, and replace with a single space. The simpler +# regexps in the Email Addressing FAQ are imperfect - they will miss escaped +# chars in atoms, for example. + + while ($s =~ s/^((?:[^"\\]|\\.)* + (?:"(?:[^"\\]|\\.)*"(?:[^"\\]|\\.)*)*) + $(?:[^()\\]|\\.)*$/$1 /osx) {} + return $s; +} + +# valid: returns true if the parameter is an RFC822 valid address +# +sub rfc822_valid { + my $s = rfc822_strip_comments(shift); + + if (!$rfc822re) { + $rfc822re = make_rfc822re(); + } + + return $s =~ m/^$rfc822re$/so && $s =~ m/^$rfc822_char*$/; +} + +# validlist: In scalar context, returns true if the parameter is an RFC822 +# valid list of addresses. +# +# In list context, returns an empty list on failure (an invalid +# address was found); otherwise a list whose first element is the +# number of addresses found and whose remaining elements are the +# addresses. This is needed to disambiguate failure (invalid) +# from success with no addresses found, because an empty string is +# a valid list. + +sub rfc822_validlist { + my $s = rfc822_strip_comments(shift); + + if (!$rfc822re) { + $rfc822re = make_rfc822re(); + } + # * null list items are valid according to the RFC + # * the '1' business is to aid in distinguishing failure from no results + + my @r; + if ($s =~ m/^(?:$rfc822re)?(?:,(?:$rfc822re)?)*$/so && + $s =~ m/^$rfc822_char*$/) { + while ($s =~ m/(?:^|,$rfc822_lwsp*)($rfc822re)/gos) { + push(@r, $1); + } + return wantarray ? (scalar(@r), @r) : 1; + } + return wantarray ? () : 0; +} -- 2.17.0

5 5

[libvirt] [PATCH 5/9] virsh-network: Add network name completion to 'net-event' command
by Lin Ma 16 May '18

16 May '18

Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/virsh-network.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 7a8bcb1beb..bcf322a5ae 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1202,10 +1202,7 @@ static const vshCmdInfo info_network_event[] = { }; static const vshCmdOptDef opts_network_event[] = { - {.name = "network", - .type = VSH_OT_STRING, - .help = N_("filter by network name or uuid") - }, + VIRSH_COMMON_OPT_NETWORK_OT_STRING(N_("filter by network name or uuid"), 0), {.name = "event", .type = VSH_OT_STRING, .help = N_("which event type to wait for") -- 2.16.2

2 6

[libvirt] [PATCH 0/9] Some virsh completion fixes
by Lin Ma 16 May '18

16 May '18

patch 1 is not about completion, I merge it into this patch set for easy review because it's a tiny fix. Lin Ma (9): virsh: Remove 'id' text from help message for 'domrename' command virsh: Only return active domain names for 'reset' command virsh: Only return active domain names for block* command virsh-network: Create macros for VSH_OT_STRING "network" option virsh-network: Add network name completion to 'net-event' command virsh-network: Add macro VIRSH_COMMON_OPT_NETWORK_FULL virsh-network: Add network name completion to 'net-uuid' command virsh: Introduce virshDomainBlockTargetCompleter virsh: Add target name completion for block device options tools/virsh-completer.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ tools/virsh-completer.h | 4 ++++ tools/virsh-domain-monitor.c | 2 ++ tools/virsh-domain.c | 23 ++++++++++++++------- tools/virsh-network.c | 47 +++++++++++++++++++++++++------------------ 5 files changed, 97 insertions(+), 27 deletions(-) -- 2.16.2

2 5

[libvirt] [PATCH v2 0/5] Add QEMU SDL OpenGL support
by Maciej Wolny 15 May '18

15 May '18

This patch set adds support for accelerated graphics rendering with OpenGL when using the SDL backend with QEMU. This takes advantage of the `-sdl gl` option in QEMU. Maciej Wolny (5): qemu_command: Move SDL command line building into helper qemu_command: Remove outdated comment qemu: Add gl property to graphics of type sdl in domain config qemu: Add QEMU_CAPS_SDL_GL to qemu capabilities qemu: Add gl option to SDL graphics command line docs/formatdomain.html.in | 6 ++ docs/schemas/domaincommon.rng | 8 +++ src/conf/domain_conf.c | 44 +++++++++++++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 69 +++++++++++++++------- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 9 +++ tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 3 +- .../qemuxml2argvdata/video-virtio-gpu-sdl-gl.args | 28 +++++++++ tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml | 38 ++++++++++++ tests/qemuxml2argvtest.c | 5 ++ .../qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml | 45 ++++++++++++++ tests/qemuxml2xmltest.c | 1 + 14 files changed, 237 insertions(+), 23 deletions(-) create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml create mode 100644 tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml -- 2.11.0

3 29

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

15 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 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 tpm: 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 | 13 + 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_driver.c | 5 + 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_tpm.c | 962 +++++++++++++++++++++ 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 + 47 files changed, 2098 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.5.5

5 37

[libvirt] [PATCH 00/12] Various storage_util adjustments
by John Ferlan 15 May '18

15 May '18

Essentially fallout and preparatory steps needed in order to alter the code to allow using qemu-img for creation of qcow[2] encrypted volume. The following series: https://www.redhat.com/archives/libvir-list/2018-April/msg01578.html is the impetus for these changes. What will follow once more testing is done are the adjustments to be able to qemu-img create a qcow[2] encrypted volume and changes to allow qemu-img convert to also work. Currently create is broken for qcow[2] encryption and convert is broken for both qcow[2] and luks encryption. Patches 1&2 could be combined, but since some like separated adjustments like that, I kept them separate. John Ferlan (12): storage_util: Some code cleanup storage_util: Cleanup usage of target.encryption storage_util: Remove unnecessary check storage_util: Rename virQEMUBuildLuksOpts storage_util: Generate the qcow secret earlier storage_util: Move secretPath generation storage_util: Remove luks distinction from secret path and alias storage_util: Split backing_fmt set in storageBackendCreateQemuImgOpts storage_util: Split preallocate set in storageBackendCreateQemuImgOpts storage_util: Move @type into _virStorageBackendQemuImgInfo storage_util: Introduce storageBackendCreateQemuImgSetInput storage_util: Introduce storageBackendDoCreateQemuImg src/libvirt_private.syms | 2 +- src/storage/storage_util.c | 252 +++++++++++++++++++++++++++------------------ src/util/virqemu.c | 8 +- src/util/virqemu.h | 6 +- 4 files changed, 158 insertions(+), 110 deletions(-) -- 2.14.3

3 30

[libvirt] [PATCH 00/13] Fix XML for persistent reservations and refactor
by Peter Krempa 15 May '18

15 May '18

The XML design for the PR stuff is slightly weird so fix it and refactor the code so that it will be much easier to use it with the blockdev infrastructure. Peter Krempa (13): qemu: hotplug: Fix spacing around addition operator qemu: alias: Allow passing alias of parent when generating PR manager alias qemu: command: Fix comment for qemuBuildPRManagerInfoProps qemu: Move validation of PR manager support util: storage: Drop pointless 'enabled' form PR definition util: storage: Drop virStoragePRDefIsEnabled util: storage: Allow passing <source> also for managed PR case qemu: Assign managed PR path when preparing storage source qemu: process: Change semantics of functions starting PR daemon qemu: command: Move check whether PR manager object props need to be built conf: domain: Add helper to check whether a domain def requires use of PR util: storage: Store PR manager alias in the definition qemu: hotplug: Replace qemuDomainDiskNeedRemovePR docs/formatdomain.html.in | 21 ++-- docs/schemas/storagecommon.rng | 3 - src/conf/domain_conf.c | 21 ++++ src/conf/domain_conf.h | 3 + src/libvirt_private.syms | 2 +- src/qemu/qemu_alias.c | 4 +- src/qemu/qemu_alias.h | 2 +- src/qemu/qemu_command.c | 61 +++------- src/qemu/qemu_command.h | 6 +- src/qemu/qemu_domain.c | 66 ++++++++--- src/qemu/qemu_domain.h | 3 +- src/qemu/qemu_hotplug.c | 83 +++----------- src/qemu/qemu_process.c | 40 ++----- src/qemu/qemu_process.h | 5 +- src/util/virstoragefile.c | 124 ++++++++------------- src/util/virstoragefile.h | 5 +- tests/qemustatusxml2xmldata/modern-in.xml | 4 + .../disk-virtio-scsi-reservations.xml | 4 +- tests/qemuxml2xmltest.c | 2 +- 19 files changed, 191 insertions(+), 268 deletions(-) -- 2.16.2

3 26

[libvirt] [dbus PATCH] tests: Add test_storage.py into test_programs
by Pavel Hrdina 15 May '18

15 May '18

Commit <bc58af85e6> forgot to list the test. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule. tests/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 089ade5..5e224f8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,7 +5,8 @@ test_helpers = \ test_programs = \ test_connect.py \ test_domain.py \ - test_network.py + test_network.py \ + test_storage.py EXTRA_DIST = \ $(test_helpers) \ -- 2.17.0

1 0

[libvirt] [jenkins-ci PATCH v2 0/3] Enable out-of-the-box parallel make
by Andrea Bolognani 15 May '18

15 May '18

Changes from [v1]: * turns out some versions of ExtUtils::MakeMaker output Makefiles that are not entirely compatible with parallel make, which forces us to introduce an exception in the relevant template and shuffle patches around. [v1] https://www.redhat.com/archives/libvir-list/2018-May/msg00732.html Andrea Bolognani (3): jobs: Enable parallel make everywhere jobs: Drop explicit parallel make usage guests: Set MAKEFLAGS for out-of-the-box parallel make guests/templates/bashrc | 2 ++ jobs/autotools.yaml | 10 +++++----- jobs/defaults.yaml | 1 - jobs/perl-makemaker.yaml | 12 +++++++----- projects/libvirt.yaml | 4 ++-- projects/osinfo-db.yaml | 4 ++-- 6 files changed, 18 insertions(+), 15 deletions(-) -- 2.17.0

2 5

[libvirt] [PATCH] xenconfig: xm: Fix checking for extra in parser
by Filip Alac 15 May '18

15 May '18

Parser assumed extra was always present when root was specified. Fixed by handling root and extra separately. --- src/xenconfig/xen_xm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/xenconfig/xen_xm.c b/src/xenconfig/xen_xm.c index 8ef68bbc..4becb40b 100644 --- a/src/xenconfig/xen_xm.c +++ b/src/xenconfig/xen_xm.c @@ -91,10 +91,13 @@ xenParseXMOS(virConfPtr conf, virDomainDefPtr def) if (xenConfigGetString(conf, "root", &root, NULL) < 0) return -1; - if (root) { + if (root && extra) { if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0) return -1; - } else { + } else if (root) { + if (virAsprintf(&def->os.cmdline, "root=%s", root) < 0) + return -1; + } else if (extra) { if (VIR_STRDUP(def->os.cmdline, extra) < 0) return -1; } -- 2.17.0

3 4

[libvirt] [PATCH] virDomainMemoryDefParseXML: Don't leak discard
by Michal Privoznik 15 May '18

15 May '18

==1589== 7 bytes in 2 blocks are definitely lost in loss record 34 of 261 ==1589== at 0x4C2AF0F: malloc (vg_replace_malloc.c:299) ==1589== by 0x8A82794: xmlStrndup (in /usr/lib64/libxml2.so.2.9.8) ==1589== by 0x5DD8392: virXMLPropString (virxml.c:510) ==1589== by 0x5E12427: virDomainMemoryDefParseXML (domain_conf.c:15704) ==1589== by 0x5E207DE: virDomainDefParseXML (domain_conf.c:20351) ==1589== by 0x5E2184F: virDomainDefParseNode (domain_conf.c:20636) ==1589== by 0x5E216A1: virDomainDefParse (domain_conf.c:20580) ==1589== by 0x5E21747: virDomainDefParseFile (domain_conf.c:20606) ==1589== by 0x112F5F: testCompareXMLToArgv (qemuxml2argvtest.c:493) ==1589== by 0x138780: virTestRun (testutils.c:180) ==1589== by 0x117129: mymain (qemuxml2argvtest.c:937) ==1589== by 0x13A83C: virTestMain (testutils.c:1120) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d38a775f21..338fbc0e61 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15710,6 +15710,7 @@ virDomainMemoryDefParseXML(virDomainXMLOptionPtr xmlopt, def->discard = val; } + VIR_FREE(tmp); /* source */ if ((node = virXPathNode("./source", ctxt)) && -- 2.16.1

2 1

[libvirt] [PATCH] util: fix misleading command for virObjectLock
by Daniel P. Berrangé 15 May '18

15 May '18

It only accepts a virObjecLockable, not a virObjecRWLockable Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/util/virobject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virobject.c b/src/util/virobject.c index 9fb0328d58..a597ff4f54 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -408,7 +408,7 @@ virObjectGetRWLockableObj(void *anyobj) /** * virObjectLock: - * @anyobj: any instance of virObjectLockable or virObjectRWLockable + * @anyobj: any instance of virObjectLockable * * Acquire a lock on @anyobj. The lock must be released by * virObjectUnlock. -- 2.17.0

2 1

[libvirt] [PATCH] tests: Link mocks with libvirt.so
by Michal Privoznik 15 May '18

15 May '18

In a lot of our mocks (if not all of them) we use our internal APIs (e.g. VIR_ALLOC). So far, we're relying on test binary that links with the mock to drag in libvirt.so. Well, this works only partially. Firstly, whatever binary we execute from tests will fail (e.g. as Martin reported on the list ./qemucapsprobe fails to execute qemu). Secondly, if there's a program that tries to validate linking (like valgrind is doing) it fails because of unresolved symbols. Because of that we have to link our mocks with libvirt.so. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 621480dd0c..ac92190845 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -81,7 +81,8 @@ LDADDS = \ ../src/libvirt.la MOCKLIBS_LIBS = \ - $(GNULIB_LIBS) + $(GNULIB_LIBS) \ + ../src/libvirt.la EXTRA_DIST = \ .valgrind.supp \ -- 2.16.1

2 2

[libvirt] [PATCH v2 00/12] Some fixes and improvement for virsh completion in non interactive mode
by Lin Ma 15 May '18

15 May '18

This patch series is about some fixes and improvement for virsh completion in non interactive mode. Some of them probably don't make sense, I sent them out for suggestions. v2->v1: * Add a new patch for centralize the definition of macro VIRSH_COMMON_OPT_DOMAIN_FULL to virsh.h * rename the helper function from virDomainEventGetName virshDomainEventGetName Follow Peter Krempa's suggestion: * Drop the original patch#10 which about introduce some VIR_DOMAIN_EVENT_* macros * code formatting fix * centralize the definition of macro VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL * centralize the definition of macro VIRSH_COMMON_OPT_DOMAIN_OT_ARGV_FULL * refactor some code in patch#10 for using same array, handle the case when '--event' and '--all' are provided together through command line. * Due to the helper function is only used for virsh, unnecessary to be publiced, I move it from src/conf/domain_event.c to tools/virsh-util.c Lin Ma (12): virsh: Move the definition of macro VIRSH_COMMON_OPT_DOMAIN_FULL to virsh.h virsh: Add domain name completion to 'migrate-postcopy' command virsh: Conditionally Ignore the first entry in list of completions virsh: Create macros for VSH_OT_STRING "domain" option virsh: Apply macro for current VSH_OT_STRING "domain" options vshReadlineParse: Ignore vshReadlineOptionsGenerator for VSH_OT_ARGV options virsh: Create macros for VSH_OT_ARGV "domain" option virsh: Apply macro for current VSH_OT_ARGV "domain" options vshReadlineOptionsGenerator: Add already provided VSH_OT_ARGV options to list virsh: Enable multiple --event flags to 'event' command virsh: add helper for returning event name string virsh: Add event name completion to 'event' command tools/virsh-completer.c | 37 ++++++++++++ tools/virsh-completer.h | 3 + tools/virsh-domain-monitor.c | 9 +-- tools/virsh-domain.c | 135 ++++++++++++++++++++----------------------- tools/virsh-snapshot.c | 3 - tools/virsh-util.c | 60 +++++++++++++++++++ tools/virsh-util.h | 3 + tools/virsh.h | 26 +++++++++ tools/vsh.c | 12 +++- 9 files changed, 203 insertions(+), 85 deletions(-) -- 2.15.1

2 32

[libvirt] [PATCH 0/9] Some virsh completion fixes
by Lin Ma 15 May '18

15 May '18

patch 1 is not about completion, I merge it into this patch set for easy review because it's a tiny fix. Lin Ma (9): virsh: Remove 'id' text from help message for 'domrename' command virsh: Only return active domain names for 'reset' command virsh: Only return active domain names for block* command virsh-network: Create macros for VSH_OT_STRING "network" option virsh-network: Add network name completion to 'net-event' command virsh-network: Add macro VIRSH_COMMON_OPT_NETWORK_FULL virsh-network: Add network name completion to 'net-uuid' command virsh: Introduce virshDomainBlockTargetCompleter virsh: Add target name completion for block device options tools/virsh-completer.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ tools/virsh-completer.h | 4 ++++ tools/virsh-domain-monitor.c | 2 ++ tools/virsh-domain.c | 23 ++++++++++++++------- tools/virsh-network.c | 47 +++++++++++++++++++++++++------------------ 5 files changed, 97 insertions(+), 27 deletions(-) -- 2.16.2

1 0

[libvirt] gnutls regression in vircrypto
by Olaf Hering 15 May '18

15 May '18

Since commit 799011bbe7 ("vircrypto: Rely on GnuTLS for hash functions") the function "gnutls_hash_fast" is used. According to the documentation at https://www.gnutls.org/manual/html_node/Cryptographic-API.html this function is only available since version 2.10.0. But m4/virt-gnutls.m4 expects at least 2.2.0. Please either revert that change, or bump also the required gnutls version. Olaf

3 4

[libvirt] [PATCH] libxl: don't set hasManagedSave when performing save
by Jim Fehlig 15 May '18

15 May '18

libxlDoDomainSave() is used in both the save and managedsave code paths but was unconditionally setting hasManagedSave to true on success. As a result, undefine would fail after a non-managed save/restore operation. E.g. virsh define; virsh start virsh save; virsh restore virsh shutdown virsh undefine error: Refusing to undefine while domain managed save image exists Modify libxlDoDomainSave() to take an additional parameter to specify managed vs non-managed save, and change callers to use it. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 34adef8d48..df53dead0a 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1653,8 +1653,10 @@ libxlDomainGetState(virDomainPtr dom, * virDomainObjPtr must be locked on invocation */ static int -libxlDoDomainSave(libxlDriverPrivatePtr driver, virDomainObjPtr vm, - const char *to) +libxlDoDomainSave(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + const char *to, + bool managed) { libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); libxlSavefileHeader hdr; @@ -1725,7 +1727,7 @@ libxlDoDomainSave(libxlDriverPrivatePtr driver, virDomainObjPtr vm, } libxlDomainCleanup(driver, vm); - vm->hasManagedSave = true; + vm->hasManagedSave = managed; ret = 0; cleanup: @@ -1772,7 +1774,7 @@ libxlDomainSaveFlags(virDomainPtr dom, const char *to, const char *dxml, if (virDomainObjCheckActive(vm) < 0) goto endjob; - if (libxlDoDomainSave(driver, vm, to) < 0) + if (libxlDoDomainSave(driver, vm, to, false) < 0) goto endjob; if (!vm->persistent) @@ -1989,7 +1991,7 @@ libxlDomainManagedSave(virDomainPtr dom, unsigned int flags) VIR_INFO("Saving state to %s", name); - if (libxlDoDomainSave(driver, vm, name) < 0) + if (libxlDoDomainSave(driver, vm, name, true) < 0) goto endjob; if (!vm->persistent) -- 2.16.3

2 1

[libvirt] [PATCH v2 0/8] vfio-ccw passthrough support
by Boris Fiuczynski 15 May '18

15 May '18

Let us support the basic channel I/O passthrough infrastructure based on vfio, which have been introduced in QEMU 2.10. The current focus is to support dasd-eckd (cu_type/dev_type = 0x3990/0x3390) as the target device. Shalini Chellathurai Saroja (8): qemu: introduce capability for virtual-css-bridge qemu: introduce vfio-ccw capability util: virhostdev: add virHostdevIsMdevDevice() qemu: vfio-ccw device address generation qemu: command line generation for vfio-ccw device tests: tests for vfio-ccw passthrough docs: documentation for vfio-ccw passthrough news: documentation of new feature docs/drvnodedev.html.in | 21 ++++- docs/formatdomain.html.in | 20 +++- docs/news.xml | 9 ++ docs/schemas/domaincommon.rng | 5 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 23 +++++ src/qemu/qemu_capabilities.h | 5 + src/qemu/qemu_command.c | 37 ++++++-- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain_address.c | 32 +++++-- src/qemu/qemu_hostdev.c | 3 +- src/qemu/qemu_hotplug.c | 4 +- src/util/virhostdev.c | 26 ++++-- src/util/virhostdev.h | 3 + src/util/virmdev.c | 3 +- src/util/virmdev.h | 1 + .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 28 ++++-- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 28 ++++-- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 31 +++++-- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 3 + .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 24 +++-- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 28 ++++-- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 28 ++++-- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 3 +- tests/qemuhotplugtest.c | 2 +- ...tdev-subsys-mdev-vfio-ccw-duplicate-address.xml | 29 ++++++ ...ostdev-subsys-mdev-vfio-ccw-invalid-address.xml | 23 +++++ .../hostdev-subsys-mdev-vfio-ccw.args | 26 ++++++ .../hostdev-subsys-mdev-vfio-ccw.xml | 22 +++++ tests/qemuxml2argvtest.c | 102 ++++++++++++--------- .../hostdev-subsys-mdev-vfio-ccw.xml | 28 ++++++ tests/qemuxml2xmltest.c | 31 ++++--- 36 files changed, 494 insertions(+), 149 deletions(-) create mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-duplicate-address.xml create mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-invalid-address.xml create mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args create mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.xml -- 2.9.4

3 22

[libvirt] [PATCH 0/3] bhyve: allow locking memory
by Fabian Freyer 14 May '18

14 May '18

This patch series adds support for locking guest memory to the bhyve driver using the following elements <memoryBacking> <locked/> </memoryBacking> When specified, the -S flag is passed to the bhyve binary. Fabian Freyer (3): bhyve: add support for wiring memory bhyve: add tests for wiring memory bhyve: document support for wiring guest memory docs/drvbhyve.html.in | 14 +++++++++ docs/news.xml | 10 ++++++ src/bhyve/bhyve_command.c | 3 ++ src/bhyve/bhyve_parse_command.c | 3 ++ tests/bhyveargv2xmldata/bhyveargv2xml-wired.args | 7 +++++ tests/bhyveargv2xmldata/bhyveargv2xml-wired.xml | 19 ++++++++++++ tests/bhyveargv2xmltest.c | 1 + tests/bhyvexml2argvdata/bhyvexml2argv-wired.args | 10 ++++++ tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs | 3 ++ tests/bhyvexml2argvdata/bhyvexml2argv-wired.xml | 26 ++++++++++++++++ tests/bhyvexml2argvtest.c | 1 + .../bhyvexml2xmloutdata/bhyvexml2xmlout-wired.xml | 36 ++++++++++++++++++++++ tests/bhyvexml2xmltest.c | 1 + 13 files changed, 134 insertions(+) create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-wired.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-wired.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-wired.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-wired.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-wired.xml -- 2.15.1

3 7

[libvirt] [PATCH 0/5] Rely on GnuTLS for md5/sha256 functions
by Ján Tomko 14 May '18

14 May '18

Ján Tomko (5): vircrypto: provide constants for hash sizes Introduce virCryptoHashBuf esx: use virCryptoHashBuf esx: Use VIR_CRYPTO_HASH_SIZE_MD5 vircrypto: Rely on GnuTLS for hash functions bootstrap.conf | 2 -- src/esx/esx_network_driver.c | 22 ++++++++------ src/esx/esx_storage_backend_iscsi.c | 46 +++++++++++++++++------------- src/esx/esx_storage_backend_vmfs.c | 20 ++++++------- src/util/vircrypto.c | 57 ++++++++++++++++++++++++++----------- src/util/vircrypto.h | 10 +++++++ 6 files changed, 100 insertions(+), 57 deletions(-) -- 2.16.1

3 9

[libvirt] [PATCH] travis: Uninstall packages before upgrade
by Andrea Bolognani 14 May '18

14 May '18

numpy (needed by cgal) started having the same issue with linking as python, which makes upgrade and thus the entire build fail on macOS. Instead of playing more tricks with linking/unlinking, just uninstall the problematic packages (and those dragging them in) before doing anything else. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Technically a build breaker, but since I'm changing the approach I'd rather wait for an explicit ACK before pushing. .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3f72d46f3..140072b801 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,10 +21,10 @@ matrix: - compiler: clang os: osx before_install: + - brew uninstall python mercurial postgis sfcgal cgal gdal - brew update - - brew unlink python - brew upgrade - - brew install rpcgen yajl + - brew install python rpcgen yajl script: # We can't run make distcheck/syntax-check because they # fail on macOS, but doing 'install' and 'dist' gives us -- 2.17.0

3 3

[libvirt] [PATCH] tests: Fix qemucapsprobemock linking
by Martin Kletzander 14 May '18

14 May '18

Add libvirt.la into qemucapsprobemock_la_LIBADD because that mock uses bunch of libvirt internal functions. Without this patch the following error occurs: $ ./qemucapsprobe /usr/bin/qemu-system-x86_64 ... warning : virQEMUCapsLogProbeFailure:4204 : Failed to probe capabilities for /usr/bin/qemu-system-x86_64: internal error: Failed to probe QEMU binary with QMP: /usr/bin/qemu-system-x86_64: symbol lookup error: .../qemucapsprobemock.so: undefined symbol: virJSONValueObjectHasKey Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- TBH I didn't go into details why this is needed. It still seems fishy to me. Not only that I get that error above as a libvirt error, but if i add just libvirt_util.la in there, I get: .../qemucapsprobe: symbol lookup error: .../qemucapsprobemock.so: undefined symbol: libvirt_event_poll_update_handle_semaphore If anyone has a better idea how this should be fixed, please suggest that. tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 05db6b1192a4..24ea41f5176c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -619,7 +619,7 @@ qemucapsprobe_LDADD = \ qemucapsprobemock_la_SOURCES = \ qemucapsprobemock.c qemucapsprobemock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) -qemucapsprobemock_la_LIBADD = $(MOCKLIBS_LIBS) +qemucapsprobemock_la_LIBADD = $(MOCKLIBS_LIBS) ../src/libvirt.la qemucommandutiltest_SOURCES = \ qemucommandutiltest.c \ -- 2.17.0

2 1

[libvirt] [dbus PATCH v2 0/3] Type fixes
by Katerina Koukiou 14 May '18

14 May '18

Katerina Koukiou (3): virtDBusNetworkGetDHCPLeases: fix lease type Replace uint -> int wherever libvirt uses int type virtDBusNetworkGetDHCPLeases: fix type for expirytime data/org.libvirt.Connect.xml | 18 +++++++++--------- data/org.libvirt.Domain.xml | 18 +++++++++--------- data/org.libvirt.Network.xml | 2 +- data/org.libvirt.Secret.xml | 2 +- data/org.libvirt.StoragePool.xml | 2 +- src/connect.c | 6 +++--- src/domain.c | 22 +++++++++++----------- src/events.c | 12 ++++++------ src/network.c | 4 ++-- src/secret.c | 2 +- src/storagepool.c | 2 +- 11 files changed, 45 insertions(+), 45 deletions(-) -- 2.15.0

2 6

[libvirt] [dbus PATCH v2 0/3] Domain Events
by Katerina Koukiou 14 May '18

14 May '18

Katerina Koukiou (3): events: Register VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2 events: Register VIR_DOMAIN_EVENT_ID_GRAPHICS events: Register VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON data/org.libvirt.Domain.xml | 25 ++++++++++ src/events.c | 119 ++++++++++++++++++++++++++++++++++++++++++++ src/util.h | 2 + 3 files changed, 146 insertions(+) -- 2.15.0

2 6

[libvirt] [dbus PATCH] connect: Remove unused variable
by Andrea Bolognani 14 May '18

14 May '18

Clang catches the issue: ../../src/connect.c:532:26: error: unused variable 'domain' [-Werror,-Wunused-variable] g_autoptr(virDomain) domain = NULL; ^ Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/connect.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/connect.c b/src/connect.c index 6719e21..14a60dc 100644 --- a/src/connect.c +++ b/src/connect.c @@ -529,7 +529,6 @@ virtDBusConnectDomainSaveImageGetXMLDesc(GVariant *inArgs, GError **error) { virtDBusConnect *connect = userData; - g_autoptr(virDomain) domain = NULL; const gchar *file; guint flags; g_autofree gchar *xml = NULL; -- 2.17.0

2 1

[libvirt] [PATCH 0/3] Finish replacements for virDomainObjCheckActive
by clem＠lse.epita.fr 14 May '18

14 May '18

From: Clementine Hayat <clem(a)lse.epita.fr> Follow-up of https://www.redhat.com/archives/libvir-list/2018-April/msg01591.html Here is the changes asked by Ján Tomko: * Refactor also checks when the error message is close to "domain is not running" * Add forgotten checks in qemu_migration.c * Revert one incorrect change in lxc_driver.c Clementine Hayat (3): qemu: start using virDomainObjCheckActive lxc: start using virDomainObjCheckActive bhyve: start using virDomainObjCheckActive src/bhyve/bhyve_driver.c | 15 +-- src/lxc/lxc_driver.c | 65 ++------- src/qemu/qemu_domain.c | 5 +- src/qemu/qemu_driver.c | 271 ++++++++------------------------------ src/qemu/qemu_migration.c | 10 +- 5 files changed, 74 insertions(+), 292 deletions(-) -- 2.17.0

2 4

[libvirt] [PATCH 0/2] Some include cleanups
by Ján Tomko 14 May '18

14 May '18

Ján Tomko (2): virutil.c: do not include ioctl.h virutil.c: do not include stdarg.h src/util/virutil.c | 2 -- 1 file changed, 2 deletions(-) -- 2.16.1

2 4

[libvirt] [PATCH] maint: typo fix in VIR_MIGRATE_PARAM_URI
by Eric Blake 11 May '18

11 May '18

s/filed/field/ Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule include/libvirt/libvirt-domain.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 12fd34037e..d7cbd18796 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -837,7 +837,7 @@ typedef enum { * the destination host has multiple interfaces and a specific interface is * required to transmit migration data. * - * This filed may not be used when VIR_MIGRATE_TUNNELLED flag is set. + * This field may not be used when VIR_MIGRATE_TUNNELLED flag is set. */ # define VIR_MIGRATE_PARAM_URI "migrate_uri" -- 2.14.3

1 0

[libvirt] [PATCH v5 0/7] Enable memory-backend-file.discard-data
by Michal Privoznik 11 May '18

11 May '18

v5 of: https://www.redhat.com/archives/libvir-list/2018-April/msg02029.html diff to v4: - last patch in the original series is split into two, - more tests added - couple of small changes (e.g. s/int/virTristateBool/) Michal Privoznik (7): qemuMonitorJSONGetDeviceProps: Separate props processing qemu_monitor: Introduce qemuMonitorGetObjectProps qemu_capabilities: Introduce QEMU_CAPS_QOM_LIST_PROPERTIES qemu_capabilities: Introduce QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD conf: Move virDomainMemtune formatting into a separate function conf: Introduce memoryBacking/discard qemu: Implement memoryBacking/discard docs/formatdomain.html.in | 34 +- docs/schemas/cputypes.rng | 5 + docs/schemas/domaincommon.rng | 10 + src/conf/domain_conf.c | 150 +- src/conf/domain_conf.h | 3 + src/conf/numa_conf.c | 27 + src/conf/numa_conf.h | 3 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 22 + src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 27 +- src/qemu/qemu_monitor.c | 13 + src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 89 +- src/qemu/qemu_monitor_json.h | 4 + .../caps_2.12.0.aarch64.replies | 416 +- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 4 +- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 4454 ++++++++++---------- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 4 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 78 +- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 + .../caps_2.12.0.x86_64.replies | 804 ++-- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 4 +- tests/qemuxml2argvdata/hugepages-pages.args | 12 +- tests/qemuxml2argvdata/hugepages-pages.xml | 3 +- tests/qemuxml2argvdata/hugepages-pages3.args | 3 +- tests/qemuxml2argvdata/hugepages-pages3.xml | 4 +- tests/qemuxml2argvdata/hugepages-pages7.args | 3 +- tests/qemuxml2argvdata/hugepages-pages7.xml | 4 +- tests/qemuxml2argvtest.c | 9 +- tests/qemuxml2xmloutdata/hugepages-pages.xml | 3 +- tests/qemuxml2xmloutdata/hugepages-pages3.xml | 4 +- 32 files changed, 3337 insertions(+), 2869 deletions(-) -- 2.16.1

2 10

[libvirt] [PATCH v2 0/4] Reimplement logging wildcards to use full shell glob syntax
by Daniel P. Berrangé 11 May '18

11 May '18

This series provides a more generalized support for wildcards in logging and removes the ordering constraint. Changed in v2: - Improve various config file comments (Erik) - Always use fnmatch as performance hit vs strstr will be inconsequential in real world (Dan). Daniel P. Berrangé (4): Revert "util: virlog: Introduce wildcard to log filters" log: rename virLogFlags to virLogFilterFlags to match docs log: support logging using shell wildcard syntax log: update docs for daemons to improve user understanding src/locking/test_virtlockd.aug.in | 2 +- src/locking/virtlockd.conf | 65 +++++++++++++++++++++++++---------- src/logging/test_virtlogd.aug.in | 2 +- src/logging/virtlogd.conf | 68 +++++++++++++++++++++++++----------- src/remote/libvirtd.conf | 72 +++++++++++++++++++++++---------------- src/remote/test_libvirtd.aug.in | 2 +- src/util/virlog.c | 49 +++----------------------- src/util/virlog.h | 3 +- 8 files changed, 146 insertions(+), 117 deletions(-) -- 2.14.3

2 10