- Devel - libvirt List Archives

[PULL 0/3] MIPS patches for 5.2-rc1
by Philippe Mathieu-Daudé 09 Nov '20

09 Nov '20

The following changes since commit 3493c36f0371777c62d1d72b205b0eb6117e2156: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20201106' into staging (2020-11-06 13:43:28 +0000) are available in the Git repository at: https://gitlab.com/philmd/qemu.git tags/mips-fixes-20201109 for you to fetch changes up to bf4ee88ab63fcf2dcb75f0d68cc6c8d2edb68212: hw/mips/boston: Fix memory leak in boston_fdt_filter() error-handling paths (2020-11-09 00:40:44 +0100) ---------------------------------------------------------------- MIPS patches queue - Deprecate nanoMIPS ISA - Fix PageMask with variable page size (Huacai Chen) - Fix memory leak in boston_fdt_filter (Coverity CID 1432275, Peter Maydell) CI jobs results: . https://cirrus-ci.com/build/5439131968864256 . https://gitlab.com/philmd/qemu/-/pipelines/213403385 . https://travis-ci.org/github/philmd/qemu/builds/742312387 ---------------------------------------------------------------- Jiaxun Yang (1): target/mips: Fix PageMask with variable page size Peter Maydell (1): hw/mips/boston: Fix memory leak in boston_fdt_filter() error-handling paths Philippe Mathieu-Daudé (1): target/mips: Deprecate nanoMIPS ISA docs/system/deprecated.rst | 23 +++++++++++++++++++++++ target/mips/cpu.h | 1 + hw/mips/boston.c | 10 ++++------ target/mips/cp0_helper.c | 27 +++++++++++++++++++++------ MAINTAINERS | 6 +++++- 5 files changed, 54 insertions(+), 13 deletions(-) -- 2.26.2

2 4

Libvirt Open Source Contribution
by Barrett J Schonefeld 09 Nov '20

09 Nov '20

Hey libvirt team, We (Ryan Gahagan, Dustan Helm, and Barrett Schonefeld) are computer science students at the University of Texas at Austin. We are taking a course in virtualization, and we’d like to contribute to the libvirt repository as part of this course. Here are the issues we are most interested in: https://gitlab.com/libvirt/libvirt/-/issues/11 https://gitlab.com/libvirt/libvirt/-/issues/16 Additionally, we would like to take a look at issue 4 ( https://gitlab.com/libvirt/libvirt/-/issues/4) the UDP slowdown for QEMU. We expect issue 4 to be more time-intensive, and we would like to communicate with you to ensure we’re solving the problem effectively. Our course only runs until the end of the fall semester, so our time to contribute to this project is somewhat limited. If you think any of the issues we picked would be too difficult to accomplish during that time frame, we would appreciate alternative suggestions. We really hope to contribute to this project and help make improvements where we can. Best regards, Dustan Helm: dustan.helm(a)yahoo.com Barrett Schonefeld: bschoney(a)utexas.edu Ryan Gahagan: ryangahagan18(a)gmail.com

7 12

[PATCH 0/9] tests: Add testing of qemu migration cookie
by Peter Krempa 09 Nov '20

09 Nov '20

