- Devel - libvirt List Archives

[libvirt] [libvirt-perl PATCH] Add blkdeviotune group_name parameter
by John Ferlan 06 Dec '16

06 Dec '16

Add VIR_DOMAIN_{BLOCK_IOTUNE|TUNABLE_BLKDEV}_GROUP_NAME parameters and the description. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Changes | 2 +- Virt.xs | 2 ++ lib/Sys/Virt/Domain.pm | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Changes b/Changes index 721f036..c9a36dd 100644 --- a/Changes +++ b/Changes @@ -2,7 +2,7 @@ Revision history for perl module Sys::Virt 3.0.0 2017-00-00 - - XXX + - Add group_name for block iotune 2.5.0 2016-12-05 diff --git a/Virt.xs b/Virt.xs index cbf2e7b..ac14feb 100644 --- a/Virt.xs +++ b/Virt.xs @@ -8275,6 +8275,7 @@ BOOT: REGISTER_CONSTANT_STR(VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC_MAX, BLOCK_IOTUNE_READ_IOPS_SEC_MAX); REGISTER_CONSTANT_STR(VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX, BLOCK_IOTUNE_WRITE_IOPS_SEC_MAX); REGISTER_CONSTANT_STR(VIR_DOMAIN_BLOCK_IOTUNE_SIZE_IOPS_SEC, BLOCK_IOTUNE_SIZE_IOPS_SEC); + REGISTER_CONSTANT_STR(VIR_DOMAIN_BLOCK_IOTUNE_GROUP_NAME, BLOCK_IOTUNE_GROUP_NAME); REGISTER_CONSTANT_STR(VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX_LENGTH, BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX_LENGTH); REGISTER_CONSTANT_STR(VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC_MAX_LENGTH, BLOCK_IOTUNE_READ_BYTES_SEC_MAX_LENGTH); REGISTER_CONSTANT_STR(VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX_LENGTH, BLOCK_IOTUNE_WRITE_BYTES_SEC_MAX_LENGTH); @@ -8491,6 +8492,7 @@ BOOT: REGISTER_CONSTANT_STR(VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX, TUNABLE_BLKDEV_TOTAL_BYTES_SEC_MAX); REGISTER_CONSTANT_STR(VIR_DOMAIN_TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX, TUNABLE_BLKDEV_TOTAL_IOPS_SEC_MAX); REGISTER_CONSTANT_STR(VIR_DOMAIN_TUNABLE_BLKDEV_SIZE_IOPS_SEC, TUNABLE_BLKDEV_SIZE_IOPS_SEC); + REGISTER_CONSTANT_STR(VIR_DOMAIN_TUNABLE_BLKDEV_GROUP_NAME, TUNABLE_BLKDEV_GROUP_NAME); REGISTER_CONSTANT_STR(VIR_DOMAIN_TUNABLE_BLKDEV_READ_BYTES_SEC_MAX_LENGTH, TUNABLE_BLKDEV_READ_BYTES_SEC_MAX_LENGTH); REGISTER_CONSTANT_STR(VIR_DOMAIN_TUNABLE_BLKDEV_READ_IOPS_SEC_MAX_LENGTH, TUNABLE_BLKDEV_READ_IOPS_SEC_MAX_LENGTH); REGISTER_CONSTANT_STR(VIR_DOMAIN_TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX_LENGTH, TUNABLE_BLKDEV_WRITE_BYTES_SEC_MAX_LENGTH); diff --git a/lib/Sys/Virt/Domain.pm b/lib/Sys/Virt/Domain.pm index ba58f26..e11440d 100644 --- a/lib/Sys/Virt/Domain.pm +++ b/lib/Sys/Virt/Domain.pm @@ -2566,6 +2566,11 @@ The maximum I/O operations written per second. The maximum I/O operations per second +=item Sys::Virt::Domain::BLOCK_IOTUNE_GROUP_NAME + +A string representing a group name to allow sharing of I/O +throttling quota between multiple drives + =item Sys::Virt::Domain::BLOCK_IOTUNE_TOTAL_BYTES_SEC_MAX_LENGTH The duration in seconds allowed for maximum total bytes processed per second. -- 2.7.4

2 1

[libvirt] [PATCH] qemu: capabilities: Add gluster.debug_level detection for 2.8.0+
by Peter Krempa 06 Dec '16

06 Dec '16

Qemu 2.8.0+ changes arguments structure for blockdev-add in the effort to make it finally stable. Since libvirt recently added the detection of gluster debug support relying on the old syntax we need to add the new as well. --- src/qemu/qemu_capabilities.c | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index df417f2..214f848 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1725,6 +1725,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUSBNECXHCI[] = { /* see documentation for virQEMUCapsQMPSchemaGetByPath for the query format */ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = { { "blockdev-add/arg-type/options/+gluster/debug-level", QEMU_CAPS_GLUSTER_DEBUG_LEVEL}, + { "blockdev-add/arg-type/+gluster/debug-level", QEMU_CAPS_GLUSTER_DEBUG_LEVEL}, }; struct virQEMUCapsObjectTypeProps { diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index f5e467c..60c53bc 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -195,6 +195,7 @@ <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='query-qmp-schema'/> + <flag name='gluster.debug_level'/> <flag name='vhost-scsi'/> <flag name='drive-iotune-group'/> <version>2007091</version> -- 2.10.2

2 3

[libvirt] [PATCH] perf: add one more perf event support
by Nitesh Konkar 06 Dec '16

06 Dec '16

With current perf framework, this patch adds support and documentation for branch instructions perf event. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- docs/formatdomain.html.in | 6 ++++ docs/schemas/domaincommon.rng | 1 + include/libvirt/libvirt-domain.h | 10 +++++++ src/libvirt-domain.c | 38 +++++++++++++------------ src/qemu/qemu_driver.c | 1 + src/util/virperf.c | 6 +++- src/util/virperf.h | 9 +++--- tests/genericxml2xmlindata/generic-perf.xml | 1 + tools/virsh.pod | 43 +++++++++++++++-------------- 9 files changed, 72 insertions(+), 43 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 6bd02cc..259b2c6 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1927,6 +1927,7 @@ <event name='instructions' enabled='yes'/> <event name='cache_references' enabled='no'/> <event name='cache_misses' enabled='no'/> + <event name='branch_instructions' enabled='no'/> </perf> ... </pre> @@ -1972,6 +1973,11 @@ <td>the count of cache misses by applications running on the platform</td> <td><code>perf.cache_misses</code></td> </tr> + <tr> + <td><code>hardware_instructions</code></td> + <td>the count of hardware instructions by applications running on the platform</td> + <td><code>perf.hardware_instructions</code></td> + </tr> </table> <h3><a name="elementsDevices">Devices</a></h3> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index bb903ef..5fdc036 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -427,6 +427,7 @@ <value>instructions</value> <value>cache_references</value> <value>cache_misses</value> + <value>branch_instructions</value> </choice> </attribute> <attribute name="enabled"> diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index a8435ab..aad2541 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2125,6 +2125,16 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); */ # define VIR_PERF_PARAM_CPU_CYCLES "cpu_cycles" +/** + * VIR_PERF_PARAM_BRANCH_INSTRUCTIONS: + * + * Macro for typed parameter name that represents branch instructions + * perf event which can be used to measure the count of branch instructions + * by applications running on the platform. It corresponds to the + * "perf.branch_instructions" field in the *Stats APIs. + */ +# define VIR_PERF_PARAM_BRANCH_INSTRUCTIONS "branch_instructions" + int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, int *nparams, diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index ce199f0..c12c87f 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11195,24 +11195,26 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * * VIR_DOMAIN_STATS_PERF: Return perf event statistics. * The typed parameter keys are in this format: - * "perf.cmt" - the usage of l3 cache (bytes) by applications running on the - * platform as unsigned long long. It is produced by cmt perf - * event. - * "perf.mbmt" - the total system bandwidth (bytes/s) from one level of cache - * to another as unsigned long long. It is produced by mbmt perf - * event. - * "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 count of cache misses as unsigned long long. - * It is produced by cache_misses perf event. - * "perf.cache_references" - the count of cache hits as unsigned long long. - * It is produced by cache_references perf event. - * "perf.instructions" - The count of instructions as unsigned long long. - * It is produced by instructions perf event. - * "perf.cpu_cycles" - The count of cpu cycles (total/elapsed) as an - * unsigned long long. It is produced by cpu_cycles - * perf event. + * "perf.cmt" - the usage of l3 cache (bytes) by applications running on the + * platform as unsigned long long. It is produced by cmt perf + * event. + * "perf.mbmt" - the total system bandwidth (bytes/s) from one level of cache + * to another as unsigned long long. It is produced by mbmt perf + * event. + * "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 count of cache misses as unsigned long long. + * It is produced by cache_misses perf event. + * "perf.cache_references" - the count of cache hits as unsigned long long. + * It is produced by cache_references perf event. + * "perf.instructions" - The count of instructions as unsigned long long. + * It is produced by instructions perf event. + * "perf.cpu_cycles" - The count of cpu cycles (total/elapsed) as an + * unsigned long long. It is produced by cpu_cycles + * perf event. + * "perf.branch_instructions" - The count of branch instructions as unsigned long long. + * It is produced by branch_instructions 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 3517aa2..c7fad30 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9852,6 +9852,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom, VIR_PERF_PARAM_INSTRUCTIONS, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_CACHE_REFERENCES, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_CACHE_MISSES, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_BRANCH_INSTRUCTIONS, VIR_TYPED_PARAM_BOOLEAN, NULL) < 0) return -1; diff --git a/src/util/virperf.c b/src/util/virperf.c index 5d57962..635faf1 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -40,7 +40,8 @@ VIR_LOG_INIT("util.perf"); VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, "cmt", "mbmt", "mbml", "cpu_cycles", "instructions", - "cache_references", "cache_misses"); + "cache_references", "cache_misses", + "branch_instructions"); struct virPerfEvent { int type; @@ -85,6 +86,9 @@ static struct virPerfEventAttr attrs[] = { {.type = VIR_PERF_EVENT_CACHE_MISSES, .attrType = PERF_TYPE_HARDWARE, .attrConfig = PERF_COUNT_HW_CACHE_MISSES}, + {.type = VIR_PERF_EVENT_BRANCH_INSTRUCTIONS, + .attrType = PERF_TYPE_HARDWARE, + .attrConfig = PERF_COUNT_HW_BRANCH_INSTRUCTIONS}, }; typedef struct virPerfEventAttr *virPerfEventAttrPtr; diff --git a/src/util/virperf.h b/src/util/virperf.h index 3fca2d0..e43f332 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -32,10 +32,11 @@ typedef enum { VIR_PERF_EVENT_MBMT, /* Memory Bandwidth Monitoring Total */ VIR_PERF_EVENT_MBML, /* Memory Bandwidth Monitor Limit for controller */ - VIR_PERF_EVENT_CPU_CYCLES, /* Count of CPU Cycles (total/elapsed) */ - VIR_PERF_EVENT_INSTRUCTIONS, /* Count of instructions for application */ - VIR_PERF_EVENT_CACHE_REFERENCES, /* Cache hits by applications */ - VIR_PERF_EVENT_CACHE_MISSES, /* Cache misses by applications */ + VIR_PERF_EVENT_CPU_CYCLES, /* Count of CPU Cycles (total/elapsed) */ + VIR_PERF_EVENT_INSTRUCTIONS, /* Count of instructions for application */ + VIR_PERF_EVENT_CACHE_REFERENCES, /* Cache hits by applications */ + VIR_PERF_EVENT_CACHE_MISSES, /* Cache misses by applications */ + VIR_PERF_EVENT_BRANCH_INSTRUCTIONS, /* Count of branch instructions by applications*/ VIR_PERF_EVENT_LAST } virPerfEventType; diff --git a/tests/genericxml2xmlindata/generic-perf.xml b/tests/genericxml2xmlindata/generic-perf.xml index a914133..92e5847 100644 --- a/tests/genericxml2xmlindata/generic-perf.xml +++ b/tests/genericxml2xmlindata/generic-perf.xml @@ -20,6 +20,7 @@ <event name='instructions' enabled='yes'/> <event name='cache_references' enabled='no'/> <event name='cache_misses' enabled='no'/> + <event name='branch_instructions' enabled='yes'/> </perf> <devices> </devices> diff --git a/tools/virsh.pod b/tools/virsh.pod index 247d235..aa5b756 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -945,7 +945,8 @@ I<--perf> returns the statistics of all enabled perf events: "perf.cpu_cycles" - the count of cpu cycles (total/elapsed), "perf.instructions" - the count of instructions, "perf.cache_references" - the count of cache hits, -"perf.cache_misses" - the count of caches misses +"perf.cache_misses" - the count of caches misses, +"perf.branch_instructions" - the count of branch instructions See the B<perf> command for more details about each event. @@ -2270,25 +2271,27 @@ performance event. B<eventSpec> is a string list of one or more events separated by commas. Valid event names are as follows: B<Valid perf event names> - cmt - A PQos (Platform Qos) feature to monitor the - usage of cache by applications running on the - platform. - mbmt - Provides a way to monitor the total system - memory bandwidth between one level of cache - and another. - mbml - Provides a way to limit the amount of data - (bytes/s) send through the memory controller - on the socket. - cache_misses - Provides the count of cache misses by - applications running on the platform. - cache_references - Provides the count of cache hits by - applications running on th e platform. - instructions - Provides the count of instructions executed - by applications running on the platform. - cpu_cycles - Provides the count of cpu cycles - (total/elapsed). May be used with - instructions in order to get a cycles - per instruction. + cmt - A PQos (Platform Qos) feature to monitor the + usage of cache by applications running on the + platform. + mbmt - Provides a way to monitor the total system + memory bandwidth between one level of cache + and another. + mbml - Provides a way to limit the amount of data + (bytes/s) send through the memory controller + on the socket. + cache_misses - Provides the count of cache misses by + applications running on the platform. + cache_references - Provides the count of cache hits by + applications running on th e platform. + instructions - Provides the count of instructions executed + by applications running on the platform. + cpu_cycles - Provides the count of cpu cycles + (total/elapsed). May be used with + instructions in order to get a cycles + per instruction. + branch_instructions - Provides the count of branch instructions + executed by applications running on the platform. B<Note>: The statistics can be retrieved using the B<domstats> command using the I<--perf> flag. -- 1.9.3

3 2

[libvirt] [PATCH v5 0/2] List only online cpus for vcpupin/emulatorpin when vcpu placement static
by Nitesh Konkar 06 Dec '16

06 Dec '16

Currently when the vcpu placement is static and cpuset is not specified, CPU Affinity shows 0.. CPUMAX. This patchset will result in display of only online CPU's under CPU Affinity on linux. Fixes the following Bug: virsh dumpxml Fedora <domain type='kvm' id='4'> <name>Fedora</name> <uuid>aecf3e5e-6f9a-42a3-9d6a-223a75569a66</uuid> <maxMemory slots='32' unit='KiB'>3145728</maxMemory> <memory unit='KiB'>524288</memory> <currentMemory unit='KiB'>524288</currentMemory> <vcpu placement='static' current='8'>160</vcpu> <resource> <partition>/machine</partition> </resource> ..................... ....................... ......................... <memballoon model='virtio'> <alias name='balloon0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </memballoon> </devices> <seclabel type='dynamic' model='dac' relabel='yes'> <label>+0:+0</label> <imagelabel>+0:+0</imagelabel> </seclabel> </domain> lscpu Architecture: x86_64 CPU op-mode(s): 32-bit, 64-bit Byte Order: Little Endian CPU(s): 8 On-line CPU(s) list: 0-2,4-7 Off-line CPU(s) list: 3 Thread(s) per core: 1 Core(s) per socket: 7 Socket(s): 1 .......... .......... NUMA node0 CPU(s): 0-2,4-7 NUMA node1 CPU(s): cat /sys/devices/system/cpu/online 0-2,4-7 Before Patch virsh vcpupin Fedora VCPU: CPU Affinity ---------------------------------- 0: 0-7 1: 0-7 ... ... 158: 0-7 159: 0-7 virsh emulatorpin Fedora emulator: CPU Affinity ---------------------------------- *: 0-7 After Patch virsh vcpupin Fedora VCPU: CPU Affinity ---------------------------------- 0: 0-2,4-7 1: 0-2,4-7 ... ... 158: 0-2,4-7 159: 0-2,4-7 virsh emulatorpin Fedora emulator: CPU Affinity ---------------------------------- *: 0-2,4-7 Nitesh Konkar (2): conf: List only online cpus for virsh vcpupin conf: List only online cpus for virsh emulatorpin src/conf/domain_conf.c | 6 ++++++ src/qemu/qemu_driver.c | 5 +++++ 2 files changed, 11 insertions(+) -- 2.1.0

3 7

[libvirt] [RFC PATCH] cgroup: Use system reported "unlimited" value for comparison
by Viktor Mihajlovski 06 Dec '16

06 Dec '16

With kernel 3.18 (since commit 3e32cb2e0a12b6915056ff04601cf1bb9b44f967) the "unlimited" value for cgroup memory limits has changed once again as its byte value is now computed from a page counter. The new "unlimited" value reported by the cgroup fs is therefore 2**51-1 pages which is (VIR_DOMAIN_MEMORY_PARAM_UNLIMITED - 3072). This results e.g. in virsh memtune displaying 9007199254740988 instead of unlimited for the limits. This patch uses the value of memory.limit_in_bytes from the cgroup memory root which is the system's "real" unlimited value for comparison. See also libvirt commit 231656bbeb9e4d3bedc44362784c35eee21cf0f4 for the history for kernel 3.12 and before. I've tested this on F24 with the following configurations: - no memory cgroup controller mounted - memory cgroup controller mounted but not configured for libvirt - memory cgroup controller mounted and configured The first two fail as expected (and as before), the third case works as expected. Testing on other kernel versions highly welcome! Not perfect yet in that we still provide a fallback to the old value. We might consider failing right away if we can't get the system value. I'd be inclined to do that, since we're probably facing principal cgroup issues in this case. Further, it's not the most efficient implementation. Obviously, the unlimited value can be read once and cached. However, I'd like to see the question above resolved first. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/util/vircgroup.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 6 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index f151193..969dca5 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -2452,6 +2452,40 @@ virCgroupGetBlkioDeviceWeight(virCgroupPtr group, } +/* + * Retrieve the "memory.limit_in_bytes" value from the memory controller + * root dir. This value cannot be modified by userspace and therefore + * is the maximum limit value supported by cgroups on the local system. + */ +static int +virCgroupGetMemoryUnlimited(unsigned long long int * mem_unlimited) +{ + int ret = -1; + virCgroupPtr group; + + if (VIR_ALLOC(group)) + goto cleanup; + + if (virCgroupDetectMounts(group)) + goto cleanup; + + if (!group->controllers[VIR_CGROUP_CONTROLLER_MEMORY].mountPoint) + goto cleanup; + + if (VIR_STRDUP(group->controllers[VIR_CGROUP_CONTROLLER_MEMORY].placement, + "/.") < 0) + goto cleanup; + + ret = virCgroupGetValueU64(group, + VIR_CGROUP_CONTROLLER_MEMORY, + "memory.limit_in_bytes", + mem_unlimited); + cleanup: + virCgroupFree(&group); + return ret; +} + + /** * virCgroupSetMemory: * @@ -2534,6 +2568,7 @@ int virCgroupGetMemoryHardLimit(virCgroupPtr group, unsigned long long *kb) { long long unsigned int limit_in_bytes; + long long unsigned int unlimited_in_bytes; int ret = -1; if (virCgroupGetValueU64(group, @@ -2541,9 +2576,13 @@ virCgroupGetMemoryHardLimit(virCgroupPtr group, unsigned long long *kb) "memory.limit_in_bytes", &limit_in_bytes) < 0) goto cleanup; - *kb = limit_in_bytes >> 10; - if (*kb > VIR_DOMAIN_MEMORY_PARAM_UNLIMITED) + if (virCgroupGetMemoryUnlimited(&unlimited_in_bytes) < 0) + unlimited_in_bytes = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED << 10; + + if (limit_in_bytes == unlimited_in_bytes) *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED; + else + *kb = limit_in_bytes >> 10; ret = 0; cleanup: @@ -2596,6 +2635,7 @@ int virCgroupGetMemorySoftLimit(virCgroupPtr group, unsigned long long *kb) { long long unsigned int limit_in_bytes; + long long unsigned int unlimited_in_bytes; int ret = -1; if (virCgroupGetValueU64(group, @@ -2603,9 +2643,13 @@ virCgroupGetMemorySoftLimit(virCgroupPtr group, unsigned long long *kb) "memory.soft_limit_in_bytes", &limit_in_bytes) < 0) goto cleanup; - *kb = limit_in_bytes >> 10; - if (*kb > VIR_DOMAIN_MEMORY_PARAM_UNLIMITED) + if (virCgroupGetMemoryUnlimited(&unlimited_in_bytes) < 0) + unlimited_in_bytes = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED << 10; + + if (limit_in_bytes == unlimited_in_bytes) *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED; + else + *kb = limit_in_bytes >> 10; ret = 0; cleanup: @@ -2658,6 +2702,7 @@ int virCgroupGetMemSwapHardLimit(virCgroupPtr group, unsigned long long *kb) { long long unsigned int limit_in_bytes; + long long unsigned int unlimited_in_bytes; int ret = -1; if (virCgroupGetValueU64(group, @@ -2665,9 +2710,13 @@ virCgroupGetMemSwapHardLimit(virCgroupPtr group, unsigned long long *kb) "memory.memsw.limit_in_bytes", &limit_in_bytes) < 0) goto cleanup; - *kb = limit_in_bytes >> 10; - if (*kb > VIR_DOMAIN_MEMORY_PARAM_UNLIMITED) + if (virCgroupGetMemoryUnlimited(&unlimited_in_bytes) < 0) + unlimited_in_bytes = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED << 10; + + if (limit_in_bytes == unlimited_in_bytes) *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED; + else + *kb = limit_in_bytes >> 10; ret = 0; cleanup: -- 1.9.1

2 3

[libvirt] [PATCH python] libvirt-override: fix setBlockIoTune failure passed
by xieyingtai＠huawei.com 06 Dec '16

06 Dec '16

From: Yingtai Xie <xieyingtai(a)huawei.com> virDomainGetBlockIoTune() will be called before setBlockIoTune, as a result, it leads to a failure if set flags with VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG which is an reasonable option. Signed-off-by: Yingtai Xie <xieyingtai(a)huawei.com> --- libvirt-override.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 2de95ce..caa52fb 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -4805,6 +4805,7 @@ libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, Py_ssize_t size = 0; const char *disk; unsigned int flags; + unsigned int flags1 = 0; virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OzOI:virDomainSetBlockIoTune", @@ -4822,7 +4823,7 @@ libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, } LIBVIRT_BEGIN_ALLOW_THREADS; - i_retval = virDomainGetBlockIoTune(domain, disk, NULL, &nparams, flags); + i_retval = virDomainGetBlockIoTune(domain, disk, NULL, &nparams, flags1); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) @@ -4838,7 +4839,7 @@ libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; - i_retval = virDomainGetBlockIoTune(domain, disk, params, &nparams, flags); + i_retval = virDomainGetBlockIoTune(domain, disk, params, &nparams, flags1); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) { -- 1.8.3.1

3 2

[libvirt] [PATCH] Add support for parsing -vga virtio
by Nehal J Wani 06 Dec '16

06 Dec '16

Since a94f0c5c qemu supports '-vga virtio'. Libvirt also supports it since 21373feb. This patch enables libvirt to parse the qemu-argv: virsh domxml-from-native qemu-argv <(echo '/usr/bin/qemu-system-x86_64 -vga virtio') Signed-off-by: Nehal J Wani <nehaljw.kkd1(a)gmail.com> --- src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4a5fce3..d92bf9d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -100,7 +100,7 @@ VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, "", /* don't support vbox */ "qxl", "", /* don't support parallels */ - "" /* no need for virtio */); + "virtio"); VIR_ENUM_DECL(qemuDeviceVideo) -- 2.7.4

