- Devel - libvirt List Archives

[libvirt] [PATCH 0/6] events: don't mandate a uuid
by Cole Robinson 28 Jun '16

28 Jun '16

The generic event infrastructure has the notion of lookup-by-uuid baked into the API, but not all objects have a uuid (nodedev, interfaces). This series enables callers to specify a string key for match purposes. Existing users of the binary uuid value now pass in a converted uuid string. Cole Robinson (6): events: Privatize virObjectEventCallback events: Add virObjectEventCallbackFree events: Cleanup callback variable name events: Pass in UUID as a string events: Add explicit lookup 'key' value events: Rename argument uuid->key src/conf/domain_event.c | 28 +++++-- src/conf/network_event.c | 16 +++- src/conf/object_event.c | 170 +++++++++++++++++++++------------------- src/conf/object_event.h | 3 - src/conf/object_event_private.h | 8 +- src/conf/storage_event.c | 16 +++- 6 files changed, 145 insertions(+), 96 deletions(-) -- 2.7.4

2 9

[libvirt] [PATCH 0/3] qemu: add support for intel-iommu
by Ján Tomko 28 Jun '16

28 Jun '16

https://bugzilla.redhat.com/show_bug.cgi?id=1235581 Note that while support for -device intel-iommu has been merged in QEMU for a while, that option is currently broken. A fix is on the way: https://lists.gnu.org/archive/html/qemu-devel/2016-06/msg03548.html Ján Tomko (3): Introduce <iommu> device Add QEMU_CAPS_DEVICE_INTEL_IOMMU qemu: format intel-iommu on the command line docs/schemas/domaincommon.rng | 11 +++++++ src/conf/domain_conf.c | 37 ++++++++++++++++++++++ src/conf/domain_conf.h | 14 ++++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 30 ++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-intel-iommu.args | 22 +++++++++++++ .../qemuxml2argvdata/qemuxml2argv-intel-iommu.xml | 37 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ .../qemuxml2xmlout-intel-iommu.xml | 37 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 4 +++ 15 files changed, 202 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu.xml -- 2.7.3

2 6

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

28 Jun '16

