- Devel - libvirt List Archives

[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 23 Jun '16

23 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

[libvirt] libvirt and VIR_WARN("cannot parse process status data")
by Vasiliy Tolstov 21 Jun '16

21 Jun '16

I have system with 3.19.3 kernel and libvirt 1.3.3 (version not matter because part of code not changed). When i'm try to get cpu stats via libvirt i have error in libvirt log, that says "cannot parse process status data" relevant code in src/qemu/qemu_driver.c in function qemuGetProcessInfo i'm add debut test to this function and in my case i have always fscanf != 4 qemu pid 7977 cat /proc/7977/stat 7977 (qemu-system-x86) S 1 7976 7976 0 -1 138420608 12728 0 0 0 4819 8249 0 0 20 0 7 0 51378692 4783886336 75779 18446744073709551615 139849472311296 139849478294132 140732912418880 140732912417952 139849400618495 0 268444224 4096 16963 18446744073709551615 0 0 17 5 0 0 15624 744 0 139849480394624 139849482248448 139849496641536 140732912421083 140732912422775 140732912422775 140732912422876 0 cat /proc/7977/task/7977/stat 7977 (qemu-system-x86) S 1 7976 7976 0 -1 138420608 12537 0 0 0 3917 7799 0 0 20 0 7 0 51378692 4783886336 75779 18446744073709551615 139849472311296 139849478294132 140732912418880 140732912417952 139849400618495 0 268444224 4096 16963 0 0 0 17 3 0 0 15624 0 0 139849480394624 139849482248448 139849496641536 140732912421083 140732912422775 140732912422775 140732912422876 0 cat /proc/7977/task/7979/stat 7979 (qemu-system-x86) S 1 7976 7976 0 -1 1077944384 20 0 0 0 0 0 0 0 20 0 7 0 51378696 4783886336 75779 18446744073709551615 139849472311296 139849478294132 140732912418880 139849260591832 139849400637449 0 2147221247 4096 16963 0 0 0 -1 6 0 0 0 0 0 139849480394624 139849482248448 139849496641536 140732912421083 140732912422775 140732912422775 140732912422876 0 cat /proc/7977/task/7982/stat 7982 (CPU 0/KVM) S 1 7976 7976 0 -1 138420416 22 0 0 0 226 118 0 0 20 0 7 0 51378697 4783886336 75779 18446744073709551615 139849472311296 139849478294132 140732912418880 139849222842936 139849400624151 0 2147220671 4096 16963 0 0 0 -1 5 0 0 0 196 0 139849480394624 139849482248448 139849496641536 140732912421083 140732912422775 140732912422775 140732912422876 0 Does somebody have time to fix this ? -- Vasiliy Tolstov, e-mail: v.tolstov(a)yoctocloud.net

2 1

[libvirt] [PATCH 0/3] Remove unused macros
by Ján Tomko 21 Jun '16

21 Jun '16

Ján Tomko (3): Remove unused SOL_NETLINK macro vbox: remove duplicate macros vsh: remove namespace poisoning src/util/virnetlink.c | 4 ---- src/vbox/vbox_driver.c | 2 -- src/vbox/vbox_network.c | 43 ------------------------------------------- tools/vsh.c | 6 ------ tools/vsh.h | 10 ---------- 5 files changed, 65 deletions(-) -- 2.7.3

2 8

[libvirt] [PATCH v5 0/3] qemu: expand domain memory statistics
by Maxim Nestratov 21 Jun '16

21 Jun '16

Changes since v1: * Enum numeration fixed * Macro getting "usage" field fixed Changes since v2: * previous patches were on wrong branch * qemu's stat name was "stat-available-memory" Changes since v3: * 3rd patch added Changes since v4: * Formatted and rephrased commit messages * fixed libvirt crash, caused by simultaneous incorrect QUERY job execution Derbyshev Dmitry (3): qemu: expand domain memory statistics with 'usable' qemu: expand domain memory statistics with 'last-update' timestamp qemu: return balloon statistics when all domain statistics reported include/libvirt/libvirt-domain.h | 11 ++++- src/libvirt-domain.c | 5 +++ src/qemu/qemu_driver.c | 95 +++++++++++++++++++++++++++++++--------- src/qemu/qemu_monitor_json.c | 24 ++++++---- tools/virsh-domain-monitor.c | 4 ++ 5 files changed, 108 insertions(+), 31 deletions(-) -- 2.4.3

2 6

[libvirt] qemu: cpu model definition problem
by Maxim Nestratov 21 Jun '16

21 Jun '16

Hi all, I've just encountered a problem with ability to live migrate a VM between hosts using the following cpu section in VM's xml: <cpu mode='custom' match='exact'> <model fallback='allow'>Haswell-noTSX</model> ... <feature policy='disable' name='rdrand'/> </cpu> The problem is that a VM with such a config crashes when it migrates from a host where 'rdrand' presents to a host where it is absent. This happens due to the fact that QEMU and libvirt have pretty different view on what 'Haswell-noTSX' is. Libvirt's description lacks some features, which present in QEMU description of this cpu model (e.g. 'rdrand'). It is impossible to disable features present on the host and different from QEMU's ones by current libvirt code, i.e. libvirt thinks that no use to disable something that doesn't exist. Of course, the problem in this case can be fixed just by adding missed features to 'Haswell-noTSX' model in cpu_map.xml to match what QEMU has, but it doesn't seem right because it will help just in this particular case, and in general, it will not be a solution because QEMU can change its cpu model definitions at any time and it does this from time to time. What libvirt might have done is: - either ask QEMU for cpu model definition and work with it, - or construct a command line for QEMU with required and disabled features without taking into account libvirt cpu_map.xml, i.e. always add '+xx' and '-yy' for features mentioned explicitly in domain xml. What do you think? Maxim

2 2

[libvirt] [PATCH] qemu: Fix typo pci-extender-bus -> pci-expander-bus
by Andrea Bolognani 21 Jun '16

21 Jun '16

--- Pushed as trivial. src/qemu/qemu_domain_address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 883264a..f42e7c0 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -1382,7 +1382,7 @@ qemuDomainAddressFindNewBusNr(virDomainDefPtr def) * bus and busNr of the next highest bus for the guest to assign a * unique bus number to each PCI bus that is a child of this * bus. Each PCI controller. On top of this, the pxb device (which - * implements the pci-extender-bus) includes a pci-bridge within + * implements the pci-expander-bus) includes a pci-bridge within * it, and that bridge also uses one bus number (so each pxb device * requires at least 2 bus numbers). * -- 2.7.4

1 0

[libvirt] [PATCH] virsh migrate: Fix positional parameters
by Jiri Denemark 21 Jun '16

21 Jun '16

Thanks to our smart option parser which automatically assigns positional parameters the following (previously working) command fails: virsh migrate test qemu+ssh://1.2.3.4/system tcp://1.2.3.4/ error: invalid argument: Unsupported compression method 'tcp://1.2.3.4/' We need to make sure new options are added at the end of the list rather than where they logically belong. Reported by Brian Rak. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tools/virsh-domain.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 02be58f..19c40b3 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9792,26 +9792,6 @@ static const vshCmdOptDef opts_migrate[] = { .type = VSH_OT_BOOL, .help = N_("compress repeated pages during live migration") }, - {.name = "comp-methods", - .type = VSH_OT_STRING, - .help = N_("comma separated list of compression methods to be used") - }, - {.name = "comp-mt-level", - .type = VSH_OT_INT, - .help = N_("compress level for multithread compression") - }, - {.name = "comp-mt-threads", - .type = VSH_OT_INT, - .help = N_("number of compression threads for multithread compression") - }, - {.name = "comp-mt-dthreads", - .type = VSH_OT_INT, - .help = N_("number of decompression threads for multithread compression") - }, - {.name = "comp-xbzrle-cache", - .type = VSH_OT_INT, - .help = N_("page cache size for xbzrle compression") - }, {.name = "auto-converge", .type = VSH_OT_BOOL, .help = N_("force convergence during live migration") @@ -9873,6 +9853,26 @@ static const vshCmdOptDef opts_migrate[] = { .type = VSH_OT_INT, .help = N_("port to use by target server for incoming disks migration") }, + {.name = "comp-methods", + .type = VSH_OT_STRING, + .help = N_("comma separated list of compression methods to be used") + }, + {.name = "comp-mt-level", + .type = VSH_OT_INT, + .help = N_("compress level for multithread compression") + }, + {.name = "comp-mt-threads", + .type = VSH_OT_INT, + .help = N_("number of compression threads for multithread compression") + }, + {.name = "comp-mt-dthreads", + .type = VSH_OT_INT, + .help = N_("number of decompression threads for multithread compression") + }, + {.name = "comp-xbzrle-cache", + .type = VSH_OT_INT, + .help = N_("page cache size for xbzrle compression") + }, {.name = NULL} }; -- 2.9.0

3 3

[libvirt] [PATCH] conf: limit chassisNr, and busNr to a minimum value of 1, not 0
by Laine Stump 21 Jun '16

21 Jun '16

In the case of chassisNr (used to set chassis_nr of a pci-bridge controller), 0 is reserved for / used by the pci[e]-root bus. In the base of busNr, a value of 0 would mean that the root bus had no places available to plug in new buses, including the pxb itself (the documentation I wrote for pxb even noted the limit of busNr as 1.254). NB: oddly, the "chassis" attribute, which is used for pcie-root-port and pcie-switch-downstream-port *can* be set to 0, since it's the combination of {chassis, slot} that needs to be unique, not chassis by itself (and slot 0 of pcie-root is reserved, while pcie-*-port can use *only* slot 0). This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1342962 --- docs/formatdomain.html.in | 2 +- src/conf/domain_conf.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index d181ffa..88db3bc 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3277,7 +3277,7 @@ control QEMU's "chassis_nr" option for the pci-bridge device (normally libvirt automatically sets this to the same value as the index attribute of the pci controller). If set, chassisNr - must be between 0 and 255. + must be between 1 and 255. </dd> <dt><code>chassis</code></dt> <dd> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 23ca236..9a6610b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8426,11 +8426,11 @@ virDomainControllerDefParseXML(xmlNodePtr node, chassisNr); goto error; } - if (def->opts.pciopts.chassisNr < 0 || + if (def->opts.pciopts.chassisNr < 1 || def->opts.pciopts.chassisNr > 255) { virReportError(VIR_ERR_XML_ERROR, _("PCI controller chassisNr '%s' out of range " - "- must be 0-255"), + "- must be 1-255"), chassisNr); goto error; } @@ -8477,11 +8477,11 @@ virDomainControllerDefParseXML(xmlNodePtr node, busNr); goto error; } - if (def->opts.pciopts.busNr < 0 || + if (def->opts.pciopts.busNr < 1 || def->opts.pciopts.busNr > 254) { virReportError(VIR_ERR_XML_ERROR, _("PCI controller busNr '%s' out of range " - "- must be 0-254"), + "- must be 1-254"), busNr); goto error; } -- 2.5.5

2 1

[libvirt] [PATCH 1/1] perf: add more perf events support
by Qiaowei Ren 21 Jun '16

21 Jun '16

With current perf framework, this patch adds support to more perf events, including cache missing, cache peference, cpu cycles, instrction, etc.. Signed-off-by: Qiaowei Ren <qiaowei.ren(a)intel.com> --- include/libvirt/libvirt-domain.h | 39 ++++++++++++++++++++++++ src/libvirt-domain.c | 8 +++++ src/qemu/qemu_driver.c | 23 +++++++------- src/util/virperf.c | 65 +++++++++++++++++++++++++++++++++++++++- src/util/virperf.h | 4 +++ 5 files changed, 126 insertions(+), 13 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index cba4fa5..99c4c48 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -1928,6 +1928,45 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); */ # define VIR_PERF_PARAM_MBML "mbml" +/** + * VIR_PERF_PARAM_CACHE_MISSES: + * + * Macro for typed parameter name that represents cache_misses perf + * event which can be used to measure the amount of cache missing by + * applications running on the platform. It corresponds to the + * "perf.cache_misses" field in the *Stats APIs. + */ +# define VIR_PERF_PARAM_CACHE_MISSES "cache_misses" + +/** + * VIR_PERF_PARAM_CACHE_REFERENCES: + * + * Macro for typed parameter name that represents cache_peferences + * perf event which can be used to measure the amount of cache hit + * by applications running on the platform. It corresponds to the + * "perf.cache_peferences" field in the *Stats APIs. + */ +# define VIR_PERF_PARAM_CACHE_REFERENCES "cache_peferences" + +/** + * VIR_PERF_PARAM_INSTRUCTIONS: + * + * Macro for typed parameter name that represents instructions perf + * event which can be used to measure the amount of instructions + * by applications running on the platform. It corresponds to the + * "perf.instructions" field in the *Stats APIs. + */ +# define VIR_PERF_PARAM_INSTRUCTIONS "instructions" + +/** + * VIR_PERF_PARAM_CPU_CYCLES: + * + * Macro for typed parameter name that represents cpu_cycles perf event + * which can be used to measure how many cycles one instruction needs. + * It corresponds to the "perf.cpu_cycles" field in the *Stats APIs. + */ +# define VIR_PERF_PARAM_CPU_CYCLES "cpu_cycles" + int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, int *nparams, diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 73ae369..ef71b31 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11452,6 +11452,14 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * "perf.mbml" - the amount of data (bytes/s) sent through the memory controller * on the socket as unsigned long long. It is produced by mbml * perf event. + * "perf.cache_misses" - the amount of cache missing as unsigned long long. + * It is produced by cache_misses perf event. + * "perf.cache_peferences" - the amount of cache hit as unsigned long long. + * It is produced by cache_peferences perf event. + * "perf.instructions" - the amount of instructions as unsigned long long. + * It is produced by instructions perf event. + * "perf.cpu_cycles" - the amount of cycles one instruction needs as unsigned + * long long. It is produced by cpu_cycles perf event. * * Note that entire stats groups or individual stat fields may be missing from * the output in case they are not supported by the given hypervisor, are not diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 10d3e3d..d465ec5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9756,6 +9756,10 @@ qemuDomainSetPerfEvents(virDomainPtr dom, VIR_PERF_PARAM_CMT, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_MBMT, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_MBML, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_CACHE_MISSES, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_CACHE_REFERENCES, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_INSTRUCTIONS, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_CPU_CYCLES, VIR_TYPED_PARAM_BOOLEAN, NULL) < 0) return -1; @@ -19071,10 +19075,10 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, #undef QEMU_ADD_COUNT_PARAM static int -qemuDomainGetStatsPerfRdt(virPerfPtr perf, - virPerfEventType type, - virDomainStatsRecordPtr record, - int *maxparams) +qemuDomainGetStatsPerfOneEvent(virPerfPtr perf, + virPerfEventType type, + virDomainStatsRecordPtr record, + int *maxparams) { char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; uint64_t value = 0; @@ -19110,14 +19114,9 @@ qemuDomainGetStatsPerf(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, if (!virPerfEventIsEnabled(priv->perf, i)) continue; - switch (i) { - case VIR_PERF_EVENT_CMT: - case VIR_PERF_EVENT_MBMT: - case VIR_PERF_EVENT_MBML: - if (qemuDomainGetStatsPerfRdt(priv->perf, i, record, maxparams) < 0) - goto cleanup; - break; - } + if (qemuDomainGetStatsPerfOneEvent(priv->perf, i, + record, maxparams) < 0) + goto cleanup; } ret = 0; diff --git a/src/util/virperf.c b/src/util/virperf.c index 450b3ba..38f2158 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -38,7 +38,9 @@ VIR_LOG_INIT("util.perf"); #define VIR_FROM_THIS VIR_FROM_PERF VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, - "cmt", "mbmt", "mbml"); + "cmt", "mbmt", "mbml", + "cache_misses", "cache_peferences", + "instructions", "cpu_cycles"); struct virPerfEvent { int type; @@ -186,6 +188,60 @@ virPerfRdtEnable(virPerfEventPtr event, return -1; } +static int +virPerfGeneralEnable(virPerfEventPtr event, + pid_t pid) +{ + struct perf_event_attr attr; + + memset(&attr, 0, sizeof(attr)); + attr.size = sizeof(attr); + attr.inherit = 1; + attr.disabled = 1; + attr.enable_on_exec = 0; + + switch (event->type) { + case VIR_PERF_EVENT_CACHE_MISSES: + attr.type = PERF_TYPE_HARDWARE; + attr.config = PERF_COUNT_HW_CACHE_MISSES; + break; + case VIR_PERF_EVENT_CACHE_REFERENCES: + attr.type = PERF_TYPE_HARDWARE; + attr.config = PERF_COUNT_HW_CACHE_REFERENCES; + break; + case VIR_PERF_EVENT_INSTRUCTIONS: + attr.type = PERF_TYPE_HARDWARE; + attr.config = PERF_COUNT_HW_INSTRUCTIONS; + break; + case VIR_PERF_EVENT_CPU_CYCLES: + attr.type = PERF_TYPE_HARDWARE; + attr.config = PERF_COUNT_HW_CPU_CYCLES; + break; + } + + event->fd = syscall(__NR_perf_event_open, &attr, pid, -1, -1, 0); + if (event->fd < 0) { + virReportSystemError(errno, + _("Unable to open perf event for %s"), + virPerfEventTypeToString(event->type)); + goto error; + } + + if (ioctl(event->fd, PERF_EVENT_IOC_ENABLE) < 0) { + virReportSystemError(errno, + _("Unable to enable perf event for %s"), + virPerfEventTypeToString(event->type)); + goto error; + } + + event->enabled = true; + return 0; + + error: + VIR_FORCE_CLOSE(event->fd); + return -1; +} + int virPerfEventEnable(virPerfPtr perf, virPerfEventType type, @@ -202,6 +258,13 @@ virPerfEventEnable(virPerfPtr perf, if (virPerfRdtEnable(event, pid) < 0) return -1; break; + case VIR_PERF_EVENT_CACHE_MISSES: + case VIR_PERF_EVENT_CACHE_REFERENCES: + case VIR_PERF_EVENT_INSTRUCTIONS: + case VIR_PERF_EVENT_CPU_CYCLES: + if (virPerfGeneralEnable(event, pid) < 0) + return -1; + break; case VIR_PERF_EVENT_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected perf event type=%d"), type); diff --git a/src/util/virperf.h b/src/util/virperf.h index 769e85a..2cab339 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -28,6 +28,10 @@ typedef enum { VIR_PERF_EVENT_CMT, VIR_PERF_EVENT_MBMT, VIR_PERF_EVENT_MBML, + VIR_PERF_EVENT_CACHE_MISSES, + VIR_PERF_EVENT_CACHE_REFERENCES, + VIR_PERF_EVENT_INSTRUCTIONS, + VIR_PERF_EVENT_CPU_CYCLES, VIR_PERF_EVENT_LAST } virPerfEventType; -- 1.9.1