Note that this series probably depends on the hash table refactor. Add testing of migration cookie as we don't have any schema or examples of it to prevent breakage and help with development. Peter Krempa (9): qemuxml2xmltest: Remove 'WITH_QEMU' conditional qemuxml2xmltest: Split out status XML testing to qemustatusxml2xmltest.c qemu_migration_cookie: Make header standalone qemu_migration_cookie: Export qemuMigrationCookieXMLFormat for tests tests: Add mock library for virGetHostname and virGetHostUUID qemu_migration_cookie: Make cookie parsing robust against missing domain job tests: Add testing of qemu migration cookie qemumigrationcookiexmltest: Add synthetic test case virCPUDefFormatBufFull: Use virXMLFormatElement src/conf/cpu_conf.c | 16 +- src/qemu/qemu_migration_cookie.c | 4 +- src/qemu/qemu_migration_cookie.h | 9 + src/util/virutil.h | 2 +- src/util/viruuid.h | 2 +- tests/hostidmock.c | 36 ++ tests/meson.build | 3 + .../basic-xml2xml-in.xml | 6 + .../basic-xml2xml-out.xml | 9 + .../full-xml2xml-in.xml | 221 ++++++++++++ .../full-xml2xml-out.xml | 219 ++++++++++++ .../modern-dom-out-dest.xml | 12 + .../modern-dom-out-source.xml | 12 + tests/qemumigrationcookiexmltest.c | 337 ++++++++++++++++++ tests/qemustatusxml2xmltest.c | 159 +++++++++ tests/qemuxml2xmltest.c | 136 ++----- 16 files changed, 1048 insertions(+), 135 deletions(-) create mode 100644 tests/hostidmock.c create mode 100644 tests/qemumigrationcookiexmldata/basic-xml2xml-in.xml create mode 100644 tests/qemumigrationcookiexmldata/basic-xml2xml-out.xml create mode 100644 tests/qemumigrationcookiexmldata/full-xml2xml-in.xml create mode 100644 tests/qemumigrationcookiexmldata/full-xml2xml-out.xml create mode 100644 tests/qemumigrationcookiexmldata/modern-dom-out-dest.xml create mode 100644 tests/qemumigrationcookiexmldata/modern-dom-out-source.xml create mode 100644 tests/qemumigrationcookiexmltest.c create mode 100644 tests/qemustatusxml2xmltest.c -- 2.26.2

2 11

[PATCH v2] virsh: Allow listing just domain IDs
by Michal Privoznik 09 Nov '20

09 Nov '20

Some completers for libvirt related tools might want to list domain IDs only. Just like the one I've implemented for virt-viewer [1]. I've worked around it using some awk magic, but if it was possible to just 'virsh list --id' then I could drop awk. 1: https://www.redhat.com/archives/virt-tools-list/2019-May/msg00014.html Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Diff to v1: - Documented the new switch in the manpage - Allowed --id to be used with --all docs/manpages/virsh.rst | 21 +++++++++--------- tools/virsh-domain-monitor.c | 42 +++++++++++++++++++++++++----------- 2 files changed, 39 insertions(+), 24 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index d34a1c8684..848e1a6458 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -621,7 +621,7 @@ list list [--inactive | --all] [--managed-save] [--title] - { [--table] | --name | --uuid } + { [--table] | --name | --uuid | --id } [--persistent] [--transient] [--with-managed-save] [--without-managed-save] [--autostart] [--no-autostart] @@ -758,16 +758,15 @@ If *--managed-save* is specified, then domains that have managed save state in the listing. This flag is usable only with the default *--table* output. Note that this flag does not filter the list of domains. -If *--name* is specified, domain names are printed instead of the table -formatted one per line. If *--uuid* is specified domain's UUID's are printed -instead of names. Flag *--table* specifies that the legacy table-formatted -output should be used. This is the default. - -If both *--name* and *--uuid* are specified, domain UUID's and names -are printed side by side without any header. Flag *--table* specifies -that the legacy table-formatted output should be used. This is the -default if neither *--name* nor *--uuid* are specified. Option -*--table* is mutually exclusive with options *--uuid* and *--name*. +If *--name* is specified, domain names are printed instead of the +table formatted one per line. If *--uuid* is specified domain's UUID's +are printed instead of names. If *--id* is specified then domain's ID's +are printed indead of names. However, it is possible to combine +*--name*, *--uuid* and *--id* to select only desired fields for +printing. Flag *--table* specifies that the legacy table-formatted +output should be used, but it is mutually exclusive with *--name*, +*--uuid* and *--id*. This is the default and will be used if neither of +*--name*, *--uuid* or *--id* is specified. If *--title* is specified, then the short domain description (title) is printed in an extra column. This flag is usable only with the default diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index e0491d48ac..5d0a03afa9 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1919,6 +1919,10 @@ static const vshCmdOptDef opts_list[] = { .type = VSH_OT_BOOL, .help = N_("list domain names only") }, + {.name = "id", + .type = VSH_OT_BOOL, + .help = N_("list domain IDs only") + }, {.name = "table", .type = VSH_OT_BOOL, .help = N_("list table (default)") @@ -1945,6 +1949,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd) bool optTable = vshCommandOptBool(cmd, "table"); bool optUUID = vshCommandOptBool(cmd, "uuid"); bool optName = vshCommandOptBool(cmd, "name"); + bool optID = vshCommandOptBool(cmd, "id"); size_t i; char *title; char uuid[VIR_UUID_STRING_BUFLEN]; @@ -1988,8 +1993,9 @@ cmdList(vshControl *ctl, const vshCmd *cmd) VSH_EXCLUSIVE_OPTIONS("table", "name"); VSH_EXCLUSIVE_OPTIONS("table", "uuid"); + VSH_EXCLUSIVE_OPTIONS("table", "id"); - if (!optUUID && !optName) + if (!optUUID && !optName && !optID) optTable = true; if (!(list = virshDomainListCollect(ctl, flags))) @@ -2007,6 +2013,8 @@ cmdList(vshControl *ctl, const vshCmd *cmd) } for (i = 0; i < list->ndomains; i++) { + const char *sep = ""; + dom = list->domains[i]; id = virDomainGetID(dom); if (id != (unsigned int) -1) @@ -2044,20 +2052,28 @@ cmdList(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - } else if (optUUID && optName) { - if (virDomainGetUUIDString(dom, uuid) < 0) { - vshError(ctl, "%s", _("Failed to get domain's UUID")); - goto cleanup; + } else { + if (optUUID) { + if (virDomainGetUUIDString(dom, uuid) < 0) { + vshError(ctl, "%s", _("Failed to get domain's UUID")); + goto cleanup; + } + vshPrint(ctl, "%s", uuid); + sep = " "; } - vshPrint(ctl, "%-36s %-30s\n", uuid, virDomainGetName(dom)); - } else if (optUUID) { - if (virDomainGetUUIDString(dom, uuid) < 0) { - vshError(ctl, "%s", _("Failed to get domain's UUID")); - goto cleanup; + if (optID) { + /* If we are asked to print IDs only then do that + * only for live domains. */ + if (id == (unsigned int) -1 && !optUUID && !optName) + continue; + vshPrint(ctl, "%s%s", sep, id_buf); + sep = " "; } - vshPrint(ctl, "%s\n", uuid); - } else if (optName) { - vshPrint(ctl, "%s\n", virDomainGetName(dom)); + if (optName) { + vshPrint(ctl, "%s%s", sep, virDomainGetName(dom)); + sep = " "; + } + vshPrint(ctl, "\n"); } } -- 2.26.2