With current perf framework, this patch adds support to more perf events, including cache missing, cache peference, cpu cycles, instrction, etc.. Signed-off-by: Qiaowei Ren <qiaowei.ren(a)intel.com> --- docs/formatdomain.html.in | 24 +++++++++++++++ docs/schemas/domaincommon.rng | 4 +++ include/libvirt/libvirt-domain.h | 39 ++++++++++++++++++++++++ src/libvirt-domain.c | 8 +++++ src/qemu/qemu_driver.c | 23 +++++++------- src/util/virperf.c | 65 +++++++++++++++++++++++++++++++++++++++- src/util/virperf.h | 4 +++ 7 files changed, 154 insertions(+), 13 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 7d34363..a4064ae 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1839,6 +1839,10 @@ <event name='cmt' enabled='yes'/> <event name='mbmt' enabled='no'/> <event name='mbml' enabled='yes'/> + <event name='cache_misses' enabled='no'/> + <event name='cache_peferences' enabled='no'/> + <event name='instructions' enabled='no'/> + <event name='cpu_cycles' enabled='no'/> </perf> ... </pre> @@ -1864,6 +1868,26 @@ <td>bandwidth of memory traffic for a memory controller</td> <td><code>perf.mbml</code></td> </tr> + <tr> + <td><code>cache_misses</code></td> + <td>the amount of cache missing by applications running on the platform</td> + <td><code>perf.cache_misses</code></td> + </tr> + <tr> + <td><code>cache_peferences</code></td> + <td>the amount of cache hit by applications running on the platform</td> + <td><code>perf.cache_peferences</code></td> + </tr> + <tr> + <td><code>instructions</code></td> + <td>the amount of instructions by applications running on the platform</td> + <td><code>perf.instructions</code></td> + </tr> + <tr> + <td><code>cpu_cycles</code></td> + <td>the amount of cycles one instruction needs</td> + <td><code>perf.cpu_cycles</code></td> + </tr> </table> <h3><a name="elementsDevices">Devices</a></h3> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 162c2e0..01db999 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -414,6 +414,10 @@ <value>cmt</value> <value>mbmt</value> <value>mbml</value> + <value>cache_misses</value> + <value>cache_peferences</value> + <value>instructions</value> + <value>cpu_cycles</value> </choice> </attribute> <attribute name="enabled"> diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index cba4fa5..99c4c48 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -1928,6 +1928,45 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); */ # define VIR_PERF_PARAM_MBML "mbml" +/** + * VIR_PERF_PARAM_CACHE_MISSES: + * + * Macro for typed parameter name that represents cache_misses perf + * event which can be used to measure the amount of cache missing by + * applications running on the platform. It corresponds to the + * "perf.cache_misses" field in the *Stats APIs. + */ +# define VIR_PERF_PARAM_CACHE_MISSES "cache_misses" + +/** + * VIR_PERF_PARAM_CACHE_REFERENCES: + * + * Macro for typed parameter name that represents cache_peferences + * perf event which can be used to measure the amount of cache hit + * by applications running on the platform. It corresponds to the + * "perf.cache_peferences" field in the *Stats APIs. + */ +# define VIR_PERF_PARAM_CACHE_REFERENCES "cache_peferences" + +/** + * VIR_PERF_PARAM_INSTRUCTIONS: + * + * Macro for typed parameter name that represents instructions perf + * event which can be used to measure the amount of instructions + * by applications running on the platform. It corresponds to the + * "perf.instructions" field in the *Stats APIs. + */ +# define VIR_PERF_PARAM_INSTRUCTIONS "instructions" + +/** + * VIR_PERF_PARAM_CPU_CYCLES: + * + * Macro for typed parameter name that represents cpu_cycles perf event + * which can be used to measure how many cycles one instruction needs. + * It corresponds to the "perf.cpu_cycles" field in the *Stats APIs. + */ +# define VIR_PERF_PARAM_CPU_CYCLES "cpu_cycles" + int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, int *nparams, diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 73ae369..ef71b31 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11452,6 +11452,14 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * "perf.mbml" - the amount of data (bytes/s) sent through the memory controller * on the socket as unsigned long long. It is produced by mbml * perf event. + * "perf.cache_misses" - the amount of cache missing as unsigned long long. + * It is produced by cache_misses perf event. + * "perf.cache_peferences" - the amount of cache hit as unsigned long long. + * It is produced by cache_peferences perf event. + * "perf.instructions" - the amount of instructions as unsigned long long. + * It is produced by instructions perf event. + * "perf.cpu_cycles" - the amount of cycles one instruction needs as unsigned + * long long. It is produced by cpu_cycles perf event. * * Note that entire stats groups or individual stat fields may be missing from * the output in case they are not supported by the given hypervisor, are not diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d065e45..6210771 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9748,6 +9748,10 @@ qemuDomainSetPerfEvents(virDomainPtr dom, VIR_PERF_PARAM_CMT, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_MBMT, VIR_TYPED_PARAM_BOOLEAN, VIR_PERF_PARAM_MBML, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_CACHE_MISSES, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_CACHE_REFERENCES, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_INSTRUCTIONS, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_CPU_CYCLES, VIR_TYPED_PARAM_BOOLEAN, NULL) < 0) return -1; @@ -19068,10 +19072,10 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, #undef QEMU_ADD_COUNT_PARAM static int -qemuDomainGetStatsPerfRdt(virPerfPtr perf, - virPerfEventType type, - virDomainStatsRecordPtr record, - int *maxparams) +qemuDomainGetStatsPerfOneEvent(virPerfPtr perf, + virPerfEventType type, + virDomainStatsRecordPtr record, + int *maxparams) { char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; uint64_t value = 0; @@ -19107,14 +19111,9 @@ qemuDomainGetStatsPerf(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, if (!virPerfEventIsEnabled(priv->perf, i)) continue; - switch (i) { - case VIR_PERF_EVENT_CMT: - case VIR_PERF_EVENT_MBMT: - case VIR_PERF_EVENT_MBML: - if (qemuDomainGetStatsPerfRdt(priv->perf, i, record, maxparams) < 0) - goto cleanup; - break; - } + if (qemuDomainGetStatsPerfOneEvent(priv->perf, i, + record, maxparams) < 0) + goto cleanup; } ret = 0; diff --git a/src/util/virperf.c b/src/util/virperf.c index 4661ba3..a3d2bc6 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -38,7 +38,9 @@ VIR_LOG_INIT("util.perf"); #define VIR_FROM_THIS VIR_FROM_PERF VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, - "cmt", "mbmt", "mbml"); + "cmt", "mbmt", "mbml", + "cache_misses", "cache_peferences", + "instructions", "cpu_cycles"); struct virPerfEvent { int type; @@ -189,6 +191,60 @@ virPerfRdtEnable(virPerfEventPtr event, return -1; } +static int +virPerfGeneralEnable(virPerfEventPtr event, + pid_t pid) +{ + struct perf_event_attr attr; + + memset(&attr, 0, sizeof(attr)); + attr.size = sizeof(attr); + attr.inherit = 1; + attr.disabled = 1; + attr.enable_on_exec = 0; + + switch (event->type) { + case VIR_PERF_EVENT_CACHE_MISSES: + attr.type = PERF_TYPE_HARDWARE; + attr.config = PERF_COUNT_HW_CACHE_MISSES; + break; + case VIR_PERF_EVENT_CACHE_REFERENCES: + attr.type = PERF_TYPE_HARDWARE; + attr.config = PERF_COUNT_HW_CACHE_REFERENCES; + break; + case VIR_PERF_EVENT_INSTRUCTIONS: + attr.type = PERF_TYPE_HARDWARE; + attr.config = PERF_COUNT_HW_INSTRUCTIONS; + break; + case VIR_PERF_EVENT_CPU_CYCLES: + attr.type = PERF_TYPE_HARDWARE; + attr.config = PERF_COUNT_HW_CPU_CYCLES; + break; + } + + event->fd = syscall(__NR_perf_event_open, &attr, pid, -1, -1, 0); + if (event->fd < 0) { + virReportSystemError(errno, + _("Unable to open perf event for %s"), + virPerfEventTypeToString(event->type)); + goto error; + } + + if (ioctl(event->fd, PERF_EVENT_IOC_ENABLE) < 0) { + virReportSystemError(errno, + _("Unable to enable perf event for %s"), + virPerfEventTypeToString(event->type)); + goto error; + } + + event->enabled = true; + return 0; + + error: + VIR_FORCE_CLOSE(event->fd); + return -1; +} + int virPerfEventEnable(virPerfPtr perf, virPerfEventType type, @@ -205,6 +261,13 @@ virPerfEventEnable(virPerfPtr perf, if (virPerfRdtEnable(event, pid) < 0) return -1; break; + case VIR_PERF_EVENT_CACHE_MISSES: + case VIR_PERF_EVENT_CACHE_REFERENCES: + case VIR_PERF_EVENT_INSTRUCTIONS: + case VIR_PERF_EVENT_CPU_CYCLES: + if (virPerfGeneralEnable(event, pid) < 0) + return -1; + break; case VIR_PERF_EVENT_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected perf event type=%d"), type); diff --git a/src/util/virperf.h b/src/util/virperf.h index 7163410..7129370 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -28,6 +28,10 @@ typedef enum { VIR_PERF_EVENT_CMT, VIR_PERF_EVENT_MBMT, VIR_PERF_EVENT_MBML, + VIR_PERF_EVENT_CACHE_MISSES, + VIR_PERF_EVENT_CACHE_REFERENCES, + VIR_PERF_EVENT_INSTRUCTIONS, + VIR_PERF_EVENT_CPU_CYCLES, VIR_PERF_EVENT_LAST } virPerfEventType; -- 1.9.1

3 2

[libvirt] [PATCH] virStorageTranslateDiskSourcePool: Avoid double free
by Michal Privoznik 28 Jun '16

28 Jun '16

