- Devel - libvirt List Archives

[libvirt] [PATCH v2 0/5] bhyve: virConnectDomainXMLFromNative
by Fabian Freyer 24 Jun '16

24 Jun '16

Aaand I'm reposting this series again, in the hope that this time it will consistently send to the mailing list. Again, very sorry for the noise. Differences to v1: - use gnulib's reentrant getopt implementation. This is necessary for thread safety. - config-post.h: __GNUC_PREREQ is defined here, since using gnulib's getopt pulls in other gnulib headers, which rely on __GNUC_PREREQ, which doesn't exist on FreeBSD. This approach is open for discussion: I chose config-post.h as this would likely always be the first header pulled in (through config.h). Link to v1: https://www.redhat.com/archives/libvir-list/2016-June/msg00001.html Fabian Freyer (5): config-post.h: define __GNUC_PREREQ if not defined gnulib: add getopt module bhyve: implement virConnectDomainXMLFromNative bhyve: implement bhyve argument parser bhyve: implement argument parser for loader bootstrap.conf | 1 + config-post.h | 11 + m4/virt-driver-bhyve.m4 | 3 + po/POTFILES.in | 1 + src/Makefile.am | 2 + src/bhyve/bhyve_driver.c | 42 ++ src/bhyve/bhyve_parse_command.c | 875 ++++++++++++++++++++++++++++++++++++++++ src/bhyve/bhyve_parse_command.h | 30 ++ 8 files changed, 965 insertions(+) create mode 100644 src/bhyve/bhyve_parse_command.c create mode 100644 src/bhyve/bhyve_parse_command.h -- 2.7.0

2 12

[libvirt] [PATCH] virStorageBackendISCSIGetHostNumber: correctly use virDirOpen
by Ján Tomko 24 Jun '16

24 Jun '16