3 7

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

20 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 | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index e2d729f..74af35d 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; @@ -143,6 +158,7 @@ storagePoolUpdateAllState(void) virStoragePoolObjPtr pool = driver->pools.objs[i]; virStoragePoolObjLock(pool); + storagePoolSetInactive(pool); storagePoolUpdateState(pool); virStoragePoolObjUnlock(pool); } @@ -198,6 +214,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,7 +754,7 @@ storagePoolCreateXML(virConnectPtr conn, unlink(stateFile); if (backend->stopPool) backend->stopPool(conn, pool); - virStoragePoolObjRemove(&driver->pools, pool); + storagePoolSetInactive(pool); pool = NULL; goto cleanup; } @@ -1068,16 +1085,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 +1205,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] virsh: introduce name-uuid for list command
by Chen Hanxiao 20 Jun '16

20 Jun '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> This patch will show both name and UUID of domain: Id Name State UUID --------------------------------------------------------------------------------------- 3 f23 running 918f1dd6-b19f-412b-ba17-d113bad89af8 Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- tools/virsh-domain-monitor.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 0a93949..32e4ea4 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1793,6 +1793,10 @@ static const vshCmdOptDef opts_list[] = { .type = VSH_OT_BOOL, .help = N_("show domain title") }, + {.name = "name-uuid", + .type = VSH_OT_BOOL, + .help = N_("show domain name and uuid") + }, {.name = NULL} }; @@ -1807,6 +1811,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd) bool optTable = vshCommandOptBool(cmd, "table"); bool optUUID = vshCommandOptBool(cmd, "uuid"); bool optName = vshCommandOptBool(cmd, "name"); + bool optNameUuid = vshCommandOptBool(cmd, "name-uuid"); size_t i; char *title; char uuid[VIR_UUID_STRING_BUFLEN]; @@ -1844,10 +1849,10 @@ cmdList(vshControl *ctl, const vshCmd *cmd) FILTER("state-shutoff", VIR_CONNECT_LIST_DOMAINS_SHUTOFF); FILTER("state-other", VIR_CONNECT_LIST_DOMAINS_OTHER); - if (optTable + optName + optUUID > 1) { + if (optTable + optName + optUUID + optNameUuid > 1) { vshError(ctl, "%s", - _("Only one argument from --table, --name and --uuid " - "may be specified.")); + _("Only one argument from --table, --name, --uuid " + "and --name-uuid may be specified.")); return false; } @@ -1864,6 +1869,12 @@ cmdList(vshControl *ctl, const vshCmd *cmd) _("Id"), _("Name"), _("State"), _("Title"), "-----------------------------------------" "-----------------------------------------"); + else if (optNameUuid) + vshPrintExtra(ctl, " %-5s %-30s %-10s %-36s\n%s\n", + _("Id"), _("Name"), _("State"), _("UUID"), + "-----------------------------------------" + "-----------------------------------------" + "----"); else vshPrintExtra(ctl, " %-5s %-30s %s\n%s\n", _("Id"), _("Name"), _("State"), @@ -1901,6 +1912,16 @@ cmdList(vshControl *ctl, const vshCmd *cmd) title); VIR_FREE(title); + } else if (optNameUuid) { + if (virDomainGetUUIDString(dom, uuid) < 0) { + vshError(ctl, "%s", _("Failed to get domain's UUID")); + goto cleanup; + } + vshPrint(ctl, " %-5s %-30s %-10s %-36s\n", id_buf, + virDomainGetName(dom), + state == -2 ? _("saved") + : virshDomainStateToString(state), + uuid); } else { vshPrint(ctl, " %-5s %-30s %s\n", id_buf, virDomainGetName(dom), -- 1.8.3.1

4 6

[libvirt] [PATCH v3 0/4] util: Make failure to get supplementary groups non-fatal
by Peter Krempa 20 Jun '16

20 Jun '16

Changes: - New patches fixing few problems in virt-login-shell found while modifying the original patch. - split out addition of @quiet - rest of review feedback Peter Krempa (4): tools: virt-login-shell: Fix group list bounds checking tools: virt-login-shell: Fix cut'n'paste mistake in error message util: Add option not to report errors in virGetUserEnt util: Make failure to get supplementary group list for a uid non-fatal src/util/virutil.c | 49 ++++++++++++++++++++++++++++-------------------- tools/virt-login-shell.c | 9 +++++---- 2 files changed, 34 insertions(+), 24 deletions(-) -- 2.8.3

3 8

[libvirt] [PATCH 0/6] Remove 'make check' heating
by Ján Tomko 20 Jun '16

20 Jun '16

https://xkcd.com/1172/ Ján Tomko (6): Remove virsh-all tests: mock gnutls_dh_params_generate2 Introduce virsh self-test Remove virsh-synopsis Drop virrandomtest Mark virsh-optparse as expensive .gitignore | 1 + tests/Makefile.am | 8 +--- tests/virnettlscontexttest.c | 2 +- tests/virnettlssessiontest.c | 2 +- tests/virrandommock.c | 51 +++++++++++++++++++++ tests/virrandomtest.c | 86 ------------------------------------ tests/virsh-optparse | 2 + tests/{virsh-all => virsh-self-test} | 31 ++++--------- tests/virsh-synopsis | 44 ------------------ tools/virsh.c | 50 +++++++++++++++++++++ 10 files changed, 115 insertions(+), 162 deletions(-) delete mode 100644 tests/virrandomtest.c rename tests/{virsh-all => virsh-self-test} (54%) delete mode 100755 tests/virsh-synopsis -- 2.7.3

2 12

[libvirt] [PATCH 0/2] Fix leak and labels in virDomainGraphicsListensParseXML
by Peter Krempa 20 Jun '16

20 Jun '16

Peter Krempa (2): conf: Fix memory leak in graphics XML parser conf: Fix label name in virDomainGraphicsListensParseXML src/conf/domain_conf.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 2.8.3

2 3

[libvirt] [PATCH v2 0/7] Redirdev attach & detach
by Michal Privoznik 20 Jun '16

20 Jun '16

v2 of: https://www.redhat.com/archives/libvir-list/2016-June/msg00615.html diff to v1: - Peter's review worked in - Pushed ACKed patches - Found one silly bug (patch 7/7) Michal Privoznik (7): domain_conf: Validate redirdev after parsing virDomainRedirdevDef: Introduce find & remove routines virDomainDeviceInfoIterateInternal: Iterate through redirdevs too qemuDomainAttachDeviceConfig: Allow redirdev coldplug qemuDomainDetachDeviceConfig: Allow cold unplug of redirdevs qemuDomainRemoveDevice: Enable live redirdev detach qemuDomainDetachDeviceFlags: Pass live device XML to live detach code src/conf/domain_conf.c | 105 ++++++++++++++++++++++++++++++++++++----------- src/conf/domain_conf.h | 4 ++ src/libvirt_private.syms | 2 + src/qemu/qemu_driver.c | 35 ++++++++++++---- src/qemu/qemu_hotplug.c | 76 +++++++++++++++++++++++++++++++++- src/qemu/qemu_hotplug.h | 3 ++ 6 files changed, 193 insertions(+), 32 deletions(-) -- 2.8.4

3 16

[libvirt] gnulib and 32-bit libvirt build, rpl_canonicalize_file_name
by Ian Jackson 20 Jun '16

20 Jun '16