https://bugzilla.redhat.com/show_bug.cgi?id=1316370 Consider the following disk for a domain: <disk type='volume' device='cdrom'> <driver name='qemu' type='raw'/> <auth username='libvirt'> <secret type='iscsi' usage='libvirtiscsi'/> </auth> <source pool='iscsi-secret-pool' volume='unit:0:0:0' mode='direct' startupPolicy='optional'/> <target dev='sda' bus='scsi'/> <readonly/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> Now, startupPolicy is currently not allowed for iscsi disks, so one would expect an error message to be thrown. But what a surprise is waiting for users if they try to start up such domain: ==15724== Invalid free() / delete / delete[] / realloc() ==15724== at 0x4C2B1F0: free (vg_replace_malloc.c:473) ==15724== by 0x54B7A69: virFree (viralloc.c:582) ==15724== by 0x552DC90: virStorageAuthDefFree (virstoragefile.c:1549) ==15724== by 0x552F023: virStorageSourceClear (virstoragefile.c:2055) ==15724== by 0x552F054: virStorageSourceFree (virstoragefile.c:2067) ==15724== by 0x55556AA: virDomainDiskDefFree (domain_conf.c:1562) ==15724== by 0x5557ABE: virDomainDefFree (domain_conf.c:2547) ==15724== by 0x1B43CC42: qemuProcessStop (qemu_process.c:5918) ==15724== by 0x1B43BA2E: qemuProcessStart (qemu_process.c:5511) ==15724== by 0x1B48993E: qemuDomainObjStart (qemu_driver.c:7050) ==15724== by 0x1B489B9A: qemuDomainCreateWithFlags (qemu_driver.c:7104) ==15724== by 0x1B489C01: qemuDomainCreate (qemu_driver.c:7122) ==15724== Address 0x21cfbb90 is 0 bytes inside a block of size 48 free'd ==15724== at 0x4C2B1F0: free (vg_replace_malloc.c:473) ==15724== by 0x54B7A69: virFree (viralloc.c:582) ==15724== by 0x552DC90: virStorageAuthDefFree (virstoragefile.c:1549) ==15724== by 0x12D1C8D4: virStorageTranslateDiskSourcePool (storage_driver.c:3475) ==15724== by 0x1B4396E4: qemuProcessPrepareDomain (qemu_process.c:4896) ==15724== by 0x1B43B880: qemuProcessStart (qemu_process.c:5466) ==15724== by 0x1B48993E: qemuDomainObjStart (qemu_driver.c:7050) ==15724== by 0x1B489B9A: qemuDomainCreateWithFlags (qemu_driver.c:7104) ==15724== by 0x1B489C01: qemuDomainCreate (qemu_driver.c:7122) ==15724== by 0x561CA97: virDomainCreate (libvirt-domain.c:6787) ==15724== by 0x12B6FD: remoteDispatchDomainCreate (remote_dispatch.h:4116) ==15724== by 0x12B61A: remoteDispatchDomainCreateHelper (remote_dispatch.h:4092) The problem is, in virStorageTranslateDiskSourcePool disk def->src->auth is freed, but the pointer is not set to NULL. So later, when qemuProcessStop starts to free the domain definition, virStorageAuthDefFree() tries to free the memory again, instead of jumping out immediately. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/storage/storage_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 831e6b0..cb9d578 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -3472,7 +3472,10 @@ virStorageTranslateDiskSourcePool(virConnectPtr conn, VIR_FREE(def->src->path); virStorageNetHostDefFree(def->src->nhosts, def->src->hosts); + def->src->nhosts = 0; + def->src->hosts = NULL; virStorageAuthDefFree(def->src->auth); + def->src->auth = NULL; switch ((virStoragePoolType) pooldef->type) { case VIR_STORAGE_POOL_DIR: -- 2.8.4

2 2

[libvirt] [libvirt-perl][PATCH 0/3] Fix a few memleaks
by Michal Privoznik 28 Jun '16

28 Jun '16

I've noticed these while trying to write support for the new libvirt APIs (but Dan was quicker :-)). Michal Privoznik (3): Prefer virTypedParameterPtr over virTypedParameter * get/set_memory_parameters: Favour virTypedParameter over virMemoryParameter Substitute Safefree with virTypedParamsFree Virt.xs | 146 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 74 insertions(+), 72 deletions(-) -- 2.8.4

2 8

[libvirt] [PATCH 0/1] vz: fix build for virNetDev* changes
by Olga Krishtal 28 Jun '16

28 Jun '16

Although this changes have been reverted, it useful to have patch, that makes this changes in vz driver.

3 3

[libvirt] [PATCH v2] logging: fixing log level initialization from cmdline
by Jaroslav Suchanek 28 Jun '16

28 Jun '16

Reorder code for setting default log level from cmdline prior initialization of log outputs. Thus the --verbose option is reflected. This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1325072 --- Notes: v2: moving up the cmdline override for default logging level also for the virlockd src/locking/lock_daemon.c | 12 ++++++------ src/logging/log_daemon.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 2c45349..9509e0c 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -482,6 +482,12 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config, virLogParseOutputs(config->log_outputs); /* + * Command line override for --verbose + */ + if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) + virLogSetDefaultPriority(VIR_LOG_INFO); + + /* * If no defined outputs, and either running * as daemon or not on a tty, then first try * to direct it to the systemd journal @@ -541,12 +547,6 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config, VIR_FREE(tmp); } - /* - * Command line override for --verbose - */ - if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) - virLogSetDefaultPriority(VIR_LOG_INFO); - return 0; error: diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 8f1ccc2..9f71ca9 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -405,6 +405,12 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, virLogParseOutputs(config->log_outputs); /* + * Command line override for --verbose + */ + if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) + virLogSetDefaultPriority(VIR_LOG_INFO); + + /* * If no defined outputs, and either running * as daemon or not on a tty, then first try * to direct it to the systemd journal @@ -464,12 +470,6 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, VIR_FREE(tmp); } - /* - * Command line override for --verbose - */ - if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) - virLogSetDefaultPriority(VIR_LOG_INFO); - return 0; error: -- 1.8.3.1

2 2

[libvirt] Fixing libvirt's libxl driver breakage -- where to define LIBXL_API_VERSION?
by Wei Liu 28 Jun '16

28 Jun '16

Hi libvirt maintainers, Xen's control library libxenlight (libxl) requires application (libvirt in this case) to explictily define LIBXL_API_VERSION. This is lacking at the moment so libvirt's libxl driver always gets the latest APIs. We changed one of the APIs in libxl so libvirt's libxl driver can't build at the moment. I want to submit a patch for libvirt to define LIBXL_API_VERSION, but I'm not sure where I should add that to. Can you give me some pointers? Or even better -- a specific file that I should edit? src/Makefile.am and src/Makfile.in are good candicate to me as far as I can tell. Thanks Wei.

9 21

[libvirt] [PATCH] vz: Fix indentation in prlsdkGetNetAddresses()
by Andrea Bolognani 28 Jun '16