3 3

[PATCH] News: Several apparmor improvements at v6.8.0
by jgao 09 Nov '20

09 Nov '20

From: jgao <jgao(a)redhat.com> Add news about apparmor about the improvements. Signed-off-by: jgao <jgao(a)redhat.com> --- NEWS.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 905deba5a8..1db8648536 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -154,6 +154,11 @@ v6.8.0 (2020-10-01) taking an external snapshot now preserves the cluser size of the original top image to preserve any performance tuning done on the original image. + * apparmor: Several improvements + + Add support for virtiofs filesystem,allowing qemu load old shared objects after + upgrades. + * **Bug fixes** * qemu: Various (i)SCSI backed hostdev fixes -- 2.21.3

2 1

[PATCH] convert char pointers to use g_autofree
by Ryan Gahagan 08 Nov '20

08 Nov '20

From: bschoney <bschoney(a)utexas.edu> additional conversions to the GLib API in src/util per issue #11. Please let me know if there are additional changes I should make in the files updated so far. I intend to submit work on additional files, and I want to be sure the changes so far are correct. Related issue: https://gitlab.com/libvirt/libvirt/-/issues/11 Signed-off-by: bschoney <bschoney(a)utexas.edu> --- src/util/vircgroupv1.c | 3 +-- src/util/virhostcpu.c | 4 +--- src/util/virlockspace.c | 6 ++---- src/util/virmacmap.c | 3 +-- src/util/virresctrl.c | 25 ++++++++----------------- src/util/virsysinfo.c | 9 +++------ 6 files changed, 16 insertions(+), 34 deletions(-) diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 731e9d61d4..984cd50409 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -1549,7 +1549,7 @@ virCgroupV1GetMemoryStat(virCgroupPtr group, unsigned long long *unevictable) { int ret = -1; - char *stat = NULL; + g_autofree char *stat = NULL; char *line = NULL; unsigned long long cacheVal = 0; unsigned long long activeAnonVal = 0; @@ -1614,7 +1614,6 @@ virCgroupV1GetMemoryStat(virCgroupPtr group, ret = 0; cleanup: - VIR_FREE(stat); return ret; } diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index c531d65f86..4f6c3390ce 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -87,7 +87,7 @@ virHostCPUGetStatsFreeBSD(int cpuNum, int *nparams) { const char *sysctl_name; - long *cpu_times; + g_autofree long *cpu_times = NULL; struct clockinfo clkinfo; size_t i, j, cpu_times_size, clkinfo_size; int cpu_times_num, offset, hz, stathz, ret = -1; @@ -172,8 +172,6 @@ virHostCPUGetStatsFreeBSD(int cpuNum, ret = 0; cleanup: - VIR_FREE(cpu_times); - return ret; } diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index b90e13f506..71d5dfb83e 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -515,7 +515,7 @@ int virLockSpaceCreateResource(virLockSpacePtr lockspace, const char *resname) { int ret = -1; - char *respath = NULL; + g_autofree char *respath = NULL; VIR_DEBUG("lockspace=%p resname=%s", lockspace, resname); @@ -538,7 +538,6 @@ int virLockSpaceCreateResource(virLockSpacePtr lockspace, cleanup: virMutexUnlock(&lockspace->lock); - VIR_FREE(respath); return ret; } @@ -547,7 +546,7 @@ int virLockSpaceDeleteResource(virLockSpacePtr lockspace, const char *resname) { int ret = -1; - char *respath = NULL; + g_autofree char *respath = NULL; VIR_DEBUG("lockspace=%p resname=%s", lockspace, resname); @@ -575,7 +574,6 @@ int virLockSpaceDeleteResource(virLockSpacePtr lockspace, cleanup: virMutexUnlock(&lockspace->lock); - VIR_FREE(respath); return ret; } diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index f9047d0fb1..e68742de10 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -129,7 +129,7 @@ static int virMacMapLoadFile(virMacMapPtr mgr, const char *file) { - char *map_str = NULL; + g_autofree char *map_str = NULL; virJSONValuePtr map = NULL; int map_str_len = 0; size_t i; @@ -189,7 +189,6 @@ virMacMapLoadFile(virMacMapPtr mgr, ret = 0; cleanup: - VIR_FREE(map_str); virJSONValueFree(map); return ret; } diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index d3087b98c1..1c2d175295 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -709,7 +709,7 @@ virResctrlGetMonitorInfo(virResctrlInfoPtr resctrl) { int ret = -1; int rv = -1; - char *featurestr = NULL; + g_autofree char *featurestr = NULL; char **features = NULL; size_t nfeatures = 0; virResctrlInfoMongrpPtr info_monitor = NULL; @@ -771,7 +771,6 @@ virResctrlGetMonitorInfo(virResctrlInfoPtr resctrl) ret = 0; cleanup: - VIR_FREE(featurestr); g_strfreev(features); VIR_FREE(info_monitor); return ret; @@ -1736,7 +1735,7 @@ virResctrlAllocGetGroup(virResctrlInfoPtr resctrl, const char *groupname, virResctrlAllocPtr *alloc) { - char *schemata = NULL; + g_autofree char *schemata = NULL; int rv = virFileReadValueString(&schemata, SYSFS_RESCTRL_PATH "/%s/schemata", groupname); @@ -1753,11 +1752,9 @@ virResctrlAllocGetGroup(virResctrlInfoPtr resctrl, if (virResctrlAllocParse(resctrl, *alloc, schemata) < 0) goto error; - VIR_FREE(schemata); return 0; error: - VIR_FREE(schemata); virObjectUnref(*alloc); *alloc = NULL; return -1; @@ -2354,8 +2351,8 @@ virResctrlAllocCreate(virResctrlInfoPtr resctrl, virResctrlAllocPtr alloc, const char *machinename) { - char *schemata_path = NULL; - char *alloc_str = NULL; + g_autofree char *schemata_path = NULL; + g_autofree char *alloc_str = NULL; int ret = -1; int lockfd = -1; @@ -2403,8 +2400,6 @@ virResctrlAllocCreate(virResctrlInfoPtr resctrl, ret = 0; cleanup: virResctrlUnlock(lockfd); - VIR_FREE(alloc_str); - VIR_FREE(schemata_path); return ret; } @@ -2413,8 +2408,8 @@ static int virResctrlAddPID(const char *path, pid_t pid) { - char *tasks = NULL; - char *pidstr = NULL; + g_autofree char *tasks = NULL; + g_autofree char *pidstr = NULL; int ret = 0; if (!path) { @@ -2436,8 +2431,6 @@ virResctrlAddPID(const char *path, ret = 0; cleanup: - VIR_FREE(tasks); - VIR_FREE(pidstr); return ret; } @@ -2657,8 +2650,8 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor, size_t i = 0; unsigned long long val = 0; g_autoptr(DIR) dirp = NULL; - char *datapath = NULL; - char *filepath = NULL; + g_autofree char *datapath = NULL; + g_autofree char *filepath = NULL; struct dirent *ent = NULL; virResctrlMonitorStatsPtr stat = NULL; @@ -2737,8 +2730,6 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor, ret = 0; cleanup: - VIR_FREE(datapath); - VIR_FREE(filepath); virResctrlMonitorStatsFree(stat); return ret; } diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 217f842a37..e1336bf566 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -532,9 +532,9 @@ static int virSysinfoParseS390Processor(const char *base, virSysinfoDefPtr ret) { const char *tmp_base; - char *manufacturer = NULL; - char *procline = NULL; - char *ncpu = NULL; + g_autofree char *manufacturer = NULL; + g_autofree char *procline = NULL; + g_autofree char *ncpu = NULL; int result = -1; virSysinfoProcessorDefPtr processor; @@ -593,9 +593,6 @@ virSysinfoParseS390Processor(const char *base, virSysinfoDefPtr ret) result = 0; error: - VIR_FREE(manufacturer); - VIR_FREE(procline); - VIR_FREE(ncpu); return result; } -- 2.29.0