The Xen Project's automated test (CI) system has reported a build failure in libvirt; libvirt uses gnulib. osstest has bisected it to a specific gnulib commit. (Email from osstest is quoted below.) The error message is: ../gnulib/lib/.libs/libgnu.a(canonicalize-lgpl.o): In function `rpl_canonicalize_file_name': /home/osstest/build.95966.build-i386-libvirt/libvirt/gnulib/lib/canonicalize-lgpl.c:400: multiple definition of `rpl_canonicalize_file_name' .libs/virpcimock_la-virpcimock.o:/home/osstest/build.95966.build-i386-libvirt/libvirt/tests/virpcimock.c:954: first defined here collect2: error: ld returned 1 exit status Do you already know about this ? Would you like us to submit a patch to gnulib ? Thanks, Ian. osstest service owner writes ("[qemu-upstream-4.3-testing bisection] complete build-i386-libvirt"): > branch xen-4.3-testing > xenbranch xen-4.3-testing > job build-i386-libvirt > testid libvirt-build > > Tree: libvirt git://xenbits.xen.org/libvirt.git > Tree: libvirt_gnulib git://git.sv.gnu.org/gnulib.git > Tree: qemu git://xenbits.xen.org/qemu-xen-traditional.git > Tree: qemuu git://xenbits.xen.org/qemu-xen.git > Tree: xen git://xenbits.xen.org/xen.git > > *** Found and reproduced problem changeset *** > > Bug is in tree: libvirt_gnulib git://git.sv.gnu.org/gnulib.git > Bug introduced: 54615b95ff238e235e806855efc46a9abad09f2e > Bug not present: e78f894d0bdc770101bc040613f4ea94e45f38f7 > Last fail repro: http://logs.test-lab.xenproject.org/osstest/logs/95966/ > > > commit 54615b95ff238e235e806855efc46a9abad09f2e > Author: Paul Eggert <eggert(a)cs.ucla.edu> > Date: Sat Feb 6 18:11:48 2016 -0800 > > misc: port better to gcc -fsanitize=address > > Without these patches, ./configure CFLAGS='-fsanitize=address' > would compute incorrect values. This patch fixes some (but not all) > test failures with recent glibc, with this configuration. > * m4/acl.m4 (gl_ACL_GET_FILE): > * m4/calloc.m4 (_AC_FUNC_CALLOC_IF): > * m4/canonicalize.m4 (gl_FUNC_REALPATH_WORKS): > * m4/d-ino.m4 (gl_CHECK_TYPE_STRUCT_DIRENT_D_INO): > * m4/duplocale.m4 (gl_FUNC_DUPLOCALE): > * m4/getcwd.m4 (gl_FUNC_GETCWD_NULL): > * m4/getdelim.m4 (gl_FUNC_GETDELIM): > * m4/getgroups.m4 (gl_FUNC_GETGROUPS): > * m4/getline.m4 (gl_FUNC_GETLINE): > * m4/malloc.m4 (_AC_FUNC_MALLOC_IF): > * m4/realloc.m4 (_AC_FUNC_REALLOC_IF): > * m4/regex.m4 (gl_REGEX): > * m4/strndup.m4 (gl_FUNC_STRNDUP): > * tests/test-calloc-gnu.c (main): > * tests/test-duplocale.c (main): > * tests/test-getgroups.c (main): > * tests/test-getline.c (main): > * tests/test-inttostr.c (main): > * tests/test-localename.c (test_locale_name) > (test_locale_name_thread, test_locale_name_environ) > (test_locale_name_default): > * tests/test-regex.c (main): > * tests/test-setlocale1.c (main): > * tests/test-stat.h (test_stat_func): > Free heap-allocated storage before exiting. > * m4/asm-underscore.m4 (gl_ASM_SYMBOL_PREFIX): > Don't match *_foo symbols inserted by AddressSanitizer. > * tests/test-regex.c, tests/test-stat.c: Include stdlib.h, for 'free'. > > > For bisection revision-tuple graph see: > http://logs.test-lab.xenproject.org/osstest/results/bisect/qemu-upstream-4.… > Revision IDs in each graph node refer, respectively, to the Trees above. > > ---------------------------------------- > Running cs-bisection-step --graph-out=/home/logs/results/bisect/qemu-upstream-4.3-testing/build-i386-libvirt.libvirt-build --summary-out=tmp/95966.bisection-summary --basis-template=80927 --blessings=real,real-bisect qemu-upstream-4.3-testing build-i386-libvirt libvirt-build > Searching for failure / basis pass: > 95930 fail [host=fiano0] / 80927 [host=pinot1] 80730 [host=baroque0] 77983 [host=pinot0] 77930 [host=italia0] 77853 [host=italia1] 62112 [host=nocera1] 62045 [host=nocera1] 61805 [host=nocera1] 61729 [host=nocera0] 61620 [host=pinot1] 60903 [host=nocera1] 60700 [host=nocera0] 60676 [host=nocera0] 60159 [host=italia1] 58381 [host=pinot1] 57828 [host=nocera0] 56721 [host=nocera1] 56679 [host=nocera0] 56637 [host=nocera1] 56604 [host=nocera1] 56583 [host=italia1] 56556 [host=nocera0] 56506 [host=nocera1] 56427 [host=nocera1] 56373 [host=nocera0] 55875 [host=nocera1] 50282 [host=fiano1] 36518 [host=scape-moth] 31652 [host=lace-bug] template as basis? using template as basis. > Failure / basis pass flights: 95930 / 80927 > (tree with no url: seabios) > Tree: libvirt git://xenbits.xen.org/libvirt.git > Tree: libvirt_gnulib git://git.sv.gnu.org/gnulib.git > Tree: qemu git://xenbits.xen.org/qemu-xen-traditional.git > Tree: qemuu git://xenbits.xen.org/qemu-xen.git > Tree: xen git://xenbits.xen.org/xen.git > Latest eac167e2610d3e59b32f7ec7ba78cbc8c420a425 246b3b28808ee5f4664be674dce573af9497fc7a b96625e17169a7958575c2fb41499bb9ea2c212e 12e8fccf5b5460be7aecddc71d27eceaba6e1f15 8fa31952e2d08ef63897c43b5e8b33475ebf5d93 > Basis pass 6ec319b84f67d72bf59fe7e0fd41d88ee9c393c7 6cc32c63e80bc1a30c521b2f07f2b54909b59892 b96625e17169a7958575c2fb41499bb9ea2c212e 10c1b763c26feb645627a1639e722515f3e1e876 ac0cc84d7bdfc111d47236356e5d06b5681a1dd6 > Generating revisions with ./adhoc-revtuple-generator git://xenbits.xen.org/libvirt.git#6ec319b84f67d72bf59fe7e0fd41d88ee9c393c7-… git://git.sv.gnu.org/gnulib.git#6cc32c63e80bc1a30c521b2f07f2b54909b59892-24… git://xenbits.xen.org/qemu-xen-traditional.git#b96625e17169a7958575c2fb4149… git://xenbits.xen.org/qemu-xen.git#10c1b763c26feb645627a1639e722515f3e1e876… git://xenbits.xen.org/xen.git#ac0cc84d7bdfc111d47236356e5d06b5681a1dd6-8fa3… > adhoc-revtuple-generator: tree discontiguous: libvirt > Loaded 12327 nodes in revision graph > Searching for test results: > 80730 [host=baroque0] > 80927 [host=pinot1] > 95874 fail irrelevant > 95911 fail irrelevant > 95852 fail irrelevant > 95895 fail irrelevant > 95954 fail 6ec319b84f67d72bf59fe7e0fd41d88ee9c393c7 7ac276b42cbeb648c6b11e5637b2b05be951fd6d b96625e17169a7958575c2fb41499bb9ea2c212e 10c1b763c26feb645627a1639e722515f3e1e876 ac0cc84d7bdfc111d47236356e5d06b5681a1dd6 > 95928 pass 6ec319b84f67d72bf59fe7e0fd41d88ee9c393c7 6cc32c63e80bc1a30c521b2f07f2b54909b59892 b96625e17169a7958575c2fb41499bb9ea2c212e 10c1b763c26feb645627a1639e722515f3e1e876 ac0cc84d7bdfc111d47236356e5d06b5681a1dd6 > 95957 pass 6ec319b84f67d72bf59fe7e0fd41d88ee9c393c7 e78f894d0bdc770101bc040613f4ea94e45f38f7 b96625e17169a7958575c2fb41499bb9ea2c212e 10c1b763c26feb645627a1639e722515f3e1e876 ac0cc84d7bdfc111d47236356e5d06b5681a1dd6 > 95934 fail irrelevant > 95959 fail 6ec319b84f67d72bf59fe7e0fd41d88ee9c393c7 54615b95ff238e235e806855efc46a9abad09f2e b96625e17169a7958575c2fb41499bb9ea2c212e 10c1b763c26feb645627a1639e722515f3e1e876 ac0cc84d7bdfc111d47236356e5d06b5681a1dd6 > 95938 pass 6ec319b84f67d72bf59fe7e0fd41d88ee9c393c7 6cc32c63e80bc1a30c521b2f07f2b54909b59892 b96625e17169a7958575c2fb41499bb9ea2c212e 10c1b763c26feb645627a1639e722515f3e1e876 ac0cc84d7bdfc111d47236356e5d06b5681a1dd6 > 95941 fail irrelevant > 95960 pass 6ec319b84f67d72bf59fe7e0fd41d88ee9c393c7 e78f894d0bdc770101bc040613f4ea94e45f38f7 b96625e17169a7958575c2fb41499bb9ea2c212e 10c1b763c26feb645627a1639e722515f3e1e876 ac0cc84d7bdfc111d47236356e5d06b5681a1dd6 > 95943 fail 6ec319b84f67d72bf59fe7e0fd41d88ee9c393c7 fa2329eeae5ae80d0630f493b029297406b47237 b96625e17169a7958575c2fb41499bb9ea2c212e 10c1b763c26feb645627a1639e722515f3e1e876 404e83e055cb419efccbcb0c5c89476307a9ae46 > 95930 fail eac167e2610d3e59b32f7ec7ba78cbc8c420a425 246b3b28808ee5f4664be674dce573af9497fc7a b96625e17169a7958575c2fb41499bb9ea2c212e 12e8fccf5b5460be7aecddc71d27eceaba6e1f15 8fa31952e2d08ef63897c43b5e8b33475ebf5d93 > 95946 pass 6ec319b84f67d72bf59fe7e0fd41d88ee9c393c7 2b34f389a8a9a6ebfd514560369d91c9f6de7751 b96625e17169a7958575c2fb41499bb9ea2c212e 10c1b763c26feb645627a1639e722515f3e1e876 ac0cc84d7bdfc111d47236356e5d06b5681a1dd6 > 95962 fail 6ec319b84f67d72bf59fe7e0fd41d88ee9c393c7 54615b95ff238e235e806855efc46a9abad09f2e b96625e17169a7958575c2fb41499bb9ea2c212e 10c1b763c26feb645627a1639e722515f3e1e876 ac0cc84d7bdfc111d47236356e5d06b5681a1dd6 > 95949 fail eac167e2610d3e59b32f7ec7ba78cbc8c420a425 246b3b28808ee5f4664be674dce573af9497fc7a b96625e17169a7958575c2fb41499bb9ea2c212e 12e8fccf5b5460be7aecddc71d27eceaba6e1f15 8fa31952e2d08ef63897c43b5e8b33475ebf5d93 > 95965 pass 6ec319b84f67d72bf59fe7e0fd41d88ee9c393c7 e78f894d0bdc770101bc040613f4ea94e45f38f7 b96625e17169a7958575c2fb41499bb9ea2c212e 10c1b763c26feb645627a1639e722515f3e1e876 ac0cc84d7bdfc111d47236356e5d06b5681a1dd6 > 95950 fail 6ec319b84f67d72bf59fe7e0fd41d88ee9c393c7 cd9ecca8812571fc443688d11148f2768ededfa4 b96625e17169a7958575c2fb41499bb9ea2c212e 10c1b763c26feb645627a1639e722515f3e1e876 ac0cc84d7bdfc111d47236356e5d06b5681a1dd6 > 95953 pass 6ec319b84f67d72bf59fe7e0fd41d88ee9c393c7 cd6a45292cdb7b3c4b628f1cb0f199a02140ea7c b96625e17169a7958575c2fb41499bb9ea2c212e 10c1b763c26feb645627a1639e722515f3e1e876 ac0cc84d7bdfc111d47236356e5d06b5681a1dd6 > 95966 fail 6ec319b84f67d72bf59fe7e0fd41d88ee9c393c7 54615b95ff238e235e806855efc46a9abad09f2e b96625e17169a7958575c2fb41499bb9ea2c212e 10c1b763c26feb645627a1639e722515f3e1e876 ac0cc84d7bdfc111d47236356e5d06b5681a1dd6 > Searching for interesting versions > Result found: flight 95928 (pass), for basis pass > Result found: flight 95930 (fail), for basis failure > Repro found: flight 95938 (pass), for basis pass > Repro found: flight 95949 (fail), for basis failure > 0 revisions at 6ec319b84f67d72bf59fe7e0fd41d88ee9c393c7 e78f894d0bdc770101bc040613f4ea94e45f38f7 b96625e17169a7958575c2fb41499bb9ea2c212e 10c1b763c26feb645627a1639e722515f3e1e876 ac0cc84d7bdfc111d47236356e5d06b5681a1dd6 > No revisions left to test, checking graph state. > Result found: flight 95957 (pass), for last pass > Result found: flight 95959 (fail), for first failure > Repro found: flight 95960 (pass), for last pass > Repro found: flight 95962 (fail), for first failure > Repro found: flight 95965 (pass), for last pass > Repro found: flight 95966 (fail), for first failure > > *** Found and reproduced problem changeset *** > > Bug is in tree: libvirt_gnulib git://git.sv.gnu.org/gnulib.git > Bug introduced: 54615b95ff238e235e806855efc46a9abad09f2e > Bug not present: e78f894d0bdc770101bc040613f4ea94e45f38f7 > Last fail repro: http://logs.test-lab.xenproject.org/osstest/logs/95966/ > > > commit 54615b95ff238e235e806855efc46a9abad09f2e > Author: Paul Eggert <eggert(a)cs.ucla.edu> > Date: Sat Feb 6 18:11:48 2016 -0800 > > misc: port better to gcc -fsanitize=address > > Without these patches, ./configure CFLAGS='-fsanitize=address' > would compute incorrect values. This patch fixes some (but not all) > test failures with recent glibc, with this configuration. > * m4/acl.m4 (gl_ACL_GET_FILE): > * m4/calloc.m4 (_AC_FUNC_CALLOC_IF): > * m4/canonicalize.m4 (gl_FUNC_REALPATH_WORKS): > * m4/d-ino.m4 (gl_CHECK_TYPE_STRUCT_DIRENT_D_INO): > * m4/duplocale.m4 (gl_FUNC_DUPLOCALE): > * m4/getcwd.m4 (gl_FUNC_GETCWD_NULL): > * m4/getdelim.m4 (gl_FUNC_GETDELIM): > * m4/getgroups.m4 (gl_FUNC_GETGROUPS): > * m4/getline.m4 (gl_FUNC_GETLINE): > * m4/malloc.m4 (_AC_FUNC_MALLOC_IF): > * m4/realloc.m4 (_AC_FUNC_REALLOC_IF): > * m4/regex.m4 (gl_REGEX): > * m4/strndup.m4 (gl_FUNC_STRNDUP): > * tests/test-calloc-gnu.c (main): > * tests/test-duplocale.c (main): > * tests/test-getgroups.c (main): > * tests/test-getline.c (main): > * tests/test-inttostr.c (main): > * tests/test-localename.c (test_locale_name) > (test_locale_name_thread, test_locale_name_environ) > (test_locale_name_default): > * tests/test-regex.c (main): > * tests/test-setlocale1.c (main): > * tests/test-stat.h (test_stat_func): > Free heap-allocated storage before exiting. > * m4/asm-underscore.m4 (gl_ASM_SYMBOL_PREFIX): > Don't match *_foo symbols inserted by AddressSanitizer. > * tests/test-regex.c, tests/test-stat.c: Include stdlib.h, for 'free'. > > pnmtopng: 226 colors found > Revision graph left in /home/logs/results/bisect/qemu-upstream-4.3-testing/build-i386-libvirt.libvirt-build.{dot,ps,png,html,svg}. > ---------------------------------------- > 95966: tolerable ALL FAIL > > flight 95966 qemu-upstream-4.3-testing real-bisect [real] > http://logs.test-lab.xenproject.org/osstest/logs/95966/ > > Failures :-/ but no regressions. > > Tests which did not succeed, > including tests which could not be run: > build-i386-libvirt 5 libvirt-build fail baseline untested > > > jobs: > build-i386-libvirt fail > > > ------------------------------------------------------------ > sg-report-flight on osstest.test-lab.xenproject.org > logs: /home/logs/logs > images: /home/logs/images > > Logs, config files, etc. are available at > http://logs.test-lab.xenproject.org/osstest/logs > > Explanation of these reports, and of osstest in general, is at > http://xenbits.xen.org/gitweb/?p=osstest.git;a=blob;f=README.email;hb=master > http://xenbits.xen.org/gitweb/?p=osstest.git;a=blob;f=README;hb=master > > Test harness code can be found at > http://xenbits.xen.org/gitweb?p=osstest.git;a=summary >

2 2

[libvirt] [PATCH] util: fix a typo
by Chen Hanxiao 20 Jun '16

20 Jun '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> s/succcess/success Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/util/virfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 9d460b9..f47bf39 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -406,7 +406,7 @@ int virFileLock(int fd, bool shared, off_t start, off_t len, bool waitForLock) * NB the lock will also be released if any open file descriptor * pointing to the same file as @fd is closed * - * Returns 0 on succcess, or -errno on error + * Returns 0 on success, or -errno on error */ int virFileUnlock(int fd, off_t start, off_t len) { -- 1.8.3.1

2 1

[libvirt] [PATCH] docs: virsh: Added note for the dump command
by jsuchane＠redhat.com 20 Jun '16

20 Jun '16

From: Jaroslav Suchanek <jsuchane(a)redhat.com> Crash dump in a old kvmdump format is being obsolete and cannot be loaded and processed by crash utility since its version 6.1.0. A --memory-only option is required in order to produce valid ELF file which can be later processed by the crash utility. A new note is added to the dump command description. --- tools/virsh.pod | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/virsh.pod b/tools/virsh.pod index 98fed76..8e3ba69 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1355,6 +1355,11 @@ B<dump> command. I<--verbose> displays the progress of dump. NOTE: Some hypervisors may require the user to manually ensure proper permissions on file and path specified by argument I<corefilepath>. +NOTE: Crash dump in a old kvmdump format is being obsolete and cannot be loaded +and processed by crash utility since its version 6.1.0. A --memory-only option +is required in order to produce valid ELF file which can be later processed by +the crash utility. + =item B<dumpxml> I<domain> [I<--inactive>] [I<--security-info>] [I<--update-cpu>] [I<--migratable>] -- 1.8.3.1

2 1

[libvirt] [PATCH 1/7] add VirtualBox 5 C API to libvirt
by Martin Pietsch 20 Jun '16

20 Jun '16

add VirtualBox 5 C API to libvirt

1 0

[libvirt] [PATCH 2/7] add VirtualBox 5 support to vbox_tmpl.c
by Martin Pietsch 20 Jun '16

20 Jun '16

add VirtualBox 5 support to vbox_tmpl.c

1 0

[libvirt] [PATCH 3/7] add VirtualBox5 support to vbox_uniformed_api.h
by Martin Pietsch 20 Jun '16

20 Jun '16

add VirtualBox5 support to vbox_uniformed_api.h

1 0

[libvirt] [PATCH 4/7] add vbox_V5_0.c for libvirt support of VirtualBox 5
by Martin Pietsch 20 Jun '16

20 Jun '16

add vbox_V5_0.c for libvirt support of VirtualBox 5

1 0

[libvirt] [PATCH 5/7] append vbox_V5_0.c and vbox_CAPI_v5_0.h to src/Makefile.am
by Martin Pietsch 20 Jun '16

20 Jun '16

append vbox_V5_0.c and vbox_CAPI_v5_0.h to src/Makefile.am

1 0

[libvirt] [PATCH 6/7] add VirtualBox 5 support to vbox_common.h
by Martin Pietsch 20 Jun '16

20 Jun '16

add VirtualBox 5 support to vbox_common.h

1 0

[libvirt] [PATCH 7/7] add VirtualBox 5 support to vbox_storage.c
by Martin Pietsch 20 Jun '16

20 Jun '16

add VirtualBox 5 support to vbox_storage.c

1 0

[libvirt] [PATCH v2] maint: Switch to xz compressed PAX release archives
by Andrea Bolognani 20 Jun '16

20 Jun '16

This allows us to produce releases that are roughly a third in size, have no limitation on path length, and are still readable by all supported platforms. --- Changes from [v1]: * Update all references to .tar.gz, including spec files, scripts and documentation (thanks Dan) * Fix typo lenght -> length (thanks Ján) [v1] https://www.redhat.com/archives/libvir-list/2016-June/msg00974.html .gitignore | 2 +- Makefile.am | 2 +- autobuild.sh | 2 +- configure.ac | 2 +- docs/compiling.html.in | 2 +- docs/downloads.html.in | 4 ++-- libvirt.spec.in | 2 +- mingw-libvirt.spec.in | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 7fd9963..39c0423 100644 --- a/.gitignore +++ b/.gitignore @@ -88,7 +88,7 @@ /gnulib/tests/* /include/libvirt/libvirt-common.h /libtool -/libvirt-*.tar.gz +/libvirt-*.tar.xz /libvirt-[0-9]* /libvirt*.pc /libvirt.spec diff --git a/Makefile.am b/Makefile.am index da07e6c..4b4aad3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,7 +63,7 @@ $(top_srcdir)/HACKING: $(top_srcdir)/docs/hacking1.xsl \ > $@-t && mv $@-t $@ ; fi; rpm: clean - @(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz) + @(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.xz) check-local: all tests diff --git a/autobuild.sh b/autobuild.sh index 4d9f616..2143479 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -56,7 +56,7 @@ exec 3>&- test "$st" = 0 test -x /usr/bin/lcov && make cov -rm -f *.tar.gz +rm -f *.tar.xz make dist if test -n "$AUTOBUILD_COUNTER" ; then diff --git a/configure.ac b/configure.ac index 0114149..7d16e5a 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ AH_BOTTOM([#include <config-post.h>]) AC_CONFIG_MACRO_DIR([m4]) dnl Make automake keep quiet about wildcards & other GNUmake-isms; also keep dnl quiet about the fact that we intentionally cater to automake 1.9 -AM_INIT_AUTOMAKE([-Wno-portability -Wno-obsolete tar-ustar subdir-objects]) +AM_INIT_AUTOMAKE([-Wno-portability -Wno-obsolete tar-pax no-dist-gzip dist-xz subdir-objects]) dnl older automake's default of ARFLAGS=cru is noisy on newer binutils; dnl we don't really need the 'u' even in older toolchains. Then there is dnl older libtool, which spelled it AR_FLAGS diff --git a/docs/compiling.html.in b/docs/compiling.html.in index aff5487..d2a3f15 100644 --- a/docs/compiling.html.in +++ b/docs/compiling.html.in @@ -13,7 +13,7 @@ </p> <pre> - $ gunzip -c libvirt-x.x.x.tar.gz | tar xvf - + $ xz -c libvirt-x.x.x.tar.xz | tar xvf - $ cd libvirt-x.x.x $ ./configure</pre> diff --git a/docs/downloads.html.in b/docs/downloads.html.in index f213b29..1a3400a 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -28,8 +28,8 @@ </p> <ul> - <li><a href="ftp://libvirt.org/libvirt/libvirt-git-snapshot.tar.gz">libvirt.org FTP server</a></li> - <li><a href="http://libvirt.org/sources/libvirt-git-snapshot.tar.gz">libvirt.org HTTP server</a></li> + <li><a href="ftp://libvirt.org/libvirt/libvirt-git-snapshot.tar.xz">libvirt.org FTP server</a></li> + <li><a href="http://libvirt.org/sources/libvirt-git-snapshot.tar.xz">libvirt.org HTTP server</a></li> </ul> <h2><a name="schedule">Primary release schedule</a></h2> diff --git a/libvirt.spec.in b/libvirt.spec.in index ee6162e..6b3e888 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -225,7 +225,7 @@ URL: http://libvirt.org/ %if %(echo %{version} | grep -o \\. | wc -l) == 3 %define mainturl stable_updates/ %endif -Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz +Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 6f95832..e808839 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -30,7 +30,7 @@ Summary: MinGW Windows libvirt virtualization library License: LGPLv2+ Group: Development/Libraries URL: http://libvirt.org/ -Source0: ftp://libvirt.org/libvirt/libvirt-%{version}.tar.gz +Source0: ftp://libvirt.org/libvirt/libvirt-%{version}.tar.xz BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw64-filesystem >= 95 -- 2.5.5

4 11

[libvirt] [PATCH] qemu: Don't use legacy USB for aarch64 mach-virt guests
by Andrea Bolognani 20 Jun '16

20 Jun '16

The '-usb' option doesn't have any effect for aarch64 mach-virt guests, so the fact that it's currently enabled by default is not really causing any issue. However, that might change in the future (although unlikely), and having it as part of the QEMU command line can cause confusion to someone looking through the process list. Avoid it completely, like it's already happening for q35. --- This requires https://www.redhat.com/archives/libvir-list/2016-June/msg01157.html to apply cleanly, but it's not really related. Applying it on top of master instead should just be a matter of fixing a few trivial merge conflicts in the test suite. CC:ing Drew for extra assurance that doing this is indeed completely safe :) src/qemu/qemu_command.c | 1 + tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args | 3 +-- tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args | 3 +-- tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args | 3 +-- tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args | 1 - .../qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args | 1 - .../qemuxml2argv-aarch64-virtio-pci-manual-addresses.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args | 1 - 14 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4a8def1..6944129 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2875,6 +2875,7 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd, if (usbcontroller == 0 && !qemuDomainMachineIsQ35(def) && + !qemuDomainMachineIsVirt(def) && !ARCH_IS_S390(def->os.arch)) virCommandAddArg(cmd, "-usb"); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args index 3f05dfb..1de2ecf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args @@ -22,7 +22,6 @@ QEMU_AUDIO_DRV=none \ -append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ -dtb /aarch64.dtb \ -device virtio-serial-device,id=virtio-serial0 \ --usb \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args index 4ae3923..b394066 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args @@ -17,6 +17,5 @@ QEMU_AUDIO_DRV=none \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -boot c \ --usb \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args index 61ee5af..a16b8b6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args @@ -16,5 +16,4 @@ QEMU_AUDIO_DRV=none \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -no-acpi \ --boot c \ --usb +-boot c diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args index d3ac955..031a31e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args @@ -16,5 +16,4 @@ QEMU_AUDIO_DRV=none \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -no-acpi \ --boot c \ --usb +-boot c diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args index 27fa1f5..f078fd8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args @@ -16,5 +16,4 @@ QEMU_AUDIO_DRV=none \ -nodefaults \ -monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -no-acpi \ --boot c \ --usb +-boot c diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args index 23bb517..284aacf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args @@ -20,7 +20,6 @@ QEMU_AUDIO_DRV=none \ -kernel /arm.kernel \ -initrd /arm.initrd \ -append 'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \ --usb \ -drive file=/arm.raw,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ 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 3e6bee9..6c2a908 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 @@ -22,7 +22,6 @@ QEMU_AUDIO_DRV=none \ -append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ -dtb /aarch64.dtb \ -device virtio-serial-device,id=virtio-serial0 \ --usb \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args index 06a4733..ab45209 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args @@ -20,6 +20,5 @@ QEMU_AUDIO_DRV=none \ -kernel /aarch64.kernel \ -initrd /aarch64.initrd \ -append console=ttyAMA0 \ --usb \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -net user,vlan=0,name=hostnet0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args index 566bee2..1ed5462 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args @@ -22,7 +22,6 @@ QEMU_AUDIO_DRV=none \ -append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ -dtb /aarch64.dtb \ -device virtio-serial-device,id=virtio-serial0 \ --usb \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args index 566bee2..1ed5462 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args @@ -22,7 +22,6 @@ QEMU_AUDIO_DRV=none \ -append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ -dtb /aarch64.dtb \ -device virtio-serial-device,id=virtio-serial0 \ --usb \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.args index 4e5dbdb..8245854 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.args @@ -25,7 +25,6 @@ QEMU_AUDIO_DRV=none \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \ -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 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args index c736f60..d3e8efc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args @@ -21,7 +21,6 @@ QEMU_AUDIO_DRV=none \ -append 'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \ -dtb /arm.dtb \ -device virtio-serial-device,id=virtio-serial0 \ --usb \ -drive file=/arm.raw,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args index 0fd9107..42709c5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args @@ -21,5 +21,4 @@ QEMU_AUDIO_DRV=none \ -initrd /aarch64.initrd \ -append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ -dtb /aarch64.dtb \ --usb \ -device virtio-balloon-device,id=balloon0,deflate-on-oom=on -- 2.5.5

3 4

Re: [libvirt] [PATCH v2 3/3] KVM: VMX: enable guest access to LMCE related MSRs
by Eduardo Habkost 20 Jun '16

20 Jun '16

On Thu, Jun 16, 2016 at 12:04:50PM +0200, Paolo Bonzini wrote: > On 16/06/2016 08:05, Haozhong Zhang wrote: > > From: Ashok Raj <ashok.raj(a)intel.com> > > > > On Intel platforms, this patch adds LMCE to KVM MCE supported > > capabilities and handles guest access to LMCE related MSRs. > > > > Signed-off-by: Ashok Raj <ashok.raj(a)intel.com> > > [Haozhong: macro KVM_MCE_CAP_SUPPORTED => variable kvm_mce_cap_supported > > Only enable LMCE on Intel platform > > Check MSR_IA32_FEATURE_CONTROL when handling guest > > access to MSR_IA32_MCG_EXT_CTL] > > Signed-off-by: Haozhong Zhang <haozhong.zhang(a)intel.com> [...] > > @@ -6433,6 +6455,8 @@ static __init int hardware_setup(void) > > > > kvm_set_posted_intr_wakeup_handler(wakeup_handler); > > > > + kvm_mce_cap_supported |= MCG_LMCE_P; > > Ah, so virtual LMCE is available on all processors! This is > interesting, but it also makes it more complicated to handle in QEMU; a > new QEMU generally doesn't require a new kernel. > > Eduardo, any ideas? (CCing libvirt list) As we shouldn't make machine-type changes introduce new host requirements, it looks like we need to either add a new set of CPU models (unreasonable), or expect management software to explicitly enable LMCE after ensuring the host supports it. Or we could wait for a reasonable time after the feature is available in the kernel, and declare that QEMU as a whole requires a newer kernel. But how much time would be reasonable for that? Long term, I believe we should think of a better solution. I don't think it is reasonable to require new libvirt code to be written for every single low-level feature that requires a newer kernel or newer host hardware. Maybe new introspection interfaces that would allow us to drop the "no new requirements on machine-type changes" rule? -- Eduardo

3 4

[libvirt] [PATCH] qemu_hotplug: Use a helper variable consistently
by Tomasz Flendrich 20 Jun '16

20 Jun '16

--- src/qemu/qemu_hotplug.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9aca853..f695903 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1305,7 +1305,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, char *charAlias = NULL; char *devstr = NULL; - if (qemuAssignDeviceRedirdevAlias(vm->def, redirdev, -1) < 0) + if (qemuAssignDeviceRedirdevAlias(def, redirdev, -1) < 0) goto cleanup; if (virAsprintf(&charAlias, "char%s", redirdev->info.alias) < 0) @@ -1314,7 +1314,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, if (!(devstr = qemuBuildRedirdevDevStr(def, redirdev, priv->qemuCaps))) goto cleanup; - if (VIR_REALLOC_N(vm->def->redirdevs, vm->def->nredirdevs+1) < 0) + if (VIR_REALLOC_N(def->redirdevs, def->nredirdevs+1) < 0) goto cleanup; qemuDomainObjEnterMonitor(driver, vm); @@ -1335,7 +1335,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, if (qemuDomainObjExitMonitor(driver, vm) < 0) goto audit; - vm->def->redirdevs[vm->def->nredirdevs++] = redirdev; + def->redirdevs[def->nredirdevs++] = redirdev; ret = 0; audit: virDomainAuditRedirdev(vm, redirdev, "attach", ret == 0); @@ -1514,7 +1514,7 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver, if (rc == 1) need_release = true; - if (qemuBuildChrDeviceStr(&devstr, vm->def, chr, priv->qemuCaps) < 0) + if (qemuBuildChrDeviceStr(&devstr, vmdef, chr, priv->qemuCaps) < 0) goto cleanup; if (virAsprintf(&charAlias, "char%s", chr->info.alias) < 0) @@ -1533,13 +1533,13 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver, if (qemuDomainObjExitMonitor(driver, vm) < 0) goto audit; - qemuDomainChrInsertPreAlloced(vm->def, chr); + qemuDomainChrInsertPreAlloced(vmdef, chr); ret = 0; audit: virDomainAuditChardev(vm, NULL, chr, "attach", ret == 0); cleanup: if (ret < 0 && virDomainObjIsActive(vm)) - qemuDomainChrInsertPreAllocCleanup(vm->def, chr); + qemuDomainChrInsertPreAllocCleanup(vmdef, chr); if (ret < 0 && need_release) qemuDomainReleaseDeviceAddress(vm, &chr->info, NULL); VIR_FREE(charAlias); @@ -4066,7 +4066,7 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver, sa_assert(tmpChr->info.alias); - if (qemuBuildChrDeviceStr(&devstr, vm->def, chr, priv->qemuCaps) < 0) + if (qemuBuildChrDeviceStr(&devstr, vmdef, chr, priv->qemuCaps) < 0) return ret; qemuDomainMarkDeviceForRemoval(vm, &tmpChr->info); -- 2.7.4 (Apple Git-66)

2 1

[libvirt] Question: forbid dnsmasq to install IPv6 default route
by Maxim Perevedentsev 18 Jun '16

18 Jun '16

Hello guys! I got into problem with installing IPv6 default gateway on centos7 guest while running dhcpv6. === Scheme === Guest has two network interfaces. *eth0* is connected to Host-Only network over virbr0. This network has dhcpv6 set up. [root@s143 ~]# virsh net-dumpxml Host-Only <network connections='1'> <name>Host-Only</name> <uuid>11aa4e6a-9014-4dae-86b9-b13159896efe</uuid> <bridge name='virbr0' stp='off' delay='0'/> <mac address='52:54:00:1e:17:49'/> <ip family='ipv4' address='10.37.130.2' prefix='24'> <dhcp> <range start='10.37.130.1' end='10.37.130.254'/> </dhcp> </ip> <ip family='ipv6' address='fdb2:2c26:f4e4::1' prefix='64'> <dhcp> <range start='fdb2:2c26:f4e4::' end='fdb2:2c26:f4e4::ffff'/> </dhcp> </ip> </network> *eth1* is connected to Bridged network over br0 bridge on host enp4s0 interface. [root@s143 ~]# virsh net-dumpxml Bridged <network connections='1'> <name>Bridged</name> <uuid>1ffa16f9-6a52-4710-9b58-52b8463cdece</uuid> <forward mode='bridge'/> <bridge name='br0'/> </network> [root@s143 ~]# virsh iface-dumpxml br0 <interface type='bridge' name='br0'> <protocol family='ipv4'> <ip address='10.94.1.161' prefix='16'/> </protocol> <protocol family='ipv6'> <ip address='2001:aaad::a5e:a28E' prefix='64'/> <ip address='fe80::be5f:f4ff:fe44:2cbb' prefix='64'/> </protocol> <bridge> <interface type='ethernet' name='vme42460d71'> <link state='unknown'/> <mac address='fe:1c:42:46:0d:71'/> </interface> <interface type='ethernet' name='enp4s0'> <link speed='1000' state='up'/> <mac address='bc:5f:f4:44:2c:bb'/> </interface> </bridge> </interface> === Problem === Now I want to set ipv6 address 2001:aaad::a5e:a28F to guest eth1 (bridged to host) and install a default route ip -6 route add default via 2001:aaad::a5e:a290 dev eth1 // metric 1024 So I want all the IPv6 traffic w/o route to go into eth1, then through host bridge to gateway (same for host and guest). The problem is that I see following in my guest: // the metric changes somehow, but this does not matter. default via fe80::5054:ff:fe1e:1749 dev eth0 proto static metric 100 pref medium default via 2001:aaad::a5e:a290 dev eth1 metric 1024 pref medium And the first (via link-local) route is preferred on routing. [root@s143 ~]# ip -6 address show dev virbr0 6: virbr0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 inet6 fdb2:2c26:f4e4::1/64 scope global valid_lft forever preferred_lft forever inet6 fe80::5054:ff:fe1e:1749/64 scope link valid_lft forever preferred_lft forever The problem is: guest:/ # radvdump # # radvd configuration generated by radvdump 2.11 # based on Router Advertisement from fe80::5054:ff:fe1e:1749 # received by interface eth0 # interface eth0 { AdvSendAdvert on; # Note: {Min,Max}RtrAdvInterval cannot be obtained with radvdump AdvManagedFlag on; AdvOtherConfigFlag on; AdvReachableTime 0; AdvRetransTimer 0; AdvCurHopLimit 64; AdvDefaultLifetime 1800; <---------------- AdvHomeAgentFlag off; AdvDefaultPreference medium; AdvLinkMTU 1500; AdvSourceLLAddress on; prefix fdb2:2c26:f4e4::/64 { AdvValidLifetime 3600; AdvPreferredLifetime 3600; AdvOnLink on; AdvAutonomous off; AdvRouterAddr off; }; # End of prefix definition RDNSS fe80::5054:ff:fe1e:1749 { AdvRDNSSLifetime 3600; }; # End of RDNSS definition }; # End of interface definition So, dnsmasq includes its link-local address into RA and announces itself as default gateway valid for 30min. Guest sees this RA and installs a route in accordance. As a result, the default gateway requested by user is overridden and thus not used. We cannot just disable RA since we still need IPv6 address on guest eth0 (dhcp6 part of functionality). === Possible solutions === I see two possible solutions. 1) Tinker with routes. As I said, the metric of installed RA routes may change and it's difficult to override them for sure (maybe with metric 0 or 1?) Moreover, this may confuse user and requires specific knowledge (IPv6, RA, etc.). 2) Forbid guest to learn default route from RA sysctl -w net.ipv6.conf.eth0.accept_ra_defrtr=0 - This should be made for all virbr-based networks. - This may confuse user as well. 3) Forbid dnsmasq to announce virbr0 link-local address as default gateway. This can be made with adding 'ra-param=*,0,0' to /var/lib/libvirt/dnsmasq/Host-Only.conf // interface=* (any), interval=0 (default), router_lifetime=0 (I am NOT you gateway, Luke). // tested on dnsmasq-2.75-3.fc22 but should work from 2.67 now the RA looks as following: linux-bnqo:/ # radvdump # # radvd configuration generated by radvdump 2.11 # based on Router Advertisement from fe80::5054:ff:fe1e:1749 # received by interface eth0 # interface eth0 { AdvSendAdvert on; # Note: {Min,Max}RtrAdvInterval cannot be obtained with radvdump AdvManagedFlag on; AdvOtherConfigFlag on; AdvReachableTime 0; AdvRetransTimer 0; AdvCurHopLimit 64; AdvDefaultLifetime 0; AdvHomeAgentFlag off; AdvDefaultPreference medium; AdvLinkMTU 1500; AdvSourceLLAddress on; prefix fdb2:2c26:f4e4::/64 { AdvValidLifetime 3600; AdvPreferredLifetime 3600; AdvOnLink on; AdvAutonomous off; AdvRouterAddr off; }; # End of prefix definition RDNSS fe80::5054:ff:fe1e:1749 { AdvRDNSSLifetime 3600; }; # End of RDNSS definition }; # End of interface definition === Conclusion ==== Please correct me if my setup itself is wrong and causes problems. Maybe there are another solutions possible, w/o modifying libvirt/guest? Would you accept patches related to 3rd solution? Looking forward to your replies. Thanks in advance! -- Your sincerely, Maxim Perevedentsev

2 1

[libvirt] [PATCH v5] virsh: Introduce virsh-pool command
by Jovanka Gulicoska 18 Jun '16

18 Jun '16

--- tools/virsh-pool.c | 184 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 18 ++++++ 2 files changed, 202 insertions(+) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index f9299e2..18e218c 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -32,6 +32,7 @@ #include "virfile.h" #include "conf/storage_conf.h" #include "virstring.h" +#include "virtime.h" #define VIRSH_COMMON_OPT_POOL_FULL \ VIRSH_COMMON_OPT_POOL(N_("pool name or uuid")) \ @@ -1889,6 +1890,183 @@ cmdPoolEdit(vshControl *ctl, const vshCmd *cmd) return ret; } +/* + * "pool-event" command + */ +VIR_ENUM_DECL(virshPoolEvent) +VIR_ENUM_IMPL(virshPoolEvent, + VIR_STORAGE_POOL_EVENT_LAST, + N_("Defined"), + N_("Undefined"), + N_("Started"), + N_("Stopped"), + N_("Refreshed")) + +static const char * +virshPoolEventToString(int event) +{ + const char *str = virshPoolEventTypeToString(event); + return str ? _(str) : _("unknown"); +} + +struct virshPoolEventData { + vshControl *ctl; + bool loop; + bool timestamp; + int count; +}; +typedef struct virshPoolEventData virshPoolEventData; + +VIR_ENUM_DECL(virshPoolEventId) +VIR_ENUM_IMPL(virshPoolEventId, + VIR_STORAGE_POOL_EVENT_ID_LAST, + "lifecycle") + +static void +vshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolPtr pool, + int event, + int detail ATTRIBUTE_UNUSED, + void *opaque) +{ + virshPoolEventData *data = opaque; + + if (!data->loop && data->count) + return; + + if (data->timestamp) { + char timestamp[VIR_TIME_STRING_BUFLEN]; + + if (virTimeStringNowRaw(timestamp) < 0) + timestamp[0] = '\0'; + + vshPrint(data->ctl, _("%s: event 'lifecycle' for storage pool %s: %s\n"), + timestamp, + virStoragePoolGetName(pool), + virshPoolEventToString(event)); + } else { + vshPrint(data->ctl, _("event 'lifecycle' for storage pool %s: %s\n"), + virStoragePoolGetName(pool), + virshPoolEventToString(event)); + } + + data->count++; + if (!data->loop) + vshEventDone(data->ctl); +} + +static const vshCmdInfo info_pool_event[] = { + {.name = "help", + .data = N_("Storage Pool Events") + }, + {.name = "desc", + .data = N_("List event types, or wait for storage pool events to occur") + }, + {.name = NULL} +}; + +static const vshCmdOptDef opts_pool_event[] = { + {.name = "pool", + .type = VSH_OT_STRING, + .help = N_("filter by storage pool name or uuid") + }, + {.name = "event", + .type = VSH_OT_STRING, + .help = N_("which event type to wait for") + }, + {.name = "loop", + .type = VSH_OT_BOOL, + .help = N_("loop until timeout or interrupt, rather than one-shot") + }, + {.name = "timeout", + .type = VSH_OT_INT, + .help = N_("timeout seconds") + }, + {.name = "list", + .type = VSH_OT_BOOL, + .help = N_("list valid event types") + }, + {.name = "timestamp", + .type = VSH_OT_BOOL, + .help = N_("show timestamp for each printed event") + }, + {.name = NULL} +}; + +static bool +cmdPoolEvent(vshControl *ctl, const vshCmd *cmd) +{ + virStoragePoolPtr pool = NULL; + bool ret = false; + int eventId = -1; + int timeout = 0; + virshPoolEventData data; + const char *eventName = NULL; + int event; + virshControlPtr priv = ctl->privData; + + if (vshCommandOptBool(cmd, "list")) { + size_t i; + + for (i = 0; i < VIR_STORAGE_POOL_EVENT_ID_LAST; i++) + vshPrint(ctl, "%s\n", virshPoolEventIdTypeToString(i)); + return true; + } + + if (vshCommandOptStringReq(ctl, cmd, "event", &eventName) < 0) + return false; + if (!eventName) { + vshError(ctl, "%s", _("either --list or event type is required")); + return false; + } + if ((event = virshPoolEventIdTypeFromString(eventName)) < 0) { + vshError(ctl, _("unknown event type %s"), eventName); + return false; + } + + data.ctl = ctl; + data.loop = vshCommandOptBool(cmd, "loop"); + data.timestamp = vshCommandOptBool(cmd, "timestamp"); + data.count = 0; + if (vshCommandOptTimeoutToMs(ctl, cmd, &timeout) < 0) + return false; + + if (vshCommandOptBool(cmd, "pool")) + pool = virshCommandOptPool(ctl, cmd, "pool", NULL); + if (vshEventStart(ctl, timeout) < 0) + goto cleanup; + + if ((eventId = virConnectStoragePoolEventRegisterAny(priv->conn, pool, event, + VIR_STORAGE_POOL_EVENT_CALLBACK(vshEventLifecyclePrint), + &data, NULL)) < 0) + goto cleanup; + switch (vshEventWait(ctl)) { + case VSH_EVENT_INTERRUPT: + vshPrint(ctl, "%s", _("event loop interrupted\n")); + break; + case VSH_EVENT_TIMEOUT: + vshPrint(ctl, "%s", _("event loop timed out\n")); + break; + case VSH_EVENT_DONE: + break; + default: + goto cleanup; + } + vshPrint(ctl, _("events received: %d\n"), data.count); + if (data.count) + ret = true; + + cleanup: + vshEventCleanup(ctl); + if (eventId >= 0 && + virConnectStoragePoolEventDeregisterAny(priv->conn, eventId) < 0) + ret = false; + if (pool) + virStoragePoolFree(pool); + return ret; +} + + const vshCmdDef storagePoolCmds[] = { {.name = "find-storage-pool-sources-as", .handler = cmdPoolDiscoverSourcesAs, @@ -2004,5 +2182,11 @@ const vshCmdDef storagePoolCmds[] = { .info = info_pool_uuid, .flags = 0 }, + {.name = "pool-event", + .handler = cmdPoolEvent, + .opts = opts_pool_event, + .info = info_pool_event, + .flags = 0 + }, {.name = NULL} }; diff --git a/tools/virsh.pod b/tools/virsh.pod index 1e56660..e530160 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3457,6 +3457,24 @@ Undefine the configuration for an inactive I<pool>. Returns the UUID of the named I<pool>. +=item B<pool-event> {[I<pool>] I<event> [I<--loop>] [I<--timeout> +I<seconds>] [I<--timestamp>] | I<--list>} + +Wait for a class of storage pool events to occur, and print appropriate +details of events as they happen. The events can optionally be filtered +by I<pool>. Using I<--list> as the only argument will provide a list +of possible I<event> values known by this client, although the connection +might not allow registering for all these events. + +By default, this command is one-shot, and returns success once an event +occurs; you can send SIGINT (usually via C<Ctrl-C>) to quit immediately. +If I<--timeout> is specified, the command gives up waiting for events +after I<seconds> have elapsed. With I<--loop>, the command prints all +events until a timeout or interrupt key. + +When I<--timestamp> is used, a human-readable timestamp will be printed +before the event. + =back =head1 VOLUME COMMANDS -- 2.5.5

2 2

[libvirt] ANNOUNCE: virt-manager 1.4.0 released
by Cole Robinson 18 Jun '16

18 Jun '16

I'm happy to announce the release of virt-manager 1.4.0! virt-manager is a desktop application for managing KVM, Xen, and LXC virtualization via libvirt. The release can be downloaded from: http://virt-manager.org/download/ This release includes: - virt-manager: spice GL console support (Marc-André Lureau, Cole Robinson) - Note, this isn't enabled by default, and there isn't any GUI bits to enable this, but if it _is_ enabled the virt-manager SPICE viewer will do the right thing. More details: http://blog.wikichoon.com/2016/05/spice-openglvirgl-acceleration-on.html - Bump gtk and pygobject deps to 3.14 - virt-manager: add checkbox to forget keyring password (Pavel Hrdina) - cli: add --graphics gl= (Marc-André Lureau) - cli: add --video accel3d= (Marc-André Lureau) - cli: add --graphics listen=none (Marc-André Lureau) - cli: add --transient flag (Richard W.M. Jones) - cli: --features gic= support, and set a default for it (Pavel Hrdina) - cli: Expose --video heads, ram, vram, vgamem - cli: add --graphics listen=socket - cli: add device address.type/address.bus/... - cli: add --disk seclabelX.model (and .label, .relabel) - cli: add -cpu cellX.id (and .cpus, and .memory) - cli: add --network rom_bar= and rom_file= - cli: add --disk backing_format= - Many bug fixes and improvements Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 0

[libvirt] [PATCH v2] libxl: add USB to hostdev domcapabilities
by Joao Martins 17 Jun '16

17 Jun '16

From: Jim Fehlig <jfehlig(a)suse.com> Commit 2a58ed0b added support for creating guests with USB hostdevs. Commit fc21d10 later added support for hotplut of USB hostdevs. Advertise support for USB hostdevs in the domcapabilities. In addition add the appropriate caps for USB support on domaincapstest when libvirt is built on a Xen with LIBXL_HAVE_PVUSB. Otherwise domaincapstest would fail i.e. testing the wrong domain capabilities. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- Changes since v2: - Change domaincapstest to target (non-)PVUSB caps. --- src/libxl/libxl_capabilities.c | 5 ++ tests/domaincapsschemadata/libxl-xenfv-usb.xml | 69 ++++++++++++++++++++++++++ tests/domaincapsschemadata/libxl-xenpv-usb.xml | 59 ++++++++++++++++++++++ tests/domaincapstest.c | 12 ++++- 4 files changed, 143 insertions(+), 2 deletions(-) create mode 100644 tests/domaincapsschemadata/libxl-xenfv-usb.xml create mode 100644 tests/domaincapsschemadata/libxl-xenpv-usb.xml diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 45f0988..0145116 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -492,6 +492,11 @@ libxlMakeDomainDeviceHostdevCaps(virDomainCapsDeviceHostdevPtr dev) VIR_DOMAIN_CAPS_ENUM_SET(dev->subsysType, VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI); +#ifdef LIBXL_HAVE_PVUSB + VIR_DOMAIN_CAPS_ENUM_SET(dev->subsysType, + VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB); +#endif + /* No virDomainHostdevCapsType for libxl */ virDomainCapsEnumClear(&dev->capsType); diff --git a/tests/domaincapsschemadata/libxl-xenfv-usb.xml b/tests/domaincapsschemadata/libxl-xenfv-usb.xml new file mode 100644 index 0000000..c071d12 --- /dev/null +++ b/tests/domaincapsschemadata/libxl-xenfv-usb.xml @@ -0,0 +1,69 @@ +<domainCapabilities> + <path>/usr/bin/qemu-system-x86_64</path> + <domain>xen</domain> + <machine>xenfv</machine> + <arch>x86_64</arch> + <vcpu max='128'/> + <os supported='yes'> + <loader supported='yes'> + <value>/usr/lib/xen/boot/hvmloader</value> + <value>/usr/lib/xen/boot/ovmf.bin</value> + <enum name='type'> + <value>rom</value> + <value>pflash</value> + </enum> + <enum name='readonly'> + <value>yes</value> + </enum> + </loader> + </os> + <devices> + <disk supported='yes'> + <enum name='diskDevice'> + <value>disk</value> + <value>cdrom</value> + </enum> + <enum name='bus'> + <value>ide</value> + <value>scsi</value> + <value>xen</value> + </enum> + </disk> + <graphics supported='yes'> + <enum name='type'> + <value>sdl</value> + <value>vnc</value> + <value>spice</value> + </enum> + </graphics> + <video supported='yes'> + <enum name='modelType'> + <value>vga</value> + <value>cirrus</value> + <value>xen</value> + </enum> + </video> + <hostdev supported='yes'> + <enum name='mode'> + <value>subsystem</value> + </enum> + <enum name='startupPolicy'> + <value>default</value> + <value>mandatory</value> + <value>requisite</value> + <value>optional</value> + </enum> + <enum name='subsysType'> + <value>usb</value> + <value>pci</value> + </enum> + <enum name='capsType'/> + <enum name='pciBackend'> + <value>xen</value> + </enum> + </hostdev> + </devices> + <features> + <gic supported='no'/> + </features> +</domainCapabilities> diff --git a/tests/domaincapsschemadata/libxl-xenpv-usb.xml b/tests/domaincapsschemadata/libxl-xenpv-usb.xml new file mode 100644 index 0000000..4dd07bd --- /dev/null +++ b/tests/domaincapsschemadata/libxl-xenpv-usb.xml @@ -0,0 +1,59 @@ +<domainCapabilities> + <path>/usr/bin/qemu-system-x86_64</path> + <domain>xen</domain> + <machine>xenpv</machine> + <arch>x86_64</arch> + <vcpu max='512'/> + <os supported='yes'> + <loader supported='no'/> + </os> + <devices> + <disk supported='yes'> + <enum name='diskDevice'> + <value>disk</value> + <value>cdrom</value> + </enum> + <enum name='bus'> + <value>ide</value> + <value>scsi</value> + <value>xen</value> + </enum> + </disk> + <graphics supported='yes'> + <enum name='type'> + <value>sdl</value> + <value>vnc</value> + <value>spice</value> + </enum> + </graphics> + <video supported='yes'> + <enum name='modelType'> + <value>vga</value> + <value>cirrus</value> + <value>xen</value> + </enum> + </video> + <hostdev supported='yes'> + <enum name='mode'> + <value>subsystem</value> + </enum> + <enum name='startupPolicy'> + <value>default</value> + <value>mandatory</value> + <value>requisite</value> + <value>optional</value> + </enum> + <enum name='subsysType'> + <value>usb</value> + <value>pci</value> + </enum> + <enum name='capsType'/> + <enum name='pciBackend'> + <value>xen</value> + </enum> + </hostdev> + </devices> + <features> + <gic supported='no'/> + </features> +</domainCapabilities> diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 9fb2c97..ae31146 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -367,9 +367,17 @@ mymain(void) #if WITH_LIBXL - DO_TEST_LIBXL("libxl-xenpv", "/usr/bin/qemu-system-x86_64", +# ifdef LIBXL_HAVE_PVUSB +# define LIBXL_XENPV_CAPS "libxl-xenpv-usb" +# define LIBXL_XENFV_CAPS "libxl-xenfv-usb" +# else +# define LIBXL_XENPV_CAPS "libxl-xenpv" +# define LIBXL_XENFV_CAPS "libxl-xenfv" +# endif + + DO_TEST_LIBXL(LIBXL_XENPV_CAPS, "/usr/bin/qemu-system-x86_64", "xenpv", "x86_64", VIR_DOMAIN_VIRT_XEN); - DO_TEST_LIBXL("libxl-xenfv", "/usr/bin/qemu-system-x86_64", + DO_TEST_LIBXL(LIBXL_XENFV_CAPS, "/usr/bin/qemu-system-x86_64", "xenfv", "x86_64", VIR_DOMAIN_VIRT_XEN); #endif /* WITH_LIBXL */ -- 2.1.4

2 1

[libvirt] [PATCH] Remove stray space in cmdHelp
by Ján Tomko 17 Jun '16

17 Jun '16

--- tools/vsh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Pushed as trivial. diff --git a/tools/vsh.c b/tools/vsh.c index 605c574..8649305 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2858,7 +2858,7 @@ const vshCmdInfo info_help[] = { bool cmdHelp(vshControl *ctl, const vshCmd *cmd) - { +{ const char *name = NULL; if (vshCommandOptStringQuiet(ctl, cmd, "command", &name) <= 0) { -- 2.7.3

1 0

[libvirt] [PATCH] libxl: add USB to hostdev domcapabilities
by Jim Fehlig 17 Jun '16

17 Jun '16

Commit 2a58ed0b added support for creating guests with USB hostdevs. Commit fc21d10 later added support for hotplut of USB hostdevs. Advertise support for USB hostdevs in the domcapabilities. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_capabilities.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 45f0988..0145116 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -492,6 +492,11 @@ libxlMakeDomainDeviceHostdevCaps(virDomainCapsDeviceHostdevPtr dev) VIR_DOMAIN_CAPS_ENUM_SET(dev->subsysType, VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI); +#ifdef LIBXL_HAVE_PVUSB + VIR_DOMAIN_CAPS_ENUM_SET(dev->subsysType, + VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB); +#endif + /* No virDomainHostdevCapsType for libxl */ virDomainCapsEnumClear(&dev->capsType); -- 2.1.4

2 5

[libvirt] [PATCH] storage: dir: adapts .wipeVol for ploop volumes
by Olga Krishtal 17 Jun '16

17 Jun '16

The modification of .volWipe callback wipes ploop volume using one of given wiping algorithm: dod, nnsa, etc. However, in case of ploop volume we need to reinitialize root.hds and DiskDescriptor.xml. Signed-off-by: Olga Krishtal <okrishtal(a)virtuozzo.com> --- src/storage/storage_backend.c | 58 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 6 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index d47a76a..367a887 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -2295,6 +2295,45 @@ virStorageBackendWipeLocal(virStorageVolDefPtr vol, return ret; } +static int +virStorageBackendVolWipePloop(virStorageVolDefPtr vol) +{ + virCommandPtr cmd = NULL; + char *target_path = NULL; + char *disk_desc = NULL; + int ret = -1; + + if (virAsprintf(&target_path, "%s/root.hds", vol->target.path) < 0) + goto cleanup; + + if (virAsprintf(&disk_desc, "%s/DiskDescriptor.xml", vol->target.path) < 0) + goto cleanup; + + if (virFileRemove(disk_desc, 0, 0) < 0) { + virReportError(errno, _("Failed to delete DiskDescriptor.xml of volume '%s'"), + vol->target.path); + goto cleanup; + } + if (virFileRemove(target_path, 0, 0) < 0) { + virReportError(errno, _("failed to delete root.hds of volume '%s'"), + vol->target.path); + goto cleanup; + } + + cmd = virCommandNewArgList("ploop", "init", "-s", NULL); + + virCommandAddArgFormat(cmd, "%lluM", VIR_DIV_UP(vol->target.capacity, + (1024 * 1024))); + virCommandAddArgList(cmd, "-t", "ext4", NULL); + virCommandAddArgFormat(cmd, "%s/root.hds", vol->target.path); + ret = virCommandRun(cmd, NULL); + + cleanup: + VIR_FREE(disk_desc); + VIR_FREE(target_path); + virCommandFree(cmd); + return ret; +} int virStorageBackendVolWipeLocal(virConnectPtr conn ATTRIBUTE_UNUSED, @@ -2307,6 +2346,8 @@ virStorageBackendVolWipeLocal(virConnectPtr conn ATTRIBUTE_UNUSED, const char *alg_char = NULL; struct stat st; virCommandPtr cmd = NULL; + char *path = NULL; + char *target_path = vol->target.path; virCheckFlags(0, -1); @@ -2314,12 +2355,12 @@ virStorageBackendVolWipeLocal(virConnectPtr conn ATTRIBUTE_UNUSED, vol->target.path, algorithm); if (vol->target.format == VIR_STORAGE_FILE_PLOOP) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("wiping for ploop volumes is not supported")); - goto cleanup; + if (virAsprintf(&path, "%s/root.hds", vol->target.path) < 0) + goto cleanup; + target_path = path; } - fd = open(vol->target.path, O_RDWR); + fd = open(target_path, O_RDWR); if (fd == -1) { virReportSystemError(errno, _("Failed to open storage volume with path '%s'"), @@ -2376,13 +2417,12 @@ virStorageBackendVolWipeLocal(virConnectPtr conn ATTRIBUTE_UNUSED, if (algorithm != VIR_STORAGE_VOL_WIPE_ALG_ZERO) { cmd = virCommandNew(SCRUB); virCommandAddArgList(cmd, "-f", "-p", alg_char, - vol->target.path, NULL); + target_path, NULL); if (virCommandRun(cmd, NULL) < 0) goto cleanup; ret = 0; - goto cleanup; } else { if (S_ISREG(st.st_mode) && st.st_blocks < (st.st_size / DEV_BSIZE)) { ret = virStorageBackendVolZeroSparseFileLocal(vol, st.st_size, fd); @@ -2392,10 +2432,16 @@ virStorageBackendVolWipeLocal(virConnectPtr conn ATTRIBUTE_UNUSED, vol->target.allocation, st.st_blksize); } + if (ret < 0) + goto cleanup; } + if (vol->target.format == VIR_STORAGE_FILE_PLOOP) + ret = virStorageBackendVolWipePloop(vol); + cleanup: virCommandFree(cmd); + VIR_FREE(path); VIR_FORCE_CLOSE(fd); return ret; } -- 1.8.3.1

3 3

[libvirt] [PATCH 0/5] Allow disjunct ranges in VIR_TEST_RANGE
by Ján Tomko 17 Jun '16

17 Jun '16

Now you can do: VIR_TEST_RANGE=7-14,^10,1024 ./virschematest Ján Tomko (5): Do not return number of set bits in virBitmapParse Introduce virBitmapParseSeparator Remove separator argument from virBitmapParse Introduce virBitmapParseUnlimited Allow disjunct ranges in VIR_TEST_RANGE src/conf/domain_conf.c | 15 +++-- src/conf/network_conf.c | 2 +- src/conf/numa_conf.c | 7 +-- src/libvirt_private.syms | 2 + src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_native.c | 4 +- src/nodeinfo.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 2 +- src/util/virbitmap.c | 149 ++++++++++++++++++++++++++++++++++++++++++--- src/util/virbitmap.h | 12 +++- src/util/virhostcpu.c | 2 +- src/vz/vz_sdk.c | 2 +- src/xen/xend_internal.c | 5 +- src/xenconfig/xen_common.c | 2 +- src/xenconfig/xen_sxpr.c | 3 +- tests/qemuxml2argvtest.c | 2 +- tests/testutils.c | 30 ++------- tests/virbitmaptest.c | 31 ++++++---- tests/vircapstest.c | 2 +- tools/virsh-domain.c | 2 +- 22 files changed, 205 insertions(+), 77 deletions(-) -- 2.7.3

2 10

[libvirt] [PATCH] qemu: restore non-pci hostdev labels after detach
by Ján Tomko 17 Jun '16

17 Jun '16

Commit 409de00 changed the logic to only match PCI devices while moving this before Remove*HostDevice calls. https://bugzilla.redhat.com/show_bug.cgi?id=1342874 --- src/qemu/qemu_hotplug.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e1c3de7..39d49d4 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2952,10 +2952,16 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; char *drivestr = NULL; + bool is_vfio = false; VIR_DEBUG("Removing host device %s from domain %p %s", hostdev->info->alias, vm, vm->def->name); + if (hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { + int backend = hostdev->source.subsys.u.pci.backend; + is_vfio = backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO; + } + if (hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) { /* build the actual drive id string as generated during * qemuBuildSCSIHostdevDrvStr that is passed to qemu */ @@ -2993,13 +2999,10 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, virDomainAuditHostdev(vm, hostdev, "detach", true); - if (hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI && - hostdev->source.subsys.u.pci.backend != - VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { - if (virSecurityManagerRestoreHostdevLabel(driver->securityManager, - vm->def, hostdev, NULL) < 0) - VIR_WARN("Failed to restore host device labelling"); - } + if (!is_vfio && + virSecurityManagerRestoreHostdevLabel(driver->securityManager, + vm->def, hostdev, NULL) < 0) + VIR_WARN("Failed to restore host device labelling"); if (qemuTeardownHostdevCgroup(vm, hostdev) < 0) VIR_WARN("Failed to remove host device cgroup ACL"); -- 2.7.3

2 1

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

17 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.

1 0

[libvirt] [PATCH 0/3] configure: fix building with mpath
by Ján Tomko 17 Jun '16

17 Jun '16

Recently we've started adding --with-storage-mpath unconditionally in the specfile. This exposed a bug in our configure script where we would define the WITH_STORAGE_MPATH pre-processor macro only if we checked for mpath, not if it was requested. Ján Tomko (3): configure: define preprocessor macros for SCSI and MPATH configure: error out when asked for mpath on non-Linux configure: remove definition of HAVE_GLIBC_RPCGEN configure.ac | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) -- 2.7.3

3 6

[libvirt] [PATCH] qemu: Fix alignment in virDomainDefAddController() call
by Andrea Bolognani 17 Jun '16

17 Jun '16

--- Pushed as oh-so-very-trivial. src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 2fe59d7..1eb5644 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1957,7 +1957,7 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, */ if (virDomainControllerFind(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 1) < 0 && !virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 1, - VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE)) + VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE)) goto cleanup; } -- 2.5.5

1 0

[libvirt] [PATCH 0/2] Perf event fixes follow up
by Peter Krempa 17 Jun '16

17 Jun '16

Add/fix at least some virsh documentation for the perf events and remove the rather useless schema-test XML. Peter Krempa (2): docs: virsh: Add minimal documentation for 'mbmt' and 'mbml' perf events tests: schema: Remove useless perf schema data tests/domainschemadata/domain-perf-simple.xml | 20 -------------------- tools/virsh.pod | 11 ++++++++--- 2 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 tests/domainschemadata/domain-perf-simple.xml -- 2.8.3

2 5

[libvirt] [PATCH 00/10] Add new CPU model for Skylake CPUs
by Jiri Denemark 17 Jun '16

17 Jun '16

This series applies on top of "Another round of CPU driver patches" I sent earlier today. Jiri Denemark (10): qemumonitorjsontest: Add getcpu test data cpu_x86: Prepare for ecx_in CPUID parameter cpu_x86: Add full support for ecx_in CPUID parameter cpu: Shorten eax_in values in CPU map cpu: Sort CPU map features on eax_in cpu: Add x86 feature flags for CPUID leaf 0xd, sub leaf 1 cpu: Add ARAT x86 CPU feature cpu: Add Skylake-Client x86 CPU model cputest: Rename nehalem-force to penryn-force cpu_x86: Use signature in CPU detection code src/cpu/cpu_map.xml | 341 +++++++++------ src/cpu/cpu_x86.c | 476 +++++++++++++++++++-- src/cpu/cpu_x86_data.h | 1 + src/qemu/qemu_monitor_json.c | 4 + tests/cputest.c | 4 +- tests/cputestdata/x86-cpuid-A10-5800K-guest.xml | 2 +- tests/cputestdata/x86-cpuid-A10-5800K-host.xml | 2 +- tests/cputestdata/x86-cpuid-A10-5800K-json.xml | 4 +- tests/cputestdata/x86-cpuid-Core-i5-2500-guest.xml | 2 + tests/cputestdata/x86-cpuid-Core-i5-2500-host.xml | 2 + tests/cputestdata/x86-cpuid-Core-i5-2500-json.xml | 2 + .../cputestdata/x86-cpuid-Core-i5-2540M-guest.xml | 2 + tests/cputestdata/x86-cpuid-Core-i5-2540M-host.xml | 2 + tests/cputestdata/x86-cpuid-Core-i5-2540M-json.xml | 2 + .../cputestdata/x86-cpuid-Core-i5-4670T-guest.xml | 3 +- tests/cputestdata/x86-cpuid-Core-i5-4670T-host.xml | 3 +- tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml | 3 +- tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml | 10 +- tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml | 10 +- tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml | 10 +- tests/cputestdata/x86-cpuid-Core-i7-2600-guest.xml | 2 + tests/cputestdata/x86-cpuid-Core-i7-2600-host.xml | 2 + tests/cputestdata/x86-cpuid-Core-i7-2600-json.xml | 1 + .../cputestdata/x86-cpuid-Core-i7-3520M-guest.xml | 2 + tests/cputestdata/x86-cpuid-Core-i7-3520M-host.xml | 2 + .../cputestdata/x86-cpuid-Core-i7-3740QM-guest.xml | 1 + .../cputestdata/x86-cpuid-Core-i7-3740QM-host.xml | 1 + .../cputestdata/x86-cpuid-Core-i7-3740QM-json.xml | 1 + tests/cputestdata/x86-cpuid-Core-i7-3770-guest.xml | 2 + tests/cputestdata/x86-cpuid-Core-i7-3770-host.xml | 2 + tests/cputestdata/x86-cpuid-Core-i7-3770-json.xml | 1 + .../cputestdata/x86-cpuid-Core-i7-4600U-guest.xml | 4 +- tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml | 4 +- tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml | 4 +- .../cputestdata/x86-cpuid-Core-i7-5600U-guest.xml | 4 +- tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml | 4 +- tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml | 11 +- tests/cputestdata/x86-cpuid-Core2-E6850-guest.xml | 5 +- tests/cputestdata/x86-cpuid-Core2-E6850-host.xml | 5 +- tests/cputestdata/x86-cpuid-Opteron-6234-json.xml | 3 +- .../cputestdata/x86-cpuid-Pentium-P6100-guest.xml | 1 + tests/cputestdata/x86-cpuid-Pentium-P6100-host.xml | 1 + tests/cputestdata/x86-cpuid-Xeon-5110-guest.xml | 5 +- tests/cputestdata/x86-cpuid-Xeon-5110-host.xml | 5 +- tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml | 10 +- tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml | 10 +- tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml | 9 +- tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml | 4 +- tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml | 4 +- tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml | 3 +- tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml | 4 +- tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml | 4 +- tests/cputestdata/x86-cpuid-Xeon-E7-4820-guest.xml | 1 + tests/cputestdata/x86-cpuid-Xeon-E7-4820-host.xml | 1 + tests/cputestdata/x86-cpuid-Xeon-E7-4820-json.xml | 2 +- tests/cputestdata/x86-cpuid-Xeon-W3520-json.xml | 2 +- .../cputestdata/x86-host+nehalem-force-result.xml | 4 - tests/cputestdata/x86-host+penryn-force-result.xml | 6 + ...{x86-nehalem-force.xml => x86-penryn-force.xml} | 0 .../qemumonitorjson-getcpu-ecx.data | 7 + .../qemumonitorjson-getcpu-ecx.json | 57 +++ .../qemumonitorjson-getcpu-full.data | 6 +- .../qemumonitorjson-getcpu-host.data | 8 +- tests/qemumonitorjsontest.c | 1 + 64 files changed, 853 insertions(+), 248 deletions(-) delete mode 100644 tests/cputestdata/x86-host+nehalem-force-result.xml create mode 100644 tests/cputestdata/x86-host+penryn-force-result.xml rename tests/cputestdata/{x86-nehalem-force.xml => x86-penryn-force.xml} (100%) create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-ecx.data create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-ecx.json -- 2.8.4

2 26

[libvirt] [PATCH 0/2] conf: Tweak how we calculate memory sizes
by Peter Krempa 17 Jun '16

17 Jun '16

Patches that allowed to use memory hotplug without NUMA introduced a problem where the size in <memory> wouldn't be right after memory cold unplug. See patch 1/2 for explanation. Peter Krempa (2): conf: Remove pre-calculation of initial memory size conf: Rename virDomainDefGetMemoryActual to virDomainDefGetMemoryTotal src/bhyve/bhyve_driver.c | 2 +- src/conf/domain_audit.c | 2 +- src/conf/domain_conf.c | 103 ++++++++++++++++++++++++--------------------- src/conf/domain_conf.h | 5 +-- src/libvirt_private.syms | 3 +- src/libxl/libxl_driver.c | 6 +-- src/lxc/lxc_driver.c | 10 ++--- src/lxc/lxc_fuse.c | 6 +-- src/openvz/openvz_driver.c | 2 +- src/qemu/qemu_domain.c | 12 +++--- src/qemu/qemu_driver.c | 16 +++---- src/qemu/qemu_hotplug.c | 4 +- src/qemu/qemu_process.c | 4 +- src/test/test_driver.c | 6 +-- src/uml/uml_driver.c | 6 +-- src/vmware/vmware_driver.c | 2 +- src/vmx/vmx.c | 10 ++--- src/vz/vz_driver.c | 4 +- src/vz/vz_sdk.c | 6 +-- src/xen/xm_internal.c | 8 ++-- src/xenapi/xenapi_utils.c | 4 +- src/xenconfig/xen_common.c | 2 +- src/xenconfig/xen_sxpr.c | 6 +-- 23 files changed, 116 insertions(+), 113 deletions(-) -- 2.8.3

2 6

[libvirt] [PATCH 0/3] perf: Unbreak virsh and XML parser
by Peter Krempa 17 Jun '16

17 Jun '16

Yet another breakage in the perf event code. Add missing docs, fix schemas and rewrite the XML parser since it was broken. Peter Krempa (3): qemu: perf: Don't set state of first event for every other event docs: Add at least some docs and fix schema entry for perf events conf: Fix perf event parser docs/formatdomain.html.in | 44 +++++++++++++++++++++++++++ docs/schemas/domaincommon.rng | 2 ++ src/conf/domain_conf.c | 47 ++++++++++++----------------- src/qemu/qemu_driver.c | 2 +- tests/genericxml2xmlindata/generic-perf.xml | 22 ++++++++++++++ tests/genericxml2xmltest.c | 2 ++ 6 files changed, 90 insertions(+), 29 deletions(-) create mode 100644 tests/genericxml2xmlindata/generic-perf.xml -- 2.8.3

2 8

[libvirt] [PATCH] spec: Make driver-qemu require driver-storage
by Martin Kletzander 17 Jun '16

17 Jun '16

Without that we might get similar messages in the log: error : virDriverLoadModule:73 : failed to load module /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so: undefined symbol: virStorageFileCreate Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 6b3e888d0048..816a950ef624 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -607,6 +607,7 @@ Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} # There really is a hard cross-driver dependency here Requires: libvirt-daemon-driver-network = %{version}-%{release} +Requires: libvirt-daemon-driver-storage = %{version}-%{release} Requires: /usr/bin/qemu-img # For image compression Requires: gzip -- 2.9.0

2 1

[libvirt] [PATCH v2] util: Make failure to get suplementary group list for a uid non-fatal
by Peter Krempa 17 Jun '16

17 Jun '16

Since introduction of the DAC security driver we've documented that seclabels with a leading + can be used with numerical uid. This would not work though with the rest of libvirt if the uid was not actually used in the system as we'd fail when trying to get a list of suplementary groups for the given uid. Since a uid without entry in /etc/passwd (or other user database) will not have any suppolementary groups we can treat the failure to obtain them as such. This patch modifies virGetGroupList to not report the error of missing user and tweaks callers to treat the missing list as having 0 supplementary groups. The only place reporting errors is virt-login-shell as it's used to determine whether the given user is allowed to access the shell. --- Although it was ACKed I'm reposting a rebased version including the fixes and fixed merge conflicts. I'd like to hear feedback from the reporter of this issue. CC: Roy Keene <rkeene(a)knightpoint.com> src/security/security_dac.c | 13 +++++++------ src/util/vircommand.c | 4 +++- src/util/virfile.c | 28 ++++++++++++++++------------ src/util/virutil.c | 27 +++++++++++++++++---------- tools/virt-login-shell.c | 6 +++++- 5 files changed, 48 insertions(+), 30 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 442ce70..9dec201 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -266,14 +266,15 @@ static int virSecurityDACPreFork(virSecurityManagerPtr mgr) { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); - int ngroups; VIR_FREE(priv->groups); - priv->ngroups = 0; - if ((ngroups = virGetGroupList(priv->user, priv->group, - &priv->groups)) < 0) - return -1; - priv->ngroups = ngroups; + + /* ignore a possible problem in getting supplementary groups just assume + * we have none and continue with uid/gid only */ + if ((priv->ngroups = virGetGroupList(priv->user, priv->group, + &priv->groups)) < 0) + priv->ngroups = 0; + return 0; } diff --git a/src/util/vircommand.c b/src/util/vircommand.c index f5bd7af..58af06a 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -554,8 +554,10 @@ virExec(virCommandPtr cmd) childerr = null; } + /* ignore a possible problem in getting supplementary groups just assume + * we have none and continue with uid/gid only */ if ((ngroups = virGetGroupList(cmd->uid, cmd->gid, &groups)) < 0) - goto cleanup; + ngroups = 0; pid = virFork(); diff --git a/src/util/virfile.c b/src/util/virfile.c index 9d460b9..4298ec5 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1978,9 +1978,10 @@ virFileAccessibleAs(const char *path, int mode, gid == getegid()) return access(path, mode); - ngroups = virGetGroupList(uid, gid, &groups); - if (ngroups < 0) - return -1; + /* ignore a possible problem in getting supplementary groups just assume + * we have none and continue with uid/gid only */ + if ((ngroups = virGetGroupList(uid, gid, &groups)) == -1) + ngroups = 0; pid = virFork(); @@ -2104,9 +2105,10 @@ virFileOpenForked(const char *path, int openflags, mode_t mode, * following dance avoids problems caused by root-squashing * NFS servers. */ - ngroups = virGetGroupList(uid, gid, &groups); - if (ngroups < 0) - return -errno; + /* ignore a possible problem in getting supplementary groups just assume + * we have none and continue with uid/gid only */ + if ((ngroups = virGetGroupList(uid, gid, &groups)) == -1) + ngroups = 0; if (socketpair(AF_UNIX, SOCK_STREAM, 0, pair) < 0) { ret = -errno; @@ -2407,9 +2409,10 @@ virFileRemove(const char *path, if (gid == (gid_t) -1) gid = getegid(); - ngroups = virGetGroupList(uid, gid, &groups); - if (ngroups < 0) - return -errno; + /* ignore a possible problem in getting supplementary groups just assume + * we have none and continue with uid/gid only */ + if ((ngroups = virGetGroupList(uid, gid, &groups)) == -1) + ngroups = 0; pid = virFork(); @@ -2583,9 +2586,10 @@ virDirCreate(const char *path, if (gid == (gid_t) -1) gid = getegid(); - ngroups = virGetGroupList(uid, gid, &groups); - if (ngroups < 0) - return -errno; + /* ignore a possible problem in getting supplementary groups just assume + * we have none and continue with uid/gid only */ + if ((ngroups = virGetGroupList(uid, gid, &groups)) == -1) + ngroups = 0; pid = virFork(); diff --git a/src/util/virutil.c b/src/util/virutil.c index ff58054..c11278f 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -755,9 +755,10 @@ virGetUserDirectory(void) #ifdef HAVE_GETPWUID_R /* Look up fields from the user database for the given user. On - * error, set errno, report the error, and return -1. */ + * error, set errno, report the error if not instructed otherwise via @quiet, + * and return -1. */ static int -virGetUserEnt(uid_t uid, char **name, gid_t *group, char **dir, char **shell) +virGetUserEnt(uid_t uid, char **name, gid_t *group, char **dir, char **shell, bool quiet) { char *strbuf; struct passwd pwbuf; @@ -792,12 +793,19 @@ virGetUserEnt(uid_t uid, char **name, gid_t *group, char **dir, char **shell) if (VIR_RESIZE_N(strbuf, strbuflen, strbuflen, strbuflen) < 0) goto cleanup; } + if (rc != 0) { + if (quiet) + goto cleanup; + virReportSystemError(rc, _("Failed to find user record for uid '%u'"), (unsigned int) uid); goto cleanup; } else if (pw == NULL) { + if (quiet) + goto cleanup; + virReportError(VIR_ERR_SYSTEM_ERROR, _("Failed to find user record for uid '%u'"), (unsigned int) uid); @@ -882,7 +890,7 @@ char * virGetUserDirectoryByUID(uid_t uid) { char *ret; - virGetUserEnt(uid, NULL, NULL, &ret, NULL); + virGetUserEnt(uid, NULL, NULL, &ret, NULL, false); return ret; } @@ -890,7 +898,7 @@ virGetUserDirectoryByUID(uid_t uid) char *virGetUserShell(uid_t uid) { char *ret; - virGetUserEnt(uid, NULL, NULL, NULL, &ret); + virGetUserEnt(uid, NULL, NULL, NULL, &ret, false); return ret; } @@ -940,7 +948,7 @@ char *virGetUserRuntimeDirectory(void) char *virGetUserName(uid_t uid) { char *ret; - virGetUserEnt(uid, &ret, NULL, NULL, NULL); + virGetUserEnt(uid, &ret, NULL, NULL, NULL, false); return ret; } @@ -1113,8 +1121,9 @@ virGetGroupID(const char *group, gid_t *gid) /* Compute the list of primary and supplementary groups associated * with @uid, and including @gid in the list (unless it is -1), * storing a malloc'd result into @list. Return the size of the list - * on success, or -1 on failure with error reported and errno set. May - * not be called between fork and exec. */ + * on success, or -1 on failure with no error reported as this usually isn't + * a fatal problem for callers. errno is set on error. May not be called + * between fork and exec. */ int virGetGroupList(uid_t uid, gid_t gid, gid_t **list) { @@ -1126,14 +1135,12 @@ virGetGroupList(uid_t uid, gid_t gid, gid_t **list) if (uid == (uid_t)-1) return 0; - if (virGetUserEnt(uid, &user, &primary, NULL, NULL) < 0) + if (virGetUserEnt(uid, &user, &primary, NULL, NULL, true) < 0) return -1; ret = mgetgroups(user, primary, list); if (ret < 0) { sa_assert(!*list); - virReportSystemError(errno, - _("cannot get group list for '%s'"), user); goto cleanup; } diff --git a/tools/virt-login-shell.c b/tools/virt-login-shell.c index 38fcb9e..2ad6634 100644 --- a/tools/virt-login-shell.c +++ b/tools/virt-login-shell.c @@ -303,8 +303,12 @@ main(int argc, char **argv) if (!(conf = virConfReadFile(login_shell_path, 0))) goto cleanup; - if ((ngroups = virGetGroupList(uid, gid, &groups)) < 0) + if ((ngroups = virGetGroupList(uid, gid, &groups)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to query supplementary group list for uid '%u'"), + (unsigned int) uid); goto cleanup; + } if (virLoginShellAllowedUser(conf, name, groups) < 0) goto cleanup; -- 2.8.3

2 1

[libvirt] [PATCH v4 0/3] qemu: expand domain memory statistics
by Derbyshev Dmitriy 16 Jun '16

16 Jun '16

From: Derbyshev Dmitry <dderbyshev(a)virtuozzo.com> QEMU reports timestamp and available along with other memory statistics. This information was not saved into domain statistics. Also, to collect all balloon statistics for all guests it was necessary to make several libvirt requests (one per VE). Last patch allows doing this via qemuConnectGetAllDomainStats in one request. Changes since v1: * Enum numeration fixed * Macro getting "usage" field fixed Changes since v2: * previous patches were on wrong branch * qemu's stat name was "stat-available-memory" Changes since v3: * 3rd patch added Derbyshev Dmitry (3): qemu: expand domain memory statistics with 'usable' qemu: expand domain memory statistics with 'last-update' timestamp qemu: return balloon statistics alongside all domain stats include/libvirt/libvirt-domain.h | 11 +++++- src/libvirt-domain.c | 5 +++ src/qemu/qemu_driver.c | 84 +++++++++++++++++++++++++++++++--------- src/qemu/qemu_monitor_json.c | 22 ++++++----- tools/virsh-domain-monitor.c | 4 ++ 5 files changed, 98 insertions(+), 28 deletions(-) -- 1.9.5.msysgit.0

2 6

[libvirt] [PATCH] xenconfig: fix conversion of <driver> to backendtype
by Jim Fehlig 16 Jun '16

16 Jun '16

When converting domXML to xen xl.cfg, backendtype should not be emitted if <driver> is not specified. Moreover, <driver name='file'/> should be converted to backendtype qdisk, similar to handling of <driver> in libxlMakeDisk() in libxl_conf.c. Prior to this change, connectDomainXMLToNative would produce incorrect xl.cfg when the input domXML contained <driver name='file'/> domXML: <disk type="file" device="disk"> <driver name="file"/> <source file="/image/file/path"/> <target dev="xvda" bus="xen"/> </disk> virsh domxml-to-native xen-xl domXML disk = [ "format=raw,vdev=xvda,access=rw,backendtype=target=/image/file/path" ] xl create xl.cfg config parsing error in disk specification: unknown value for backendtype: near `target=/image/file/path' in `format=raw,vdev=xvda,access=rw,backendtype=target=/image/file/path' Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/xenconfig/xen_xl.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index 5879c66..d524a82 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -857,13 +857,15 @@ xenFormatXLDisk(virConfValuePtr list, virDomainDiskDefPtr disk) } /* backendtype */ - virBufferAddLit(&buf, "backendtype="); - if (STREQ_NULLABLE(driver, "qemu")) - virBufferAddLit(&buf, "qdisk,"); - else if (STREQ_NULLABLE(driver, "tap")) - virBufferAddLit(&buf, "tap,"); - else if (STREQ_NULLABLE(driver, "phy")) - virBufferAddLit(&buf, "phy,"); + if (driver) { + virBufferAddLit(&buf, "backendtype="); + if (STREQ(driver, "qemu") || STREQ(driver, "file")) + virBufferAddLit(&buf, "qdisk,"); + else if (STREQ(driver, "tap")) + virBufferAddLit(&buf, "tap,"); + else if (STREQ(driver, "phy")) + virBufferAddLit(&buf, "phy,"); + } /* devtype */ if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) -- 2.1.4