28 Jun '16

--- Pushed as trivial. src/vz/vz_sdk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 7e75e44..ae218e9 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -829,7 +829,7 @@ prlsdkGetNetAddresses(PRL_HANDLE sdknet, virDomainNetDefPtr net) prlsdkCheckRetGoto(pret, cleanup); for (i = 0; i < num; ++i) { - virNetDevIPAddrPtr ip = NULL; + virNetDevIPAddrPtr ip = NULL; PRL_UINT32 buflen = 0; char *addr; -- 2.7.4

1 0

[libvirt] [PATCH] qemuDomainDeviceDefValidate: Drop unused qemuCaps
by Jiri Denemark 27 Jun '16

27 Jun '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domain.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 0c107aa..fd25669 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2196,12 +2196,9 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, void *opaque) { virQEMUDriverPtr driver = opaque; - virQEMUCapsPtr qemuCaps = NULL; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); int ret = -1; - qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator); - if (dev->type == VIR_DOMAIN_DEVICE_NET) { const virDomainNetDef *net = dev->data.net; @@ -2216,7 +2213,6 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, ret = 0; cleanup: - virObjectUnref(qemuCaps); virObjectUnref(cfg); return ret; } -- 2.9.0

2 1

[libvirt] [PATCH RFC 00/48] Sparse streams
by Michal Privoznik 27 Jun '16

27 Jun '16

So, after some time spent working on this, I think I finally have something that works. Finally, we have a formatted messages between iohelper and the daemon. BUT, it there's a corner case because where this does not work 100%. If there's a hole at EOF, it is either not transferred to the other side or not fully seeked. Therefore, hole at EOF is not in the copy. I guess it is some silly mistake somewhere. Anyway, any comments appreciated. v2 can be found here: https://www.redhat.com/archives/libvir-list/2016-May/msg01691.html Michal Privoznik (48): util: Introduce virFileInData src: Move iohelper out from utils/ to a separate dir fdstream: s/struct virFDStreamData */virFDStreamDataPtr/ virFDStreamData: Turn into virObjectLockable Introduce virStreamRecvFlags Implement virStreamRecvFlags to some drivers Introduce virStreamSkip Introduce virStreamHoleSize Introduce VIR_STREAM_RECV_STOP_AT_HOLE flag Introduce virStreamSparseRecvAll Introduce virStreamSparseSendAll Introduce virStreamInData virNetClientStreamNew: Track origin stream Track if stream is skippable RPC: Introduce virNetStreamSkip Introduce VIR_NET_STREAM_SKIP message type Teach wireshark plugin about VIR_NET_STREAM_SKIP daemon: Introduce virNetServerProgramSendStreamSkip virnetclientstream: Introduce virNetClientStreamSendSkip daemon: Implement VIR_NET_STREAM_SKIP handling virnetclientstream: Introduce virNetClientStreamHandleSkip remote_driver: Implement virStreamSkip virNetClientStreamRecvPacket: Introduce @flags argument Introduce virNetClientStreamHoleSize remote: Implement virStreamHoleSize virNetClientStream: Wire up VIR_NET_STREAM_SKIP remote_driver: Implement VIR_STREAM_RECV_STOP_AT_HOLE daemonStreamHandleRead: Wire up seekable stream fdstream: Implement seek gendispatch: Introduce @sparseflag for our calls Introduce virStorageVol{Download,Upload}Flags virsh: Implement sparse stream to vol-download virsh: Implement sparse stream to vol-upload daemon: Don't call virStreamInData so often storage: Enable sparse streams for virStorageVol{Download,Upload} fdstream: Track formatted message fdstream: Handle formatted messages separately iohelper: Introduce iohelper_message iohelper_message: Introduce API stubs iohelper_message: Implement formatted read iohelper_message: Implement formatted write tests: Introduce iohelpermessagetest iohelpermessagetest: test non-blocking read & write iohelper_message: Add support for sparse streams iohelper: Move runIO to runIOBasic iohelper: Introduce setupFDs iohelper: Teach command line 'sparse' argument iohelper: Wire up formatted messages daemon/remote.c | 2 +- daemon/stream.c | 152 +++++++++++- daemon/stream.h | 3 +- include/libvirt/libvirt-storage.h | 9 + include/libvirt/libvirt-stream.h | 86 ++++++- po/POTFILES.in | 2 +- src/Makefile.am | 33 ++- src/driver-stream.h | 23 ++ src/esx/esx_stream.c | 16 +- src/fdstream.c | 267 +++++++++++++++----- src/fdstream.h | 3 +- src/{util => iohelper}/iohelper.c | 234 +++++++++++++++--- src/iohelper/iohelper_message.c | 429 ++++++++++++++++++++++++++++++++ src/iohelper/iohelper_message.h | 53 ++++ src/libvirt-storage.c | 4 +- src/libvirt-stream.c | 455 ++++++++++++++++++++++++++++++++++ src/libvirt_internal.h | 3 + src/libvirt_private.syms | 2 + src/libvirt_public.syms | 8 +- src/libvirt_remote.syms | 3 + src/remote/remote_driver.c | 89 ++++++- src/remote/remote_protocol.x | 2 + src/rpc/gendispatch.pl | 21 +- src/rpc/virnetclient.c | 1 + src/rpc/virnetclientstream.c | 203 ++++++++++++++- src/rpc/virnetclientstream.h | 17 +- src/rpc/virnetprotocol.x | 16 +- src/rpc/virnetserverprogram.c | 33 +++ src/rpc/virnetserverprogram.h | 7 + src/storage/storage_backend.c | 12 +- src/storage/storage_driver.c | 4 +- src/util/virfile.c | 70 ++++++ src/util/virfile.h | 4 + src/virnetprotocol-structs | 4 + tests/Makefile.am | 10 +- tests/iohelpermessagetest.c | 466 +++++++++++++++++++++++++++++++++++ tools/virsh-volume.c | 49 ++-- tools/virsh.c | 36 +++ tools/virsh.h | 17 ++ tools/virsh.pod | 6 +- tools/wireshark/src/packet-libvirt.c | 40 +++ tools/wireshark/src/packet-libvirt.h | 2 + 42 files changed, 2716 insertions(+), 180 deletions(-) rename src/{util => iohelper}/iohelper.c (58%) create mode 100644 src/iohelper/iohelper_message.c create mode 100644 src/iohelper/iohelper_message.h create mode 100644 tests/iohelpermessagetest.c -- 2.8.4

2 59

[libvirt] [PATCH] Drop virStorageBackendLogicalMatchPoolSource
by Ján Tomko 27 Jun '16

27 Jun '16

Regression introduced by commit 71b803a for [1] that prevents starting up a logical pool created with <source><device path=''></source> after it has been moved to a different physical volume. For logical pools <source><name> contains the name of the volume group and uniquely identifies the VG on the host. This also speeds up startup for pools that do not have any <device>s specified. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1025230 --- src/storage/storage_backend_logical.c | 104 +--------------------------------- 1 file changed, 2 insertions(+), 102 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index ca05fe1..057e0b9 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -558,107 +558,11 @@ virStorageBackendLogicalFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, } -/* - * virStorageBackendLogicalMatchPoolSource - * @pool: Pointer to the source pool object - * - * Search the output generated by a 'pvs --noheadings -o pv_name,vg_name' - * to match the 'vg_name' with the pool def->source.name and for the list - * of pool def->source.devices[]. - * - * Returns true if the volume group name matches the pool's source.name - * and at least one of the pool's def->source.devices[] matches the - * list of physical device names listed for the pool. Return false if - * we cannot find a matching volume group name and if we cannot match - * the any device list members. - */ -static bool -virStorageBackendLogicalMatchPoolSource(virStoragePoolObjPtr pool) -{ - virStoragePoolSourceList sourceList; - virStoragePoolSource *thisSource = NULL; - size_t i, j; - int matchcount = 0; - bool ret = false; - - memset(&sourceList, 0, sizeof(sourceList)); - sourceList.type = VIR_STORAGE_POOL_LOGICAL; - - if (virStorageBackendLogicalGetPoolSources(&sourceList) < 0) - goto cleanup; - - /* Search the pvs output for this pool's source.name */ - for (i = 0; i < sourceList.nsources; i++) { - thisSource = &sourceList.sources[i]; - if (STREQ(thisSource->name, pool->def->source.name)) - break; - } - - if (i == sourceList.nsources) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot find logical volume group name '%s'"), - pool->def->source.name); - goto cleanup; - } - - /* If the pool has defined source device(s), then let's make sure - * they match as well; otherwise, matching can only occur on the - * pool's name. - */ - if (!pool->def->source.ndevice) { - ret = true; - goto cleanup; - } - - /* Let's make sure the pool's device(s) match what the pvs output has - * for volume group devices. - */ - for (i = 0; i < pool->def->source.ndevice; i++) { - for (j = 0; j < thisSource->ndevice; j++) { - if (STREQ(pool->def->source.devices[i].path, - thisSource->devices[j].path)) - matchcount++; - } - } - - /* If we didn't find any matches, then this pool has listed (a) source - * device path(s) that don't/doesn't match what was created for the pool - */ - if (matchcount == 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot find any matching source devices for logical " - "volume group '%s'"), pool->def->source.name); - goto cleanup; - } - - /* Either there's more devices in the pool source device list or there's - * more devices in the pvs output. Could easily happen if someone decides - * to 'add' to or 'remove' from the volume group outside of libvirt's - * knowledge. Rather than fail on that, provide a warning and move on. - */ - if (matchcount != pool->def->source.ndevice) - VIR_WARN("pool device list count doesn't match pvs device list count"); - - ret = true; - - cleanup: - for (i = 0; i < sourceList.nsources; i++) - virStoragePoolSourceClear(&sourceList.sources[i]); - VIR_FREE(sourceList.sources); - - return ret; -} - - static int virStorageBackendLogicalCheckPool(virStoragePoolObjPtr pool, bool *isActive) { - /* If we can find the target.path as well as ensure that the - * pool's def source - */ - *isActive = virFileExists(pool->def->target.path) && - virStorageBackendLogicalMatchPoolSource(pool); + *isActive = virFileExists(pool->def->target.path); return 0; } @@ -666,11 +570,7 @@ static int virStorageBackendLogicalStartPool(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool) { - /* Let's make sure that the pool's name matches the pvs output and - * that the pool's source devices match the pvs output. - */ - if (!virStorageBackendLogicalMatchPoolSource(pool) || - virStorageBackendLogicalSetActive(pool, 1) < 0) + if (virStorageBackendLogicalSetActive(pool, 1) < 0) return -1; return 0; -- 2.7.3

3 9

[libvirt] [PATCH] logging: fixing log level initialization from cmdline
by Jaroslav Suchanek 27 Jun '16

27 Jun '16

Reorder code for setting default log level from cmdline prior initialization of log outputs. Thus the --verbose option is reflected. This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1325072 --- src/logging/log_daemon.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 8f1ccc2..9f71ca9 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -405,6 +405,12 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, virLogParseOutputs(config->log_outputs); /* + * Command line override for --verbose + */ + if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) + virLogSetDefaultPriority(VIR_LOG_INFO); + + /* * If no defined outputs, and either running * as daemon or not on a tty, then first try * to direct it to the systemd journal @@ -464,12 +470,6 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, VIR_FREE(tmp); } - /* - * Command line override for --verbose - */ - if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) - virLogSetDefaultPriority(VIR_LOG_INFO); - return 0; error: -- 1.8.3.1