Incorrect conflict resolution in my commit e81de04c1 broke this. --- src/storage/storage_backend_iscsi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) Pushed under the build-breaker rule. diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 4a16d2b..98d1141 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -100,9 +100,7 @@ virStorageBackendISCSIGetHostNumber(const char *sysfs_path, virFileWaitForDevices(); - if (virDirOpen(&sysdir, sysfs_path) < 0) - virReportSystemError(errno, - _("Failed to opendir path '%s'"), sysfs_path); + if (virDirOpen(&sysdir, sysfs_path) < 0) { retval = -1; goto out; } -- 2.7.3

1 0

[libvirt] [PATCH 00/18] Allow domains to start with a dot
by Ján Tomko 24 Jun '16

24 Jun '16

Also introduce virDirOpen* and VIR_DIR_CLOSE helpers. https://bugzilla.redhat.com/show_bug.cgi?id=1333248 Ján Tomko (18): Do not save errno in virUSBDeviceSearch Fix error detection in virStorageBackendISCSIGetHostNumber Do not check the return value of closedir Introduce VIR_DIR_CLOSE Introduce virDirOpen Use virDirOpen Add virDirOpenIfExists Use virDirOpenIfExists Introduce virDirOpenQuiet Use virDirOpenQuiet Prohibit opendir in syntax-check Skip '.' and '..' in virDirRead Do not check for '.' and '..' after virDirRead Fix comment in virStorageBackendFileSystemRefresh Do not ignore hidden files in /sys and /proc Do not skip hidden entries when looking for a stable path Allow configs to start with a dot Do not skip files starting with a dot in leases directory cfg.mk | 7 +- src/conf/network_conf.c | 31 +++------ src/conf/nwfilter_conf.c | 15 ++--- src/conf/storage_conf.c | 30 +++------ src/conf/virdomainobjlist.c | 16 ++--- src/conf/virsecretobj.c | 14 ++-- src/libvirt_private.syms | 4 ++ src/network/bridge_driver.c | 17 ++--- src/openvz/openvz_conf.c | 5 +- src/qemu/qemu_driver.c | 14 +--- src/qemu/qemu_hostdev.c | 10 +-- src/storage/storage_backend.c | 11 ++-- src/storage/storage_backend_fs.c | 14 ++-- src/storage/storage_backend_iscsi.c | 47 +++++++------- src/storage/storage_backend_scsi.c | 30 ++------- src/util/vircgroup.c | 43 ++++--------- src/util/virfile.c | 124 ++++++++++++++++++++++++++---------- src/util/virfile.h | 9 +++ src/util/virhostcpu.c | 19 ++---- src/util/virnetdev.c | 10 +-- src/util/virnetdevtap.c | 9 +-- src/util/virnuma.c | 17 ++--- src/util/virpci.c | 36 +++-------- src/util/virprocess.c | 9 +-- src/util/virscsi.c | 22 ++----- src/util/virusb.c | 16 +---- src/util/virutil.c | 32 ++-------- src/xen/xen_inotify.c | 13 ++-- src/xen/xm_internal.c | 10 +-- tests/virschematest.c | 8 +-- tools/nss/libvirt_nss.c | 13 +--- 31 files changed, 245 insertions(+), 410 deletions(-) -- 2.7.3

2 27

[libvirt] [PATCH 1/1] cpu_map.xml: add cmt/mbm feature to x86
by Qiaowei Ren 24 Jun '16

24 Jun '16

Some Intel processor families (e.g. the Intel Xeon processor E5 v3 family) introduced some PQos (Platform Qos) features, including CMT (Cache Monitoring echnology) and MBM (Memory Bandwidth Monitoring), to monitor or control shared resource. This patch add them into x86 part of cpu_map.xml to be used for applications (like OpenStack) based on libvirt to get cpu capabilities. Signed-off-by: Qiaowei Ren <qiaowei.ren(a)intel.com> --- src/cpu/cpu_map.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 08aded2..2e2cb4f 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -320,6 +320,9 @@ <feature name='rtm'> <cpuid function='0x00000007' ebx='0x00000800'/> </feature> + <feature name='cmt'> + <cpuid function='0x00000007' ebx='0x00001000'/> + </feature> <feature name='mpx'> <cpuid function='0x00000007' ebx='0x00004000'/> </feature> @@ -353,6 +356,14 @@ <cpuid function='0x80000007' edx='0x00000100'/> </feature> +  + <feature name='mbm_total'>  + <cpuid function='0x0000000f' edx='0x00000002'/> + </feature> + <feature name='mbm_local'>  + <cpuid function='0x0000000f' edx='0x00000004'/> + </feature> +  <model name='486'> <feature name='fpu'/> -- 1.9.1

4 6

[libvirt] [PATCH 0/2] Warn users with weird thread/memory alignment
by Martin Kletzander 24 Jun '16

24 Jun '16

People are doing weird things. Let's let them do what they want but gently warn them in case they did not want that exact behaviour and are looking for some possible problems. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1254402 Martin Kletzander (2): qemu: Add qemuProcessSetupPid() qemu: Check for thread <=> memory alignment src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_process.c | 375 ++++++++++++++++++++++-------------------------- src/qemu/qemu_process.h | 6 +- 3 files changed, 181 insertions(+), 204 deletions(-) -- 2.9.0

3 9

[libvirt] [PATCH] Don't allow raneming domains to empty strings
by Martin Kletzander 24 Jun '16

24 Jun '16

It may cause unwanted behaviour (of course, is there any wanted one for that case?) so we should rather disable the possibility of doing so. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1320893 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/libvirt-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 508520efd6c5..89a2d7efe972 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -8790,7 +8790,7 @@ virDomainRename(virDomainPtr dom, virResetLastError(); virCheckDomainReturn(dom, -1); - virCheckNonNullArgGoto(new_name, error); + virCheckNonEmptyStringArgGoto(new_name, error); virCheckReadOnlyGoto(dom->conn->flags, error); if (dom->conn->driver->domainRename) { -- 2.9.0

4 5

[libvirt] [PATCH 0/3] Add hotplug/unplug for RBD disk with AES secret
by John Ferlan 24 Jun '16

24 Jun '16

Since AES secrets were setup for RBD during qemuDomainSecretDiskPrepare, the secret object needs to be added to the command line when hotplugging. Additionally, when unplugging, if there's an AES secret, we need to remove it. John Ferlan (3): qemu: Remove type from qemuBuildSecretInfoProps qemu: Make qemuBuildSecretInfoProps global qemu: Add secinfo for hotplug virtio disk src/qemu/qemu_command.c | 11 +++-------- src/qemu/qemu_command.h | 4 ++++ src/qemu/qemu_hotplug.c | 44 ++++++++++++++++++++++++++++++++++++++------ 3 files changed, 45 insertions(+), 14 deletions(-) -- 2.5.5

2 6

[libvirt] [libvirt-test-API] Plans for code update
by Ruifeng Bian 24 Jun '16

24 Jun '16

I am not sure how many of you keep an eye on this project. The project is for testing libvirt-python APIs, but many test cases are not fully implemented until now. We want to keep this project updated in the future, the following aspects will be considered to update the code: 1. Code style - Use inspekt to check code style. 2. Pythonizing the code - Replace all shell scripts with python. 3. Bug fixing - Some code bugs need to be fixed. 4. New features - Add more API test cases. Any feedback or suggestion is welcome. Let's work together to contribute to this project. Thanks, Ruifeng Bian

2 4

[libvirt] [PATCH 0/4] Add architecture checks to qemuDomainMachineIs*()
by Andrea Bolognani 24 Jun '16

24 Jun '16

The pseries machine type is only available on ppc64/ppc64le, and in the same way the virt machine type is only available on armv7l/aarch64. Until either machine type is introduced on another architecture, we can perform the architecture checks in a single location instead of repeating them all over the place. Andrea Bolognani (4): qemu: Remove redundant arguments to qemuBuildSerialChrDeviceStr() qemu: Add architecture checks to qemuDomainMachineIsVirt() qemu: Introduce qemuDomainMachineIsPSeries() qemu: Use stricter checks in virQEMUCapsFillDomainDeviceDiskCaps() src/qemu/qemu_capabilities.c | 18 +++++++++--------- src/qemu/qemu_command.c | 25 ++++++++----------------- src/qemu/qemu_domain.c | 31 +++++++++++++++++++++++++------ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_domain_address.c | 9 +++------ src/qemu/qemu_parse_command.c | 12 ++++-------- 6 files changed, 50 insertions(+), 46 deletions(-) -- 2.7.4

2 10

[libvirt] [PATCH] openvz: split single-line if
by Ján Tomko 24 Jun '16

24 Jun '16

Put the 'continue' statement on a separate line. --- src/openvz/openvz_conf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Pushed as trivial. diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index ff5e5b8..aa04bc4 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -741,7 +741,8 @@ openvzReadConfigParam(const char *conf_file, const char *param, char **value) continue; sf = line + strlen(param); - if (*sf++ != '=') continue; + if (*sf++ != '=') + continue; saveptr = NULL; if ((token = strtok_r(sf, "\"\t\n", &saveptr)) != NULL) { -- 2.7.3

1 0

[libvirt] [RFC PATCH] build: increase xz compression level
by Ján Tomko 24 Jun '16

24 Jun '16

Increase the default compression level to 9 from 6. This also increases decompression memory requirements from 9 MB to 65 MB. --- The resulting tarball is 880 kB smaller [10.5 MB] Level 8 requires 33 MB and saves 520 kB [10.8 MB] Level 7 requires 17 MB and saves 170 kB [11.2 MB] Compression time is not much different since we're already using --extreme. The Linux kernel also uses -9, but the tarball is 8x our size. cfg.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cfg.mk b/cfg.mk index e93114c..ebafb0f 100644 --- a/cfg.mk +++ b/cfg.mk @@ -16,6 +16,9 @@ # along with this program. If not, see # <http://www.gnu.org/licenses/>. +XZ_OPT ?= -9e +export XZ_OPT + # Use alpha.gnu.org for alpha and beta releases. # Use ftp.gnu.org for major releases. gnu_ftp_host-alpha = alpha.gnu.org -- 2.7.3

2 1

[libvirt] [PATCH 0/7] *** Add VirtualBox 5 support to libvirt ***
by Martin Pietsch 24 Jun '16

24 Jun '16

*** BLURB HERE *** Martin Pietsch (7): add VirtualBox 5 C API to libvirt add VirtualBox 5 support to vbox_tmpl.c add VirtualBox5 support to vbox_uniformed_api.h add vbox_V5_0.c for libvirt support of VirtualBox 5 append vbox_V5_0.c and vbox_CAPI_v5_0.h to src/Makefile.am add VirtualBox 5 support to vbox_common.h add VirtualBox 5 support to vbox_storage.c src/Makefile.am | 1 + src/vbox/vbox_CAPI_v5_0.h | 25550 ++++++++++++++++++++++++++++++++++++++++ src/vbox/vbox_V5_0.c | 13 + src/vbox/vbox_common.h | 2 + src/vbox/vbox_storage.c | 2 + src/vbox/vbox_tmpl.c | 84 +- src/vbox/vbox_uniformed_api.h | 1 + 7 files changed, 25647 insertions(+), 6 deletions(-) create mode 100644 src/vbox/vbox_CAPI_v5_0.h create mode 100644 src/vbox/vbox_V5_0.c -- 2.7.4

2 1

[libvirt] [PATCH] storage: Fix coverity warning
by Cole Robinson 24 Jun '16

24 Jun '16

After commit e808d3f227 cbdata is always available here, so the check is pointless --- src/storage/storage_driver.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 4b5419d..d75c5aa 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2442,12 +2442,10 @@ storageVolUpload(virStorageVolPtr obj, /* Add cleanup callback - call after uploadVol since the stream * is then fully set up */ - if (cbdata) { - virFDStreamSetInternalCloseCb(stream, - virStorageVolFDStreamCloseCb, - cbdata, NULL); - cbdata = NULL; - } + virFDStreamSetInternalCloseCb(stream, + virStorageVolFDStreamCloseCb, + cbdata, NULL); + cbdata = NULL; cleanup: virStoragePoolObjUnlock(pool); -- 2.7.4

2 1

[libvirt] [PATCH] Rename virNetClient*AddrString
by Ján Tomko 23 Jun '16

23 Jun '16

Add SASL at the end to make the format obvious. --- src/libvirt_remote.syms | 4 ++-- src/remote/remote_driver.c | 4 ++-- src/rpc/virnetclient.c | 4 ++-- src/rpc/virnetclient.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms index a6192ef..ca1f3ac 100644 --- a/src/libvirt_remote.syms +++ b/src/libvirt_remote.syms @@ -17,7 +17,7 @@ virNetClientIsOpen; virNetClientKeepAliveIsSupported; virNetClientKeepAliveStart; virNetClientKeepAliveStop; -virNetClientLocalAddrString; +virNetClientLocalAddrStringSASL; virNetClientNewExternal; virNetClientNewLibSSH2; virNetClientNewSSH; @@ -25,7 +25,7 @@ virNetClientNewTCP; virNetClientNewUNIX; virNetClientRegisterAsyncIO; virNetClientRegisterKeepAlive; -virNetClientRemoteAddrString; +virNetClientRemoteAddrStringSASL; virNetClientRemoveStream; virNetClientSendNonBlock; virNetClientSendNoReply; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index b11bfe0..1f81f03 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -3831,8 +3831,8 @@ remoteAuthSASL(virConnectPtr conn, struct private_data *priv, if (!(sasl = virNetSASLSessionNewClient(saslCtxt, "libvirt", priv->hostname, - virNetClientLocalAddrString(priv->client), - virNetClientRemoteAddrString(priv->client), + virNetClientLocalAddrStringSASL(priv->client), + virNetClientRemoteAddrStringSASL(priv->client), saslcb))) goto cleanup; /* saslcb is now owned by sasl */ diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index c43cd08..361dc1a 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -944,12 +944,12 @@ void virNetClientRemoveStream(virNetClientPtr client, } -const char *virNetClientLocalAddrString(virNetClientPtr client) +const char *virNetClientLocalAddrStringSASL(virNetClientPtr client) { return virNetSocketLocalAddrStringSASL(client->sock); } -const char *virNetClientRemoteAddrString(virNetClientPtr client) +const char *virNetClientRemoteAddrStringSASL(virNetClientPtr client) { return virNetSocketRemoteAddrStringSASL(client->sock); } diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h index 38f929c..c772d0b 100644 --- a/src/rpc/virnetclient.h +++ b/src/rpc/virnetclient.h @@ -121,8 +121,8 @@ int virNetClientSetTLSSession(virNetClientPtr client, bool virNetClientIsEncrypted(virNetClientPtr client); bool virNetClientIsOpen(virNetClientPtr client); -const char *virNetClientLocalAddrString(virNetClientPtr client); -const char *virNetClientRemoteAddrString(virNetClientPtr client); +const char *virNetClientLocalAddrStringSASL(virNetClientPtr client); +const char *virNetClientRemoteAddrStringSASL(virNetClientPtr client); # ifdef WITH_GNUTLS int virNetClientGetTLSKeySize(virNetClientPtr client); -- 2.7.3

2 2

[libvirt] [PATCH 0/7] Fix SASL authentication regression
by Ján Tomko 23 Jun '16

23 Jun '16

Introduced by commit 9b45c9f, released in v1.3.5. https://bugzilla.redhat.com/show_bug.cgi?id=1345743 Ján Tomko (7): Revert "virnetsocket: Provide socket address format in a more standard form" Introduce virNetSocketRemoteAddrStringURI Introduce virNetServerClientRemoteAddrStringURI virnetsockettest: fix error messages virNetSocket: rename AddrStr to AddrStrSASL Add SASL to virNetSocket{Local,Remote}AddrString Rename virNetServerClient*AddrString daemon/remote.c | 13 ++----------- src/libvirt_remote.syms | 10 ++++++---- src/remote/remote_driver.c | 7 ------- src/rpc/virnetclient.c | 14 ++------------ src/rpc/virnetclient.h | 2 -- src/rpc/virnetserver.c | 2 +- src/rpc/virnetserverclient.c | 21 +++++++-------------- src/rpc/virnetserverclient.h | 7 +++---- src/rpc/virnetsocket.c | 41 +++++++++++++++++++---------------------- src/rpc/virnetsocket.h | 7 +++---- tests/virnetsockettest.c | 26 ++++++++++++++++++-------- 11 files changed, 61 insertions(+), 89 deletions(-) -- 2.7.3

2 16

[libvirt] [PATCH v3 0/5] bhyve: virConnectDomainXMLFromNative
by Fabian Freyer 23 Jun '16

23 Jun '16

Differences to v2: - style fixes (C-style comments, function naming) - removed unnecessary break - added commentary on why __GNU_C_PREREQ is defined - Set Domain virtType = VIR_DOMAIN_VIRT_BHYVE - Free domain definition on error in bhyveParseCommandLineString. This should prevent an empty XML document to be returned. Link to v2: https://www.redhat.com/archives/libvir-list/2016-June/msg00728.html Link to v1: https://www.redhat.com/archives/libvir-list/2016-June/msg00001.html Fabian Freyer (5): config-post.h: define __GNUC_PREREQ if not defined gnulib: add getopt module bhyve: implement virConnectDomainXMLFromNative bhyve: implement bhyve argument parser bhyve: implement argument parser for loader bootstrap.conf | 1 + config-post.h | 18 + m4/virt-driver-bhyve.m4 | 3 + po/POTFILES.in | 1 + src/Makefile.am | 2 + src/bhyve/bhyve_driver.c | 42 ++ src/bhyve/bhyve_parse_command.c | 877 ++++++++++++++++++++++++++++++++++++++++ src/bhyve/bhyve_parse_command.h | 30 ++ 8 files changed, 974 insertions(+) create mode 100644 src/bhyve/bhyve_parse_command.c create mode 100644 src/bhyve/bhyve_parse_command.h -- 2.7.0

1 5

[libvirt] [PATCH] storage: Remove redundant refreshPool check
by Cole Robinson 23 Jun '16

23 Jun '16

Every driver provides a refreshPool impl, and many other critical places in the code unconditionally call it without checking if it exists, so this check is pointless --- src/storage/storage_driver.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index e2d729f..4b5419d 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2422,20 +2422,18 @@ storageVolUpload(virStorageVolPtr obj, goto cleanup; } - /* If we have a refreshPool, use the callback routine in order to + /* Use the callback routine in order to * refresh the pool after the volume upload stream closes. This way * we make sure the volume and pool data are refreshed without user * interaction and we can just lookup the backend in the callback * routine in order to call the refresh API. */ - if (backend->refreshPool) { - if (VIR_ALLOC(cbdata) < 0 || - VIR_STRDUP(cbdata->pool_name, pool->def->name) < 0) - goto cleanup; - if (vol->target.type == VIR_STORAGE_VOL_PLOOP && - VIR_STRDUP(cbdata->vol_path, vol->target.path) < 0) - goto cleanup; - } + if (VIR_ALLOC(cbdata) < 0 || + VIR_STRDUP(cbdata->pool_name, pool->def->name) < 0) + goto cleanup; + if (vol->target.type == VIR_STORAGE_VOL_PLOOP && + VIR_STRDUP(cbdata->vol_path, vol->target.path) < 0) + goto cleanup; if ((ret = backend->uploadVol(obj->conn, pool, vol, stream, offset, length, flags)) < 0) -- 2.7.4

3 6

[libvirt] [PATCH 00/19] Add support for LUKS encrypted devices
by John Ferlan 23 Jun '16

23 Jun '16

See RFC: http://www.redhat.com/archives/libvir-list/2016-June/msg00312.html For: https://bugzilla.redhat.com/show_bug.cgi?id=1301021 Changes since RFC: 1. Address Dan's comment regarding providing secinfo objects for both secret for RBD as well as secret for LUKS 2. Remove code from secret/secret_util.{h,c} and need for including "secret/secret_util.h" (as well as cfg.mk change) 3. Change secret usage name from "luks" to "key". The "key" secret type will be reused for work I have in other local trees (eg. TLS) 4. Reorder the patches a bit. Patches 1-9 are more or less setup for patches 10-19. John Ferlan (19): storage: Adjust qemu-img switches check storage: Create helper to set backing for CreateQemuImg code storage: Create helper to set options for CreateQemuImg code storage: Use virSecretGetSecretString secret: Move virStorageSecretType and rename util: Move and rename virStorageAuthDefParseSecret util: Introduce virSecretFormatSecret qemu: Change protocol parameter for secret setup qemu: Remove authdef from secret setup tests: Adjust tests for encrypted storage util: Add 'usage' for encryption util: Modify the FileTypeInfo for meta data checks util: Add 'luks' to the FileTypeInfo conf: Add new secret type "key" encryption: Add luks parsing for storageencryption encryption: Add <cipher> and <ivgen> to encryption storage: Add support to create a luks volume qemu: Add new secret info type qemu: Add luks support for domain disk docs/aclpolkit.html.in | 4 + docs/formatsecret.html.in | 62 ++- docs/formatstorageencryption.html.in | 115 ++++- docs/schemas/secret.rng | 10 + docs/schemas/storagecommon.rng | 58 ++- include/libvirt/libvirt-secret.h | 3 +- po/POTFILES.in | 1 + src/Makefile.am | 2 + src/access/viraccessdriverpolkit.c | 13 + src/conf/domain_conf.c | 11 + src/conf/secret_conf.c | 26 +- src/conf/secret_conf.h | 3 +- src/conf/virsecretobj.c | 5 + src/libvirt_private.syms | 8 + src/libxl/libxl_conf.c | 2 +- src/qemu/qemu_command.c | 12 +- src/qemu/qemu_domain.c | 148 ++++--- src/qemu/qemu_domain.h | 5 + src/qemu/qemu_process.c | 19 +- src/secret/secret_util.c | 18 +- src/secret/secret_util.h | 10 +- src/storage/storage_backend.c | 480 +++++++++++++++------ src/storage/storage_backend.h | 3 +- src/storage/storage_backend_fs.c | 10 +- src/storage/storage_backend_gluster.c | 2 + src/storage/storage_backend_iscsi.c | 54 +-- src/storage/storage_backend_rbd.c | 49 +-- src/util/virendian.h | 24 ++ src/util/virqemu.c | 23 + src/util/virqemu.h | 6 + src/util/virsecret.c | 127 ++++++ src/util/virsecret.h | 56 +++ src/util/virstorageencryption.c | 156 ++++++- src/util/virstorageencryption.h | 18 +- src/util/virstoragefile.c | 196 ++++----- src/util/virstoragefile.h | 18 +- tests/qemuargv2xmltest.c | 4 +- .../qemuxml2argv-encrypted-disk-usage.args | 24 ++ .../qemuxml2argv-encrypted-disk-usage.xml | 32 ++ .../qemuxml2argv-encrypted-disk.args | 26 +- .../qemuxml2argv-encrypted-disk.xml | 4 +- .../qemuxml2argv-luks-disk-cipher.args | 36 ++ .../qemuxml2argv-luks-disk-cipher.xml | 41 ++ .../qemuxml2argvdata/qemuxml2argv-luks-disks.args | 36 ++ tests/qemuxml2argvdata/qemuxml2argv-luks-disks.xml | 41 ++ tests/qemuxml2argvtest.c | 14 +- .../qemuxml2xmlout-encrypted-disk-usage.xml | 36 ++ .../qemuxml2xmlout-encrypted-disk.xml | 4 +- .../qemuxml2xmlout-luks-disk-cipher.xml | 45 ++ .../qemuxml2xmlout-luks-disks.xml | 45 ++ tests/qemuxml2xmltest.c | 3 + tests/secretxml2xmlin/usage-key.xml | 7 + tests/secretxml2xmltest.c | 1 + tests/storagevolxml2argvdata/qcow2-flag.argv | 2 - .../qcow2-nobacking-convert-flag.argv | 2 - .../qcow2-nobacking-convert-none.argv | 2 - .../qcow2-nobacking-flag.argv | 1 - .../qcow2-nobacking-none.argv | 1 - tests/storagevolxml2argvdata/qcow2-none.argv | 1 - tests/storagevolxml2argvtest.c | 25 +- tests/storagevolxml2xmlin/vol-luks-cipher.xml | 23 + tests/storagevolxml2xmlin/vol-luks.xml | 21 + tests/storagevolxml2xmlout/vol-luks-cipher.xml | 23 + tests/storagevolxml2xmlout/vol-luks.xml | 21 + tests/storagevolxml2xmltest.c | 2 + tests/virendiantest.c | 18 + 66 files changed, 1792 insertions(+), 506 deletions(-) create mode 100644 src/util/virsecret.c create mode 100644 src/util/virsecret.h create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk-usage.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk-usage.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disk-cipher.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disk-cipher.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk-usage.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disk-cipher.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks.xml create mode 100644 tests/secretxml2xmlin/usage-key.xml delete mode 100644 tests/storagevolxml2argvdata/qcow2-flag.argv delete mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-convert-flag.argv delete mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-convert-none.argv delete mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-flag.argv delete mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-none.argv delete mode 100644 tests/storagevolxml2argvdata/qcow2-none.argv create mode 100644 tests/storagevolxml2xmlin/vol-luks-cipher.xml create mode 100644 tests/storagevolxml2xmlin/vol-luks.xml create mode 100644 tests/storagevolxml2xmlout/vol-luks-cipher.xml create mode 100644 tests/storagevolxml2xmlout/vol-luks.xml -- 2.5.5

2 48

[libvirt] [PATCH 0/3] qmp: query-host-cpu command
by Eduardo Habkost 23 Jun '16

23 Jun '16

Add QMP command to allow management software to query for CPU information for the running host. The data returned by the command is in the form of a dictionary of QOM properties. This series depends on the "Add runnability info to query-cpu-definitions" series I sent 2 weeks ago. Git tree: https://github.com/ehabkost/qemu-hacks.git work/query-host-cpu Example output for x86: { "qom-properties": { "pfthreshold": false, "pku": false, "rtm": false, "tsc-deadline": true, "xstore-en": false, "cpuid-0xb": true, "abm": true, "ia64": false, "kvm-mmu": false, "xsaveopt": true, "hv-spinlocks": -1, "hotpluggable": true, "tce": false, "smep": true, "nx": true, "xcrypt": false, "sse4_2": true, "clflush": true, "sse4_1": true, "flushbyasid": false, "kvm-steal-time": true, "host-cache-info": false, "tsc": true, "adx": false, "ds": false, "fxsr": true, "tm": false, "hv-relaxed": false, "pclmuldq": true, "xgetbv1": false, "xstore": false, "migratable": true, "vme": true, "vendor": "GenuineIntel", "arat": true, "ffxsr": false, "de": true, "aes": true, "pse": true, "ds-cpl": false, "tbm": false, "sse": true, "phe-en": false, "f16c": true, "hotplugged": true, "mpx": false, "tsc-adjust": true, "avx512f": false, "avx2": true, "misalignsse": false, "level": 13, "pbe": false, "cx16": true, "avx512pf": false, "movbe": true, "perfctr-nb": false, "enforce": false, "ospke": false, "pmu": true, "fma4": false, "stepping": 1, "feature-words": [ { "cpuid-register": "EAX", "cpuid-input-eax": 6, "features": 4 }, { "cpuid-register": "EAX", "cpuid-input-eax": 13, "features": 1, "cpuid-input-ecx": 1 }, { "cpuid-register": "EDX", "cpuid-input-eax": 2147483658, "features": 0 }, { "cpuid-register": "EAX", "cpuid-input-eax": 1073741825, "features": 16777467 }, { "cpuid-register": "EDX", "cpuid-input-eax": 3221225473, "features": 0 }, { "cpuid-register": "EDX", "cpuid-input-eax": 2147483655, "features": 0 }, { "cpuid-register": "ECX", "cpuid-input-eax": 2147483649, "features": 33 }, { "cpuid-register": "EDX", "cpuid-input-eax": 2147483649, "features": 739248128 }, { "cpuid-register": "ECX", "cpuid-input-eax": 7, "features": 0, "cpuid-input-ecx": 0 }, { "cpuid-register": "EBX", "cpuid-input-eax": 7, "features": 1963, "cpuid-input-ecx": 0 }, { "cpuid-register": "ECX", "cpuid-input-eax": 1, "features": 4160369155 }, { "cpuid-register": "EDX", "cpuid-input-eax": 1, "features": 260832255 } ], "sse4a": false, "i64": true, "xsave": true, "hv-runtime": false, "pmm": false, "hle": false, "hv-crash": false, "est": false, "xop": false, "smx": false, "tsc-scale": false, "monitor": false, "avx512er": false, "apic": true, "sse4.1": true, "sse4.2": true, "hv-vapic": false, "pause-filter": false, "lahf-lm": true, "kvm-nopiodelay": true, "acpi": false, "mmx": true, "osxsave": false, "pcommit": false, "clwb": false, "dca": false, "pdcm": false, "xcrypt-en": false, "3dnow": false, "invtsc": false, "tm2": false, "hv-time": false, "hypervisor": true, "kvmclock-stable-bit": true, "xlevel": 2147483656, "fxsr-opt": false, "pcid": true, "lbrv": false, "wdt": false, "svm-lock": false, "popcnt": true, "nrip-save": false, "x2apic": true, "kvmclock": true, "smap": false, "pdpe1gb": true, "family": 6, "xlevel2": 0, "dtes64": false, "xd": true, "ace2": false, "xtpr": false, "lwp": false, "sep": true, "msr": true, "syscall": true, "decodeassists": false, "perfctr-core": false, "pge": true, "pn": false, "fma": true, "nodeid-msr": false, "hv-vpindex": false, "cx8": true, "mce": true, "avx512cd": false, "cr8legacy": false, "mca": true, "pni": true, "hv-vendor-id": "", "rdseed": false, "osvw": false, "fsgsbase": true, "model-id": "Intel(R) Core(TM) i7-4600U CPU @ 2.10GHz", "cmp-legacy": false, "kvm-pv-unhalt": true, "rdtscp": true, "mmxext": false, "cid": false, "type": "host-x86_64-cpu", "vmx": false, "ssse3": true, "extapic": false, "pse36": true, "mtrr": true, "ibs": false, "avx": true, "ace2-en": false, "invpcid": true, "bmi2": true, "vmcb-clean": false, "erms": true, "cmov": true, "check": true, "parent_bus": "", "clflushopt": false, "pat": true, "hv-synic": false, "hv-stimer": false, "3dnowprefetch": false, "fpu": true, "pae": true, "hv-reset": false, "skinit": false, "kvm": true, "pmm-en": false, "phe": false, "3dnowext": false, "ht": false, "tsc-frequency": 0, "kvm-pv-eoi": true, "npt": false, "apic-id": -1, "xsavec": false, "lm": true, "pclmulqdq": true, "svm": false, "sse3": true, "sse2": true, "ss": true, "topoext": false, "rdrand": true, "bmi1": true, "kvm-asyncpf": true, "xsaves": false, "model": 69 } } Eduardo Habkost (3): qmp: Add query-host-cpu command target-i386: Introduce x86_cpu_load_host_data() function target-i386: Implement arch_query_host_cpu_info() include/sysemu/arch_init.h | 1 + qapi-schema.json | 36 +++++++++++++++++ qmp-commands.hx | 6 +++ qmp.c | 13 ++++++ stubs/Makefile.objs | 1 + stubs/arch-query-host-cpu-info.c | 8 ++++ target-i386/cpu.c | 87 ++++++++++++++++++++++++++++++++++++---- 7 files changed, 145 insertions(+), 7 deletions(-) create mode 100644 stubs/arch-query-host-cpu-info.c -- 2.5.5

4 14

[libvirt] [PATCH v4 00/14] Add native TLS encrypted chardev TCP support
by John Ferlan 23 Jun '16

23 Jun '16

v3: http://www.redhat.com/archives/libvir-list/2016-June/msg01094.html Yes, I know another long series, but there are some duplicates with the LUKS series: http://www.redhat.com/archives/libvir-list/2016-June/msg01691.html In particular: Patches 1-3 match the LUKS patches 1-3 Patches 4-6 match the LUKS patches 12-14 They are needed for "parts" for this series. Changes since v3: Patches 7-10 are patches 1-4 of the v3 series with perhaps a few adjustments these were reviewed and had partial ACK's see the v3 series cover for details Patches 11->14 are NEW. Patch 11 needs the "passphrase" secret from LUKS in order to allow the addition of a <secret> for a <serial type='tcp'...> to provide the passphrase for the TLS environment. Patch 12 provides the means (like Disk and Hostdev) to store the secinfo required to generate an AES secret Patch 13 adds the secret for the command line startup Patch 14 could be combined w/ 13, but I just kept it a separate way to add the secret for the hotplug (and unplug) John Ferlan (14): qemu: Change protocol parameter for secret setup qemu: Remove authdef from secret setup conf: Add new secret type "passphrase" qemu: Remove type from qemuBuildSecretInfoProps qemu: Make qemuBuildSecretInfoProps global qemu: Add secinfo for hotplug virtio disk conf: Add new default TLS X.509 certificate default directory conf: Introduce chartcp_tls_x509_cert_dir qemu: Add support for TLS X.509 path to TCP chardev backend qemu: Add the ability to hotplug the TLS X.509 environment conf: Add new secret element for tcp chardev qemu: Introduce qemuDomainChardevPrivatePtr qemu: Add a secret object to/for a chardev tcp with secret qemu: Add the ability to hotplug a secret object for TCP chardev TLS docs/aclpolkit.html.in | 4 + docs/formatdomain.html.in | 29 +++ docs/formatsecret.html.in | 57 +++++- docs/schemas/domaincommon.rng | 21 +++ docs/schemas/secret.rng | 10 + include/libvirt/libvirt-secret.h | 3 +- src/access/viraccessdriverpolkit.c | 13 ++ src/conf/domain_conf.c | 62 ++++++- src/conf/domain_conf.h | 8 +- src/conf/secret_conf.c | 26 ++- src/conf/secret_conf.h | 1 + src/conf/virsecretobj.c | 5 + src/libxl/libxl_domain.c | 2 +- src/lxc/lxc_native.c | 2 +- src/qemu/libvirtd_qemu.aug | 11 +- src/qemu/qemu.conf | 83 +++++++-- src/qemu/qemu_command.c | 148 ++++++++++++++- src/qemu/qemu_command.h | 13 ++ src/qemu/qemu_conf.c | 59 +++++- src/qemu/qemu_conf.h | 7 + src/qemu/qemu_domain.c | 202 +++++++++++++++------ src/qemu/qemu_domain.h | 22 +++ src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 141 ++++++++++++-- src/qemu/qemu_hotplug.h | 3 +- src/qemu/qemu_monitor_json.c | 9 + src/qemu/qemu_parse_command.c | 4 +- src/qemu/qemu_process.c | 2 +- src/qemu/test_libvirtd_qemu.aug.in | 5 + src/vz/vz_sdk.c | 2 +- src/xenconfig/xen_sxpr.c | 2 +- tests/qemuhotplugtest.c | 2 +- .../qemuxml2argv-serial-tcp-tlsx509-chardev.args | 33 ++++ .../qemuxml2argv-serial-tcp-tlsx509-chardev.xml | 41 +++++ ...xml2argv-serial-tcp-tlsx509-secret-chardev.args | 38 ++++ ...uxml2argv-serial-tcp-tlsx509-secret-chardev.xml | 42 +++++ tests/qemuxml2argvtest.c | 14 ++ .../qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml | 50 +++++ ...ml2xmlout-serial-tcp-tlsx509-secret-chardev.xml | 51 ++++++ tests/qemuxml2xmltest.c | 2 + tests/secretxml2xmlin/usage-passphrase.xml | 7 + tests/secretxml2xmltest.c | 1 + 42 files changed, 1116 insertions(+), 123 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-secret-chardev.xml create mode 100644 tests/secretxml2xmlin/usage-passphrase.xml -- 2.5.5

1 14

[libvirt] [PATCH 0/7] Create a util/virsecret and add key usage secret
by John Ferlan 23 Jun '16

23 Jun '16

Extracted from the LUKS series (patches 4-9 and patch 14): http://www.redhat.com/archives/libvir-list/2016-June/msg00804.html with a couple of modifications as I working through the TLS code... 1. Instead of looking the LookupDef 'secdef', call it 'seclookupdef' (it's just clearer that way I think) 2. Likewise, change the ParseSecret and FormatSecret to add "Lookup" John Ferlan (7): storage: Use virSecretGetSecretString secret: Move virStorageSecretType and rename util: Move and rename virStorageAuthDefParseSecret util: Introduce virSecretFormatSecret qemu: Change protocol parameter for secret setup qemu: Remove authdef from secret setup conf: Add new secret type "key" docs/aclpolkit.html.in | 4 ++ docs/formatsecret.html.in | 57 +++++++++++++++- docs/schemas/secret.rng | 10 +++ include/libvirt/libvirt-secret.h | 3 +- po/POTFILES.in | 1 + src/Makefile.am | 2 + src/access/viraccessdriverpolkit.c | 13 ++++ src/conf/secret_conf.c | 26 ++++++- src/conf/secret_conf.h | 3 +- src/conf/virsecretobj.c | 5 ++ src/libvirt_private.syms | 7 ++ src/libxl/libxl_conf.c | 2 +- src/qemu/qemu_domain.c | 131 ++++++++++++++++++++++-------------- src/secret/secret_util.c | 18 ++--- src/secret/secret_util.h | 10 +-- src/storage/storage_backend_iscsi.c | 54 +++------------ src/storage/storage_backend_rbd.c | 49 ++------------ src/util/virsecret.c | 124 ++++++++++++++++++++++++++++++++++ src/util/virsecret.h | 56 +++++++++++++++ src/util/virstoragefile.c | 103 +++++++--------------------- src/util/virstoragefile.h | 17 +---- tests/qemuargv2xmltest.c | 4 +- tests/secretxml2xmlin/usage-key.xml | 7 ++ tests/secretxml2xmltest.c | 1 + 24 files changed, 451 insertions(+), 256 deletions(-) create mode 100644 src/util/virsecret.c create mode 100644 src/util/virsecret.h create mode 100644 tests/secretxml2xmlin/usage-key.xml -- 2.5.5

1 8

[libvirt] [PATCH 0/2] Fix genericxml2xml test and avoid further mistakes
by Peter Krempa 23 Jun '16

23 Jun '16

Peter Krempa (2): tests: genericxml2xml: Fix test file name tests: utils: Fail XML file comparison if input file doesn't exist tests/genericxml2xmltest.c | 2 +- tests/testutils.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) -- 2.8.3

2 3

[libvirt] [PATCH 0/2] Two more 'make check' speedups
by Ján Tomko 23 Jun '16

23 Jun '16

Do not generate random bignums and stop doing expensive virsh tests by default. Ján Tomko (2): tests: mock gnutls_dh_params_generate2 tests: mark virsh-optparse and virsh-synopsis as expensive tests/virnettlscontexttest.c | 2 +- tests/virnettlssessiontest.c | 2 +- tests/virrandommock.c | 12 ++++++++++++ tests/virsh-optparse | 2 ++ tests/virsh-synopsis | 2 ++ 5 files changed, 18 insertions(+), 2 deletions(-) -- 2.7.3

3 5

[libvirt] [libvirt-python][PATCH] Add support for virDomainGetGuestVcpus
by Michal Privoznik 23 Jun '16

23 Jun '16

This function has virTypedParameterPtr as one of the args and our generator is unable to deal with that. Therefore we must provide implementation. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- generator.py | 1 + libvirt-override.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/generator.py b/generator.py index 92ac7a7..82f13e9 100755 --- a/generator.py +++ b/generator.py @@ -491,6 +491,7 @@ skip_impl = ( 'virDomainInterfaceAddresses', 'virDomainGetPerfEvents', 'virDomainSetPerfEvents', + 'virDomainGetGuestVcpus', ) lxc_skip_impl = ( diff --git a/libvirt-override.c b/libvirt-override.c index 3075681..9c5dd84 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -8915,6 +8915,38 @@ libvirt_virConnectStoragePoolEventDeregisterAny(PyObject *self ATTRIBUTE_UNUSED, return libvirt_intWrap(ret); } + +static PyObject * +libvirt_virDomainGetGuestVcpus(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *pyobj_domain; + virDomainPtr domain; + virTypedParameterPtr params = NULL; + int nparams = 0; + unsigned int flags; + int i_retval; + PyObject *ret = NULL; + + if (!PyArg_ParseTuple(args, (char *)"OI:virDomainGetScedulerParametersFlags", + &pyobj_domain, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetGuestVcpus(domain, &params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_NONE; + goto cleanup; + } + + ret = getPyVirTypedParameter(params, nparams); + cleanup: + virTypedParamsFree(params, nparams); + return ret; +} #endif /* LIBVIR_CHECK_VERSION(2, 0, 0)*/ @@ -9128,6 +9160,7 @@ static PyMethodDef libvirtMethods[] = { #if LIBVIR_CHECK_VERSION(2, 0, 0) {(char *) "virConnectStoragePoolEventRegisterAny", libvirt_virConnectStoragePoolEventRegisterAny, METH_VARARGS, NULL}, {(char *) "virConnectStoragePoolEventDeregisterAny", libvirt_virConnectStoragePoolEventDeregisterAny, METH_VARARGS, NULL}, + {(char *) "virDomainGetGuestVcpus", libvirt_virDomainGetGuestVcpus, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(2, 0, 0) */ {NULL, NULL, 0, NULL} }; -- 2.8.4

2 2

[libvirt] [PATCH] qemu: Permit PCI-free aarch64 mach-virt guests
by Andrea Bolognani 23 Jun '16

23 Jun '16

There has been some progress lately in enabling virtio-pci on aarch64 guests; however, guest OS support is still spotty at best, so most guests are going to be using virtio-mmio instead. Currently, mach-virt guests are closely modeled after q35 guests, and that includes always adding a dmi-to-pci-bridge that's just impossible to get rid of. While that's acceptable (if suboptimal) for q35, where you will always need some kind of PCI device anyway, mach-virt guests should be allowed to avoid it. --- src/qemu/qemu_domain.c | 8 ++++++-- src/qemu/qemu_domain_address.c | 8 +++++++- .../qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args | 1 - .../qemuxml2argv-aarch64-virtio-pci-default.args | 1 - .../qemuxml2argv-aarch64-virtio-pci-manual-addresses.args | 5 +++-- .../qemuxml2argv-aarch64-virtio-pci-manual-addresses.xml | 14 ++++++++++++-- .../qemuxml2xmlout-aarch64-virtio-pci-default.xml | 4 ---- .../qemuxml2xmlout-aarch64-virtio-pci-manual-addresses.xml | 13 +++++++++---- 8 files changed, 37 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 1eb5644..595ad64 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1951,11 +1951,15 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT)) { goto cleanup; } - /* add a dmi-to-pci-bridge and a pci-bridge if there are no pci controllers + /* Add a dmi-to-pci-bridge bridge if there are no PCI controllers * other than the pcie-root. This is so that there will be hot-pluggable - * PCI slots available + * PCI slots available. + * + * We skip this step for aarch64 mach-virt guests, where we want to + * be able to have a pure virtio-mmio topology */ if (virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 1) < 0 && + !qemuDomainMachineIsVirt(def) && !virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 1, VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE)) goto cleanup; diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index ca3adc0..883264a 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -1483,9 +1483,15 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, } /* Reserve 1 extra slot for a (potential) bridge only if buses - * are not fully reserved yet + * are not fully reserved yet. + * + * We don't reserve the extra slot for aarch64 mach-virt guests + * either because we want to be able to have pure virtio-mmio + * guests, and reserving this slot would force us to add at least + * a dmi-to-pci-bridge to an otherwise PCI-free topology */ if (!buses_reserved && + !qemuDomainMachineIsVirt(def) && virDomainPCIAddressReserveNextSlot(addrs, &info, flags) < 0) goto cleanup; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args index 2a5702f..3e6bee9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args @@ -21,7 +21,6 @@ QEMU_AUDIO_DRV=none \ -initrd /aarch64.initrd \ -append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ -dtb /aarch64.dtb \ --device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \ -device virtio-serial-device,id=virtio-serial0 \ -usb \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args index a2df858..566bee2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args @@ -21,7 +21,6 @@ QEMU_AUDIO_DRV=none \ -initrd /aarch64.initrd \ -append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ -dtb /aarch64.dtb \ --device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \ -device virtio-serial-device,id=virtio-serial0 \ -usb \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.args index 0234404..4e5dbdb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.args @@ -23,12 +23,13 @@ QEMU_AUDIO_DRV=none \ -dtb /aarch64.dtb \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \ --device virtio-scsi-pci,id=scsi0,bus=pcie.0,addr=0x3 \ +-device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.1,addr=0x1 \ +-device virtio-scsi-pci,id=scsi0,bus=pci.3,addr=0x1 \ -usb \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-scsi0-0-0-0 \ -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ id=scsi0-0-0-0 \ --device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:09:a4:37,bus=pcie.0,addr=0x2 \ +-device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:09:a4:37,bus=pci.3,addr=0x2 \ -net user,vlan=0,name=hostnet0 \ -device virtio-net-pci,vlan=1,id=net1,mac=52:54:00:09:a4:38,bus=pci.2,addr=0x1 \ -net user,vlan=1,name=hostnet1 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.xml index bf0f249..5e1b494 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.xml @@ -31,13 +31,23 @@ <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='dmi-to-pci-bridge'> + <model name='i82801b11-bridge'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> + </controller> + <controller type='pci' index='2' model='pci-bridge'> + <model name='pci-bridge'/> + <target chassisNr='2'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> + </controller> <controller type='scsi' index='0' model='virtio-scsi'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + <address type='pci' domain='0x0000' bus='0x03' slot='0x01' function='0x0'/> </controller> <interface type='user'> <mac address='52:54:00:09:a4:37'/> <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + <address type='pci' domain='0x0000' bus='0x03' slot='0x02' function='0x0'/> </interface> <interface type='user'> <mac address='52:54:00:09:a4:38'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-default.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-default.xml index a212601..7c3fc19 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-default.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-default.xml @@ -33,10 +33,6 @@ <address type='virtio-mmio'/> </disk> <controller type='pci' index='0' model='pcie-root'/> - <controller type='pci' index='1' model='dmi-to-pci-bridge'> - <model name='i82801b11-bridge'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> - </controller> <controller type='virtio-serial' index='0'> <address type='virtio-mmio'/> </controller> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-manual-addresses.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-manual-addresses.xml index 4fdedac..1b50f75 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-manual-addresses.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-manual-addresses.xml @@ -32,9 +32,6 @@ <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> - <controller type='scsi' index='0' model='virtio-scsi'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </controller> <controller type='pci' index='0' model='pcie-root'/> <controller type='pci' index='1' model='dmi-to-pci-bridge'> <model name='i82801b11-bridge'/> @@ -45,10 +42,18 @@ <target chassisNr='2'/> <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> </controller> + <controller type='scsi' index='0' model='virtio-scsi'> + <address type='pci' domain='0x0000' bus='0x03' slot='0x01' function='0x0'/> + </controller> + <controller type='pci' index='3' model='pci-bridge'> + <model name='pci-bridge'/> + <target chassisNr='3'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> + </controller> <interface type='user'> <mac address='52:54:00:09:a4:37'/> <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + <address type='pci' domain='0x0000' bus='0x03' slot='0x02' function='0x0'/> </interface> <interface type='user'> <mac address='52:54:00:09:a4:38'/> -- 2.5.5

3 7

[libvirt] [PATCHv2 0/2] Rewrite prohibit-duplicate-header in perl
by Ján Tomko 23 Jun '16

23 Jun '16

v2: * use minuses instead of underscores in make target * actually call it during syntax-check * output file name and line for ViM integration Ján Tomko (2): syntax-check: rewrite prohibit-duplicate-header in perl prohibit-duplicate-header: print file name and line build-aux/prohibit-duplicate-header.pl | 26 ++++++++++++++++++++++++++ cfg.mk | 32 +++++++------------------------- 2 files changed, 33 insertions(+), 25 deletions(-) create mode 100644 build-aux/prohibit-duplicate-header.pl -- 2.7.3

2 3

[libvirt] [PATCH RESEND 0/2] qemu: reject invalid video accel* settings
by Cole Robinson 23 Jun '16

23 Jun '16

This series adds a couple checks for invalid video accel* settings, incase users screw up their XML when trying to enable spice GL No change since last posting, just rebased to master Cole Robinson (2): qemu: command: Error on accel3d with non-virtio qemu: command: Error on accel2d src/qemu/qemu_command.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) -- 2.7.4

2 3

[libvirt] [PATCH] Do not ignore perl scripts in build-aux
by Ján Tomko 23 Jun '16

23 Jun '16

Also remove the duplicate build-aux entry from .gitignore. --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8ce7e18..fba1464 100644 --- a/.gitignore +++ b/.gitignore @@ -43,7 +43,6 @@ /NEWS /aclocal.m4 /autom4te.cache -/build-aux /build-aux/ /build/ /confdefs.h @@ -197,6 +196,7 @@ stamp-h stamp-h.in stamp-h1 tags +!/build-aux/*.pl !/gnulib/lib/Makefile.am !/gnulib/tests/Makefile.am !/m4/virt-*.m4 -- 2.7.3

2 1

[libvirt] [PATCH v2 0/6] Add runnability info to query-cpu-definitions
by Eduardo Habkost 23 Jun '16

23 Jun '16

This series extends query-cpu-definitions to include an extra field: "unavailable-features". The new field can be used to find out reasons that prevent the CPU model from running in the current host. This will return information based on the current machine and accelerator only. In the future we may extend these mechanisms to allow querying other machines and other accelerators without restarting QEMU, but it will require some reorganization of QEMU's main code. This series is based on my 'x86-next' branch, at: git://github.com/ehabkost/qemu.git x86-next Changes v1 -> v2: * Fixed documentation to say "(since 2.7)" * Removed @runnable field, improved documentation Example command output: { "return": [ { "unavailable-features": [ "kvm" ], "name": "host" }, { "unavailable-features": [], "name": "qemu64" }, { "unavailable-features": [], "name": "qemu32" }, { "unavailable-features": ["npt", "fxsr-opt", "vme"], "name": "phenom" }, { "unavailable-features": ["vme"], "name": "pentium3" }, { "unavailable-features": ["vme"], "name": "pentium2" }, { "unavailable-features": ["vme"], "name": "pentium" }, { "unavailable-features": ["vme"], "name": "n270" }, { "unavailable-features": ["vme"], "name": "kvm64" }, { "unavailable-features": ["vme"], "name": "kvm32" }, { "unavailable-features": ["vme"], "name": "coreduo" }, { "unavailable-features": ["vme"], "name": "core2duo" }, { "unavailable-features": ["vme"], "name": "athlon" }, { "unavailable-features": ["vme"], "name": "Westmere" }, { "unavailable-features": ["xsavec", "3dnowprefetch", "rdseed", "rtm", "invpcid", "erms", "avx2", "hle", "rdrand", "f16c", "avx", "tsc-deadline", "x2apic", "pcid", "fma", "vme"], "name": "Skylake-Client" }, { "unavailable-features": ["avx", "tsc-deadline", "x2apic", "vme"], "name": "SandyBridge" }, { "unavailable-features": ["vme"], "name": "Penryn" }, { "unavailable-features": ["tbm", "fma4", "xop", "3dnowprefetch", "misalignsse", "f16c", "avx", "fma", "vme"], "name": "Opteron_G5" }, { "unavailable-features": ["fma4", "xop", "3dnowprefetch", "misalignsse", "avx", "vme"], "name": "Opteron_G4" }, { "unavailable-features": ["misalignsse", "vme"], "name": "Opteron_G3" }, { "unavailable-features": ["vme"], "name": "Opteron_G2" }, { "unavailable-features": ["vme"], "name": "Opteron_G1" }, { "unavailable-features": ["vme"], "name": "Nehalem" }, { "unavailable-features": ["erms", "rdrand", "f16c", "avx", "tsc-deadline", "x2apic", "vme"], "name": "IvyBridge" }, { "unavailable-features": ["rtm", "invpcid", "erms", "avx2", "hle", "rdrand", "f16c", "avx", "tsc-deadline", "x2apic", "pcid", "fma", "vme"], "name": "Haswell" }, { "unavailable-features": ["invpcid", "erms", "avx2", "rdrand", "f16c", "avx", "tsc-deadline", "x2apic", "pcid", "fma", "vme"], "name": "Haswell-noTSX" }, { "unavailable-features": ["vme"], "name": "Conroe" }, { "unavailable-features": ["3dnowprefetch", "rdseed", "rtm", "invpcid", "erms", "avx2", "hle", "rdrand", "f16c", "avx", "tsc-deadline", "x2apic", "pcid", "fma", "vme"], "name": "Broadwell" }, { "unavailable-features": ["3dnowprefetch", "rdseed", "invpcid", "erms", "avx2", "rdrand", "f16c", "avx", "tsc-deadline", "x2apic", "pcid", "fma", "vme"], "name": "Broadwell-noTSX" }, { "unavailable-features": ["vme"], "name": "486" } ]} Cc: David Hildenbrand <dahi(a)linux.vnet.ibm.com> Cc: Michael Mueller <mimu(a)linux.vnet.ibm.com> Cc: Christian Borntraeger <borntraeger(a)de.ibm.com> Cc: Cornelia Huck <cornelia.huck(a)de.ibm.com> Cc: Jiri Denemark <jdenemar(a)redhat.com> Cc: libvir-list(a)redhat.com Eduardo Habkost (6): target-i386: List CPU models using subclass list target-i386: Move warning code outside x86_cpu_filter_features() target-i386: Define CPUID filtering functions before x86_cpu_list() qmp: Add runnability information to query-cpu-definitions target-i386: Use "-" instead of "_" on all feature names target-i386: Return runnability information on query-cpu-definitions qapi-schema.json | 23 ++++- target-i386/cpu-qom.h | 4 + target-i386/cpu.c | 262 +++++++++++++++++++++++++++++++++++--------------- 3 files changed, 209 insertions(+), 80 deletions(-) -- 2.5.5

3 13

[libvirt] [PATCH] Allow virDomain(SG)etGuestVcpus on read-write connection only
by Peter Krempa 23 Jun '16

23 Jun '16

Guest agent interaction is considered privileged. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1349272 --- src/libvirt-domain.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 508520e..2ca054a 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11873,6 +11873,8 @@ virDomainGetGuestVcpus(virDomainPtr domain, virResetLastError(); virCheckDomainReturn(domain, -1); + virCheckReadOnlyGoto(domain->conn->flags, error); + virCheckNonNullArgGoto(params, error); virCheckNonNullArgGoto(nparams, error); @@ -11929,6 +11931,8 @@ virDomainSetGuestVcpus(virDomainPtr domain, virResetLastError(); virCheckDomainReturn(domain, -1); + virCheckReadOnlyGoto(domain->conn->flags, error); + virCheckNonNullArgGoto(cpumap, error); if (domain->conn->driver->domainSetGuestVcpus) { -- 2.8.3

2 1

Re: [libvirt] [RFC 00/28] s390x CPU models: exposing features
by Eduardo Habkost 23 Jun '16

23 Jun '16

(CCing libvirt people) On Tue, Jun 21, 2016 at 03:02:05PM +0200, David Hildenbrand wrote: > This is our second attempt to implement CPU models for s390x. We realized > that we also want to have features exposed via the CPU model. While doing > that we realized that we want to have a better interface for libvirt. Before getting into the details, I would like to clarify how the following could be accomplished using the new commands: Example: 1) User configures libvirt with: <cpu match='exact'> <model fallback='forbid'>Westmere</model> <feature policy='require' name='aes'/> </cpu> 2) libvirt will translate that to: "-cpu Westmere,+aes" or "-cpu Westmere,aes=on" 3) libvirt wants to know if "-cpu Westmere,aes=on" is usable in the current host, before trying to start the VM. How exactly would this be done using the new commands? > > Unfortunately, CPU models on s390x are special and we have to take care of: > - A CPU like z13 looks differently in various environments (under different > LPAR versions, under different z/VM versions, under different KVM > versions, export regulation) - we have _a lot_ of feature variability. > - We still have certain features that are not published but might be > implemented/introduced in the future. As they are a theoretical part > of a CPU already, we have to find a way to model these future changes. > - We still have certain features that are already published, but not > implemented. Implementation might be added in the future in KVM. > - We heavily rely on KVM to tell us which features it can actually > virtualize - user space queries like "STFL(e)" give no guarantees. > - Certain "subfeatures" were introduced in one run. In practice, they are > always around, but in theory, subfeatures could be dropped in the future. > - Just because two CPU models have the same features doesn't mean they > are equal - some internal numbers might be different. E.g. we won't allow > running a z13 under a zBC12 just by turning off features. > - We cannot blindly enable all possible features for a CPU generation, > the IBC "Instruction Blocking Control" in KVM will try to block > instructions introduced with certain features. So a CPU generation always > has some maximum feature set that is guaranteed to work. > > It all boils down to a specific released CPU to have. > a) A fixed feature set that we expect it to be have on every hypervisor. > b) A variable part that depends on the hypervisor and that could be > extended in the future (adding not yet implemented features) that we > always want to enable later on. > c) A variable part that we want to enable only if requested - nested > virtualization ("vsie") and assists are one example. > > But, the fixed feature set is not really what we want to use as a default. > It is just like a really minimum, stable base. > > So we have > a) A "stable" CPU model for each released CPU that will never change and > maps to the minimum feature set we expect to be around on all > hypervisors. e.g. "z13-base" or "z10EC.2-base". These are migration > safe. > b) A "default" CPU model for each released CPU, that can change between > QEMU versions and that will always include the features we expect to > be around in our currently supported environments and will contain only > features we expect to be stable. E.g. nested virtualization will not be > contained in these models. These models are not migration safe, e.g > "z13" or "z10EC.2". The feature set can differ between QEMU versions. > c) An internal "maximum" CPU model for each generation that tells us which > features were supported as a maximum back when the hardware was > released. This will not be exposed > > To not have to replicate all CPU model changes ("new default fetaures") in > libvirt, to not duplicate the logic about compatibility and the like, > our approach tries to keep all the QEMU logic in libvirt and provide > standardized interfaces for libvirt to e.g. baseline, compare. This > allows libvirt to not have to care about any model names or feature names, > it can just pass the data from interface to interface and report it to > the user. > > Also, libvirt might want to know what the "host" model looks like and > convert a CPU model to a migration safe variant. For this reason, a QMP > command is added that can create a migration safe variant of a variable > CPU model, indicating only the delta changes done to a stable model. > > So we have: > a) "query-cpu-model-expansion" - tell us what the "host" or a migration > unsafe model looks like. Either falling back to a stable model or > completely exposing all properties. We are interested in stable models. > b) "query-cpu-model-comparison" - tell us how two CPU models compare, > indicating which properties were responsible for the decision. > c) "query-cpu-model-baseline" - create a new model out of two models, > taking a requested level of stability into account. > > As we are aware that e.g. x86 has their own idea of a CPU model and their > existing implementation in place, but are also looking into to ways to e.g. > expand the "host" CPU model to a detailed representation, we designed the > "expansion" interface to also allow that. > > Comments are very welcome, but please always keep the restrictions and > specialties in mind when suggesting some major design changes. > > The header update will be replaced by a kvm-next header update as soon as > the VSIE patches are upstream. The major KVM interface changes are already > part of kvm-next. > > The current state is available on git://github.com/cohuck/qemu on branch > "cpumodel-s390x". > > David Hildenbrand (26): > s390x/cpumodel: "host" and "qemu" as CPU subclasses > s390x/cpumodel: expose CPU class properties > s390x/cpumodel: generate CPU feature group lists > s390x/cpumodel: introduce CPU feature group definitions > s390x/cpumodel: register defined CPU models as subclasses > s390x/cpumodel: store the CPU model in the CPU instance > s390x/cpumodel: expose features and feature groups as properties > s390x/cpumodel: let the CPU model handle feature checks > s390x/cpumodel: check and apply the CPU model > s390x/sclp: factor out preparation of cpu entries > s390x/sclp: introduce sclp feature blocks > s390x/sclp: indicate sclp features > s390x/sclp: propagate the ibc val(lowest and unblocked ibc) > s390x/sclp: propagate the mha via sclp > s390x/sclp: propagate hmfai > update linux headers (CPU model) > s390x/kvm: allow runtime-instrumentation for "none" machine > s390x/kvm: implement CPU model support > s390x/kvm: disable host model for existing compat machines > s390x/kvm: let the CPU model control CMM(A) > qmp: add QMP interface "query-cpu-model-expansion" > qmp: add QMP interface "query-cpu-model-comparison" > qmp: add QMP interface "query-cpu-model-baseline" > s390x/cpumodel: implement QMP interface "query-cpu-model-expansion" > s390x/cpumodel: implement QMP interface "query-cpu-model-comparison" > s390x/cpumodel: implement QMP interface "query-cpu-model-baseline" > > Michael Mueller (2): > s390x/cpumodel: introduce CPU features > s390x/cpumodel: generate CPU feature lists for CPU models > > Makefile.target | 2 +- > hw/s390x/s390-virtio-ccw.c | 5 + > hw/s390x/s390-virtio.c | 6 +- > hw/s390x/sclp.c | 35 +- > include/hw/s390x/sclp.h | 17 +- > include/sysemu/arch_init.h | 10 + > linux-headers/asm-s390/kvm.h | 40 ++ > qapi-schema.json | 184 ++++++ > qmp-commands.hx | 18 + > qmp.c | 22 + > rules.mak | 1 + > stubs/Makefile.objs | 3 + > stubs/arch-query-cpu-model-baseline.c | 13 + > stubs/arch-query-cpu-model-comparison.c | 12 + > stubs/arch-query-cpu-model-expansion.c | 12 + > target-s390x/Makefile.objs | 22 +- > target-s390x/cpu-qom.h | 5 + > target-s390x/cpu.c | 35 +- > target-s390x/cpu.h | 5 + > target-s390x/cpu_features.c | 376 +++++++++++ > target-s390x/cpu_features.h | 302 +++++++++ > target-s390x/cpu_models.c | 1055 +++++++++++++++++++++++++++++++ > target-s390x/cpu_models.h | 113 ++++ > target-s390x/gen-features.c | 587 +++++++++++++++++ > target-s390x/helper.c | 29 +- > target-s390x/kvm.c | 346 +++++++++- > target-s390x/machine.c | 14 +- > 27 files changed, 3203 insertions(+), 66 deletions(-) > create mode 100644 stubs/arch-query-cpu-model-baseline.c > create mode 100644 stubs/arch-query-cpu-model-comparison.c > create mode 100644 stubs/arch-query-cpu-model-expansion.c > create mode 100644 target-s390x/cpu_features.c > create mode 100644 target-s390x/cpu_features.h > create mode 100644 target-s390x/cpu_models.c > create mode 100644 target-s390x/cpu_models.h > create mode 100644 target-s390x/gen-features.c > > -- > 2.6.6 > -- Eduardo

3 17

[libvirt] [PATCH] libxl: use serial device for console when targetType is serial
by Jim Fehlig 22 Jun '16

22 Jun '16

When domXML contains only <console type='pty'> and no corresponding <serial>, the console is "stolen" [1] and used as the first <serial> device. When this "stolen" console is accessed from the libxl driver (in libxlConsoleCallback and libxlDomainOpenConsole), check if the targetType is VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL, and use the "stolen" device in def->serials[0] instead. Prior to this change, creating a domain with input XML containing only a <console> device and subsequently attempting to access its console with 'virsh console' would fail error: internal error: character device <null> is not using a PTY [1] See comments associated with virDomainDefAddConsoleCompat() in $LIBVIRT-SRC/src/conf/domain_conf.c: Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_domain.c | 8 ++++++-- src/libxl/libxl_driver.c | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 221af87..6bcb4d9 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -964,13 +964,17 @@ libxlConsoleCallback(libxl_ctx *ctx, libxl_event *ev, void *for_callback) virObjectLock(vm); for (i = 0; i < vm->def->nconsoles; i++) { virDomainChrDefPtr chr = vm->def->consoles[i]; - if (chr && chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { + if (i == 0 && + chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) + chr = vm->def->serials[0]; + + if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { libxl_console_type console_type; char *console = NULL; int ret; console_type = - (chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL ? + (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL ? LIBXL_CONSOLE_TYPE_SERIAL : LIBXL_CONSOLE_TYPE_PV); ret = libxl_console_get_tty(ctx, ev->domid, chr->target.port, console_type, diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index c8c1f07..3189f1c 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -4443,8 +4443,11 @@ libxlDomainOpenConsole(virDomainPtr dom, priv = vm->privateData; - if (vm->def->nconsoles) + if (vm->def->nconsoles) { chr = vm->def->consoles[0]; + if (chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) + chr = vm->def->serials[0]; + } if (!chr) { virReportError(VIR_ERR_INTERNAL_ERROR, -- 2.1.4

3 4

[libvirt] [PATCH] conf: Remove dead console compat formatting
by Cole Robinson 22 Jun '16

22 Jun '16

This code was attempting to handle some implicit <console> XML formatting for manually assembled DomainDef, since previously the console<->serial compat copying was only done at XML parse time. Nowadays it's done via virDomainDefPostParse -> virDomainDefAddConsoleCompat, which all manual DomainDef builders already call, so we can drop this workaround. --- src/conf/domain_conf.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 75ad03f..6ab7450 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -23463,20 +23463,6 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (virDomainChrDefFormat(buf, &console, flags) < 0) goto error; } - /* The back-compat console device stub is added when parsing the domain XML - * and handled above, this is for formatting definitions created via other - * means. - */ - if (def->os.type == VIR_DOMAIN_OSTYPE_HVM && - def->nconsoles == 0 && - def->nserials > 0) { - virDomainChrDef console; - memcpy(&console, def->serials[n], sizeof(console)); - console.deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE; - console.targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL; - if (virDomainChrDefFormat(buf, &console, flags) < 0) - goto error; - } for (n = 0; n < def->nchannels; n++) if (virDomainChrDefFormat(buf, def->channels[n], flags) < 0) -- 2.7.4

2 1

[libvirt] [PATCH RFC] libxl: set serial source path for console type=serial
by Joao Martins 22 Jun '16

22 Jun '16

Guests use a <console /> (and sometimes <serial /> pair) to represent the console. On the callback that is called when console is brought up (NB: before domain starts), we fill the path of the console element with the appropriate "/dev/pts/X". For PV guests it all works fine, although for HVM guests it doesn't. Consequently we end up seeing erronous behaviour on HVM guests where console path is not displayed on the XML but still can be accessed with virDomainOpenConsole after booting guest. Consumers of this XML (e.g. Openstack) also won't be able to use the console path. Finally, the path set in consoles array won't persist across daemon reboots, thus rendering admins/users with no access to console with a message such as: "error: operation failed: PTY device is not yet assigned" This is because: for HVM guests, DefFormatInternal will ignore the console element and instead write it with the content of the serial element for target type = serial which isn't touched in our libxlConsoleCallback. To address that we introduce a new helper routine libxlConsoleSetSourcePath() that sets the source path and thus also handling this case. That is by setting the source path on with serial element akin to the one indexed by console "port". This way we keep similar behaviour for PV and HVM guests. Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- src/libxl/libxl_domain.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 221af87..4a46143 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -955,6 +955,35 @@ libxlNetworkPrepareDevices(virDomainDefPtr def) return 0; } +static int +libxlConsoleSetSourcePath(virDomainDefPtr def, virDomainChrDefPtr console, + char *path) +{ + int ret = -1; + size_t i; + + if (!path || path[0] == '\0') + return ret; + + if (VIR_STRDUP(console->source.data.file.path, path) < 0) + return ret; + + if (console->targetType != VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) + return 0; + + for (i = 0; i < def->nserials; i++) { + virDomainChrDefPtr serial = def->serials[i]; + + if (serial->target.port == console->target.port && + VIR_STRDUP(serial->source.data.file.path, path) >= 0) { + ret = 0; + break; + } + } + + return ret; +} + static void libxlConsoleCallback(libxl_ctx *ctx, libxl_event *ev, void *for_callback) { @@ -977,10 +1006,8 @@ libxlConsoleCallback(libxl_ctx *ctx, libxl_event *ev, void *for_callback) &console); if (!ret) { VIR_FREE(chr->source.data.file.path); - if (console && console[0] != '\0') { - ignore_value(VIR_STRDUP(chr->source.data.file.path, - console)); - } + if (libxlConsoleSetSourcePath(vm->def, chr, console) < 0) + VIR_WARN("Failed to set console source path"); } VIR_FREE(console); } -- 2.1.4

3 7

[libvirt] [PATCH v3] storage: Fix several issues with transient pool cleanup
by Jovanka Gulicoska 22 Jun '16

22 Jun '16

There are several cases where we do not handle transient pool destroy and cleanup correctly. For example: https://bugzilla.redhat.com/show_bug.cgi?id=1227475 Move the pool cleanup logic to a new function storagePoolSetInactive and use it consistently. --- src/storage/storage_driver.c | 45 +++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index e2d729f..930ae5a 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -77,6 +77,23 @@ static void storageDriverUnlock(void) } static void +storagePoolSetInactive(virStoragePoolObjPtr *poolptr) +{ + virStoragePoolObjPtr pool = *poolptr; + + pool->active = false; + + if (pool->configFile == NULL) { + virStoragePoolObjRemove(&driver->pools, pool); + *poolptr = NULL; + } else if (pool->newDef) { + virStoragePoolDefFree(pool->def); + pool->def = pool->newDef; + pool->newDef = NULL; + } +} + +static void storagePoolUpdateState(virStoragePoolObjPtr pool) { bool active; @@ -115,16 +132,19 @@ storagePoolUpdateState(virStoragePoolObjPtr pool) if (backend->refreshPool(NULL, pool) < 0) { if (backend->stopPool) backend->stopPool(NULL, pool); + active = false; virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to restart storage pool '%s': %s"), pool->def->name, virGetLastErrorMessage()); goto error; } + active = true; } - pool->active = active; ret = 0; error: + if (!active) + storagePoolSetInactive(&pool); if (ret < 0) { if (stateFile) unlink(stateFile); @@ -201,6 +221,8 @@ storageDriverAutostart(void) virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to autostart storage pool '%s': %s"), pool->def->name, virGetLastErrorMessage()); + storagePoolSetInactive(&pool); + continue; } else { pool->active = true; } @@ -737,8 +759,7 @@ storagePoolCreateXML(virConnectPtr conn, unlink(stateFile); if (backend->stopPool) backend->stopPool(conn, pool); - virStoragePoolObjRemove(&driver->pools, pool); - pool = NULL; + storagePoolSetInactive(&pool); goto cleanup; } @@ -1068,16 +1089,7 @@ storagePoolDestroy(virStoragePoolPtr obj) VIR_STORAGE_POOL_EVENT_STOPPED, 0); - pool->active = false; - - if (pool->configFile == NULL) { - virStoragePoolObjRemove(&driver->pools, pool); - pool = NULL; - } else if (pool->newDef) { - virStoragePoolDefFree(pool->def); - pool->def = pool->newDef; - pool->newDef = NULL; - } + storagePoolSetInactive(&pool); ret = 0; @@ -1197,12 +1209,7 @@ storagePoolRefresh(virStoragePoolPtr obj, pool->def->uuid, VIR_STORAGE_POOL_EVENT_STOPPED, 0); - pool->active = false; - - if (pool->configFile == NULL) { - virStoragePoolObjRemove(&driver->pools, pool); - pool = NULL; - } + storagePoolSetInactive(&pool); goto cleanup; } -- 2.5.5

2 1

[libvirt] [PATCH 0/4] Move ccwaddrs and pciaddrs to domainDef
by Tomasz Flendrich 22 Jun '16

22 Jun '16

This patch depends on another one, because it was created on top of the changes in the other one. Link to the dependency: https://www.redhat.com/archives/libvir-list/2016-June/msg01227.html This is the next patch of the ongoing process of abstracting device address generation. In this patch, addres sets are moved from QEMU's (ccw and pci) and bhyve's (pci only) private data to domainDef. In the future, it's likely that more hypervisors will add the feature of explicitly specifying the device addresses, so handling the addresses should be made more generic. Tomasz Flendrich (4): Move functions from qemu_domain_address to domain_addr Move ccwaddrs from QEMU's private data to domainDef Move virDomainPCIAddressSetFree from domain_addr to domain_conf Move pciaddrs from private data to domainDef src/bhyve/bhyve_device.c | 16 +- src/bhyve/bhyve_domain.c | 2 - src/bhyve/bhyve_domain.h | 3 - src/conf/domain_addr.c | 497 ++++++++++++++++++++++++++++++++++-- src/conf/domain_addr.h | 67 ++--- src/conf/domain_conf.c | 21 ++ src/conf/domain_conf.h | 51 ++++ src/libvirt_private.syms | 11 +- src/qemu/qemu_domain.c | 4 +- src/qemu/qemu_domain.h | 3 - src/qemu/qemu_domain_address.c | 561 +++-------------------------------------- src/qemu/qemu_domain_address.h | 3 +- src/qemu/qemu_hotplug.c | 23 +- src/qemu/qemu_process.c | 6 +- tests/qemuhotplugtest.c | 2 +- 15 files changed, 629 insertions(+), 641 deletions(-) -- 2.7.4 (Apple Git-66)

4 12

[libvirt] [PATCH 0/2] Abstracting device address allocation
by Tomasz Flendrich 22 Jun '16

22 Jun '16

More hypervisors may implement the possibility of specifying device addresses, so it makes sense to make QEMU-specific code more generic to be prepared for it. If this approach will be acceptable, all the other address sets will be moved from QEMU's private data to domainDef, the qemu_domain_address.c will shrink in size and the functionality will be moved to domain_addr.[hc]. Tomasz Flendrich (2): Move virtio *Free() functions from domain_addr to domain_conf Move vioserialaddrs from QEMU's private data to domainDef src/conf/domain_addr.c | 22 ---------------------- src/conf/domain_addr.h | 17 ----------------- src/conf/domain_conf.c | 23 +++++++++++++++++++++++ src/conf/domain_conf.h | 19 +++++++++++++++++++ src/libvirt_private.syms | 3 ++- src/qemu/qemu_domain.c | 1 - src/qemu/qemu_domain.h | 1 - src/qemu/qemu_domain_address.c | 20 ++++++++------------ src/qemu/qemu_hotplug.c | 9 +++++---- 9 files changed, 57 insertions(+), 58 deletions(-) -- 2.7.4 (Apple Git-66)

2 3

[libvirt] [PATCH] qemu: make monitor command API available during async jobs
by Nikolay Shirokovskiy 22 Jun '16

22 Jun '16

One can not issue monitor commands manually during async calls thru designated API while this could be useful for testing/debugging purposes. qemuDomainQemuMonitorCommand uses job of type QEMU_JOB_MODIFY and any async call disable parallel execution of this type of job. The only state that is changed is taint variable. AFAIU the only place we can mess is resetting taint flag in qemuProcessStop routine under some async job. But this can not happen thanx to both virDomainObjIsActive check in qemuDomainQemuMonitorCommand and resetting active status in qemuProcessStop before taint flag. Change job type to QEMU_JOB_QUERY and thus make the API call available for most of async jobs. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 931efae..d6aa640 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15514,7 +15514,7 @@ static int qemuDomainQemuMonitorCommand(virDomainPtr domain, const char *cmd, if (virDomainQemuMonitorCommandEnsureACL(domain->conn, vm->def) < 0) goto cleanup; - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; if (!virDomainObjIsActive(vm)) { -- 1.8.3.1

2 3

[libvirt] [PATCH 00/11] Add auto convergence migration parameters
by Jiri Denemark 22 Jun '16

22 Jun '16

This series adds support for a couple of migration parameters which can be used to tune the auto-convergence algorithm in QEMU. Jiri Denemark (11): qemu: Make qemuMonitorSetMigrationCompression saner qemu: Decouple migration parameters from compression settings qemu: Rename qemuMonitorMigrationCompression qemu: Rework qemuMonitorJSONGetMigrationParams qemu: Rework qemuMonitorJSONSetMigrationParams test: Rework qemuMonitorJSONGetMigrationParams test Add auto convergence migration parameters qemu: Introduce qemuMigrationSetParams qemu: Add support for cpu throttling parameters qemu: Implement auto convergence migration parameters Report auto convergence throttle rate in migration stats include/libvirt/libvirt-domain.h | 27 ++++++ src/qemu/qemu_domain.c | 6 ++ src/qemu/qemu_driver.c | 13 ++- src/qemu/qemu_migration.c | 195 ++++++++++++++++++++++++++++++--------- src/qemu/qemu_migration.h | 17 +++- src/qemu/qemu_monitor.c | 29 ++++-- src/qemu/qemu_monitor.h | 37 +++++--- src/qemu/qemu_monitor_json.c | 74 +++++++-------- src/qemu/qemu_monitor_json.h | 8 +- tests/qemumonitorjsontest.c | 60 ++++++------ tools/virsh-domain.c | 35 +++++++ tools/virsh.pod | 16 ++-- 12 files changed, 364 insertions(+), 153 deletions(-) -- 2.9.0

2 22

[libvirt] [PATCH] syntax-check: rewrite prohibit-duplicate-header in perl
by Ján Tomko 22 Jun '16

22 Jun '16

Invoke the script only once instead of once for every file. --- build-aux/prohibit-duplicate-header.pl | 22 ++++++++++++++++++++++ cfg.mk | 29 +++++------------------------ 2 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 build-aux/prohibit-duplicate-header.pl diff --git a/build-aux/prohibit-duplicate-header.pl b/build-aux/prohibit-duplicate-header.pl new file mode 100644 index 0000000..f9ab3f5 --- /dev/null +++ b/build-aux/prohibit-duplicate-header.pl @@ -0,0 +1,22 @@ +#!/usr/bin/perl + +use strict; + +my $file = " "; +my $ret = 0; +my %includes = ( ); + +while (<>) { + if (not $file eq $ARGV) { + %includes = ( ); + $file = $ARGV; + } + if (/^# *include *[<"]([^>"]*\.h)[">]/) { + $includes{$1}++; + if ($includes{$1} == 2) { + $ret = 1; + print STDERR "$1 included multiple times in $ARGV\n"; + } + } +} +exit $ret; diff --git a/cfg.mk b/cfg.mk index 297ca3a..69ab6fe 100644 --- a/cfg.mk +++ b/cfg.mk @@ -813,30 +813,6 @@ sc_prohibit_exit_in_tests: halt='use return, not exit(), in tests' \ $(_sc_search_regexp) -# Don't include duplicate header in the source (either *.c or *.h) -sc_prohibit_duplicate_header: - @fail=0; for i in $$($(VC_LIST_EXCEPT) | grep '\.[chx]$$'); do \ - awk '/# *include.*\.h/ { \ - match($$0, /[<"][^>"]*[">]/); \ - arr[substr($$0, RSTART + 1, RLENGTH - 2)]++; \ - } \ - END { \ - for (key in arr) { \ - if (arr[key] > 1) { \ - fail=1; \ - printf("%d %s are included\n", arr[key], key); \ - } \ - } \ - if (fail == 1) { \ - printf("duplicate header(s) in " FILENAME "\n"); \ - exit 1; \ - } \ - }' $$i || fail=1; \ - done; \ - if test $$fail -eq 1; then \ - { echo '$(ME): avoid duplicate headers' 1>&2; exit 1; } \ - fi; - # Don't include "libvirt/*.h" in "" form. sc_prohibit_include_public_headers_quote: @prohibit='# *include *"libvirt/.*\.h"' \ @@ -1100,6 +1076,11 @@ ifneq ($(_gl-Makefile),) syntax-check: $(top_srcdir)/HACKING spacing-check test-wrap-argv endif +# Don't include duplicate header in the source (either *.c or *.h) +prohibit_duplicate_header: + $(AM_V_GEN)files= $$($(VC_LIST_EXCEPT) | grep '\.[chx]$$') \ + $(PERL) -W $(top_srcdir)/build-aux/prohibit-duplicate-header.pl $$files + spacing-check: $(AM_V_GEN)files=`$(VC_LIST) | grep '\.c$$'`; \ $(PERL) $(top_srcdir)/build-aux/check-spacing.pl $$files || \ -- 2.7.3

2 2

[libvirt] [PATCH] conf: Simplify conditions in CPU parser/formatter
by Jiri Denemark 22 Jun '16

22 Jun '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/cpu_conf.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 7230b89..b71528e 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -330,8 +330,7 @@ virCPUDefParseXML(xmlNodePtr node, goto error; if (n > 0) { - if (!def->model && def->mode != VIR_CPU_MODE_HOST_MODEL && - def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) { + if (!def->model && def->mode == VIR_CPU_MODE_CUSTOM) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Non-empty feature list specified without " "CPU model")); @@ -518,10 +517,7 @@ virCPUDefFormatBuf(virBufferPtr buf, (def->mode == VIR_CPU_MODE_HOST_MODEL || (def->mode == VIR_CPU_MODE_CUSTOM && def->model))); - if (!def->model && - def->mode != VIR_CPU_MODE_HOST_MODEL && - def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH && - def->nfeatures) { + if (!def->model && def->mode == VIR_CPU_MODE_CUSTOM && def->nfeatures) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Non-empty feature list specified without CPU model")); return -1; -- 2.9.0

2 1

[libvirt] [PATCH] qemucapsprobe: Don't put empty line at EOF
by Jiri Denemark 22 Jun '16

22 Jun '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tests/qemucapsprobemock.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/qemucapsprobemock.c b/tests/qemucapsprobemock.c index 8ff4de9..0c4c786 100644 --- a/tests/qemucapsprobemock.c +++ b/tests/qemucapsprobemock.c @@ -62,6 +62,7 @@ qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon, const char *line, qemuMonitorMessagePtr msg) { + static bool first = true; virJSONValuePtr value = NULL; char *json = NULL; int ret; @@ -76,6 +77,11 @@ qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon, char *p; bool skip = false; + if (first) + first = false; + else + putchar('\n'); + for (p = json; *p; p++) { if (skip && *p == '\n') { continue; @@ -84,7 +90,6 @@ qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon, putchar(*p); } } - putchar('\n'); } VIR_FREE(json); -- 2.9.0

2 1

[libvirt] [PATCH] conf: Remove redundant free in virCPUDefFree
by Jiri Denemark 22 Jun '16

22 Jun '16

vendor_id is (and always was) already freed in virCPUDefFreeModel. This effectively reverts commit fb49ffc3. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/cpu_conf.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 1ba1d82..7230b89 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -77,9 +77,6 @@ virCPUDefFree(virCPUDefPtr def) return; virCPUDefFreeModel(def); - - VIR_FREE(def->vendor_id); - VIR_FREE(def); } -- 2.9.0

2 1

[libvirt] [PATCH] qemu: Fix reference leak in qemuDomainDefPostParse
by Jiri Denemark 22 Jun '16

22 Jun '16

The function gets a reference on virQEMUDriverConfig which needs to be released before returning. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 29f6b93..8f19fb5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2134,13 +2134,13 @@ qemuDomainDefPostParse(virDomainDefPtr def, if (def->os.bootloader || def->os.bootloaderArgs) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("bootloader is not supported by QEMU")); - return ret; + goto cleanup; } if (!def->os.machine) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing machine type")); - return ret; + goto cleanup; } if (def->os.loader && @@ -2155,7 +2155,7 @@ qemuDomainDefPostParse(virDomainDefPtr def, /* check for emulator and create a default one if needed */ if (!def->emulator && !(def->emulator = virDomainDefGetDefaultEmulator(def, caps))) - return ret; + goto cleanup; if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator))) -- 2.9.0

2 1

[libvirt] [PATCH] qemu: Hide virQEMUCapsNewForBinary
by Jiri Denemark 22 Jun '16

22 Jun '16

Since virQEMUCapsNewForBinaryInternal was introduced, virQEMUCapsNewForBinary is no longer used outside qemu_capabilities.c. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6e6010d..4ed5b71 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3801,7 +3801,7 @@ virQEMUCapsNewForBinaryInternal(const char *binary, return NULL; } -virQEMUCapsPtr +static virQEMUCapsPtr virQEMUCapsNewForBinary(const char *binary, const char *libDir, const char *cacheDir, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 651f962..affb639 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -382,11 +382,6 @@ typedef virQEMUCapsCache *virQEMUCapsCachePtr; virQEMUCapsPtr virQEMUCapsNew(void); virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps); -virQEMUCapsPtr virQEMUCapsNewForBinary(const char *binary, - const char *libDir, - const char *cacheDir, - uid_t runUid, - gid_t runGid); int virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon); -- 2.9.0

2 1

[libvirt] [PATCH 00/17] qemu: Assign addresses to USB devices
by Ján Tomko 22 Jun '16

22 Jun '16

Technically a v2, but it's been too long: https://www.redhat.com/archives/libvir-list/2015-August/msg00521.html With apologies to anyone who had read v1. https://bugzilla.redhat.com/show_bug.cgi?id=1215968 Ján Tomko (17): Format CCID controllers after USB hubs Fix USB port in input-usbmouse test Add a USB hub to controller order test Add a test for long USB port paths Split out USB port parsing Use for instead of code duplication when parsing USB port Store USB port path as an array of integers Do not call postParse with ABI_UPDATE when parsing cmdline Add newDomain parameter to qemuDomainAssignAddresses Introduce virDomainUSBAddressSet Add functions for adding USB controllers to addrs Add functions for adding USB hubs to addrs Reserve existing USB addresses Assign addresses to USB devices Auto-add one hub if there are too many USB devices Add USB disk to hotplug-base Assign addresses on USB device hotplug src/conf/device_conf.h | 5 +- src/conf/domain_addr.c | 481 +++++++++++++++++++++ src/conf/domain_addr.h | 55 +++ src/conf/domain_conf.c | 125 +++++- src/conf/domain_conf.h | 6 + src/libvirt_private.syms | 11 + src/qemu/qemu_command.c | 33 +- src/qemu/qemu_domain.c | 3 +- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_domain_address.c | 126 +++++- src/qemu/qemu_domain_address.h | 3 +- src/qemu/qemu_hotplug.c | 27 ++ src/qemu/qemu_parse_command.c | 3 +- src/qemu/qemu_process.c | 7 +- tests/qemuhotplugtest.c | 2 +- ...otplug-console-compat-2-live+console-virtio.xml | 1 + .../qemuhotplug-hotplug-base-live+disk-usb.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-bios-nvram.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-bios.args | 2 +- .../qemuxml2argv-console-compat-2-live.xml | 1 + .../qemuxml2argv-console-compat-2.xml | 4 +- .../qemuxml2argv-controller-order.args | 7 +- .../qemuxml2argv-controller-order.xml | 1 + .../qemuxml2argv-disk-usb-device-removable.args | 3 +- .../qemuxml2argv-disk-usb-device.args | 2 +- .../qemuxml2argv-graphics-spice-timeout.args | 2 +- ...muxml2argv-hostdev-usb-address-device-boot.args | 2 +- .../qemuxml2argv-hostdev-usb-address-device.args | 2 +- .../qemuxml2argv-hostdev-usb-address.args | 2 +- .../qemuxml2argv-hotplug-base.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-hotplug-base.xml | 8 + .../qemuxml2argv-hugepages-numa.args | 2 +- .../qemuxml2argv-input-usbmouse-addr.args | 2 +- .../qemuxml2argv-input-usbmouse-addr.xml | 2 +- .../qemuxml2argv-input-usbmouse.args | 2 +- .../qemuxml2argv-input-usbtablet.args | 2 +- .../qemuxml2argv-pseries-usb-kbd.args | 2 +- .../qemuxml2argv-serial-spiceport.args | 2 +- .../qemuxml2argv-smartcard-controller.args | 2 +- .../qemuxml2argv-smartcard-host-certificates.args | 2 +- .../qemuxml2argv-smartcard-host.args | 2 +- ...emuxml2argv-smartcard-passthrough-spicevmc.args | 2 +- .../qemuxml2argv-smartcard-passthrough-tcp.args | 2 +- .../qemuxml2argv-sound-device.args | 2 +- .../qemuxml2argv-usb-hub-autoadd.args | 28 ++ .../qemuxml2argv-usb-hub-autoadd.xml | 23 + .../qemuxml2argv-usb-hub-conflict.xml | 22 + .../qemuxml2argv-usb-long-port-path.args | 27 ++ .../qemuxml2argv-usb-long-port-path.xml | 30 ++ .../qemuxml2argv-usb-port-autoassign.args | 28 ++ .../qemuxml2argv-usb-port-autoassign.xml | 27 ++ ...qemuxml2argv-usb-too-long-port-path-invalid.xml | 33 ++ tests/qemuxml2argvtest.c | 20 +- 53 files changed, 1139 insertions(+), 58 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub-autoadd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub-autoadd.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub-conflict.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-long-port-path.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-long-port-path.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-port-autoassign.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-port-autoassign.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-too-long-port-path-invalid.xml -- 2.7.3

3 30

[libvirt] [PATCH 2/2] Add new elements source, access and allocation
by Safka, JaroslavX 21 Jun '16

21 Jun '16

This change introduces support for preallocated shared file descriptor based memory backing. It allows vhost-user to be used without hugepages. This is achieved by introducing 3 new sub elements to the memoryBacking element: source, access & allocation which will configure qemu commandline during VM startup accordingly. First patch adds parsing of elements and storing the values in mem structure. Second patch configures the qemu commandline on the base of values in mem structure. -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

2 1

[libvirt] [PATCH 0/7] Add APIs for individual vCPU state modification using the guest agent
by Peter Krempa 21 Jun '16

21 Jun '16

As a first step, add the guest-agent part. The real hotplug stuff will follow shortly. Please note that the setter API will be used as template for the real stuff too. Peter Krempa (7): rpcgen: Add support for generating funcs returning alloc'd typed params lib: Add API to query guest vcpu info using guest agent lib: Add API to set individual vcpu usage in the guest via guest agent virsh: Add command 'guestvcpus' implementing virDomain(GS)etGuestVcpus qemu: agent: Make setting of vcpus more robust qemu: Implement virDomainGetGuestVcpus qemu: Implement virDomainSetGuestVcpus include/libvirt/libvirt-domain.h | 10 ++ src/driver-hypervisor.h | 14 +++ src/libvirt-domain.c | 105 ++++++++++++++++++++ src/libvirt_public.syms | 2 + src/qemu/qemu_agent.c | 83 +++++++++++++--- src/qemu/qemu_agent.h | 2 + src/qemu/qemu_driver.c | 210 ++++++++++++++++++++++++++++++++++++--- src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 39 +++++++- src/remote_protocol-structs | 18 ++++ src/rpc/gendispatch.pl | 45 ++++++++- tests/qemuagenttest.c | 44 ++++---- tools/virsh-domain.c | 93 +++++++++++++++++ tools/virsh.pod | 10 ++ 14 files changed, 625 insertions(+), 52 deletions(-) -- 2.8.3

2 15

[libvirt] [PATCH v2] There are several cases where we do not handle transient pool destroy and cleanup correctly. For example:
by Jovanka Gulicoska 21 Jun '16

21 Jun '16

https://bugzilla.redhat.com/show_bug.cgi?id=1227475 Move the pool cleanup logic to a new function storagePoolSetInactive and use it consistently. --- src/storage/storage_driver.c | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index e2d729f..2f29292 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -77,6 +77,21 @@ static void storageDriverUnlock(void) } static void +storagePoolSetInactive(virStoragePoolObjPtr *pool) +{ + (*pool)->active = false; + + if ((*pool)->configFile == NULL) { + virStoragePoolObjRemove(&driver->pools, (*pool)); + *pool = NULL; + } else if ((*pool)->newDef) { + virStoragePoolDefFree((*pool)->def); + (*pool)->def = (*pool)->newDef; + (*pool)->newDef = NULL; + } +} + +static void storagePoolUpdateState(virStoragePoolObjPtr pool) { bool active; @@ -115,16 +130,19 @@ storagePoolUpdateState(virStoragePoolObjPtr pool) if (backend->refreshPool(NULL, pool) < 0) { if (backend->stopPool) backend->stopPool(NULL, pool); + active = false; virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to restart storage pool '%s': %s"), pool->def->name, virGetLastErrorMessage()); goto error; } + active = true; } - pool->active = active; ret = 0; error: + if (!active) + storagePoolSetInactive(&pool); if (ret < 0) { if (stateFile) unlink(stateFile); @@ -198,6 +216,7 @@ storageDriverAutostart(void) unlink(stateFile); if (backend->stopPool) backend->stopPool(conn, pool); + storagePoolSetInactive(&pool); virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to autostart storage pool '%s': %s"), pool->def->name, virGetLastErrorMessage()); @@ -737,8 +756,7 @@ storagePoolCreateXML(virConnectPtr conn, unlink(stateFile); if (backend->stopPool) backend->stopPool(conn, pool); - virStoragePoolObjRemove(&driver->pools, pool); - pool = NULL; + storagePoolSetInactive(&pool); goto cleanup; } @@ -1068,16 +1086,7 @@ storagePoolDestroy(virStoragePoolPtr obj) VIR_STORAGE_POOL_EVENT_STOPPED, 0); - pool->active = false; - - if (pool->configFile == NULL) { - virStoragePoolObjRemove(&driver->pools, pool); - pool = NULL; - } else if (pool->newDef) { - virStoragePoolDefFree(pool->def); - pool->def = pool->newDef; - pool->newDef = NULL; - } + storagePoolSetInactive(&pool); ret = 0; @@ -1197,13 +1206,7 @@ storagePoolRefresh(virStoragePoolPtr obj, pool->def->uuid, VIR_STORAGE_POOL_EVENT_STOPPED, 0); - pool->active = false; - - if (pool->configFile == NULL) { - virStoragePoolObjRemove(&driver->pools, pool); - pool = NULL; - } - goto cleanup; + storagePoolSetInactive(&pool); } event = virStoragePoolEventLifecycleNew(pool->def->name, -- 2.5.5

2 1

[libvirt] [PATCH 0/8] Add --in-place and --check to test-wrap-argv
by Ján Tomko 21 Jun '16

21 Jun '16

The --in-place parameter makes the invocation in testutils slightly nicer and --check makes syntax-check faster. Ján Tomko (8): test-wrap-argv: split out rewrap_line test-wrap-argv: split out rewrap_arg test-wrap-argv: return a string in rewrap_arg test-wrap-argv: use map and join instead of a for cycle test-wrap-argv: return a string in rewrap_line test-wrap-argv: hold a copy of the original file in an array test-wrap-argv: add --in-place parameter test-wrap-argv: add --check parameter cfg.mk | 12 +--- tests/test-wrap-argv.pl | 170 ++++++++++++++++++++++++++++++------------------ tests/testutils.c | 8 +-- 3 files changed, 108 insertions(+), 82 deletions(-) -- 2.7.3

2 10