1 0

[PATCH] convert char pointers to use g_autofree
by Ryan Gahagan 06 Nov '20

06 Nov '20

From: bschoney <bschoney(a)utexas.edu> additional conversions to the GLib API in src/util per issue #11. Please let me know if there are additional changes I should make in the files updated so far. I intend to submit work on additional files, and I want to be sure the changes so far are correct. Related issue: https://gitlab.com/libvirt/libvirt/-/issues/11 Signed-off-by: bschoney <bschoney(a)utexas.edu> --- src/util/vircgroupv1.c | 3 +-- src/util/virhostcpu.c | 4 +--- src/util/virlockspace.c | 6 ++---- src/util/virmacmap.c | 3 +-- src/util/virresctrl.c | 25 ++++++++----------------- src/util/virsysinfo.c | 9 +++------ 6 files changed, 16 insertions(+), 34 deletions(-) diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 731e9d61d4..984cd50409 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -1549,7 +1549,7 @@ virCgroupV1GetMemoryStat(virCgroupPtr group, unsigned long long *unevictable) { int ret = -1; - char *stat = NULL; + g_autofree char *stat = NULL; char *line = NULL; unsigned long long cacheVal = 0; unsigned long long activeAnonVal = 0; @@ -1614,7 +1614,6 @@ virCgroupV1GetMemoryStat(virCgroupPtr group, ret = 0; cleanup: - VIR_FREE(stat); return ret; } diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index c531d65f86..4f6c3390ce 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -87,7 +87,7 @@ virHostCPUGetStatsFreeBSD(int cpuNum, int *nparams) { const char *sysctl_name; - long *cpu_times; + g_autofree long *cpu_times = NULL; struct clockinfo clkinfo; size_t i, j, cpu_times_size, clkinfo_size; int cpu_times_num, offset, hz, stathz, ret = -1; @@ -172,8 +172,6 @@ virHostCPUGetStatsFreeBSD(int cpuNum, ret = 0; cleanup: - VIR_FREE(cpu_times); - return ret; } diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 2731d46dfc..c88a24be36 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -515,7 +515,7 @@ int virLockSpaceCreateResource(virLockSpacePtr lockspace, const char *resname) { int ret = -1; - char *respath = NULL; + g_autofree char *respath = NULL; VIR_DEBUG("lockspace=%p resname=%s", lockspace, resname); @@ -538,7 +538,6 @@ int virLockSpaceCreateResource(virLockSpacePtr lockspace, cleanup: virMutexUnlock(&lockspace->lock); - VIR_FREE(respath); return ret; } @@ -547,7 +546,7 @@ int virLockSpaceDeleteResource(virLockSpacePtr lockspace, const char *resname) { int ret = -1; - char *respath = NULL; + g_autofree char *respath = NULL; VIR_DEBUG("lockspace=%p resname=%s", lockspace, resname); @@ -575,7 +574,6 @@ int virLockSpaceDeleteResource(virLockSpacePtr lockspace, cleanup: virMutexUnlock(&lockspace->lock); - VIR_FREE(respath); return ret; } diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index 2d203e72af..70b148acac 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -129,7 +129,7 @@ static int virMacMapLoadFile(virMacMapPtr mgr, const char *file) { - char *map_str = NULL; + g_autofree char *map_str = NULL; virJSONValuePtr map = NULL; int map_str_len = 0; size_t i; @@ -189,7 +189,6 @@ virMacMapLoadFile(virMacMapPtr mgr, ret = 0; cleanup: - VIR_FREE(map_str); virJSONValueFree(map); return ret; } diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index d3087b98c1..1c2d175295 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -709,7 +709,7 @@ virResctrlGetMonitorInfo(virResctrlInfoPtr resctrl) { int ret = -1; int rv = -1; - char *featurestr = NULL; + g_autofree char *featurestr = NULL; char **features = NULL; size_t nfeatures = 0; virResctrlInfoMongrpPtr info_monitor = NULL; @@ -771,7 +771,6 @@ virResctrlGetMonitorInfo(virResctrlInfoPtr resctrl) ret = 0; cleanup: - VIR_FREE(featurestr); g_strfreev(features); VIR_FREE(info_monitor); return ret; @@ -1736,7 +1735,7 @@ virResctrlAllocGetGroup(virResctrlInfoPtr resctrl, const char *groupname, virResctrlAllocPtr *alloc) { - char *schemata = NULL; + g_autofree char *schemata = NULL; int rv = virFileReadValueString(&schemata, SYSFS_RESCTRL_PATH "/%s/schemata", groupname); @@ -1753,11 +1752,9 @@ virResctrlAllocGetGroup(virResctrlInfoPtr resctrl, if (virResctrlAllocParse(resctrl, *alloc, schemata) < 0) goto error; - VIR_FREE(schemata); return 0; error: - VIR_FREE(schemata); virObjectUnref(*alloc); *alloc = NULL; return -1; @@ -2354,8 +2351,8 @@ virResctrlAllocCreate(virResctrlInfoPtr resctrl, virResctrlAllocPtr alloc, const char *machinename) { - char *schemata_path = NULL; - char *alloc_str = NULL; + g_autofree char *schemata_path = NULL; + g_autofree char *alloc_str = NULL; int ret = -1; int lockfd = -1; @@ -2403,8 +2400,6 @@ virResctrlAllocCreate(virResctrlInfoPtr resctrl, ret = 0; cleanup: virResctrlUnlock(lockfd); - VIR_FREE(alloc_str); - VIR_FREE(schemata_path); return ret; } @@ -2413,8 +2408,8 @@ static int virResctrlAddPID(const char *path, pid_t pid) { - char *tasks = NULL; - char *pidstr = NULL; + g_autofree char *tasks = NULL; + g_autofree char *pidstr = NULL; int ret = 0; if (!path) { @@ -2436,8 +2431,6 @@ virResctrlAddPID(const char *path, ret = 0; cleanup: - VIR_FREE(tasks); - VIR_FREE(pidstr); return ret; } @@ -2657,8 +2650,8 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor, size_t i = 0; unsigned long long val = 0; g_autoptr(DIR) dirp = NULL; - char *datapath = NULL; - char *filepath = NULL; + g_autofree char *datapath = NULL; + g_autofree char *filepath = NULL; struct dirent *ent = NULL; virResctrlMonitorStatsPtr stat = NULL; @@ -2737,8 +2730,6 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monitor, ret = 0; cleanup: - VIR_FREE(datapath); - VIR_FREE(filepath); virResctrlMonitorStatsFree(stat); return ret; } diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 217f842a37..e1336bf566 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -532,9 +532,9 @@ static int virSysinfoParseS390Processor(const char *base, virSysinfoDefPtr ret) { const char *tmp_base; - char *manufacturer = NULL; - char *procline = NULL; - char *ncpu = NULL; + g_autofree char *manufacturer = NULL; + g_autofree char *procline = NULL; + g_autofree char *ncpu = NULL; int result = -1; virSysinfoProcessorDefPtr processor; @@ -593,9 +593,6 @@ virSysinfoParseS390Processor(const char *base, virSysinfoDefPtr ret) result = 0; error: - VIR_FREE(manufacturer); - VIR_FREE(procline); - VIR_FREE(ncpu); return result; } -- 2.29.0