2 2

[libvirt] [PATCH 0/2] virQEMUCapsFillDomainCaps: Drop redundant parameter
by Jiri Denemark 27 Jun '16

27 Jun '16

Jiri Denemark (2): qemu: Remove redundant parameter in virQEMUCapsFillDomainCaps domaincapstest: Don't read data from host src/qemu/qemu_capabilities.c | 5 ++--- src/qemu/qemu_capabilities.h | 3 +-- src/qemu/qemu_driver.c | 2 +- tests/Makefile.am | 7 +++++++ tests/domaincapsmock.c | 26 ++++++++++++++++++++++++++ tests/domaincapstest.c | 5 ++--- 6 files changed, 39 insertions(+), 9 deletions(-) create mode 100644 tests/domaincapsmock.c -- 2.9.0

2 7

[libvirt] [PATCH 0/2] Fix FreeBSD build
by Andrea Bolognani 27 Jun '16

27 Jun '16

Pushed under the build-breaker rule. Andrea Bolognani (2): util: netdevip: Include vircommand.h Clean up after virNetDevIP creation src/util/virnetdev.h | 21 --------------------- src/util/virnetdevip.c | 5 +++-- tests/qemuxml2argvmock.c | 9 +++++---- 3 files changed, 8 insertions(+), 27 deletions(-) -- 2.7.4

