- Devel - libvirt List Archives

[libvirt] Refactoring of storage pool
by Olga Krishtal 26 Jan '17

26 Jan '17

Hi everyone! Half a year ago we started discussion about filesystem pools: https://www.redhat.com/archives/libvir-list/2016-April/msg01941.html https://www.redhat.com/archives/libvir-list/2016-May/msg00208.html https://www.redhat.com/archives/libvir-list/2016-September/msg00463.html At the end we have decided not to use copy/paste and try to merge code: https://www.redhat.com/archives/libvir-list/2016-December/msg00051.html However, after first try it had became obvious (the discussion is in the link above) that pools can be describe as a separate object, that later will be used in storage pool, filesystem pool, vgpu pool, etc. This latter is an extension of previous discussion; I just want to separate refactoring of storage pools and the implementation of filesystem pools a bit. Before sending any patch with such huge refactoring I want to agree about pools Here is an example of pool structures and prototypes of some management functions that were discussed before (thanks a lot to John Ferlan for good advice). I tried to tie everything together and here it is: /* * virpool.h: pool utility to manage structures commonly used for pools. * */ /* The dscription of pool element * For storage pool it used to be virStorageVolDef * instead of key we use uuid, because key is specific * for storage pools, and for other pool types (filesystem pools) * or gpu pool we do nor have key. * type field is also specific - that is why we put it into * void* ElementTypeDef. * ElementTypeDef - stores internal information about pool element(volume, item, etc) * (the same as privateData for virConnectPtr) * For example, for storage pool voluems it consists from: * int type; * virStorageVolSource source; * virStorageSource target; */ #include "virhash.h" typedef enum { VIR_POOL_ELEMENT_VOLUME, VIR_POOL_ELEMENT_FILESYSTEM, VIR_POOL_ELEMENT_LAST, } virPoolElemenType; VIR_ENUM_DECL(virPoolElementType) typedef void (*virPoolElementTypeDefFree) (void *PoolElementDef); typedef struct _virPoolElementDef virPoolElementDef; typedef virPoolElementDef *virPoolElementDefPtr; struct _virPoolElementDef { char *name; char *uuid; bool building; unsigned int in_use; int type; void* ElementTypeDef; virPoolElementTypeDefFree PoolElementDefFree; }; typedef struct _virPoolElementDefList virPoolElementDefList; typedef virPoolElementDefList *virPoolElementDefListPtr; struct _virPoolElementDefList { size_t count; virPoolElementDefPtr *elements; }; /* General information about pool source*/ typedef struct _virPoolSourceHost virPoolSourceHost; typedef virPoolSourceHost *virPoolSourceHostPtr; struct _virPoolSourceHost { char *name; int port; }; typedef struct _virPoolAuthDef virPoolAuthDef; typedef virPoolAuthDef *virPoolAuthDefPtr; struct _virPoolAuthDef { char *username; char *secrettype; /* <secret type='%s' for disk source */ int authType; /* virStorageAuthType */ virSecretLookupTypeDef seclookupdef; }; typedef enum { VIR_POOL_SOURCE_DIR, VIR_POOL_SOURCE_DEVICE, VIR_POOL_SOURCE_NAME, VIR_POOL_SOURCE_LAST, } virPoolSourcePathType; VIR_ENUM_DECL(virPoolSourcePathType) typedef struct _virPoolSourcePath virPoolSourcePath; typedef virPoolSourcePath *virPoolSourcePathPtr; struct _virPoolSourcePath { virPoolSourcePathType sourcetype; char *path; }; typedef void(*virPoolPrivDataFree) (void *privePoolData); typedef struct _virPoolSource virPoolSource; typedef virPoolSource *virPoolSourcePtr; struct _virPoolSource{ /* One or more host definitions */ size_t nhost; virPoolSourceHostPtr hosts; /* Authentication information */ virPoolAuthDefPtr auth; /* One or more devices */ size_t nsrcpath; virPoolSourcePathPtr srcpaths; /* Name of the source */ char *name; /* Vendor of the source */ char *vendor; /* Product name of the source */ char *product; /*Some private data */ void *privatePoolData; virPoolPrivDataFree privDataFree; }; typedef struct _virPoolPathPerms virPoolPathPerms; typedef virPoolPathPerms *virPoolPathPermsPtr; struct _virPoolPathPerms { mode_t mode; uid_t uid; gid_t gid; char *label; } typedef struct _virPoolTarget virPoolTarget; typedef virPoolTarget *virPoolTargetPtr; struct _virPoolTarget{ char *path; /* Optional path to target */ virPoolPathPerms perms; /* Default permissions for path */ }; typedef struct _virPoolDef virPoolDef; typedef virPoolDef *virPoolDefPtr; struct _virPoolDef { char *name; unsigned char uuid[VIR_UUID_BUFLEN]; virPoolSource source; virPoolTarget target; }; typedef struct _virPoolInfo virPoolInfo; // used to be virPoolObj typedef virPoolInfo *virPoolInfoPtr; struct _virPoolInfo { char *configFile; char *autostartLink; bool active; int autostart; unsigned int asyncjobs; virPoolDefPtr def; virPoolDefPtr newDef; virPoolElementDefList elementsdef; }; /* Used to be PoolObjList * Separate struct - in case we will need additional info * upon the hash table. */ typedef struct _virPoolStore virPoolStore; typedef virPoolStore *virPoolStorePtr; struct _virPoolStore { size_t count; virHashAtomicPtr *pools; //Used to be objects obj }; /* * Pool hash and pool elements managment operations */ void virPoolElementDefFree (virPoolElementDefPtr def); void virPoolClearElements(virPoolInfoPtr poolinfo); void virPoolAuthDefFree(virPoolAuthDefPtr authdef); virPoolSourcePtr virPoolSourceNew (virPoolPrivDataFree privDataFree); void virPoolSourceClear(virPoolSourcePtr source); void virPoolDefFree(virPoolDefPtr def); void virPoolInfoFree(virPoolInfoPtr pool); virPoolStorePtr virPoolStoreNew(); * * Functions to manage pool as an object. * */ // It is reference implementation. #include "virpool.h" VIR_ENUM_IMPL(virPoolElementType, VIR_POOL_ELEMNT_LAST, "volume", "filesystem"); void virPoolElementDefFree(virPoolElementDefPtr def) { if (!def) return; VIR_FREE(def->name); VIR_FREE(def->uuid); if (def->PoolElementDefFree) def->PoolElementDefFree(def->ElementTypeDef); } void virPoolClearElements(virPoolInfoPtr poolinfo) { size_t i; for (i = 0; i < poolinfo->elementsdef.count; i++) virPoolElementDefFree(poolinfo->elementsdef.elements[i]); VIR_FREE(poolinfo->elementdef.elements); poolindo->elementsdef.count = 0; } /* General functions to work with pool */ VIR_ENUM_IMPL(virPoolSourcePathType, VIR_POOL_SOURCE_LAST, "dir", "device", "name"); void virPoolAuthDefFree(virPoolAuthDefPtr authdef) { if (!authdef) return; VIR_FREE(authdef->username); VIR_FREE(authdef->secrettype); VIR_FREE(authdef); } virPoolSourcePtr virPoolSourceNew(virPoolPrivDataFree privDataFree) { virPoolSourcePtr source; if (VIR_ALLOC(source) < 0) return -1; source->privDataFree = privDataFree; return source; } void virPoolSourceClear(virPoolSourcePtr source) { size_t i; if (!source) return; /* Free hosts */ for (i = 0; i < source->nhosts; i++) VIR_FREE(source->hosts[i].name); VIR_FREE(source->hosts); /* Free auth information * empty at the moment*/ virPoolAuthDefFree(source->auth); /* Free dev path*/ for (i = 0; i < source->nsrcpath; i++) VIR_FREE(source->srcpath[i].name); VIR_FREE(source->srcpath); VIR_FREE(source->name); VIR_FREE(source->vendor); VIR_FREE(source->product); if (source->privDataFree) source->privDataFree(source->privatePoolData); } void virPoolDefFree(virPoolDefPtr def) { if (!def) return; VIR_FREE(def->name); /*Free other fields*/ virPoolSourceClear(def->source); VIR_FREE(def->target.path); VIR_FREE(def->target.perms.lable); VIR_FREE(def); } void virPoolInfoFree(virPoolInfoPtr pool) { if (!pool) return; VIR_FREE(pool->configFile); VIR_FREE(pool->autostartLink); virPoolDefFree(pool->def); virPoolDefFree(pool->newDef); virPoolClearElements(pool); } virPoolStorePtr virPoolStoreNew() { virPoolStorePtr poolstore; if (VIR_ALLOC(poolstore) < 0) return NULL; poolstore->count = 0; poolstore->pools = virHashAtomicNew(0, virPoolInfoFree); return poolstore; } I will be glad to here any ideas and advises. -- Best regards, Olga