1 0

[PATCH 5/5] Fixed error where char** not being promoted to const
by Ryan Gahagan 06 Nov '20

06 Nov '20

Signed-off-by: Ryan Gahagan <rgahagan(a)cs.utexas.edu> --- tools/virsh-domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 8abca1b65e..10ff7175a2 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -227,7 +227,7 @@ static const vshCmdOptDef opts_attach_disk[] = { {.name = "source-protocol", .type = VSH_OT_STRING, .help = N_("protocol used by disk device source") - } + }, {.name = "source-name", .type = VSH_OT_STRING, .help = N_("name of disk device source") @@ -629,7 +629,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) vshCommandOptStringReq(ctl, cmd, "targetbus", &targetbus) < 0 || vshCommandOptStringReq(ctl, cmd, "alias", &alias) < 0 || vshCommandOptStringReq(ctl, cmd, "sourcetype", &stype) < 0 || - vshCommandOptStringReq(ctl, cmd, "source-host-name", &host_name) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-host-name", (const char **) &host_name) < 0 || vshCommandOptStringReq(ctl, cmd, "source-host-transport", &host_transport) < 0 || vshCommandOptStringReq(ctl, cmd, "source-host-socket", &host_socket) < 0) goto cleanup; -- 2.29.0

1 0

[PATCH] qemu: virtiofs: Add pool element to limit thread pool
by Masayoshi Mizuma 06 Nov '20