2 5

Re: [libvirt] [Bug] make check fails when LIBVIRT_DEBUG is defined
by Eric Blake 27 Jun '16

27 Jun '16

[moderator note: the mail server balked at 1.3 megabytes of attachments, so I've stripped them in my reply] On 12/31/1969 05:00 PM, wrote: > Hello everybody, > > I set up a clean libvirt repo with: > git clone > ./autogen.sh > make -j5 > > and then executed tests with various values of LIBVIRT_DEBUG using > the following command: > LIBVIRT_DEBUG=0…5 VIR_TEST_DEBUG=1 make check > > The logs are in this mail's attachments. > > > With LIBVIRT_DEBUG=0 (or =5 or probably any invalid value), the logs say: > "Ignoring invalid log level setting” > but still, 10 tests fail due to various reasons. > > With LIBVIRT_DEBUG=1, there is a slight difference. The number of tests > that fail is also 10, but here, commandtest fails instead of eventtest. > > With LIBVIRT_DEBUG=2, only 9 tests fail, because commandtest passes. > > With LIBVIRT_DEBUG=3, only 1 test fails: qemuargv2xmltest. The > reason is the same as in the previous tests. > > With LIBVIRT_DEBUG=4, it’s just qemuargv2xmltest that is failing, > but for a different reason than before: > "qemuParseCommandLineString should have logged a warning”. > > > Perhaps it’s okay that these tests fail, but still there's no harm > in letting people know. > > Thank you rbogorodskiy for guidance on the mailing list :) > > Have a nice day, > Tomasz > I don't know that anyone ever expected the testsuite to work with LIBVIRT_DEBUG set to anything (because turning on debug can change output of libvirt itself). Things are different with VIR_TEST_DEBUG, which explicitly exists to change the verbosity of the testsuite itself, but not affect libvirt. If the testsuite passes without LIBVIRT_DEBUG set, then that's the solution :) But if you still get failures with LIBVIRT_DEBUG removed from the environment on your particular platform, then it is worth investigating how we can fix those failures (it may be a weakness in the testsuite, or an actual libvirt bug). -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

4 4

[libvirt] [PATCH 0/2] util: Small cleanups
by Andrea Bolognani 27 Jun '16

27 Jun '16

What it says on the tin. Andrea Bolognani (2): util: Drop obsolete compatibility code util: Only define /dev/kvm path once src/util/virhostcpu.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) -- 2.7.4

2 8

[libvirt] [PATCH v2 0/3] Small cleanups and improvements
by Andrea Bolognani 27 Jun '16

27 Jun '16

Remove some obsolete code, and improve the behavior of the 'virsh domcapabilities --virttype kvm' command when running on non-Linux platform. Andrea Bolognani (3): util: hostcpu: Add virHostCPUGetKVMMaxVCPUs() stub util: hostcpu: Drop obsolete compatibility code qemu: capabilities: Make virHostCPUGetKVMMaxVCPUs() errors fatal src/qemu/qemu_capabilities.c | 9 ++++++--- src/util/virhostcpu.c | 25 ++++++++++++------------- 2 files changed, 18 insertions(+), 16 deletions(-) -- 2.7.4

1 3

[libvirt] [PATCH v2 00/15] Add support for LUKS encrypted devices
by John Ferlan 27 Jun '16

27 Jun '16

v1: http://www.redhat.com/archives/libvir-list/2016-June/msg00804.html Differences since v1 (beyond those patches already pushed) Patch 1: Adjust via recent comments for patch 8 of previous series Patch 2: Already ACK'd, adjust slightly based on merge conflicts Patch 3: Used to be patch 14 - Use VIR_SECRET_USAGE_TYPE_PASSPHRASE (instead of _KEY) - Use "usage.id" (instead of "usage.key") Patch 4: Used by be patch 11 (wasn't reviewed) Patch 5: Split from patch 13 for separate endian code to read a 16 bit value Patch 6: NEW - based slightly on former patch 12 - No longer use cryptType - Use versionSize instead in order to decode verision data as 16 or 32 bits Patch 7: Former patch 13 with adjustments based on previous patches Patch 8-9: Former patch 15-16 w/ adjustments from review and to keep up with other changes Patch 10: NEW - Reaction to former patch 17 comments with respect to a file name. Need a way to build a path to temporarily save the secret where that path is not in the pool. Chose the "stateDir", but since storage_driver is the only place that knows, added helper API to access. Patch 11: Former patch 17 with adjustments from code review and to handle other changes so far Patches 12-14: NEW - Really a bug fix submitted as a separate patch (although there are a few differences here), but I need it for patch 15 Patch 15: Former patch 19 plus adjustments for hotplug. John Ferlan (15): qemu: Change protocol parameter for secret setup qemu: Remove authdef from secret setup conf: Add new secret type "passphrase" util: Add 'usage' for encryption util: Introduce virReadBufInt16LE and virReadBufInt16BE util: Modify the FileTypeInfo to add a version size util: Add 'luks' to the FileTypeInfo encryption: Add luks parsing for storageencryption encryption: Add <cipher> and <ivgen> to encryption storage: Introduce virStoragePoolObjBuildTempFilePath storage: Add support to create a luks volume qemu: Remove type from qemuBuildSecretInfoProps qemu: Make qemuBuildSecretInfoProps global qemu: Add secinfo for hotplug virtio disk qemu: Add luks support for domain disk docs/aclpolkit.html.in | 4 + docs/formatsecret.html.in | 62 ++++- docs/formatstorageencryption.html.in | 116 ++++++++- docs/schemas/secret.rng | 10 + docs/schemas/storagecommon.rng | 57 ++++- include/libvirt/libvirt-secret.h | 3 +- src/access/viraccessdriverpolkit.c | 13 + src/conf/domain_conf.c | 11 + src/conf/secret_conf.c | 26 +- src/conf/secret_conf.h | 1 + src/conf/virsecretobj.c | 5 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 23 +- src/qemu/qemu_command.h | 4 + src/qemu/qemu_domain.c | 126 +++++----- src/qemu/qemu_hotplug.c | 107 ++++++++- src/qemu/qemu_process.c | 19 +- src/storage/storage_backend.c | 266 +++++++++++++++++++-- src/storage/storage_backend.h | 3 +- src/storage/storage_backend_fs.c | 10 +- src/storage/storage_backend_gluster.c | 2 + src/storage/storage_driver.c | 24 ++ src/storage/storage_driver.h | 6 +- src/util/virendian.h | 24 ++ src/util/virqemu.c | 23 ++ src/util/virqemu.h | 6 + src/util/virstorageencryption.c | 152 ++++++++++-- src/util/virstorageencryption.h | 17 +- src/util/virstoragefile.c | 84 +++++-- src/util/virstoragefile.h | 1 + .../qemuxml2argv-encrypted-disk-usage.args | 24 ++ .../qemuxml2argv-encrypted-disk-usage.xml | 32 +++ .../qemuxml2argv-luks-disk-cipher.args | 36 +++ .../qemuxml2argv-luks-disk-cipher.xml | 41 ++++ .../qemuxml2argvdata/qemuxml2argv-luks-disks.args | 36 +++ tests/qemuxml2argvdata/qemuxml2argv-luks-disks.xml | 41 ++++ tests/qemuxml2argvtest.c | 12 +- .../qemuxml2xmlout-encrypted-disk-usage.xml | 36 +++ .../qemuxml2xmlout-luks-disk-cipher.xml | 45 ++++ .../qemuxml2xmlout-luks-disks.xml | 45 ++++ tests/qemuxml2xmltest.c | 3 + tests/secretxml2xmlin/usage-passphrase.xml | 7 + tests/secretxml2xmltest.c | 1 + tests/storagevolxml2argvtest.c | 3 +- tests/storagevolxml2xmlin/vol-luks-cipher.xml | 23 ++ tests/storagevolxml2xmlin/vol-luks.xml | 21 ++ tests/storagevolxml2xmlout/vol-luks-cipher.xml | 23 ++ tests/storagevolxml2xmlout/vol-luks.xml | 21 ++ tests/storagevolxml2xmltest.c | 2 + tests/virendiantest.c | 18 ++ 50 files changed, 1495 insertions(+), 181 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk-usage.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk-usage.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disk-cipher.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disk-cipher.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk-usage.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disk-cipher.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks.xml create mode 100644 tests/secretxml2xmlin/usage-passphrase.xml create mode 100644 tests/storagevolxml2xmlin/vol-luks-cipher.xml create mode 100644 tests/storagevolxml2xmlin/vol-luks.xml create mode 100644 tests/storagevolxml2xmlout/vol-luks-cipher.xml create mode 100644 tests/storagevolxml2xmlout/vol-luks.xml -- 2.5.5