3 3

[libvirt] [PATCH 0/7] perf: add CACHE_L1D perf event support
by Nitesh Konkar 26 Jan '17

26 Jan '17

This patch series adds support and documentation for a generalized hardware cache event called CACHE_L1D perf event. This perf event is split into cache_l1dra, cache_l1drm, cache_l1dwa, cache_l1dwm, cache_l1dpa and cache_l1dpm perf events depending on the config value set. Nitesh Konkar (7): perf: add cache_l1dra perf event support perf: add cache_l1drm perf event support perf: add cache_l1dwa perf event support perf: add cache_l1dwm perf event support perf: add cache_l1dpa perf event support perf: add cache_l1dpm perf event support virsh: Fix manpage typo docs/formatdomain.html.in | 42 ++++++++++++++++++ docs/news.xml | 6 ++- docs/schemas/domaincommon.rng | 6 +++ include/libvirt/libvirt-domain.h | 66 +++++++++++++++++++++++++++++ src/libvirt-domain.c | 18 ++++++++ src/qemu/qemu_driver.c | 6 +++ src/remote/remote_protocol.x | 2 +- src/util/virperf.c | 34 ++++++++++++++- src/util/virperf.h | 6 +++ tests/genericxml2xmlindata/generic-perf.xml | 6 +++ tools/virsh.pod | 26 ++++++++++-- 11 files changed, 210 insertions(+), 8 deletions(-) -- 1.9.3

2 10

[libvirt] [PATCH] virnettlssessiontest.c: fix grammar
by Nitesh Konkar 26 Jan '17