06 Nov '20

From: Masayoshi Mizuma <m.mizuma(a)jp.fujitsu.com> virtiofsd has --thread-pool-size=NUM option to limit the thread pool size. It will be useful to tune the performance. Add pool element to use the option like as: <filesystem type='mount' accessmode='passthrough'> <driver type='virtiofs' queue='1024'/> <binary path='/usr/libexec/virtiofsd' xattr='on' pool='32'/> <source dir='/path'/> <target dir='mount_tag'/> </filesystem> Signed-off-by: Masayoshi Mizuma <m.mizuma(a)jp.fujitsu.com> --- docs/formatdomain.rst | 6 ++++-- docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 12 ++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_virtiofs.c | 3 +++ 5 files changed, 25 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index bfa80e4bc2..0f66af5dc3 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -3070,7 +3070,7 @@ A directory on the host that can be accessed directly from the guest. </filesystem> <filesystem type='mount' accessmode='passthrough'> <driver type='virtiofs' queue='1024'/> - <binary path='/usr/libexec/virtiofsd' xattr='on'> + <binary path='/usr/libexec/virtiofsd' xattr='on' pool='32'> <cache mode='always'/> <lock posix='on' flock='on'/> </binary> @@ -3188,7 +3188,9 @@ A directory on the host that can be accessed directly from the guest. the use of filesystem extended attributes. Caching can be tuned via the ``cache`` element, possible ``mode`` values being ``none`` and ``always``. Locking can be controlled via the ``lock`` element - attributes ``posix`` and - ``flock`` both accepting values ``on`` or ``off``. ( :since:`Since 6.2.0` ) + ``flock`` both accepting values ``on`` or ``off``. ( :since:`Since 6.2.0` ). + Thread pool size limit can be tuned via the ``pool`` element. + ( :since:`Since 6.9.0` ) ``source`` The resource on the host that is being accessed in the guest. The ``name`` attribute must be used with ``type='template'``, and the ``dir`` attribute diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index c25a742581..cd5de2ba80 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2839,6 +2839,11 @@ <ref name="virOnOff"/> </attribute> </optional> + <optional> + <attribute name="pool"> + <ref name="unsignedInt"/> + </attribute> + </optional> <optional> <element name="cache"> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index efa5ac527b..9d06f8c75f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11588,6 +11588,7 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt, g_autofree char *cache = virXPathString("string(./binary/cache/@mode)", ctxt); g_autofree char *posix_lock = virXPathString("string(./binary/lock/@posix)", ctxt); g_autofree char *flock = virXPathString("string(./binary/lock/@flock)", ctxt); + g_autofree char *thread_pool_size = virXPathString("string(./binary/@pool)", ctxt); int val; if (queue_size && virStrToLong_ull(queue_size, NULL, 10, &def->queue_size) < 0) { @@ -11597,6 +11598,14 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } + if (thread_pool_size && + virStrToLong_ull(thread_pool_size, NULL, 10, &def->thread_pool_size) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("cannot parse thread pool size '%s' for virtiofs"), + thread_pool_size); + goto error; + } + if (binary) def->binary = virFileSanitizePath(binary); @@ -26191,6 +26200,9 @@ virDomainFSDefFormat(virBufferPtr buf, virTristateSwitchTypeToString(def->xattr)); } + if (def->thread_pool_size) + virBufferAsprintf(&binaryAttrBuf, " pool='%llu'", def->thread_pool_size); + if (def->cache != VIR_DOMAIN_FS_CACHE_MODE_DEFAULT) { virBufferAsprintf(&binaryBuf, "<cache mode='%s'/>\n", virDomainFSCacheModeTypeToString(def->cache)); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index cd344716a3..98ab0a51c7 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -860,6 +860,7 @@ struct _virDomainFSDef { bool symlinksResolved; char *binary; unsigned long long queue_size; + unsigned long long thread_pool_size; virTristateSwitch xattr; virDomainFSCacheMode cache; virTristateSwitch posix_lock; diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c index 2e239cad66..e35c278a1b 100644 --- a/src/qemu/qemu_virtiofs.c +++ b/src/qemu/qemu_virtiofs.c @@ -126,6 +126,9 @@ qemuVirtioFSBuildCommandLine(virQEMUDriverConfigPtr cfg, virCommandPassFD(cmd, *fd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); *fd = -1; + if (fs->thread_pool_size) + virCommandAddArgFormat(cmd, "--thread-pool-size=%llu", fs->thread_pool_size); + virCommandAddArg(cmd, "-o"); virBufferAddLit(&opts, "source="); virQEMUBuildBufferEscapeComma(&opts, fs->src->path); -- 2.27.0

3 4

[PATCH] lxc: Cleanup after failed startup
by Michal Privoznik 06 Nov '20

06 Nov '20

If starting an container fails, the virLXCProcessStop() is called. But since vm->def->id is not set until libvirt_lxc is spawned (the domain's ID is PID of that process), virLXCProcessStop() returns early as virDomainObjIsActive() returns false. But doing so leaves behind resources reserved for the containers during the startup process. Most notably, hostdevs are not re-attached to the host, the domain's transient XML is not removed, etc. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/lxc/lxc_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index c5a710fc3f..08c82b0e9a 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -855,7 +855,7 @@ int virLXCProcessStop(virLXCDriverPtr driver, vm->def->name, (int)vm->pid, (int)reason); if (!virDomainObjIsActive(vm)) { VIR_DEBUG("VM '%s' not active", vm->def->name); - return 0; + goto cleanup; } priv = vm->privateData; -- 2.26.2

2 1