2 36

[libvirt] [PATCH] Reject USB address without a port
by Ján Tomko 27 Jun '16

27 Jun '16

We would happily accept a usb address with a missing port attribute, then format it back as port='(null)', so the persistent domain would not be able to start (due to the XML sightseeing tour in virDomainObjSetDefTransient) or survive daemon restart. --- src/conf/domain_conf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 79d15c8..d0684eb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5132,7 +5132,11 @@ virDomainDeviceUSBAddressParseXML(xmlNodePtr node, memset(addr, 0, sizeof(*addr)); - port = virXMLPropString(node, "port"); + if (!(port = virXMLPropString(node, "port"))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("USB address must have a port")); + goto cleanup; + } bus = virXMLPropString(node, "bus"); if (port && virDomainDeviceUSBAddressParsePort(port) < 0) -- 2.7.3

2 1

[libvirt] [PATCHv3 00/10] Assign addresses to USB devices
by Ján Tomko 27 Jun '16

27 Jun '16

v3: * drop change of commandline order of ccid controllers and USB hubs (that could possibly break compatibility) * assign addresses to redirdevs too * take custom port= setting of xhci controllers into account * hubs without addresses get one assigned only after we took a look on all the other devices Ján Tomko (10): Add USB addresses to qemuhotplug test cases Store USB port path as an array of integers Introduce virDomainUSBDeviceDefForeach Introduce virDomainUSBAddressSet Add functions for adding USB controllers to addrs Add functions for adding USB hubs to addrs Reserve existing USB addresses Assign addresses to USB devices Assign addresses on USB device hotplug Auto-add one hub if there are too many USB devices src/conf/device_conf.h | 2 +- src/conf/domain_addr.c | 491 +++++++++++++++++++++ src/conf/domain_addr.h | 58 +++ src/conf/domain_conf.c | 110 ++++- src/conf/domain_conf.h | 7 + src/libvirt_private.syms | 12 + src/qemu/qemu_command.c | 3 +- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_domain_address.c | 155 ++++++- src/qemu/qemu_hotplug.c | 27 ++ ...otplug-console-compat-2-live+console-virtio.xml | 1 + .../qemuhotplug-hotplug-base-live+disk-usb.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-bios-nvram.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-bios.args | 2 +- .../qemuxml2argv-console-compat-2-live.xml | 1 + .../qemuxml2argv-console-compat-2.xml | 4 +- .../qemuxml2argv-controller-order.args | 8 +- .../qemuxml2argv-disk-usb-device-removable.args | 3 +- .../qemuxml2argv-disk-usb-device.args | 2 +- .../qemuxml2argv-graphics-spice-timeout.args | 2 +- .../qemuxml2argv-graphics-spice-usb-redir.args | 2 +- ...muxml2argv-hostdev-usb-address-device-boot.args | 2 +- .../qemuxml2argv-hostdev-usb-address-device.args | 2 +- .../qemuxml2argv-hostdev-usb-address.args | 2 +- .../qemuxml2argv-hugepages-numa.args | 6 +- .../qemuxml2argv-input-usbmouse.args | 2 +- .../qemuxml2argv-input-usbtablet.args | 2 +- .../qemuxml2argv-pseries-usb-kbd.args | 2 +- .../qemuxml2argv-serial-spiceport.args | 2 +- .../qemuxml2argv-smartcard-controller.args | 2 +- .../qemuxml2argv-smartcard-host-certificates.args | 2 +- .../qemuxml2argv-smartcard-host.args | 2 +- ...emuxml2argv-smartcard-passthrough-spicevmc.args | 2 +- .../qemuxml2argv-smartcard-passthrough-tcp.args | 2 +- .../qemuxml2argv-sound-device.args | 2 +- .../qemuxml2argv-usb-hub-autoadd.args | 28 ++ .../qemuxml2argv-usb-hub-autoadd.xml | 23 + .../qemuxml2argv-usb-hub-conflict.args | 25 ++ .../qemuxml2argv-usb-hub-conflict.xml | 22 + .../qemuxml2argv-usb-port-autoassign.args | 28 ++ .../qemuxml2argv-usb-port-autoassign.xml | 27 ++ .../qemuxml2argv-usb-redir-boot.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args | 2 +- tests/qemuxml2argvtest.c | 9 + 44 files changed, 1048 insertions(+), 44 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub-autoadd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub-autoadd.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub-conflict.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub-conflict.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-port-autoassign.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-port-autoassign.xml -- 2.7.3

