- Devel - libvirt List Archives

[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