2 2

[libvirt] [REPOST PATCH v2 0/9] Add group_name support for <iotune>
by John Ferlan 05 Dec '16

05 Dec '16

This is just a REPOST of the v2 series: http://www.redhat.com/archives/libvir-list/2016-November/msg00363.html The only difference being updating to the current top of tree of commit id '0b4c3bd30'. I did *not* add the NEWS change yet as that's newer than this, but will update NEWS with this once/if this is ACK'd using whatever format becomes agreed upon for the file contents/formatting options. John Ferlan (9): include: Add new "group_name" definition for iotune throttling caps: Add new capability for the iotune group name qemu: Adjust maxparams logic for qemuDomainGetBlockIoTune qemu: Alter qemuMonitorJSONSetBlockIoThrottle command logic qemu: Adjust various bool BlockIoTune set_ values into mask qemu: Add support for parsing iotune group setting conf: Add support for blkiotune group_name option qemu: Add the group name option to the iotune command line virsh: Add group name to blkdeviotune output docs/formatdomain.html.in | 11 ++ docs/schemas/domaincommon.rng | 5 + include/libvirt/libvirt-domain.h | 15 ++ src/conf/domain_conf.c | 10 ++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 ++ src/qemu/qemu_driver.c | 177 +++++++++++++-------- src/qemu/qemu_monitor.c | 2 + src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 97 ++++++----- src/qemu/qemu_monitor_json.h | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemumonitorjsontest.c | 88 +++++++--- .../qemuxml2argv-blkdeviotune-group-num.args | 32 ++++ .../qemuxml2argv-blkdeviotune-group-num.xml | 61 +++++++ tests/qemuxml2argvtest.c | 4 + .../qemuxml2xmlout-blkdeviotune-group-num.xml | 1 + tests/qemuxml2xmltest.c | 1 + tools/virsh-domain.c | 17 ++ tools/virsh.pod | 5 +- 28 files changed, 428 insertions(+), 124 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-group-num.xml -- 2.7.4

2 26

[libvirt] [PATCH] cpu: Add support for pku and ospke Intel features for Memory Protection Keys
by Lin Ma 05 Dec '16

05 Dec '16

qemu commit: f74eefe0 https://lwn.net/Articles/667156/ Signed-off-by: Lin Ma <lma(a)suse.com> --- src/cpu/cpu_map.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 6da8321..dca5720 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -255,6 +255,13 @@ <cpuid eax_in='0x07' ebx='0x10000000'/> </feature> + <feature name='pku'> + <cpuid eax_in='0x07' ecx='0x00000008'/> + </feature> + <feature name='ospke'> + <cpuid eax_in='0x07' ecx='0x00000010'/> + </feature> +  <feature name='xsaveopt'> <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000001'/> -- 2.9.2

2 1

[libvirt] [PATCH] cpu: Add support for more AVX512 Intel features
by Lin Ma 05 Dec '16

05 Dec '16

These features are included: AVX512DQ, AVX512IFMA, AVX512BW, AVX512VL, AVX512VBMI, AVX512_4VNNIW and AVX512_4FMAPS. qemu commits: cc728d14 and 95ea69fb Signed-off-by: Lin Ma <lma(a)suse.com> --- src/cpu/cpu_map.xml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 6da8321..e9292e1 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -233,6 +233,9 @@ <feature name='avx512f'>  <cpuid eax_in='0x07' ebx='0x00010000'/> </feature> + <feature name='avx512dq'>  + <cpuid eax_in='0x07' ebx='0x00020000'/> + </feature> <feature name='rdseed'> <cpuid eax_in='0x07' ebx='0x00040000'/> </feature> @@ -242,6 +245,9 @@ <feature name='smap'> <cpuid eax_in='0x07' ebx='0x00100000'/> </feature> + <feature name='avx512ifma'>  + <cpuid eax_in='0x07' ebx='0x00200000'/> + </feature> <feature name='clflushopt'> <cpuid eax_in='0x07' ebx='0x00800000'/> </feature> @@ -254,6 +260,24 @@ <feature name='avx512cd'>  <cpuid eax_in='0x07' ebx='0x10000000'/> </feature> + <feature name='avx512bw'>  + <cpuid eax_in='0x07' ebx='0x40000000'/> + </feature> + <feature name='avx512vl'>  + <cpuid eax_in='0x07' ebx='0x80000000'/> + </feature> + + <feature name='avx512vbmi'>  + <cpuid eax_in='0x07' ecx='0x00000002'/> + </feature> + + <feature name='avx512-4vnniw'>  + <cpuid eax_in='0x07' edx='0x00000004'/> + </feature> +  + <feature name='avx512-4fmaps'> + <cpuid eax_in='0x07' edx='0x00000008'/> + </feature>  <feature name='xsaveopt'> -- 2.9.2

2 1

[libvirt] [PATCH 0/5] Reject duplicate drive addresses
by Marc Hartmayer 05 Dec '16

05 Dec '16

Reject duplicate drive addresses at domain definition. Hot-plug for disks and hostdevs is still to fix and this is why the old version of drive address checking is still there. Additionally, it isn't that easy to be sure that the changes won't break other drivers as these are common code changes. Marc Hartmayer (5): conf: simplify functions virDomainSCSIDriveAddressIsUsedBy*() conf: virDomainDriveAddressIsUsedByDisk: Rename type to bus_type tests: don't use duplicate disk addresses conf: add global check for duplicate drive addresses tests: add test cases for address conflicts src/conf/domain_conf.c | 184 +++++++++++++++++---- .../qemuxml2argv-disk-drive-address-conflict.xml | 27 +++ ...xml2argv-disk-hostdev-scsi-address-conflict.xml | 30 ++++ ...emuxml2argv-hostdevs-drive-address-conflict.xml | 33 ++++ .../qemuxml2argv-seclabel-dynamic-override.args | 4 +- .../qemuxml2argv-seclabel-dynamic-override.xml | 2 +- tests/qemuxml2argvtest.c | 8 + .../qemuxml2xmlout-seclabel-dynamic-override.xml | 2 +- 8 files changed, 251 insertions(+), 39 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-address-conflict.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-hostdev-scsi-address-conflict.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdevs-drive-address-conflict.xml -- 2.5.5

2 9

[libvirt] [PATCH v2 1/1] gluster: cache glfs connection object per volume
by prasanna.kalever＠redhat.com 05 Dec '16

05 Dec '16