2 16

[libvirt] [PATCH] qemu: match controller index for LIVE+CONFIG when doing hotplug
by Laine Stump 27 Jun '16

27 Jun '16

An attempt to attach a new scsi controller with both --live and --config but without specifying an index, e.g.: <controller model="virtio-scsi" type="scsi" /> led to this error: internal error: Cannot parse controller index -1 This was because unspecified indexes are auto-assigned during virDomainDefPostParse(), which doesn't happen for hotplugged devices until after the device has been added to the domainDef, but qemuDomainAttachFlags() makes a copy of the device (for feeding to qemuDomainAttachDeviceLive() *before* it's added to the config, and the copying function actually formats the device object and then re-parses it into a new object. Since qemuDomainAttachDeviceConfig() consumes the device object pointer (i.e. sets it to NULL in the original virDomainDeviceDef) we can't just wait to make the copy. Instead, we need to make a *shallow* copy of the virDomainDeviceDef prior to qemuDomainAttachDeviceConfig(), then make a deep copy of the shallow copy. This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1344899 --- src/qemu/qemu_driver.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fa05046..f3e17e2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8199,6 +8199,7 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom, virDomainObjPtr vm = NULL; virDomainDefPtr vmdef = NULL; virDomainDeviceDefPtr dev = NULL, dev_copy = NULL; + virDomainDeviceDef dev_shallow; int ret = -1; unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; @@ -8237,22 +8238,19 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom, if (dev == NULL) goto endjob; - if (flags & VIR_DOMAIN_AFFECT_CONFIG && - flags & VIR_DOMAIN_AFFECT_LIVE) { - /* If we are affecting both CONFIG and LIVE - * create a deep copy of device as adding - * to CONFIG takes one instance. - */ - dev_copy = virDomainDeviceDefCopy(dev, vm->def, caps, driver->xmlopt); - if (!dev_copy) - goto endjob; - } - if (priv->qemuCaps) qemuCaps = virObjectRef(priv->qemuCaps); else if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, vm->def->emulator))) goto endjob; + /* Save away the pointer to the device object before it is + * potentially swallowed up by qemuDomainAttachDeviceConfig(). + * This will allow us to make a copy of the device after any + * modifications made by virDomainDefPostParse() (which is called + * after the new device is added to the config + */ + dev_shallow = *dev; + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { /* Make a copy for updated domain. */ vmdef = virDomainObjCopyPersistentDef(vm, caps, driver->xmlopt); @@ -8270,6 +8268,17 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom, } if (flags & VIR_DOMAIN_AFFECT_LIVE) { + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + /* If we are affecting both CONFIG and LIVE create a deep + * copy of device from the saved shallow copy, as adding + * it to CONFIG has already consumed the original. + */ + dev_copy = virDomainDeviceDefCopy(&dev_shallow, vm->def, + caps, driver->xmlopt); + if (!dev_copy) + goto endjob; + } + if (virDomainDefCompatibleDevice(vm->def, dev_copy, VIR_DOMAIN_DEVICE_ACTION_ATTACH) < 0) goto endjob; -- 2.5.5

5 6

[libvirt] [PATCH] libvirtd.conf: Fix invalid default of max_anonymous_clients
by Michal Privoznik 27 Jun '16

27 Jun '16

https://bugzilla.redhat.com/show_bug.cgi?id=1343442 When a client connects, it is placed into a queue. As soon as it authenticate, it is taken out of that queue and placed into a different one. Now, we have a setting in the daemon config file that allows users to control the length of the queue of yet not authenticated clients. By default, it has a value 20 but in the description to the config knob we clam it's zero. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- daemon/libvirtd.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index 3b957e5..8466616 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -283,8 +283,8 @@ #max_queued_clients = 1000 # The maximum length of queue of accepted but not yet -# authenticated clients. The default value is zero, meaning -# the feature is disabled. +# authenticated clients. The default value is 20. Set this to +# zero to turn this feature off. #max_anonymous_clients = 20 # The minimum limit sets the number of workers to start up -- 2.8.4

2 1

[libvirt] how to make syntax-check on tar-tall released-version
by Zhangbo (Oscar) 27 Jun '16

27 Jun '16

Hi all: I downloaded libvirt v1.3.4 from http://libvirt.org/sources, and try to make syntax-check inside the code tree. But I encounted with many problems, first, I need to have file .gitignore and directory .git, and then have gnulib, many problems still comes out after that. I still have not fixed the problems until now. So what's the right way to make syntax-check on released-version libvirt project? Thanks in advance. Oscar.

3 4

[libvirt] [PATCH 0/2] Make a generic version of virDomainDefMetadataSanitize()
by Laine Stump 27 Jun '16

27 Jun '16

Peter pointed out that Brandon's patch to add metadata to the network XML should "sanitize" it (to remove duplicate namespaces) in the same manner as we do (thanks to Peter!) for the domain metadata. In order to make that simpler, I made a patch that turns virDomainDefMetadataSanitize() into the generic function virXMLNodeSanitizeNamespaces(), then (in a separate patch) changed the domain parser to use that new generic function. I will also add a call to that function into Brandon's patch before pushing it. Laine Stump (2): util: new function virXMLNodeSanitizeNamespaces() qemu: use virXMLNodeSanitizeNamespaces() src/conf/domain_conf.c | 56 ++---------------------------------------------- src/libvirt_private.syms | 1 + src/util/virxml.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virxml.h | 2 ++ 4 files changed, 57 insertions(+), 54 deletions(-) -- 2.5.5

2 4