2 2

[libvirt] [PATCH] util: fix missing broadcast address in bridge and tap device IP addresses
by Laine Stump 16 Jun '16

16 Jun '16

Commit b3d069872ce53eb added peer address setting to the low level virNetDevSetIPAddress() function, but ended up causing a segfault in cases where the caller passed NULL for peer address. Commit a3510e33d33e52c fixed the segfault, but managed to cause us to skip setting the broadcast address when setting an interface's IP address if the peer address was NULL. The result is that the broadcast address is 0.0.0.0 for all libvirt-created bridges (and for now also in interfaces in lxc containers with IP addresses set by libvirt). This was reported on the mailing list: https://www.redhat.com/archives/libvir-list/2016-June/msg00027.html but I was too busy to investigate at the time. I found it by accident today while refactoring virNetDevSetIPAddress(). Since this regression is present in the 1.3.5 release, I'm sending the bugfix as a separate simpler patch from my larger refactoring patchset. --- src/util/virnetdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 925b41f..5a4ccc6 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1129,7 +1129,8 @@ int virNetDevSetIPAddress(const char *ifname, unsigned int recvbuflen; /* The caller needs to provide a correct address */ - if (VIR_SOCKET_ADDR_FAMILY(addr) == AF_INET && peer && !VIR_SOCKET_ADDR_VALID(peer)) { + if (VIR_SOCKET_ADDR_FAMILY(addr) == AF_INET && + !(peer && VIR_SOCKET_ADDR_VALID(peer))) { /* compute a broadcast address if this is IPv4 */ if (VIR_ALLOC(broadcast) < 0) return -1; -- 2.4.11

2 2

[libvirt] [PATCH] util: remove redundant comments
by Chen Hanxiao 16 Jun '16

16 Jun '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/util/vireventpoll.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c index 5e99b3c..81ecab4 100644 --- a/src/util/vireventpoll.c +++ b/src/util/vireventpoll.c @@ -405,7 +405,6 @@ static struct pollfd *virEventPollMakePollFDs(int *nfds) { fds[*nfds].events = eventLoop.handles[i].events; fds[*nfds].revents = 0; (*nfds)++; - //EVENT_DEBUG("Wait for %d %d", eventLoop.handles[i].fd, eventLoop.handles[i].events); } return fds; -- 1.8.3.1

2 2

[libvirt] [PATCH python v2 0/2] Bindings for storage pool lifecycle events
by Jovanka Gulicoska 16 Jun '16

16 Jun '16

Changes since v1: use double newline spacing, change LIBVIRT_CHECK_VERSION to 2.0.0 Python buindings and tests for storage pool lifecycle events API. Function storageDetailToString() is not implemented for now. Jovanka Gulicoska (2): Python binding for storage pool lifecycle events API event-test: Add storage pool lifecycle event tests examples/event-test.py | 18 +++++ generator.py | 2 + libvirt-override-virConnect.py | 35 ++++++++++ libvirt-override.c | 153 +++++++++++++++++++++++++++++++++++++++++ sanitytest.py | 2 + 5 files changed, 210 insertions(+) -- 2.5.5

2 3

[libvirt] [PATCH v3 0/4] Some patches for native TLS encrypted chardev TCP support
by John Ferlan 16 Jun '16

16 Jun '16

v2: http://www.redhat.com/archives/libvir-list/2016-June/msg01044.html Patches 3 and 4 from original already pushed. Changes since v2: Patch 1: (the two bullets were ACK'd, but 3rd introduced new change so repost) * Change to using /etc/pki/qemu as the default directory name * Add description for dh-params.pem * Added default_tls_x509_verify Patch 2: * Change to using /etc/pki/qemu-chardev * Change charTCP/chartcp to chardev * Added chardev_tls_x509_verify Patch 3: (former patch 5) * Added processing for verify-peer and set in .args output Patch 4: (was ACK'd, but...) * Needed update due to new argument to qemuBuildTLSx509BackendProps John Ferlan (4): 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 src/conf/domain_conf.h | 1 + src/qemu/libvirtd_qemu.aug | 11 ++- src/qemu/qemu.conf | 83 ++++++++++++---- src/qemu/qemu_command.c | 109 ++++++++++++++++++++- src/qemu/qemu_command.h | 7 ++ src/qemu/qemu_conf.c | 59 +++++++++-- src/qemu/qemu_conf.h | 7 ++ src/qemu/qemu_hotplug.c | 30 +++++- src/qemu/qemu_monitor_json.c | 9 ++ src/qemu/test_libvirtd_qemu.aug.in | 5 + .../qemuxml2argv-serial-tcp-tlsx509-chardev.args | 33 +++++++ .../qemuxml2argv-serial-tcp-tlsx509-chardev.xml | 41 ++++++++ tests/qemuxml2argvtest.c | 6 ++ .../qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml | 50 ++++++++++ tests/qemuxml2xmltest.c | 1 + 15 files changed, 424 insertions(+), 28 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/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml -- 2.5.5

1 4

[libvirt] [PATCH 0/3] Tiny cleanups
by Martin Kletzander 16 Jun '16

16 Jun '16

John suggested I clean up some things, so here they are. 2 out of 3 are trivial, but the first patch would look really really ugly if I wquashed them together (feel free to try). Martin Kletzander (3): qemu: Unify automatic coredump filenames qemu: Follow coding style convention qemu: Remove useless block in processWatchdogEvent src/qemu/qemu_driver.c | 117 +++++++++++++++++++++++++------------------------ 1 file changed, 60 insertions(+), 57 deletions(-) -- 2.9.0

2 4

[libvirt] [PATCH] qemu: Shorten domain name for watchdog coredump
by Martin Kletzander 16 Jun '16

16 Jun '16

Similarly to commit d294f6b0dff7, if the name is long enough, the filename can be longer than filesystem's limit. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1334237 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_driver.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index efb3f854fb10..80d1d209a80c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3906,6 +3906,10 @@ static void processWatchdogEvent(virQEMUDriverPtr driver, virDomainObjPtr vm, in { int ret; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + char *domname = virDomainObjGetShortName(vm); + + if (!domname) + goto cleanup; switch (action) { case VIR_DOMAIN_WATCHDOG_ACTION_DUMP: @@ -3915,7 +3919,7 @@ static void processWatchdogEvent(virQEMUDriverPtr driver, virDomainObjPtr vm, in if (virAsprintf(&dumpfile, "%s/%s-%u", cfg->autoDumpPath, - vm->def->name, + domname, (unsigned int)time(NULL)) < 0) goto cleanup; @@ -3959,6 +3963,7 @@ static void processWatchdogEvent(virQEMUDriverPtr driver, virDomainObjPtr vm, in qemuDomainObjEndAsyncJob(driver, vm); cleanup: + VIR_FREE(domname); virObjectUnref(cfg); } -- 2.8.4

2 2

[libvirt] [PATCH] logging: remove concept of default log priority
by Daniel P. Berrange 16 Jun '16

16 Jun '16

The logging framework has categories which can be selectively enabled/disabled by setting a suitable LIBVIRT_LOG_FILTERS environment variable or config file setting. Along side that we also have the LIBVIRT_DEBUG environment variable which unconditionally enables every single category at DEBUG level. With the amount of logging produced by libvirt these days, the signal/noise ratio in the output from setting LIBVIRT_DEBUG is to poor for it to be useful. Originally the LIBVIRT_DEBUG env variable had a very specific use case - it resulted in logging of anything in our public API entrypoints. eg it turned on src/libvirt.c debugging and nothing else. Additionally it would always result in log messages being sent to stderr. When applied to any of the daemons, the log output no longers gets sent to stderr, but rather to whatever default log output has been configured by the daemon. If no log_outputs setting or LIBVIRT_LOG_OUTPUTS env is set, then messages will often go to the systemd journal or a /var/log/libvirt/libvirtd.log file rather than stderr. These factors have conspired to make the LIBVIRT_DEBUG env and/or default log priority to be pretty useless in the real world. This change attempts to take us back towards the original semantics of the LIBVIRT_DEBUG env variable as follows. If LIBVIRT_DEBUG is set to a plain integer, or log level string, then it will turn on logging for the "libvirt" log category at that level. Any other string will be parsed in the same way as LIBVIRT_LOG_FILTERS would be. In all cases use of LIBVIRT_DEBUG will result in an explicit output being added for stderr. This ensures that messages always go to stderr, even if other outputs are already configured. IOW, LIBVIRT_DEBUG=1 virsh or LIBVIRT_DEBUG=1 libvirtd will both result in printing logs of libvirt public API calls to stderr. Meanwhile setting LIBVIRT_DEBUG="1:qemu" is equivalent to setting LIBVIRT_LOG_FILTERS="1:qemu" and LIBVIRT_LOG_OUTPUTS="1:stderr" Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- daemon/libvirtd.c | 27 ++++++------ src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 3 +- src/locking/lock_daemon.c | 29 ++++++------- src/logging/log_daemon.c | 29 ++++++------- src/lxc/lxc_process.c | 7 ---- src/util/vircommand.c | 4 -- src/util/virlog.c | 104 +++++++++++++++++++--------------------------- src/util/virlog.h | 11 ++--- tests/eventtest.c | 6 +-- 10 files changed, 97 insertions(+), 124 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index cc5190f..e88a982 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -668,6 +668,8 @@ daemonSetupLogging(struct daemonConfig *config, bool verbose, bool godaemon) { + int level = VIR_LOG_WARN; + virLogReset(); /* @@ -684,9 +686,6 @@ daemonSetupLogging(struct daemonConfig *config, * level has been set, we must process variables in the opposite * order, each one overriding the previous. */ - if (config->log_level != 0) - virLogSetDefaultPriority(config->log_level); - virLogSetFromEnv(); if (virLogGetNbFilters() == 0) @@ -695,11 +694,14 @@ daemonSetupLogging(struct daemonConfig *config, if (virLogGetNbOutputs() == 0) virLogParseOutputs(config->log_outputs); - /* - * Command line override for --verbose - */ - if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) - virLogSetDefaultPriority(VIR_LOG_INFO); + if (config->log_level != 0 || verbose) { + level = config->log_level; + if (verbose && level > VIR_LOG_INFO) + level = VIR_LOG_INFO; + virLogDefineFilter("libvirt", level, 0); + if (virLogGetNbOutputs() == 0) + virLogParseOutputs("1:stderr"); + } /* * If no defined outputs, and either running @@ -711,7 +713,7 @@ daemonSetupLogging(struct daemonConfig *config, (godaemon || !isatty(STDIN_FILENO))) { char *tmp; if (access("/run/systemd/journal/socket", W_OK) >= 0) { - virLogPriority priority = virLogGetDefaultPriority(); + virLogPriority priority = level; /* By default we don't want to log too much stuff into journald as * it may employ rate limiting and thus block libvirt execution. */ @@ -735,8 +737,7 @@ daemonSetupLogging(struct daemonConfig *config, if (godaemon) { if (privileged) { if (virAsprintf(&tmp, "%d:file:%s/log/libvirt/libvirtd.log", - virLogGetDefaultPriority(), - LOCALSTATEDIR) == -1) + level, LOCALSTATEDIR) == -1) goto error; } else { char *logdir = virGetUserCacheDirectory(); @@ -753,14 +754,14 @@ daemonSetupLogging(struct daemonConfig *config, umask(old_umask); if (virAsprintf(&tmp, "%d:file:%s/libvirtd.log", - virLogGetDefaultPriority(), logdir) == -1) { + level, logdir) == -1) { VIR_FREE(logdir); goto error; } VIR_FREE(logdir); } } else { - if (virAsprintf(&tmp, "%d:stderr", virLogGetDefaultPriority()) < 0) + if (virAsprintf(&tmp, "%d:stderr", level) < 0) goto error; } virLogParseOutputs(tmp); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a980a32..5586d8b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1801,6 +1801,7 @@ virLogProbablyLogMessage; virLogReset; virLogSetDefaultPriority; virLogSetFromEnv; +virLogSourceGetPriority; virLogUnlock; virLogVMessage; diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index d927b37..51d6037 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -52,6 +52,7 @@ #define VIR_FROM_THIS VIR_FROM_LIBXL VIR_LOG_INIT("libxl.libxl_conf"); +VIR_LOG_INIT_FULL("libxl.libxl_context", virLogLibXL); /* see xen-unstable.hg/xen/include/asm-x86/cpufeature.h */ #define LIBXL_X86_FEATURE_PAE_MASK 0x40 @@ -1724,7 +1725,7 @@ libxlDriverConfigNew(void) } VIR_FREE(log_file); - switch (virLogGetDefaultPriority()) { + switch (virLogSourceGetPriority(&virLogLibXL)) { case VIR_LOG_DEBUG: log_level = XTL_DEBUG; break; diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index f889a34..426fe6b 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -454,6 +454,8 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config, bool verbose, bool godaemon) { + int level = VIR_LOG_WARN; + virLogReset(); /* @@ -470,9 +472,6 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config, * level has been set, we must process variables in the opposite * order, each one overriding the previous. */ - if (config->log_level != 0) - virLogSetDefaultPriority(config->log_level); - virLogSetFromEnv(); if (virLogGetNbFilters() == 0) @@ -481,6 +480,15 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config, if (virLogGetNbOutputs() == 0) virLogParseOutputs(config->log_outputs); + if (config->log_level != 0 || verbose) { + level = config->log_level; + if (verbose && level > VIR_LOG_INFO) + level = VIR_LOG_INFO; + virLogDefineFilter("libvirt", level, 0); + if (virLogGetNbOutputs() == 0) + virLogParseOutputs("1:stderr"); + } + /* * If no defined outputs, and either running * as daemon or not on a tty, then first try @@ -491,7 +499,7 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config, (godaemon || !isatty(STDIN_FILENO))) { char *tmp; if (access("/run/systemd/journal/socket", W_OK) >= 0) { - if (virAsprintf(&tmp, "%d:journald", virLogGetDefaultPriority()) < 0) + if (virAsprintf(&tmp, "%d:journald", level) < 0) goto error; virLogParseOutputs(tmp); VIR_FREE(tmp); @@ -508,8 +516,7 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config, if (godaemon) { if (privileged) { if (virAsprintf(&tmp, "%d:file:%s/log/libvirt/virtlockd.log", - virLogGetDefaultPriority(), - LOCALSTATEDIR) == -1) + level, LOCALSTATEDIR) == -1) goto error; } else { char *logdir = virGetUserCacheDirectory(); @@ -527,26 +534,20 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config, umask(old_umask); if (virAsprintf(&tmp, "%d:file:%s/virtlockd.log", - virLogGetDefaultPriority(), logdir) == -1) { + level, logdir) == -1) { VIR_FREE(logdir); goto error; } VIR_FREE(logdir); } } else { - if (virAsprintf(&tmp, "%d:stderr", virLogGetDefaultPriority()) < 0) + if (virAsprintf(&tmp, "%d:stderr", level) < 0) goto error; } virLogParseOutputs(tmp); VIR_FREE(tmp); } - /* - * Command line override for --verbose - */ - if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) - virLogSetDefaultPriority(VIR_LOG_INFO); - return 0; error: diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 90f8427..f344ba2 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -377,6 +377,8 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, bool verbose, bool godaemon) { + int level = VIR_LOG_WARN; + virLogReset(); /* @@ -393,9 +395,6 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, * level has been set, we must process variables in the opposite * order, each one overriding the previous. */ - if (config->log_level != 0) - virLogSetDefaultPriority(config->log_level); - virLogSetFromEnv(); if (virLogGetNbFilters() == 0) @@ -404,6 +403,15 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, if (virLogGetNbOutputs() == 0) virLogParseOutputs(config->log_outputs); + if (config->log_level != 0 || verbose) { + level = config->log_level; + if (verbose && level > VIR_LOG_INFO) + level = VIR_LOG_INFO; + virLogDefineFilter("libvirt", level, 0); + if (virLogGetNbOutputs() == 0) + virLogParseOutputs("1:stderr"); + } + /* * If no defined outputs, and either running * as daemon or not on a tty, then first try @@ -414,7 +422,7 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, (godaemon || !isatty(STDIN_FILENO))) { char *tmp; if (access("/run/systemd/journal/socket", W_OK) >= 0) { - if (virAsprintf(&tmp, "%d:journald", virLogGetDefaultPriority()) < 0) + if (virAsprintf(&tmp, "%d:journald", level) < 0) goto error; virLogParseOutputs(tmp); VIR_FREE(tmp); @@ -431,8 +439,7 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, if (godaemon) { if (privileged) { if (virAsprintf(&tmp, "%d:file:%s/log/libvirt/virtlogd.log", - virLogGetDefaultPriority(), - LOCALSTATEDIR) == -1) + level, LOCALSTATEDIR) == -1) goto error; } else { char *logdir = virGetUserCacheDirectory(); @@ -450,26 +457,20 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, umask(old_umask); if (virAsprintf(&tmp, "%d:file:%s/virtlogd.log", - virLogGetDefaultPriority(), logdir) == -1) { + level, logdir) == -1) { VIR_FREE(logdir); goto error; } VIR_FREE(logdir); } } else { - if (virAsprintf(&tmp, "%d:stderr", virLogGetDefaultPriority()) < 0) + if (virAsprintf(&tmp, "%d:stderr", level) < 0) goto error; } virLogParseOutputs(tmp); VIR_FREE(tmp); } - /* - * Command line override for --verbose - */ - if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) - virLogSetDefaultPriority(VIR_LOG_INFO); - return 0; error: diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 8981d9a..9fca007 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -918,9 +918,6 @@ virLXCProcessBuildControllerCmd(virLXCDriverPtr driver, /* The controller may call ip command, so we have to retain PATH. */ virCommandAddEnvPassBlockSUID(cmd, "PATH", "/bin:/usr/bin"); - virCommandAddEnvFormat(cmd, "LIBVIRT_DEBUG=%d", - virLogGetDefaultPriority()); - if (virLogGetNbFilters() > 0) { filterstr = virLogGetFilters(); if (!filterstr) { @@ -943,10 +940,6 @@ virLXCProcessBuildControllerCmd(virLXCDriverPtr driver, virCommandAddEnvPair(cmd, "LIBVIRT_LOG_OUTPUTS", outputstr); VIR_FREE(outputstr); } - } else { - virCommandAddEnvFormat(cmd, - "LIBVIRT_LOG_OUTPUTS=%d:stderr", - virLogGetDefaultPriority()); } virCommandAddArgList(cmd, "--name", vm->def->name, NULL); diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 027cb64..07cd005 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -342,8 +342,6 @@ virFork(void) } else { /* child process */ - - int logprio; size_t i; /* Remove any error callback so errors in child now get sent @@ -354,9 +352,7 @@ virFork(void) /* Make sure any hook logging is sent to stderr, since child * process may close the logfile FDs */ - logprio = virLogGetDefaultPriority(); virLogReset(); - virLogSetDefaultPriority(logprio); /* Clear out all signal handlers from parent so nothing * unexpected can happen in our child once we unblock diff --git a/src/util/virlog.c b/src/util/virlog.c index 738eaac..82fb4dc 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -112,11 +112,6 @@ typedef virLogOutput *virLogOutputPtr; static virLogOutputPtr virLogOutputs; static int virLogNbOutputs; -/* - * Default priorities - */ -static virLogPriority virLogDefaultPriority = VIR_LOG_DEFAULT; - static int virLogResetFilters(void); static int virLogResetOutputs(void); static void virLogOutputToFd(virLogSourcePtr src, @@ -175,7 +170,6 @@ virLogOnceInit(void) return -1; virLogLock(); - virLogDefaultPriority = VIR_LOG_DEFAULT; if (VIR_ALLOC_QUIET(virLogRegex) >= 0) { if (regcomp(virLogRegex, VIR_LOG_REGEX, REG_EXTENDED) != 0) @@ -205,35 +199,10 @@ virLogReset(void) virLogLock(); virLogResetFilters(); virLogResetOutputs(); - virLogDefaultPriority = VIR_LOG_DEFAULT; virLogUnlock(); return 0; } -/** - * virLogSetDefaultPriority: - * @priority: the default priority level - * - * Set the default priority level, i.e. any logged data of a priority - * equal or superior to this level will be logged, unless a specific rule - * was defined for the log category of the message. - * - * Returns 0 if successful, -1 in case of error. - */ -int -virLogSetDefaultPriority(virLogPriority priority) -{ - if ((priority < VIR_LOG_DEBUG) || (priority > VIR_LOG_ERROR)) { - VIR_WARN("Ignoring invalid log level setting."); - return -1; - } - if (virLogInitialize() < 0) - return -1; - - virLogDefaultPriority = priority; - return 0; -} - /** * virLogResetFilters: @@ -472,7 +441,7 @@ virLogSourceUpdate(virLogSourcePtr source) { virLogLock(); if (source->serial < virLogFiltersSerial) { - unsigned int priority = virLogDefaultPriority; + unsigned int priority = VIR_LOG_DEFAULT; unsigned int flags = 0; size_t i; @@ -1310,18 +1279,6 @@ virLogParseFilters(const char *filters) /** - * virLogGetDefaultPriority: - * - * Returns the current logging priority level. - */ -virLogPriority -virLogGetDefaultPriority(void) -{ - return virLogDefaultPriority; -} - - -/** * virLogGetFilters: * * Returns a string listing the current filters, in the format originally @@ -1423,35 +1380,53 @@ virLogGetNbOutputs(void) /** - * virLogParseDefaultPriority: + * virLogParseDebug: * @priority: string defining the desired logging level * - * Parses and sets the default log priority level. It can take a string or - * number corresponding to the following levels: + * This method is a shortcut for setting a filter + * along with output to stderr. + * + * It can take one of the following strings or numbers: + * * 1: DEBUG * 2: INFO * 3: WARNING * 4: ERROR * + * in which case it will set the priority level on the + * "libvirt" log source filter. If it does not match any + * of these standard strings it will be treated as a full + * filter string. + * + * In all cases an output to stderr will be defined. + * * Returns 0 if successful, -1 in case of error. */ int -virLogParseDefaultPriority(const char *priority) +virLogParseDebug(const char *debug) { - int ret = -1; + unsigned int priority = VIR_LOG_DEFAULT; + if (STREQ(debug, "1") || STREQ(debug, "debug")) + priority = VIR_LOG_DEBUG; + else if (STREQ(debug, "2") || STREQ(debug, "info")) + priority = VIR_LOG_INFO; + else if (STREQ(debug, "3") || STREQ(debug, "warning")) + priority = VIR_LOG_WARN; + else if (STREQ(debug, "4") || STREQ(debug, "error")) + priority = VIR_LOG_ERROR; + + if (priority == VIR_LOG_DEFAULT) { + if (virLogParseFilters(debug) < 0) + return -1; + } else { + if (virLogDefineFilter("libvirt", priority, 0) < 0) + return -1; + } - if (STREQ(priority, "1") || STREQ(priority, "debug")) - ret = virLogSetDefaultPriority(VIR_LOG_DEBUG); - else if (STREQ(priority, "2") || STREQ(priority, "info")) - ret = virLogSetDefaultPriority(VIR_LOG_INFO); - else if (STREQ(priority, "3") || STREQ(priority, "warning")) - ret = virLogSetDefaultPriority(VIR_LOG_WARN); - else if (STREQ(priority, "4") || STREQ(priority, "error")) - ret = virLogSetDefaultPriority(VIR_LOG_ERROR); - else - VIR_WARN("Ignoring invalid log level setting"); + if (virLogParseOutputs("1:stderr") < 0) + return -1; - return ret; + return 0; } @@ -1471,7 +1446,7 @@ virLogSetFromEnv(void) debugEnv = virGetEnvAllowSUID("LIBVIRT_DEBUG"); if (debugEnv && *debugEnv) - virLogParseDefaultPriority(debugEnv); + virLogParseDebug(debugEnv); debugEnv = virGetEnvAllowSUID("LIBVIRT_LOG_FILTERS"); if (debugEnv && *debugEnv) virLogParseFilters(debugEnv); @@ -1495,3 +1470,10 @@ bool virLogProbablyLogMessage(const char *str) ret = true; return ret; } + + +int virLogSourceGetPriority(virLogSourcePtr source) +{ + virLogSourceUpdate(source); + return source->priority; +} diff --git a/src/util/virlog.h b/src/util/virlog.h index 3ad00d4..aace409 100644 --- a/src/util/virlog.h +++ b/src/util/virlog.h @@ -73,13 +73,14 @@ struct _virLogSource { * log statements in a file are conditionally disabled * at compile time due to configure options. */ -# define VIR_LOG_INIT(n) \ - static ATTRIBUTE_UNUSED virLogSource virLogSelf = { \ +# define VIR_LOG_INIT_FULL(n, _var) \ + static ATTRIBUTE_UNUSED virLogSource _var = { \ .name = "" n "", \ .priority = VIR_LOG_ERROR, \ .serial = 0, \ .flags = 0, \ }; +# define VIR_LOG_INIT(n) VIR_LOG_INIT_FULL(n, virLogSelf) /* * If configured with --enable-debug=yes then library calls @@ -174,8 +175,6 @@ int virLogGetNbFilters(void); int virLogGetNbOutputs(void); char *virLogGetFilters(void); char *virLogGetOutputs(void); -virLogPriority virLogGetDefaultPriority(void); -int virLogSetDefaultPriority(virLogPriority priority); void virLogSetFromEnv(void); int virLogDefineFilter(const char *match, virLogPriority priority, @@ -195,7 +194,7 @@ int virLogDefineOutput(virLogOutputFunc f, void virLogLock(void); void virLogUnlock(void); int virLogReset(void); -int virLogParseDefaultPriority(const char *priority); +int virLogParseDebug(const char *debug); int virLogParseFilters(const char *filters); int virLogParseOutputs(const char *output); int virLogPriorityFromSyslog(int priority); @@ -217,4 +216,6 @@ void virLogVMessage(virLogSourcePtr source, bool virLogProbablyLogMessage(const char *str); +int virLogSourceGetPriority(virLogSourcePtr source); + #endif diff --git a/tests/eventtest.c b/tests/eventtest.c index c4be606..0a31672 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -310,11 +310,7 @@ mymain(void) if (virThreadInitialize() < 0) return EXIT_FAILURE; - char *debugEnv = getenv("LIBVIRT_DEBUG"); - if (debugEnv && *debugEnv && (virLogParseDefaultPriority(debugEnv) == -1)) { - fprintf(stderr, "Invalid log level setting.\n"); - return EXIT_FAILURE; - } + virLogSetFromEnv(); virEventPollInit(); -- 2.5.5

4 5

[libvirt] [PATCH] A word error about net-dumpxml --inactive
by sannyshao 16 Jun '16

16 Jun '16

--- tools/virsh-network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 5abcda3..fcf1f0b 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -282,7 +282,7 @@ static const vshCmdOptDef opts_network_dumpxml[] = { VIRSH_COMMON_OPT_NETWORK, {.name = "inactive", .type = VSH_OT_BOOL, - .help = N_("network information of an inactive domain") + .help = N_("network information of an inactive network") }, {.name = NULL} }; -- 1.8.3.1

2 1

[libvirt] [PATCH v2 0/6] Some patches for native TLS encrypted chardev TCP support
by John Ferlan 16 Jun '16

16 Jun '16

v1: http://www.redhat.com/archives/libvir-list/2016-June/msg00824.html Based on Dan's review from patch 4, alter the methodology to use the libvirt qemu config file to add support for a 'default' and (at first) a 'chartcp' (I could use chardev, but I was concerned that would imply more options - udp, unix, etc.). I have started on the authentication portion of this (e.g. a passwordid= parameter pointing at a secret object), but I'm a bit held up by the need to have the secret key patches. I've separated those out and will post a separate set shortly as well to hopefully get some traction. For the chartcp, I went with the 'default' location for the /etc/pki path - that will at least test patch 1. I also tested those locally by removing the code in qemuxml2xmltest.c to specify the specific -vnc or -spice paths as the test has. John Ferlan (6): conf: Add new default TLS X.509 certificate default directory conf: Introduce chartcp_tls_x509_cert_dir qemu: Make qemuBuildShmemBackendStr private qemu: Add cfg pointer to various command line helpers qemu: Add support for TLS X.509 path to TCP chardev backend qemu: Add the ability to hotplug the TLS X.509 environment src/conf/domain_conf.h | 1 + src/qemu/libvirtd_qemu.aug | 9 +- src/qemu/qemu.conf | 52 ++++--- src/qemu/qemu_command.c | 158 ++++++++++++++++++--- src/qemu/qemu_command.h | 12 +- src/qemu/qemu_conf.c | 45 +++++- src/qemu/qemu_conf.h | 5 + src/qemu/qemu_hotplug.c | 29 +++- src/qemu/qemu_monitor_json.c | 9 ++ src/qemu/test_libvirtd_qemu.aug.in | 3 + .../qemuxml2argv-serial-tcp-tlsx509-chardev.args | 33 +++++ .../qemuxml2argv-serial-tcp-tlsx509-chardev.xml | 41 ++++++ tests/qemuxml2argvtest.c | 6 + .../qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml | 50 +++++++ tests/qemuxml2xmltest.c | 1 + 15 files changed, 399 insertions(+), 55 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/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml -- 2.5.5

2 13

[libvirt] [PATCH 0/2] qemu: active blockjob error tweaks
by Cole Robinson 16 Jun '16

16 Jun '16

Just a couple error message tweaks/cleanups regarding active block jobs, noticed while looking at https://bugzilla.redhat.com/show_bug.cgi?id=1342276 Cole Robinson (2): qemu: More usage of qemuDomainDiskBlockJobIsActive qemu: migration: use consistent error message src/qemu/qemu_driver.c | 7 +------ src/qemu/qemu_hotplug.c | 6 +----- src/qemu/qemu_migration.c | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) -- 2.7.4

2 5

[libvirt] [PATCH 0/2] Don't add a pci-bridge unless needed on Q35/aarch64
by Laine Stump 16 Jun '16

16 Jun '16

I had these in a branch waiting for further work to make them more useful, and abologna asked about this topic, so I'm posting these two patches. Note that in most cases we'll still get a pci-bridge device added (since most devices are legacy PCI) but at least if the config doesn't have any unaddressed PCI devices, that won't happen. As patch 1 states, the dmi-to-pci-bridge will still be there in all cases for Q35/aarch64. That needs more work to eliminate. Laine Stump (2): qemu: don't be as insistent about adding dmi-to-pci-bridge or pci-bridge qemu: don't add pci-bridge to Q35/arm domains unless it's needed src/qemu/qemu_domain.c | 14 +++++++------- .../qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args | 1 - .../qemuxml2argv-aarch64-virtio-pci-default.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args | 3 +-- .../qemuxml2xmlout-aarch64-virtio-pci-default.xml | 5 ----- tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root.xml | 5 ----- 6 files changed, 8 insertions(+), 21 deletions(-) -- 2.5.5

2 4

[libvirt] [PATCH] util: Fix broken syntax-check
by John Ferlan 16 Jun '16

16 Jun '16

Commit id '743db933' broke at least one syntax check rule regard open/close braces and perhaps more with spacing. Just remove the braces Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as build breaker src/util/virauthconfig.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c index b58937c..91c9c0c 100644 --- a/src/util/virauthconfig.c +++ b/src/util/virauthconfig.c @@ -123,9 +123,8 @@ int virAuthConfigLookup(virAuthConfigPtr auth, if (!virKeyFileHasGroup(auth->keyfile, authgroup)) { VIR_FREE(authgroup); - if (virAsprintf(&authgroup, "auth-%s-%s", service, "default") < 0){ + if (virAsprintf(&authgroup, "auth-%s-%s", service, "default") < 0) goto cleanup; - } } if (!virKeyFileHasGroup(auth->keyfile, authgroup)) { -- 2.5.5

1 0

[libvirt] RFC: New CPU hot(un)plug API and XML
by Peter Krempa 16 Jun '16

16 Jun '16

Hi list, I'm planing on adding API that will be used instead of virDomainSetVcpus and will allow a more granular control of which virtual CPUs are enabled for a guest. The new approach will allow to use cpu hotplug properly with NUMA guests as the old APIs would not allow adding CPUs to very specific cgroups. The old APIs should still work fine with the current approach although the final implementation should also allow to unplug vcpus from the guest by using new qemu features. I'm still not sure though whether it will be possible to use this in a backward compatible fashion though depending how this stuff will exactly need to be set up in qemu. # API # As for the new API I'm thinking of the following design: int virDomainVcpu(virDomainPtr domain, unsigned int id, unsigned int flags); The flags for this API would be following: - usual domain modification impact: * VIR_DOMAIN_SET_VCPU_CURRENT * VIR_DOMAIN_SET_VCPU_LIVE * VIR_DOMAIN_SET_VCPU_CONFIG - for specifying the operation as the default operation would query the cpu state: * VIR_DOMAIN_SET_VCPU_ENABLE * VIR_DOMAIN_SET_VCPU_DISABLE - misc: * VIR_DOMAIN_SET_VCPU_GUEST - use the guest agent instead of ACPI hotplug * VIR_DOMAIN_SET_VCPU_NUMA_NODE - 'id' is the ID of a numa node where the cpu should be enabled/disabled rather than CPU id. This is a convenience flag that will allow to add cpu to a given numa node rather than having to find the correct ID. * VIR_DOMAIN_SET_VCPU_CORE - use thread level hotplug (see [1]). This makes sure that the CPU will be plugged in on platforms that require to plug in multiple threads at once. VIR_DOMAIN_SET_VCPU_NUMA_NODE and VIR_DOMAIN_SET_VCPU_GUEST are mutually exclusive as the guest agent doesn't report the guest numa node the CPU is belonging to . If the idea of one API that will both query and set is too nonconformist to our existing API design I have no problem adding Get/Set versions and/or explode the ADD/REMOVE flags into a separate parameter. # XML # The new API will require us to add new XML that will allow to track the state of VCPUs individually. Internally we now have a data structure allowing to keep the relevant data in one place. Currently we are setting data relevant to VCPUs in many places. <domain> [...] <vcpu current='1'>3</vcpu> [...] <cputune> <cpupin ... /> </cputune> [...] <cpu> <numa> <cell id='0' cpus='0' memory='102400' unit='KiB/> <cell id='1' cpus='1-2' memory='102400' unit='KiB/> </numa> As we'll be required to keep the state for every single cpu I'm thinking of adding a new subelement called '<vcpus>' to <domain>. This will have a '<vcpu>' subelement for every configured cpu. I'm specifically not going to add any of the cpupin or numa node ids to the /domain/vcpus/vcpu as input parameters to avoid introducing very compicated checking code that would be required to keep the data in sync. I'm thinking of adding the numa node id as an output only attribute since it's relevant to the hotplug case and it's misplaced otherwise. I certainly can add the duplicated data as output-only attributes. The XML with the new elements should look like: <domain> [...] <vcpu current='1'>3</vcpu> <vcpus> <vcpu id='0' state='enabled'/> <-- option 1, no extra data <vcpu id='1' state='disabled' cell='1'/> <--- option 2, just numa node, since it's non-obvious <vcpu id='2' state='disabled' cell='1' pin='1-2' scheduler='...'/>  </vcpus> [...] <cputune> <cpupin ... /> </cputune> [...] <cpu> <numa> <cell id='0' cpus='0' memory='102400' unit='KiB/> <cell id='1' cpus='1-2' memory='102400' unit='KiB/> </numa> # migration # To ensure migration compatibility a new libvirt will set a new migration feature flag in cases where a sparse topology was created by any means. Older versions of libvirt will reject it. As the new cpu data will be ignored by the parser of older libvirt we don't need to stop formatting them on migration. (fortunately schemas are not validated during migration) # qemu/platform implementation caveats # When starting the VM for the first time it might be necessary to start a throw-away qemu process to query some details that we'll need to pass in on a command line. I'm not sure if this is still necessary and I'll try to avoid it at all cost. [1] Some architectures (ppc64) don't directly support thread-level hotplug and thus require us to plug in a core which translates into multiple threads (8 in case of power 8). Possibly other yet unknown problems. Thanks for your feedback. Peter

3 4

[libvirt] [PATCH] syntax-check: drop prohibit_undesirable_word_seq
by Ján Tomko 16 Jun '16

16 Jun '16

This checks forbids using "can not" and checks the placement of some texinfo tags. Drop it since we do not use texinfo and the check takes almost twice as much as the rest of the checks. --- cfg.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/cfg.mk b/cfg.mk index 297ca3a..d82070d 100644 --- a/cfg.mk +++ b/cfg.mk @@ -64,6 +64,7 @@ local-checks-to-skip = \ sc_prohibit_quote_without_use \ sc_prohibit_quotearg_without_use \ sc_prohibit_stat_st_blocks \ + sc_prohibit_undesirable_word_seq \ sc_root_tests \ sc_space_tab \ sc_sun_os_names \ -- 2.7.3

2 1