From: Prasanna Kumar Kalever <prasanna.kalever(a)redhat.com> This patch optimizes calls to glfs_init() and friends Currently, a start of a VM will call 2 glfs_new/glfs_init (which will create glfs object, once for stat, read headers and next to chown) and then will fork qemu process which will call once again (for actual read write IO). Not that all, in case if we are have 4 extra attached disks, then the total calls to glfs_init() and friends will be (4+1)*2 in libvirt and (4+1)*1 in qemu space i.e 15 calls. Since we don't have control over qemu process as that executes in a different process environment, lets do not bother much about it. This patch shrinks these 10 calls (i.e objects from above example) to just one, by maintaining a cache of glfs objects. Additionally snapshot(external) scenario will further complex the situation ... The glfs object is shared across other only if volume name and all the volfile servers match (includes hostname, transport and port number). In case of hit glfs object takes a ref and on close unref happens. Thanks to 'Peter Krempa' for all the inputs. Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever(a)redhat.com> --- v2: Address review comments from Peter on v1 * Rebased on latest master * Changes to commit msg * Introduce storage API's for Register and Unregister of volume * During qemu process Start/Stop and snapshot create * Check Transport and Port type * Atomic element add/del to list and ref counting Pending: Treating IP and FQDN belong to same host v1: Initial patch --- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain.h | 5 + src/qemu/qemu_driver.c | 29 ++++ src/qemu/qemu_process.c | 25 +++ src/storage/storage_backend_fs.c | 2 + src/storage/storage_backend_gluster.c | 295 +++++++++++++++++++++++++++++++--- src/storage/storage_driver.c | 23 ++- src/storage/storage_driver.h | 3 + 8 files changed, 357 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 47332a8..35914c5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4837,7 +4837,7 @@ qemuDomainCleanupRun(virQEMUDriverPtr driver, priv->ncleanupCallbacks_max = 0; } -static void +void qemuDomainGetImageIds(virQEMUDriverConfigPtr cfg, virDomainObjPtr vm, virStorageSourcePtr src, diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 7650ff3..a9e38bd 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -591,6 +591,11 @@ bool qemuDomainDiskSourceDiffers(virDomainDiskDefPtr disk, bool qemuDomainDiskChangeSupported(virDomainDiskDefPtr disk, virDomainDiskDefPtr orig_disk); +void qemuDomainGetImageIds(virQEMUDriverConfigPtr cfg, + virDomainObjPtr vm, + virStorageSourcePtr src, + uid_t *uid, gid_t *gid); + int qemuDomainStorageFileInit(virQEMUDriverPtr driver, virDomainObjPtr vm, virStorageSourcePtr src); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3517aa2..7cae094 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14211,6 +14211,7 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver, cleanup: if (need_unlink && virStorageFileUnlink(newDiskSrc)) VIR_WARN("unable to unlink just-created %s", source); + virStorageFileDeinit(disk->src); virStorageFileDeinit(newDiskSrc); virStorageSourceFree(newDiskSrc); virStorageSourceFree(persistDiskSrc); @@ -14566,6 +14567,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, virDomainSnapshotObjPtr snap = NULL; virDomainSnapshotPtr snapshot = NULL; virDomainSnapshotDefPtr def = NULL; + virDomainSnapshotDefPtr refDef = NULL; bool update_current = true; bool redefine = flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE; unsigned int parse_flags = VIR_DOMAIN_SNAPSHOT_PARSE_DISKS; @@ -14574,6 +14576,9 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, bool align_match = true; virQEMUDriverConfigPtr cfg = NULL; virCapsPtr caps = NULL; + unsigned int dIndex; + uid_t uid; + gid_t gid; virCheckFlags(VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE | VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT | @@ -14690,6 +14695,19 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, qemuDomainObjSetAsyncJobMask(vm, QEMU_JOB_NONE); + for (dIndex = 0; dIndex < def->ndisks; dIndex++) { + virDomainSnapshotDiskDef disk = def->disks[dIndex]; + + if (virStorageSourceIsEmpty(disk.src)) + continue; + + qemuDomainGetImageIds(cfg, vm, disk.src, &uid, &gid); + + if (virStorageVolumeRegister(disk.src, uid, gid) <0) + goto cleanup; + } + + if (redefine) { if (virDomainSnapshotRedefinePrep(domain, vm, &def, &snap, &update_current, flags) < 0) @@ -14800,6 +14818,17 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, snapshot = virGetDomainSnapshot(domain, snap->def->name); endjob: + refDef = (!snap) ? def : snap->def; + + for (dIndex = 0; dIndex < refDef->ndisks; dIndex++) { + virDomainSnapshotDiskDef disk = refDef->disks[dIndex]; + + if (virStorageSourceIsEmpty(disk.src)) + continue; + + virStorageVolumeUnRegister(disk.src); + } + if (snapshot && !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA)) { if (qemuDomainSnapshotWriteMetadata(vm, snap, driver->caps, cfg->snapshotDir) < 0) { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ecd7ded..20793cf 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4612,6 +4612,9 @@ qemuProcessInit(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; int stopFlags; int ret = -1; + unsigned int dIndex; + uid_t uid; + gid_t gid; VIR_DEBUG("vm=%p name=%s id=%d migration=%d", vm, vm->def->name, vm->def->id, migration); @@ -4664,6 +4667,18 @@ qemuProcessInit(virQEMUDriverPtr driver, if (qemuDomainSetPrivatePaths(driver, vm) < 0) goto cleanup; + for (dIndex = 0; dIndex < vm->def->ndisks; dIndex++) { + virDomainDiskDefPtr disk = vm->def->disks[dIndex]; + + if (virStorageSourceIsEmpty(disk->src)) + continue; + + qemuDomainGetImageIds(cfg, vm, disk->src, &uid, &gid); + + if (virStorageVolumeRegister(disk->src, uid, gid) < 0) + goto cleanup; + } + ret = 0; cleanup: @@ -5671,6 +5686,7 @@ qemuProcessFinishStartup(virConnectPtr conn, { virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); int ret = -1; + unsigned int dIndex; if (startCPUs) { VIR_DEBUG("Starting domain CPUs"); @@ -5695,6 +5711,15 @@ qemuProcessFinishStartup(virConnectPtr conn, VIR_HOOK_SUBOP_BEGIN) < 0) goto cleanup; + for (dIndex = 0; dIndex < vm->def->ndisks; dIndex++) { + virDomainDiskDefPtr disk = vm->def->disks[dIndex]; + + if (virStorageSourceIsEmpty(disk->src)) + continue; + + virStorageVolumeUnRegister(disk->src); + } + ret = 0; cleanup: diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index de0e8d5..0e03e06 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1488,6 +1488,8 @@ virStorageFileBackendFileDeinit(virStorageSourcePtr src) VIR_FREE(priv->canonpath); VIR_FREE(priv); + + VIR_FREE(src->drv); } diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index 8e86704..18b7fc3 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -31,11 +31,34 @@ #include "virstoragefile.h" #include "virstring.h" #include "viruri.h" +#include "viratomic.h" #define VIR_FROM_THIS VIR_FROM_STORAGE VIR_LOG_INIT("storage.storage_backend_gluster"); +static bool virGlusterGlobalError; +static virOnceControl glusterConnOnce = VIR_ONCE_CONTROL_INITIALIZER; + +typedef struct _virStorageBackendGlusterState virStorageBackendGlusterState; +typedef virStorageBackendGlusterState *virStorageBackendGlusterStatePtr; + +typedef struct _virStorageFileBackendGlusterPriv virStorageFileBackendGlusterPriv; +typedef virStorageFileBackendGlusterPriv *virStorageFileBackendGlusterPrivPtr; + +typedef struct _unixSocketAddress unixSocketAddress; + +typedef struct _inetSocketAddress inetSocketAddress; + +typedef struct _glusterServer glusterServer; +typedef struct _glusterServer *glusterServerPtr; + +typedef struct _virStorageBackendGlusterStatePreopened virStorageBackendGlusterStatePreopened; +typedef virStorageBackendGlusterStatePreopened *virStorageBackendGlusterStatePtrPreopened; + +typedef struct _virStorageBackendGlusterconnCache virStorageBackendGlusterconnCache; +typedef virStorageBackendGlusterconnCache *virStorageBackendGlusterconnCachePtr; + struct _virStorageBackendGlusterState { glfs_t *vol; @@ -47,8 +70,241 @@ struct _virStorageBackendGlusterState { char *dir; /* dir from URI, or "/"; always starts and ends in '/' */ }; -typedef struct _virStorageBackendGlusterState virStorageBackendGlusterState; -typedef virStorageBackendGlusterState *virStorageBackendGlusterStatePtr; +struct _virStorageFileBackendGlusterPriv { + glfs_t *vol; + char *canonpath; +}; + +struct _unixSocketAddress { + char *path; +}; + +struct _inetSocketAddress { + char *host; + char *port; +}; + +struct _glusterServer { + virStorageNetHostTransport type; + union { /* union tag is @type */ + unixSocketAddress uds; + inetSocketAddress tcp; + } u; +}; + +struct _virStorageBackendGlusterStatePreopened { + virStorageFileBackendGlusterPrivPtr priv; + unsigned int nservers; + glusterServerPtr *hosts; + char *volname; + volatile int ref; +}; + +struct _virStorageBackendGlusterconnCache { + virMutex lock; + size_t nConn; + virStorageBackendGlusterStatePtrPreopened *conn; +}; + +virStorageBackendGlusterconnCachePtr connCache = {0,}; + + +static void +virGlusterConnAlloc(void) +{ + if ((VIR_ALLOC(connCache) < 0)) + virGlusterGlobalError = false; +} + +static int +virStorageBackendGlusterSetPreopened(virStorageSourcePtr src, + virStorageFileBackendGlusterPrivPtr priv) +{ + unsigned int idx; + virStorageBackendGlusterStatePtrPreopened entry = NULL; + + if (connCache == NULL && (virOnce(&glusterConnOnce, + virGlusterConnAlloc) < 0)) + return -1; + + if (virGlusterGlobalError) + return -1; + + if (!connCache->nConn) { + if (virMutexInit(&connCache->lock) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to initialize mutex")); + return -1; + } + } + + for (idx = 0; idx < connCache->nConn; idx++) { + if (STREQ(connCache->conn[idx]->volname, src->volume)) + return 0; + } + + if (VIR_ALLOC(entry) < 0) + return -1; + + if (VIR_STRDUP(entry->volname, src->volume) < 0) + goto error; + + if (VIR_ALLOC_N(entry->hosts, entry->nservers) < 0) + goto error; + + entry->nservers = src->nhosts; + + for (idx = 0; idx < src->nhosts; idx++) { + if (VIR_ALLOC(entry->hosts[idx]) < 0) + goto error; + if (src->hosts[idx].transport == VIR_STORAGE_NET_HOST_TRANS_UNIX) { + if (VIR_STRDUP(entry->hosts[idx]->u.uds.path, + src->hosts[idx].socket) < 0) + goto error; + entry->hosts[idx]->type = VIR_STORAGE_NET_HOST_TRANS_UNIX; + } else if (src->hosts[idx].transport == + VIR_STORAGE_NET_HOST_TRANS_TCP) { + if (VIR_STRDUP(entry->hosts[idx]->u.tcp.host, + src->hosts[idx].name) < 0) + goto error; + if (VIR_STRDUP(entry->hosts[idx]->u.tcp.port, + src->hosts[idx].port) < 0) + goto error; + entry->hosts[idx]->type = VIR_STORAGE_NET_HOST_TRANS_TCP; + } else { + entry->hosts[idx]->type = VIR_STORAGE_NET_HOST_TRANS_LAST; + } + } + entry->priv = priv; + + virMutexLock(&connCache->lock); + virAtomicIntSet(&entry->ref, 1); + if (VIR_INSERT_ELEMENT(connCache->conn, -1, connCache->nConn, entry) < 0) { + virMutexUnlock(&connCache->lock); + goto error; + } + virMutexUnlock(&connCache->lock); + + return 0; + + error: + for (idx = 0; idx < entry->nservers; idx++) { + if (entry->hosts[idx]->type == VIR_STORAGE_NET_HOST_TRANS_UNIX) { + VIR_FREE(entry->hosts[idx]->u.uds.path); + } else { + VIR_FREE(entry->hosts[idx]->u.tcp.host); + VIR_FREE(entry->hosts[idx]->u.tcp.port); + } + VIR_FREE(entry->hosts[idx]); + } + + VIR_FREE(entry->hosts); + VIR_FREE(entry->volname); + VIR_FREE(entry); + + return -1; +} + +static glfs_t * +virStorageBackendGlusterFindPreopened(virStorageSourcePtr src) +{ + unsigned int cIdx, sIdx, nIdx; /* connectionIdx, savedIdx, newIdx */ + bool flag = false; + + if (connCache == NULL) + return NULL; + + virStorageBackendGlusterStatePtrPreopened entry; + + for (cIdx = 0; cIdx < connCache->nConn; cIdx++) { + entry = connCache->conn[cIdx]; + if (STREQ(entry->volname, src->volume)) { + if (entry->nservers == src->nhosts) { + for (sIdx = 0; sIdx < entry->nservers; sIdx++) { + for (nIdx = 0; nIdx < src->nhosts; nIdx++) { + if (entry->hosts[sIdx]->type == + src->hosts[nIdx].transport) { + if (entry->hosts[sIdx]->type + == VIR_STORAGE_NET_HOST_TRANS_UNIX) { + if (STREQ(entry->hosts[sIdx]->u.uds.path, + src->hosts[nIdx].socket)) { + flag = true; + break; + } + } else { + if (STREQ(entry->hosts[sIdx]->u.tcp.host, + src->hosts[nIdx].name) && + STREQ(entry->hosts[sIdx]->u.tcp.port, + src->hosts[nIdx].port)) { + flag = true; + break; + } + } + } + } + if (!flag) + return NULL; + flag = false; + } + virAtomicIntInc(&entry->ref); + return entry->priv->vol; + } else { + return NULL; + } + } + } + return NULL; +} + +static void +virStorageBackendGlusterClosePreopened(virStorageSourcePtr src) +{ + virStorageFileBackendGlusterPrivPtr priv = src->drv->priv; + unsigned int cIdx, hIdx; /* connectionIdx, hostIdx */ + + for (cIdx = 0; cIdx < connCache->nConn; cIdx++) { + if (STREQ(connCache->conn[cIdx]->volname, src->volume)) { + virAtomicIntDecAndTest(&connCache->conn[cIdx]->ref); + if (virAtomicIntGet(&connCache->conn[cIdx]->ref) != 0) { + if (priv && priv->canonpath) { + VIR_FREE(priv->canonpath); + VIR_FREE(priv); + src->drv->priv = NULL; + } + return; + } + + glfs_fini(connCache->conn[cIdx]->priv->vol); + + VIR_FREE(connCache->conn[cIdx]->priv->canonpath); + VIR_FREE(connCache->conn[cIdx]->priv); + + for (hIdx = 0; hIdx < connCache->conn[cIdx]->nservers; hIdx++) { + if (connCache->conn[cIdx]->hosts[hIdx]->type == + VIR_STORAGE_NET_HOST_TRANS_UNIX) { + VIR_FREE(connCache->conn[cIdx]->hosts[hIdx]->u.uds.path); + } else { + VIR_FREE(connCache->conn[cIdx]->hosts[hIdx]->u.tcp.host); + VIR_FREE(connCache->conn[cIdx]->hosts[hIdx]->u.tcp.port); + } + VIR_FREE(connCache->conn[cIdx]->hosts[hIdx]); + } + + VIR_FREE(connCache->conn[cIdx]->hosts); + VIR_FREE(connCache->conn[cIdx]->volname); + VIR_FREE(connCache->conn[cIdx]); + + virMutexLock(&connCache->lock); + VIR_DELETE_ELEMENT(connCache->conn, cIdx, connCache->nConn); + virMutexUnlock(&connCache->lock); + + VIR_FREE(src->drv); + } + } + + if (!connCache->conn) + virMutexDestroy(&connCache->lock); +} static void virStorageBackendGlusterClose(virStorageBackendGlusterStatePtr state) @@ -538,30 +794,14 @@ virStorageBackend virStorageBackendGluster = { }; -typedef struct _virStorageFileBackendGlusterPriv virStorageFileBackendGlusterPriv; -typedef virStorageFileBackendGlusterPriv *virStorageFileBackendGlusterPrivPtr; - -struct _virStorageFileBackendGlusterPriv { - glfs_t *vol; - char *canonpath; -}; - - static void virStorageFileBackendGlusterDeinit(virStorageSourcePtr src) { - virStorageFileBackendGlusterPrivPtr priv = src->drv->priv; - VIR_DEBUG("deinitializing gluster storage file %p (gluster://%s:%s/%s%s)", src, src->hosts->name, src->hosts->port ? src->hosts->port : "0", src->volume, src->path); - if (priv->vol) - glfs_fini(priv->vol); - VIR_FREE(priv->canonpath); - - VIR_FREE(priv); - src->drv->priv = NULL; + virStorageBackendGlusterClosePreopened(src); } static int @@ -612,6 +852,7 @@ virStorageFileBackendGlusterInitServer(virStorageFileBackendGlusterPrivPtr priv, static int virStorageFileBackendGlusterInit(virStorageSourcePtr src) { + int ret = 0; virStorageFileBackendGlusterPrivPtr priv = NULL; size_t i; @@ -625,6 +866,12 @@ virStorageFileBackendGlusterInit(virStorageSourcePtr src) if (VIR_ALLOC(priv) < 0) return -1; + priv->vol = virStorageBackendGlusterFindPreopened(src); + if (priv->vol) { + src->drv->priv = priv; + return ret; + } + VIR_DEBUG("initializing gluster storage file %p " "(priv='%p' volume='%s' path='%s') as [%u:%u]", src, priv, src->volume, src->path, @@ -635,6 +882,10 @@ virStorageFileBackendGlusterInit(virStorageSourcePtr src) goto error; } + ret = virStorageBackendGlusterSetPreopened(src, priv); + if (ret < 0) + goto error; + for (i = 0; i < src->nhosts; i++) { if (virStorageFileBackendGlusterInitServer(priv, src->hosts + i) < 0) goto error; @@ -648,13 +899,13 @@ virStorageFileBackendGlusterInit(virStorageSourcePtr src) } src->drv->priv = priv; + ret = 0; - return 0; + return ret; error: - if (priv->vol) - glfs_fini(priv->vol); VIR_FREE(priv); + virStorageBackendGlusterClosePreopened(src); return -1; } diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index df65807..9c3bffb 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2900,11 +2900,8 @@ virStorageFileDeinit(virStorageSourcePtr src) if (!virStorageFileIsInitialized(src)) return; - if (src->drv->backend && - src->drv->backend->backendDeinit) + if (src->drv->backend && src->drv->backend->backendDeinit) src->drv->backend->backendDeinit(src); - - VIR_FREE(src->drv); } @@ -2967,6 +2964,24 @@ virStorageFileInit(virStorageSourcePtr src) return virStorageFileInitAs(src, -1, -1); } +int +virStorageVolumeRegister(virStorageSourcePtr src, + uid_t uid, gid_t gid) +{ + if (virStorageFileInitAs(src, uid, gid) < 0) + return -1; + + src->drv->priv = NULL; + + return 0; +} + +void +virStorageVolumeUnRegister(virStorageSourcePtr src) +{ + virStorageFileDeinit(src); +} + /** * virStorageFileCreate: Creates an empty storage file via storage driver diff --git a/src/storage/storage_driver.h b/src/storage/storage_driver.h index 3f2549d..89a3d55 100644 --- a/src/storage/storage_driver.h +++ b/src/storage/storage_driver.h @@ -71,4 +71,7 @@ char *virStoragePoolObjBuildTempFilePath(virStoragePoolObjPtr pool, int storageRegister(void); +int virStorageVolumeRegister(virStorageSourcePtr src, uid_t uid, gid_t gid); +void virStorageVolumeUnRegister(virStorageSourcePtr src); + #endif /* __VIR_STORAGE_DRIVER_H__ */ -- 2.7.4

4 5

[libvirt] [RFC] provide error string on blockjob event
by Nikolay Shirokovskiy 05 Dec '16

05 Dec '16

Hi, all. There is a patch series [1] that adds reporting qemu blockjob errors to the client on migration. I guess if somebody uses block{copy/pull/commit} he would be glad to see the precise qemu error too. But these operation are asynchronous and blockjob result is provided via event. So what do you think on extending blockjob events to provide error string too? [1] https://www.redhat.com/archives/libvir-list/2016-November/msg00047.html Nikolay

1 0

[libvirt] [PATCH] storage: Fix type PLOOP type check for storageVolUpload
by John Ferlan 05 Dec '16

05 Dec '16

Commit id '03e750f3' added support for checking the PLOOP type; however, it used 'target.type' which no storage code ever fills in, so it will never be set. Change to just vol->type (could use vol->target.format as well). Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Found this by chance while digging through the code to investigate something else. Turns out the storage/volume code does not fill in the target.type field. src/storage/storage_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index df65807..a79acc6 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2427,7 +2427,7 @@ storageVolUpload(virStorageVolPtr obj, if (VIR_ALLOC(cbdata) < 0 || VIR_STRDUP(cbdata->pool_name, pool->def->name) < 0) goto cleanup; - if (vol->target.type == VIR_STORAGE_VOL_PLOOP && + if (vol->type == VIR_STORAGE_VOL_PLOOP && VIR_STRDUP(cbdata->vol_path, vol->target.path) < 0) goto cleanup; -- 2.7.4

3 2

[libvirt] [PATCH] NEWS: Remove end-of-sentence period
by Andrea Bolognani 05 Dec '16

05 Dec '16

None of the other sentences in the file ends with the period, and we want to maintain a consistent style. --- Pushed as trivial. docs/news.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/news.html.in b/docs/news.html.in index 8a86dd4..27d3387 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -67,7 +67,7 @@ <ul> <li>vz: Fix migration in P2P mode </li> - <li>Forbid newline character in names of some libvirt objects. + <li>Forbid newline character in names of some libvirt objects </li> <li>Fix compilation on macOS </li> -- 2.7.4

2 2

[libvirt] [PATCH 0/2] Post-release version bump to 3.0.0
by Andrea Bolognani 05 Dec '16

05 Dec '16

Pushed as "trivial enough that I got it wrong the first time around" :/ Andrea Bolognani (2): Post-release version bump to 2.6.0 Fix version number configure.ac | 2 +- docs/news.html.in | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) -- 2.7.4

1 2

[libvirt] [PATCH] NEWS: Add release date for 2.5.0
by Andrea Bolognani 05 Dec '16

05 Dec '16

--- Pushed as trivial. docs/news.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/news.html.in b/docs/news.html.in index f7bac14..3ede17c 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -12,7 +12,7 @@ <a href="http://libvirt.org/git/?p=libvirt.git;a=log">git log</a>. </p> - <h3>v2.5.0 (<i>unreleased</i>)</h3> + <h3>v2.5.0 (2016-12-04)</h3> <ul> <li><strong>New features</strong> <ul> -- 2.7.4

1 0

[libvirt] [PATCH RESEND] cpu: Add support for pku and ospke Intel features for Memory Protection Keys
by Lin Ma 05 Dec '16

05 Dec '16

qemu commit: f74eefe0 https://lwn.net/Articles/667156/ Signed-off-by: Lin Ma <lma(a)suse.com> --- src/cpu/cpu_map.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 6da8321..dca5720 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -255,6 +255,13 @@ <cpuid eax_in='0x07' ebx='0x10000000'/> </feature> + <feature name='pku'> + <cpuid eax_in='0x07' ecx='0x00000008'/> + </feature> + <feature name='ospke'> + <cpuid eax_in='0x07' ecx='0x00000010'/> + </feature> +  <feature name='xsaveopt'> <cpuid eax_in='0x0d' ecx_in='0x01' eax='0x00000001'/> -- 2.9.2

1 0

[libvirt] [PATCH RESEND] cpu: Add support for more AVX512 Intel features
by Lin Ma 05 Dec '16

05 Dec '16

These features are included: AVX512DQ, AVX512IFMA, AVX512BW, AVX512VL, AVX512VBMI, AVX512_4VNNIW and AVX512_4FMAPS. qemu commits: cc728d14 and 95ea69fb Signed-off-by: Lin Ma <lma(a)suse.com> --- src/cpu/cpu_map.xml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 6da8321..e9292e1 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -233,6 +233,9 @@ <feature name='avx512f'>  <cpuid eax_in='0x07' ebx='0x00010000'/> </feature> + <feature name='avx512dq'>  + <cpuid eax_in='0x07' ebx='0x00020000'/> + </feature> <feature name='rdseed'> <cpuid eax_in='0x07' ebx='0x00040000'/> </feature> @@ -242,6 +245,9 @@ <feature name='smap'> <cpuid eax_in='0x07' ebx='0x00100000'/> </feature> + <feature name='avx512ifma'>  + <cpuid eax_in='0x07' ebx='0x00200000'/> + </feature> <feature name='clflushopt'> <cpuid eax_in='0x07' ebx='0x00800000'/> </feature> @@ -254,6 +260,24 @@ <feature name='avx512cd'>  <cpuid eax_in='0x07' ebx='0x10000000'/> </feature> + <feature name='avx512bw'>  + <cpuid eax_in='0x07' ebx='0x40000000'/> + </feature> + <feature name='avx512vl'>  + <cpuid eax_in='0x07' ebx='0x80000000'/> + </feature> + + <feature name='avx512vbmi'>  + <cpuid eax_in='0x07' ecx='0x00000002'/> + </feature> + + <feature name='avx512-4vnniw'>  + <cpuid eax_in='0x07' edx='0x00000004'/> + </feature> +  + <feature name='avx512-4fmaps'> + <cpuid eax_in='0x07' edx='0x00000008'/> + </feature>  <feature name='xsaveopt'> -- 2.9.2

1 0

[libvirt] Release of libvirt-2.5.0
by Daniel Veillard 04 Dec '16

04 Dec '16

As planned I have tagged the release in git and pushed signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ I also pushed 2.5.0 for the python bindings at: ftp://libvirt.org/libvirt/python/ thanks everybody for your help getting this release out, enjoy ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH 0/7] Adjustments for storage/qemu volume/file backing size settings
by John Ferlan 02 Dec '16

02 Dec '16

A bit of a mix between fixing some bugs and merging some code between the block info/stats fetching of backing store data and storage backend data for volume allocation, capacity, and physical sizes. Patch 1 just adjusts some comments Patches 2-3 are code motion Patch 4 alters how domain/qemu will open the backing store from an open to a qemuFileOpen and it allows for fetching of more physical sizes (the code only gets the block backing stores now) Patch 5 shares the setting of the various size values between storage driver and domain/qemu Patch 6 shares the recalculation of the capacity value (it may not be necessary for patch 5, but I left it there since there's multiple other paths to the VolTargetInfoFD API). Patch 7 fixes an issue with displaying the allocation value of a qcow2 backed file for the GetBlockInfo API (the results will match volume code now). John Ferlan (7): qemu: Clean up description for qemuStorageLimitsRefresh qemu: Add helpers to handle stat data for qemuStorageLimitsRefresh qemu: Introduce helper qemuDomainStorageUpdatePhysical util: Introduce virStorageSourceUpdatePhysicalSize util: Introduce virStorageSourceUpdateBackingSizes util: Introduce virStorageSourceUpdateCapacity qemu: Fix GetBlockInfo setting allocation from wr_highest_offset src/libvirt_private.syms | 5 +- src/qemu/qemu_driver.c | 237 ++++++++++++++++++++++++------------------ src/storage/storage_backend.c | 41 +------- src/util/virstoragefile.c | 173 ++++++++++++++++++++++++++---- src/util/virstoragefile.h | 15 ++- 5 files changed, 304 insertions(+), 167 deletions(-) -- 2.7.4

2 8

[libvirt] [PATCH] docs: Format text in <p/> into a block
by Michal Privoznik 02 Dec '16

02 Dec '16

With the rework of our webpage I've also noticed that we can make our <p/> block look more uniform: stretch the lines so that each has the equal width. Just like if you hit "align to block" in your favourite text editor. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/generic.css | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/generic.css b/docs/generic.css index a6b2354df..4c8887d6d 100644 --- a/docs/generic.css +++ b/docs/generic.css @@ -14,6 +14,7 @@ p, ul, ol, dl { p { margin-top: 1em; margin-bottom: 1em; + text-align: justify; } ul, ol { -- 2.11.0

3 5

[libvirt] Should Libvirt apply for OSS-Fuzz?
by Michal Privoznik 02 Dec '16

02 Dec '16

Google announced OSS-Fuzz project [1]. It's aim is to test projects with significant user base and/or critical projects to the global infrastructure. I like to think that libvirt falls in both categories :-) You can find a list of already accepted projects here [2]. Once accepted to the project we would have to provide some scripts that build libvirt and run some tests. One of the disadvantages is that we have to provide a docker(!) image where the scripts would run from. What are your thoughts on this? Should we apply? Michal 1: https://opensource.googleblog.com/2016/12/announcing-oss-fuzz-continuous-fu… 2: https://github.com/google/oss-fuzz

3 5

[libvirt] bug, libvirt, internal error
by CESAR DAVID VASQUEZ ROMERO 02 Dec '16

02 Dec '16

Hi, I'm having a problem with libvirt. Since a few days, when I try to create a virtual machine I get the following error and I could not solve it " Imposible completar la instalación: 'internal error: Cannot find suitable CPU model for given data' " ------------------------------------------------------------------------------------------------------------- Detalles: imposible completar la instalación: 'internal error: Cannot find suitable CPU model for given data' Traceback (most recent call last): File "/usr/share/virt-manager/virtManager/asyncjob.py", line 90, in cb_wrapper callback(asyncjob, *args, **kwargs) File "/usr/share/virt-manager/virtManager/create.py", line 2277, in _do_async_install guest.start_install(meter=meter) File "/usr/share/virt-manager/virtinst/guest.py", line 501, in start_install noboot) File "/usr/share/virt-manager/virtinst/guest.py", line 416, in _create_guest dom = self.conn.createLinux(start_xml or final_xml, 0) File "/usr/lib/python2.7/dist-packages/libvirt.py", line 3606, in createLinux if ret is None:raise libvirtError('virDomainCreateLinux() failed', conn=self) libvirtError: internal error: Cannot find suitable CPU model for given data ------------------------------------------------------------------------------------------------------------- I tried deleting the / var / cache / libvirt / qemu / capabilities / directory, and restarting libvirt but it did not work. I have other virtual machines on the physical server and they work fine, but I can not create new ones. How can i fix this Thank you

3 2

[libvirt] [PATCH] Fix minor typos
by Yuri Chornoivan 02 Dec '16

02 Dec '16

Hi, Attached is a minor fix for the typos found while translating libvirt. Best regards, Yuri P. S. Sorry for the lame format. My mail provider rejects direct sending emails from git send.

2 1

[libvirt] [PATCH python] libvirt-override: fix setBlockIoTune failure with flags 3
by xieyingtai＠huawei.com 01 Dec '16

01 Dec '16

From: Yingtai Xie <xieyingtai(a)huawei.com> virDomainGetBlockIoTune() will be called before setBlockIoTune, as a result, it leads to a failure if set flags with VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG which is an reasonable option. Signed-off-by: Yingtai Xie <xieyingtai(a)huawei.com> --- libvirt-override.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 2de95ce..caa52fb 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -4805,6 +4805,7 @@ libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, Py_ssize_t size = 0; const char *disk; unsigned int flags; + unsigned int flags1 = VIR_DOMAIN_AFFECT_LIVE; virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OzOI:virDomainSetBlockIoTune", @@ -4822,7 +4823,7 @@ libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, } LIBVIRT_BEGIN_ALLOW_THREADS; - i_retval = virDomainGetBlockIoTune(domain, disk, NULL, &nparams, flags); + i_retval = virDomainGetBlockIoTune(domain, disk, NULL, &nparams, flags1); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) @@ -4838,7 +4839,7 @@ libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; - i_retval = virDomainGetBlockIoTune(domain, disk, params, &nparams, flags); + i_retval = virDomainGetBlockIoTune(domain, disk, params, &nparams, flags1); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) { -- 1.8.3.1

2 1

[libvirt] [PATCH] qemuDomainAttachNetDevice: pass mq and vectors for vhost-user with multiqueue
by gaohaifeng 01 Dec '16

01 Dec '16

Two reasons: 1.in none hotplug, we will pass it. We can see from libvirt function qemuBuildVhostuserCommandLine 2.qemu will use this vetcor num to init msix table. If we don't pass, qemu will use default value, this will cause VM can only use default value interrupts at most. Signed-off-by: gaohaifeng <gaohaifeng.gao(a)huawei.com> --- src/qemu/qemu_hotplug.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7c3f32d..55af888 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -946,6 +946,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, char **vhostfdName = NULL; int *vhostfd = NULL; size_t vhostfdSize = 0; + size_t queueSize = 0; char *nicstr = NULL; char *netstr = NULL; virNetDevVPortProfilePtr vport = NULL; @@ -1010,6 +1011,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, tapfdSize = vhostfdSize = net->driver.virtio.queues; if (!tapfdSize) tapfdSize = vhostfdSize = 1; + queueSize = tapfdSize; if (VIR_ALLOC_N(tapfd, tapfdSize) < 0) goto cleanup; memset(tapfd, -1, sizeof(*tapfd) * tapfdSize); @@ -1029,6 +1031,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, tapfdSize = vhostfdSize = net->driver.virtio.queues; if (!tapfdSize) tapfdSize = vhostfdSize = 1; + queueSize = tapfdSize; if (VIR_ALLOC_N(tapfd, tapfdSize) < 0) goto cleanup; memset(tapfd, -1, sizeof(*tapfd) * tapfdSize); @@ -1049,6 +1052,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, tapfdSize = vhostfdSize = net->driver.virtio.queues; if (!tapfdSize) tapfdSize = vhostfdSize = 1; + queueSize = tapfdSize; if (VIR_ALLOC_N(tapfd, tapfdSize) < 0) goto cleanup; memset(tapfd, -1, sizeof(*tapfd) * tapfdSize); @@ -1079,6 +1083,9 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, break; case VIR_DOMAIN_NET_TYPE_VHOSTUSER: + queueSize = net->driver.virtio.queues; + if (!queueSize) + queueSize = 1; if (!qemuDomainSupportsNetdev(vm->def, priv->qemuCaps, net)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Netdev support unavailable")); @@ -1223,7 +1230,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, VIR_FORCE_CLOSE(vhostfd[i]); if (!(nicstr = qemuBuildNicDevStr(vm->def, net, vlan, 0, - vhostfdSize, priv->qemuCaps))) + queueSize, priv->qemuCaps))) goto try_remove; qemuDomainObjEnterMonitor(driver, vm); -- 2.6.4

2 1

[libvirt] [PATCH] docs: add "more PCIe less legacy PCI" to list of new features
by Laine Stump 01 Dec '16

01 Dec '16

--- If this entry looks okay and I'm not around on IRC, feel free to push it so it will be in RC2. docs/news.html.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/news.html.in b/docs/news.html.in index 8a86dd4..df245ea 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -39,6 +39,14 @@ can be specified without providing a base address, which simplifies user configuration </li> + <li>qemu: for machinetypes that use a PCI Express root bus + (e.g. x86_64/Q35 and aarch64/virt), any unaddressed PCI + device that is an Express device (all virtio-1.0 devices, + e1000e, nec-xhci, vfio assigned devices) will be placed on + an Express controller (i.e. a pcie-root-port) instead of a + legacy PCI controller (i.e. pci-bridge). pcie-root-ports are + automatically added as needed. + </li> </ul> </li> <li><strong>Improvements</strong> -- 2.7.4

2 1

[libvirt] Entering freeze for 2.5.0
by Daniel Veillard 01 Dec '16

01 Dec '16

With exception of the patch set of Laine which we will likely push in today or tomorrow. I have made the signed tarball and rpms available at the usual place: ftp://libvirt.org/libvirt/ and also tagged the RC1 in git. This seems to work fine with my minimal testing, but obviously others should give it a try and try it in more diverse environments. If all goes well, I will push an rc2 on Thursday and plan the final release over the w.e. thanks for givit it a try, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] Plan for next release(s)
by Daniel Veillard 01 Dec '16

01 Dec '16

I'm late <grin/> so I think that if we don't want to slip too much the best would be to enter freeze tomorrow (Tuesday) then have RC2 around Thursday and a release over the week-end. That said they are supposed to mess with my internet tomorrow morning and I'm travelling till the end of the week, but the above plan should be doable. Hope that's okay with everybody. Then usually December is a low productivity month, and Feb is short, so it is tempting to do like for previous years i.e. release mid-january and end of Feb, except the Jan release will be 3.0.0. Works for everybody ? Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

4 5

[libvirt] [PATCH 0/8] Make NSS module lookup by libvirt domain names too
by Michal Privoznik 01 Dec '16

01 Dec '16

So far, the NSS module relies on guests providing hostnames during DHCP transaction, because if they do it's recorded in a json file that NSS module consults when doing the hostname translation. But there are few cases where this is not enough: some system (e.g. old RHEL6) don't provide hostname at all. If that's the case we can maintain a separate file $bridge.macs where we would keep a list of pairs <domain, mac address list>. Thus next time when doing hostname translation we can look up MAC address list for given domain, and then lookup the MAC <-> IP mapping in $bridge.status. It's a bit clunky, but it's our best shot. Michal Privoznik (8): network: Don't unlock non-locked network driver nssmock: Prefer free() over VIR_FREE() virstring: Introduce virStringListAdd virstring: Introduce virStringListRemove util: Introduce virFileRewriteStr util: Introduce virMACMap module network: Track MAC address map nss: Lookup by libvirt domain names too cfg.mk | 2 +- docs/nss.html.in | 13 +- po/POTFILES.in | 1 + src/Makefile.am | 9 + src/conf/network_conf.h | 4 + src/conf/virsecretobj.c | 20 +- src/libvirt_private.syms | 12 ++ src/network/bridge_driver.c | 95 ++++++++- src/network/leaseshelper.c | 14 +- src/util/virfile.c | 24 ++- src/util/virfile.h | 7 +- src/util/virmacmap.c | 399 +++++++++++++++++++++++++++++++++++ src/util/virmacmap.h | 48 +++++ src/util/virstring.c | 87 ++++++++ src/util/virstring.h | 6 + src/util/virxml.c | 4 +- tests/Makefile.am | 14 ++ tests/nssdata/virbr0.macs | 23 ++ tests/nssdata/virbr0.status | 5 + tests/nssdata/virbr1.macs | 21 ++ tests/nssdata/virbr1.status | 5 + tests/nssmock.c | 25 ++- tests/nsstest.c | 2 + tests/virmacmapmock.c | 29 +++ tests/virmacmaptest.c | 232 ++++++++++++++++++++ tests/virmacmaptestdata/complex.json | 45 ++++ tests/virmacmaptestdata/empty.json | 3 + tests/virmacmaptestdata/simple.json | 8 + tests/virmacmaptestdata/simple2.json | 16 ++ tests/virstringtest.c | 80 +++++++ tools/nss/libvirt_nss.c | 173 +++++++++++---- 31 files changed, 1340 insertions(+), 86 deletions(-) create mode 100644 src/util/virmacmap.c create mode 100644 src/util/virmacmap.h create mode 100644 tests/nssdata/virbr0.macs create mode 100644 tests/nssdata/virbr1.macs create mode 100644 tests/virmacmapmock.c create mode 100644 tests/virmacmaptest.c create mode 100644 tests/virmacmaptestdata/complex.json create mode 100644 tests/virmacmaptestdata/empty.json create mode 100644 tests/virmacmaptestdata/simple.json create mode 100644 tests/virmacmaptestdata/simple2.json -- 2.8.4

5 21

[libvirt] [PATCH] xen: Fix build when with xen disabled and libxl enabled
by Peter Krempa 01 Dec '16

01 Dec '16

xen_common.c does not get compiled in such case which breaks the build due to xenDomainDefAddImplicitInputDevice not being available. Move the function to a different place to resolve the issue. Caused by commit 36785c7e --- src/Makefile.am | 4 ++-- src/conf/domain_conf.c | 22 ++++++++++++++++++++++ src/conf/domain_conf.h | 3 +++ src/libxl/libxl_domain.c | 3 +-- src/xen/xen_driver.c | 2 +- src/xenapi/xenapi_driver.c | 3 +-- src/xenconfig/xen_common.c | 22 ---------------------- src/xenconfig/xen_common.h | 3 --- 8 files changed, 30 insertions(+), 32 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index d440548..eaf7b59 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1250,7 +1250,7 @@ libvirt_driver_xen_impl_la_CFLAGS = \ -I$(srcdir)/xenconfig \ $(AM_CFLAGS) libvirt_driver_xen_impl_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS) libvirt_xenconfig.la +libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS) libvirt_driver_xen_impl_la_SOURCES = $(XEN_DRIVER_SOURCES) endif WITH_XEN @@ -1311,7 +1311,7 @@ if WITH_XENAPI noinst_LTLIBRARIES += libvirt_driver_xenapi.la libvirt_la_BUILT_LIBADD += libvirt_driver_xenapi.la libvirt_driver_xenapi_la_CFLAGS = $(LIBXENSERVER_CFLAGS) $(CURL_CFLAGS) \ - -I$(srcdir)/conf -I$(srcdir)/xenconfig $(AM_CFLAGS) + -I$(srcdir)/conf $(AM_CFLAGS) libvirt_driver_xenapi_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_xenapi_la_LIBADD = $(LIBXENSERVER_LIBS) $(CURL_LIBS) libvirt_driver_xenapi_la_SOURCES = $(XENAPI_DRIVER_SOURCES) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b001efc..64665fa 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -25786,3 +25786,25 @@ virDomainDefVcpuOrderClear(virDomainDefPtr def) for (i = 0; i < def->maxvcpus; i++) def->vcpus[i]->order = 0; } + + +int +virDomainDefXenAddImplicitInputDevice(virDomainDefPtr def) +{ + virDomainInputBus implicitInputBus = VIR_DOMAIN_INPUT_BUS_XEN; + + if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) + implicitInputBus = VIR_DOMAIN_INPUT_BUS_PS2; + + if (virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_MOUSE, + implicitInputBus) < 0) + return -1; + + if (virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_KBD, + implicitInputBus) < 0) + return -1; + + return 0; +} diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4447b03..00e833d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3211,4 +3211,7 @@ virDomainGetBlkioParametersAssignFromDef(virDomainDefPtr def, virTypedParameterPtr params, int *nparams, int maxparams); + +int virDomainDefXenAddImplicitInputDevice(virDomainDefPtr def); + #endif /* __DOMAIN_CONF_H */ diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 5cde576..557a408 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -37,7 +37,6 @@ #include "virstring.h" #include "virtime.h" #include "locking/domain_lock.h" -#include "xen_common.h" #include "network/bridge_driver.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -407,7 +406,7 @@ libxlDomainDefPostParse(virDomainDefPtr def, } /* add implicit input devices */ - if (xenDomainDefAddImplicitInputDevice(def) < 0) + if (virDomainDefXenAddImplicitInputDevice(def) < 0) return -1; return 0; diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 3f9bfa7..55c3eb4 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -384,7 +384,7 @@ xenDomainDefPostParse(virDomainDefPtr def, } /* add implicit input device */ - if (xenDomainDefAddImplicitInputDevice(def) <0) + if (virDomainDefXenAddImplicitInputDevice(def) <0) return -1; return 0; diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index a9ed407..0949192 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -39,7 +39,6 @@ #include "xenapi_driver_private.h" #include "xenapi_utils.h" #include "virstring.h" -#include "xen_common.h" #define VIR_FROM_THIS VIR_FROM_XENAPI @@ -80,7 +79,7 @@ xenapiDomainDefPostParse(virDomainDefPtr def, void *parseOpaque ATTRIBUTE_UNUSED) { /* add implicit input device */ - if (xenDomainDefAddImplicitInputDevice(def) < 0) + if (virDomainDefXenAddImplicitInputDevice(def) < 0) return -1; return 0; diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index 7968d40..b129f5e 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -1870,25 +1870,3 @@ xenFormatConfigCommon(virConfPtr conf, return 0; } - - -int -xenDomainDefAddImplicitInputDevice(virDomainDefPtr def) -{ - virDomainInputBus implicitInputBus = VIR_DOMAIN_INPUT_BUS_XEN; - - if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) - implicitInputBus = VIR_DOMAIN_INPUT_BUS_PS2; - - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_MOUSE, - implicitInputBus) < 0) - return -1; - - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - implicitInputBus) < 0) - return -1; - - return 0; -} diff --git a/src/xenconfig/xen_common.h b/src/xenconfig/xen_common.h index 9055692..de981ba 100644 --- a/src/xenconfig/xen_common.h +++ b/src/xenconfig/xen_common.h @@ -67,7 +67,4 @@ int xenFormatConfigCommon(virConfPtr conf, virConnectPtr conn, const char *nativeFormat); - -int xenDomainDefAddImplicitInputDevice(virDomainDefPtr def); - #endif /* __VIR_XEN_COMMON_H__ */ -- 2.10.1

2 2

[libvirt] [Question] vhost-user hotplug: multiqueue hotplug seems doesn't pass mq and vectors
by Gaohaifeng (A) 01 Dec '16

01 Dec '16

Hi ALL: Recently I review the vhost-user hotplug codes, when attach a vhost-user nic with multiqueue, it seems that it doesn't pass mq=on and vectors num to qemu. Is there any special consideration or just a small mistake? Parts of codes: qemuDomainAttachNetDevice(vhostfdSize is 0 when type is vhost-user) qemuBuildNicDevStr: if (usingVirtio && vhostfdSize > 1) { if (net->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { /* ccw provides a one to one relation of fds to queues and * does not support the vectors option */ virBufferAddLit(&buf, ",mq=on"); } else { /* As advised at http://www.linux-kvm.org/page/Multiqueue * we should add vectors=2*N+2 where N is the vhostfdSize */ virBufferAsprintf(&buf, ",mq=on,vectors=%zu", 2 * vhostfdSize + 2); } } Thanks. Haifeng Gao

2 4

[libvirt] [PATCH] qemu: Prevent detaching SCSI controller used by hostdev
by Eric Farman 30 Nov '16

30 Nov '16

Consider a guest started with the following XML snippet: <controller type='scsi' model='virtio-scsi' index='0'/> <hostdev mode='subsystem' type='scsi'> <source> <adapter name='scsi_host0'/> <address bus='0' target='8' unit='1074151456'/> </source> </hostdev> If we attach/create a virtio-scsi hostdev device but forget to include a virtio-scsi controller, one is silently created for us. (See qemuDomainFindOrCreateSCSIDiskController for context.) Detaching the hostdev, followed by the controller, works well and the guest behaves appropriately. If we detach the virtio-scsi controller device first, Libvirt silently detaches any associated hostdevs for us too. But all is not well, as the guest is unable to receive new virtio-scsi devices (the attach commands succeed, but devices never appear within the guest), nor even be shutdown, after this point. It appears that something is tied up in the host virtio layer. While I investigate this, we can see if a controller is being used by any hostdevs, and prevent the detach if it would lead us down this path. $ virsh detach-device guest_one_virtio_scsi scsicontroller.xml error: Failed to detach device from scsicontroller.xml error: operation failed: device cannot be detached: device is busy $ virsh detach-device guest_one_virtio_scsi scsidisk.xml Device detached successfully $ virsh detach-device guest_one_virtio_scsi scsicontroller.xml Device detached successfully Signed-off-by: Eric Farman <farman(a)linux.vnet.ibm.com> Reviewed-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- src/qemu/qemu_hotplug.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index b03e618..5db7abf 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4443,6 +4443,7 @@ static bool qemuDomainDiskControllerIsBusy(virDomainObjPtr vm, { size_t i; virDomainDiskDefPtr disk; + virDomainHostdevDefPtr hostdev; for (i = 0; i < vm->def->ndisks; i++) { disk = vm->def->disks[i]; @@ -4465,6 +4466,15 @@ static bool qemuDomainDiskControllerIsBusy(virDomainObjPtr vm, return true; } + for (i = 0; i < vm->def->nhostdevs; i++) { + hostdev = vm->def->hostdevs[i]; + if (!virHostdevIsSCSIDevice(hostdev) || + detach->type != VIR_DOMAIN_CONTROLLER_TYPE_SCSI) + continue; + if (hostdev->info->addr.drive.controller == detach->idx) + return true; + } + return false; } -- 2.8.4

2 5

[libvirt] [PATCH] loopback is not always just lo
by Pavel Timofeev 30 Nov '16

30 Nov '16

On BSD family OSes (Free/Net/Open/DragonFlyBSD, Mac OS) and Solaris loopback interface is called 'lo0' instead of just 'lo'. --- src/network/bridge_driver.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index a3ee3f3..9d94d65 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1002,7 +1002,12 @@ networkDnsmasqConfContents(virNetworkObjPtr network, virBufferAsprintf(&configbuf, "pid-file=%s\n", pidfile); /* dnsmasq will *always* listen on localhost unless told otherwise */ +#ifdef __linux__ virBufferAddLit(&configbuf, "except-interface=lo\n"); +#else + /* BSD family OSes and Solaris call loopback interface as lo0 */ + virBufferAddLit(&configbuf, "except-interface=lo0\n"); +#endif if (dnsmasqCapsGet(caps, DNSMASQ_CAPS_BIND_DYNAMIC)) { /* using --bind-dynamic with only --interface (no -- 2.9.2

5 7

[libvirt] [PATCH v2] cgroup: Use system reported "unlimited" value for comparison
by Viktor Mihajlovski 30 Nov '16

30 Nov '16

With kernel 3.18 (since commit 3e32cb2e0a12b6915056ff04601cf1bb9b44f967) the "unlimited" value for cgroup memory limits has changed once again as its byte value is now computed from a page counter. The new "unlimited" value reported by the cgroup fs is therefore 2**51-1 pages which is (VIR_DOMAIN_MEMORY_PARAM_UNLIMITED - 3072). This results e.g. in virsh memtune displaying 9007199254740988 instead of unlimited for the limits. This patch uses the value of memory.limit_in_bytes from the cgroup memory root which is the system's "real" unlimited value for comparison. See also libvirt commit 231656bbeb9e4d3bedc44362784c35eee21cf0f4 for the history for kernel 3.12 and before. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- v2: - removed RFC verbiage from commit message - per Martin's review comment, cache the cgroup memory.limit_in_bytes - used the cgroup detection logic proposed by Martin, much nicer now indeed - other than initially planned, fall back to VIR_DOMAIN_MEMORY_PARAM_UNLIMITED in case of cgroup read failure, since the usual paranoia fits in nicely with the "already initialized" check. With the current code structure this will never be called when the memory controller is not configured or mounted anyway... - while at it, replaced the goto cleanups with direct returns as there's really no cleanup to be done in the GetMemoryxxxLimit functions src/util/vircgroup.c | 67 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 18 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index f151193..76d9738 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -2452,6 +2452,46 @@ virCgroupGetBlkioDeviceWeight(virCgroupPtr group, } +/* + * Retrieve the "memory.limit_in_bytes" value from the memory controller + * root dir. This value cannot be modified by userspace and therefore + * is the maximum limit value supported by cgroups on the local system. + * Returns this value scaled to KB or falls back to the original + * VIR_DOMAIN_MEMORY_PARAM_UNLIMITED. Either way, remember the return + * value to avoid unnecessary cgroup filesystem access. + */ +static unsigned long long int virCgroupMemoryUnlimitedKB; + +static unsigned long long int +virCgroupGetMemoryUnlimitedKB(void) +{ + virCgroupPtr group; + unsigned long long int mem_unlimited; + + if (virCgroupMemoryUnlimitedKB) { + return virCgroupMemoryUnlimitedKB; + } else { + mem_unlimited = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED << 10; + + if (virCgroupNew(-1, "/", NULL, -1, &group) < 0) + goto cleanup; + + if (!virCgroupHasController(group, VIR_CGROUP_CONTROLLER_MEMORY)) + goto cleanup; + + ignore_value(virCgroupGetValueU64(group, + VIR_CGROUP_CONTROLLER_MEMORY, + "memory.limit_in_bytes", + &mem_unlimited)); + } + + cleanup: + virCgroupFree(&group); + virCgroupMemoryUnlimitedKB = mem_unlimited >> 10; + return virCgroupMemoryUnlimitedKB; +} + + /** * virCgroupSetMemory: * @@ -2534,20 +2574,17 @@ int virCgroupGetMemoryHardLimit(virCgroupPtr group, unsigned long long *kb) { long long unsigned int limit_in_bytes; - int ret = -1; if (virCgroupGetValueU64(group, VIR_CGROUP_CONTROLLER_MEMORY, "memory.limit_in_bytes", &limit_in_bytes) < 0) - goto cleanup; + return -1; *kb = limit_in_bytes >> 10; - if (*kb > VIR_DOMAIN_MEMORY_PARAM_UNLIMITED) + if (*kb >= virCgroupGetMemoryUnlimitedKB()) *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED; - ret = 0; - cleanup: - return ret; + return 0; } @@ -2596,20 +2633,17 @@ int virCgroupGetMemorySoftLimit(virCgroupPtr group, unsigned long long *kb) { long long unsigned int limit_in_bytes; - int ret = -1; if (virCgroupGetValueU64(group, VIR_CGROUP_CONTROLLER_MEMORY, "memory.soft_limit_in_bytes", &limit_in_bytes) < 0) - goto cleanup; + return -1; *kb = limit_in_bytes >> 10; - if (*kb > VIR_DOMAIN_MEMORY_PARAM_UNLIMITED) + if (*kb >= virCgroupGetMemoryUnlimitedKB()) *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED; - ret = 0; - cleanup: - return ret; + return 0; } @@ -2658,20 +2692,17 @@ int virCgroupGetMemSwapHardLimit(virCgroupPtr group, unsigned long long *kb) { long long unsigned int limit_in_bytes; - int ret = -1; if (virCgroupGetValueU64(group, VIR_CGROUP_CONTROLLER_MEMORY, "memory.memsw.limit_in_bytes", &limit_in_bytes) < 0) - goto cleanup; + return -1; *kb = limit_in_bytes >> 10; - if (*kb > VIR_DOMAIN_MEMORY_PARAM_UNLIMITED) + if (*kb >= virCgroupGetMemoryUnlimitedKB()) *kb = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED; - ret = 0; - cleanup: - return ret; + return 0; } -- 1.9.1

1 0

[libvirt] [PATCH 0/2] cpu: Add alternative feature spellings to CPU map
by Jiri Denemark 30 Nov '16

30 Nov '16

Jiri Denemark (2): cpu: Remove useless comments from CPU map cpu: Add alternative feature spellings to CPU map src/cpu/cpu_map.xml | 154 ++++++++++++++++++++++++++-------------------------- 1 file changed, 77 insertions(+), 77 deletions(-) -- 2.11.0.rc2

3 5

[libvirt] [PATCH v2 0/4] qemu: assign vfio devices to PCIe addresses when appropriate
by Laine Stump 30 Nov '16

30 Nov '16

Patches 1 and 4 were originally added to the end of the "more PCIe less legacy PCI" patchset in its final incarnation, but all the other patches were ACKed and pushed, while this needed a bit more work, resulting in this "faux V2" - although it's the 2nd time I've posted these patches, their "V1" was really inside the "V11666" of a larger series. In order to implement Alex's suggestion of checking the length of a PCI device's config file to determine if it's an Express device, I first made a utility function to return the length of a file, and then another to return the name of the config file of a virPCIDevice - those are the new patches 2 and 3. I'm open to suggestions about additional checks to put in virFileLength(), as long as they don't involve opening the file. For now I've kept it as simple as possible. (Just keep in mind that I'll be away from my keyboard from Wednesday through Sunday this week). Laine Stump (4): util: new function virFileLength() util: new function virPCIDeviceGetConfigPath() qemu: propagate virQEMUDriver object to qemuDomainDeviceCalculatePCIConnectFlags qemu: assign vfio devices to PCIe addresses when appropriate src/libvirt_private.syms | 2 + src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain_address.c | 117 ++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_domain_address.h | 7 ++- src/qemu/qemu_hotplug.c | 19 +++---- src/qemu/qemu_process.c | 13 +++-- src/util/virfile.c | 13 +++++ src/util/virfile.h | 2 + src/util/virpci.c | 6 +++ src/util/virpci.h | 1 + tests/qemuhotplugtest.c | 4 +- 11 files changed, 157 insertions(+), 29 deletions(-) -- 2.9.3

3 16

[libvirt] [PATCH] daemon: Install virt-guest-shutdown.target properly
by Michal Privoznik 30 Nov '16

30 Nov '16

When trying to install libvirtd from sources I've noticed the following failure: /usr/bin/install: cannot stat 'virt-guest-shutdown.target': No such file or directory Makefile:2792: recipe for target 'install-init-systemd' failed make[3]: *** [install-init-systemd] Error 1 make[3]: *** Waiting for unfinished jobs.... The problem is that while other files around that location in Makefile are firstly generated into the builddir and only after that installed, virt-guest-shutdown.target file is not generated at all and should be installed from the srcdir. This was introduced in 01079727. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build-breaker & trivial rules. daemon/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 463db6e..60c7368 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -457,7 +457,7 @@ install-init-systemd: install-sysconfig libvirtd.service $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) $(INSTALL_DATA) libvirtd.service \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.service - $(INSTALL_DATA) virt-guest-shutdown.target \ + $(INSTALL_DATA) $(srcdir)/virt-guest-shutdown.target \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virt-guest-shutdown.target uninstall-init-systemd: uninstall-sysconfig -- 2.8.4

2 1

[libvirt] [PATCH] virt-gnutls.m4: fixed check for gnutls_rnd and gnutls_cipher_encrypt
by Daniel P. Berrange 30 Nov '16

30 Nov '16

From: Nikos Mavrogiannopoulos <nmav(a)redhat.com> --- m4/virt-gnutls.m4 | 3 +++ 1 file changed, 3 insertions(+) I thought this was onlist already, but there was a typo in To, so neither the original patch or my ACK made it to the list. I pushed as a build fix. diff --git a/m4/virt-gnutls.m4 b/m4/virt-gnutls.m4 index b850828..5bca950 100644 --- a/m4/virt-gnutls.m4 +++ b/m4/virt-gnutls.m4 @@ -54,8 +54,11 @@ AC_DEFUN([LIBVIRT_CHECK_GNUTLS],[ #include <gnutls/gnutls.h> ]]) + OLD_LIBS="$LIBS" + LIBS="$LIBS $GNUTLS_LIBS" AC_CHECK_FUNC([gnutls_rnd]) AC_CHECK_FUNC([gnutls_cipher_encrypt]) + LIBS=$OLD_LIBS fi ]) -- 2.9.3

1 0

[libvirt] [PATCH] docs: improve release numbering rule for minor numbers
by Boris Fiuczynski 30 Nov '16

30 Nov '16

Adding first build of year minor number reset to 0. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- docs/downloads.html.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index f34e9a6..1f2ec1d 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -383,7 +383,8 @@ <dd>incremented by 1 for the first release of the year (the Jan 15th release)</dd> <dt><code>minor</code></dt> - <dd>incremented by 1 for each monthly release from git master</dd> + <dd>set to 0 with every major increment or incremented by 1 + for each monthly release from git master</dd> <dt><code>micro</code></dt> <dd>always 0 for releases from git master, incremented by 1 for each stable maintenance release</dd> -- 2.5.5

2 4

[libvirt] [PATCH] fix parsing security labels from virt-aa-helper
by Christian Ehrhardt 30 Nov '16

30 Nov '16

When parsing labels virt-aa-helper does no more pass VIR_DOMAIN_DEF_PARSE_INACTIVE due to dfbc9a83 that tried to mitigate the changes of a89f05ba. For those it had to switch from VIR_DOMAIN_DEF_PARSE_INACTIVE to active since we need the domain id (ctl->def->id) as it is part of the socket path now which is needed for the aa profile. But that turned out to break non apparmor seclabels as well as apparmor seclabels in xmls without labels. In those cases due to VIR_DOMAIN_DEF_PARSE_INACTIVE now not set anymore virSecurityLabelDefParseXML insists on finding labels. Cases: - non-apparmor seclabel - virt-aa-helper breaks - apparmor seclabel without labels on a defined domain - virt-aa-helper breaks This was not spotted due to labels getting dynamically created on definition. So "define, start, stop" works. But "define, edit (add label), start" does not. Now turning back on VIR_DOMAIN_DEF_PARSE_INACTIVE would cause the old bug, so we have to differ those more fine grained. This is done by the new flag VIR_DOMAIN_DEF_PARSE_SKIP_ACTIVE_LABEL which is like VIR_DOMAIN_DEF_PARSE_INACTIVE but only for the security labels. So far only set by virt-aa-helper. Testcase with virt-aa-helper on xml file: virt-aa-helper -d -r -p 0 -u libvirt-<uuid> < your-guest.xml virt-aa-helper: error: could not parse XML virt-aa-helper: error: could not get VM definition (That should have printed a valid apparmor profile) Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- src/conf/domain_conf.c | 6 ++++-- src/conf/domain_conf.h | 3 +++ src/security/virt-aa-helper.c | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 03506cb..9eb7883 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6626,7 +6626,8 @@ virSecurityLabelDefParseXML(xmlXPathContextPtr ctxt, * if the 'live' VM XML is requested */ if (seclabel->type == VIR_DOMAIN_SECLABEL_STATIC || - (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) && + (!(flags & (VIR_DOMAIN_DEF_PARSE_SKIP_ACTIVE_LABEL | + VIR_DOMAIN_DEF_PARSE_INACTIVE)) && seclabel->type != VIR_DOMAIN_SECLABEL_NONE)) { p = virXPathStringLimit("string(./label[1])", VIR_SECURITY_LABEL_BUFLEN-1, ctxt); @@ -6642,7 +6643,8 @@ virSecurityLabelDefParseXML(xmlXPathContextPtr ctxt, /* Only parse imagelabel, if requested live XML with relabeling */ if (seclabel->relabel && - (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) && + (!(flags & (VIR_DOMAIN_DEF_PARSE_SKIP_ACTIVE_LABEL | + VIR_DOMAIN_DEF_PARSE_INACTIVE)) && seclabel->type != VIR_DOMAIN_SECLABEL_NONE)) { p = virXPathStringLimit("string(./imagelabel[1])", VIR_SECURITY_LABEL_BUFLEN-1, ctxt); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 24aa79c..90693c6 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2657,6 +2657,9 @@ typedef enum { VIR_DOMAIN_DEF_PARSE_ABI_UPDATE = 1 << 9, /* skip definition validation checks meant to be executed on define time only */ VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE = 1 << 10, + /* in regard to security labels, skip parts of the XML that would only be + * present in an active libvirt XML. */ + VIR_DOMAIN_DEF_PARSE_SKIP_ACTIVE_LABEL = 1 << 11, } virDomainDefParseFlags; typedef enum { diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 77eeaff..0ca4c83 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -705,6 +705,7 @@ get_definition(vahControl * ctl, const char *xmlStr) ctl->def = virDomainDefParseString(xmlStr, ctl->caps, ctl->xmlopt, NULL, + VIR_DOMAIN_DEF_PARSE_SKIP_ACTIVE_LABEL | VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE); if (ctl->def == NULL) { -- 2.7.4

4 14

[libvirt] [RFC v2 00/20] qmp: Report bus information on 'query-machines'
by Eduardo Habkost 29 Nov '16

29 Nov '16

Changes v1 -> v2: * v1 series subject was: "qmp: Report supported device types on 'query-machines'" * Now we return additional bus information: bus ID, bus type, and the list of accepted device types on each bus * Now hotplug can be covered because accepted-device-types can be set by individual bus instances if necessary * Now the new field is optional, and every machine having the new field are now validated in "strict mode" on test code (meaning all buses must be present on the list) * TODO: only PC was converted, machines from other architectures don't include the field yet * Legacy-PCI vs PCIe is now handled: * PCIDeviceClass::is_express field was removed * Defined INTERFACE_LEGACY_PCI_DEVICE and INTERFACE_PCIE_DEVICE, buses and devices now report appropriate interface names * Now PCIe buses can return the right information because each bus instance can set its own accepted-device-types list * TODO: PCIe pci-bridge classes need to be changed to not include INTERFACE_LEGACY_PCI_DEVICE * TODO: replace q35 hack with appropriate code that set Legacy-PCI rules in PCI code * Removed patches from v1: * pc: Initialize default bus lists * s390x: Initialize default bus lists * arm: Initialize default bus lists * mips: Initialize default bus lists * ppc: Initialize default bus lists * qdev: Add device_class_set_bus_type() function (validation is more difficult with the PCI/PCIe rules, plan is to try to remove DeviceClass::bus_type field, se "Limitations" below) * See individual patches for additional details The Problem =========== Currently management software has no way to find out which device types can be plugged in a machine, unless the machine is already initialized. Even after the machine is initialized, there's no way to map existing bus types to supported device types unless management software hardcodes the mapping between bus types and device types. Example: floppy support on q35 vs i440fx ---------------------------------------- There's no way for libvirt to find out that there's no floppy controller on pc-q35-* machine-types by default. With this series, pc-i440fx-* will report "floppy" as a supported device type, but pc-q35-* will not. Example: Legacy PCI vs vs PCIe devices -------------------------------------- Some devices require a PCIe bus to be available, others work on both legacy PCI and PCIe, while others work only on a legacy PCI bus. Currently management software has no way to know which devices can be added to a given machine, unless it hardcodes machine-type names and device-types names. Example: spapr and PCIe root bus -------------------------------- See the thread at: Subject: [RFC PATCH qemu] spapr_pci: Create PCI-express root bus by default If we make new spapr machine-type versions create a PCIe root bus, management software will need a way to find out: 1) The type of the default bus for the machine type; 2) The ID of the default bus for the machine type. Otherwise, management software will have to hardcode it based on machine-type version. The proposed interface should solve this problem. The Proposed Interface ====================== Bus info on query-machines -------------------------- This series adds a new field to the output of 'query-machines': 'always-available-buses'. It will contain a a list of MachineBusInfo structs. MachineBusInfo will contain: * bus-id: The bus ID * bus-type: The bus type * accepted-device-types: A list of accepted device types for the bus. bus-id can be used to find out what's the right "bus" argument to be used when adding a device to the machine configuration (e.g. when using -device and device_add). accepted-device-types can be used as the 'implements' argument on the 'qom-list-types' command, to find out which device types can be plugged on the bus. accepted-device-types property on bus objects --------------------------------------------- This series also adds a 'accepted-device-types' property to bus objects, so management software can check which kinds of devices can be plugged at runtime. Example output -------------- TODO: update it. Considered alternatives ======================= Indirect mapping (machine => bus => device) ------------------------------------------- This RFC implements a mechanism to implement ax machine-type => accepted-device-types mapping. An alternative solution I considered was to expose an indirect mapping: machine-type => default-bus-types followed by bus-type => accepted-device-types. But some buses have no correct bus-type => accepted-device-types mapping. PCIe buses, for example, may or may not accept legacy PCI buses, depending on the machine and the bus topology. imposes less restrictions on how the device and bus type hierarchy is implemented inside QEMU. There's still a machine-type => bus-type => device-type mapping implemented internally, but it is an implementation detail on the current version, and not part of the externally-visible interface. The Implementation ================== This add a new field to MachineClass: always_available_buses, a new field to BusState: accepted_device_types, and a new field to BusClass: device_type. On most cases, the normal QOM type hierarchy is used to define the set of accepted devices for a bus. On the case of PCI buses, INTERFACE_PCIE_DEVICE and INTERFACE_LEGACY_PCI_DEVICE interface names were introduced, to indicate the set of devices accepted by PCI buses. That means we are duplicating information: MachineClass::always_available_buses duplicates knowledge that is already encoded in the machine init function. To make sure the information is correct, a qmp-machine-info.py test case is added, that will validate the supported-device-types field based on the buses created by the machine. Test Code --------- qdev-based test code for the new field was implemented in a Python script. Some extra support was implemented in tests/Makefile.include, scripts/qemu.py and scripts/qtest.py to allow the test to be implemented. Limitations =========== TODO: "slots" vs "buses" ------------------------ The current interface is returning information about "available buses". Future versions might return more detailed information about "slots" where devices can be plugged. This would make the proposed mechanism more flexible, and cover cases like CPU hotplug (in other words, the new interface could replace query-hotpluggable-cpus in a generic way). "default defaults" vs "-nodefault defaults" ------------------------------------------- libvirt use -nodefaults when starting QEMU, so knowing which buses are available when using -nodefaults is more interesting for them. Other software, on the other hand, might be interested in the results without -nodefaults. The new 'always-available-bus' field won't cover the more general cases, where "-nodefaults" is not used, or when there are extra QEMU options that create more buses (e.g. "-machine usb=on", or explicit -device options that would create additional buses). Additional mechanisms may be added to let management software to ask which buses are created when extra options are used, but maybe thoses cases would be more easily solved if management software checks the bus list at runtime (after the machine was actually created). TYPE_SYS_BUS_DEVICE is too generic ---------------------------------- Currently all machines have a TYPE_SYS_BUS bus, and all TYPE_SYS_BUS_DEVICE subclasses are reported as supported by that bus. On the other hand, omitting sysbus would make query-machines lie about supporting sysbus devices, and would require management software to add special cases for sysbus devices. For this reason, sysbus is being included in the output of query-machines, although its accepted-device-types info is less useful than the information about other buses. Future versions of QEMU can keep the same interface, but make it include more useful information, e.g., return more specific bus info, with type names that exclude sysbus devices that can't possibly work with the machine. PCI vs PCIe ----------- This was a limitation on v1, but I believe the problem was addressed on v2. This series defines two new interface names: INTERFACE_LEGACY_PCI_DEVICE and INTERFACE_PCIE_DEVICE. * Legacy PCI devices will implement INTERFACE_LEGACY_PCI_DEVICE. * PCIe devices will implement INTERFACE_PCIE_DEVICE. * Hybrid devices that support both will implement both * interfaces. Buses will have accepted-device-types set accordingly: * Legacy PCI buses will report INTERFACE_LEGACY_PCI_DEVICE on accepted-device-types. * PCIe buses that accept only PCIe devices will report INTERFACE_PCIE_DEVICE on accepted-device-types. * PCIe buses that accept both PCIe and legacy PCI devices will report both INTERFACE_PCIE_DEVICE and INTERFACE_LEGACY_PCI_DEVICE on accepted-device-types. The Q35 root bus is the only existing example of a hybrid bus. See the next section about the hack where this is implemented. Q35 root bus hack ----------------- This series includes a hack on Q35 code to add INTERFACE_LEGACY_PCI_DEVICE to accepted-device-types on the root PCIe bus. Suggestions on where this information should be encoded are welcome. Only PC is covered ------------------ This series sets always-available-buses only on the PC machine-types, by now. Future versions might have the field added to other machines. sPAPR is an obvious candidate, as there are plans to change new spapr machine-type versions to use PCIe as the root bus. Out of scope: Configurable buses -------------------------------- There's no way to map machine options like "usb=on|off" to device-types or buses. This is not on the scope of this series. Additional mechanisms may be added to let management software to ask which buses are created when extra options are used, but maybe thoses cases would be more easily solved if management software checks the bus list at runtime (after the machine was actually created). Existing DeviceClass::bus_type field ------------------------------------ The new BusClass::device_type and BusState::accepted_device_types fields duplicate knowledge that is already encoded in DeviceClass::bus_type. v1 of this series included code that validated both fields to ensure they are consistent with each other. But the PCI/PCIe hierarchy makes validation more difficult, so the validation code was removed on v2. The DeviceClass::bus_type abstraction breaks in the case of hybrid PCI buses, because only a bus type name is not enough information to find the right bus to plug a device. This needs to be addressed somehow (maybe DeviceClass::bus_type can be completely removed), but I didn't look at the device_add code to find out the best way to do that. --- Cc: libvir-list(a)redhat.com Cc: Laine Stump <laine(a)redhat.com> Cc: Alexey Kardashevskiy <aik(a)ozlabs.ru> Cc: Greg Kurz <groug(a)kaod.org> Cc: David Gibson <david(a)gibson.dropbear.id.au> Cc: Andrea Bolognani <abologna(a)redhat.com>, Cc: Eric Blake <eblake(a)redhat.com> Cc: Cornelia Huck <cornelia.huck(a)de.ibm.com> Cc: David Hildenbrand <david(a)redhat.com> Eduardo Habkost (20): qemu.py: Make logging optional qtest.py: Support QTEST_LOG environment variable qtest.py: make logging optional qtest.py: Make 'binary' parameter optional tests: Add rules to non-gtester qtest test cases qdev: Add 'accepted-device-types' property to BusClass qmp: Add 'always-available-buses' field to 'query-machines' virtio-pci: Set PCIDeviceClass::is_express=1 vmxnet3: Set PCIDeviceClass::is_express=1 pvscsi: Set PCIDeviceClass::is_express=1 pci: INTERFACE_LEGACY_PCI_DEVICE and INTERFACE_PCIE_DEVICE interfaces pci: Replace is_express with INTERFACE_PCIE_DEVICE [trivial] edu: Move edu_info outside function [automated] Add INTERFACE_LEGACY_PCI_DEVICE to all PCI device subclasses eepro100: Add INTERFACE_LEGACY_PCI_DEVICE [incomplete] remove INTERFACE_LEGACY_PCI_DEVICE from PCIe-only devices pci: Set device_type on bus classes q35: Hack to make root bus accept legacy PCI devices pci: validate interfaces on base_class_init pc: Initialize default bus lists hw/acpi/piix4.c | 1 + hw/audio/ac97.c | 4 + hw/audio/es1370.c | 4 + hw/audio/intel-hda.c | 11 +++ hw/block/fdc.c | 15 +++- hw/block/nvme.c | 5 +- hw/char/serial-pci.c | 12 +++ hw/char/virtio-serial-bus.c | 1 + hw/core/bus.c | 21 +++++ hw/core/machine.c | 33 ++++++- hw/core/sysbus.c | 1 + hw/display/cirrus_vga.c | 4 + hw/display/qxl.c | 4 + hw/display/vga-pci.c | 4 + hw/display/vmware_vga.c | 4 + hw/i2c/core.c | 7 ++ hw/i2c/smbus_ich9.c | 4 + hw/i386/amd_iommu.c | 4 + hw/i386/kvm/pci-assign.c | 4 + hw/i386/pc.c | 1 + hw/i386/pc_piix.c | 29 ++++++ hw/i386/pc_q35.c | 21 +++++ hw/i386/xen/xen_platform.c | 4 + hw/i386/xen/xen_pvdevice.c | 4 + hw/ide/ich.c | 4 + hw/ide/pci.c | 4 + hw/ide/qdev.c | 1 + hw/input/adb.c | 7 ++ hw/ipack/ipack.c | 7 ++ hw/ipack/tpci200.c | 4 + hw/isa/i82378.c | 4 + hw/isa/isa-bus.c | 1 + hw/isa/lpc_ich9.c | 1 + hw/isa/piix4.c | 4 + hw/isa/vt82c686.c | 16 ++++ hw/mips/gt64xxx_pci.c | 4 + hw/misc/auxbus.c | 1 + hw/misc/edu.c | 20 +++-- hw/misc/ivshmem.c | 4 + hw/misc/macio/macio.c | 4 + hw/misc/pci-testdev.c | 4 + hw/net/e1000.c | 4 + hw/net/e1000e.c | 5 +- hw/net/eepro100.c | 5 ++ hw/net/ne2000.c | 4 + hw/net/pcnet-pci.c | 4 + hw/net/rocker/rocker.c | 4 + hw/net/rtl8139.c | 4 + hw/net/vmxnet3.c | 36 ++------ hw/pci-bridge/dec.c | 4 + hw/pci-bridge/ioh3420.c | 6 +- hw/pci-bridge/pci_expander_bridge.c | 8 ++ hw/pci-bridge/xio3130_downstream.c | 6 +- hw/pci-bridge/xio3130_upstream.c | 6 +- hw/pci-host/apb.c | 4 + hw/pci-host/bonito.c | 4 + hw/pci-host/gpex.c | 4 + hw/pci-host/grackle.c | 4 + hw/pci-host/piix.c | 8 ++ hw/pci-host/ppce500.c | 4 + hw/pci-host/prep.c | 4 + hw/pci-host/q35.c | 14 +++ hw/pci-host/uninorth.c | 16 ++++ hw/pci-host/versatile.c | 4 + hw/pci/pci.c | 41 ++++++++- hw/pci/pci_bridge.c | 4 + hw/ppc/ppc4xx_pci.c | 4 + hw/ppc/spapr_vio.c | 1 + hw/s390x/css-bridge.c | 2 + hw/s390x/event-facility.c | 1 + hw/s390x/s390-pci-bus.c | 7 ++ hw/scsi/esp-pci.c | 4 + hw/scsi/lsi53c895a.c | 4 + hw/scsi/megasas.c | 12 ++- hw/scsi/mptsas.c | 4 + hw/scsi/scsi-bus.c | 1 + hw/scsi/vmw_pvscsi.c | 29 ++---- hw/sd/core.c | 7 ++ hw/sd/sdhci.c | 4 + hw/sh4/sh_pci.c | 4 + hw/sparc64/sun4u.c | 4 + hw/ssi/ssi.c | 7 ++ hw/usb/bus.c | 1 + hw/usb/dev-smartcard-reader.c | 7 ++ hw/usb/hcd-ehci-pci.c | 4 + hw/usb/hcd-ohci.c | 4 + hw/usb/hcd-uhci.c | 4 + hw/usb/hcd-xhci.c | 5 +- hw/vfio/pci-quirks.c | 4 + hw/vfio/pci.c | 6 +- hw/virtio/virtio-bus.c | 1 + hw/virtio/virtio-pci.c | 27 +++--- hw/watchdog/wdt_i6300esb.c | 4 + hw/xen/xen_pt.c | 4 + include/hw/boards.h | 7 ++ include/hw/pci/pci.h | 9 +- include/hw/qdev-core.h | 8 ++ qapi-schema.json | 37 +++++++- scripts/qemu.py | 25 ++++-- scripts/qtest.py | 15 +++- tests/Makefile.include | 39 +++++++- tests/qmp-machine-info.py | 173 ++++++++++++++++++++++++++++++++++++ vl.c | 6 ++ 103 files changed, 882 insertions(+), 102 deletions(-) create mode 100755 tests/qmp-machine-info.py -- 2.7.4

1 2

[libvirt] [PATCH 0/3] Better documentation of migration APIs and flags
by Jiri Denemark 29 Nov '16

29 Nov '16

We have 6 public APIs for migration: virDomainMigrate, virDomainMigrate2, virDomainMigrate3, virDomainMigrateToURI, virDomainMigrateToURI2, and virDomainMigrateToURI3. Each of them was documented separately, but the documentation was not consistent. Some APIs documented individual flags, some didn't do that. Some notes about specific behavior were not added to all APIs. And so on. Since the newer versions provide a superset of the functionality of the older ones mainly adding new parameters, it doesn't really make sense to keep 6 (ideally) almost identical copies of the same documentation. To get out of this mess this patch set moves documentation of individual migration flags directly to libvirt-domain.h, where the flags are defined. And the documentation of virDomainMigrate{,ToURI}{,2} is reduced to point to the *3 APIs with a description of how old parameters are mapped to the new ones. Jiri Denemark (3): Enhance documentation of virDomainMigrateFlags Consolidate documentation of virDomainMigrate{,ToURI}{,2,3} docs: Update news docs/news.html.in | 2 + include/libvirt/libvirt-domain.h | 153 ++++++++++++++--- src/libvirt-domain.c | 348 ++++----------------------------------- 3 files changed, 170 insertions(+), 333 deletions(-) -- 2.11.0.rc2

2 6

[libvirt] [RFC PATCH 1/1] gluster: cache glfs connection object per volume
by Prasanna Kumar Kalever 29 Nov '16

29 Nov '16

This patch offer, 1. Optimizing the calls to glfs_init() and friends 2. Temporarily reduce the memory leak appear in libvirt process account, even if the root cause for the leaks are glfs_fini() (7 - 10MB per object) [Hopefully gluster should address this in its future releases, not very near] Currently, a start of a VM will call 2 glfs_new/glfs_init (which will create glfs object, once for stat, read headers and next to chown) and then will fork qemu process which will call once again (for actual read write IO). Not that all, in case if we are have 4 extra attached disks, then the total calls to glfs_init() and friends will be (4+1)*2 in libvirt and (4+1)*1 in qemu space i.e 15 calls. Since we don't have control over qemu process as that executes in a different process environment, lets do not bother much about it. This patch shrinks these 10 calls (i.e objects from above example) to just one, by maintaining a cache of glfs objects. The glfs object is shared across other only if volume name and all the volfile servers match. In case of hit glfs object takes a ref and only on close unref happens. Thanks to 'Peter Krempa' for the discussion. Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever(a)redhat.com> --- WORK IN PROGRESS: (WIP) ---------------- While initially caching the glfs object, i.e. in virStorageBackendGlusterSetPreopened() I have took a ref=2, so on the following virStorageBackendGlusterClosePreopened() --ref will make ref=1, which will help not cleaning up the object which has to be shared with next coming disks (if conditions meat). Given some context, the idea is that on time-out (or after all disks are initiallized) some one should call virStorageBackendGlusterClosePreopened() which will ideally make ref=0, hence cached object will be cleaned/deleted calling glfs_fini() I had a thought of doing the time-out cleanup call in virSecurityManagerSetAllLabel() or similar, but that looks too odd for me? Some help ? Thanks in advance. --- src/storage/storage_backend_gluster.c | 136 ++++++++++++++++++++++++++++++++-- src/storage/storage_backend_gluster.h | 33 ++++++++- 2 files changed, 160 insertions(+), 9 deletions(-) diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index 8e86704..4f53ebc 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -47,19 +47,132 @@ struct _virStorageBackendGlusterState { char *dir; /* dir from URI, or "/"; always starts and ends in '/' */ }; +virGlusterDefPtr ConnCache = {0,}; + typedef struct _virStorageBackendGlusterState virStorageBackendGlusterState; typedef virStorageBackendGlusterState *virStorageBackendGlusterStatePtr; +void +virStorageBackendGlusterSetPreopened(virStorageSourcePtr src, glfs_t *fs) +{ + size_t i; + virStorageBackendGlusterStatePtrPreopened entry = NULL; + + if (ConnCache == NULL && (VIR_ALLOC(ConnCache) < 0)) + return; + + for (i = 0; i < ConnCache->nConn; i++) { + if (STREQ(ConnCache->Conn[i]->volname, src->volume)) + return; + } + + if (VIR_ALLOC(entry) < 0) + goto L1; + + if (VIR_STRDUP(entry->volname, src->volume) < 0) + goto L1; + + entry->nhosts = src->nhosts; + for (i = 0; i < src->nhosts; i++) { + if (VIR_ALLOC_N(entry->hosts[i], strlen(src->hosts[i].name) + 1) < 0) + goto L2; + strcpy(entry->hosts[i], src->hosts[i].name); + } + + entry->fs = fs; + entry->ref = 2; /* persist glfs obj per volume until a final timeout + virStorageBackendGlusterClosePreopened() is called */ + + if (VIR_INSERT_ELEMENT(ConnCache->Conn, -1, ConnCache->nConn, entry) < 0) + goto L2; + + return; + +L2: + for (i = 0; i < entry->nhosts; i++) + VIR_FREE(entry->hosts[i]); +L1: + if(ConnCache->nConn == 0) + VIR_FREE(ConnCache); + VIR_FREE(entry->volname); + VIR_FREE(entry); +} + +glfs_t * +virStorageBackendGlusterFindPreopened(virStorageSourcePtr src) +{ + size_t i, j, k, ret = 0; + size_t min, max; + + if (ConnCache == NULL) + return NULL; + + virStorageBackendGlusterStatePtrPreopened entry; + + for (i = 0; i < ConnCache->nConn; i++) { + entry = ConnCache->Conn[i]; + if (STREQ(entry->volname, src->volume)) { + min = entry->nhosts < src->nhosts ? entry->nhosts : src->nhosts; + max = entry->nhosts >= src->nhosts ? entry->nhosts : src->nhosts; + for (j = 0; j< min; j++) { + if (entry->nhosts == min) { + for (k = 0; k < max; k++) { + if (STREQ(entry->hosts[j], src->hosts[k].name)) { + ret = 1; + break; + } + } + if (!ret) + return NULL; + } else { + for (k = 0; k < max; k++) { + if (STREQ(src->hosts[j].name, entry->hosts[k])) { + ret = 1; + break; + } + } + if (!ret) + return NULL; + } + } + entry->ref++; + return entry->fs; + } + } + return NULL; +} + +int +virStorageBackendGlusterClosePreopened(glfs_t *fs) +{ + size_t i; + int ret = 0; + + if (fs == NULL) + return ret; + + for (i = 0; i < ConnCache->nConn; i++) { + if (ConnCache->Conn[i]->fs == fs) { + if (--ConnCache->Conn[i]->ref) + return ret; + + ret = glfs_fini(ConnCache->Conn[i]->fs); + VIR_FREE(ConnCache->Conn[i]->volname); + VIR_FREE(ConnCache->Conn[i]); + + VIR_DELETE_ELEMENT(ConnCache->Conn, i, ConnCache->nConn); + } + } + return ret; +} + static void virStorageBackendGlusterClose(virStorageBackendGlusterStatePtr state) { if (!state) return; - /* Yuck - glusterfs-api-3.4.1 appears to always return -1 for - * glfs_fini, with errno containing random data, so there's no way - * to tell if it succeeded. 3.4.2 is supposed to fix this.*/ - if (state->vol && glfs_fini(state->vol) < 0) + if (state->vol && virStorageBackendGlusterClosePreopened(state->vol) < 0) VIR_DEBUG("shutdown of gluster volume %s failed with errno %d", state->volname, errno); @@ -556,8 +669,7 @@ virStorageFileBackendGlusterDeinit(virStorageSourcePtr src) src, src->hosts->name, src->hosts->port ? src->hosts->port : "0", src->volume, src->path); - if (priv->vol) - glfs_fini(priv->vol); + virStorageBackendGlusterClosePreopened(priv->vol); VIR_FREE(priv->canonpath); VIR_FREE(priv); @@ -630,11 +742,20 @@ virStorageFileBackendGlusterInit(virStorageSourcePtr src) src, priv, src->volume, src->path, (unsigned int)src->drv->uid, (unsigned int)src->drv->gid); + + priv->vol = virStorageBackendGlusterFindPreopened(src); + if (priv->vol) { + src->drv->priv = priv; + return 0; + } + if (!(priv->vol = glfs_new(src->volume))) { virReportOOMError(); goto error; } + virStorageBackendGlusterSetPreopened(src, priv->vol); + for (i = 0; i < src->nhosts; i++) { if (virStorageFileBackendGlusterInitServer(priv, src->hosts + i) < 0) goto error; @@ -652,8 +773,7 @@ virStorageFileBackendGlusterInit(virStorageSourcePtr src) return 0; error: - if (priv->vol) - glfs_fini(priv->vol); + virStorageBackendGlusterClosePreopened(priv->vol); VIR_FREE(priv); return -1; diff --git a/src/storage/storage_backend_gluster.h b/src/storage/storage_backend_gluster.h index 6796016..a0326aa 100644 --- a/src/storage/storage_backend_gluster.h +++ b/src/storage/storage_backend_gluster.h @@ -22,9 +22,40 @@ #ifndef __VIR_STORAGE_BACKEND_GLUSTER_H__ # define __VIR_STORAGE_BACKEND_GLUSTER_H__ -# include "storage_backend.h" +#include "storage_backend.h" +#include <glusterfs/api/glfs.h> extern virStorageBackend virStorageBackendGluster; extern virStorageFileBackend virStorageFileBackendGluster; + +struct _virStorageBackendGlusterStatePreopened { + char *volname; + size_t nhosts; + char *hosts[1024]; /* FIXME: 1024 ? */ + glfs_t *fs; + int ref; +}; + +typedef struct _virStorageBackendGlusterStatePreopened virStorageBackendGlusterStatePreopened; +typedef virStorageBackendGlusterStatePreopened *virStorageBackendGlusterStatePtrPreopened; + +struct _virGlusterDef { + size_t nConn; + virStorageBackendGlusterStatePtrPreopened *Conn; +}; + +typedef struct _virGlusterDef virGlusterDef; +typedef virGlusterDef *virGlusterDefPtr; + +extern virGlusterDefPtr ConnCache; + +void +virStorageBackendGlusterSetPreopened(virStorageSourcePtr src, glfs_t *fs); + +glfs_t* +virStorageBackendGlusterFindPreopened(virStorageSourcePtr src); + +int +virStorageBackendGlusterClosePreopened(glfs_t *fs); #endif /* __VIR_STORAGE_BACKEND_GLUSTER_H__ */ -- 2.7.4

3 2

[libvirt] [PATCH 0/2] qemu: error out on USB ports out of range
by Ján Tomko 29 Nov '16

29 Nov '16

https://bugzilla.redhat.com/show_bug.cgi?id=1399260 Ján Tomko (2): tests: Fix USB ports in usb-redir-filter qemu: error out on USB ports out of range src/conf/domain_addr.c | 7 ++++++ .../qemuxml2argv-usb-ports-out-of-range.xml | 25 ++++++++++++++++++++++ .../qemuxml2argv-usb-redir-filter-version.args | 4 ++-- .../qemuxml2argv-usb-redir-filter-version.xml | 4 ++-- tests/qemuxml2argvtest.c | 3 +++ .../qemuxml2xmlout-usb-redir-filter-version.xml | 4 ++-- 6 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-ports-out-of-range.xml -- 2.7.3

2 3

[libvirt] [PATCH] qemuProcessReconnect: Avoid relabeling images after migration
by Jiri Denemark 29 Nov '16

29 Nov '16

Restarting libvirtd on the source host at the end of migration when a domain is already running on the destination would cause image labels to be reset effectively killing the domain. Commit e8d0166e1d fixed similar issue on the destination host, but kept the source always resetting the labels, which was mostly correct except for the specific case handled by this patch. https://bugzilla.redhat.com/show_bug.cgi?id=1343858 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_process.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f8f379a58..01c9259b6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2955,7 +2955,8 @@ qemuProcessRecoverMigrationOut(virQEMUDriverPtr driver, virConnectPtr conn, qemuMigrationJobPhase phase, virDomainState state, - int reason) + int reason, + unsigned int *stopFlags) { bool postcopy = state == VIR_DOMAIN_PAUSED && (reason == VIR_DOMAIN_PAUSED_POSTCOPY || @@ -3019,6 +3020,7 @@ qemuProcessRecoverMigrationOut(virQEMUDriverPtr driver, case QEMU_MIGRATION_PHASE_CONFIRM3: /* migration completed, we need to kill the domain here */ + *stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED; return -1; } @@ -3044,7 +3046,8 @@ static int qemuProcessRecoverJob(virQEMUDriverPtr driver, virDomainObjPtr vm, virConnectPtr conn, - const struct qemuDomainJobObj *job) + const struct qemuDomainJobObj *job, + unsigned int *stopFlags) { qemuDomainObjPrivatePtr priv = vm->privateData; virDomainState state; @@ -3055,7 +3058,7 @@ qemuProcessRecoverJob(virQEMUDriverPtr driver, switch (job->asyncJob) { case QEMU_ASYNC_JOB_MIGRATION_OUT: if (qemuProcessRecoverMigrationOut(driver, vm, conn, job->phase, - state, reason) < 0) + state, reason, stopFlags) < 0) return -1; break; @@ -3402,7 +3405,7 @@ qemuProcessReconnect(void *opaque) if (qemuProcessRefreshBalloonState(driver, obj, QEMU_ASYNC_JOB_NONE) < 0) goto error; - if (qemuProcessRecoverJob(driver, obj, conn, &oldjob) < 0) + if (qemuProcessRecoverJob(driver, obj, conn, &oldjob, &stopFlags) < 0) goto error; if (qemuProcessUpdateDevices(driver, obj) < 0) -- 2.11.0.rc2

2 1

[libvirt] [PATCH] qemu: Report tunnelled post-copy migration as unsupported
by Jiri Denemark 29 Nov '16

29 Nov '16

Post-copy migration needs bi-directional communication between the source and the destination QEMU processes, which is not supported by tunnelled migration. https://bugzilla.redhat.com/show_bug.cgi?id=1371358 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index d4a55d8f7..26b2e6d25 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3167,6 +3167,12 @@ qemuMigrationBeginPhase(virQEMUDriverPtr driver, goto cleanup; } + if (flags & VIR_MIGRATE_POSTCOPY && flags & VIR_MIGRATE_TUNNELLED) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("post-copy is not supported with tunnelled migration")); + goto cleanup; + } + if (flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC)) { bool has_drive_mirror = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_MIRROR); @@ -3645,6 +3651,12 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, goto cleanup; } + if (flags & VIR_MIGRATE_POSTCOPY && flags & VIR_MIGRATE_TUNNELLED) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("post-copy is not supported with tunnelled migration")); + goto cleanup; + } + if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; -- 2.11.0.rc2

2 1

[libvirt] [PATCH 0/2] Fix case with non-root domain and hugepages
by Michal Privoznik 29 Nov '16

29 Nov '16

Yet another bug found due to my work on containerizing qemu. Michal Privoznik (2): qemu: Create hugepage path on per domain basis security: Implement virSecurityManagerSetHugepages src/qemu/qemu_command.c | 4 +- src/qemu/qemu_conf.c | 45 ++++++++++++++++------ src/qemu/qemu_conf.h | 16 +++++--- src/qemu/qemu_driver.c | 19 +++------ src/qemu/qemu_process.c | 25 +++++++++++- src/security/security_dac.c | 11 ++++++ src/security/security_selinux.c | 10 +++++ .../qemuxml2argv-hugepages-numa.args | 4 +- .../qemuxml2argv-hugepages-pages.args | 14 +++---- .../qemuxml2argv-hugepages-pages2.args | 2 +- .../qemuxml2argv-hugepages-pages3.args | 2 +- .../qemuxml2argv-hugepages-pages5.args | 2 +- .../qemuxml2argv-hugepages-shared.args | 12 +++--- tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 2 +- .../qemuxml2argv-memory-hotplug-dimm-addr.args | 4 +- .../qemuxml2argv-memory-hotplug-dimm.args | 4 +- 16 files changed, 118 insertions(+), 58 deletions(-) -- 2.8.4

4 8

[libvirt] [PATCH v2 00/31] qemu: Add support for unavailable-features
by Jiri Denemark 28 Nov '16

28 Nov '16

QEMU 2.8.0 adds support for unavailable-features in query-cpu-definitions reply. The unavailable-features array lists CPU features which prevent a corresponding CPU model from being usable on current host. It can only be used when all the unavailable features are disabled. Empty array means the CPU model can be used without modifications. Changes in v2: - many; the way we probe QEMU was rewritten so that we probe both KVM and TCG capabilities and store them separately whenever we expect them to be different Big thanks to Andrea Bolognani for providing the updated replies data from aarch64 and ppc64le machines. Jiri Denemark (31): qemu: Make QMP probing process reusable qemu: Use -machine when probing capabilities via QMP qemu: Probe KVM state earlier qemucapsprobe: Ignore all greetings except the first one qemu: Enable KVM when probing capabilities qemu: Discard caps cache when KVM availability changes qemu: Use saner defaults for domain capabilities qemu: Don't return unusable virttype in domain capabilities qemu: Refactor virQEMUCapsCacheLookup qemu: Refresh caps in virQEMUCapsCacheLookupByArch qemu: Introduce virQEMUCapsLoadCPUModels qemu: Introduce virQEMUCapsFormatCPUModels qemu: Probe CPU models for KVM and TCG tests: Update capabilities for QEMU 1.2.2 tests: Update capabilities for QEMU 1.3.1 tests: Update capabilities for QEMU 1.4.2 tests: Update capabilities for QEMU 1.5.3 tests: Update capabilities for QEMU 1.6.0 tests: Update capabilities for QEMU 1.7.0 tests: Update capabilities for QEMU 2.1.1 tests: Update capabilities for QEMU 2.4.0 tests: Update capabilities for QEMU 2.5.0 tests: Update capabilities for QEMU 2.6.0 tests: Update capabilities for QEMU 2.6.0 (aarch64, GICv2) qemu: Avoid reporting "host" as a supported CPU model tests: Update capabilities for QEMU 2.6.0 (aarch64, GICv3) tests: Update capabilities for QEMU 2.6.0 (ppc64le) tests: Update capabilities for QEMU 2.7.0 tests: Add QEMU 2.8.0 capabilities data tests: Add QEMU 2.8.0 domain capabilities tests qemu: Add support for unavailable-features src/conf/domain_capabilities.c | 6 +- src/conf/domain_capabilities.h | 3 +- src/qemu/qemu_capabilities.c | 684 +- src/qemu/qemu_capabilities.h | 15 +- src/qemu/qemu_capspriv.h | 8 + src/qemu/qemu_driver.c | 27 +- src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 18 + src/qemu/qemu_process.c | 3 +- tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml | 1 + .../domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml | 116 + tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml | 116 + tests/domaincapstest.c | 8 + .../qemucapabilitiesdata/caps_1.2.2.x86_64.replies | 216 +- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 68 +- .../qemucapabilitiesdata/caps_1.3.1.x86_64.replies | 172 +- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 74 +- .../qemucapabilitiesdata/caps_1.4.2.x86_64.replies | 170 +- tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 74 +- .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 170 +- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 74 +- .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 170 +- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 74 +- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 170 +- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 74 +- .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 173 +- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 77 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 182 +- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 86 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 182 +- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 86 +- .../caps_2.6.0-gicv2.aarch64.replies | 194 +- .../caps_2.6.0-gicv2.aarch64.xml | 93 +- .../caps_2.6.0-gicv3.aarch64.replies | 207 +- .../caps_2.6.0-gicv3.aarch64.xml | 95 +- .../caps_2.6.0.ppc64le.replies | 1406 +- tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1296 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 182 +- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 86 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 185 +- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 89 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 14246 +++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 293 + tests/qemucapabilitiestest.c | 6 + tests/qemucapsprobemock.c | 9 +- tests/qemumonitorjsontest.c | 27 +- tests/qemuxml2argvtest.c | 39 +- 47 files changed, 20114 insertions(+), 1637 deletions(-) create mode 100644 tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml create mode 100644 tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml -- 2.10.2

3 72