- Devel - libvirt List Archives

[libvirt] [PATCH 0/2] Add support for some useful vim plugins
by Andrea Bolognani 02 May '17

02 May '17

libclang can be integrated into vim in pretty useful ways, notably to provide semantic syntax highlighting and code completion. This series enables basic support for both (through the color_coded and YouCompleteMe plugin respectively) by creating the required per-project configuration files automatically at configure time. Note that external libraries (eg. libxml2) are not being processed at the moment, but even with this basic configuration the plugins can be very useful. More sophisticated support can be worked in later on. Visual comparison: http://imgur.com/a/TBJsz Andrea Bolognani (2): Add color_coded support Add YouCompleteMe support .color_coded.in | 40 ++++++++++++++++++++++++++++++++++++++++ .gitignore | 2 ++ .ycm_extra_conf.py.in | 45 +++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 ++ 4 files changed, 89 insertions(+) create mode 100644 .color_coded.in create mode 100644 .ycm_extra_conf.py.in -- 2.7.4

2 11

[libvirt] [PATCH RFC V2] RFC: Reimplement cache allocation for a VM
by Eli Qiao 02 May '17

02 May '17

This is a RFC patch for the reimplement of `support cache tune(CAT) in libvirt`[1]. This patch defines some structs to represent data struct in linux resctrl fs which will be used later to do cache allocation. The patch expose a private interface `virResctrlFreeSchemata`, which will be used to query the cache allocation on the host. Also added unit test cases to test this interface can works well. There are already patch sets[2] to address it, and functional works, but people doesn't like it cause it has global variable, and missing unit test case for new added capabilites, etc. Martin has proposed a test infra to do vircaps2xmltest, and I extened it on top of it to extend resctrl control[3], this is kinds of new desiged apart from [2], so I propose this RFC patch to do some rework on it. [1] https://www.redhat.com/archives/libvir-list/2017-January/msg00683.html [2] https://www.redhat.com/archives/libvir-list/2017-March/msg00181.html [3] https://www.redhat.com/archives/libvir-list/2017-April/msg00516.html --- include/libvirt/virterror.h | 1 + src/Makefile.am | 1 + src/libvirt_private.syms | 6 + src/util/virerror.c | 1 + src/util/virresctrl.c | 423 ++++++++++++++++++++++++++++++ src/util/virresctrl.h | 86 ++++++ tests/Makefile.am | 7 +- tests/virresctrldata/L3-free.schemata | 1 + tests/virresctrldata/L3CODE-free.schemata | 1 + tests/virresctrldata/L3DATA-free.schemata | 1 + tests/virresctrltest.c | 117 +++++++++ 11 files changed, 644 insertions(+), 1 deletion(-) create mode 100644 src/util/virresctrl.c create mode 100644 src/util/virresctrl.h create mode 100644 tests/virresctrldata/L3-free.schemata create mode 100644 tests/virresctrldata/L3CODE-free.schemata create mode 100644 tests/virresctrldata/L3DATA-free.schemata create mode 100644 tests/virresctrltest.c diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index 2efee8f..4bc0c74 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -132,6 +132,7 @@ typedef enum { VIR_FROM_PERF = 65, /* Error from perf */ VIR_FROM_LIBSSH = 66, /* Error from libssh connection transport */ + VIR_FROM_RESCTRL = 67, /* Error from resctrl */ # ifdef VIR_ENUM_SENTINELS VIR_ERR_DOMAIN_LAST diff --git a/src/Makefile.am b/src/Makefile.am index 60eba37..0ae2af5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -165,6 +165,7 @@ UTIL_SOURCES = \ util/virprocess.c util/virprocess.h \ util/virqemu.c util/virqemu.h \ util/virrandom.h util/virrandom.c \ + util/virresctrl.h util/virresctrl.c \ util/virrotatingfile.h util/virrotatingfile.c \ util/virscsi.c util/virscsi.h \ util/virscsihost.c util/virscsihost.h \ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9d7760d..b7225fe 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2396,6 +2396,12 @@ virRandomGenerateWWN; virRandomInt; +# util/virresctrl.h +virResctrlFreeSchemata; +virResctrlGetFreeCache; +virResctrlTypeToString; + + # util/virrotatingfile.h virRotatingFileReaderConsume; virRotatingFileReaderFree; diff --git a/src/util/virerror.c b/src/util/virerror.c index ef17fb5..02fabcc 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -139,6 +139,7 @@ VIR_ENUM_IMPL(virErrorDomain, VIR_ERR_DOMAIN_LAST, "Perf", /* 65 */ "Libssh transport layer", + "Resource Control", ) diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c new file mode 100644 index 0000000..778c2ec --- /dev/null +++ b/src/util/virresctrl.c @@ -0,0 +1,423 @@ +/* + * virresctrl.c: methods for managing resource control + * + * Copyright (C) 2017 Intel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Eli Qiao <liyong.qiao(a)intel.com> + */ + +#include <config.h> +#include <fcntl.h> +#include <sys/file.h> +#include <sys/stat.h> +#include <sys/types.h> + +#include "virresctrl.h" +#include "virerror.h" +#include "virlog.h" +#include "viralloc.h" +#include "virstring.h" +#include "virfile.h" + +VIR_LOG_INIT("util.resctrl"); + +#define VIR_FROM_THIS VIR_FROM_RESCTRL +#define SYSFS_RESCTRL_PATH "/sys/fs/resctrl/" + +VIR_ENUM_IMPL(virResctrl, VIR_RESCTRL_TYPE_LAST, + "L3", + "L3CODE", + "L3DATA", + "L2") + +/** + * a virResctrlDomain represents a resource control group, it's a directory + * under /sys/fs/resctrl. + * eg: /sys/fs/resctrl/CG1 + * |-- cpus + * |-- schemata + * `-- tasks + * # cat schemata + * L3DATA:0=fffff;1=fffff + * L3CODE:0=fffff;1=fffff + * + * Besides, it can also represent the default resource control group of the + * host. + */ + +typedef struct _virResctrlGroup virResctrlGroup; +typedef virResctrlGroup *virResctrlGroupPtr; +struct _virResctrlGroup { + char *name; /* resource group name, eg: CG1. If it represent host's + default resource group name, should be a NULL pointer */ + size_t n_tasks; /* number of task assigned to the resource group */ + char **tasks; /* task list which contains task id eg: 77454 */ + + size_t n_schematas; /* number of schemata the resource group contains, + eg: 2 */ + virResctrlSchemataPtr *schematas; /* scheamta list */ +}; + +/* All resource control groups on this host, including default resource group */ +typedef struct _virResctrlDomain virResctrlDomain; +typedef virResctrlDomain *virResctrlDomainPtr; +struct _virResctrlDomain { + size_t n_groups; /* number of resource control group */ + virResctrlGroupPtr *groups; /* list of resource control group */ +}; + +void +virResctrlFreeSchemata(virResctrlSchemataPtr ptr) +{ + size_t i; + + if (!ptr) + return; + + for (i = 0; i < ptr->n_schemata_items; i++) + VIR_FREE(ptr->schemata_items[i]); +} + +static void +virResctrlFreeGroup(virResctrlGroupPtr ptr) +{ + size_t i; + + if (!ptr) + return; + + for (i = 0; i < ptr->n_tasks; i++) + VIR_FREE(ptr->tasks[i]); + + for (i = 0; i < ptr->n_schematas; i++) { + virResctrlFreeSchemata(ptr->schematas[i]); + VIR_FREE(ptr->schematas[i]); + } +} + +static void +virResctrlFreeDomain(virResctrlDomainPtr ptr) +{ + size_t i; + + if (!ptr) + return; + + for (i = 0; i < ptr->n_groups; i++) { + virResctrlFreeGroup(ptr->groups[i]); + VIR_FREE(ptr->groups[i]); + } +} + +static int +virResctrlCopySchemata(virResctrlSchemataPtr src, + virResctrlSchemataPtr *dst) +{ + size_t i; + virResctrlSchemataItemPtr schemataitem; + virResctrlSchemataPtr schemata; + + if (VIR_ALLOC(schemata) < 0) + return -1; + + schemata->type = src->type; + + for (i = 0; i < src->n_schemata_items; i++) { + if (VIR_ALLOC(schemataitem) < 0) + goto error; + + schemataitem->cache_id = src->schemata_items[i]->cache_id; + schemataitem->continuous_schemata = src->schemata_items[i]->continuous_schemata; + schemataitem->schemata = src->schemata_items[i]->schemata; + schemataitem->size = src->schemata_items[i]->size; + + if (VIR_APPEND_ELEMENT(schemata->schemata_items, + schemata->n_schemata_items, + schemataitem) < 0) + goto error; + } + + *dst = schemata; + + return 0; + + error: + virResctrlFreeSchemata(schemata); + return -1; +} + +static int +virResctrlGetSchemataString(virResctrlType type, + const char *name, + char **schemata) +{ + int rc = -1; + char *tmp = NULL; + char *end = NULL; + char *buf = NULL; + char *type_suffix = NULL; + + if (virFileReadValueString(&buf, + SYSFS_RESCTRL_PATH "%s/schemata", + name ? name : "") < 0) + return -1; + + if (virAsprintf(&type_suffix, + "%s:", + virResctrlTypeToString(type)) < 0) + goto cleanup; + + tmp = strstr(buf, type_suffix); + + if (!tmp) + goto cleanup; + + end = strchr(tmp, '\n'); + if (end != NULL) + *end = '\0'; + + if (VIR_STRDUP(*schemata, tmp) < 0) + goto cleanup; + + rc = 0; + + cleanup: + VIR_FREE(buf); + VIR_FREE(type_suffix); + return rc; +} + +static int +virResctrlLoadSchemata(const char* schemata_str, + virResctrlSchemataPtr schemata) +{ + VIR_DEBUG("%s, %p\n", schemata_str, schemata); + + int ret = -1; + char **lists = NULL; + char **sms = NULL; + char **sis = NULL; + size_t i; + virResctrlSchemataItemPtr si; + + /* parse L3:0=fffff;1=f */ + lists = virStringSplit(schemata_str, ":", 2); + + if ((!lists) || (!lists[1])) + goto cleanup; + + /* parse 0=fffff;1=f */ + sms = virStringSplit(lists[1], ";", 0); + if (!sms) + goto cleanup; + + for (i = 0; sms[i] != NULL; i++) { + /* parse 0=fffff */ + sis = virStringSplit(sms[i], "=", 2); + if (!sis) + goto cleanup; + + if (VIR_ALLOC(si) < 0) + goto cleanup; + + if (virStrToLong_ui(sis[0], NULL, 10, &si->cache_id) < 0) + goto cleanup; + + if (virStrToLong_ui(sis[1], NULL, 16, &si->continuous_schemata) < 0) + goto cleanup; + + si->schemata = si->continuous_schemata; + + if (VIR_APPEND_ELEMENT(schemata->schemata_items, + schemata->n_schemata_items, + si) < 0) + goto cleanup; + + } + + ret = 0; + + cleanup: + VIR_FREE(si); + virStringListFree(lists); + virStringListFree(sms); + virStringListFree(sis); + return ret; +} + +static int +virResctrlLoadGroup(const char *name, + virResctrlDomainPtr dom) +{ + VIR_DEBUG("%s, %p\n", name, dom); + + int ret = -1; + char *path = NULL; + char *schemata_str; + virResctrlType i; + int rv; + virResctrlGroupPtr grp; + virResctrlSchemataPtr schemata; + + if ((virAsprintf(&path, "%s/%s", SYSFS_RESCTRL_PATH, name)) < 0) + return -1; + + if (!virFileExists(path)) + goto cleanup; + + if (VIR_ALLOC(grp) < 0) + goto cleanup; + + if (VIR_STRDUP(grp->name, name) < 0) + goto cleanup; + + for (i = 0; i < VIR_RESCTRL_TYPE_LAST; i++) { + rv = virResctrlGetSchemataString(i, name, &schemata_str); + if (rv < 0) + continue; + + if (VIR_ALLOC(schemata) < 0) + goto cleanup; + + schemata->type = i; + + if (virResctrlLoadSchemata(schemata_str, schemata) < 0) + goto cleanup; + + VIR_FREE(schemata_str); + + if (VIR_APPEND_ELEMENT(grp->schematas, + grp->n_schematas, + schemata) < 0) + goto cleanup; + + virResctrlFreeSchemata(schemata); + } + + if (VIR_APPEND_ELEMENT(dom->groups, + dom->n_groups, + grp) < 0) + goto cleanup; + + ret = 0; + + cleanup: + VIR_FREE(path); + virResctrlFreeGroup(grp); + return ret; +} + +static int +virResctrlLoadDomain(virResctrlDomainPtr dom) +{ + int ret = -1; + int rv = -1; + DIR *dirp = NULL; + char *path = NULL; + struct dirent *ent; + + VIR_DEBUG("%s, %p\n", "", dom); + + rv = virDirOpenIfExists(&dirp, SYSFS_RESCTRL_PATH); + + if (rv < 0) + goto cleanup; + + /* load default resctrl group */ + if (virResctrlLoadGroup("", dom) < 0) + goto cleanup; + + while ((rv = virDirRead(dirp, &ent, path)) > 0) { + /* only read directory in resctrl */ + if ((ent->d_type != DT_DIR) || STREQ(ent->d_name, "info")) + continue; + + if (virResctrlLoadGroup(ent->d_name, dom) < 0) + goto cleanup; + } + + ret = 0; + + cleanup: + virDirClose(&dirp); + return ret; +} + +static void +virResctrlRefreshDom(virResctrlDomainPtr dom, virResctrlType type) +{ + size_t i; + size_t j; + size_t k; + + virResctrlGroupPtr default_grp = NULL; + virResctrlGroupPtr grp = NULL; + virResctrlSchemataPtr schemata = NULL; + virResctrlSchemataItemPtr schemataitem = NULL; + + default_grp = dom->groups[0]; + + /* We are sure that the first group is the default one */ + for (i = 1; i < dom->n_groups; i++) { + grp = dom->groups[i]; + for (j = 0; j < grp->n_schematas; j++) { + schemata = grp->schematas[j]; + /* we can only calculate one type of schemata */ + if (schemata->type != type) + continue; + for (k = 0; k < schemata->n_schemata_items; k++) { + schemataitem = schemata->schemata_items[k]; + /* if the schemata = 1, ignore it */ + if (schemataitem->continuous_schemata > 1) + /* calculate default schemata, it can be non-continuous */ + default_grp->schematas[j]->schemata_items[k]->schemata &= ~(schemataitem->continuous_schemata); + } + } + } +} + +int virResctrlGetFreeCache(virResctrlType type, + virResctrlSchemataPtr *schemata) +{ + VIR_DEBUG("%d, %p\n", type, schemata); + int ret = -1; + size_t i; + virResctrlDomainPtr dom = NULL; + virResctrlGroupPtr grp = NULL; + + if (VIR_ALLOC(dom) < 0) + return -1; + + if (virResctrlLoadDomain(dom) < 0) + goto cleanup; + + virResctrlRefreshDom(dom, type); + grp = dom->groups[0]; + + for (i = 0; i < grp->n_schematas; i ++) + if (grp->schematas[i]->type == type) + if (virResctrlCopySchemata(grp->schematas[i], schemata) < 0) + goto cleanup; + + if (schemata != NULL) + ret = 0; + + cleanup: + virResctrlFreeDomain(dom); + return ret; +} diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h new file mode 100644 index 0000000..1b040d4 --- /dev/null +++ b/src/util/virresctrl.h @@ -0,0 +1,86 @@ +/* + * virresctrl.h: header for managing resctrl control + * + * Copyright (C) 2017 Intel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Eli Qiao <liyong.qiao(a)intel.com> + */ + +#ifndef __VIR_RESCTRL_H__ +# define __VIR_RESCTRL_H__ + +#include "virutil.h" + +typedef enum { + VIR_RESCTRL_TYPE_L3, + VIR_RESCTRL_TYPE_L3_CODE, + VIR_RESCTRL_TYPE_L3_DATA, + VIR_RESCTRL_TYPE_L2, + + VIR_RESCTRL_TYPE_LAST +} virResctrlType; + +VIR_ENUM_DECL(virResctrl); + +/* + * a virResctrlSchemataItem represents one of schemata object in a + * resource control group. + * eg: 0=f + */ +typedef struct _virResctrlSchemataItem virResctrlSchemataItem; +typedef virResctrlSchemataItem *virResctrlSchemataItemPtr; +struct _virResctrlSchemataItem { + unsigned int cache_id; /* cache resource id, eg: 0 */ + unsigned int continuous_schemata; /* schemata, should be a continuous bits, + eg: f, this schemata can be persisted + to sysfs */ + unsigned int schemata; /* schemata eg: f0f, a schemata which is calculated + at running time */ + unsigned long long size; /* the cache size schemata represented in B, + eg: (min * bits of continuous_schemata) */ +}; + +/* + * a virResctrlSchemata represents schemata objects of specific type of + * resource in a resource control group. + * eg: L3:0=f,1=ff + */ +typedef struct _virResctrlSchemata virResctrlSchemata; +typedef virResctrlSchemata *virResctrlSchemataPtr; +struct _virResctrlSchemata { + virResctrlType type; /* resource control type, eg: L3 */ + size_t n_schemata_items; /* number of schemata item, eg: 2 */ + virResctrlSchemataItemPtr *schemata_items; /* pointer list of schemata item */ +}; + +/* Get free cache of the host, result saved in schemata */ +int virResctrlGetFreeCache(virResctrlType type, + virResctrlSchemataPtr *schemata); + + +/* TODO Need to first define virDomainCachetunePtr */ +/* Set cache allocation for a VM domain */ +// int virResctrlSetCacheBanks(virDomainCachetunePtr cachetune, +// unsigned char *group_name, +// size_t n_pids, +// pid_t *pids); +// +/* remove cache allocation for a VM domain */ +// int virResctrlRemoveCacheBanks(unsigned char *group_name); +void virResctrlFreeSchemata(virResctrlSchemataPtr ptr); +#endif diff --git a/tests/Makefile.am b/tests/Makefile.am index 3cc828d..0e09e43 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -229,6 +229,7 @@ if WITH_LINUX test_programs += fchosttest test_programs += scsihosttest test_programs += vircaps2xmltest +test_programs += virresctrltest test_libraries += virusbmock.la \ virnetdevbandwidthmock.la \ virnumamock.la \ @@ -1150,6 +1151,10 @@ vircaps2xmltest_SOURCES = \ vircaps2xmltest.c testutils.h testutils.c virfilemock.c vircaps2xmltest_LDADD = $(LDADDS) +virresctrltest_SOURCES = \ + virresctrltest.c testutils.h testutils.c virfilemock.c +virresctrltest_LDADD = $(LDADDS) + virnumamock_la_SOURCES = \ virnumamock.c virnumamock_la_CFLAGS = $(AM_CFLAGS) @@ -1157,7 +1162,7 @@ virnumamock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virnumamock_la_LIBADD = $(MOCKLIBS_LIBS) else ! WITH_LINUX -EXTRA_DIST += vircaps2xmltest.c virnumamock.c +EXTRA_DIST += vircaps2xmltest.c virresctrltest.c virnumamock.c endif ! WITH_LINUX if WITH_NSS diff --git a/tests/virresctrldata/L3-free.schemata b/tests/virresctrldata/L3-free.schemata new file mode 100644 index 0000000..9b47d25 --- /dev/null +++ b/tests/virresctrldata/L3-free.schemata @@ -0,0 +1 @@ +L3:0=1ffff;1=1ffff diff --git a/tests/virresctrldata/L3CODE-free.schemata b/tests/virresctrldata/L3CODE-free.schemata new file mode 100644 index 0000000..7039c45 --- /dev/null +++ b/tests/virresctrldata/L3CODE-free.schemata @@ -0,0 +1 @@ +L3CODE:0=cffff;1=cffff diff --git a/tests/virresctrldata/L3DATA-free.schemata b/tests/virresctrldata/L3DATA-free.schemata new file mode 100644 index 0000000..30f1cbd --- /dev/null +++ b/tests/virresctrldata/L3DATA-free.schemata @@ -0,0 +1 @@ +L3DATA:0=3ffff;1=3ffff diff --git a/tests/virresctrltest.c b/tests/virresctrltest.c new file mode 100644 index 0000000..4926468 --- /dev/null +++ b/tests/virresctrltest.c @@ -0,0 +1,117 @@ +/* + * Copyright (C) Intel, Inc. 2017 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Eli Qiao <liyong.qiao(a)intel.com> + */ + +#include <config.h> +#include <stdlib.h> + +#include "testutils.h" +#include "virbitmap.h" +#include "virfilemock.h" +#include "virresctrl.h" + + +#define VIR_FROM_THIS VIR_FROM_NONE + +struct virResctrlData { + const char *filename; + virResctrlType type; +}; + +static void +GetSchemataStr(virResctrlSchemataPtr schemata, char **str) +{ + size_t i; + virBuffer buf = VIR_BUFFER_INITIALIZER; + virBufferAsprintf(&buf, "%s:%u=%x", + virResctrlTypeToString(schemata->type), + schemata->schemata_items[0]->cache_id, + schemata->schemata_items[0]->schemata); + + for (i = 1; i < schemata->n_schemata_items; i ++) + virBufferAsprintf(&buf, ";%u=%x", + schemata->schemata_items[i]->cache_id, + schemata->schemata_items[i]->schemata); + + *str = virBufferContentAndReset(&buf); +} + +static int +test_virResctrl(const void *opaque) +{ + struct virResctrlData *data = (struct virResctrlData *) opaque; + char *dir = NULL; + char *resctrl = NULL; + int ret = -1; + virResctrlSchemataPtr schemata = NULL; + char *schemata_str; + char *schemata_file; + + if (virAsprintf(&resctrl, "%s/virresctrldata/linux-%s/resctrl", + abs_srcdir, data->filename) < 0) + goto cleanup; + + if (virAsprintf(&schemata_file, "%s/virresctrldata/%s-free.schemata", + abs_srcdir, virResctrlTypeToString(data->type)) < 0) + goto cleanup; + + virFileMockAddPrefix("/sys/fs/resctrl", resctrl); + + if (virResctrlGetFreeCache(data->type, &schemata) < 0) + goto cleanup; + + GetSchemataStr(schemata, &schemata_str); + + if (virTestCompareToFile(schemata_str, schemata_file) < 0) + goto cleanup; + + virFileMockClearPrefixes(); + + ret = 0; + + cleanup: + VIR_FREE(dir); + VIR_FREE(resctrl); + VIR_FREE(schemata_str); + virResctrlFreeSchemata(schemata); + return ret; +} + +static int +mymain(void) +{ + int ret = 0; + +#define DO_TEST_FULL(filename, type) \ + do { \ + struct virResctrlData data = {filename, \ + type}; \ + if (virTestRun(filename, test_virResctrl, &data) < 0) \ + ret = -1; \ + } while (0) + + DO_TEST_FULL("resctrl", VIR_RESCTRL_TYPE_L3); + DO_TEST_FULL("resctrl-cdp", VIR_RESCTRL_TYPE_L3_CODE); + DO_TEST_FULL("resctrl-cdp", VIR_RESCTRL_TYPE_L3_DATA); + + return ret; +} + +VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virnumamock.so") -- 1.9.1

3 3

[libvirt] Making panic great again
by Ed Swierk 02 May '17

02 May '17

The panic device is currently documented as a way for "libvirt to receive panic notification from a QEMU guest". This is true, but not the whole story. When a guest triggers the panic device, QEMU pauses the guest, and libvirt takes the action specified by on_crash. This can interfere with the guest's own crash handling actions (e.g. writing a dump file and rebooting itself) if the guest triggers the panic device first (as Windows does). None of this is an obvious side effect of a notification mechanism, so the panic device documentation should mention it. (I'll send a documentation patch shortly.) Nor is this a desirable side effect, for guests that are configured to deal with crashes themselves. Sure, you can avoid using the panic device with such guests, but then virsh list or another application using the libvirt API to monitor domain state won't notice guest crashes. And if you still want libvirt to take action on guests that don't do it themselves, then you have to be careful to include the panic device only for those domains. Ideally libvirt would offer (1) a state indicating "this guest crashed and needs help" independently of triggering an action, and (2) a way to trigger an action only when needed to recover from the crash, excluding guests that deal with their own crashes. Sadly pvpanic and the HyperV crash MSR convey only that the guest crashed, not whether the guest is configured to take some action on its own. So there's no way to know precisely that a crashed (and not paused) guest is in need of assistance. But a state indicating "this guest crashed N minutes ago and hasn't rebooted itself" would be a useful approximation. And triggering an action N minutes after a guest crash if it hasn't rebooted itself in the meantime would make it easy to cap the downtime of crashed domains. Both could be implemented without changing either QEMU or panic device semantics. Does this seem useful to anyone else? --Ed

4 7

[libvirt] [PATCH] virsh-domain-monitor: add human readable output for 'domblkinfo'.
by Julio Faracco 02 May '17

02 May '17

The virsh command 'domblkinfo' returns the capacity, allocation and phisycal size of the devices attached in a domain. Usually, this sizes are very big and hard to understand and calculate. This commits introduce a human readable support to check the size of each field easilly. For example, the command today: virsh # domblkinfo my_domain hda Capacity: 21474836480 Allocation: 14875545600 Physical: 21474836480 After this patch: virsh # domblkinfo my_domain hda --human Capacity: 20.0G Allocation: 13.9G Physical: 20.0G This commit supports Bytes, KiB and MiB too. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1330940 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- tools/virsh-domain-monitor.c | 41 ++++++++++++++++++++++++++++++++++++++--- tools/virsh.pod | 5 +++-- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 3db4795..755d740 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -396,6 +396,10 @@ static const vshCmdOptDef opts_domblkinfo[] = { .flags = VSH_OFLAG_REQ, .help = N_("block device") }, + {.name = "human", + .type = VSH_OT_BOOL, + .help = N_("Human readable output") + }, {.name = NULL} }; @@ -405,6 +409,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) virDomainBlockInfo info; virDomainPtr dom; bool ret = false; + bool human = false; const char *device = NULL; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) @@ -416,9 +421,39 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) if (virDomainGetBlockInfo(dom, device, &info, 0) < 0) goto cleanup; - vshPrint(ctl, "%-15s %llu\n", _("Capacity:"), info.capacity); - vshPrint(ctl, "%-15s %llu\n", _("Allocation:"), info.allocation); - vshPrint(ctl, "%-15s %llu\n", _("Physical:"), info.physical); + human = vshCommandOptBool(cmd, "human"); + + if (!human) { + vshPrint(ctl, "%-15s %llu\n", _("Capacity:"), info.capacity); + vshPrint(ctl, "%-15s %llu\n", _("Allocation:"), info.allocation); + vshPrint(ctl, "%-15s %llu\n", _("Physical:"), info.physical); + } else { + double sizeCapacity = 1; + const char *sizeStr = "B"; + + /* Check if capacity can be in K. */ + if (info.capacity >= 1024) { + sizeCapacity = 1024.0; + sizeStr = "K"; + } + /* Check if capacity can be in M. */ + if (info.capacity >= 1048576) { + sizeCapacity = 1048576.0; + sizeStr = "M"; + } + /* Check if capacity can be in G. */ + if (info.capacity >= 1073741824) { + sizeCapacity = 1073741824.0; + sizeStr = "G"; + } + + vshPrint(ctl, "%-15s %.1f%s\n", _("Capacity:"), + info.capacity/sizeCapacity, sizeStr); + vshPrint(ctl, "%-15s %.1f%s\n", _("Allocation:"), + info.allocation/sizeCapacity, sizeStr); + vshPrint(ctl, "%-15s %.1f%s\n", _("Physical:"), + info.physical/sizeCapacity, sizeStr); + } ret = true; diff --git a/tools/virsh.pod b/tools/virsh.pod index e16f62f..9f67de2 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -841,12 +841,13 @@ B<domstate> command says that a domain was paused due to I/O error. The B<domblkerror> command lists all block devices in error state and the error seen on each of them. -=item B<domblkinfo> I<domain> I<block-device> +=item B<domblkinfo> I<domain> I<block-device> [I<--human>] Get block device size info for a domain. A I<block-device> corresponds to a unique target name (<target dev='name'/>) or source file (<source file='name'/>) for one of the disk devices attached to I<domain> (see -also B<domblklist> for listing these names). +also B<domblklist> for listing these names). If I<--human> is set, the +output will have a human readable design. =item B<domblklist> I<domain> [I<--inactive>] [I<--details>] -- 2.7.4

2 1

[libvirt] [PATCH] qemu: Adding 'downscript' feature for QEMU network interfaces.
by Julio Faracco 01 May '17

01 May '17

This commit adds the support for 'downscript' feature: - For QEMU command line with the option: '-net downscript=/etc/qemu-ifdown,...'. - For Domains with a network interface description: '<interface type='ethernet'> ... <downscript path='/etc/qemu-ifdown'/> ... </interface>' The options 'script' and 'downscript' accept the argument 'no' to disable the script executions. The way that the code was implemented, the XML file accepts '<[down]script path='no'>' to solve this problem. This commit updates the tests too. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=825939 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- docs/schemas/domaincommon.rng | 8 ++++++++ src/conf/domain_conf.c | 13 +++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_parse_command.c | 4 ++++ tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args | 2 +- tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml | 1 + tests/qemuargv2xmldata/qemuargv2xml-net-eth.args | 2 +- tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 1 + tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml | 1 + tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml | 1 + 12 files changed, 34 insertions(+), 2 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 281309e..2f88dda 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2609,6 +2609,14 @@ </element> </optional> <optional> + <element name="downscript"> + <attribute name="path"> + <ref name="filePath"/> + </attribute> + <empty/> + </element> + </optional> + <optional> <element name="backenddomain"> <attribute name="name"> <ref name="domainName"/> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0ff216e..32d5720 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1935,6 +1935,7 @@ virDomainNetDefClear(virDomainNetDefPtr def) VIR_FREE(def->backend.vhost); VIR_FREE(def->virtPortProfile); VIR_FREE(def->script); + VIR_FREE(def->downscript); VIR_FREE(def->domain_name); VIR_FREE(def->ifname); VIR_FREE(def->ifname_guest); @@ -9589,6 +9590,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, char *ifname_guest = NULL; char *ifname_guest_actual = NULL; char *script = NULL; + char *downscript = NULL; char *address = NULL; char *port = NULL; char *localaddr = NULL; @@ -9761,6 +9763,9 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, } else if (!script && xmlStrEqual(cur->name, BAD_CAST "script")) { script = virXMLPropString(cur, "path"); + } else if (!downscript && + xmlStrEqual(cur->name, BAD_CAST "downscript")) { + downscript = virXMLPropString(cur, "path"); } else if (!domain_name && xmlStrEqual(cur->name, BAD_CAST "backenddomain")) { domain_name = virXMLPropString(cur, "name"); @@ -10074,6 +10079,10 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, def->script = script; script = NULL; } + if (downscript != NULL) { + def->downscript = downscript; + downscript = NULL; + } if (domain_name != NULL) { def->domain_name = domain_name; domain_name = NULL; @@ -10356,6 +10365,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_FREE(dev); virDomainActualNetDefFree(actual); VIR_FREE(script); + VIR_FREE(downscript); VIR_FREE(bridge); VIR_FREE(model); VIR_FREE(backend); @@ -22158,6 +22168,9 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferEscapeString(buf, "<script path='%s'/>\n", def->script); + if (def->downscript) + virBufferEscapeString(buf, "<downscript path='%s'/>\n", + def->downscript); virBufferEscapeString(buf, "<backenddomain name='%s'/>\n", def->domain_name); if (def->ifname && diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 09fb7aa..9deca76 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1024,6 +1024,7 @@ struct _virDomainNetDef { unsigned long sndbuf; } tune; char *script; + char *downscript; char *domain_name; /* backend domain name */ char *ifname; /* interface name on the host (<target dev='x'/>) */ virNetDevIPInfo hostIP; diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index af9063c..d773917 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -1060,6 +1060,10 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt, def->script = values[i]; values[i] = NULL; } else if (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET && + STREQ(keywords[i], "downscript") && STRNEQ(values[i], "")) { + def->downscript = values[i]; + values[i] = NULL; + } else if (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET && STREQ(keywords[i], "ifname")) { def->ifname = values[i]; values[i] = NULL; diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args b/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args index 4d74ae4..5d7129c 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args +++ b/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args @@ -18,6 +18,6 @@ QEMU_AUDIO_DRV=none \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139,name=net0 \ --net tap,ifname=nic02,script=/etc/qemu-ifup,vlan=0,name=hostnet0 \ +-net tap,ifname=nic02,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown,vlan=0,name=hostnet0 \ -serial none \ -parallel none diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml b/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml index fa9a892..8e04efb 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml @@ -30,6 +30,7 @@ <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> <script path='/etc/qemu-ifup'/> + <downscript path='/etc/qemu-ifdown'/> <target dev='nic02'/> <model type='rtl8139'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth.args b/tests/qemuargv2xmldata/qemuargv2xml-net-eth.args index 89eb4c1..0e3fa21 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-net-eth.args +++ b/tests/qemuargv2xmldata/qemuargv2xml-net-eth.args @@ -18,6 +18,6 @@ QEMU_AUDIO_DRV=none \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139,name=net0 \ --net tap,script=/etc/qemu-ifup,vlan=0,name=hostnet0 \ +-net tap,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown,vlan=0,name=hostnet0 \ -serial none \ -parallel none diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml b/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml index 57c4be8..d177ca8 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml @@ -30,6 +30,7 @@ <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> <script path='/etc/qemu-ifup'/> + <downscript path='/etc/qemu-ifdown'/> <model type='rtl8139'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml index dd0d752..21d8259 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml @@ -26,6 +26,7 @@ <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> <script path='/etc/qemu-ifup'/> + <downscript path='/etc/qemu-ifdown'/> <target dev='nic02'/> <model type='rtl8139'/> </interface> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml index 48acadf..9f40122 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml @@ -26,6 +26,7 @@ <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> <script path='/etc/qemu-ifup'/> + <downscript path='/etc/qemu-ifdown'/> <model type='rtl8139'/> </interface> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml index c36baa0..b71fd5a 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml @@ -30,6 +30,7 @@ <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> <script path='/etc/qemu-ifup'/> + <downscript path='/etc/qemu-ifdown'/> <target dev='nic02'/> <model type='rtl8139'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml index 898bda6..c55cd68 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml @@ -30,6 +30,7 @@ <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> <script path='/etc/qemu-ifup'/> + <downscript path='/etc/qemu-ifdown'/> <model type='rtl8139'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> -- 2.7.4

1 1

[libvirt] [PATCHv3 0/6] Support more options for intel-iommu
by Ján Tomko 28 Apr '17

28 Apr '17

[Adding Peter Xu to cc to see if he has any opinion on the docs] https://bugzilla.redhat.com/show_bug.cgi?id=1427005 v1: https://www.redhat.com/archives/libvir-list/2017-March/msg01072.html v2: https://www.redhat.com/archives/libvir-list/2017-April/msg00932.html new in v3: * add more devices to qemuxml2argv-intel-iommu-caching.xml to check the ordering (intel-iommu should come before other devices) * fix the capability clustering Ján Tomko (6): conf: add <irqchip mode> to <features> qemu: format kernel_irqchip on the command line conf: add <driver intremap> to <iommu> qemu: format intremap= on intel-iommu command line conf: add caching attribute to iommu device qemu: format caching-mode on iommu command line docs/formatdomain.html.in | 41 +++++++++- docs/schemas/domaincommon.rng | 30 ++++++++ src/conf/domain_conf.c | 90 ++++++++++++++++++++-- src/conf/domain_conf.h | 14 ++++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 13 ++++ src/qemu/qemu_capabilities.h | 5 ++ src/qemu/qemu_command.c | 40 ++++++++++ tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 22 ++++-- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 24 ++++-- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 24 ++++-- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 28 +++++-- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 37 +++++++-- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 + .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 49 +++++++++--- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 3 + .../qemuxml2argv-intel-iommu-caching.args | 25 ++++++ .../qemuxml2argv-intel-iommu-caching.xml | 50 ++++++++++++ .../qemuxml2argv-intel-iommu-irqchip.args | 19 +++++ .../qemuxml2argv-intel-iommu-irqchip.xml | 31 ++++++++ tests/qemuxml2argvtest.c | 16 ++++ .../qemuxml2xmlout-intel-iommu-caching.xml | 1 + .../qemuxml2xmlout-intel-iommu-irqchip.xml | 1 + tests/qemuxml2xmltest.c | 2 + 37 files changed, 533 insertions(+), 49 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-irqchip.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-irqchip.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-irqchip.xml -- 2.10.2

4 14

[libvirt] [PATCH] docs: Add details about panic device behavior
by Ed Swierk 28 Apr '17

28 Apr '17

When a guest triggers the panic device, QEMU pauses the guest, and libvirt takes the action specified by on_crash. This can interfere with the guest's own crash handling actions (like writing a dump file and rebooting itself) if the guest triggers the panic device first (as Windows does via the Hyper-V crash CPU feature). This is not an obvious side effect of a notification mechanism, so it's worth explaining. Signed-off-by: Ed Swierk <eswierk(a)skyportsystems.com> --- docs/formatdomain.html.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index e31a271..1c5fdb9 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -7078,7 +7078,11 @@ qemu-kvm -net nic,model=? /dev/null <h4><a name="elementsPanic">panic device</a></h4> <p> panic device enables libvirt to receive panic notification from a QEMU - guest. + guest. When the guest triggers the panic device, QEMU pauses the guest, and + libvirt takes the action specified by the <code>on_crash</code> element. + Note that this may interfere with the guest's own crash handling actions + (like writing a dump file and rebooting itself) if the guest triggers the + panic device first (as Windows does via the Hyper-V crash CPU feature). <span class="since">Since 1.2.1, QEMU and KVM only</span> </p> <p> -- 1.9.1

1 0

[libvirt] [PATCH] news: Document libxl nested HVM support
by Jim Fehlig 28 Apr '17

28 Apr '17

Nested HVM support in the libxl driver is a news-worthy improvement for libvirt 3.3.0. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- docs/news.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 1f558451f..5dc8403b4 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -48,6 +48,17 @@ ease handling such breaks if they happen in the future. </description> </change> + <change> + <summary> + Add support for nested HVM domains in the libxl driver. + </summary> + <description> + Xen has supported nested HVM domains since version 4.4. The + libvirt libxl driver now supports nested HVM domains by + specifying the host-passthrough CPU mode when defining a + domain. + </description> + </change> </section> <section title="Bug fixes"> </section> -- 2.11.0

3 4

[libvirt] [PATCH] conf: format only relevant attributes for graphics based on listen type
by Pavel Hrdina 28 Apr '17

28 Apr '17

This patch changes following output: ... <graphics type='vnc' port='-1' autoport='yes'> <listen type='none'/> </graphics> ... into this output: ... <graphics type='vnc'> <listen type='none'/> </graphics> ... Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/domain_conf.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fe9b7c7273..88bcd6c052 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -23297,7 +23297,8 @@ virDomainGraphicsDefFormat(virBufferPtr buf, return -1; } - if (glisten->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET) { + switch (glisten->type) { + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: /* To not break migration we shouldn't print the 'socket' attribute * if it's auto-generated or if it's based on config option from * qemu.conf. If the socket is provided by user we need to print it @@ -23307,7 +23308,10 @@ virDomainGraphicsDefFormat(virBufferPtr buf, (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE))) { virBufferEscapeString(buf, " socket='%s'", glisten->socket); } - } else { + break; + + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: if (def->data.vnc.port && (!def->data.vnc.autoport || !(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE))) virBufferAsprintf(buf, " port='%d'", @@ -23325,6 +23329,10 @@ virDomainGraphicsDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " websocket='%d'", def->data.vnc.websocket); virDomainGraphicsListenDefFormatAddr(buf, glisten, flags); + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: + break; } if (def->data.vnc.keymap) -- 2.12.2

2 1

[libvirt] [PATCH v2 0/3] conf: don't ignore <target dev='blah'/> for macvtap interfaces
by Laine Stump 28 Apr '17

28 Apr '17

The parser had been clearing out *all* suggested device names for type='direct' (aka macvtap) interfaces. All of the code implementing macvtap allows for a user-specified device name, so we should allow it. In the case that an interface name starts with "macvtap" or "macvlan" though, we do still clear it out, just as we do with "vnet" (which is the prefix used for automatically generated tap device names), since those are the prefixes for the names we autogenerate for macvtap and macvlan devices. Resolves: https://bugzilla.redhat.com/1335798 Changes since V1: * make a single #define for each of MACVLAN_PREFIX and MACVTAP_PREFIX in virnetdevmacvlan.h rather than duplicating #defines from virnetdevmacvlan.c into domain_conf.h (as suggested by Martin * move/rename the auto-generated prefix for regular tap devices to be consistent with the macvtap/macvlan prefixes. Laine Stump (3): util: make macvtap/macvlan generated name #defines available to other files conf: don't ignore <target dev='blah'/> for macvtap interfaces util: rename/move VIR_NET_GENERATED_PREFIX to be consistent docs/formatdomain.html.in | 6 ++-- src/bhyve/bhyve_command.c | 4 +-- src/conf/domain_conf.c | 11 ++++-- src/conf/domain_conf.h | 4 --- src/interface/interface_backend_udev.c | 2 +- src/qemu/qemu_interface.c | 8 ++--- src/uml/uml_conf.c | 4 +-- src/util/virnetdev.h | 5 +++ src/util/virnetdevmacvlan.c | 65 ++++++++++++++-------------------- src/util/virnetdevmacvlan.h | 6 ++++ 10 files changed, 57 insertions(+), 58 deletions(-) -- 2.9.3

2 5

[libvirt] [PATCH v2 0/5] add support for qemu-xhci USB controller
by Pavel Hrdina 28 Apr '17

28 Apr '17

Pavel Hrdina (5): qemu: change the logic of setting default USB controller qemu: use nec-usb-xhci as a default controller for aarch64 if available qemu: introduce QEMU_CAPS_DEVICE_QEMU_XHCI qemu: add support for qemu-xhci USB controller qemu: use qemu-xhci USB controller by default for ppc64 and aarch64 docs/formatdomain.html.in | 4 +- docs/schemas/domaincommon.rng | 1 + src/conf/domain_addr.c | 1 + src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 8 +++- src/qemu/qemu_domain.c | 47 ++++++++++++++-------- src/qemu/qemu_domain_address.c | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + ...muxml2argv-aarch64-usb-controller-nec-xhci.args | 19 +++++++++ ...emuxml2argv-aarch64-usb-controller-nec-xhci.xml | 16 ++++++++ ...uxml2argv-aarch64-usb-controller-qemu-xhci.args | 19 +++++++++ ...muxml2argv-aarch64-usb-controller-qemu-xhci.xml | 16 ++++++++ ...emuxml2argv-ppc64-usb-controller-qemu-xhci.args | 19 +++++++++ ...qemuxml2argv-ppc64-usb-controller-qemu-xhci.xml | 1 + ...qemuxml2argv-usb-controller-qemu-xhci-limit.xml | 14 +++++++ ...l2argv-usb-controller-qemu-xhci-unavailable.xml | 1 + .../qemuxml2argv-usb-controller-qemu-xhci.args | 19 +++++++++ .../qemuxml2argv-usb-controller-qemu-xhci.xml | 14 +++++++ tests/qemuxml2argvtest.c | 15 +++++++ 22 files changed, 201 insertions(+), 20 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-usb-controller-nec-xhci.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-usb-controller-nec-xhci.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-usb-controller-qemu-xhci.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-usb-controller-qemu-xhci.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-qemu-xhci.args create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-qemu-xhci.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci-limit.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci-unavailable.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci.xml -- 2.12.2

2 17

[libvirt] [PATCH v2 0/2] don't kill qemu process on restart if networkNotify fails
by Laine Stump 28 Apr '17

28 Apr '17

John thought I didn't go far enough in my removal of return codes in V1... Laine Stump (2): qemu: don't kill qemu process on restart if networkNotify fails network: better log message when network is inactive during reconnect src/network/bridge_driver.c | 17 +++++++++++------ src/network/bridge_driver.h | 7 +++---- src/qemu/qemu_process.c | 9 +++------ 3 files changed, 17 insertions(+), 16 deletions(-) -- 2.9.3

2 3

[libvirt] [PATCH v4 0/3] libxl: nestedhvm support
by Wim Ten Have 27 Apr '17

27 Apr '17

From: Wim ten Have <wim.ten.have(a)oracle.com> This patch enhances host-passthrough capability to advertise the required vendor CPU virtualization feature which will be used to enable 'nestedhvm' in the libxl driver. Wim ten Have (3): libxl: set nestedhvm for mode host-passthrough xenconfig: add conversions for xen-xl xlconfigtest: add tests for 'nestedhvm' support cfg.mk | 4 +- src/libxl/libxl_conf.c | 39 ++++++++++- src/libxl/libxl_conf.h | 1 + src/libxl/libxl_domain.c | 2 +- src/xenconfig/xen_xl.c | 76 ++++++++++++++++++++++ tests/testutilsxen.c | 30 +++++++++ .../test-fullvirt-nestedhvm-disabled.cfg | 26 ++++++++ .../test-fullvirt-nestedhvm-disabled.xml | 61 +++++++++++++++++ tests/xlconfigdata/test-fullvirt-nestedhvm.cfg | 26 ++++++++ tests/xlconfigdata/test-fullvirt-nestedhvm.xml | 59 +++++++++++++++++ tests/xlconfigtest.c | 2 + 11 files changed, 322 insertions(+), 4 deletions(-) create mode 100644 tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.xml create mode 100644 tests/xlconfigdata/test-fullvirt-nestedhvm.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-nestedhvm.xml -- 2.9.3

2 5

[libvirt] [PATCH 0/4] qemu: process: Fix memleaks on VM restart
by Peter Krempa 27 Apr '17

27 Apr '17

Few leaks with automatic pinning, USB addresses and TLS migration, since the private data structure needs to be cleared manually in qemuProcessStop. Peter Krempa (4): qemu: process: Clean automatic NUMA/cpu pinning information on shutdown qemu: process: Don't leak priv->usbaddrs after VM restart qemu: process: Clean up priv->migTLSAlias qemu: Move freeing of PCI address list to qemuProcessStop src/qemu/qemu_domain_address.c | 1 - src/qemu/qemu_process.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) -- 2.12.2

2 5

[libvirt] [PATCH] qemu: Don't fail if physical size can't be updated in qemuDomainGetBlockInfo
by Peter Krempa 27 Apr '17

27 Apr '17

Since commit c5f6151390 qemuDomainBlockInfo tries to update the "physical" storage size for all network storage and not only block devices. Since the storage driver APIs to do this are not implemented for certain storage types (RBD, iSCSI, ...) the code would fail to retrieve any data since the failure of qemuDomainStorageUpdatePhysical is fatal. Since it's desired to return data even if the total size can't be updated we need to ignore errors from that fucntion and return plausible data. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1442344 --- Notes: This function will require more fixing though. This is just a bandaid to remove the regression. I'll post other patches as follow up later. src/qemu/qemu_driver.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e39de625d..8ff242597 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11553,10 +11553,12 @@ qemuDomainGetBlockInfo(virDomainPtr dom, if (info->allocation == 0) info->allocation = entry->physical; - if (qemuDomainStorageUpdatePhysical(driver, cfg, vm, disk->src) < 0) - goto endjob; - - info->physical = disk->src->physical; + if (qemuDomainStorageUpdatePhysical(driver, cfg, vm, disk->src) == 0) { + info->physical = disk->src->physical; + } else { + virResetLastError(); + info->physical = entry->physical; + } } else { info->physical = entry->physical; } -- 2.12.2

2 2

[libvirt] [PATCH 00/14] network schema refactor and addition of cookies for http disks
by Peter Krempa 27 Apr '17

27 Apr '17

Peter Krempa (14): docs: schemas: Remove <interleave> from file/block/dir/volume disks docs: schemas: Extract disk source host specification docs: schemas: Move the interleave definition into network disk source docs: schemas: Extract RBD-specific data docs: schemas: Extract HTTP disk source specification docs: schemas: Split out simple network protocols docs: schemas: Split up definitions for NBD and gluster conf: Extract formatting of network disk source into separate function tests: genericxml2xml: Add test case for HTTP based disk util: string: Introduce virStringHasChars conf: Add support for cookies for HTTP based disks qemu: command: Use switch to formatting additional network disk params qemu: capabilities: Add capability for the new curl driver options qemu: command: Add support for HTTP cookies docs/formatdomain.html.in | 9 + docs/schemas/domaincommon.rng | 316 +++++++++++++-------- src/conf/domain_conf.c | 205 ++++++++++--- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 48 +++- src/util/virstoragefile.c | 124 ++++++++ src/util/virstoragefile.h | 14 + src/util/virstring.c | 23 +- src/util/virstring.h | 2 + .../generic-disk-network-http.xml | 48 ++++ tests/genericxml2xmltest.c | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../qemuxml2argv-disk-drive-network-http.args | 32 +++ .../qemuxml2argv-disk-drive-network-http.xml | 48 ++++ tests/qemuxml2argvtest.c | 1 + 16 files changed, 701 insertions(+), 174 deletions(-) create mode 100644 tests/genericxml2xmlindata/generic-disk-network-http.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-http.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-http.xml -- 2.12.2

3 31

[libvirt] [PATCH 0/3] qemu: Allow turing of SSL verification for https/ftps drives
by Peter Krempa 27 Apr '17

27 Apr '17

This is a followup to the qemu cookie series and should be applied on top of it. Since I already fixed a few things in the original series this would not apply cleanly, thus you can fetch it at: git fetch git://pipo.sk/pipo/libvirt.git qemu-ssl-verify-off Peter Krempa (3): conf: Use only one temporary string in virDomainDiskSourceParse conf: Add support for modifying ssl validation for https/ftps disks qemu: command: Implement ssl verification configuration docs/formatdomain.html.in | 9 ++++ docs/schemas/domaincommon.rng | 50 +++++++++++++++++++++- src/conf/domain_conf.c | 34 ++++++++++++--- src/qemu/qemu_command.c | 27 +++++++++++- src/util/virstoragefile.h | 1 + .../generic-disk-network-http.xml | 2 + .../qemuxml2argv-disk-drive-network-http.args | 2 +- .../qemuxml2argv-disk-drive-network-http.xml | 1 + 8 files changed, 114 insertions(+), 12 deletions(-) -- 2.12.2

1 3

[libvirt] [PATCH 0/3] add support for qemu-xhci USB controller
by Pavel Hrdina 27 Apr '17

27 Apr '17

Pavel Hrdina (3): qemu: introduce QEMU_CAPS_DEVICE_QEMU_XHCI qemu: add support for qemu-xhci USB controller qemu: use qemu-xhci USB controller by default for ppc64 and aarch64 docs/formatdomain.html.in | 2 +- docs/schemas/domaincommon.rng | 1 + src/conf/domain_addr.c | 1 + src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 8 +++++-- src/qemu/qemu_domain.c | 25 ++++++++++++++------ src/qemu/qemu_domain_address.c | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + ...uxml2argv-aarch64-usb-controller-qemu-xhci.args | 20 ++++++++++++++++ ...muxml2argv-aarch64-usb-controller-qemu-xhci.xml | 27 ++++++++++++++++++++++ ...emuxml2argv-ppc64-usb-controller-qemu-xhci.args | 19 +++++++++++++++ ...qemuxml2argv-ppc64-usb-controller-qemu-xhci.xml | 1 + ...qemuxml2argv-usb-controller-qemu-xhci-limit.xml | 15 ++++++++++++ ...l2argv-usb-controller-qemu-xhci-unavailable.xml | 15 ++++++++++++ .../qemuxml2argv-usb-controller-qemu-xhci.args | 19 +++++++++++++++ .../qemuxml2argv-usb-controller-qemu-xhci.xml | 15 ++++++++++++ tests/qemuxml2argvtest.c | 12 ++++++++++ 20 files changed, 177 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-usb-controller-qemu-xhci.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-usb-controller-qemu-xhci.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-qemu-xhci.args create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-qemu-xhci.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci-limit.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci-unavailable.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci.xml -- 2.12.2

4 14

[libvirt] [PATCH 0/2] Report VIR_DOMAIN_JOB_OPERATION in job stats
by Jiri Denemark 27 Apr '17

27 Apr '17

As agreed in [1] we should enhance job statistics returned by virDomainGetJobStats API and VIR_DOMAIN_EVENT_ID_JOB_COMPLETED event with a new typed parameter which would indicate what operation (migration, snapshot, ...) the reported statistics belong to. https://bugzilla.redhat.com/show_bug.cgi?id=1441563 [1] https://www.redhat.com/archives/libvir-list/2017-April/msg00540.html Jiri Denemark (2): Add VIR_DOMAIN_JOB_OPERATION typed parameter qemu: Report VIR_DOMAIN_JOB_OPERATION include/libvirt/libvirt-domain.h | 25 +++++++++++++++++++++++++ src/qemu/qemu_domain.c | 16 +++++++++++++--- src/qemu/qemu_domain.h | 4 +++- src/qemu/qemu_driver.c | 32 ++++++++++++++++++++++---------- src/qemu/qemu_migration.c | 19 ++++++++++++------- src/qemu/qemu_process.c | 6 ++++-- src/qemu/qemu_process.h | 3 ++- tools/virsh-domain.c | 29 +++++++++++++++++++++++++++++ 8 files changed, 110 insertions(+), 24 deletions(-) -- 2.12.2

2 4

[libvirt] [PATCH 0/2] don't kill qemu process on restart if networkNotify fails
by Laine Stump 27 Apr '17

27 Apr '17

The individual patches explain themselves. Laine Stump (2): qemu: don't kill qemu process on restart if networkNotify fails network: better log message when network is inactive during reconnect src/network/bridge_driver.c | 7 +++++++ src/qemu/qemu_process.c | 9 +++------ 2 files changed, 10 insertions(+), 6 deletions(-) -- 2.9.3

2 8

[libvirt] [PATCH 0/4] Couple of trivial c89 style fixes
by Michal Privoznik 27 Apr '17

27 Apr '17

*** BLURB HERE *** BLURB Michal Privoznik (4): examples: Properly include getopt.h vmwarevertest: drop VIR_FROM_THIS definition lib: Fix c99 style comments cpu: Avoid c99 style of assembler examples/admin/logging.c | 14 +++++++------- examples/openauth/openauth.c | 2 +- src/cpu/cpu_ppc64.c | 4 ++-- src/cpu/cpu_x86.c | 44 +++++++++++++++++++++---------------------- src/lxc/lxc_controller.c | 2 +- src/remote/remote_driver.c | 2 +- src/rpc/virnetservermdns.c | 2 +- src/security/security_stack.c | 8 ++++---- src/uml/uml_conf.c | 2 +- src/util/virhostcpu.c | 4 ++-- src/util/virhostmem.c | 4 ++-- src/vbox/vbox_snapshot_conf.c | 2 +- tests/eventtest.c | 2 +- tests/virhostcpumock.c | 2 +- tests/vmwarevertest.c | 2 -- 15 files changed, 47 insertions(+), 49 deletions(-) -- 2.10.2

3 14

[libvirt] [PATCH v2 0/3] Cleanup messages after hotplug of scsi hostdev
by Eric Farman 27 Apr '17

27 Apr '17

v1 was here: https://www.redhat.com/archives/libvir-list/2017-April/msg01066.html Per review, removed the "internal error" messages and split the resulting patch into patches 2 (virtio-scsi) and 3 (vhost-scsi). Patch 1 fixes a return code check that is a little off. Eric Farman (3): qemu: Check return code from qemuHostdevPrepareSCSIDevices qemu: Remove extra messages from virtio-scsi hotplug qemu: Remove extra messages for vhost-scsi hotplug src/qemu/qemu_hotplug.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) -- 1.9.1

2 4

[libvirt] [PATCH 0/2] qemu: migration: bugfixes for cancelling drive mirror
by Nikolay Shirokovskiy 27 Apr '17

27 Apr '17

Nikolay Shirokovskiy (2): qemu: take current async job into account in qemuBlockNodeNamesDetect qemu: migration: fix race on cancelling drive mirror src/qemu/qemu_block.c | 6 ++++-- src/qemu/qemu_block.h | 4 +++- src/qemu/qemu_blockjob.c | 9 ++++++--- src/qemu/qemu_blockjob.h | 4 ++++ src/qemu/qemu_driver.c | 11 ++++++----- src/qemu/qemu_migration.c | 43 +++++++++++++++++++++++++++++++------------ src/qemu/qemu_process.c | 2 +- 7 files changed, 55 insertions(+), 24 deletions(-) -- 1.8.3.1

2 5

Re: [libvirt] [PATCH v3] Add support for Veritas HyperScale (VxHS) block device protocol
by ashish mittal 27 Apr '17

27 Apr '17

Hi, I'm trying to figure out what changes are needed in the libvirt vxhs patch to support passing TLS X509 arguments to qemu, similar to the following - Sample QEMU command line passing TLS credentials to the VxHS block device (run in secure mode): ./qemu-io --object tls-creds-x509,id=tls0,dir=/etc/pki/qemu/vxhs,endpoint=client -c 'read -v 66000 2.5k' 'json:{"server.host": "127.0.0.1", "server.port": "9999", "vdisk-id": "/test.raw", "driver": "vxhs", "tls-creds":"tls0"}' I was hoping to find some NBD code related to this, but not able to locate it. Any pointers will be appreciated. Thanks, Ashish On Wed, Feb 1, 2017 at 8:36 AM, John Ferlan <jferlan(a)redhat.com> wrote: > [...] > Pressed send too soon, sigh. > > >>>> >>>> #1. Based on Peter's v2 comments, we don't want to support the >>>> older/legacy syntax for VxHS, so it's something that should be removed - >>>> although we should check for it being present and fail if found. >>>> >>> >>> I am testing with changed code to return error if legacy syntax is >>> found for VxHS. Also added a test case to check for failure on legacy >>> syntax and it seems to pass (test #41 below). >>> >>> Then I added a pass test case to check conversion from new native >>> syntax to XML (test #40 below). That test fails with error >>> 'qemuParseCommandLineDisk:901 : internal error: missing file parameter >>> in drive 'file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b...' >> >> The qemu_parse_command.c changes while nice to have weren't even updated >> when multiple gluster servers were added (e.g. commit id '' or '7b7da9e28') >> Check the changes to add the new s >> >> IOW: This code knows how to parse something like: >> >> -drive >> 'file=gluster+unix:///Volume2/Image?socket=/path/to/sock,format=raw,if=none,id=drive-virtio-disk1' >> >> but it's clueless for: >> >> -drive file.driver=gluster,file.volume=Volume3,file.path=/Image.qcow2,\ >> file.server.0.type=tcp,file.server.0.host=example.org,file.server.0.port=6000,\ >> file.server.1.type=tcp,file.server.1.host=example.org,file.server.1.port=24007,\ >> file.server.2.type=unix,file.server.2.socket=/path/to/sock,format=qcow2,\ >> if=none,id=drive-virtio-disk2 \ >> -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,\ >> id=virtio-disk2 >> >> See >>> >>> Looks like none of the existing tests in qemuargv2xmltest test for the >>> parsing of new syntax, and qemuParseCommandLineDisk() expects to find >>> 'file=' for a drive or it errors out. If this is true, will it be able >>> to parse the new syntax? Some help here please! > > So I wouldn't expect the VxHS code to be able to do that unless you > wanted to be adventurous. The good news is that this code is primarily > for developers that need to take a qemu command line to generate the > libvirt syntax. It has not really been kept up to date with all the most > recent command line changes. I started to try over a year ago, but got > very side tracked. > >>> >>> Output from the newly added test cases (40 should pass and 41 checks >>> for error) : >>> >>> 40) QEMU ARGV-2-XML disk-drive-network-vxhs >>> ... Got unexpected warning from qemuParseCommandLineString: >>> 2017-01-28 00:57:30.814+0000: 10391: info : libvirt version: 3.0.0 >>> 2017-01-28 00:57:30.814+0000: 10391: info : hostname: localhost.localdomain >>> 2017-01-28 00:57:30.814+0000: 10391: error : >>> qemuParseCommandLineDisk:901 : internal error: missing file parameter >>> in drive 'file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,id=drive-virtio-disk0,cache=none' >>> libvirt: QEMU Driver error : internal error: missing file parameter in >>> drive 'file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,id=drive-virtio-disk0,cache=none' >>> FAILED >>> >>> 41) QEMU ARGV-2-XML disk-drive-network-vxhs-fail >>> ... Got expected error from qemuParseCommandLineString: >>> libvirt: QEMU Driver error : internal error: VxHS protocol does not >>> support URI syntax >>> 'vxhs://192.168.0.1:9999/eb90327c-8302-4725-9e1b-4e85ed4dc251' >>> OK >>> 42) QEMU ARGV-2-XML disk-usb ... OK >>> >>> >>> >>>> #2. Is the desire to ever support more than 1 host? If not, then is the >>>> "server" syntax you've borrowed from the Gluster code necessary? Could >>>> you just go with the single "host" like NBD and SSH. As it relates to >>>> the qemu command line - I'm not quite as clear. From the example I see >>>> in commit id '7b7da9e28', the gluster syntax would have: >>>> >>> >>> Present understanding is to have only one host. You are right, the >>> "server" part is not necessary. Will have to check with the qemu >>> community on this change. >>> >>>> +file.server.0.type=tcp,file.server.0.host=example.org,file.server.0.port=6000,\ >>>> +file.server.1.type=tcp,file.server.1.host=example.org,file.server.1.port=24007,\ >>>> +file.server.2.type=unix,file.server.2.socket=/path/to/sock,format=qcow2,\ >>>> >>>> whereas, the VxHS syntax is: >>>> +file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\ >>>> >>>> FWIW: I also note there is no ".type=tcp" in your output - so perhaps >>>> the "default" is tcp unless otherwise specified, but I'm sure of the >>>> qemu syntax requirements in this area. I assume that since there's only >>>> 1 server, the ".0, .1, .2" become unnecessary (something added by commit >>>> id 'f1bbc7df4' for multiple gluster hosts). >>>> >>> >>> That's correct. TCP is the default. >>> >>>> I haven't closedly followed the qemu syntax discussion, but it would it >>>> would be possible to use: >>>> >>>> +file.host=192.168.0.1,file.port=9999 >>>> >>> >>> That is correct. Above syntax would also work for us. I will pose this >>> suggestion to the qemu community and update with their response. >>> > > It's not that important... I was looking for a simplification and > generation of only what's required. You can continue using the server > syntax - perhaps just leave a note/comment in the code indicating the > decision point and move on. > > [...] > > John

2 11

[libvirt] [PATCH] qemu: numa: Don't return automatic nodeset for inactive domain
by Peter Krempa 27 Apr '17

27 Apr '17

qemuDomainGetNumaParameters would return the automatic nodeset even for the persistent config if the domain was running. This is incorrect since the automatic nodeset will be re-queried upon starting the vm. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1445325 --- src/qemu/qemu_driver.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e39de625d..1ba3e0943 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9461,6 +9461,8 @@ qemuDomainGetNumaParameters(virDomainPtr dom, char *nodeset = NULL; int ret = -1; virDomainDefPtr def = NULL; + bool live = false; + virBitmapPtr autoNodeset = NULL; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG | @@ -9473,9 +9475,12 @@ qemuDomainGetNumaParameters(virDomainPtr dom, if (virDomainGetNumaParametersEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (!(def = virDomainObjGetOneDef(vm, flags))) + if (!(def = virDomainObjGetOneDefState(vm, flags, &live))) goto cleanup; + if (live) + autoNodeset = priv->autoNodeset; + if ((*nparams) == 0) { *nparams = QEMU_NB_NUMA_PARAM; ret = 0; @@ -9496,8 +9501,7 @@ qemuDomainGetNumaParameters(virDomainPtr dom, break; case 1: /* fill numa nodeset here */ - nodeset = virDomainNumatuneFormatNodeset(def->numa, - priv->autoNodeset, -1); + nodeset = virDomainNumatuneFormatNodeset(def->numa, autoNodeset, -1); if (!nodeset || virTypedParameterAssign(param, VIR_DOMAIN_NUMA_NODESET, VIR_TYPED_PARAM_STRING, nodeset) < 0) -- 2.12.2

2 1

[libvirt] [PATCH] qemu: Properly reset non-p2p migration
by Jiri Denemark 27 Apr '17

27 Apr '17

While peer-to-peer migration enters the Confirm phase even if the Perform phase fails, the client which initiated a non-p2p migration will never call virDomainMigrateConfirm* API if the Perform phase failed. Thus we need to explicitly reset migration before reporting a failure from the Perform phase API. https://bugzilla.redhat.com/show_bug.cgi?id=1425003 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 09adb0484..42da706c9 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4914,10 +4914,13 @@ qemuMigrationPerformPhase(virQEMUDriverPtr driver, goto endjob; endjob: - if (ret < 0) + if (ret < 0) { + qemuMigrationReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT); qemuMigrationJobFinish(driver, vm); - else + } else { qemuMigrationJobContinue(vm); + } + if (!virDomainObjIsActive(vm)) qemuDomainRemoveInactive(driver, vm); -- 2.12.2

2 1

[libvirt] [PATCH] util: Remove unused variate @errbuf in virPCIGetDeviceAddressFromSysfsLink
by Wang King 27 Apr '17

27 Apr '17

From: w00185384 <king.wang(a)huawei.com> Since refactoring by commit id 'a7035662', @errbuf is no longer used. --- src/util/virpci.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index c89b94b..83c7e74 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2618,7 +2618,6 @@ virPCIGetDeviceAddressFromSysfsLink(const char *device_link) virPCIDeviceAddressPtr bdf = NULL; char *config_address = NULL; char *device_path = NULL; - char errbuf[64]; if (!virFileExists(device_link)) { VIR_DEBUG("'%s' does not exist", device_link); @@ -2627,7 +2626,6 @@ virPCIGetDeviceAddressFromSysfsLink(const char *device_link) device_path = canonicalize_file_name(device_link); if (device_path == NULL) { - memset(errbuf, '\0', sizeof(errbuf)); virReportSystemError(errno, _("Failed to resolve device link '%s'"), device_link); -- 2.8.3

2 1

[libvirt] [PATCH] locking: Add support for sanlock_strerror
by Jiri Denemark 27 Apr '17

27 Apr '17

The recently added sanlock_strerror function can be used to translate sanlock's numeric errors into human readable strings. https://bugzilla.redhat.com/show_bug.cgi?id=1409511 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- m4/virt-sanlock.m4 | 7 ++ src/locking/lock_driver_sanlock.c | 154 ++++++++++++++++++++++++++------------ 2 files changed, 115 insertions(+), 46 deletions(-) diff --git a/m4/virt-sanlock.m4 b/m4/virt-sanlock.m4 index e4476cae4..00de7980e 100644 --- a/m4/virt-sanlock.m4 +++ b/m4/virt-sanlock.m4 @@ -61,6 +61,13 @@ AC_DEFUN([LIBVIRT_CHECK_SANLOCK],[ [whether sanlock supports sanlock_write_lockspace]) fi + AC_CHECK_LIB([sanlock_client], [sanlock_strerror], + [sanlock_strerror=yes], [sanlock_strerror=no]) + if test "x$sanlock_strerror" = "xyes" ; then + AC_DEFINE_UNQUOTED([HAVE_SANLOCK_STRERROR], 1, + [whether sanlock supports sanlock_strerror]) + fi + CPPFLAGS="$old_cppflags" LIBS="$old_libs" fi diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 280219f72..b5e69c472 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -97,6 +97,25 @@ struct _virLockManagerSanlockPrivate { bool registered; }; + +static bool +ATTRIBUTE_NONNULL(2) +virLockManagerSanlockError(int err, + char **message) +{ + if (err <= -200) { +#if HAVE_SANLOCK_STRERROR + ignore_value(VIR_STRDUP_QUIET(*message, sanlock_strerror(err))); +#else + ignore_value(virAsprintfQuiet(message, _("sanlock error %d"), err)); +#endif + return true; + } else { + return false; + } +} + + /* * sanlock plugin for the libvirt virLockManager API */ @@ -263,14 +282,17 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriverPtr driver) } if ((rv = sanlock_align(&ls.host_id_disk)) < 0) { - if (rv <= -200) + char *err = NULL; + if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to query sector size %s: error %d"), - path, rv); - else + _("Unable to query sector size %s: %s"), + path, NULLSTR(err)); + VIR_FREE(err); + } else { virReportSystemError(-rv, _("Unable to query sector size %s"), path); + } goto error_unlink; } @@ -292,14 +314,17 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriverPtr driver) } if ((rv = virLockManagerSanlockInitLockspace(driver, &ls) < 0)) { - if (rv <= -200) + char *err = NULL; + if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to initialize lockspace %s: error %d"), - path, rv); - else + _("Unable to initialize lockspace %s: %s"), + path, NULLSTR(err)); + VIR_FREE(err); + } else { virReportSystemError(-rv, _("Unable to initialize lockspace %s"), path); + } goto error_unlink; } VIR_DEBUG("Lockspace %s has been initialized", path); @@ -362,14 +387,17 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriverPtr driver) goto retry; } if (-rv != EEXIST) { - if (rv <= -200) + char *err = NULL; + if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to add lockspace %s: error %d"), - path, rv); - else + _("Unable to add lockspace %s: %s"), + path, NULLSTR(err)); + VIR_FREE(err); + } else { virReportSystemError(-rv, _("Unable to add lockspace %s"), path); + } goto error; } else { VIR_DEBUG("Lockspace %s is already registered", path); @@ -694,14 +722,17 @@ virLockManagerSanlockCreateLease(virLockManagerSanlockDriverPtr driver, } if ((rv = sanlock_align(&res->disks[0])) < 0) { - if (rv <= -200) + char *err = NULL; + if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to query sector size %s: error %d"), - res->disks[0].path, rv); - else + _("Unable to query sector size %s: %s"), + res->disks[0].path, NULLSTR(err)); + VIR_FREE(err); + } else { virReportSystemError(-rv, _("Unable to query sector size %s"), res->disks[0].path); + } goto error_unlink; } @@ -723,14 +754,17 @@ virLockManagerSanlockCreateLease(virLockManagerSanlockDriverPtr driver, } if ((rv = sanlock_init(NULL, res, 0, 0)) < 0) { - if (rv <= -200) + char *err = NULL; + if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to initialize lease %s: error %d"), - res->disks[0].path, rv); - else + _("Unable to initialize lease %s: %s"), + res->disks[0].path, NULLSTR(err)); + VIR_FREE(err); + } else { virReportSystemError(-rv, _("Unable to initialize lease %s"), res->disks[0].path); + } goto error_unlink; } VIR_DEBUG("Lease %s has been initialized", res->disks[0].path); @@ -867,10 +901,12 @@ virLockManagerSanlockRegisterKillscript(int sock, } if ((rv = sanlock_killpath(sock, 0, path, args)) < 0) { - if (rv <= -200) { + char *err = NULL; + if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to register lock failure action:" - " error %d"), rv); + _("Failed to register lock failure action: %s"), + NULLSTR(err)); + VIR_FREE(err); } else { virReportSystemError(-rv, "%s", _("Failed to register lock failure" @@ -934,13 +970,16 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, if (priv->vm_pid == getpid()) { VIR_DEBUG("Register sanlock %d", flags); if ((sock = sanlock_register()) < 0) { - if (sock <= -200) + char *err = NULL; + if (virLockManagerSanlockError(sock, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to open socket to sanlock daemon: error %d"), - sock); - else + _("Failed to open socket to sanlock daemon: %s"), + NULLSTR(err)); + VIR_FREE(err); + } else { virReportSystemError(-sock, "%s", _("Failed to open socket to sanlock daemon")); + } goto error; } @@ -971,14 +1010,17 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, if ((rv = sanlock_state_to_args((char *)state, &res_count, &res_args)) < 0) { - if (rv <= -200) + char *err = NULL; + if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse lock state %s: error %d"), - state, rv); - else + _("Unable to parse lock state %s: %s"), + state, NULLSTR(err)); + VIR_FREE(err); + } else { virReportSystemError(-rv, _("Unable to parse lock state %s"), state); + } goto error; } res_free = true; @@ -992,12 +1034,16 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, if ((rv = sanlock_acquire(sock, priv->vm_pid, 0, priv->res_count, priv->res_args, opt)) < 0) { - if (rv <= -200) + char *err = NULL; + if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_RESOURCE_BUSY, - _("Failed to acquire lock: error %d"), rv); - else + _("Failed to acquire lock: %s"), + NULLSTR(err)); + VIR_FREE(err); + } else { virReportSystemError(-rv, "%s", _("Failed to acquire lock")); + } goto error; } } @@ -1016,12 +1062,16 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, if (flags & VIR_LOCK_MANAGER_ACQUIRE_RESTRICT) { if ((rv = sanlock_restrict(sock, SANLK_RESTRICT_ALL)) < 0) { - if (rv <= -200) + char *err = NULL; + if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to restrict process: error %d"), rv); - else + _("Failed to restrict process: %s"), + NULLSTR(err)); + VIR_FREE(err); + } else { virReportSystemError(-rv, "%s", _("Failed to restrict process")); + } goto error; } } @@ -1068,12 +1118,16 @@ static int virLockManagerSanlockRelease(virLockManagerPtr lock, if (state) { if ((rv = sanlock_inquire(-1, priv->vm_pid, 0, &res_count, state)) < 0) { - if (rv <= -200) + char *err = NULL; + if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to inquire lock: error %d"), rv); - else + _("Failed to inquire lock: %s"), + NULLSTR(err)); + VIR_FREE(err); + } else { virReportSystemError(-rv, "%s", _("Failed to inquire lock")); + } return -1; } @@ -1083,12 +1137,16 @@ static int virLockManagerSanlockRelease(virLockManagerPtr lock, if ((rv = sanlock_release(-1, priv->vm_pid, 0, res_count, priv->res_args)) < 0) { - if (rv <= -200) + char *err = NULL; + if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to release lock: error %d"), rv); - else + _("Failed to release lock: %s"), + NULLSTR(err)); + VIR_FREE(err); + } else { virReportSystemError(-rv, "%s", _("Failed to release lock")); + } return -1; } @@ -1118,12 +1176,16 @@ static int virLockManagerSanlockInquire(virLockManagerPtr lock, } if ((rv = sanlock_inquire(-1, priv->vm_pid, 0, &res_count, state)) < 0) { - if (rv <= -200) + char *err; + if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to inquire lock: error %d"), rv); - else + _("Failed to inquire lock: %s"), + NULLSTR(err)); + VIR_FREE(err); + } else { virReportSystemError(-rv, "%s", _("Failed to inquire lock")); + } return -1; } -- 2.12.2

2 2

[libvirt] [PATCH] qemu: Ignore missing query-migrate-parameters
by Jiri Denemark 27 Apr '17

27 Apr '17

Trivially no migration parameters are supported when query-migrate-parameters QMP command is missing. There's no need to report an error in such case especially when doing so breaks compatibility with old QEMU. https://bugzilla.redhat.com/show_bug.cgi?id=1441934 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 98e3c53f5..083729003 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2660,6 +2660,11 @@ qemuMonitorJSONGetMigrationParams(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; + if (qemuMonitorJSONHasError(reply, "CommandNotFound")) { + ret = 0; + goto cleanup; + } + if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; -- 2.12.2

2 3

[libvirt] [ROC] migration: set cpu throttle value by workload
by Chao Fan 27 Apr '17

27 Apr '17

Hi all, When migrating a guest which consumes too much CPU & memory, dirty pages amount will increase significantly, so does the migration time, migration can not even complete, at worst. So I made an RFC patch in QEMU to set cpu throttle value by workload when migration. The test result and the RFC patch are here: https://lists.gnu.org/archive/html/qemu-devel/2017-01/msg03479.html But this idea was not accepted by QEMU community. So I want to do a similar feature in libvirt: Step 1: Add --auto-converge-smart parameter to migrate. Step 2: Add a timer in qemu-driver to get the 'info migrate' to check if the dirty-pages-rate updated every 1 second or 0.5 second when migration. Step 3: If updated, change the cpu throttle value according to the dirty-pages-rate and page-size by 'migrate_set_parameter cpu-throttle-increment' I think this feature makes auto-converge smarter than leaving the cpu throttle value with default 20/10 or set by users. And also it can save time. Any comments will be welcome. Thanks, Chao Fan

3 3

[libvirt] Errors related to Per-node memory binding and huge pages per NUMA node.
by Vinod Chegu 27 Apr '17

27 Apr '17

Hi Daniel et.al, Running into the following errors when attempting to start up a multi-vNUMA node VM backed by 1G huge page per physical NUMA node. (details below) error: unsupported configuration: Per-node memory binding is not supported with this QEMU (or in another case) error: unsupported configuration: huge pages per NUMA node are not supported with this QEMU What am I missing ? Thanks! Vinod System : (CentOS 7.3) --------- # numactl -H available: 2 nodes (0-1) node 0 cpus: 0 1 2 3 4 5 6 7 16 17 18 19 20 21 22 23 node 0 size: 65320 MB node 0 free: 62672 MB node 1 cpus: 8 9 10 11 12 13 14 15 24 25 26 27 28 29 30 31 node 1 size: 65536 MB node 1 free: 63323 MB node distances: node 0 1 0: 10 20 1: 20 10 # uname -a Linux <hostname> 3.10.0-514.el7.x86_64 #1 SMP Tue Nov 22 16:42:41 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux # virsh version Compiled against library: libvirt 2.0.0 Using library: libvirt 2.0.0 Using API: QEMU 2.0.0 Running hypervisor: QEMU 1.5.3 # cat /proc/cmdline BOOT_IMAGE=/vmlinuz-3.10.0-514.el7.x86_64 root=/dev/mapper/cl-root ro crashkernel=auto rd.lvm.lv=cl/root rd.lvm.lv=cl/swap rhgb quiet LANG=en_US.UTF-8 intel_iommu=on iommu=pt default_hugepagesz=1G hugepagesz=1G hugepages=16 hugepagesz=2M hugepages=4096 # mount ... ... none on /dev/hugepages1G type hugetlbfs (rw,relatime,seclabel,pagesize=1G) none on /dev/hugepages2M type hugetlbfs (rw,relatime,seclabel,pagesize=2M) ----------- Test 1: 1G Huge page memoryBacking & memory binding per numa node, and virtual numa nodes. -------- <domain type='kvm'> <name>vm1</name> <uuid>62077ba4-9d7a-4b81-8dfb-b0cd55693cc2</uuid> <memory unit='KiB'>8388608</memory> <currentMemory unit='KiB'>8388608</currentMemory> <memtune> <hard_limit unit='KiB'>9437184</hard_limit> </memtune> <memoryBacking> <hugepages> <page size='1048576' unit='KiB' nodeset='0'/> <page size='1048576' unit='KiB' nodeset='1'/> </hugepages> </memoryBacking> <vcpu placement='static'>4</vcpu> <cputune> <vcpupin vcpu='0' cpuset='1'/> <vcpupin vcpu='1' cpuset='2'/> <vcpupin vcpu='2' cpuset='8'/> <vcpupin vcpu='3' cpuset='9'/> </cputune> <numatune> <memory mode='strict' nodeset='0-1'/> <memnode cellid='0' mode='strict' nodeset='0'/> <memnode cellid='1' mode='strict' nodeset='1'/> </numatune> <os> <type arch='x86_64' machine='pc-i440fx-rhel7.0.0'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> </features> <cpu mode='custom' match='exact'> <model fallback='allow'>IvyBridge</model> <numa> <cell id='0' cpus='0-1' memory='4194304' unit='KiB'/> <cell id='1' cpus='2-3' memory='4194304' unit='KiB'/> </numa> </cpu> ... # virsh start vm1 error: Failed to start domain vm1 error: unsupported configuration: Per-node memory binding is not supported with this QEMU Test 2: 1G Huge page memoryBacking per NUMA node and virtual numa nodes. ------ <domain type='kvm'> <name>vm1</name> <uuid>62077ba4-9d7a-4b81-8dfb-b0cd55693cc2</uuid> <memory unit='KiB'>8388608</memory> <currentMemory unit='KiB'>8388608</currentMemory> <memtune> <hard_limit unit='KiB'>9437184</hard_limit> </memtune> <memoryBacking> <hugepages> <page size='1048576' unit='KiB' nodeset='0'/> <page size='1048576' unit='KiB' nodeset='1'/> </hugepages> </memoryBacking> <vcpu placement='static'>4</vcpu> <cputune> <vcpupin vcpu='0' cpuset='1'/> <vcpupin vcpu='1' cpuset='2'/> <vcpupin vcpu='2' cpuset='8'/> <vcpupin vcpu='3' cpuset='9'/> </cputune> <os> <type arch='x86_64' machine='pc-i440fx-rhel7.0.0'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> </features> <cpu mode='custom' match='exact'> <model fallback='allow'>IvyBridge</model> <numa> <cell id='0' cpus='0-1' memory='4194304' unit='KiB'/> <cell id='1' cpus='2-3' memory='4194304' unit='KiB'/> </numa> </cpu> ... # virsh start vm1 error: Failed to start domain vm1 error: unsupported configuration: huge pages per NUMA node are not supported with this QEMU Test 3: Only virtual numa nodes. ------ <main type='kvm'> <name>vm1</name> <uuid>62077ba4-9d7a-4b81-8dfb-b0cd55693cc2</uuid> <memory unit='KiB'>8388608</memory> <currentMemory unit='KiB'>8388608</currentMemory> <memtune> <hard_limit unit='KiB'>9437184</hard_limit> </memtune> <vcpu placement='static'>4</vcpu> <cputune> <vcpupin vcpu='0' cpuset='1'/> <vcpupin vcpu='1' cpuset='2'/> <vcpupin vcpu='2' cpuset='8'/> <vcpupin vcpu='3' cpuset='9'/> </cputune> <os> <type arch='x86_64' machine='pc-i440fx-rhel7.0.0'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> </features> <cpu mode='custom' match='exact'> <model fallback='allow'>IvyBridge</model> <numa> <cell id='0' cpus='0-1' memory='4194304' unit='KiB'/> <cell id='1' cpus='2-3' memory='4194304' unit='KiB'/> </numa> </cpu> ... # virsh start vm1 <Success and the guest OS shows the virtual NUMA nodes etc.> Test 4: Only 1G huge page backing per NUMA node ------ <domain type='kvm'> <name>vm1</name> <uuid>62077ba4-9d7a-4b81-8dfb-b0cd55693cc2</uuid> <memory unit='KiB'>8388608</memory> <currentMemory unit='KiB'>8388608</currentMemory> <memtune> <hard_limit unit='KiB'>9437184</hard_limit> </memtune> <memoryBacking> <hugepages> <page size='1048576' unit='KiB' nodeset='0'/> <page size='1048576' unit='KiB' nodeset='1'/> </hugepages> </memoryBacking> <vcpu placement='static'>4</vcpu> <cputune> <vcpupin vcpu='0' cpuset='1'/> <vcpupin vcpu='1' cpuset='2'/> <vcpupin vcpu='2' cpuset='8'/> <vcpupin vcpu='3' cpuset='9'/> </cputune> <os> <type arch='x86_64' machine='pc-i440fx-rhel7.0.0'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> </features> <cpu mode='custom' match='exact'> <model fallback='allow'>IvyBridge</model> </cpu> ... # virsh start vm1 <Success and the 1G pages on the host are consumed for backing VM's memory>

2 1

[libvirt] [PATCH] qemu: Do not overwrite existing messages in hotplug
by Eric Farman 26 Apr '17

26 Apr '17

I tried to attach a SCSI LUN to two different guests, and forgot to specify "shareable" in the hostdev XML. Attaching the device to the second guest failed, but the message was not helpful in telling me what I was doing wrong: $ cat scsi_scratch_disk.xml <hostdev mode='subsystem' type='scsi'> <source> <adapter name='scsi_host3'/> <address bus='0' target='15' unit='1074151456'/> </source> </hostdev> $ virsh attach-device dasd_sles_d99c scsi_scratch_disk.xml Device attached successfully $ virsh attach-device dasd_fedora_0e1e scsi_scratch_disk.xml error: Failed to attach device from scsi_scratch_disk.xml error: internal error: Unable to prepare scsi hostdev: scsi_host3:0:15:1074151456 I eventually discovered my error, but thought it was weird that Libvirt doesn't provide something more helpful in this case. Looking over the code we had just gone through, I commented out the "internal error" message, and got something more useful: $ virsh attach-device dasd_fedora_0e1e scsi_scratch_disk.xml error: Failed to attach device from scsi_scratch_disk.xml error: Requested operation is not valid: SCSI device 3:0:15:1074151456 is already in use by other domain(s) as 'non-shareable' Seems that the virReportError issued for an internal error overwrites one that might have already existed. Rather than remove them altogether (there may be error paths that don't spit out a more helpful message), I thought maybe it'd be best to check if one exists, and exit if one does. If not, the existing internal error messages are probably helpful. Make this adjustment for both virtio-scsi and vhost-scsi devices. Signed-off-by: Eric Farman <farman(a)linux.vnet.ibm.com> Reviewed-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- src/qemu/qemu_hotplug.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 120bcdc..d421a77 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2470,6 +2470,10 @@ qemuDomainAttachHostSCSIDevice(virConnectPtr conn, if (qemuHostdevPrepareSCSIDevices(driver, vm->def->name, &hostdev, 1)) { virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi; + + if (virGetLastError()) + return -1; + if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) { virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc = &scsisrc->u.iscsi; virReportError(VIR_ERR_INTERNAL_ERROR, @@ -2595,9 +2599,12 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriverPtr driver, if (qemuHostdevPrepareSCSIVHostDevices(driver, vm->def->name, &hostdev, 1) < 0) { virDomainHostdevSubsysSCSIVHostPtr hostsrc = &hostdev->source.subsys.u.scsi_host; - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to prepare scsi_host hostdev: %s"), - hostsrc->wwpn); + + if (!virGetLastError()) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to prepare scsi_host hostdev: %s"), + hostsrc->wwpn); + } return -1; } -- 1.9.1

2 2

[libvirt] [PATCH] tests: update QEMU 2.9.0 caps data to final version
by Pavel Hrdina 26 Apr '17

26 Apr '17

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 4329 ++++++++++---------- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 5 +- 2 files changed, 2248 insertions(+), 2086 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies index bae24750ca..ca206b3e86 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies @@ -2,11 +2,11 @@ "QMP": { "version": { "qemu": { - "micro": 90, - "minor": 8, + "micro": 0, + "minor": 9, "major": 2 }, - "package": " (v2.9.0-rc0-142-g940a8ce)" + "package": " (v2.9.0)" }, "capabilities": [ ] @@ -22,11 +22,11 @@ { "return": { "qemu": { - "micro": 90, - "minor": 8, + "micro": 0, + "minor": 9, "major": 2 }, - "package": " (v2.9.0-rc0-142-g940a8ce)" + "package": " (v2.9.0)" }, "id": "libvirt-2" } @@ -74,9 +74,6 @@ "name": "x-blockdev-insert-medium" }, { - "name": "x-blockdev-del" - }, - { "name": "x-blockdev-change" }, { @@ -416,6 +413,9 @@ "name": "blockdev-mirror" }, { + "name": "blockdev-del" + }, + { "name": "blockdev-close-tray" }, { @@ -6080,84 +6080,90 @@ "arg-type": "49" }, { - "name": "blockdev-mirror", + "name": "blockdev-del", "ret-type": "17", "meta-type": "command", "arg-type": "50" }, { - "name": "blockdev-open-tray", + "name": "blockdev-mirror", "ret-type": "17", "meta-type": "command", "arg-type": "51" }, { - "name": "blockdev-snapshot", + "name": "blockdev-open-tray", "ret-type": "17", "meta-type": "command", "arg-type": "52" }, { - "name": "blockdev-snapshot-delete-internal-sync", - "ret-type": "54", + "name": "blockdev-snapshot", + "ret-type": "17", "meta-type": "command", "arg-type": "53" }, { + "name": "blockdev-snapshot-delete-internal-sync", + "ret-type": "55", + "meta-type": "command", + "arg-type": "54" + }, + { "name": "blockdev-snapshot-internal-sync", "ret-type": "17", "meta-type": "command", - "arg-type": "55" - }, - { - "name": "blockdev-snapshot-sync", - "ret-type": "17", - "meta-type": "command", "arg-type": "56" }, { - "name": "change", + "name": "blockdev-snapshot-sync", "ret-type": "17", "meta-type": "command", "arg-type": "57" }, { - "name": "change-backing-file", + "name": "change", "ret-type": "17", "meta-type": "command", "arg-type": "58" }, { - "name": "change-vnc-password", + "name": "change-backing-file", "ret-type": "17", "meta-type": "command", "arg-type": "59" }, { - "name": "chardev-add", - "ret-type": "61", + "name": "change-vnc-password", + "ret-type": "17", "meta-type": "command", "arg-type": "60" }, { + "name": "chardev-add", + "ret-type": "62", + "meta-type": "command", + "arg-type": "61" + }, + { "name": "chardev-remove", "ret-type": "17", "meta-type": "command", - "arg-type": "62" - }, - { - "name": "client_migrate_info", - "ret-type": "17", - "meta-type": "command", "arg-type": "63" }, { - "name": "closefd", + "name": "client_migrate_info", "ret-type": "17", "meta-type": "command", "arg-type": "64" }, { + "name": "closefd", + "ret-type": "17", + "meta-type": "command", + "arg-type": "65" + }, + { "name": "cont", "ret-type": "17", "meta-type": "command", @@ -6167,81 +6173,81 @@ "name": "cpu", "ret-type": "17", "meta-type": "command", - "arg-type": "65" - }, - { - "name": "cpu-add", - "ret-type": "17", - "meta-type": "command", "arg-type": "66" }, { - "name": "device-list-properties", - "ret-type": "[68]", + "name": "cpu-add", + "ret-type": "17", "meta-type": "command", "arg-type": "67" }, { + "name": "device-list-properties", + "ret-type": "[69]", + "meta-type": "command", + "arg-type": "68" + }, + { "name": "device_add", "ret-type": "17", "meta-type": "command", - "arg-type": "69" - }, - { - "name": "device_del", - "ret-type": "17", - "meta-type": "command", "arg-type": "70" }, { - "name": "drive-backup", + "name": "device_del", "ret-type": "17", "meta-type": "command", "arg-type": "71" }, { - "name": "drive-mirror", + "name": "drive-backup", "ret-type": "17", "meta-type": "command", "arg-type": "72" }, { - "name": "dump-guest-memory", + "name": "drive-mirror", "ret-type": "17", "meta-type": "command", "arg-type": "73" }, { - "name": "dump-skeys", + "name": "dump-guest-memory", "ret-type": "17", "meta-type": "command", "arg-type": "74" }, { - "name": "eject", + "name": "dump-skeys", "ret-type": "17", "meta-type": "command", "arg-type": "75" }, { - "name": "expire_password", + "name": "eject", "ret-type": "17", "meta-type": "command", "arg-type": "76" }, { - "name": "getfd", + "name": "expire_password", "ret-type": "17", "meta-type": "command", "arg-type": "77" }, { - "name": "human-monitor-command", - "ret-type": "str", + "name": "getfd", + "ret-type": "17", "meta-type": "command", "arg-type": "78" }, { + "name": "human-monitor-command", + "ret-type": "str", + "meta-type": "command", + "arg-type": "79" + }, + { "name": "inject-nmi", "ret-type": "17", "meta-type": "command", @@ -6251,45 +6257,45 @@ "name": "input-send-event", "ret-type": "17", "meta-type": "command", - "arg-type": "79" - }, - { - "name": "memsave", - "ret-type": "17", - "meta-type": "command", "arg-type": "80" }, { - "name": "migrate", + "name": "memsave", "ret-type": "17", "meta-type": "command", "arg-type": "81" }, { - "name": "migrate-incoming", + "name": "migrate", "ret-type": "17", "meta-type": "command", "arg-type": "82" }, { - "name": "migrate-set-cache-size", + "name": "migrate-incoming", "ret-type": "17", "meta-type": "command", "arg-type": "83" }, { - "name": "migrate-set-capabilities", + "name": "migrate-set-cache-size", "ret-type": "17", "meta-type": "command", "arg-type": "84" }, { - "name": "migrate-set-parameters", + "name": "migrate-set-capabilities", "ret-type": "17", "meta-type": "command", "arg-type": "85" }, { + "name": "migrate-set-parameters", + "ret-type": "17", + "meta-type": "command", + "arg-type": "86" + }, + { "name": "migrate-start-postcopy", "ret-type": "17", "meta-type": "command", @@ -6305,27 +6311,27 @@ "name": "migrate_set_downtime", "ret-type": "17", "meta-type": "command", - "arg-type": "86" - }, - { - "name": "migrate_set_speed", - "ret-type": "17", - "meta-type": "command", "arg-type": "87" }, { - "name": "nbd-server-add", + "name": "migrate_set_speed", "ret-type": "17", "meta-type": "command", "arg-type": "88" }, { - "name": "nbd-server-start", + "name": "nbd-server-add", "ret-type": "17", "meta-type": "command", "arg-type": "89" }, { + "name": "nbd-server-start", + "ret-type": "17", + "meta-type": "command", + "arg-type": "90" + }, + { "name": "nbd-server-stop", "ret-type": "17", "meta-type": "command", @@ -6335,33 +6341,33 @@ "name": "netdev_add", "ret-type": "17", "meta-type": "command", - "arg-type": "90" - }, - { - "name": "netdev_del", - "ret-type": "17", - "meta-type": "command", "arg-type": "91" }, { - "name": "object-add", + "name": "netdev_del", "ret-type": "17", "meta-type": "command", "arg-type": "92" }, { - "name": "object-del", + "name": "object-add", "ret-type": "17", "meta-type": "command", "arg-type": "93" }, { - "name": "pmemsave", + "name": "object-del", "ret-type": "17", "meta-type": "command", "arg-type": "94" }, { + "name": "pmemsave", + "ret-type": "17", + "meta-type": "command", + "arg-type": "95" + }, + { "name": "qmp_capabilities", "ret-type": "17", "meta-type": "command", @@ -6371,185 +6377,185 @@ "name": "qom-get", "ret-type": "any", "meta-type": "command", - "arg-type": "95" - }, - { - "name": "qom-list", - "ret-type": "[97]", - "meta-type": "command", "arg-type": "96" }, { + "name": "qom-list", + "ret-type": "[98]", + "meta-type": "command", + "arg-type": "97" + }, + { "name": "qom-list-types", - "ret-type": "[99]", + "ret-type": "[100]", "meta-type": "command", - "arg-type": "98" + "arg-type": "99" }, { "name": "qom-set", "ret-type": "17", "meta-type": "command", - "arg-type": "100" + "arg-type": "101" }, { "name": "query-acpi-ospm-status", - "ret-type": "[101]", + "ret-type": "[102]", "meta-type": "command", "arg-type": "17" }, { "name": "query-balloon", - "ret-type": "102", + "ret-type": "103", "meta-type": "command", "arg-type": "17" }, { "name": "query-block", - "ret-type": "[103]", - "meta-type": "command", - "arg-type": "17" - }, - { - "name": "query-block-jobs", "ret-type": "[104]", "meta-type": "command", "arg-type": "17" }, { + "name": "query-block-jobs", + "ret-type": "[105]", + "meta-type": "command", + "arg-type": "17" + }, + { "name": "query-blockstats", - "ret-type": "[106]", - "meta-type": "command", - "arg-type": "105" - }, - { - "name": "query-chardev", "ret-type": "[107]", "meta-type": "command", - "arg-type": "17" + "arg-type": "106" }, { - "name": "query-chardev-backends", + "name": "query-chardev", "ret-type": "[108]", "meta-type": "command", "arg-type": "17" }, { + "name": "query-chardev-backends", + "ret-type": "[109]", + "meta-type": "command", + "arg-type": "17" + }, + { "name": "query-command-line-options", - "ret-type": "[110]", - "meta-type": "command", - "arg-type": "109" - }, - { - "name": "query-commands", "ret-type": "[111]", "meta-type": "command", - "arg-type": "17" + "arg-type": "110" }, { - "name": "query-cpu-definitions", + "name": "query-commands", "ret-type": "[112]", "meta-type": "command", "arg-type": "17" }, { + "name": "query-cpu-definitions", + "ret-type": "[113]", + "meta-type": "command", + "arg-type": "17" + }, + { "name": "query-cpu-model-baseline", - "ret-type": "114", + "ret-type": "115", "meta-type": "command", - "arg-type": "113" + "arg-type": "114" }, { "name": "query-cpu-model-comparison", - "ret-type": "116", + "ret-type": "117", "meta-type": "command", - "arg-type": "115" + "arg-type": "116" }, { "name": "query-cpu-model-expansion", - "ret-type": "118", + "ret-type": "119", "meta-type": "command", - "arg-type": "117" + "arg-type": "118" }, { "name": "query-cpus", - "ret-type": "[119]", + "ret-type": "[120]", "meta-type": "command", "arg-type": "17" }, { "name": "query-dump", - "ret-type": "120", - "meta-type": "command", - "arg-type": "17" - }, - { - "name": "query-dump-guest-memory-capability", "ret-type": "121", "meta-type": "command", "arg-type": "17" }, { + "name": "query-dump-guest-memory-capability", + "ret-type": "122", + "meta-type": "command", + "arg-type": "17" + }, + { "name": "query-events", - "ret-type": "[122]", - "meta-type": "command", - "arg-type": "17" - }, - { - "name": "query-fdsets", "ret-type": "[123]", "meta-type": "command", "arg-type": "17" }, { - "name": "query-gic-capabilities", + "name": "query-fdsets", "ret-type": "[124]", "meta-type": "command", "arg-type": "17" }, { - "name": "query-hotpluggable-cpus", + "name": "query-gic-capabilities", "ret-type": "[125]", "meta-type": "command", "arg-type": "17" }, { - "name": "query-iothreads", + "name": "query-hotpluggable-cpus", "ret-type": "[126]", "meta-type": "command", "arg-type": "17" }, { + "name": "query-iothreads", + "ret-type": "[127]", + "meta-type": "command", + "arg-type": "17" + }, + { "name": "query-kvm", - "ret-type": "127", + "ret-type": "128", "meta-type": "command", "arg-type": "17" }, { "name": "query-machines", - "ret-type": "[128]", - "meta-type": "command", - "arg-type": "17" - }, - { - "name": "query-memdev", "ret-type": "[129]", "meta-type": "command", "arg-type": "17" }, { - "name": "query-memory-devices", + "name": "query-memdev", "ret-type": "[130]", "meta-type": "command", "arg-type": "17" }, { - "name": "query-mice", + "name": "query-memory-devices", "ret-type": "[131]", "meta-type": "command", "arg-type": "17" }, { + "name": "query-mice", + "ret-type": "[132]", + "meta-type": "command", + "arg-type": "17" + }, + { "name": "query-migrate", - "ret-type": "132", + "ret-type": "133", "meta-type": "command", "arg-type": "17" }, @@ -6561,139 +6567,139 @@ }, { "name": "query-migrate-capabilities", - "ret-type": "[133]", + "ret-type": "[134]", "meta-type": "command", "arg-type": "17" }, { "name": "query-migrate-parameters", - "ret-type": "85", + "ret-type": "86", "meta-type": "command", "arg-type": "17" }, { "name": "query-name", - "ret-type": "134", + "ret-type": "135", "meta-type": "command", "arg-type": "17" }, { "name": "query-named-block-nodes", - "ret-type": "[135]", - "meta-type": "command", - "arg-type": "17" - }, - { - "name": "query-pci", "ret-type": "[136]", "meta-type": "command", "arg-type": "17" }, { - "name": "query-qmp-schema", + "name": "query-pci", "ret-type": "[137]", "meta-type": "command", "arg-type": "17" }, { + "name": "query-qmp-schema", + "ret-type": "[138]", + "meta-type": "command", + "arg-type": "17" + }, + { "name": "query-rocker", - "ret-type": "139", + "ret-type": "140", "meta-type": "command", - "arg-type": "138" + "arg-type": "139" }, { "name": "query-rocker-of-dpa-flows", - "ret-type": "[141]", + "ret-type": "[142]", "meta-type": "command", - "arg-type": "140" + "arg-type": "141" }, { "name": "query-rocker-of-dpa-groups", - "ret-type": "[143]", + "ret-type": "[144]", "meta-type": "command", - "arg-type": "142" + "arg-type": "143" }, { "name": "query-rocker-ports", - "ret-type": "[145]", + "ret-type": "[146]", "meta-type": "command", - "arg-type": "144" + "arg-type": "145" }, { "name": "query-rx-filter", - "ret-type": "[147]", + "ret-type": "[148]", "meta-type": "command", - "arg-type": "146" + "arg-type": "147" }, { "name": "query-spice", - "ret-type": "148", - "meta-type": "command", - "arg-type": "17" - }, - { - "name": "query-status", "ret-type": "149", "meta-type": "command", "arg-type": "17" }, { - "name": "query-target", + "name": "query-status", "ret-type": "150", "meta-type": "command", "arg-type": "17" }, { + "name": "query-target", + "ret-type": "151", + "meta-type": "command", + "arg-type": "17" + }, + { "name": "query-tpm", - "ret-type": "[151]", - "meta-type": "command", - "arg-type": "17" - }, - { - "name": "query-tpm-models", "ret-type": "[152]", "meta-type": "command", "arg-type": "17" }, { - "name": "query-tpm-types", + "name": "query-tpm-models", "ret-type": "[153]", "meta-type": "command", "arg-type": "17" }, { + "name": "query-tpm-types", + "ret-type": "[154]", + "meta-type": "command", + "arg-type": "17" + }, + { "name": "query-uuid", - "ret-type": "154", - "meta-type": "command", - "arg-type": "17" - }, - { - "name": "query-version", "ret-type": "155", "meta-type": "command", "arg-type": "17" }, { - "name": "query-vm-generation-id", + "name": "query-version", "ret-type": "156", "meta-type": "command", "arg-type": "17" }, { - "name": "query-vnc", + "name": "query-vm-generation-id", "ret-type": "157", "meta-type": "command", "arg-type": "17" }, { + "name": "query-vnc", + "ret-type": "158", + "meta-type": "command", + "arg-type": "17" + }, + { "name": "query-vnc-servers", - "ret-type": "[158]", + "ret-type": "[159]", "meta-type": "command", "arg-type": "17" }, { "name": "query-xen-replication-status", - "ret-type": "159", + "ret-type": "160", "meta-type": "command", "arg-type": "17" }, @@ -6707,21 +6713,21 @@ "name": "remove-fd", "ret-type": "17", "meta-type": "command", - "arg-type": "160" - }, - { - "name": "ringbuf-read", - "ret-type": "str", - "meta-type": "command", "arg-type": "161" }, { - "name": "ringbuf-write", - "ret-type": "17", + "name": "ringbuf-read", + "ret-type": "str", "meta-type": "command", "arg-type": "162" }, { + "name": "ringbuf-write", + "ret-type": "17", + "meta-type": "command", + "arg-type": "163" + }, + { "name": "rtc-reset-reinjection", "ret-type": "17", "meta-type": "command", @@ -6731,27 +6737,27 @@ "name": "screendump", "ret-type": "17", "meta-type": "command", - "arg-type": "163" - }, - { - "name": "send-key", - "ret-type": "17", - "meta-type": "command", "arg-type": "164" }, { - "name": "set_link", + "name": "send-key", "ret-type": "17", "meta-type": "command", "arg-type": "165" }, { - "name": "set_password", + "name": "set_link", "ret-type": "17", "meta-type": "command", "arg-type": "166" }, { + "name": "set_password", + "ret-type": "17", + "meta-type": "command", + "arg-type": "167" + }, + { "name": "stop", "ret-type": "17", "meta-type": "command", @@ -6777,30 +6783,24 @@ }, { "name": "trace-event-get-state", - "ret-type": "[168]", + "ret-type": "[169]", "meta-type": "command", - "arg-type": "167" + "arg-type": "168" }, { "name": "trace-event-set-state", "ret-type": "17", "meta-type": "command", - "arg-type": "169" - }, - { - "name": "transaction", - "ret-type": "17", - "meta-type": "command", "arg-type": "170" }, { - "name": "x-blockdev-change", + "name": "transaction", "ret-type": "17", "meta-type": "command", "arg-type": "171" }, { - "name": "x-blockdev-del", + "name": "x-blockdev-change", "ret-type": "17", "meta-type": "command", "arg-type": "172" @@ -6858,7 +6858,7 @@ "members": [ { "name": "info", - "type": "101" + "type": "102" } ], "meta-type": "object" @@ -7094,7 +7094,7 @@ "members": [ { "name": "result", - "type": "120" + "type": "121" }, { "name": "error", @@ -7771,13 +7771,13 @@ }, { "case": "ftps", - "type": "202" - }, - { - "case": "gluster", "type": "203" }, { + "case": "gluster", + "type": "204" + }, + { "case": "host_cdrom", "type": "201" }, @@ -7787,35 +7787,35 @@ }, { "case": "http", - "type": "202" + "type": "205" }, { "case": "https", - "type": "202" + "type": "206" }, { "case": "iscsi", - "type": "204" + "type": "207" }, { "case": "luks", - "type": "205" + "type": "208" }, { "case": "nbd", - "type": "206" + "type": "209" }, { "case": "nfs", - "type": "207" + "type": "210" }, { "case": "null-aio", - "type": "208" + "type": "211" }, { "case": "null-co", - "type": "208" + "type": "211" }, { "case": "parallels", @@ -7823,39 +7823,39 @@ }, { "case": "qcow2", - "type": "209" + "type": "212" }, { "case": "qcow", - "type": "210" + "type": "213" }, { "case": "qed", - "type": "210" + "type": "213" }, { "case": "quorum", - "type": "211" + "type": "214" }, { "case": "raw", - "type": "212" + "type": "215" }, { "case": "rbd", - "type": "213" + "type": "216" }, { "case": "replication", - "type": "214" + "type": "217" }, { "case": "sheepdog", - "type": "215" + "type": "218" }, { "case": "ssh", - "type": "216" + "type": "219" }, { "case": "vdi", @@ -7867,7 +7867,7 @@ }, { "case": "vmdk", - "type": "210" + "type": "213" }, { "case": "vpc", @@ -7875,7 +7875,7 @@ }, { "case": "vvfat", - "type": "217" + "type": "220" } ], "members": [ @@ -7929,7 +7929,7 @@ }, { "name": "sync", - "type": "218" + "type": "221" }, { "name": "speed", @@ -7979,7 +7979,7 @@ { "name": "read-only-mode", "default": null, - "type": "219" + "type": "222" } ], "meta-type": "object" @@ -8004,55 +8004,7 @@ "name": "50", "members": [ { - "name": "job-id", - "default": null, - "type": "str" - }, - { - "name": "device", - "type": "str" - }, - { - "name": "target", - "type": "str" - }, - { - "name": "replaces", - "default": null, - "type": "str" - }, - { - "name": "sync", - "type": "218" - }, - { - "name": "speed", - "default": null, - "type": "int" - }, - { - "name": "granularity", - "default": null, - "type": "int" - }, - { - "name": "buf-size", - "default": null, - "type": "int" - }, - { - "name": "on-source-error", - "default": null, - "type": "193" - }, - { - "name": "on-target-error", - "default": null, - "type": "193" - }, - { - "name": "filter-node-name", - "default": null, + "name": "node-name", "type": "str" } ], @@ -8062,19 +8014,56 @@ "name": "51", "members": [ { + "name": "job-id", + "default": null, + "type": "str" + }, + { "name": "device", - "default": null, "type": "str" }, { - "name": "id", + "name": "target", + "type": "str" + }, + { + "name": "replaces", "default": null, "type": "str" }, { - "name": "force", + "name": "sync", + "type": "221" + }, + { + "name": "speed", + "default": null, + "type": "int" + }, + { + "name": "granularity", + "default": null, + "type": "int" + }, + { + "name": "buf-size", + "default": null, + "type": "int" + }, + { + "name": "on-source-error", "default": null, - "type": "bool" + "type": "193" + }, + { + "name": "on-target-error", + "default": null, + "type": "193" + }, + { + "name": "filter-node-name", + "default": null, + "type": "str" } ], "meta-type": "object" @@ -8083,12 +8072,19 @@ "name": "52", "members": [ { - "name": "node", + "name": "device", + "default": null, "type": "str" }, { - "name": "overlay", + "name": "id", + "default": null, "type": "str" + }, + { + "name": "force", + "default": null, + "type": "bool" } ], "meta-type": "object" @@ -8097,17 +8093,11 @@ "name": "53", "members": [ { - "name": "device", + "name": "node", "type": "str" }, { - "name": "id", - "default": null, - "type": "str" - }, - { - "name": "name", - "default": null, + "name": "overlay", "type": "str" } ], @@ -8117,6 +8107,26 @@ "name": "54", "members": [ { + "name": "device", + "type": "str" + }, + { + "name": "id", + "default": null, + "type": "str" + }, + { + "name": "name", + "default": null, + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "55", + "members": [ + { "name": "id", "type": "str" }, @@ -8148,24 +8158,24 @@ "meta-type": "object" }, { - "name": "55", - "members": [ - { - "name": "device", - "type": "str" - }, - { - "name": "name", - "type": "str" - } - ], - "meta-type": "object" - }, - { "name": "56", "members": [ { "name": "device", + "type": "str" + }, + { + "name": "name", + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "57", + "members": [ + { + "name": "device", "default": null, "type": "str" }, @@ -8191,26 +8201,7 @@ { "name": "mode", "default": null, - "type": "220" - } - ], - "meta-type": "object" - }, - { - "name": "57", - "members": [ - { - "name": "device", - "type": "str" - }, - { - "name": "target", - "type": "str" - }, - { - "name": "arg", - "default": null, - "type": "str" + "type": "223" } ], "meta-type": "object" @@ -8223,11 +8214,12 @@ "type": "str" }, { - "name": "image-node-name", + "name": "target", "type": "str" }, { - "name": "backing-file", + "name": "arg", + "default": null, "type": "str" } ], @@ -8237,7 +8229,15 @@ "name": "59", "members": [ { - "name": "password", + "name": "device", + "type": "str" + }, + { + "name": "image-node-name", + "type": "str" + }, + { + "name": "backing-file", "type": "str" } ], @@ -8247,12 +8247,8 @@ "name": "60", "members": [ { - "name": "id", + "name": "password", "type": "str" - }, - { - "name": "backend", - "type": "221" } ], "meta-type": "object" @@ -8261,9 +8257,12 @@ "name": "61", "members": [ { - "name": "pty", - "default": null, + "name": "id", "type": "str" + }, + { + "name": "backend", + "type": "224" } ], "meta-type": "object" @@ -8272,7 +8271,8 @@ "name": "62", "members": [ { - "name": "id", + "name": "pty", + "default": null, "type": "str" } ], @@ -8282,6 +8282,16 @@ "name": "63", "members": [ { + "name": "id", + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "64", + "members": [ + { "name": "protocol", "type": "str" }, @@ -8308,21 +8318,11 @@ "meta-type": "object" }, { - "name": "64", - "members": [ - { - "name": "fdname", - "type": "str" - } - ], - "meta-type": "object" - }, - { "name": "65", "members": [ { - "name": "index", - "type": "int" + "name": "fdname", + "type": "str" } ], "meta-type": "object" @@ -8331,7 +8331,7 @@ "name": "66", "members": [ { - "name": "id", + "name": "index", "type": "int" } ], @@ -8341,50 +8341,40 @@ "name": "67", "members": [ { - "name": "typename", - "type": "str" + "name": "id", + "type": "int" } ], "meta-type": "object" }, { - "name": "[68]", - "element-type": "68", - "meta-type": "array" - }, - { "name": "68", "members": [ { - "name": "name", - "type": "str" - }, - { - "name": "type", - "type": "str" - }, - { - "name": "description", - "default": null, + "name": "typename", "type": "str" } ], "meta-type": "object" }, { + "name": "[69]", + "element-type": "69", + "meta-type": "array" + }, + { "name": "69", "members": [ { - "name": "driver", + "name": "name", "type": "str" }, { - "name": "bus", - "default": null, + "name": "type", "type": "str" }, { - "name": "id", + "name": "description", "default": null, "type": "str" } @@ -8395,7 +8385,17 @@ "name": "70", "members": [ { + "name": "driver", + "type": "str" + }, + { + "name": "bus", + "default": null, + "type": "str" + }, + { "name": "id", + "default": null, "type": "str" } ], @@ -8405,56 +8405,8 @@ "name": "71", "members": [ { - "name": "job-id", - "default": null, + "name": "id", "type": "str" - }, - { - "name": "device", - "type": "str" - }, - { - "name": "target", - "type": "str" - }, - { - "name": "format", - "default": null, - "type": "str" - }, - { - "name": "sync", - "type": "218" - }, - { - "name": "mode", - "default": null, - "type": "220" - }, - { - "name": "speed", - "default": null, - "type": "int" - }, - { - "name": "bitmap", - "default": null, - "type": "str" - }, - { - "name": "compress", - "default": null, - "type": "bool" - }, - { - "name": "on-source-error", - "default": null, - "type": "193" - }, - { - "name": "on-target-error", - "default": null, - "type": "193" } ], "meta-type": "object" @@ -8481,23 +8433,13 @@ "type": "str" }, { - "name": "node-name", - "default": null, - "type": "str" - }, - { - "name": "replaces", - "default": null, - "type": "str" - }, - { "name": "sync", - "type": "218" + "type": "221" }, { "name": "mode", "default": null, - "type": "220" + "type": "223" }, { "name": "speed", @@ -8505,14 +8447,14 @@ "type": "int" }, { - "name": "granularity", + "name": "bitmap", "default": null, - "type": "int" + "type": "str" }, { - "name": "buf-size", + "name": "compress", "default": null, - "type": "int" + "type": "bool" }, { "name": "on-source-error", @@ -8523,11 +8465,6 @@ "name": "on-target-error", "default": null, "type": "193" - }, - { - "name": "unmap", - "default": null, - "type": "bool" } ], "meta-type": "object" @@ -8536,6 +8473,79 @@ "name": "73", "members": [ { + "name": "job-id", + "default": null, + "type": "str" + }, + { + "name": "device", + "type": "str" + }, + { + "name": "target", + "type": "str" + }, + { + "name": "format", + "default": null, + "type": "str" + }, + { + "name": "node-name", + "default": null, + "type": "str" + }, + { + "name": "replaces", + "default": null, + "type": "str" + }, + { + "name": "sync", + "type": "221" + }, + { + "name": "mode", + "default": null, + "type": "223" + }, + { + "name": "speed", + "default": null, + "type": "int" + }, + { + "name": "granularity", + "default": null, + "type": "int" + }, + { + "name": "buf-size", + "default": null, + "type": "int" + }, + { + "name": "on-source-error", + "default": null, + "type": "193" + }, + { + "name": "on-target-error", + "default": null, + "type": "193" + }, + { + "name": "unmap", + "default": null, + "type": "bool" + } + ], + "meta-type": "object" + }, + { + "name": "74", + "members": [ + { "name": "paging", "type": "bool" }, @@ -8561,17 +8571,7 @@ { "name": "format", "default": null, - "type": "222" - } - ], - "meta-type": "object" - }, - { - "name": "74", - "members": [ - { - "name": "filename", - "type": "str" + "type": "225" } ], "meta-type": "object" @@ -8580,19 +8580,8 @@ "name": "75", "members": [ { - "name": "device", - "default": null, + "name": "filename", "type": "str" - }, - { - "name": "id", - "default": null, - "type": "str" - }, - { - "name": "force", - "default": null, - "type": "bool" } ], "meta-type": "object" @@ -8601,12 +8590,19 @@ "name": "76", "members": [ { - "name": "protocol", + "name": "device", + "default": null, "type": "str" }, { - "name": "time", + "name": "id", + "default": null, "type": "str" + }, + { + "name": "force", + "default": null, + "type": "bool" } ], "meta-type": "object" @@ -8615,7 +8611,11 @@ "name": "77", "members": [ { - "name": "fdname", + "name": "protocol", + "type": "str" + }, + { + "name": "time", "type": "str" } ], @@ -8625,6 +8625,16 @@ "name": "78", "members": [ { + "name": "fdname", + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "79", + "members": [ + { "name": "command-line", "type": "str" }, @@ -8642,44 +8652,21 @@ "meta-type": "builtin" }, { - "name": "79", - "members": [ - { - "name": "device", - "default": null, - "type": "str" - }, - { - "name": "head", - "default": null, - "type": "int" - }, - { - "name": "events", - "type": "[223]" - } - ], - "meta-type": "object" - }, - { "name": "80", "members": [ { - "name": "val", - "type": "int" - }, - { - "name": "size", - "type": "int" - }, - { - "name": "filename", + "name": "device", + "default": null, "type": "str" }, { - "name": "cpu-index", + "name": "head", "default": null, "type": "int" + }, + { + "name": "events", + "type": "[226]" } ], "meta-type": "object" @@ -8688,6 +8675,29 @@ "name": "81", "members": [ { + "name": "val", + "type": "int" + }, + { + "name": "size", + "type": "int" + }, + { + "name": "filename", + "type": "str" + }, + { + "name": "cpu-index", + "default": null, + "type": "int" + } + ], + "meta-type": "object" + }, + { + "name": "82", + "members": [ + { "name": "uri", "type": "str" }, @@ -8710,21 +8720,11 @@ "meta-type": "object" }, { - "name": "82", - "members": [ - { - "name": "uri", - "type": "str" - } - ], - "meta-type": "object" - }, - { "name": "83", "members": [ { - "name": "value", - "type": "int" + "name": "uri", + "type": "str" } ], "meta-type": "object" @@ -8733,8 +8733,8 @@ "name": "84", "members": [ { - "name": "capabilities", - "type": "[133]" + "name": "value", + "type": "int" } ], "meta-type": "object" @@ -8743,6 +8743,16 @@ "name": "85", "members": [ { + "name": "capabilities", + "type": "[134]" + } + ], + "meta-type": "object" + }, + { + "name": "86", + "members": [ + { "name": "compress-level", "default": null, "type": "int" @@ -8796,21 +8806,11 @@ "meta-type": "object" }, { - "name": "86", - "members": [ - { - "name": "value", - "type": "number" - } - ], - "meta-type": "object" - }, - { "name": "87", "members": [ { "name": "value", - "type": "int" + "type": "number" } ], "meta-type": "object" @@ -8819,13 +8819,8 @@ "name": "88", "members": [ { - "name": "device", - "type": "str" - }, - { - "name": "writable", - "default": null, - "type": "bool" + "name": "value", + "type": "int" } ], "meta-type": "object" @@ -8834,13 +8829,13 @@ "name": "89", "members": [ { - "name": "addr", - "type": "224" + "name": "device", + "type": "str" }, { - "name": "tls-creds", + "name": "writable", "default": null, - "type": "str" + "type": "bool" } ], "meta-type": "object" @@ -8849,11 +8844,12 @@ "name": "90", "members": [ { - "name": "type", - "type": "str" + "name": "addr", + "type": "227" }, { - "name": "id", + "name": "tls-creds", + "default": null, "type": "str" } ], @@ -8863,6 +8859,10 @@ "name": "91", "members": [ { + "name": "type", + "type": "str" + }, + { "name": "id", "type": "str" } @@ -8873,17 +8873,8 @@ "name": "92", "members": [ { - "name": "qom-type", - "type": "str" - }, - { "name": "id", "type": "str" - }, - { - "name": "props", - "default": null, - "type": "any" } ], "meta-type": "object" @@ -8892,8 +8883,17 @@ "name": "93", "members": [ { + "name": "qom-type", + "type": "str" + }, + { "name": "id", "type": "str" + }, + { + "name": "props", + "default": null, + "type": "any" } ], "meta-type": "object" @@ -8902,15 +8902,7 @@ "name": "94", "members": [ { - "name": "val", - "type": "int" - }, - { - "name": "size", - "type": "int" - }, - { - "name": "filename", + "name": "id", "type": "str" } ], @@ -8920,6 +8912,24 @@ "name": "95", "members": [ { + "name": "val", + "type": "int" + }, + { + "name": "size", + "type": "int" + }, + { + "name": "filename", + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "96", + "members": [ + { "name": "path", "type": "str" }, @@ -8936,38 +8946,38 @@ "meta-type": "builtin" }, { - "name": "96", - "members": [ - { - "name": "path", - "type": "str" - } - ], - "meta-type": "object" - }, - { - "name": "[97]", - "element-type": "97", - "meta-type": "array" - }, - { "name": "97", "members": [ { - "name": "name", - "type": "str" - }, - { - "name": "type", + "name": "path", "type": "str" } ], "meta-type": "object" }, { + "name": "[98]", + "element-type": "98", + "meta-type": "array" + }, + { "name": "98", "members": [ { + "name": "name", + "type": "str" + }, + { + "name": "type", + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "99", + "members": [ + { "name": "implements", "default": null, "type": "str" @@ -8981,47 +8991,47 @@ "meta-type": "object" }, { - "name": "[99]", - "element-type": "99", + "name": "[100]", + "element-type": "100", "meta-type": "array" }, { - "name": "99", - "members": [ - { - "name": "name", - "type": "str" - } - ], - "meta-type": "object" - }, - { "name": "100", "members": [ { - "name": "path", + "name": "name", "type": "str" - }, - { - "name": "property", - "type": "str" - }, - { - "name": "value", - "type": "any" } ], "meta-type": "object" }, { - "name": "[101]", - "element-type": "101", - "meta-type": "array" - }, - { "name": "101", "members": [ { + "name": "path", + "type": "str" + }, + { + "name": "property", + "type": "str" + }, + { + "name": "value", + "type": "any" + } + ], + "meta-type": "object" + }, + { + "name": "[102]", + "element-type": "102", + "meta-type": "array" + }, + { + "name": "102", + "members": [ + { "name": "device", "default": null, "type": "str" @@ -9032,7 +9042,7 @@ }, { "name": "slot-type", - "type": "225" + "type": "228" }, { "name": "source", @@ -9046,24 +9056,24 @@ "meta-type": "object" }, { - "name": "102", - "members": [ - { - "name": "actual", - "type": "int" - } - ], - "meta-type": "object" - }, - { - "name": "[103]", - "element-type": "103", - "meta-type": "array" - }, - { "name": "103", "members": [ { + "name": "actual", + "type": "int" + } + ], + "meta-type": "object" + }, + { + "name": "[104]", + "element-type": "104", + "meta-type": "array" + }, + { + "name": "104", + "members": [ + { "name": "device", "type": "str" }, @@ -9082,7 +9092,7 @@ { "name": "inserted", "default": null, - "type": "135" + "type": "136" }, { "name": "tray_open", @@ -9092,23 +9102,23 @@ { "name": "io-status", "default": null, - "type": "226" + "type": "229" }, { "name": "dirty-bitmaps", "default": null, - "type": "[227]" + "type": "[230]" } ], "meta-type": "object" }, { - "name": "[104]", - "element-type": "104", + "name": "[105]", + "element-type": "105", "meta-type": "array" }, { - "name": "104", + "name": "105", "members": [ { "name": "type", @@ -9140,7 +9150,7 @@ }, { "name": "io-status", - "type": "226" + "type": "229" }, { "name": "ready", @@ -9150,47 +9160,12 @@ "meta-type": "object" }, { - "name": "105", - "members": [ - { - "name": "query-nodes", - "default": null, - "type": "bool" - } - ], - "meta-type": "object" - }, - { - "name": "[106]", - "element-type": "106", - "meta-type": "array" - }, - { "name": "106", "members": [ { - "name": "device", + "name": "query-nodes", "default": null, - "type": "str" - }, - { - "name": "node-name", - "default": null, - "type": "str" - }, - { - "name": "stats", - "type": "228" - }, - { - "name": "parent", - "default": null, - "type": "106" - }, - { - "name": "backing", - "default": null, - "type": "106" + "type": "bool" } ], "meta-type": "object" @@ -9204,16 +9179,28 @@ "name": "107", "members": [ { - "name": "label", + "name": "device", + "default": null, "type": "str" }, { - "name": "filename", + "name": "node-name", + "default": null, "type": "str" }, { - "name": "frontend-open", - "type": "bool" + "name": "stats", + "type": "231" + }, + { + "name": "parent", + "default": null, + "type": "107" + }, + { + "name": "backing", + "default": null, + "type": "107" } ], "meta-type": "object" @@ -9227,38 +9214,42 @@ "name": "108", "members": [ { - "name": "name", + "name": "label", "type": "str" + }, + { + "name": "filename", + "type": "str" + }, + { + "name": "frontend-open", + "type": "bool" } ], "meta-type": "object" }, { + "name": "[109]", + "element-type": "109", + "meta-type": "array" + }, + { "name": "109", "members": [ { - "name": "option", - "default": null, + "name": "name", "type": "str" } ], "meta-type": "object" }, { - "name": "[110]", - "element-type": "110", - "meta-type": "array" - }, - { "name": "110", "members": [ { "name": "option", + "default": null, "type": "str" - }, - { - "name": "parameters", - "type": "[229]" } ], "meta-type": "object" @@ -9272,8 +9263,12 @@ "name": "111", "members": [ { - "name": "name", + "name": "option", "type": "str" + }, + { + "name": "parameters", + "type": "[232]" } ], "meta-type": "object" @@ -9289,6 +9284,21 @@ { "name": "name", "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "[113]", + "element-type": "113", + "meta-type": "array" + }, + { + "name": "113", + "members": [ + { + "name": "name", + "type": "str" }, { "name": "migration-safe", @@ -9312,25 +9322,15 @@ "meta-type": "object" }, { - "name": "113", - "members": [ - { - "name": "modela", - "type": "230" - }, - { - "name": "modelb", - "type": "230" - } - ], - "meta-type": "object" - }, - { "name": "114", "members": [ { - "name": "model", - "type": "230" + "name": "modela", + "type": "233" + }, + { + "name": "modelb", + "type": "233" } ], "meta-type": "object" @@ -9339,12 +9339,8 @@ "name": "115", "members": [ { - "name": "modela", - "type": "230" - }, - { - "name": "modelb", - "type": "230" + "name": "model", + "type": "233" } ], "meta-type": "object" @@ -9353,12 +9349,12 @@ "name": "116", "members": [ { - "name": "result", - "type": "231" + "name": "modela", + "type": "233" }, { - "name": "responsible-properties", - "type": "[str]" + "name": "modelb", + "type": "233" } ], "meta-type": "object" @@ -9367,12 +9363,12 @@ "name": "117", "members": [ { - "name": "type", - "type": "232" + "name": "result", + "type": "234" }, { - "name": "model", - "type": "230" + "name": "responsible-properties", + "type": "[str]" } ], "meta-type": "object" @@ -9381,44 +9377,58 @@ "name": "118", "members": [ { + "name": "type", + "type": "235" + }, + { "name": "model", - "type": "230" + "type": "233" } ], "meta-type": "object" }, { - "name": "[119]", - "element-type": "119", - "meta-type": "array" - }, - { "name": "119", + "members": [ + { + "name": "model", + "type": "233" + } + ], + "meta-type": "object" + }, + { + "name": "[120]", + "element-type": "120", + "meta-type": "array" + }, + { + "name": "120", "tag": "arch", "variants": [ { "case": "x86", - "type": "234" + "type": "237" }, { "case": "sparc", - "type": "235" + "type": "238" }, { "case": "ppc", - "type": "236" + "type": "239" }, { "case": "mips", - "type": "237" + "type": "240" }, { "case": "tricore", - "type": "238" + "type": "241" }, { "case": "other", - "type": "239" + "type": "242" } ], "members": [ @@ -9444,25 +9454,7 @@ }, { "name": "arch", - "type": "233" - } - ], - "meta-type": "object" - }, - { - "name": "120", - "members": [ - { - "name": "status", - "type": "240" - }, - { - "name": "completed", - "type": "int" - }, - { - "name": "total", - "type": "int" + "type": "236" } ], "meta-type": "object" @@ -9471,23 +9463,26 @@ "name": "121", "members": [ { - "name": "formats", - "type": "[222]" + "name": "status", + "type": "243" + }, + { + "name": "completed", + "type": "int" + }, + { + "name": "total", + "type": "int" } ], "meta-type": "object" }, { - "name": "[122]", - "element-type": "122", - "meta-type": "array" - }, - { "name": "122", "members": [ { - "name": "name", - "type": "str" + "name": "formats", + "type": "[225]" } ], "meta-type": "object" @@ -9501,12 +9496,8 @@ "name": "123", "members": [ { - "name": "fdset-id", - "type": "int" - }, - { - "name": "fds", - "type": "[241]" + "name": "name", + "type": "str" } ], "meta-type": "object" @@ -9520,16 +9511,12 @@ "name": "124", "members": [ { - "name": "version", + "name": "fdset-id", "type": "int" }, { - "name": "emulated", - "type": "bool" - }, - { - "name": "kernel", - "type": "bool" + "name": "fds", + "type": "[244]" } ], "meta-type": "object" @@ -9543,21 +9530,16 @@ "name": "125", "members": [ { - "name": "type", - "type": "str" - }, - { - "name": "vcpus-count", + "name": "version", "type": "int" }, { - "name": "props", - "type": "242" + "name": "emulated", + "type": "bool" }, { - "name": "qom-path", - "default": null, - "type": "str" + "name": "kernel", + "type": "bool" } ], "meta-type": "object" @@ -9571,6 +9553,34 @@ "name": "126", "members": [ { + "name": "type", + "type": "str" + }, + { + "name": "vcpus-count", + "type": "int" + }, + { + "name": "props", + "type": "245" + }, + { + "name": "qom-path", + "default": null, + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "[127]", + "element-type": "127", + "meta-type": "array" + }, + { + "name": "127", + "members": [ + { "name": "id", "type": "str" }, @@ -9594,28 +9604,28 @@ "meta-type": "object" }, { - "name": "127", - "members": [ - { - "name": "enabled", - "type": "bool" - }, - { - "name": "present", - "type": "bool" - } - ], - "meta-type": "object" - }, - { - "name": "[128]", - "element-type": "128", - "meta-type": "array" - }, - { "name": "128", "members": [ { + "name": "enabled", + "type": "bool" + }, + { + "name": "present", + "type": "bool" + } + ], + "meta-type": "object" + }, + { + "name": "[129]", + "element-type": "129", + "meta-type": "array" + }, + { + "name": "129", + "members": [ + { "name": "name", "type": "str" }, @@ -9641,12 +9651,12 @@ "meta-type": "object" }, { - "name": "[129]", - "element-type": "129", + "name": "[130]", + "element-type": "130", "meta-type": "array" }, { - "name": "129", + "name": "130", "members": [ { "name": "id", @@ -9675,29 +9685,7 @@ }, { "name": "policy", - "type": "243" - } - ], - "meta-type": "object" - }, - { - "name": "[130]", - "element-type": "130", - "meta-type": "array" - }, - { - "name": "130", - "tag": "type", - "variants": [ - { - "case": "dimm", - "type": "245" - } - ], - "members": [ - { - "name": "type", - "type": "244" + "type": "246" } ], "meta-type": "object" @@ -9709,30 +9697,52 @@ }, { "name": "131", + "tag": "type", + "variants": [ + { + "case": "dimm", + "type": "248" + } + ], "members": [ { - "name": "name", - "type": "str" - }, - { - "name": "index", - "type": "int" - }, - { - "name": "current", - "type": "bool" - }, - { - "name": "absolute", - "type": "bool" + "name": "type", + "type": "247" } ], "meta-type": "object" }, { + "name": "[132]", + "element-type": "132", + "meta-type": "array" + }, + { "name": "132", "members": [ { + "name": "name", + "type": "str" + }, + { + "name": "index", + "type": "int" + }, + { + "name": "current", + "type": "bool" + }, + { + "name": "absolute", + "type": "bool" + } + ], + "meta-type": "object" + }, + { + "name": "133", + "members": [ + { "name": "status", "default": null, "type": "184" @@ -9740,17 +9750,17 @@ { "name": "ram", "default": null, - "type": "246" + "type": "249" }, { "name": "disk", "default": null, - "type": "246" + "type": "249" }, { "name": "xbzrle-cache", "default": null, - "type": "247" + "type": "250" }, { "name": "total-time", @@ -9791,44 +9801,44 @@ "meta-type": "builtin" }, { - "name": "[133]", - "element-type": "133", + "name": "[134]", + "element-type": "134", "meta-type": "array" }, { - "name": "133", - "members": [ - { - "name": "capability", - "type": "248" - }, - { - "name": "state", - "type": "bool" - } - ], - "meta-type": "object" - }, - { "name": "134", "members": [ { - "name": "name", - "default": null, - "type": "str" + "name": "capability", + "type": "251" + }, + { + "name": "state", + "type": "bool" } ], "meta-type": "object" }, { - "name": "[135]", - "element-type": "135", - "meta-type": "array" - }, - { "name": "135", "members": [ { + "name": "name", + "default": null, + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "[136]", + "element-type": "136", + "meta-type": "array" + }, + { + "name": "136", + "members": [ + { "name": "file", "type": "str" }, @@ -9892,7 +9902,7 @@ }, { "name": "image", - "type": "249" + "type": "252" }, { "name": "bps_max", @@ -9966,7 +9976,7 @@ }, { "name": "cache", - "type": "250" + "type": "253" }, { "name": "write_threshold", @@ -9976,60 +9986,60 @@ "meta-type": "object" }, { - "name": "[136]", - "element-type": "136", - "meta-type": "array" - }, - { - "name": "136", - "members": [ - { - "name": "bus", - "type": "int" - }, - { - "name": "devices", - "type": "[251]" - } - ], - "meta-type": "object" - }, - { "name": "[137]", "element-type": "137", "meta-type": "array" }, { "name": "137", + "members": [ + { + "name": "bus", + "type": "int" + }, + { + "name": "devices", + "type": "[254]" + } + ], + "meta-type": "object" + }, + { + "name": "[138]", + "element-type": "138", + "meta-type": "array" + }, + { + "name": "138", "tag": "meta-type", "variants": [ { "case": "builtin", - "type": "253" + "type": "256" }, { "case": "enum", - "type": "254" + "type": "257" }, { "case": "array", - "type": "255" + "type": "258" }, { "case": "object", - "type": "256" + "type": "259" }, { "case": "alternate", - "type": "257" + "type": "260" }, { "case": "command", - "type": "258" + "type": "261" }, { "case": "event", - "type": "259" + "type": "262" } ], "members": [ @@ -10039,17 +10049,7 @@ }, { "name": "meta-type", - "type": "252" - } - ], - "meta-type": "object" - }, - { - "name": "138", - "members": [ - { - "name": "name", - "type": "str" + "type": "255" } ], "meta-type": "object" @@ -10060,14 +10060,6 @@ { "name": "name", "type": "str" - }, - { - "name": "id", - "type": "int" - }, - { - "name": "ports", - "type": "int" } ], "meta-type": "object" @@ -10080,22 +10072,40 @@ "type": "str" }, { - "name": "tbl-id", - "default": null, + "name": "id", + "type": "int" + }, + { + "name": "ports", "type": "int" } ], "meta-type": "object" }, { - "name": "[141]", - "element-type": "141", - "meta-type": "array" - }, - { "name": "141", "members": [ { + "name": "name", + "type": "str" + }, + { + "name": "tbl-id", + "default": null, + "type": "int" + } + ], + "meta-type": "object" + }, + { + "name": "[142]", + "element-type": "142", + "meta-type": "array" + }, + { + "name": "142", + "members": [ + { "name": "cookie", "type": "int" }, @@ -10105,43 +10115,43 @@ }, { "name": "key", - "type": "260" + "type": "263" }, { "name": "mask", - "type": "261" + "type": "264" }, { "name": "action", - "type": "262" + "type": "265" } ], "meta-type": "object" }, { - "name": "142", - "members": [ - { - "name": "name", - "type": "str" - }, - { - "name": "type", - "default": null, - "type": "int" - } - ], - "meta-type": "object" - }, - { - "name": "[143]", - "element-type": "143", - "meta-type": "array" - }, - { "name": "143", "members": [ { + "name": "name", + "type": "str" + }, + { + "name": "type", + "default": null, + "type": "int" + } + ], + "meta-type": "object" + }, + { + "name": "[144]", + "element-type": "144", + "meta-type": "array" + }, + { + "name": "144", + "members": [ + { "name": "id", "type": "int" }, @@ -10208,26 +10218,26 @@ "meta-type": "object" }, { - "name": "144", - "members": [ - { - "name": "name", - "type": "str" - } - ], - "meta-type": "object" - }, - { - "name": "[145]", - "element-type": "145", - "meta-type": "array" - }, - { "name": "145", "members": [ { "name": "name", "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "[146]", + "element-type": "146", + "meta-type": "array" + }, + { + "name": "146", + "members": [ + { + "name": "name", + "type": "str" }, { "name": "enabled", @@ -10243,36 +10253,36 @@ }, { "name": "duplex", - "type": "263" + "type": "266" }, { "name": "autoneg", - "type": "264" + "type": "267" } ], "meta-type": "object" }, { - "name": "146", - "members": [ - { - "name": "name", - "default": null, - "type": "str" - } - ], - "meta-type": "object" - }, - { - "name": "[147]", - "element-type": "147", - "meta-type": "array" - }, - { "name": "147", "members": [ { "name": "name", + "default": null, + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "[148]", + "element-type": "148", + "meta-type": "array" + }, + { + "name": "148", + "members": [ + { + "name": "name", "type": "str" }, { @@ -10281,15 +10291,15 @@ }, { "name": "multicast", - "type": "265" + "type": "268" }, { "name": "unicast", - "type": "265" + "type": "268" }, { "name": "vlan", - "type": "265" + "type": "268" }, { "name": "broadcast-allowed", @@ -10323,7 +10333,7 @@ "meta-type": "object" }, { - "name": "148", + "name": "149", "members": [ { "name": "enabled", @@ -10360,7 +10370,7 @@ }, { "name": "mouse-mode", - "type": "266" + "type": "269" }, { "name": "channels", @@ -10371,7 +10381,7 @@ "meta-type": "object" }, { - "name": "149", + "name": "150", "members": [ { "name": "running", @@ -10383,40 +10393,17 @@ }, { "name": "status", - "type": "267" + "type": "270" } ], "meta-type": "object" }, { - "name": "150", - "members": [ - { - "name": "arch", - "type": "str" - } - ], - "meta-type": "object" - }, - { - "name": "[151]", - "element-type": "151", - "meta-type": "array" - }, - { "name": "151", "members": [ { - "name": "id", + "name": "arch", "type": "str" - }, - { - "name": "model", - "type": "152" - }, - { - "name": "options", - "type": "268" } ], "meta-type": "object" @@ -10428,10 +10415,21 @@ }, { "name": "152", - "meta-type": "enum", - "values": [ - "tpm-tis" - ] + "members": [ + { + "name": "id", + "type": "str" + }, + { + "name": "model", + "type": "153" + }, + { + "name": "options", + "type": "271" + } + ], + "meta-type": "object" }, { "name": "[153]", @@ -10442,25 +10440,37 @@ "name": "153", "meta-type": "enum", "values": [ - "passthrough" + "tpm-tis" ] }, { + "name": "[154]", + "element-type": "154", + "meta-type": "array" + }, + { "name": "154", - "members": [ - { - "name": "UUID", - "type": "str" - } - ], - "meta-type": "object" + "meta-type": "enum", + "values": [ + "passthrough" + ] }, { "name": "155", "members": [ { + "name": "UUID", + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "156", + "members": [ + { "name": "qemu", - "type": "269" + "type": "272" }, { "name": "package", @@ -10470,96 +10480,81 @@ "meta-type": "object" }, { - "name": "156", - "members": [ - { - "name": "guid", - "type": "str" - } - ], - "meta-type": "object" - }, - { "name": "157", "members": [ { - "name": "enabled", - "type": "bool" - }, - { - "name": "host", - "default": null, + "name": "guid", "type": "str" - }, - { - "name": "family", - "default": null, - "type": "270" - }, - { - "name": "service", - "default": null, - "type": "str" - }, - { - "name": "auth", - "default": null, - "type": "str" - }, - { - "name": "clients", - "default": null, - "type": "[191]" } ], "meta-type": "object" }, { - "name": "[158]", - "element-type": "158", - "meta-type": "array" - }, - { "name": "158", "members": [ { - "name": "id", + "name": "enabled", + "type": "bool" + }, + { + "name": "host", + "default": null, + "type": "str" + }, + { + "name": "family", + "default": null, + "type": "273" + }, + { + "name": "service", + "default": null, "type": "str" }, { - "name": "server", - "type": "[271]" + "name": "auth", + "default": null, + "type": "str" }, { "name": "clients", + "default": null, "type": "[191]" - }, - { - "name": "auth", - "type": "272" - }, - { - "name": "vencrypt", - "default": null, - "type": "273" - }, - { - "name": "display", - "default": null, - "type": "str" } ], "meta-type": "object" }, { + "name": "[159]", + "element-type": "159", + "meta-type": "array" + }, + { "name": "159", "members": [ { - "name": "error", - "type": "bool" + "name": "id", + "type": "str" }, { - "name": "desc", + "name": "server", + "type": "[274]" + }, + { + "name": "clients", + "type": "[191]" + }, + { + "name": "auth", + "type": "275" + }, + { + "name": "vencrypt", + "default": null, + "type": "276" + }, + { + "name": "display", "default": null, "type": "str" } @@ -10570,13 +10565,13 @@ "name": "160", "members": [ { - "name": "fdset-id", - "type": "int" + "name": "error", + "type": "bool" }, { - "name": "fd", + "name": "desc", "default": null, - "type": "int" + "type": "str" } ], "meta-type": "object" @@ -10585,17 +10580,13 @@ "name": "161", "members": [ { - "name": "device", - "type": "str" - }, - { - "name": "size", + "name": "fdset-id", "type": "int" }, { - "name": "format", + "name": "fd", "default": null, - "type": "274" + "type": "int" } ], "meta-type": "object" @@ -10608,13 +10599,13 @@ "type": "str" }, { - "name": "data", - "type": "str" + "name": "size", + "type": "int" }, { "name": "format", "default": null, - "type": "274" + "type": "277" } ], "meta-type": "object" @@ -10623,8 +10614,17 @@ "name": "163", "members": [ { - "name": "filename", + "name": "device", "type": "str" + }, + { + "name": "data", + "type": "str" + }, + { + "name": "format", + "default": null, + "type": "277" } ], "meta-type": "object" @@ -10633,8 +10633,18 @@ "name": "164", "members": [ { + "name": "filename", + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "165", + "members": [ + { "name": "keys", - "type": "[275]" + "type": "[278]" }, { "name": "hold-time", @@ -10645,34 +10655,15 @@ "meta-type": "object" }, { - "name": "165", - "members": [ - { - "name": "name", - "type": "str" - }, - { - "name": "up", - "type": "bool" - } - ], - "meta-type": "object" - }, - { "name": "166", "members": [ { - "name": "protocol", + "name": "name", "type": "str" }, { - "name": "password", - "type": "str" - }, - { - "name": "connected", - "default": null, - "type": "str" + "name": "up", + "type": "bool" } ], "meta-type": "object" @@ -10681,23 +10672,22 @@ "name": "167", "members": [ { - "name": "name", + "name": "protocol", "type": "str" }, { - "name": "vcpu", + "name": "password", + "type": "str" + }, + { + "name": "connected", "default": null, - "type": "int" + "type": "str" } ], "meta-type": "object" }, { - "name": "[168]", - "element-type": "168", - "meta-type": "array" - }, - { "name": "168", "members": [ { @@ -10705,17 +10695,19 @@ "type": "str" }, { - "name": "state", - "type": "276" - }, - { "name": "vcpu", - "type": "bool" + "default": null, + "type": "int" } ], "meta-type": "object" }, { + "name": "[169]", + "element-type": "169", + "meta-type": "array" + }, + { "name": "169", "members": [ { @@ -10723,18 +10715,12 @@ "type": "str" }, { - "name": "enable", - "type": "bool" - }, - { - "name": "ignore-unavailable", - "default": null, - "type": "bool" + "name": "state", + "type": "279" }, { "name": "vcpu", - "default": null, - "type": "int" + "type": "bool" } ], "meta-type": "object" @@ -10743,33 +10729,37 @@ "name": "170", "members": [ { + "name": "name", + "type": "str" + }, + { + "name": "enable", + "type": "bool" + }, + { + "name": "ignore-unavailable", + "default": null, + "type": "bool" + }, + { + "name": "vcpu", + "default": null, + "type": "int" + } + ], + "meta-type": "object" + }, + { + "name": "171", + "members": [ + { "name": "actions", - "type": "[277]" + "type": "[280]" }, { "name": "properties", "default": null, - "type": "278" - } - ], - "meta-type": "object" - }, - { - "name": "171", - "members": [ - { - "name": "parent", - "type": "str" - }, - { - "name": "child", - "default": null, - "type": "str" - }, - { - "name": "node", - "default": null, - "type": "str" + "type": "281" } ], "meta-type": "object" @@ -10778,7 +10768,17 @@ "name": "172", "members": [ { - "name": "node-name", + "name": "parent", + "type": "str" + }, + { + "name": "child", + "default": null, + "type": "str" + }, + { + "name": "node", + "default": null, "type": "str" } ], @@ -10915,13 +10915,13 @@ "variants": [ { "case": "hyper-v", - "type": "280" + "type": "283" } ], "members": [ { "name": "type", - "type": "279" + "type": "282" } ], "meta-type": "object" @@ -10963,7 +10963,7 @@ }, { "name": "family", - "type": "270" + "type": "273" } ], "meta-type": "object" @@ -10981,7 +10981,7 @@ }, { "name": "family", - "type": "270" + "type": "273" }, { "name": "auth", @@ -11004,7 +11004,7 @@ }, { "name": "family", - "type": "270" + "type": "273" }, { "name": "connection-id", @@ -11038,7 +11038,7 @@ }, { "name": "family", - "type": "270" + "type": "273" }, { "name": "websocket", @@ -11065,7 +11065,7 @@ }, { "name": "family", - "type": "270" + "type": "273" }, { "name": "websocket", @@ -11087,7 +11087,7 @@ }, { "name": "family", - "type": "270" + "type": "273" }, { "name": "websocket", @@ -11208,7 +11208,7 @@ "members": [ { "name": "image", - "type": "281" + "type": "284" }, { "name": "config", @@ -11223,12 +11223,12 @@ { "name": "inject-error", "default": null, - "type": "[282]" + "type": "[285]" }, { "name": "set-state", "default": null, - "type": "[283]" + "type": "[286]" } ], "meta-type": "object" @@ -11238,11 +11238,11 @@ "members": [ { "name": "test", - "type": "281" + "type": "284" }, { "name": "raw", - "type": "281" + "type": "284" } ], "meta-type": "object" @@ -11252,7 +11252,7 @@ "members": [ { "name": "file", - "type": "281" + "type": "284" } ], "meta-type": "object" @@ -11267,7 +11267,7 @@ { "name": "aio", "default": null, - "type": "284" + "type": "287" } ], "meta-type": "object" @@ -11276,7 +11276,37 @@ "name": "202", "members": [ { - "name": "filename", + "name": "url", + "type": "str" + }, + { + "name": "readahead", + "default": null, + "type": "int" + }, + { + "name": "timeout", + "default": null, + "type": "int" + }, + { + "name": "username", + "default": null, + "type": "str" + }, + { + "name": "password-secret", + "default": null, + "type": "str" + }, + { + "name": "proxy-username", + "default": null, + "type": "str" + }, + { + "name": "proxy-password-secret", + "default": null, "type": "str" } ], @@ -11286,26 +11316,43 @@ "name": "203", "members": [ { - "name": "volume", + "name": "url", "type": "str" }, { - "name": "path", + "name": "readahead", + "default": null, + "type": "int" + }, + { + "name": "timeout", + "default": null, + "type": "int" + }, + { + "name": "username", + "default": null, "type": "str" }, { - "name": "server", - "type": "[285]" + "name": "password-secret", + "default": null, + "type": "str" }, { - "name": "debug", + "name": "proxy-username", "default": null, - "type": "int" + "type": "str" }, { - "name": "logfile", + "name": "proxy-password-secret", "default": null, "type": "str" + }, + { + "name": "sslverify", + "default": null, + "type": "bool" } ], "meta-type": "object" @@ -11314,8 +11361,131 @@ "name": "204", "members": [ { + "name": "volume", + "type": "str" + }, + { + "name": "path", + "type": "str" + }, + { + "name": "server", + "type": "[288]" + }, + { + "name": "debug", + "default": null, + "type": "int" + }, + { + "name": "logfile", + "default": null, + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "205", + "members": [ + { + "name": "url", + "type": "str" + }, + { + "name": "readahead", + "default": null, + "type": "int" + }, + { + "name": "timeout", + "default": null, + "type": "int" + }, + { + "name": "username", + "default": null, + "type": "str" + }, + { + "name": "password-secret", + "default": null, + "type": "str" + }, + { + "name": "proxy-username", + "default": null, + "type": "str" + }, + { + "name": "proxy-password-secret", + "default": null, + "type": "str" + }, + { + "name": "cookie", + "default": null, + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "206", + "members": [ + { + "name": "url", + "type": "str" + }, + { + "name": "readahead", + "default": null, + "type": "int" + }, + { + "name": "timeout", + "default": null, + "type": "int" + }, + { + "name": "username", + "default": null, + "type": "str" + }, + { + "name": "password-secret", + "default": null, + "type": "str" + }, + { + "name": "proxy-username", + "default": null, + "type": "str" + }, + { + "name": "proxy-password-secret", + "default": null, + "type": "str" + }, + { + "name": "cookie", + "default": null, + "type": "str" + }, + { + "name": "sslverify", + "default": null, + "type": "bool" + } + ], + "meta-type": "object" + }, + { + "name": "207", + "members": [ + { "name": "transport", - "type": "286" + "type": "289" }, { "name": "portal", @@ -11348,7 +11518,7 @@ { "name": "header-digest", "default": null, - "type": "287" + "type": "290" }, { "name": "timeout", @@ -11359,11 +11529,11 @@ "meta-type": "object" }, { - "name": "205", + "name": "208", "members": [ { "name": "file", - "type": "281" + "type": "284" }, { "name": "key-secret", @@ -11374,11 +11544,11 @@ "meta-type": "object" }, { - "name": "206", + "name": "209", "members": [ { "name": "server", - "type": "224" + "type": "288" }, { "name": "export", @@ -11394,11 +11564,11 @@ "meta-type": "object" }, { - "name": "207", + "name": "210", "members": [ { "name": "server", - "type": "288" + "type": "291" }, { "name": "path", @@ -11438,7 +11608,7 @@ "meta-type": "object" }, { - "name": "208", + "name": "211", "members": [ { "name": "size", @@ -11454,16 +11624,16 @@ "meta-type": "object" }, { - "name": "209", + "name": "212", "members": [ { "name": "file", - "type": "281" + "type": "284" }, { "name": "backing", "default": null, - "type": "281" + "type": "284" }, { "name": "lazy-refcounts", @@ -11488,7 +11658,7 @@ { "name": "overlap-check", "default": null, - "type": "289" + "type": "292" }, { "name": "cache-size", @@ -11514,22 +11684,22 @@ "meta-type": "object" }, { - "name": "210", + "name": "213", "members": [ { "name": "file", - "type": "281" + "type": "284" }, { "name": "backing", "default": null, - "type": "281" + "type": "284" } ], "meta-type": "object" }, { - "name": "211", + "name": "214", "members": [ { "name": "blkverify", @@ -11538,7 +11708,7 @@ }, { "name": "children", - "type": "[281]" + "type": "[284]" }, { "name": "vote-threshold", @@ -11552,17 +11722,17 @@ { "name": "read-pattern", "default": null, - "type": "290" + "type": "293" } ], "meta-type": "object" }, { - "name": "212", + "name": "215", "members": [ { "name": "file", - "type": "281" + "type": "284" }, { "name": "offset", @@ -11578,7 +11748,7 @@ "meta-type": "object" }, { - "name": "213", + "name": "216", "members": [ { "name": "pool", @@ -11606,31 +11776,21 @@ { "name": "server", "default": null, - "type": "[291]" - }, - { - "name": "auth-supported", - "default": null, - "type": "[292]" - }, - { - "name": "password-secret", - "default": null, - "type": "str" + "type": "[294]" } ], "meta-type": "object" }, { - "name": "214", + "name": "217", "members": [ { "name": "file", - "type": "281" + "type": "284" }, { "name": "mode", - "type": "293" + "type": "295" }, { "name": "top-id", @@ -11641,11 +11801,11 @@ "meta-type": "object" }, { - "name": "215", + "name": "218", "members": [ { - "name": "addr", - "type": "285" + "name": "server", + "type": "288" }, { "name": "vdi", @@ -11665,11 +11825,11 @@ "meta-type": "object" }, { - "name": "216", + "name": "219", "members": [ { "name": "server", - "type": "291" + "type": "296" }, { "name": "path", @@ -11684,7 +11844,7 @@ "meta-type": "object" }, { - "name": "217", + "name": "220", "members": [ { "name": "dir", @@ -11714,7 +11874,7 @@ "meta-type": "object" }, { - "name": "218", + "name": "221", "meta-type": "enum", "values": [ "top", @@ -11724,7 +11884,7 @@ ] }, { - "name": "219", + "name": "222", "meta-type": "enum", "values": [ "retain", @@ -11733,7 +11893,7 @@ ] }, { - "name": "220", + "name": "223", "meta-type": "enum", "values": [ "existing", @@ -11741,100 +11901,100 @@ ] }, { - "name": "221", + "name": "224", "tag": "type", "variants": [ { "case": "file", - "type": "295" + "type": "298" }, { "case": "serial", - "type": "296" + "type": "299" }, { "case": "parallel", - "type": "296" + "type": "299" }, { "case": "pipe", - "type": "296" + "type": "299" }, { "case": "socket", - "type": "297" + "type": "300" }, { "case": "udp", - "type": "298" + "type": "301" }, { "case": "pty", - "type": "299" + "type": "302" }, { "case": "null", - "type": "299" + "type": "302" }, { "case": "mux", - "type": "300" + "type": "303" }, { "case": "msmouse", - "type": "299" + "type": "302" }, { "case": "wctablet", - "type": "299" + "type": "302" }, { "case": "braille", - "type": "299" + "type": "302" }, { "case": "testdev", - "type": "299" + "type": "302" }, { "case": "stdio", - "type": "301" + "type": "304" }, { "case": "console", - "type": "299" + "type": "302" }, { "case": "spicevmc", - "type": "302" + "type": "305" }, { "case": "spiceport", - "type": "303" + "type": "306" }, { "case": "vc", - "type": "304" + "type": "307" }, { "case": "ringbuf", - "type": "305" + "type": "308" }, { "case": "memory", - "type": "305" + "type": "308" } ], "members": [ { "name": "type", - "type": "294" + "type": "297" } ], "meta-type": "object" }, { - "name": "222", + "name": "225", "meta-type": "enum", "values": [ "elf", @@ -11844,35 +12004,35 @@ ] }, { - "name": "[223]", - "element-type": "223", + "name": "[226]", + "element-type": "226", "meta-type": "array" }, { - "name": "223", + "name": "226", "tag": "type", "variants": [ { "case": "key", - "type": "307" + "type": "310" }, { "case": "btn", - "type": "308" + "type": "311" }, { "case": "rel", - "type": "309" + "type": "312" }, { "case": "abs", - "type": "309" + "type": "312" } ], "members": [ { "name": "type", - "type": "306" + "type": "309" } ], "meta-type": "object" @@ -11883,36 +12043,36 @@ "meta-type": "builtin" }, { - "name": "224", + "name": "227", "tag": "type", "variants": [ { "case": "inet", - "type": "311" - }, - { - "case": "unix", - "type": "312" - }, - { - "case": "vsock", - "type": "313" - }, - { - "case": "fd", "type": "314" + }, + { + "case": "unix", + "type": "315" + }, + { + "case": "vsock", + "type": "316" + }, + { + "case": "fd", + "type": "317" } ], "members": [ { "name": "type", - "type": "310" + "type": "313" } ], "meta-type": "object" }, { - "name": "225", + "name": "228", "meta-type": "enum", "values": [ "DIMM", @@ -11920,7 +12080,7 @@ ] }, { - "name": "226", + "name": "229", "meta-type": "enum", "values": [ "ok", @@ -11929,12 +12089,12 @@ ] }, { - "name": "[227]", - "element-type": "227", + "name": "[230]", + "element-type": "230", "meta-type": "array" }, { - "name": "227", + "name": "230", "members": [ { "name": "name", @@ -11951,13 +12111,13 @@ }, { "name": "status", - "type": "315" + "type": "318" } ], "meta-type": "object" }, { - "name": "228", + "name": "231", "members": [ { "name": "rd_bytes", @@ -12042,18 +12202,18 @@ }, { "name": "timed_stats", - "type": "[316]" + "type": "[319]" } ], "meta-type": "object" }, { - "name": "[229]", - "element-type": "229", + "name": "[232]", + "element-type": "232", "meta-type": "array" }, { - "name": "229", + "name": "232", "members": [ { "name": "name", @@ -12061,7 +12221,7 @@ }, { "name": "type", - "type": "317" + "type": "320" }, { "name": "help", @@ -12082,7 +12242,7 @@ "meta-type": "array" }, { - "name": "230", + "name": "233", "members": [ { "name": "name", @@ -12097,7 +12257,7 @@ "meta-type": "object" }, { - "name": "231", + "name": "234", "meta-type": "enum", "values": [ "incompatible", @@ -12107,7 +12267,7 @@ ] }, { - "name": "232", + "name": "235", "meta-type": "enum", "values": [ "static", @@ -12115,7 +12275,7 @@ ] }, { - "name": "233", + "name": "236", "meta-type": "enum", "values": [ "x86", @@ -12127,44 +12287,10 @@ ] }, { - "name": "234", - "members": [ - { - "name": "pc", - "type": "int" - } - ], - "meta-type": "object" - }, - { - "name": "235", - "members": [ - { - "name": "pc", - "type": "int" - }, - { - "name": "npc", - "type": "int" - } - ], - "meta-type": "object" - }, - { - "name": "236", - "members": [ - { - "name": "nip", - "type": "int" - } - ], - "meta-type": "object" - }, - { "name": "237", "members": [ { - "name": "PC", + "name": "pc", "type": "int" } ], @@ -12174,7 +12300,11 @@ "name": "238", "members": [ { - "name": "PC", + "name": "pc", + "type": "int" + }, + { + "name": "npc", "type": "int" } ], @@ -12183,40 +12313,29 @@ { "name": "239", "members": [ + { + "name": "nip", + "type": "int" + } ], "meta-type": "object" }, { "name": "240", - "meta-type": "enum", - "values": [ - "none", - "active", - "completed", - "failed" - ] - }, - { - "name": "[222]", - "element-type": "222", - "meta-type": "array" - }, - { - "name": "[241]", - "element-type": "241", - "meta-type": "array" + "members": [ + { + "name": "PC", + "type": "int" + } + ], + "meta-type": "object" }, { "name": "241", "members": [ { - "name": "fd", + "name": "PC", "type": "int" - }, - { - "name": "opaque", - "default": null, - "type": "str" } ], "meta-type": "object" @@ -12224,6 +12343,47 @@ { "name": "242", "members": [ + ], + "meta-type": "object" + }, + { + "name": "243", + "meta-type": "enum", + "values": [ + "none", + "active", + "completed", + "failed" + ] + }, + { + "name": "[225]", + "element-type": "225", + "meta-type": "array" + }, + { + "name": "[244]", + "element-type": "244", + "meta-type": "array" + }, + { + "name": "244", + "members": [ + { + "name": "fd", + "type": "int" + }, + { + "name": "opaque", + "default": null, + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "245", + "members": [ { "name": "node-id", "default": null, @@ -12253,7 +12413,7 @@ "meta-type": "array" }, { - "name": "243", + "name": "246", "meta-type": "enum", "values": [ "default", @@ -12263,24 +12423,24 @@ ] }, { - "name": "244", + "name": "247", "meta-type": "enum", "values": [ "dimm" ] }, { - "name": "245", + "name": "248", "members": [ { "name": "data", - "type": "318" + "type": "321" } ], "meta-type": "object" }, { - "name": "246", + "name": "249", "members": [ { "name": "transferred", @@ -12330,7 +12490,7 @@ "meta-type": "object" }, { - "name": "247", + "name": "250", "members": [ { "name": "cache-size", @@ -12360,7 +12520,7 @@ "meta-type": "object" }, { - "name": "248", + "name": "251", "meta-type": "enum", "values": [ "xbzrle", @@ -12375,7 +12535,7 @@ ] }, { - "name": "249", + "name": "252", "members": [ { "name": "filename", @@ -12432,23 +12592,23 @@ { "name": "snapshots", "default": null, - "type": "[54]" + "type": "[55]" }, { "name": "backing-image", "default": null, - "type": "249" + "type": "252" }, { "name": "format-specific", "default": null, - "type": "319" + "type": "322" } ], "meta-type": "object" }, { - "name": "250", + "name": "253", "members": [ { "name": "writeback", @@ -12466,12 +12626,12 @@ "meta-type": "object" }, { - "name": "[251]", - "element-type": "251", + "name": "[254]", + "element-type": "254", "meta-type": "array" }, { - "name": "251", + "name": "254", "members": [ { "name": "bus", @@ -12487,11 +12647,11 @@ }, { "name": "class_info", - "type": "320" + "type": "323" }, { "name": "id", - "type": "321" + "type": "324" }, { "name": "irq", @@ -12505,17 +12665,17 @@ { "name": "pci_bridge", "default": null, - "type": "322" + "type": "325" }, { "name": "regions", - "type": "[323]" + "type": "[326]" } ], "meta-type": "object" }, { - "name": "252", + "name": "255", "meta-type": "enum", "values": [ "builtin", @@ -12528,51 +12688,11 @@ ] }, { - "name": "253", - "members": [ - { - "name": "json-type", - "type": "324" - } - ], - "meta-type": "object" - }, - { - "name": "254", - "members": [ - { - "name": "values", - "type": "[str]" - } - ], - "meta-type": "object" - }, - { - "name": "255", - "members": [ - { - "name": "element-type", - "type": "str" - } - ], - "meta-type": "object" - }, - { "name": "256", "members": [ { - "name": "members", - "type": "[325]" - }, - { - "name": "tag", - "default": null, - "type": "str" - }, - { - "name": "variants", - "default": null, - "type": "[326]" + "name": "json-type", + "type": "327" } ], "meta-type": "object" @@ -12581,8 +12701,8 @@ "name": "257", "members": [ { - "name": "members", - "type": "[327]" + "name": "values", + "type": "[str]" } ], "meta-type": "object" @@ -12591,11 +12711,7 @@ "name": "258", "members": [ { - "name": "arg-type", - "type": "str" - }, - { - "name": "ret-type", + "name": "element-type", "type": "str" } ], @@ -12605,8 +12721,18 @@ "name": "259", "members": [ { - "name": "arg-type", + "name": "members", + "type": "[328]" + }, + { + "name": "tag", + "default": null, "type": "str" + }, + { + "name": "variants", + "default": null, + "type": "[329]" } ], "meta-type": "object" @@ -12615,6 +12741,40 @@ "name": "260", "members": [ { + "name": "members", + "type": "[330]" + } + ], + "meta-type": "object" + }, + { + "name": "261", + "members": [ + { + "name": "arg-type", + "type": "str" + }, + { + "name": "ret-type", + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "262", + "members": [ + { + "name": "arg-type", + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "263", + "members": [ + { "name": "priority", "type": "int" }, @@ -12671,7 +12831,7 @@ "meta-type": "object" }, { - "name": "261", + "name": "264", "members": [ { "name": "in-pport", @@ -12712,7 +12872,7 @@ "meta-type": "object" }, { - "name": "262", + "name": "265", "members": [ { "name": "goto-tbl", @@ -12748,7 +12908,7 @@ "meta-type": "object" }, { - "name": "263", + "name": "266", "meta-type": "enum", "values": [ "half", @@ -12756,7 +12916,7 @@ ] }, { - "name": "264", + "name": "267", "meta-type": "enum", "values": [ "off", @@ -12764,7 +12924,7 @@ ] }, { - "name": "265", + "name": "268", "meta-type": "enum", "values": [ "normal", @@ -12773,7 +12933,7 @@ ] }, { - "name": "266", + "name": "269", "meta-type": "enum", "values": [ "client", @@ -12787,7 +12947,7 @@ "meta-type": "array" }, { - "name": "267", + "name": "270", "meta-type": "enum", "values": [ "debug", @@ -12809,24 +12969,24 @@ ] }, { - "name": "268", + "name": "271", "tag": "type", "variants": [ { "case": "passthrough", - "type": "329" + "type": "332" } ], "members": [ { "name": "type", - "type": "328" + "type": "331" } ], "meta-type": "object" }, { - "name": "269", + "name": "272", "members": [ { "name": "major", @@ -12844,7 +13004,7 @@ "meta-type": "object" }, { - "name": "270", + "name": "273", "meta-type": "enum", "values": [ "ipv4", @@ -12860,12 +13020,12 @@ "meta-type": "array" }, { - "name": "[271]", - "element-type": "271", + "name": "[274]", + "element-type": "274", "meta-type": "array" }, { - "name": "271", + "name": "274", "members": [ { "name": "host", @@ -12877,7 +13037,7 @@ }, { "name": "family", - "type": "270" + "type": "273" }, { "name": "websocket", @@ -12885,18 +13045,18 @@ }, { "name": "auth", - "type": "272" + "type": "275" }, { "name": "vencrypt", "default": null, - "type": "273" + "type": "276" } ], "meta-type": "object" }, { - "name": "272", + "name": "275", "meta-type": "enum", "values": [ "none", @@ -12911,7 +13071,7 @@ ] }, { - "name": "273", + "name": "276", "meta-type": "enum", "values": [ "plain", @@ -12926,7 +13086,7 @@ ] }, { - "name": "274", + "name": "277", "meta-type": "enum", "values": [ "utf8", @@ -12934,33 +13094,33 @@ ] }, { - "name": "[275]", - "element-type": "275", + "name": "[278]", + "element-type": "278", "meta-type": "array" }, { - "name": "275", + "name": "278", "tag": "type", "variants": [ { "case": "number", - "type": "331" + "type": "334" }, { "case": "qcode", - "type": "332" + "type": "335" } ], "members": [ { "name": "type", - "type": "330" + "type": "333" } ], "meta-type": "object" }, { - "name": "276", + "name": "279", "meta-type": "enum", "values": [ "unavailable", @@ -12969,75 +13129,75 @@ ] }, { - "name": "[277]", - "element-type": "277", + "name": "[280]", + "element-type": "280", "meta-type": "array" }, { - "name": "277", + "name": "280", "tag": "type", "variants": [ { "case": "abort", - "type": "334" + "type": "337" }, { "case": "block-dirty-bitmap-add", - "type": "335" + "type": "338" }, { "case": "block-dirty-bitmap-clear", - "type": "336" + "type": "339" }, { "case": "blockdev-backup", - "type": "337" + "type": "340" }, { "case": "blockdev-snapshot", - "type": "338" + "type": "341" }, { "case": "blockdev-snapshot-internal-sync", - "type": "339" + "type": "342" }, { "case": "blockdev-snapshot-sync", - "type": "340" + "type": "343" }, { "case": "drive-backup", - "type": "341" + "type": "344" } ], "members": [ { "name": "type", - "type": "333" + "type": "336" } ], "meta-type": "object" }, { - "name": "278", + "name": "281", "members": [ { "name": "completion-mode", "default": null, - "type": "342" + "type": "345" } ], "meta-type": "object" }, { - "name": "279", + "name": "282", "meta-type": "enum", "values": [ "hyper-v" ] }, { - "name": "280", + "name": "283", "members": [ { "name": "arg1", @@ -13063,7 +13223,7 @@ "meta-type": "object" }, { - "name": "281", + "name": "284", "members": [ { "type": "46" @@ -13075,16 +13235,16 @@ "meta-type": "alternate" }, { - "name": "[282]", - "element-type": "282", + "name": "[285]", + "element-type": "285", "meta-type": "array" }, { - "name": "282", + "name": "285", "members": [ { "name": "event", - "type": "343" + "type": "346" }, { "name": "state", @@ -13115,16 +13275,16 @@ "meta-type": "object" }, { - "name": "[283]", - "element-type": "283", + "name": "[286]", + "element-type": "286", "meta-type": "array" }, { - "name": "283", + "name": "286", "members": [ { "name": "event", - "type": "343" + "type": "346" }, { "name": "state", @@ -13139,7 +13299,7 @@ "meta-type": "object" }, { - "name": "284", + "name": "287", "meta-type": "enum", "values": [ "threads", @@ -13147,33 +13307,41 @@ ] }, { - "name": "[285]", - "element-type": "285", + "name": "[288]", + "element-type": "288", "meta-type": "array" }, { - "name": "285", + "name": "288", "tag": "type", "variants": [ { - "case": "unix", - "type": "345" - }, - { "case": "inet", - "type": "291" + "type": "296" + }, + { + "case": "unix", + "type": "348" + }, + { + "case": "vsock", + "type": "349" + }, + { + "case": "fd", + "type": "350" } ], "members": [ { "name": "type", - "type": "344" + "type": "347" } ], "meta-type": "object" }, { - "name": "286", + "name": "289", "meta-type": "enum", "values": [ "tcp", @@ -13181,7 +13349,7 @@ ] }, { - "name": "287", + "name": "290", "meta-type": "enum", "values": [ "crc32c", @@ -13191,108 +13359,107 @@ ] }, { - "name": "288", - "members": [ - { - "name": "type", - "type": "346" - }, - { - "name": "host", - "type": "str" - } - ], - "meta-type": "object" - }, - { - "name": "289", - "members": [ - { - "type": "347" - }, - { - "type": "348" - } - ], - "meta-type": "alternate" - }, - { - "name": "[281]", - "element-type": "281", - "meta-type": "array" - }, - { - "name": "290", - "meta-type": "enum", - "values": [ - "quorum", - "fifo" - ] - }, - { - "name": "[291]", - "element-type": "291", - "meta-type": "array" - }, - { "name": "291", "members": [ { + "name": "type", + "type": "351" + }, + { "name": "host", "type": "str" - }, - { - "name": "port", - "type": "str" - }, - { - "name": "numeric", - "default": null, - "type": "bool" - }, - { - "name": "to", - "default": null, - "type": "int" - }, - { - "name": "ipv4", - "default": null, - "type": "bool" - }, - { - "name": "ipv6", - "default": null, - "type": "bool" } ], "meta-type": "object" }, { - "name": "[292]", - "element-type": "292", - "meta-type": "array" - }, - { "name": "292", "members": [ { - "name": "auth", - "type": "349" + "type": "352" + }, + { + "type": "353" } ], - "meta-type": "object" + "meta-type": "alternate" + }, + { + "name": "[284]", + "element-type": "284", + "meta-type": "array" }, { "name": "293", "meta-type": "enum", "values": [ + "quorum", + "fifo" + ] + }, + { + "name": "[294]", + "element-type": "294", + "meta-type": "array" + }, + { + "name": "294", + "members": [ + { + "name": "host", + "type": "str" + }, + { + "name": "port", + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "295", + "meta-type": "enum", + "values": [ "primary", "secondary" ] }, { - "name": "294", + "name": "296", + "members": [ + { + "name": "host", + "type": "str" + }, + { + "name": "port", + "type": "str" + }, + { + "name": "numeric", + "default": null, + "type": "bool" + }, + { + "name": "to", + "default": null, + "type": "int" + }, + { + "name": "ipv4", + "default": null, + "type": "bool" + }, + { + "name": "ipv6", + "default": null, + "type": "bool" + } + ], + "meta-type": "object" + }, + { + "name": "297", "meta-type": "enum", "values": [ "file", @@ -13318,57 +13485,17 @@ ] }, { - "name": "295", - "members": [ - { - "name": "data", - "type": "350" - } - ], - "meta-type": "object" - }, - { - "name": "296", - "members": [ - { - "name": "data", - "type": "351" - } - ], - "meta-type": "object" - }, - { - "name": "297", - "members": [ - { - "name": "data", - "type": "352" - } - ], - "meta-type": "object" - }, - { "name": "298", "members": [ { "name": "data", - "type": "353" - } - ], - "meta-type": "object" - }, - { - "name": "299", - "members": [ - { - "name": "data", "type": "354" } ], "meta-type": "object" }, { - "name": "300", + "name": "299", "members": [ { "name": "data", @@ -13378,7 +13505,7 @@ "meta-type": "object" }, { - "name": "301", + "name": "300", "members": [ { "name": "data", @@ -13388,7 +13515,7 @@ "meta-type": "object" }, { - "name": "302", + "name": "301", "members": [ { "name": "data", @@ -13398,7 +13525,7 @@ "meta-type": "object" }, { - "name": "303", + "name": "302", "members": [ { "name": "data", @@ -13408,7 +13535,7 @@ "meta-type": "object" }, { - "name": "304", + "name": "303", "members": [ { "name": "data", @@ -13418,7 +13545,7 @@ "meta-type": "object" }, { - "name": "305", + "name": "304", "members": [ { "name": "data", @@ -13428,7 +13555,47 @@ "meta-type": "object" }, { + "name": "305", + "members": [ + { + "name": "data", + "type": "361" + } + ], + "meta-type": "object" + }, + { "name": "306", + "members": [ + { + "name": "data", + "type": "362" + } + ], + "meta-type": "object" + }, + { + "name": "307", + "members": [ + { + "name": "data", + "type": "363" + } + ], + "meta-type": "object" + }, + { + "name": "308", + "members": [ + { + "name": "data", + "type": "364" + } + ], + "meta-type": "object" + }, + { + "name": "309", "meta-type": "enum", "values": [ "key", @@ -13438,51 +13605,21 @@ ] }, { - "name": "307", - "members": [ - { - "name": "data", - "type": "361" - } - ], - "meta-type": "object" - }, - { - "name": "308", - "members": [ - { - "name": "data", - "type": "362" - } - ], - "meta-type": "object" - }, - { - "name": "309", - "members": [ - { - "name": "data", - "type": "363" - } - ], - "meta-type": "object" - }, - { "name": "310", - "meta-type": "enum", - "values": [ - "inet", - "unix", - "vsock", - "fd" - ] + "members": [ + { + "name": "data", + "type": "365" + } + ], + "meta-type": "object" }, { "name": "311", "members": [ { "name": "data", - "type": "291" + "type": "366" } ], "meta-type": "object" @@ -13492,49 +13629,79 @@ "members": [ { "name": "data", - "type": "345" + "type": "367" } ], "meta-type": "object" }, { "name": "313", - "members": [ - { - "name": "data", - "type": "364" - } - ], - "meta-type": "object" + "meta-type": "enum", + "values": [ + "inet", + "unix", + "vsock", + "fd" + ] }, { "name": "314", "members": [ { "name": "data", - "type": "365" + "type": "296" } ], "meta-type": "object" }, { "name": "315", - "meta-type": "enum", - "values": [ - "active", - "disabled", - "frozen" - ] - }, - { - "name": "[316]", - "element-type": "316", - "meta-type": "array" + "members": [ + { + "name": "data", + "type": "348" + } + ], + "meta-type": "object" }, { "name": "316", "members": [ { + "name": "data", + "type": "349" + } + ], + "meta-type": "object" + }, + { + "name": "317", + "members": [ + { + "name": "data", + "type": "350" + } + ], + "meta-type": "object" + }, + { + "name": "318", + "meta-type": "enum", + "values": [ + "active", + "disabled", + "frozen" + ] + }, + { + "name": "[319]", + "element-type": "319", + "meta-type": "array" + }, + { + "name": "319", + "members": [ + { "name": "interval_length", "type": "int" }, @@ -13586,7 +13753,7 @@ "meta-type": "object" }, { - "name": "317", + "name": "320", "meta-type": "enum", "values": [ "string", @@ -13596,7 +13763,7 @@ ] }, { - "name": "318", + "name": "321", "members": [ { "name": "id", @@ -13635,150 +13802,75 @@ "meta-type": "object" }, { - "name": "[54]", - "element-type": "54", + "name": "[55]", + "element-type": "55", "meta-type": "array" }, { - "name": "319", - "tag": "type", - "variants": [ - { - "case": "qcow2", - "type": "367" - }, - { - "case": "vmdk", - "type": "368" - }, - { - "case": "luks", - "type": "369" - } - ], - "members": [ - { - "name": "type", - "type": "366" - } - ], - "meta-type": "object" - }, - { - "name": "320", - "members": [ - { - "name": "desc", - "default": null, - "type": "str" - }, - { - "name": "class", - "type": "int" - } - ], - "meta-type": "object" - }, - { - "name": "321", - "members": [ - { - "name": "device", - "type": "int" - }, - { - "name": "vendor", - "type": "int" - } - ], - "meta-type": "object" - }, - { "name": "322", - "members": [ + "tag": "type", + "variants": [ { - "name": "bus", + "case": "qcow2", + "type": "369" + }, + { + "case": "vmdk", "type": "370" }, { - "name": "devices", - "default": null, - "type": "[251]" + "case": "luks", + "type": "371" + } + ], + "members": [ + { + "name": "type", + "type": "368" } ], "meta-type": "object" }, { - "name": "[323]", - "element-type": "323", - "meta-type": "array" - }, - { "name": "323", "members": [ { - "name": "bar", - "type": "int" - }, - { - "name": "type", + "name": "desc", + "default": null, "type": "str" }, { - "name": "address", + "name": "class", "type": "int" - }, - { - "name": "size", - "type": "int" - }, - { - "name": "prefetch", - "default": null, - "type": "bool" - }, - { - "name": "mem_type_64", - "default": null, - "type": "bool" } ], "meta-type": "object" }, { "name": "324", - "meta-type": "enum", - "values": [ - "string", - "number", - "int", - "boolean", - "null", - "object", - "array", - "value" - ] - }, - { - "name": "[325]", - "element-type": "325", - "meta-type": "array" + "members": [ + { + "name": "device", + "type": "int" + }, + { + "name": "vendor", + "type": "int" + } + ], + "meta-type": "object" }, { "name": "325", "members": [ { - "name": "name", - "type": "str" + "name": "bus", + "type": "372" }, { - "name": "type", - "type": "str" - }, - { - "name": "default", + "name": "devices", "default": null, - "type": "any" + "type": "[254]" } ], "meta-type": "object" @@ -13792,72 +13884,119 @@ "name": "326", "members": [ { - "name": "case", - "type": "str" + "name": "bar", + "type": "int" }, { "name": "type", "type": "str" + }, + { + "name": "address", + "type": "int" + }, + { + "name": "size", + "type": "int" + }, + { + "name": "prefetch", + "default": null, + "type": "bool" + }, + { + "name": "mem_type_64", + "default": null, + "type": "bool" } ], "meta-type": "object" }, { - "name": "[327]", - "element-type": "327", - "meta-type": "array" - }, - { "name": "327", - "members": [ - { - "name": "type", - "type": "str" - } - ], - "meta-type": "object" + "meta-type": "enum", + "values": [ + "string", + "number", + "int", + "boolean", + "null", + "object", + "array", + "value" + ] + }, + { + "name": "[328]", + "element-type": "328", + "meta-type": "array" }, { "name": "328", - "meta-type": "enum", - "values": [ - "passthrough" - ] + "members": [ + { + "name": "name", + "type": "str" + }, + { + "name": "type", + "type": "str" + }, + { + "name": "default", + "default": null, + "type": "any" + } + ], + "meta-type": "object" + }, + { + "name": "[329]", + "element-type": "329", + "meta-type": "array" }, { "name": "329", "members": [ { - "name": "data", - "type": "371" + "name": "case", + "type": "str" + }, + { + "name": "type", + "type": "str" } ], "meta-type": "object" }, { + "name": "[330]", + "element-type": "330", + "meta-type": "array" + }, + { "name": "330", - "meta-type": "enum", - "values": [ - "number", - "qcode" - ] + "members": [ + { + "name": "type", + "type": "str" + } + ], + "meta-type": "object" }, { "name": "331", - "members": [ - { - "name": "data", - "type": "int" - } - ], - "meta-type": "object" + "meta-type": "enum", + "values": [ + "passthrough" + ] }, { "name": "332", "members": [ { "name": "data", - "type": "372" + "type": "373" } ], "meta-type": "object" @@ -13866,6 +14005,34 @@ "name": "333", "meta-type": "enum", "values": [ + "number", + "qcode" + ] + }, + { + "name": "334", + "members": [ + { + "name": "data", + "type": "int" + } + ], + "meta-type": "object" + }, + { + "name": "335", + "members": [ + { + "name": "data", + "type": "374" + } + ], + "meta-type": "object" + }, + { + "name": "336", + "meta-type": "enum", + "values": [ "abort", "block-dirty-bitmap-add", "block-dirty-bitmap-clear", @@ -13877,41 +14044,11 @@ ] }, { - "name": "334", - "members": [ - { - "name": "data", - "type": "373" - } - ], - "meta-type": "object" - }, - { - "name": "335", - "members": [ - { - "name": "data", - "type": "34" - } - ], - "meta-type": "object" - }, - { - "name": "336", - "members": [ - { - "name": "data", - "type": "35" - } - ], - "meta-type": "object" - }, - { "name": "337", "members": [ { "name": "data", - "type": "47" + "type": "375" } ], "meta-type": "object" @@ -13921,7 +14058,7 @@ "members": [ { "name": "data", - "type": "52" + "type": "34" } ], "meta-type": "object" @@ -13931,7 +14068,7 @@ "members": [ { "name": "data", - "type": "55" + "type": "35" } ], "meta-type": "object" @@ -13941,7 +14078,7 @@ "members": [ { "name": "data", - "type": "56" + "type": "47" } ], "meta-type": "object" @@ -13951,13 +14088,43 @@ "members": [ { "name": "data", - "type": "71" + "type": "53" } ], "meta-type": "object" }, { "name": "342", + "members": [ + { + "name": "data", + "type": "56" + } + ], + "meta-type": "object" + }, + { + "name": "343", + "members": [ + { + "name": "data", + "type": "57" + } + ], + "meta-type": "object" + }, + { + "name": "344", + "members": [ + { + "name": "data", + "type": "72" + } + ], + "meta-type": "object" + }, + { + "name": "345", "meta-type": "enum", "values": [ "individual", @@ -13965,7 +14132,7 @@ ] }, { - "name": "343", + "name": "346", "meta-type": "enum", "values": [ "l1_update", @@ -14014,37 +14181,63 @@ ] }, { - "name": "344", - "meta-type": "enum", - "values": [ - "unix", - "inet" - ] - }, - { - "name": "345", - "members": [ - { - "name": "path", - "type": "str" - } - ], - "meta-type": "object" - }, - { - "name": "346", - "meta-type": "enum", - "values": [ - "inet" - ] - }, - { "name": "347", + "meta-type": "enum", + "values": [ + "inet", + "unix", + "vsock", + "fd" + ] + }, + { + "name": "348", + "members": [ + { + "name": "path", + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "349", + "members": [ + { + "name": "cid", + "type": "str" + }, + { + "name": "port", + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "350", + "members": [ + { + "name": "str", + "type": "str" + } + ], + "meta-type": "object" + }, + { + "name": "351", + "meta-type": "enum", + "values": [ + "inet" + ] + }, + { + "name": "352", "members": [ { "name": "template", "default": null, - "type": "348" + "type": "353" }, { "name": "main-header", @@ -14090,7 +14283,7 @@ "meta-type": "object" }, { - "name": "348", + "name": "353", "meta-type": "enum", "values": [ "none", @@ -14100,15 +14293,7 @@ ] }, { - "name": "349", - "meta-type": "enum", - "values": [ - "cephx", - "none" - ] - }, - { - "name": "350", + "name": "354", "members": [ { "name": "logfile", @@ -14138,117 +14323,6 @@ "meta-type": "object" }, { - "name": "351", - "members": [ - { - "name": "logfile", - "default": null, - "type": "str" - }, - { - "name": "logappend", - "default": null, - "type": "bool" - }, - { - "name": "device", - "type": "str" - } - ], - "meta-type": "object" - }, - { - "name": "352", - "members": [ - { - "name": "logfile", - "default": null, - "type": "str" - }, - { - "name": "logappend", - "default": null, - "type": "bool" - }, - { - "name": "addr", - "type": "224" - }, - { - "name": "tls-creds", - "default": null, - "type": "str" - }, - { - "name": "server", - "default": null, - "type": "bool" - }, - { - "name": "wait", - "default": null, - "type": "bool" - }, - { - "name": "nodelay", - "default": null, - "type": "bool" - }, - { - "name": "telnet", - "default": null, - "type": "bool" - }, - { - "name": "reconnect", - "default": null, - "type": "int" - } - ], - "meta-type": "object" - }, - { - "name": "353", - "members": [ - { - "name": "logfile", - "default": null, - "type": "str" - }, - { - "name": "logappend", - "default": null, - "type": "bool" - }, - { - "name": "remote", - "type": "224" - }, - { - "name": "local", - "default": null, - "type": "224" - } - ], - "meta-type": "object" - }, - { - "name": "354", - "members": [ - { - "name": "logfile", - "default": null, - "type": "str" - }, - { - "name": "logappend", - "default": null, - "type": "bool" - } - ], - "meta-type": "object" - }, - { "name": "355", "members": [ { @@ -14262,7 +14336,7 @@ "type": "bool" }, { - "name": "chardev", + "name": "device", "type": "str" } ], @@ -14282,9 +14356,38 @@ "type": "bool" }, { - "name": "signal", + "name": "addr", + "type": "227" + }, + { + "name": "tls-creds", + "default": null, + "type": "str" + }, + { + "name": "server", + "default": null, + "type": "bool" + }, + { + "name": "wait", + "default": null, + "type": "bool" + }, + { + "name": "nodelay", + "default": null, + "type": "bool" + }, + { + "name": "telnet", "default": null, "type": "bool" + }, + { + "name": "reconnect", + "default": null, + "type": "int" } ], "meta-type": "object" @@ -14303,8 +14406,13 @@ "type": "bool" }, { - "name": "type", - "type": "str" + "name": "remote", + "type": "227" + }, + { + "name": "local", + "default": null, + "type": "227" } ], "meta-type": "object" @@ -14321,10 +14429,6 @@ "name": "logappend", "default": null, "type": "bool" - }, - { - "name": "fqdn", - "type": "str" } ], "meta-type": "object" @@ -14343,24 +14447,8 @@ "type": "bool" }, { - "name": "width", - "default": null, - "type": "int" - }, - { - "name": "height", - "default": null, - "type": "int" - }, - { - "name": "cols", - "default": null, - "type": "int" - }, - { - "name": "rows", - "default": null, - "type": "int" + "name": "chardev", + "type": "str" } ], "meta-type": "object" @@ -14379,9 +14467,9 @@ "type": "bool" }, { - "name": "size", + "name": "signal", "default": null, - "type": "int" + "type": "bool" } ], "meta-type": "object" @@ -14390,12 +14478,18 @@ "name": "361", "members": [ { - "name": "key", - "type": "275" + "name": "logfile", + "default": null, + "type": "str" }, { - "name": "down", + "name": "logappend", + "default": null, "type": "bool" + }, + { + "name": "type", + "type": "str" } ], "meta-type": "object" @@ -14404,12 +14498,18 @@ "name": "362", "members": [ { - "name": "button", - "type": "374" + "name": "logfile", + "default": null, + "type": "str" }, { - "name": "down", + "name": "logappend", + "default": null, "type": "bool" + }, + { + "name": "fqdn", + "type": "str" } ], "meta-type": "object" @@ -14418,11 +14518,33 @@ "name": "363", "members": [ { - "name": "axis", - "type": "375" + "name": "logfile", + "default": null, + "type": "str" }, { - "name": "value", + "name": "logappend", + "default": null, + "type": "bool" + }, + { + "name": "width", + "default": null, + "type": "int" + }, + { + "name": "height", + "default": null, + "type": "int" + }, + { + "name": "cols", + "default": null, + "type": "int" + }, + { + "name": "rows", + "default": null, "type": "int" } ], @@ -14432,12 +14554,19 @@ "name": "364", "members": [ { - "name": "cid", + "name": "logfile", + "default": null, "type": "str" }, { - "name": "port", - "type": "str" + "name": "logappend", + "default": null, + "type": "bool" + }, + { + "name": "size", + "default": null, + "type": "int" } ], "meta-type": "object" @@ -14446,42 +14575,54 @@ "name": "365", "members": [ { - "name": "str", - "type": "str" + "name": "key", + "type": "278" + }, + { + "name": "down", + "type": "bool" } ], "meta-type": "object" }, { "name": "366", - "meta-type": "enum", - "values": [ - "qcow2", - "vmdk", - "luks" - ] - }, - { - "name": "367", "members": [ { - "name": "data", + "name": "button", "type": "376" + }, + { + "name": "down", + "type": "bool" } ], "meta-type": "object" }, { - "name": "368", + "name": "367", "members": [ { - "name": "data", + "name": "axis", "type": "377" + }, + { + "name": "value", + "type": "int" } ], "meta-type": "object" }, { + "name": "368", + "meta-type": "enum", + "values": [ + "qcow2", + "vmdk", + "luks" + ] + }, + { "name": "369", "members": [ { @@ -14495,6 +14636,26 @@ "name": "370", "members": [ { + "name": "data", + "type": "379" + } + ], + "meta-type": "object" + }, + { + "name": "371", + "members": [ + { + "name": "data", + "type": "380" + } + ], + "meta-type": "object" + }, + { + "name": "372", + "members": [ + { "name": "number", "type": "int" }, @@ -14508,21 +14669,21 @@ }, { "name": "io_range", - "type": "379" + "type": "381" }, { "name": "memory_range", - "type": "379" + "type": "381" }, { "name": "prefetchable_range", - "type": "379" + "type": "381" } ], "meta-type": "object" }, { - "name": "371", + "name": "373", "members": [ { "name": "path", @@ -14538,7 +14699,7 @@ "meta-type": "object" }, { - "name": "372", + "name": "374", "meta-type": "enum", "values": [ "unmapped", @@ -14674,13 +14835,13 @@ ] }, { - "name": "373", + "name": "375", "members": [ ], "meta-type": "object" }, { - "name": "374", + "name": "376", "meta-type": "enum", "values": [ "left", @@ -14693,7 +14854,7 @@ ] }, { - "name": "375", + "name": "377", "meta-type": "enum", "values": [ "x", @@ -14701,7 +14862,7 @@ ] }, { - "name": "376", + "name": "378", "members": [ { "name": "compat", @@ -14725,7 +14886,7 @@ "meta-type": "object" }, { - "name": "377", + "name": "379", "members": [ { "name": "create-type", @@ -14741,34 +14902,34 @@ }, { "name": "extents", - "type": "[249]" + "type": "[252]" } ], "meta-type": "object" }, { - "name": "378", + "name": "380", "members": [ { "name": "cipher-alg", - "type": "380" + "type": "382" }, { "name": "cipher-mode", - "type": "381" + "type": "383" }, { "name": "ivgen-alg", - "type": "382" + "type": "384" }, { "name": "ivgen-hash-alg", "default": null, - "type": "383" + "type": "385" }, { "name": "hash-alg", - "type": "383" + "type": "385" }, { "name": "payload-offset", @@ -14784,13 +14945,13 @@ }, { "name": "slots", - "type": "[384]" + "type": "[386]" } ], "meta-type": "object" }, { - "name": "379", + "name": "381", "members": [ { "name": "base", @@ -14804,12 +14965,12 @@ "meta-type": "object" }, { - "name": "[249]", - "element-type": "249", + "name": "[252]", + "element-type": "252", "meta-type": "array" }, { - "name": "380", + "name": "382", "meta-type": "enum", "values": [ "aes-128", @@ -14827,7 +14988,7 @@ ] }, { - "name": "381", + "name": "383", "meta-type": "enum", "values": [ "ecb", @@ -14837,7 +14998,7 @@ ] }, { - "name": "382", + "name": "384", "meta-type": "enum", "values": [ "plain", @@ -14846,7 +15007,7 @@ ] }, { - "name": "383", + "name": "385", "meta-type": "enum", "values": [ "md5", @@ -14859,12 +15020,12 @@ ] }, { - "name": "[384]", - "element-type": "384", + "name": "[386]", + "element-type": "386", "meta-type": "array" }, { - "name": "384", + "name": "386", "members": [ { "name": "active", diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 6386c4ed0d..d238078af9 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -203,13 +203,14 @@ <flag name='query-cpu-model-expansion'/> <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> + <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> - <version>2008090</version> + <version>2009000</version> <kvmVersion>0</kvmVersion> - <package> (v2.9.0-rc0-142-g940a8ce)</package> + <package> (v2.9.0)</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='phys-bits' type='number' value='0'/> -- 2.12.2

2 1

[libvirt] [PATCH v2 00/11]
by John Ferlan 26 Apr '17

26 Apr '17

v1: https://www.redhat.com/archives/libvir-list/2017-April/msg01051.html Changes since v1: - Patches 1, 2, 4, and 14 were pushed since they were ACK and "separable" - Former patch 3 is now patch 1 -> Restore the comments for the functions. - Former patch 5 is now split into patch 2 and 3 -> Patch 2 addresses the "if (!obj)" check in virSecretObjListRemove -> Patch 3 handles the naming of the variables - Former patch 6 is now patch 4 -> Alterations here are not creating a @def for the express purpose of only dereferencing obj->def if that's all that's used. If though there is an obj->def->X, then the @def is created - Former patch 7 is removed (e.g. keep virSecretObjListGetUUIDs where it was). A battle for a different day perhaps. - Former patch 8 is now patches 5 and 6 -> Patch 5 handles just the cleanup path for virSecretObjListGetUUIDs -> Patch 6 changes the variable names - Former patch 9 is now patches 7 and 8 -> Patch 7 focuses only on changing the name of @filter to @aclfilter (something that wasn't called out specifically in the initial review but that I figured I'd do anyway) -> Patch 8 does the split and keeps the Callback functions together so it doesn't appear that virSecretObjListNumOfSecrets moved. Again I'll pick that battle another day. I did change the name of the structures to include "virSecret" prefix though. - Former patch 10 is now patch 9 -> This was ACK'd but not "easy" to extract out, so nothing to do here. - Former patch 11 is now patch 10 -> Perhaps merge conflicts were changed here. The algorithm hasn't changed though. - Former patch 12 is now patch 11 -> This was ACKd already - just forgot to extract it out for a push. - Former patch 13 is removed So I've tried to go with the spirit of the review even though I disagree with the don't do the code motion part. I'll deal with that later when things really converge and the functions are shorter. John Ferlan (11): secret: Make some virSecretObj* functions static secret: Add NULL obj check to virSecretObjListRemove secret: Use consistent naming for variables secret: Use virSecretDefPtr rather than deref from virSecretObjPtr secret: Alter cleanup path for virSecretObjListGetUUIDs secret: Change variable names for list traversals secret: Rename 'filter' to 'aclfilter' secret: Split apart NumOfSecrets and GetUUIDs callback function secret: Combine virSecretObjListAdd with Locked function secret: Alter FindByUUID to expect the formatted uuidstr secret: Generate configDir during driver initialization src/conf/virsecretobj.c | 428 ++++++++++++++++++++++++--------------------- src/conf/virsecretobj.h | 54 ++---- src/secret/secret_driver.c | 170 +++++++++--------- 3 files changed, 328 insertions(+), 324 deletions(-) -- 2.9.3

2 16

[libvirt] [PATCH] IPv6 route check: list devices only once
by Cédric Bosdonnat 26 Apr '17

26 Apr '17

If several RA routes are found for the same device, only list that device once in the error message. --- src/util/virnetdevip.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 09925e1d7..bf98ed8a5 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -551,6 +551,8 @@ virNetDevIPCheckIPv6ForwardingCallback(const struct nlmsghdr *resp, int ret = 0; int len = RTM_PAYLOAD(resp); int oif = -1; + size_t i; + bool hasDevice; /* Ignore messages other than route ones */ if (resp->nlmsg_type != RTM_NEWROUTE) @@ -587,7 +589,13 @@ virNetDevIPCheckIPv6ForwardingCallback(const struct nlmsghdr *resp, accept_ra = virNetDevIPGetAcceptRA(ifname); VIR_DEBUG("Checking route for device %s, accept_ra: %d", ifname, accept_ra); - if (accept_ra != 2 && VIR_APPEND_ELEMENT(data->devices, data->ndevices, ifname) < 0) + hasDevice = false; + for (i = 0; i < data->ndevices && !hasDevice; i++) { + if (STREQ(data->devices[i], ifname)) + hasDevice = true; + } + if (accept_ra != 2 && !hasDevice && + VIR_APPEND_ELEMENT(data->devices, data->ndevices, ifname) < 0) goto error; cleanup: -- 2.12.2

2 1

[libvirt] Plans for next release
by Daniel Veillard 26 Apr '17

26 Apr '17

I didn't realized that end of month was getting that close. So I suggest to enter freeze for 3.3.0 on Friday. I can then push an RC2 on Monday evening or Tuesday and push the release Wed or Thursday, I hope that works for everybody, there is roughtly 2 days to push patches you want in (except bug fixes of course :) thanks, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [RFC] Adopting 'Tested-by' tag (and probably other tags)?
by Kashyap Chamarthy 26 Apr '17

26 Apr '17

Hi folks, I was wondering if the upstream would be receptive to adding a 'Tested-by' tag for patches that had someone give tested feedback on the list. Personally, what I consider a bar for giving a 'Tested-by' is, when someone: - Applies a patch or a series (following the iterations as needed, over time) locally, compile them, spend time understanding the functional change in question, and its implications.) - Do a concrete test (w/ either a Python API or a `virsh`-based command-line) that exercises the said code path. - *Post* the above test procedure / and necessary outputs as evidence to the list, in reasonable detail. (Not a: "yeah, I tested and it works" -- this isn't a 'rule'; it can have exceptions) >From a quick glance, in its 10-year history, libvirt upstream had about a mere 21 entries of 'Tested-by' tags: $ git log | grep Tested-by | wc -l 21 I bring this up because, when someone spends effort following (sometimes over weeks / months) a patch (or a series) from the list, gives reasonably detailed test feedback, in my books, it would be fair to acknowledge it in the Git. And it will encourage them to spend time in future. --- I realize that if it's not automated (via Git hooks or similar), it can become "lossy", i.e. if Joe posts v1 of a patch, you give a 'Tested-by', then there are two scenarios that immediately spring to mind: (1) Joe respins a v2 to make some corrections, adds your 'Tested-by' tag, and whoever applies the patch picks it up -- all good. (b) However, if a v2 was _not_ necessary, then whoever is applying the patch / series must remember to add the tag -- "lossy". Thoughts / remarks / rotten tomatoes welcome. -- /kashyap

5 9

[libvirt] [PATCH v2 00/10] Add mdev reporting capability to the nodedev driver
by Erik Skultety 26 Apr '17

26 Apr '17

since v1: - dropped the <description> element from the parent device nested capability - added missing RNG schema and tests - updated the documentation to describe the MDEV elements in both the parent and the child So, regarding the discussion about the presence of <description> element in the device XML, I dropped it for v2. There were points that we could continue debating about, but one of the major points against it is that libvirt should understand the information it's gathering and then exposing it in a structured way, which in this case wasn't the case, which wouldn't make the management layer's job any easier in any way, since they'd have to parse it either way (from libvirt or on their own). So, until this is resolved among vendors so that we can apply some kind of device classification (no userspace DB), management will have to simply read the description directly from sysfs. As part of a private discussion, another interesting point has been raised - virsh nodedev-list does support '--cap' option which filters only devices matching the pattern. However, with SRIOV, NPIV, and MDEV we have nested capabilities which are kept private and cannot be filtered by. That might be a nice feature for users: 1) OK, let's see what MDEVs are there on the host virsh nodedev-list --cap="mdev-<child|whatever>" 2) I'd like to create some on my own, so which physical devices do support MDEV? virsh nodedev-list --cap='mdev-<parent|whatever>' 3) create the device on that physical device The same goes for SRIOV, where we have virt_functions in parent and phys_function in child and NPIV (I don't remember what it was here), I didn't check in depth, but I think it should be possible for us to do and it's a valid use case where users don't have to parse dumpxml's output for information about the parent's nested capabilities. Erik Erik Skultety (10): nodedev: Make use of the compile-time missing enum in switch error conf: nodedev: Split virNodeDeviceDefFormat into more functions nodedev: udevProcessPCI: Drop syspath variable docs: Utilize our XSLT list generating template more nodedev: conf: Split PCI sub-capability parsing to a separate method nodedev: Introduce the mdev capability to the nodedev driver structure nodedev: Introduce the mdev capability to a PCI parent device nodedev: Introduce mdev capability for child devices docs: Provide a nodedev driver stub documentation docs: Document the mediated devices within the nodedev driver docs/drivers.html.in | 6 +- docs/drvnodedev.html.in | 344 +++++++++ docs/remote.html.in | 106 +-- docs/schemas/nodedev.rng | 41 ++ docs/storage.html.in | 62 +- include/libvirt/libvirt-nodedev.h | 1 + src/conf/node_device_conf.c | 812 +++++++++++++-------- src/conf/node_device_conf.h | 21 +- src/conf/virnodedeviceobj.c | 3 +- src/libvirt-nodedev.c | 1 + src/libvirt_private.syms | 1 + src/node_device/node_device_driver.c | 1 + src/node_device/node_device_udev.c | 242 +++++- .../mdev_3627463d_b7f0_4fea_b468_f1da537d301b.xml | 8 + tests/nodedevschemadata/pci_0000_02_10_7_mdev.xml | 27 + tests/nodedevxml2xmltest.c | 1 + tools/virsh-nodedev.c | 2 + 17 files changed, 1223 insertions(+), 456 deletions(-) create mode 100644 docs/drvnodedev.html.in create mode 100644 tests/nodedevschemadata/mdev_3627463d_b7f0_4fea_b468_f1da537d301b.xml create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_mdev.xml -- 2.12.2

3 23

Re: [libvirt] How to get VM memory usage
by Eric Blake 26 Apr '17

26 Apr '17

[moderator note: I'm forwarding a stripped down version of the original mail which was rejected in the moderator queue. I stripped the .jpg attachments, which are inappropriate for a technical list. Either paste the text contents (rather than a screenshot) of the window you are describing, or host your images elsewhere and have your list email merely give a URL of the externally-hosted images] > ForwardedMessage.eml > > Subject: > Re: Re: [libvirt] How to get VM memory usage > From: > "wangyufeng(a)cloudguarding.com" <wangyufeng(a)cloudguarding.com> > Date: > 04/26/2017 01:21 AM > > To: > "Daniel P. Berrange" <berrange(a)redhat.com> > CC: > libvir-list <libvir-list(a)redhat.com> > > > Hi Daniel, > > I found method MemoryStats in domain.go: > func (d *Domain) MemoryStats(nrStats uint32, flags uint32) ([]DomainMemoryStat, error) { > ptr := make([]C.virDomainMemoryStatStruct, nrStats) > > result := C.virDomainMemoryStats( > d.ptr, (C.virDomainMemoryStatPtr)(unsafe.Pointer(&ptr[0])), > C.uint(nrStats), C.uint(flags)) > > if result == -1 { > return []DomainMemoryStat{}, GetLastError() > } > > out := make([]DomainMemoryStat, result) > for i := 0; i < int(result); i++ { > out = append(out, DomainMemoryStat{ > Tag: int32(ptr[i].tag), > Val: uint64(ptr[i].val), > }) > } > return out, nil > } > > Do you mean this method can get used memory info? > While I invoke the method, which can only get values of tag 0 and tag 6: > > And the balloon driver have been activated on the monitored vm: > > Below is my code, could you tell me what's wrong with my code? > > Thank you very much. > > ---------------------------------------------------------------------------------------------------------- > On Fri, Apr 21, 2017 at 09:58:12AM +0800, wangyufeng(a)cloudguarding.com wrote: >> Hi Daniel, >> >> In method 'GetInfo', we can only get memory and max memory. However I >> need to get used memory for calculating memory usage. The virsh command >> 'dommemstat' can obtain used memory, is there a method in libvirt-go to >> obtain used memory? > > That command uses the virDomainMemoryStats() API call > > > Regards, > Daniel > -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange > :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: > https://entangle-photo.org -o- https://www.instagram.com/dberrange :| -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org

1 0

[libvirt] [PATCH v3 0/5] Alter the clearing of device for new partition table
by John Ferlan 26 Apr '17

26 Apr '17

Well kind of a v2/v3 type mashup - essentially reworked the portion of the series: https://www.redhat.com/archives/libvir-list/2017-April/msg00402.html that dealt with the zeroing of the header of the device path. The changes now will allow both the head and tail of the device path to be cleared rather than just the header of the file which was ACK'd for at least the logical backend. Additionally, bump the size of the clear/zero from 2048KB to 1MB and use it for both the logical and disk backends. John Ferlan (5): storage: Modify storageBackendWipeLocal to allow zero from end of device storage: Introduce virStorageBackendZeroPartitionTable logical: Use virStorageBackendZeroPartitionTable logical: Increase the size of the data to wipe disk: Use virStorageBackendZeroPartitionTable src/storage/storage_backend_disk.c | 6 ++- src/storage/storage_backend_logical.c | 44 +--------------------- src/storage/storage_util.c | 70 ++++++++++++++++++++++++++++------- src/storage/storage_util.h | 4 ++ 4 files changed, 67 insertions(+), 57 deletions(-) -- 2.9.3

2 10

[libvirt] [PATCH] Update keycodemapdb submodule for python2 compat fixes
by Daniel P. Berrange 26 Apr '17

26 Apr '17

There were a few bugs in keycodemap tool that broke it when run on python circa 2.7.5 or older, which affected RHEL builds. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a CI build fix for rhel6/7 src/keycodemapdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/keycodemapdb b/src/keycodemapdb index bd754b8..7bf5710 160000 --- a/src/keycodemapdb +++ b/src/keycodemapdb @@ -1 +1 @@ -Subproject commit bd754b861e7de5c7919aa249a975913cb207b85d +Subproject commit 7bf5710b22aa8d58b7eeaaf3dc6960c26cade4f0 -- 2.9.3

1 0

[libvirt] [PATCH v2 00/13] Multiple cleanups within nwfilterobj and nwfilter drivers
by John Ferlan 26 Apr '17

26 Apr '17

v1: https://www.redhat.com/archives/libvir-list/2017-April/msg01074.html Changes since v1: * Patch 2 -> Do not add the local @def when just dereference obj->def * Patch 13 & 15 dropped Most patches were ACK'd, but patch 2's impact was felt in a few other patches so I just resent the whole thing. In particular patch 5 for nwfilterUndefine and nwfilterGetXMLDesc as well as patch 7 for the _virNWFilterObjListDefLoopDetect call w/ _virNWFilterObjListDefLoopDetect John Ferlan (13): nwfilter: Use consistent naming for variables nwfilter: Use virNWFilterDefPtr rather than deref virNWFilterObjPtr nwfilter: Remove unused 'active' in virNWFilterObj nwfilter: Convert wantRemoved to bool nwfilter: Make _virNWFilterObjPtr private nwfilter: Introduce virNWFilterObjNew nwfilter: Rename some virNWFilterObj* API's nwfilter: Make _virNWFilterObjList private nwfilter: Make a common UUID lookup function from driver nwfilter: Replace virNWFilterConfigFile with virFileBuildPath nwfilter: Replace virNWFilterSaveDef with virNWFilterSaveConfig nwfilter: Move creation of configDir to driver initialization nwfilter: Move save of config until after successful assign src/conf/nwfilter_conf.c | 57 +------ src/conf/nwfilter_conf.h | 8 - src/conf/virnwfilterobj.c | 270 +++++++++++++++++++++------------ src/conf/virnwfilterobj.h | 70 ++++----- src/libvirt_private.syms | 20 ++- src/nwfilter/nwfilter_driver.c | 138 ++++++++++------- src/nwfilter/nwfilter_gentech_driver.c | 42 ++--- 7 files changed, 320 insertions(+), 285 deletions(-) -- 2.9.3 FWIW: The diffs between this series and the previous taking away patches 13/15: diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index 62206b8..8c9da13 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -92,16 +92,11 @@ virNWFilterObjWantRemoved(virNWFilterObjPtr obj) static void virNWFilterObjFree(virNWFilterObjPtr obj) { - virNWFilterDefPtr def; - virNWFilterDefPtr newDef; - if (!obj) return; - def = obj->def; - newDef = obj->newDef; - virNWFilterDefFree(def); - virNWFilterDefFree(newDef); + virNWFilterDefFree(obj->def); + virNWFilterDefFree(obj->newDef); virMutexDestroy(&obj->lock); @@ -204,7 +199,6 @@ _virNWFilterObjListDefLoopDetect(virNWFilterObjListPtr nwfilters, size_t i; virNWFilterEntryPtr entry; virNWFilterObjPtr obj; - virNWFilterDefPtr objdef; if (!def) return 0; @@ -221,8 +215,7 @@ _virNWFilterObjListDefLoopDetect(virNWFilterObjListPtr nwfilters, obj = virNWFilterObjListFindByName(nwfilters, entry->include->filterref); if (obj) { - objdef = obj->def; - rc = _virNWFilterObjListDefLoopDetect(nwfilters, objdef, + rc = _virNWFilterObjListDefLoopDetect(nwfilters, obj->def, filtername); virNWFilterObjUnlock(obj); if (rc < 0) @@ -386,13 +379,11 @@ virNWFilterObjListNumOfNWFilters(virNWFilterObjListPtr nwfilters, { size_t i; int nfilters = 0; - virNWFilterDefPtr def; for (i = 0; i < nwfilters->count; i++) { virNWFilterObjPtr obj = nwfilters->objs[i]; virNWFilterObjLock(obj); - def = obj->def; - if (!aclfilter || aclfilter(conn, def)) + if (!aclfilter || aclfilter(conn, obj->def)) nfilters++; virNWFilterObjUnlock(obj); }

2 14

[libvirt] Unbounded client streams
by Michal Privoznik 26 Apr '17

26 Apr '17

Dear list, as you might have seen, I've been playing with our streams lately. One of the things I wanted to try was how my sparse streams deal with vol-download and slow writer (e.g. slow disk). Note to whomever wants to try that out: blkio,throttle.write_* is no good for this. So I went the old way: diff --git i/tools/virsh-util.c w/tools/virsh-util.c index 4b86e29..8f5738d 100644 --- i/tools/virsh-util.c +++ w/tools/virsh-util.c @@ -149,6 +149,8 @@ virshStreamSink(virStreamPtr st ATTRIBUTE_UNUSED, { int *fd = opaque; + sleep(60); + return safewrite(*fd, bytes, nbytes); } And found out something ugly: the memory footprint of virsh just keeps growing as vol-download progresses. I've tracked down the problem to: 1) The client event loop (virNetClientIOEventLoop) sees some incoming data, so it reads it (virNetClientIOHandleInput -> virNetClientCallDispatch) and queues the packet (virNetClientCallDispatchStream) regardless of the length of already queued packets 2) Since the server sees client has read all the data, it sends even more data. And the queue in step 1) just grows and grows. Ideally, the packets are taken out from the queue by virStreamRecv (which boils down to virNetClientStreamRecvPacket), but that is not on the schedule for the next minute. Frankly, I don't have any idea how to fix this. We can stop reading the data (i.e. not set POLLIN on the client <-> server socket) if the queue reaches certain length. BUT, this would mean no other call is processed. Not even keepalive - and the connection would break. The other option is to pretend I've never send this e-mail and you've read nothing O:-) Michal

4 9

[libvirt] [PATCHv2 0/6] Support more options for intel-iommu
by Ján Tomko 26 Apr '17

26 Apr '17

For https://bugzilla.redhat.com/show_bug.cgi?id=1427005 v2: * use != VIR_TRISTATE_SWITCH_ABSENT more often * use symlinks for identical XMLs * move capability checks in qemuBuildIOMMUCommandLine to the beginning, to be shared with qemuBuildIOMMUCommandLine Documentation changes reflecting current QEMU implementation limits are not included. Ján Tomko (6): conf: add <irqchip mode> to <features> qemu: format kernel_irqchip on the command line conf: add <driver intremap> to <iommu> qemu: format intremap= on intel-iommu command line conf: add caching attribute to iommu device qemu: format caching-mode on iommu command line docs/formatdomain.html.in | 41 +++++++++- docs/schemas/domaincommon.rng | 30 ++++++++ src/conf/domain_conf.c | 90 ++++++++++++++++++++-- src/conf/domain_conf.h | 14 ++++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 12 +++ src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 40 ++++++++++ tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 22 ++++-- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 24 ++++-- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 24 ++++-- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 28 +++++-- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 37 +++++++-- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 + .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 49 +++++++++--- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 3 + .../qemuxml2argv-intel-iommu-caching.args | 19 +++++ .../qemuxml2argv-intel-iommu-caching.xml | 28 +++++++ .../qemuxml2argv-intel-iommu-irqchip.args | 19 +++++ .../qemuxml2argv-intel-iommu-irqchip.xml | 31 ++++++++ tests/qemuxml2argvtest.c | 10 +++ .../qemuxml2xmlout-intel-iommu-caching.xml | 1 + .../qemuxml2xmlout-intel-iommu-irqchip.xml | 1 + tests/qemuxml2xmltest.c | 2 + 37 files changed, 496 insertions(+), 49 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-irqchip.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-irqchip.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-irqchip.xml -- 2.10.2

2 14

[libvirt] [PATCH] Support CPU less NUMA node.
by Shaohe Feng 26 Apr '17

26 Apr '17

Some platform NUMA node does not include cpu, such as Phi. This patch support CPU less NUMA node. But there must be one CPU cell node for a guest. Also must assign the host nodeset for this guest cell node. please enable numactl with "--with-numactl" for libvirt config. Test this patch: 1. define a numa cell without "cpus", such as cell 1. <numatune> <memnode cellid='1' mode='strict' nodeset='0'/> </numatune> <cpu> <numa> <cell id='0' cpus='0-1' memory='512000' unit='KiB'/> <cell id='1' memory='512000' unit='KiB'/> </numa> </cpu> libvirt can edit and start the VM successfully. 2. define a numa cell without "cpus", without nodeset. <cpu> <numa> <cell id='0' cpus='0-1' memory='512000' unit='KiB'/> <cell id='1' memory='512000' unit='KiB'/> </numa> </cpu> This case, libvirt will failed to edit the CPUS. --- src/conf/domain_conf.c | 4 +++ src/conf/numa_conf.c | 89 ++++++++++++++++++++++++++++++++++--------------- src/conf/numa_conf.h | 2 ++ src/qemu/qemu_command.c | 12 ++++--- src/util/virbitmap.c | 10 ++++-- 5 files changed, 83 insertions(+), 34 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 705deb3..d6e5489 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17330,6 +17330,10 @@ virDomainDefParseXML(xmlDocPtr xml, ctxt) < 0) goto error; + if (virDomainNumaCPULessCheck(def->numa) < 0){ + goto error; + } + if (virDomainNumatuneHasPlacementAuto(def->numa) && !def->cpumask && !virDomainDefHasVcpuPin(def) && !def->cputune.emulatorpin && diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index bfd3703..1b6f7ff 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -742,34 +742,31 @@ virDomainNumaDefCPUParseXML(virDomainNumaPtr def, goto cleanup; } - if (!(tmp = virXMLPropString(nodes[i], "cpus"))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("Missing 'cpus' attribute in NUMA cell")); - goto cleanup; - } - - if (virBitmapParse(tmp, &def->mem_nodes[cur_cell].cpumask, - VIR_DOMAIN_CPUMASK_LEN) < 0) - goto cleanup; - - if (virBitmapIsAllClear(def->mem_nodes[cur_cell].cpumask)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("NUMA cell %d has no vCPUs assigned"), cur_cell); - goto cleanup; - } - VIR_FREE(tmp); - - for (j = 0; j < n; j++) { - if (j == cur_cell || !def->mem_nodes[j].cpumask) - continue; + tmp = virXMLPropString(nodes[i], "cpus"); + if (tmp) { + if (virBitmapParse(tmp, &def->mem_nodes[cur_cell].cpumask, + VIR_DOMAIN_CPUMASK_LEN) < 0) + goto cleanup; - if (virBitmapOverlaps(def->mem_nodes[j].cpumask, - def->mem_nodes[cur_cell].cpumask)) { + if (virBitmapIsAllClear(def->mem_nodes[cur_cell].cpumask)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("NUMA cells %u and %zu have overlapping vCPU ids"), - cur_cell, j); + _("NUMA cell %d has no vCPUs assigned"), cur_cell); goto cleanup; } + VIR_FREE(tmp); + + for (j = 0; j < n; j++) { + if (j == cur_cell || !def->mem_nodes[j].cpumask) + continue; + + if (virBitmapOverlaps(def->mem_nodes[j].cpumask, + def->mem_nodes[cur_cell].cpumask)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("NUMA cells %u and %zu have overlapping vCPU ids"), + cur_cell, j); + goto cleanup; + } + } } ctxt->node = nodes[i]; @@ -808,6 +805,7 @@ virDomainNumaDefCPUFormat(virBufferPtr buf, char *cpustr; size_t ncells = virDomainNumaGetNodeCount(def); size_t i; + size_t ncpuless = 0; if (ncells == 0) return 0; @@ -817,12 +815,24 @@ virDomainNumaDefCPUFormat(virBufferPtr buf, for (i = 0; i < ncells; i++) { memAccess = virDomainNumaGetNodeMemoryAccessMode(def, i); - if (!(cpustr = virBitmapFormat(virDomainNumaGetNodeCpumask(def, i)))) - return -1; + cpustr = virBitmapFormat(virDomainNumaGetNodeCpumask(def, i)); virBufferAddLit(buf, "<cell"); virBufferAsprintf(buf, " id='%zu'", i); - virBufferAsprintf(buf, " cpus='%s'", cpustr); + if (cpustr && (*cpustr != 0)) + virBufferAsprintf(buf, " cpus='%s'", cpustr); + else { + /* Note, at present we only allow cpuless numa node with */ + /* nodeset assign. */ + ncpuless++; + if (!virDomainNumatuneNodeSpecified(def, i)) { + VIR_FREE(cpustr); + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("CPUless NUMA node cellid %zu must be " + "specified node set."), i); + return -1; + } + } virBufferAsprintf(buf, " memory='%llu'", virDomainNumaGetNodeMemorySize(def, i)); virBufferAddLit(buf, " unit='KiB'"); @@ -835,6 +845,12 @@ virDomainNumaDefCPUFormat(virBufferPtr buf, virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</numa>\n"); + if (ncpuless == ncells) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("At lease one NUMA node should " + "include CPU element.")); + return -1; + } return 0; } @@ -861,6 +877,7 @@ virDomainNumaGetMaxCPUID(virDomainNumaPtr numa) int bit; bit = virBitmapLastSetBit(virDomainNumaGetNodeCpumask(numa, i)); + bit = (bit > 0) ? bit : 0; if (bit > ret) ret = bit; } @@ -973,3 +990,21 @@ virDomainNumaGetMemorySize(virDomainNumaPtr numa) return ret; } + +// NOTE, For some plateforms, there are some node without cpus, such as Phi. +// We just need do some check for these plateforms, we must assigned nodeset +// for CPU less node. +int +virDomainNumaCPULessCheck(virDomainNumaPtr numa) +{ + int ret = 0; + int i = 0; + for (i = 0; i < numa->nmem_nodes; i++){ + if (!numa->mem_nodes[i].cpumask && !numa->mem_nodes[i].nodeset) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Cell: %d is a cpuless numa, must specfiy the nodeset."), i); + return -1; + } + } + return ret; +} diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h index b6a5354..1f711e6 100644 --- a/src/conf/numa_conf.h +++ b/src/conf/numa_conf.h @@ -155,5 +155,7 @@ int virDomainNumaDefCPUFormat(virBufferPtr buf, virDomainNumaPtr def); unsigned int virDomainNumaGetCPUCountTotal(virDomainNumaPtr numa); +int virDomainNumaCPULessCheck(virDomainNumaPtr numa); + #endif /* __NUMA_CONF_H__ */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b2e76ca..b07ca66 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7665,11 +7665,13 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, virCommandAddArg(cmd, "-numa"); virBufferAsprintf(&buf, "node,nodeid=%zu", i); - for (tmpmask = cpumask; tmpmask; tmpmask = next) { - if ((next = strchr(tmpmask, ','))) - *(next++) = '\0'; - virBufferAddLit(&buf, ",cpus="); - virBufferAdd(&buf, tmpmask, -1); + if (*cpumask != 0) { + for (tmpmask = cpumask; tmpmask; tmpmask = next) { + if ((next = strchr(tmpmask, ','))) + *(next++) = '\0'; + virBufferAddLit(&buf, ",cpus="); + virBufferAdd(&buf, tmpmask, -1); + } } if (needBackend) diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index eac63d9..b2803ce 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -953,6 +953,9 @@ virBitmapLastSetBit(virBitmapPtr bitmap) unsigned long bits; /* If bitmap is empty then there is no set bit */ + if (!bitmap) + return -1; + if (bitmap->map_len == 0) return -1; @@ -1039,9 +1042,12 @@ virBitmapCountBits(virBitmapPtr bitmap) size_t i; size_t ret = 0; - for (i = 0; i < bitmap->map_len; i++) - ret += count_one_bits_l(bitmap->map[i]); + if (bitmap == NULL) + return ret; + for (i = 0; i < bitmap->map_len; i++) { + ret += count_one_bits_l(bitmap->map[i]); + } return ret; } -- 2.7.4

3 4

[libvirt] [PATCH] virsh-domain: update attach-interface to support bridge type
by ZhiPeng Lu 26 Apr '17

26 Apr '17

Adding this feature will allow users to attach a network to linux bridge or openvswitch. The interface can be attached using --brtype=linux or --brtype=openvswitch. If --brtype is not set, the network is attached to linux bridge. Signed-off-by: ZhiPeng Lu <lu.zhipeng(a)zte.com.cn> --- tools/virsh-domain.c | 23 +++++++++++++++++++++-- tools/virsh.pod | 3 +++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index db8accf..2690689 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -766,6 +766,10 @@ static const vshCmdOptDef opts_attach_interface[] = { .type = VSH_OT_BOOL, .help = N_("libvirt will automatically detach/attach the device from/to host") }, + {.name = "brtype", + .type = VSH_OT_STRING, + .help = N_("Bridge type: linux / openvswitch") + }, {.name = NULL} }; @@ -819,7 +823,8 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom = NULL; const char *mac = NULL, *target = NULL, *script = NULL, *type = NULL, *source = NULL, *model = NULL, - *inboundStr = NULL, *outboundStr = NULL; + *inboundStr = NULL, *outboundStr = NULL, + *brtype = NULL; virNetDevBandwidthRate inbound, outbound; virDomainNetType typ; int ret; @@ -850,7 +855,8 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) vshCommandOptStringReq(ctl, cmd, "script", &script) < 0 || vshCommandOptStringReq(ctl, cmd, "model", &model) < 0 || vshCommandOptStringReq(ctl, cmd, "inbound", &inboundStr) < 0 || - vshCommandOptStringReq(ctl, cmd, "outbound", &outboundStr) < 0) + vshCommandOptStringReq(ctl, cmd, "outbound", &outboundStr) < 0 || + vshCommandOptStringReq(ctl, cmd, "brtype", &brtype) < 0) goto cleanup; /* check interface type */ @@ -946,6 +952,19 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) if (model != NULL) virBufferAsprintf(&buf, "<model type='%s'/>\n", model); + if ((brtype != NULL)) { + if (STRNEQ(brtype , "linux") && STRNEQ(brtype , "openvswitch")) { + vshError(ctl, _("bridge type is incorrect, should be linux " + "or openvswitch")); + goto cleanup; + } + if (typ != VIR_DOMAIN_NET_TYPE_BRIDGE) { + vshError(ctl, _("No support for %s with bridge type"), type); + goto cleanup; + } + if (STREQ(brtype , "openvswitch")) + virBufferAsprintf(&buf, " <virtualport type='openvswitch'/>\n"); + } if (inboundStr || outboundStr) { virBufferAddLit(&buf, "<bandwidth>\n"); virBufferAdjustIndent(&buf, 2); diff --git a/tools/virsh.pod b/tools/virsh.pod index e16f62f..3cd0490 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2935,6 +2935,9 @@ B<--managed> is usable only for I<hostdev> type and tells libvirt that the interface should be managed, which means detached and reattached from/to the host by libvirt. +B<--brtype> is usable only for I<bridge> type and tells libvirt +that the interface attached to bridge type (linux bridge or openvswitch). + If B<--print-xml> is specified, then the XML of the interface that would be attached is printed instead. -- 1.8.3.1

2 1

[libvirt] [PATCH 00/15] Multiple cleanups within nwfilterobj and nwfilter drivers
by John Ferlan 25 Apr '17

25 Apr '17

More adjustments in preparation for having virobject code handle the bulk of the object management code. I know it's a lot of patches, but reducing the amount of change overall has the opposite effect of increasing the number patches to show the work flow. Should make the "next" steps easier to review, but a couple of these will be tedious. John Ferlan (15): nwfilter: Use consistent naming for variables nwfilter: Use virNWFilterDefPtr rather than deref virNWFilterObjPtr nwfilter: Remove unused 'active' in virNWFilterObj nwfilter: Convert wantRemoved to bool nwfilter: Make _virNWFilterObjPtr private nwfilter: Introduce virNWFilterObjNew nwfilter: Rename some virNWFilterObj* API's nwfilter: Make _virNWFilterObjList private nwfilter: Make a common UUID lookup function from driver nwfilter: Replace virNWFilterConfigFile with virFileBuildPath nwfilter: Replace virNWFilterSaveDef with virNWFilterSaveConfig nwfilter: Move creation of configDir to driver initialization nwfilter: Move configFile name processing into driver nwfilter: Move save of config until after successful assign nwfilter: Move and rename virNWFilterSaveConfig src/conf/nwfilter_conf.c | 107 +----------- src/conf/nwfilter_conf.h | 16 +- src/conf/virnwfilterobj.c | 308 ++++++++++++++++++++++----------- src/conf/virnwfilterobj.h | 74 ++++---- src/libvirt_private.syms | 21 ++- src/nwfilter/nwfilter_driver.c | 148 ++++++++++------ src/nwfilter/nwfilter_gentech_driver.c | 42 +++-- 7 files changed, 377 insertions(+), 339 deletions(-) -- 2.9.3

2 33

[libvirt] [PATCH v3 0/2] Use the shared keycodemap database
by Daniel P. Berrange 25 Apr '17

25 Apr '17

Follow up to: v1: https://www.redhat.com/archives/libvir-list/2017-March/msg00070.html v2: https://www.redhat.com/archives/libvir-list/2017-March/msg00136.html Changed in v3: - Rebase onto new autogen.sh - Use VIR_KEYMAP_ENTRY_MAX constant more - Change style of make vars - Fix & verify distcheck Changed in v2: - Fixed make syntax-check errors - Auto-generate man pages listing value key codes for use with the virDomainSendKey API / virsh send-key command Daniel P. Berrange (2): util: switch over to use keycodemapdb GIT submodule Add ability to generate man page describing key code names & values .gitignore | 3 +- .gitmodules | 3 + libvirt.spec.in | 1 + mingw-libvirt.spec.in | 2 + src/Makefile.am | 86 ++++++-- src/keycodemapdb | 1 + src/util/keymaps.csv | 464 ------------------------------------------ src/util/virkeycode-mapgen.py | 97 --------- src/util/virkeycode.c | 94 ++++----- tests/virkeycodetest.c | 5 + tools/virsh.pod | 20 ++ 11 files changed, 153 insertions(+), 623 deletions(-) create mode 160000 src/keycodemapdb delete mode 100644 src/util/keymaps.csv delete mode 100755 src/util/virkeycode-mapgen.py -- 2.9.3

2 5

[libvirt] [PATCH 00/14] Multiple cleanups within secretobj and secret_driver
by John Ferlan 25 Apr '17

25 Apr '17

More adjustments in preparation for having virobject code handle the bulk of the object management code. I know it's a lot of patches, but most should be relatively simple - especially the first 10... The last 4 set up for a "common" way to handle the config directory space as well and could be a bit more controversial. Perhaps the most being patch 12 which attempts to perform the mkdir of the configDir during initialization rather than first "define" of secret. Although someone could also pick out their own most favorite/controversial and surprise me. John Ferlan (14): secret: Need to set data->error on VIR_ALLOC_N failure secret: Convert virsecretobjs.h to use "newer" formatting style secret: Make some virSecretObj* functions static secret: Have virSecretObjNew return locked object secret: Use consistent naming for variables secret: Use virSecretDefPtr rather than deref from virSecretObjPtr secret: Move virSecretObjListGetUUIDs secret: Change variable names for list traversals secret: Split apart NumOfSecrets and GetUUIDs callback function secret: Combine virSecretObjListAdd with Locked function secret: Alter FindByUUID to expect the formatted uuidstr secret: Generate configDir during driver initialization secret: Alter configFile/base64File mgmt secret: Clean up virSecretObjListExport logic src/conf/virsecretobj.c | 557 +++++++++++++++++++++++---------------------- src/conf/virsecretobj.h | 120 +++++----- src/secret/secret_driver.c | 178 ++++++++------- 3 files changed, 442 insertions(+), 413 deletions(-) -- 2.9.3

2 51

[libvirt] [PATCH v2 0/2] Augment debug messages.
by Prerna Saxena 25 Apr '17

25 Apr '17

This is a v2 of the previous set of debug enhancements posted at : https://www.redhat.com/archives/libvir-list/2017-March/msg00959.html Changelog: --------- 1) Patch 1/3 : virNetSocketGetFD() is reverted to its old state, and only new DEBUG messages are introduced. 2) Patch 2/3 : Dropped, per list suggestions. 3) Patch 3/3 : Same as v1 Prerna Saxena (2): Debug: Add DEBUG messages for when a client has opened/closed connection. Debug: Report VM errors more concisely. src/qemu/qemu_process.c | 4 ++-- src/rpc/virnetserverclient.c | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) -- 1.8.1.2

3 4