26 Jan '17

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- tests/virnettlssessiontest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c index 0d2e106..24de212 100644 --- a/tests/virnettlssessiontest.c +++ b/tests/virnettlssessiontest.c @@ -74,9 +74,9 @@ static ssize_t testRead(char *buf, size_t len, void *opaque) * This is replicating the checks that are done for an * active TLS session after handshake completes. To * simulate that we create our TLS contexts, skipping - * sanity checks. When then get a socketpair, and + * sanity checks. We then get a socketpair, and * initiate a TLS session across them. Finally do - * do actual cert validation tests + * actual cert validation tests */ static int testTLSSessionInit(const void *opaque) { -- 1.9.3

2 1

[libvirt] [PATCH] perf: Prevent enabling of already enabled perf event
by Nitesh Konkar 26 Jan '17

26 Jan '17

Currently, on every --enable perf_event command, a new event->fd is created and counting of perf event counter starts from zero and previous event->fd is lost. This patch prevents this behaviour. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/util/virperf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/virperf.c b/src/util/virperf.c index 788b817..57c2081 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -230,6 +230,9 @@ virPerfEventEnable(virPerfPtr perf, if (!event || !event_attr) return -1; + if (event->enabled) + return 0; + if (event_attr->attrType == 0 && (type == VIR_PERF_EVENT_CMT || type == VIR_PERF_EVENT_MBMT || type == VIR_PERF_EVENT_MBML)) { -- 1.9.3

2 1

[libvirt] [PATCH] docs: Reword virsh manpage for --uuid --name --details options
by Nitesh Konkar 26 Jan '17

26 Jan '17

This commit is similar to commit 0977ada8.The virsh manpage lists options --uuid and --name as mutually exclusive if option --details is specified when actually the option --details is mutually exclusive and can't go with options --uuid and/or --name. This patch rewords the virsh manpage to state the correct meaning. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- tools/virsh.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 290f508..fb62923 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3634,8 +3634,8 @@ I<--autostart> lists the autostarting pools, I<--no-autostart> lists the pools with autostarting disabled. If I<--uuid> is specified only pool's UUIDs are printed. If I<--name> is specified only pool's names are printed. If both I<--name> and I<--uuid> are specified, pool's UUID and names are printed side by side -without any header. Options I<--uuid> and I<--name> are mutually exclusive -if option I<--details> is specified. +without any header. Option I<--details> is mutually exclusive with options +I<--uuid> and I<--name>. You may also want to list pools with specified types using I<type>, the pool types must be separated by comma, e.g. --type dir,disk. The valid pool -- 1.9.3

2 1

[libvirt] [PATCH] virsh: Modify description for LIBVIRT_DEBUG=4 in manpage
by Nitesh Konkar 26 Jan '17

26 Jan '17

As LIBVIRT_DEBUG=4 logs only error messages and there are no levels above it, adjusting the description in the man page accordingly. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- tools/virsh.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index c1bdbdd..9e45f09 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -4565,7 +4565,7 @@ Messages at level WARNING or above =item * LIBVIRT_DEBUG=4 -Messages at level ERROR or above +Messages at level ERROR =back -- 1.9.3

2 1

[libvirt] [PATCH] vstorage: fix build
by Olga Krishtal 26 Jan '17

26 Jan '17

Fixed errors when we build libvirt with --with-storage-vstorage key Signed-off-by: Olga Krishtal <okrishtal(a)virtuozzo.com> --- src/storage/storage_backend_vstorage.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_vstorage.c b/src/storage/storage_backend_vstorage.c index d3a12fb..7a1c468 100644 --- a/src/storage/storage_backend_vstorage.c +++ b/src/storage/storage_backend_vstorage.c @@ -9,6 +9,7 @@ #include <mntent.h> #include <pwd.h> #include <grp.h> +#include "storage_util.h" #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -131,7 +132,7 @@ virStorageBackendVzPoolStop(virConnectPtr conn ATTRIBUTE_UNUSED, if ((rc = virStorageBackendVzIsMounted(pool)) != 1) return rc; - return virStorageBackendUnmountLocal(pool); + return virStorageBackendUmountLocal(pool); } -- 1.8.3.1

2 1

[libvirt] [PATCH] storage: Fix build due to recent storage backend code movement
by John Ferlan 26 Jan '17

26 Jan '17

Commit id '5f07c3c07' broke the freebsd build in the libvirt CI test environment because the UMOUNT was not defined unless WITH_STORAGE_FS is defined. So remove the virStorageBackendUmountLocal from storage_util.c,h and restore the code back in the storage_backend_fs.c and _vstorage.c modules. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- This is a build breaker - I'll push shortly... src/storage/storage_backend_fs.c | 11 ++++++++++- src/storage/storage_backend_vstorage.c | 11 ++++++++++- src/storage/storage_util.c | 18 ------------------ src/storage/storage_util.h | 2 -- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 9710648..54bcc57 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -452,6 +452,8 @@ static int virStorageBackendFileSystemStop(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool) { + virCommandPtr cmd = NULL; + int ret = -1; int rc; if (virStorageBackendFileSystemIsValid(pool) < 0) @@ -461,7 +463,14 @@ virStorageBackendFileSystemStop(virConnectPtr conn ATTRIBUTE_UNUSED, if ((rc = virStorageBackendFileSystemIsMounted(pool)) != 1) return rc; - return virStorageBackendUmountLocal(pool); + cmd = virCommandNewArgList(UMOUNT, pool->def->target.path, NULL); + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + ret = 0; + cleanup: + virCommandFree(cmd); + return ret; } #endif /* WITH_STORAGE_FS */ diff --git a/src/storage/storage_backend_vstorage.c b/src/storage/storage_backend_vstorage.c index d3a12fb..0e945af 100644 --- a/src/storage/storage_backend_vstorage.c +++ b/src/storage/storage_backend_vstorage.c @@ -125,13 +125,22 @@ static int virStorageBackendVzPoolStop(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool) { + virCommandPtr cmd = NULL; + int ret = -1; int rc; /* Short-circuit if already unmounted */ if ((rc = virStorageBackendVzIsMounted(pool)) != 1) return rc; - return virStorageBackendUnmountLocal(pool); + cmd = virCommandNewArgList(UMOUNT, pool->def->target.path, NULL); + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + ret = 0; + cleanup: + virCommandFree(cmd); + return ret; } diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index fbe1844..a665bac 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -2803,24 +2803,6 @@ virStorageBackendBuildLocal(virStoragePoolObjPtr pool) } -int -virStorageBackendUmountLocal(virStoragePoolObjPtr pool) -{ - int ret = -1; - virCommandPtr cmd = virCommandNewArgList(UMOUNT, pool->def->target.path, - NULL); - - if (virCommandRun(cmd, NULL) < 0) - goto cleanup; - - ret = 0; - - cleanup: - virCommandFree(cmd); - return ret; -} - - /** * @conn connection to report errors against * @pool storage pool to delete diff --git a/src/storage/storage_util.h b/src/storage/storage_util.h index 49df530..326d555 100644 --- a/src/storage/storage_util.h +++ b/src/storage/storage_util.h @@ -87,8 +87,6 @@ int virStorageBackendVolWipeLocal(virConnectPtr conn, /* Local/Common Storage Pool Backend APIs */ int virStorageBackendBuildLocal(virStoragePoolObjPtr pool); -int virStorageBackendUmountLocal(virStoragePoolObjPtr pool); - int virStorageBackendDeleteLocal(virConnectPtr conn, virStoragePoolObjPtr pool, unsigned int flags); -- 2.7.4

2 1

[libvirt] [PATCH 0/3] Move FS Storage Backend API's to storage_util
by John Ferlan 26 Jan '17

26 Jan '17

While reviewing the Virtuozzo backend changes it became apparent that my initial review comments weren't fully understood. Rather than going back and forth more on this, I figured I'd take the plunge and make the "preparations". Also since the storage_util is the new dumping ground, I went there. It also already has the API's for the storage backend upload, download, and wipe - so these patches add a few more from the pool class and the rest of the volume class. FWIW: Rather than just making and bundling the changes with the Virtuozzo changes, I figured I'd post them separately just in case someone has agita over the API/helper name changes. John Ferlan (3): storage: Move the virStorageBackendFileSystem{Start|Stop} API's storage: Create common file/dir pool backend helpers storage: Create common file/dir volume backend helpers src/storage/storage_backend.c | 1 + src/storage/storage_backend_fs.c | 827 +++------------------------------- src/storage/storage_util.c | 931 ++++++++++++++++++++++++++++++++++----- src/storage/storage_util.h | 79 ++-- 4 files changed, 924 insertions(+), 914 deletions(-) -- 2.7.4

3 8

[libvirt] [PATCH 0/4] Support setting MTU on domain interfaces
by Michal Privoznik 26 Jan '17

26 Jan '17

After Laine merges his patches [1] the only missing piece is setting MTU on a domain <interface/>. Well, up until now :-) 1: https://www.redhat.com/archives/libvir-list/2017-January/msg00946.html Michal Privoznik (4): formatnetwork.html.in: Fix #elementsNICS anchor virDomainNetDefParseXML: s/ret/rv/ domain_conf: Introduce <mtu/> to <interface/> qemu: Implement mtu on interface docs/formatdomain.html.in | 19 ++++++ docs/formatnetwork.html.in | 4 +- docs/schemas/domaincommon.rng | 3 + docs/schemas/networkcommon.rng | 9 +++ src/conf/domain_conf.c | 18 ++++-- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 14 +++++ src/qemu/qemu_domain.c | 30 ++++++++++ src/qemu/qemu_domain.h | 2 + tests/qemuxml2argvdata/qemuxml2argv-net-mtu.xml | 60 +++++++++++++++++++ .../qemuxml2xmloutdata/qemuxml2xmlout-net-mtu.xml | 68 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 14 files changed, 226 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-mtu.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-mtu.xml -- 2.11.0

3 11

[libvirt] [PATCHv2 1/3] util: unlock closeCallbacks if get callbacks for connect fail
by Wang King 25 Jan '17

25 Jan '17

Avoid return with the closeCallbacks locked when get callbacks list for connect fail. Signed-off-by: Wang King <king.wang(a)huawei.com> --- src/util/virclosecallbacks.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/virclosecallbacks.c b/src/util/virclosecallbacks.c index 891a92b..1fa9596 100644 --- a/src/util/virclosecallbacks.c +++ b/src/util/virclosecallbacks.c @@ -331,8 +331,10 @@ virCloseCallbacksRun(virCloseCallbacksPtr closeCallbacks, virObjectLock(closeCallbacks); list = virCloseCallbacksGetForConn(closeCallbacks, conn); - if (!list) + if (!list) { + virObjectLock(closeCallbacks); return; + } for (i = 0; i < list->nentries; i++) { char uuidstr[VIR_UUID_STRING_BUFLEN]; -- 2.8.3

2 6

[libvirt] non-standard types in remote XDR definitions
by Matt Broadstone 25 Jan '17

25 Jan '17

Hello, I have been experimenting with the remote protocol defined in the `src/remote/remote_protocol.x` (https://libvirt.org/git/?p=libvirt.git;a=blob_plain;f=src/remote/remote_pro…) and noticed that there a number of types used that are not defined in the XDR RFC, specifically: unsigned char, char, unsigned short, short (I might have missed one or two). I'm wondering if these are missing typedefs, or whether they are custom extensions to the RFC. Does anyone have more information on this? If the latter case is the fact, are these values padded to 4 bytes per the spec? Thanks, Matt

2 3

[libvirt] [PATCH] perf: introduce option --reset
by Nitesh Konkar 25 Jan '17

25 Jan '17

Currently you can either enable or disable a perf event. This patch allows you to reset the perf event using command line option --reset. Eg: virsh perf domainName --reset cpu_cycles Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- Example: virsh domstats Fedora --perf Domain: 'Fedora' virsh perf Fedora --enable cpu_cycles,cache_references cpu_cycles : enabled cache_references: enabled virsh domstats Fedora --perf Domain: 'Fedora' perf.cpu_cycles=107559185 perf.cache_references=563288 virsh perf Fedora --reset cache_misses,cpu_cycles,cache_references cache_misses : reset cpu_cycles : reset cache_references: reset virsh domstats Fedora --perf Domain: 'Fedora' perf.cpu_cycles=0 perf.cache_references=0 perf.cache_misses=0 virsh perf Fedora --reset cache_misses,cpu_cycles,cache_references --config error: Options --reset and --config are mutually exclusive Should reset option be made available in the domainxml along with enabled=yes/no ? I have not included any such change in this patch as I think that there is no need to reset a perf counter as its value for the VM's pid shall start by default at zero unless enabled. include/libvirt/libvirt-domain.h | 6 +++++ src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 52 ++++++++++++++++++++-------------------- src/qemu/qemu_process.c | 22 +++++++++++++---- src/util/virperf.c | 52 ++++++++++++++++++++++++++++------------ src/util/virperf.h | 12 ++++++---- tools/virsh-domain.c | 37 ++++++++++++++++++---------- 7 files changed, 120 insertions(+), 62 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index e303140..6072f00 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2188,6 +2188,12 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); */ # define VIR_PERF_PARAM_REF_CPU_CYCLES "ref_cpu_cycles" +enum { +VIR_PERF_STATE_DISABLED, +VIR_PERF_STATE_ENABLED, +VIR_PERF_STATE_RESET, +}; + int virDomainGetPerfEvents(virDomainPtr dom, virTypedParameterPtr *params, int *nparams, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index cfeb43c..61bd207 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2229,6 +2229,7 @@ virPCIStubDriverTypeToString; virPerfEventDisable; virPerfEventEnable; virPerfEventIsEnabled; +virPerfEventSetFd; virPerfEventTypeFromString; virPerfEventTypeToString; virPerfFree; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 516a851..8dd3ab7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9530,25 +9530,25 @@ qemuDomainSetPerfEvents(virDomainPtr dom, virDomainDefPtr persistentDef; int ret = -1; virPerfEventType type; - bool enabled; + int state; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); if (virTypedParamsValidate(params, nparams, - 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_CPU_CYCLES, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_INSTRUCTIONS, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_CACHE_REFERENCES, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_CACHE_MISSES, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_BRANCH_INSTRUCTIONS, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_BRANCH_MISSES, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_BUS_CYCLES, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_STALLED_CYCLES_FRONTEND, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_STALLED_CYCLES_BACKEND, VIR_TYPED_PARAM_BOOLEAN, - VIR_PERF_PARAM_REF_CPU_CYCLES, VIR_TYPED_PARAM_BOOLEAN, + VIR_PERF_PARAM_CMT, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_MBMT, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_MBML, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_CPU_CYCLES, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_INSTRUCTIONS, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_CACHE_REFERENCES, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_CACHE_MISSES, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_BRANCH_INSTRUCTIONS, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_BRANCH_MISSES, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_BUS_CYCLES, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_STALLED_CYCLES_FRONTEND, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_STALLED_CYCLES_BACKEND, VIR_TYPED_PARAM_INT, + VIR_PERF_PARAM_REF_CPU_CYCLES, VIR_TYPED_PARAM_INT, NULL) < 0) return -1; @@ -9570,16 +9570,17 @@ qemuDomainSetPerfEvents(virDomainPtr dom, if (def) { for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; - enabled = param->value.b; + state = param->value.i; type = virPerfEventTypeFromString(param->field); - if (!enabled && virPerfEventDisable(priv->perf, type) < 0) - goto endjob; - if (enabled && virPerfEventEnable(priv->perf, type, vm->pid) < 0) + if ((state == VIR_PERF_STATE_DISABLED) && virPerfEventDisable(priv->perf, type) < 0) { goto endjob; + } else { + if (virPerfEventSetFd(priv->perf, type, vm->pid, state) < 0) + goto endjob; + } - def->perf.events[type] = enabled ? - VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO; + def->perf.events[type] = state; } if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) @@ -9589,11 +9590,10 @@ qemuDomainSetPerfEvents(virDomainPtr dom, if (persistentDef) { for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; - enabled = param->value.b; + state = param->value.i; type = virPerfEventTypeFromString(param->field); - persistentDef->perf.events[type] = enabled ? - VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO; + persistentDef->perf.events[type] = state; } if (virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef) < 0) @@ -9649,14 +9649,14 @@ qemuDomainGetPerfEvents(virDomainPtr dom, priv = vm->privateData; for (i = 0; i < VIR_PERF_EVENT_LAST; i++) { - bool perf_enabled; + int perf_enabled; if (flags & VIR_DOMAIN_AFFECT_CONFIG) - perf_enabled = def->perf.events[i] == VIR_TRISTATE_BOOL_YES; + perf_enabled = def->perf.events[i]; else perf_enabled = virPerfEventIsEnabled(priv->perf, i); - if (virTypedParamsAddBoolean(&par, &npar, &maxpar, + if (virTypedParamsAddInt(&par, &npar, &maxpar, virPerfEventTypeToString(i), perf_enabled) < 0) goto endjob; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 184440d..1bd7979 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3200,11 +3200,19 @@ qemuDomainPerfRestart(virDomainObjPtr vm) for (i = 0; i < VIR_PERF_EVENT_LAST; i++) { if (def->perf.events[i] && - def->perf.events[i] == VIR_TRISTATE_BOOL_YES) { + def->perf.events[i] == VIR_PERF_STATE_ENABLED) { /* Failure to re-enable the perf event should not be fatal */ - if (virPerfEventEnable(priv->perf, i, vm->pid) < 0) - def->perf.events[i] = VIR_TRISTATE_BOOL_NO; + if (virPerfEventSetFd(priv->perf, i, vm->pid, VIR_PERF_STATE_ENABLED) < 0) + def->perf.events[i] = VIR_PERF_STATE_DISABLED; + } + + if (def->perf.events[i] && + def->perf.events[i] == VIR_PERF_STATE_RESET) { + + /* Failure to reset the perf event should not be fatal */ + if (virPerfEventSetFd(priv->perf, i, vm->pid, VIR_PERF_STATE_RESET) < 0) + def->perf.events[i] = VIR_PERF_STATE_DISABLED; } } @@ -5563,8 +5571,12 @@ qemuProcessLaunch(virConnectPtr conn, goto cleanup; for (i = 0; i < VIR_PERF_EVENT_LAST; i++) { - if (vm->def->perf.events[i] == VIR_TRISTATE_BOOL_YES && - virPerfEventEnable(priv->perf, i, vm->pid) < 0) + if (vm->def->perf.events[i] == VIR_PERF_STATE_ENABLED && + virPerfEventSetFd(priv->perf, i, vm->pid, VIR_PERF_STATE_ENABLED) < 0) + goto cleanup; + + if (vm->def->perf.events[i] == VIR_PERF_STATE_RESET && + virPerfEventSetFd(priv->perf, i, vm->pid, VIR_PERF_STATE_RESET) < 0) goto cleanup; } diff --git a/src/util/virperf.c b/src/util/virperf.c index f64692b..125166b 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -48,7 +48,7 @@ VIR_ENUM_IMPL(virPerfEvent, VIR_PERF_EVENT_LAST, struct virPerfEvent { int type; int fd; - bool enabled; + int state; union { /* cmt */ struct { @@ -186,9 +186,25 @@ virPerfGetEvent(virPerfPtr perf, } int -virPerfEventEnable(virPerfPtr perf, +virPerfEventEnable(int fd) +{ + if (ioctl(fd, PERF_EVENT_IOC_ENABLE) < 0) + return -1; + return 0; +} + +int +virPerfEventReset(int fd) +{ + if (ioctl(fd, PERF_EVENT_IOC_RESET) < 0) + return -1; + return 0; +} + +int +virPerfEventSetFd(virPerfPtr perf, virPerfEventType type, - pid_t pid) + pid_t pid, int state) { char *buf = NULL; struct perf_event_attr attr; @@ -237,14 +253,20 @@ virPerfEventEnable(virPerfPtr perf, goto error; } - if (ioctl(event->fd, PERF_EVENT_IOC_ENABLE) < 0) { + if (state == VIR_PERF_STATE_ENABLED && virPerfEventEnable(event->fd) < 0) { virReportSystemError(errno, _("unable to enable host cpu perf event for %s"), virPerfEventTypeToString(event->type)); goto error; } - event->enabled = true; + if (state == VIR_PERF_STATE_RESET && virPerfEventReset(event->fd) < 0) { + virReportSystemError(errno, + _("unable to reset host cpu perf event for %s"), + virPerfEventTypeToString(event->type)); + goto error; + } + event->state = state; return 0; error: @@ -261,7 +283,7 @@ virPerfEventDisable(virPerfPtr perf, if (event == NULL) return -1; - if (!event->enabled) + if (!event->state) return 0; if (ioctl(event->fd, PERF_EVENT_IOC_DISABLE) < 0) { @@ -271,19 +293,19 @@ virPerfEventDisable(virPerfPtr perf, return -1; } - event->enabled = false; + event->state = VIR_PERF_STATE_DISABLED; VIR_FORCE_CLOSE(event->fd); return 0; } -bool virPerfEventIsEnabled(virPerfPtr perf, +int virPerfEventIsEnabled(virPerfPtr perf, virPerfEventType type) { virPerfEventPtr event = virPerfGetEvent(perf, type); if (event == NULL) return false; - return event->enabled; + return event->state; } int @@ -292,7 +314,7 @@ virPerfReadEvent(virPerfPtr perf, uint64_t *value) { virPerfEventPtr event = virPerfGetEvent(perf, type); - if (event == NULL || !event->enabled) + if (event == NULL || !event->state) return -1; if (saferead(event->fd, value, sizeof(uint64_t)) < 0) { @@ -316,7 +338,7 @@ virPerfRdtAttrInit(void) int -virPerfEventEnable(virPerfPtr perf ATTRIBUTE_UNUSED, +virPerfEventSetFd(virPerfPtr perf ATTRIBUTE_UNUSED, virPerfEventType type ATTRIBUTE_UNUSED, pid_t pid ATTRIBUTE_UNUSED) { @@ -334,11 +356,11 @@ virPerfEventDisable(virPerfPtr perf ATTRIBUTE_UNUSED, return -1; } -bool +int virPerfEventIsEnabled(virPerfPtr perf ATTRIBUTE_UNUSED, virPerfEventType type ATTRIBUTE_UNUSED) { - return false; + return 0; } int @@ -365,7 +387,7 @@ virPerfNew(void) for (i = 0; i < VIR_PERF_EVENT_LAST; i++) { perf->events[i].type = i; perf->events[i].fd = -1; - perf->events[i].enabled = false; + perf->events[i].state = VIR_PERF_STATE_DISABLED; } if (virPerfRdtAttrInit() < 0) @@ -383,7 +405,7 @@ virPerfFree(virPerfPtr perf) return; for (i = 0; i < VIR_PERF_EVENT_LAST; i++) { - if (perf->events[i].enabled) + if (perf->events[i].state >= VIR_PERF_STATE_ENABLED) virPerfEventDisable(perf, i); } diff --git a/src/util/virperf.h b/src/util/virperf.h index 1f43c92..f79ef31 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -60,14 +60,18 @@ virPerfPtr virPerfNew(void); void virPerfFree(virPerfPtr perf); -int virPerfEventEnable(virPerfPtr perf, - virPerfEventType type, - pid_t pid); +int virPerfEventSetFd(virPerfPtr perf, + virPerfEventType type, + pid_t pid, int state); + +int virPerfEventEnable(int fd); + +int virPerfEventReset(int fd); int virPerfEventDisable(virPerfPtr perf, virPerfEventType type); -bool virPerfEventIsEnabled(virPerfPtr perf, +int virPerfEventIsEnabled(virPerfPtr perf, virPerfEventType type); int virPerfReadEvent(virPerfPtr perf, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 93587e8..806490b 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8794,7 +8794,7 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_perf[] = { {.name = "help", - .data = N_("Get or set perf event") + .data = N_("Get, set or reset perf event") }, {.name = "desc", .data = N_("Get or set the current perf events for a guest" @@ -8815,6 +8815,10 @@ static const vshCmdOptDef opts_perf[] = { .type = VSH_OT_STRING, .help = N_("perf events which will be disabled") }, + {.name = "reset", + .type = VSH_OT_STRING, + .help = N_("perf events which will be reset") + }, VIRSH_COMMON_OPT_DOMAIN_CONFIG, VIRSH_COMMON_OPT_DOMAIN_LIVE, VIRSH_COMMON_OPT_DOMAIN_CURRENT, @@ -8823,7 +8827,7 @@ static const vshCmdOptDef opts_perf[] = { static int virshParseEventStr(const char *event, - bool state, + int state, virTypedParameterPtr *params, int *nparams, int *maxparams) @@ -8837,7 +8841,7 @@ virshParseEventStr(const char *event, for (i = 0; i < ntok; i++) { if ((*tok[i] != '\0') && - virTypedParamsAddBoolean(params, nparams, + virTypedParamsAddInt(params, nparams, maxparams, tok[i], state) < 0) goto cleanup; } @@ -8854,9 +8858,11 @@ virshPrintPerfStatus(vshControl *ctl, virTypedParameterPtr params, int nparams) size_t i; for (i = 0; i < nparams; i++) { - if (params[i].type == VIR_TYPED_PARAM_BOOLEAN && - params[i].value.b) { + if (params[i].type == VIR_TYPED_PARAM_INT && + params[i].value.i == VIR_PERF_STATE_ENABLED) { vshPrintExtra(ctl, "%-15s: %s\n", params[i].field, _("enabled")); + } else if (params[i].value.i == VIR_PERF_STATE_RESET) { + vshPrintExtra(ctl, "%-15s: %s\n", params[i].field, _("reset")); } else { vshPrintExtra(ctl, "%-15s: %s\n", params[i].field, _("disabled")); } @@ -8871,14 +8877,16 @@ cmdPerf(vshControl *ctl, const vshCmd *cmd) int maxparams = 0; virTypedParameterPtr params = NULL; bool ret = false; - const char *enable = NULL, *disable = NULL; + const char *enable = NULL, *disable = NULL, *resett = NULL; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; bool current = vshCommandOptBool(cmd, "current"); bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); + bool reset = vshCommandOptBool(cmd, "reset"); VSH_EXCLUSIVE_OPTIONS_VAR(current, live); VSH_EXCLUSIVE_OPTIONS_VAR(current, config); + VSH_EXCLUSIVE_OPTIONS_VAR(reset, config); if (config) flags |= VIR_DOMAIN_AFFECT_CONFIG; @@ -8886,18 +8894,23 @@ cmdPerf(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_AFFECT_LIVE; if (vshCommandOptStringReq(ctl, cmd, "enable", &enable) < 0 || - vshCommandOptStringReq(ctl, cmd, "disable", &disable) < 0) + vshCommandOptStringReq(ctl, cmd, "disable", &disable) < 0 || + vshCommandOptStringReq(ctl, cmd, "reset", &resett) < 0) return false; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (enable && virshParseEventStr(enable, true, &params, - &nparams, &maxparams) < 0) + if (enable && virshParseEventStr(enable, VIR_PERF_STATE_ENABLED, + &params, &nparams, &maxparams) < 0) + goto cleanup; + + if (disable && virshParseEventStr(disable, VIR_PERF_STATE_DISABLED, + &params, &nparams, &maxparams) < 0) goto cleanup; - if (disable && virshParseEventStr(disable, false, &params, - &nparams, &maxparams) < 0) + if (resett && virshParseEventStr(resett, VIR_PERF_STATE_RESET, + &params, &nparams, &maxparams) < 0) goto cleanup; if (nparams == 0) { @@ -8908,7 +8921,7 @@ cmdPerf(vshControl *ctl, const vshCmd *cmd) virshPrintPerfStatus(ctl, params, nparams); } else { if (virDomainSetPerfEvents(dom, params, nparams, flags) != 0) { - vshError(ctl, "%s", _("Unable to enable/disable perf events")); + vshError(ctl, "%s", _("Unable to enable/disable/reset perf events")); goto cleanup; } else { virshPrintPerfStatus(ctl, params, nparams); -- 1.9.3

2 4

[libvirt] [PATCH 0/2] *** Expose host's cache information in capabilities ***
by Eli Qiao 25 Jan '17

25 Jan '17

This series patches are the first step to support CAT featues, which also called cache tune in libvirt. First to expose cache information which could be tuned in capabilites XML, later will add some more interface to do cache tune. Some discussion about this feature support can be found from: https://www.redhat.com/archives/libvir-list/2017-January/msg00644.html Eli Qiao (2): Resctrl: Add some utils functions Resctrl: expose cache information to capabilities include/libvirt/virterror.h | 1 + src/Makefile.am | 1 + src/conf/capabilities.c | 30 +++ src/conf/capabilities.h | 15 ++ src/libvirt_private.syms | 5 + src/qemu/qemu_capabilities.c | 42 ++++ src/qemu/qemu_driver.c | 4 + src/util/virerror.c | 1 + src/util/virresctrl.c | 500 +++++++++++++++++++++++++++++++++++++++++++ src/util/virresctrl.h | 121 +++++++++++ tests/Makefile.am | 4 + 11 files changed, 724 insertions(+) create mode 100644 src/util/virresctrl.c create mode 100644 src/util/virresctrl.h -- 1.9.1

3 4

[libvirt] [PATCH v2] network: make openvswitch call timeout compile time configurable
by Boris Fiuczynski 25 Jan '17

25 Jan '17

Since a successful completion of the calls to openvswitch is expected a long timeout should be chosen to account for heavily loaded systems. Therefore this patch increases the timeout value from 5 to 120 seconds as default value and also allows to set the openvswitch timeout value by specifying with-ovs-timeout when running configure. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> Reviewed-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> Reviewed-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com> --- configure.ac | 3 +++ m4/virt-ovs-timeout.m4 | 34 ++++++++++++++++++++++++++++++++++ src/util/virnetdevopenvswitch.c | 9 +++++---- 3 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 m4/virt-ovs-timeout.m4 diff --git a/configure.ac b/configure.ac index 7efaddb..e70dfdc 100644 --- a/configure.ac +++ b/configure.ac @@ -463,6 +463,7 @@ LIBVIRT_ARG_LOADER_NVRAM LIBVIRT_ARG_LOGIN_SHELL LIBVIRT_ARG_HOST_VALIDATE LIBVIRT_ARG_TLS_PRIORITY +LIBVIRT_ARG_OVS_TIMEOUT LIBVIRT_ARG_SYSCTL_CONFIG @@ -477,6 +478,7 @@ LIBVIRT_CHECK_LOADER_NVRAM LIBVIRT_CHECK_LOGIN_SHELL LIBVIRT_CHECK_HOST_VALIDATE LIBVIRT_CHECK_TLS_PRIORITY +LIBVIRT_CHECK_OVS_TIMEOUT LIBVIRT_CHECK_SYSCTL_CONFIG LIBVIRT_CHECK_NSS @@ -1012,6 +1014,7 @@ LIBVIRT_RESULT_LOADER_NVRAM LIBVIRT_RESULT_LOGIN_SHELL LIBVIRT_RESULT_HOST_VALIDATE LIBVIRT_RESULT_TLS_PRIORITY +LIBVIRT_RESULT_OVS_TIMEOUT AC_MSG_NOTICE([]) AC_MSG_NOTICE([Developer Tools]) AC_MSG_NOTICE([]) diff --git a/m4/virt-ovs-timeout.m4 b/m4/virt-ovs-timeout.m4 new file mode 100644 index 0000000..a5174d5 --- /dev/null +++ b/m4/virt-ovs-timeout.m4 @@ -0,0 +1,34 @@ +dnl The OVS timeout check +dnl +dnl Copyright (C) 2017 IBM Corporation +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library. If not, see +dnl <http://www.gnu.org/licenses/>. +dnl + +AC_DEFUN([LIBVIRT_ARG_OVS_TIMEOUT], [ + LIBVIRT_ARG_WITH([OVS_TIMEOUT], + [set the default OVS timeout], + 120) +]) + +AC_DEFUN([LIBVIRT_CHECK_OVS_TIMEOUT], [ + AC_DEFINE_UNQUOTED([OVS_TIMEOUT], ["$with_ovs_timeout"], + [default OVS timeout]) +]) + +AC_DEFUN([LIBVIRT_RESULT_OVS_TIMEOUT], [ +dnl AC_MSG_NOTICE([OVS timeout: $with_ovs_timeout]) + LIBVIRT_RESULT([ OVS timeout], [$with_ovs_timeout]) +]) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index e6cb096..ba44b3b 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -35,6 +35,7 @@ #include "virlog.h" #define VIR_FROM_THIS VIR_FROM_NONE +#define OVS_TIMEOUT_ARG "--timeout=" OVS_TIMEOUT VIR_LOG_INIT("util.netdevopenvswitch"); @@ -89,7 +90,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, cmd = virCommandNew(OVSVSCTL); - virCommandAddArgList(cmd, "--timeout=5", "--", "--if-exists", "del-port", + virCommandAddArgList(cmd, OVS_TIMEOUT_ARG, "--", "--if-exists", "del-port", ifname, "--", "add-port", brname, ifname, NULL); if (virtVlan && virtVlan->nTags > 0) { @@ -183,7 +184,7 @@ int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, const ch virCommandPtr cmd = NULL; cmd = virCommandNew(OVSVSCTL); - virCommandAddArgList(cmd, "--timeout=5", "--", "--if-exists", "del-port", ifname, NULL); + virCommandAddArgList(cmd, OVS_TIMEOUT_ARG, "--", "--if-exists", "del-port", ifname, NULL); if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -212,7 +213,7 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) size_t len; int ret = -1; - cmd = virCommandNewArgList(OVSVSCTL, "--timeout=5", "--if-exists", "get", "Interface", + cmd = virCommandNewArgList(OVSVSCTL, OVS_TIMEOUT_ARG, "--if-exists", "get", "Interface", ifname, "external_ids:PortData", NULL); virCommandSetOutputBuffer(cmd, migrate); @@ -255,7 +256,7 @@ int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname) return 0; } - cmd = virCommandNewArgList(OVSVSCTL, "--timeout=5", "set", + cmd = virCommandNewArgList(OVSVSCTL, OVS_TIMEOUT_ARG, "set", "Interface", ifname, NULL); virCommandAddArgFormat(cmd, "external_ids:PortData=%s", migrate); -- 2.5.5

3 4

[libvirt] [PATCH] configure: fix indentation in TLS priority result
by Boris Fiuczynski 25 Jan '17

25 Jan '17

Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- m4/virt-tls-priority.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-tls-priority.m4 b/m4/virt-tls-priority.m4 index f7a6c56..44d9f68 100644 --- a/m4/virt-tls-priority.m4 +++ b/m4/virt-tls-priority.m4 @@ -29,5 +29,5 @@ AC_DEFUN([LIBVIRT_CHECK_TLS_PRIORITY], [ ]) AC_DEFUN([LIBVIRT_RESULT_TLS_PRIORITY], [ - LIBVIRT_RESULT([TLS priority], [$with_tls_priority]) + LIBVIRT_RESULT([ TLS priority], [$with_tls_priority]) ]) -- 2.5.5

2 2

[libvirt] [PATCH] THREADS.txt: fix typos
by Chen Hanxiao 25 Jan '17

25 Jan '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> s/wakup/wakeup Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- daemon/THREADS.txt | 2 +- src/util/vireventpoll.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/THREADS.txt b/daemon/THREADS.txt index 762ca25..ae4e9ba 100644 --- a/daemon/THREADS.txt +++ b/daemon/THREADS.txt @@ -42,7 +42,7 @@ event loop thread handles I/O from the client socket, and once a complete RPC message has been read off the wire (and optionally decrypted), it will be placed on the 'dx' job queue for the associated client object. The job condition will be signalled and -a worker will wakup and process it. +a worker will wakeup and process it. The worker thread must quickly drop its locks on the server and client to allow the main event loop thread to continue running diff --git a/src/util/vireventpoll.h b/src/util/vireventpoll.h index 8844c9c..e78e273 100644 --- a/src/util/vireventpoll.h +++ b/src/util/vireventpoll.h @@ -124,7 +124,7 @@ int virEventPollToNativeEvents(int events); /** * virEventPollInterrupt: wakeup any thread waiting in poll() * - * return -1 if wakup failed + * return -1 if wakeup failed */ int virEventPollInterrupt(void); -- 2.7.4

2 1

[libvirt] [PATCH 0/4] Xen: Improve support for <timer> configurations
by Jim Fehlig 24 Jan '17

24 Jan '17

This series fixes some issues wrt <timer> configuration in the libxl driver and the xenconfig parser/formatter. See patches 1 and 2 for details on the libxl driver changes, and patch 3 for details on the xenconfig parser/formatter changes. Patch 4 adds some tests to check domXML <-> xl.cfg conversions of <timer> configuration. Jim Fehlig (4): libxl: fix timer configuration libxl: support emulate mode of tsc timer xenconfig: add support for more timers tests: add xlconfig tests for <timer> configurations src/libxl/libxl_conf.c | 49 +++++++++---- src/xenconfig/xen_common.c | 87 +++++++++++++++++++++--- tests/xlconfigdata/test-fullvirt-hpet-timer.cfg | 27 ++++++++ tests/xlconfigdata/test-fullvirt-hpet-timer.xml | 64 +++++++++++++++++ tests/xlconfigdata/test-fullvirt-multi-timer.cfg | 28 ++++++++ tests/xlconfigdata/test-fullvirt-multi-timer.xml | 65 ++++++++++++++++++ tests/xlconfigdata/test-fullvirt-tsc-timer.cfg | 27 ++++++++ tests/xlconfigdata/test-fullvirt-tsc-timer.xml | 64 +++++++++++++++++ tests/xlconfigtest.c | 3 + 9 files changed, 392 insertions(+), 22 deletions(-) create mode 100644 tests/xlconfigdata/test-fullvirt-hpet-timer.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-hpet-timer.xml create mode 100644 tests/xlconfigdata/test-fullvirt-multi-timer.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-multi-timer.xml create mode 100644 tests/xlconfigdata/test-fullvirt-tsc-timer.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-tsc-timer.xml -- 2.9.2

2 11

[libvirt] [PATCH 0/3] support setting MTU of libvirt networks
by Laine Stump 24 Jan '17

24 Jan '17

This has been requested several times in #virt on IRC, and on libvirt-users, and a comment posted to https://bugzilla.redhat.com/1224348 reminded me that there's even an open BZ for it, so I finally sat down and wrote the patches for it. The idea of the patches is that an *empty* bridge device can't have its MTU directly set to anything higher than 1500, but once there are any devices on the bridge, its MTU is limited to the smallest of the MTUs of any attached devices. However, when the very first device is attached to the bridge, the bridge will *increase* its own MTU to match if needed. So the trick to setting a high MTU is to set the MTU of every device to the desired value before it is added (especially the first). libvirt already sets the MTU of every device to the MTU of the bridge, so all we need to do is make it so the first device is set from the network config's "mtu" attribute instead - the bridge will get the larger MTU, and all future devices added will get the higher MTU as well. This doesn't take care of setting the MTU on the guest side of the tap device; for now that must be done manually, but qemu has recently added a commandline parameter to send the desired MTU to the guest, and the virtio-net guest driver at least honors this. An upcoming patch to libvirt will automatically set this qemu commandline option so that no intervention will be required (beyond setting the MTU once in the network config). Laine Stump (3): util: add MTU arg to virNetDevTapCreateInBridgePort() conf: support mtu attribute in a network's <bridge> element network: honor mtu setting when creating network docs/formatnetwork.html.in | 8 +++++++- docs/news.xml | 6 +++++- docs/schemas/network.rng | 6 ++++++ src/bhyve/bhyve_command.c | 2 +- src/conf/network_conf.c | 20 ++++++++++++++++++-- src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 1 + src/qemu/qemu_interface.c | 2 +- src/uml/uml_conf.c | 2 +- src/util/virnetdevtap.c | 20 +++++++++++++++----- src/util/virnetdevtap.h | 1 + tests/bhyvexml2argvmock.c | 1 + tests/networkxml2xmlin/set-mtu.xml | 11 +++++++++++ tests/networkxml2xmlout/set-mtu.xml | 11 +++++++++++ tests/networkxml2xmltest.c | 1 + 15 files changed, 81 insertions(+), 12 deletions(-) create mode 100644 tests/networkxml2xmlin/set-mtu.xml create mode 100644 tests/networkxml2xmlout/set-mtu.xml -- 2.9.3

2 7

[libvirt] [PATCH v2 1/2] util: virhostdev: disallow assigning a pci-bridge to a guest
by Shivaprasad G Bhat 23 Jan '17

23 Jan '17

Non-endpoint devices like pci-bridges cannot be passedthrough to guests. Prevent such attempts. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/util/virhostdev.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 0673afb..b23fe1f 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -532,6 +532,16 @@ virHostdevPreparePCIDevices(virHostdevManagerPtr mgr, bool strict_acs_check = !!(flags & VIR_HOSTDEV_STRICT_ACS_CHECK); bool usesVFIO = (virPCIDeviceGetStubDriver(pci) == VIR_PCI_STUB_DRIVER_VFIO); struct virHostdevIsPCINodeDeviceUsedData data = { mgr, dom_name, usesVFIO }; + int hdrType = -1; + + if (virPCIGetHeaderType(pci, &hdrType) < 0) + goto cleanup; + + if (hdrType != VIR_PCI_HEADER_ENDPOINT) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("PCI bridge devices " + "cannot be assigned to guests")); + goto cleanup; + } if (!usesVFIO && !virPCIDeviceIsAssignable(pci, strict_acs_check)) { virReportError(VIR_ERR_OPERATION_INVALID,

3 4

[libvirt] [PATCH go] Fix segfault in Connect.GetMemoryStats
by Matvey Kruglov 23 Jan '17

23 Jan '17

*** BLURB HERE *** Matvey Kruglov (1): Fix segfault in Connect.GetMemoryStats connect.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4

2 2

[libvirt] [PATCH v2] util: disallow assigning or resetting a pci-bridge device
by Shivaprasad G Bhat 23 Jan '17

23 Jan '17

It is destructive to attempt reset on a pci-bridge, the host can crash. The bridges won't contain any guest data and neither they can be passed through using vfio/stub. So, no point in allowing a reset on them. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/util/virhostdev.c | 10 ++++++++++ src/util/virpci.c | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 0673afb..16b96f3 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -532,6 +532,16 @@ virHostdevPreparePCIDevices(virHostdevManagerPtr mgr, bool strict_acs_check = !!(flags & VIR_HOSTDEV_STRICT_ACS_CHECK); bool usesVFIO = (virPCIDeviceGetStubDriver(pci) == VIR_PCI_STUB_DRIVER_VFIO); struct virHostdevIsPCINodeDeviceUsedData data = { mgr, dom_name, usesVFIO }; + int hdrType = -1; + + if (virPCIGetHeaderType(pci, &hdrType) < 0) + goto cleanup; + + if (hdrType == VIR_PCI_HEADER_PCI_BRIDGE) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("PCI bridge devices" + " cannot be assigned to guests")); + goto cleanup; + } if (!usesVFIO && !virPCIDeviceIsAssignable(pci, strict_acs_check)) { virReportError(VIR_ERR_OPERATION_INVALID, diff --git a/src/util/virpci.c b/src/util/virpci.c index 0601f49..f205abf 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -933,6 +933,17 @@ virPCIDeviceReset(virPCIDevicePtr dev, char *drvName = NULL; int ret = -1; int fd = -1; + int hdrType = -1; + + if (virPCIGetHeaderType(dev, &hdrType) < 0) + return -1; + + if (hdrType != VIR_PCI_HEADER_ENDPOINT) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid attempt to reset non-endpoint PCI device %s." + " Only PCI endpoint devices can be reset"), dev->name); + return -1; + } if (activeDevs && virPCIDeviceListFind(activeDevs, dev)) { virReportError(VIR_ERR_INTERNAL_ERROR,

3 3

[libvirt] [PATCH resend v2 0/2] Allow saving QEMU libvirt state to a pipe
by Chen Hanxiao 22 Jan '17

22 Jan '17

This series introduce flag VIR_DOMAIN_SAVE_DIRECT to enable command 'save' to write to PIPE. Base upon patches from Roy Keene <rkeene(a)knightpoint.com> with some fixes. Change from original patch: 1) Check whether the specified path is a PIPE. 2) Rebase on upstream. 3) Add doc for virsh command v2-resend: rebase on upstream v2: rename VIR_DOMAIN_SAVE_PIPE to VIR_DOMAIN_SAVE_DIRECT remove S_ISFIFO check Chen Hanxiao (2): qemu: Allow saving QEMU libvirt state to a pipe virsh: introduce flage --direct for save command include/libvirt/libvirt-domain.h | 1 + src/qemu/qemu_driver.c | 54 ++++++++++++++++++++++++++-------------- tools/virsh-domain.c | 6 +++++ tools/virsh.pod | 5 +++- 4 files changed, 47 insertions(+), 19 deletions(-) -- 2.7.4

1 3

[libvirt] [PATCH v2] qemu_domain: add timestamp in tainting of guests log
by Chen Hanxiao 21 Jan '17

21 Jan '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We lacked of timestamp in tainting of guests log, which bring troubles for finding guest issues: such as whether a guest powerdown caused by qemu-monitor-command or others issues inside guests. If we had timestamp in tainting of guests log, it would be helpful when checking guest's /var/log/messages. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- v2: update logic flow of virDomainObjTaint check src/qemu/qemu_domain.c | 79 +++++++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 37 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c676042..2bc023c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3999,46 +3999,51 @@ void qemuDomainObjTaint(virQEMUDriverPtr driver, { virErrorPtr orig_err = NULL; bool closeLog = false; + char *timestamp = NULL; + char uuidstr[VIR_UUID_STRING_BUFLEN]; - if (virDomainObjTaint(obj, taint)) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(obj->def->uuid, uuidstr); - - VIR_WARN("Domain id=%d name='%s' uuid=%s is tainted: %s", - obj->def->id, - obj->def->name, - uuidstr, - virDomainTaintTypeToString(taint)); - - /* We don't care about errors logging taint info, so - * preserve original error, and clear any error that - * is raised */ - orig_err = virSaveLastError(); - if (logCtxt == NULL) { - logCtxt = qemuDomainLogContextNew(driver, obj, - QEMU_DOMAIN_LOG_CONTEXT_MODE_ATTACH); - if (!logCtxt) { - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); - } - VIR_WARN("Unable to open domainlog"); - return; - } - closeLog = true; - } + if (!virDomainObjTaint(obj, taint)) + return; + + virUUIDFormat(obj->def->uuid, uuidstr); + + VIR_WARN("Domain id=%d name='%s' uuid=%s is tainted: %s", + obj->def->id, + obj->def->name, + uuidstr, + virDomainTaintTypeToString(taint)); - if (qemuDomainLogContextWrite(logCtxt, - "Domain id=%d is tainted: %s\n", - obj->def->id, - virDomainTaintTypeToString(taint)) < 0) - virResetLastError(); - if (closeLog) - qemuDomainLogContextFree(logCtxt); - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); + if ((timestamp = virTimeStringNow()) == NULL) + goto cleanup; + + /* We don't care about errors logging taint info, so + * preserve original error, and clear any error that + * is raised */ + orig_err = virSaveLastError(); + if (logCtxt == NULL) { + logCtxt = qemuDomainLogContextNew(driver, obj, + QEMU_DOMAIN_LOG_CONTEXT_MODE_ATTACH); + if (!logCtxt) { + VIR_WARN("Unable to open domainlog"); + goto cleanup; } + closeLog = true; + } + + if (qemuDomainLogContextWrite(logCtxt, + "%s: Domain id=%d is tainted: %s\n", + timestamp, + obj->def->id, + virDomainTaintTypeToString(taint)) < 0) + virResetLastError(); + + cleanup: + VIR_FREE(timestamp); + if (closeLog) + qemuDomainLogContextFree(logCtxt); + if (orig_err) { + virSetError(orig_err); + virFreeError(orig_err); } } -- 2.7.4

2 1

[libvirt] [PATCH 0/9] i386: query-cpu-model-expansion test script
by Eduardo Habkost 20 Jan '17

20 Jan '17

This is a follow-up to the series that implements query-cpu-model-expansion. Before including the test script, the series has some fixes to allow the results of query-cpu-model-expansion to be used in the QEMU command-line. The script probably will work on s390x too, but I couldn't test it yet. This series and its dependencies can be pulled from the branch: https://github.com/ehabkost/qemu-hacks.git work/x86-query-cpu-expansion-test --- Cc: Cornelia Huck <cornelia.huck(a)de.ibm.com> Cc: Christian Borntraeger <borntraeger(a)de.ibm.com> Cc: David Hildenbrand <david(a)redhat.com> Cc: libvir-list(a)redhat.com Cc: Jiri Denemark <jdenemar(a)redhat.com> Cc: "Jason J. Herne" <jjherne(a)linux.vnet.ibm.com> Cc: Markus Armbruster <armbru(a)redhat.com> Cc: Richard Henderson <rth(a)twiddle.net> Cc: Igor Mammedov <imammedo(a)redhat.com> Cc: Eric Blake <eblake(a)redhat.com> Eduardo Habkost (9): target-i386: Move "host" properties to base class target-i386: Allow short strings to be used as vendor ID cpu: Support comma escaping when parsing -cpu qemu.py: Make logging optional qtest.py: Support QTEST_LOG environment variable qtest.py: make logging optional qtest.py: Make 'binary' parameter optional tests: Add rules to non-gtester qtest test cases tests: Test case for query-cpu-model-expansion scripts/qemu.py | 25 ++- scripts/qtest.py | 15 +- qom/cpu.c | 32 ++-- target/i386/cpu.c | 83 ++++----- tests/test-x86-cpuid-compat.c | 19 ++ tests/Makefile.include | 40 ++++- tests/query-cpu-model-test.py | 398 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 551 insertions(+), 61 deletions(-) create mode 100755 tests/query-cpu-model-test.py -- 2.11.0.259.g40922b1

4 10