- Devel - libvirt List Archives

[libvirt PATCH] virsh: refactor cmdDomblkinfo
by Ján Tomko 12 Aug '21

12 Aug '21

Use automatic memory cleanup to get rid of the cleanup section, and of the memory leak that happens inside the loop, because cap, alloc and phy are only freed once per function. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- tools/virsh-domain-monitor.c | 62 +++++++++++++++--------------------- 1 file changed, 25 insertions(+), 37 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index a2bf5c05fc..55c8dcf118 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -452,22 +452,16 @@ static bool cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) { virDomainBlockInfo info; - virDomainPtr dom; - bool ret = false; + g_autoptr(virshDomain) dom = NULL; bool human = false; bool all = false; const char *device = NULL; - xmlDocPtr xmldoc = NULL; - xmlXPathContextPtr ctxt = NULL; + g_autoptr(xmlDoc) xmldoc = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; int ndisks; size_t i; - xmlNodePtr *disks = NULL; - char *target = NULL; - char *protocol = NULL; - char *cap = NULL; - char *alloc = NULL; - char *phy = NULL; - vshTable *table = NULL; + g_autofree xmlNodePtr *disks = NULL; + g_autoptr(vshTable) table = NULL; VSH_EXCLUSIVE_OPTIONS("all", "device"); @@ -477,7 +471,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) all = vshCommandOptBool(cmd, "all"); if (!all && vshCommandOptStringQuiet(ctl, cmd, "device", &device) <= 0) { vshError(ctl, "command 'domblkinfo' requires <device> option"); - goto cleanup; + return false; } human = vshCommandOptBool(cmd, "human"); @@ -487,18 +481,24 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) int rc; if (virshDomainGetXML(ctl, cmd, 0, &xmldoc, &ctxt) < 0) - goto cleanup; + return false; ndisks = virXPathNodeSet("./devices/disk", ctxt, &disks); if (ndisks < 0) - goto cleanup; + return false; /* title */ table = vshTableNew(_("Target"), _("Capacity"), _("Allocation"), _("Physical"), NULL); if (!table) - goto cleanup; + return false; for (i = 0; i < ndisks; i++) { + g_autofree char *target = NULL; + g_autofree char *protocol = NULL; + g_autofree char *cap = NULL; + g_autofree char *alloc = NULL; + g_autofree char *phy = NULL; + ctxt->node = disks[i]; protocol = virXPathString("string(./source/@protocol)", ctxt); target = virXPathString("string(./target/@dev)", ctxt); @@ -517,7 +517,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) memset(&info, 0, sizeof(info)); vshResetLibvirtError(); } else { - goto cleanup; + return false; } } } else { @@ -527,41 +527,29 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) } if (!cmdDomblkinfoGet(&info, &cap, &alloc, &phy, human)) - goto cleanup; + return false; if (vshTableRowAppend(table, target, cap, alloc, phy, NULL) < 0) - goto cleanup; - - VIR_FREE(target); - VIR_FREE(protocol); + return false; } vshTablePrintToStdout(table, ctl); } else { + g_autofree char *cap = NULL; + g_autofree char *alloc = NULL; + g_autofree char *phy = NULL; + if (virDomainGetBlockInfo(dom, device, &info, 0) < 0) - goto cleanup; + return false; if (!cmdDomblkinfoGet(&info, &cap, &alloc, &phy, human)) - goto cleanup; + return false; vshPrint(ctl, "%-15s %s\n", _("Capacity:"), cap); vshPrint(ctl, "%-15s %s\n", _("Allocation:"), alloc); vshPrint(ctl, "%-15s %s\n", _("Physical:"), phy); } - ret = true; - - cleanup: - vshTableFree(table); - VIR_FREE(cap); - VIR_FREE(alloc); - VIR_FREE(phy); - virshDomainFree(dom); - VIR_FREE(target); - VIR_FREE(protocol); - VIR_FREE(disks); - xmlXPathFreeContext(ctxt); - xmlFreeDoc(xmldoc); - return ret; + return true; } /* -- 2.31.1

2 1

[PATCH 0/2] versions of: save status xml after generating taint message
by Kristina Hanicova 11 Aug '21

11 Aug '21

Both of these patches solve the same bug and only one needs to be merged. The first one is a bit longer, but I think it is more effective (because of function qemuDomainObjCheckTaint, where qemuDomainObjTaint could be potentially called in multiple for cycles). The second one is short and probably more readable. I will leave it up to the reviewer to choose one. Kristina Hanicova (2): qemu: save status xml after generating taint message qemu: save status xml after generating taint message src/qemu/qemu_domain.c | 14 ++++++++++++++ src/qemu/qemu_domain.h | 5 +++++ src/qemu/qemu_driver.c | 4 ++-- 3 files changed, 21 insertions(+), 2 deletions(-) -- 2.31.1

2 3

[PATCH v2 00/11] Implement IOThreads related APIs for test driver
by Luke Yue 11 Aug '21

11 Aug '21

v2: - Move the extracted functions to hypervisor/domain_driver.c - Implement virDomainPinIOThread - Implement virDomainSetIOThreadParams - Implement virConnectGetAllDomainStats, currently only supports get state and IOThread info - Add more tests Luke Yue (11): domain_driver.c: Introduce and use virDomainDriverAddIOThreadCheck() test_driver: Introduce testIOThreadInfo and generate IOThread infos test_driver: Implement virDomainAddIOThread test_driver: Implement virDomainDelIOThread domain_driver.c: Introduce and use virDomainDriverGetIOThreadsConfig() test_driver: Implement virDomainGetIOThreadInfo test_driver: Implement virDomainPinIOThread test_driver: Implement testDomainSetIOThreadParams test_driver: Implement virConnectGetAllDomainStats test_driver: Introduce testDomainGetStatsIOThread tests: Test IOThread related functions for test driver examples/xml/test/testdomfc4.xml | 5 + src/hypervisor/domain_driver.c | 123 ++++++++ src/hypervisor/domain_driver.h | 9 + src/libvirt_private.syms | 3 + src/qemu/qemu_driver.c | 113 +------ src/test/meson.build | 1 + src/test/test_driver.c | 509 +++++++++++++++++++++++++++++++ tests/virshtest.c | 90 ++++++ 8 files changed, 745 insertions(+), 108 deletions(-) -- 2.32.0

2 13

[PATCH 0/4] Implement some job related APIs for test driver
by Luke Yue 11 Aug '21

11 Aug '21

Luke Yue (4): test_driver: Implement virDomainGetJobInfo test_driver: Implement virDomainGetJobStats test_driver: Implement virDomainAbortJob virshtest: add test for domjobinfo src/test/test_driver.c | 170 +++++++++++++++++++++++++++++++++++++++++ tests/virshtest.c | 11 +++ 2 files changed, 181 insertions(+) -- 2.32.0

2 8

[libvirt PATCH 0/3] Invalidate the cpu flags cache on changes of kernel command line
by Tim Wiederhake 11 Aug '21

11 Aug '21

The kernel command line can contain settings affecting the availability of cpu features, eg. "tsx=on". This series adds the kernel command line to the cpu flags cache and declares the cache invalid if the current kernel command line differs. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1953389. Tim Wiederhake (3): virQEMUCaps: Add kernel command line virQEMUCapsCachePriv: Add kernel command line qemu: Invalidate capabilities cache on kernel command line mismatch src/qemu/qemu_capabilities.c | 34 ++++++++++++++++++++++++++++++++-- src/qemu/qemu_capspriv.h | 3 ++- tests/qemucapsprobe.c | 2 +- 3 files changed, 35 insertions(+), 4 deletions(-) -- 2.31.1

4 12

[libvirt PATCH] run: set abs_builddir variables
by Ján Tomko 11 Aug '21

11 Aug '21

test-lib.sh needs these to be set. Export them so that the virsh-* tests can be run using: builddir$ ./run srcdir/tests/virsh-snapshot Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- meson.build | 1 + run.in | 3 +++ 2 files changed, 4 insertions(+) diff --git a/meson.build b/meson.build index 32ad688c9c..5af09d319a 100644 --- a/meson.build +++ b/meson.build @@ -2233,6 +2233,7 @@ configure_file(output: 'meson-config.h', configuration: conf) # generate run helper run_conf = configuration_data() run_conf.set('abs_builddir', meson.build_root()) +run_conf.set('abs_top_builddir', meson.build_root()) configure_file( input: 'run.in', output: '@BASENAME@', diff --git a/run.in b/run.in index 9aae27a79e..64f99751fe 100644 --- a/run.in +++ b/run.in @@ -80,6 +80,9 @@ env["LIBVIRT_DIR_OVERRIDE"] = "1" # read problems when using glibc. env["MALLOC_PERTURB_"] = "%d" % random.randint(1, 255) +env["abs_builddir"] = "@abs_builddir@" +env["abs_top_builddir"] = "@abs_top_builddir@" + modular_daemons = [ "virtinterfaced", "virtlxcd", -- 2.31.1

2 1

[libvirt PATCH 00/10] virsh: moments: use g_auto more (glib chronicles)
by Ján Tomko 11 Aug '21

11 Aug '21

Ján Tomko (10): vsh: table: define cleanup function virsh: add cleanup function for virshDomainCheckpoint virsh: add cleanup function for virshDomainSnapshot virsh: checkpoint: move variables inside the loop virsh: snapshot: move variables inside the loop virsh: cmdCheckpointInfo: delete unused variables virsh: checkpoint: use g_auto where possible virsh: checkpoint: remove pointless cleanup labels virsh: snapshot: use g_auto where possible virsh: snapshot: remove pointless cleanup labels tools/virsh-checkpoint.c | 188 ++++++++----------------- tools/virsh-snapshot.c | 288 +++++++++++++-------------------------- tools/virsh-util.h | 4 + tools/vsh-table.h | 1 + 4 files changed, 156 insertions(+), 325 deletions(-) -- 2.31.1

2 11

[libvirt PATCH 0/5] vsh: use g_auto more (glib chronicles)
by Ján Tomko 11 Aug '21

11 Aug '21

Except for vshCommandParse. -EPARSE Ján Tomko (5): vsh: do not cast away const vsh: cmdEcho: use separate variable for argument vsh: use g_auto where possible vsh: remove pointless cleanup labels vsh: use g_clear_pointer tools/vsh.c | 91 ++++++++++++++++++----------------------------------- 1 file changed, 31 insertions(+), 60 deletions(-) -- 2.31.1

2 11

[libvirt PATCH] meson: Always use the / operator to join paths
by Andrea Bolognani 10 Aug '21

10 Aug '21

This is the preferred way to do it, but there were a few instances in which some of the path components had embedded slashes instead. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/internals/meson.build | 2 +- docs/kbase/meson.build | 2 +- docs/manpages/meson.build | 2 +- src/security/meson.build | 2 +- src/storage/meson.build | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/internals/meson.build b/docs/internals/meson.build index 5aa67ded5c..2d0ae6195c 100644 --- a/docs/internals/meson.build +++ b/docs/internals/meson.build @@ -12,7 +12,7 @@ html_xslt_gen = [] foreach name : internals_in_files html_xslt_gen += { 'name': name, - 'source': 'docs/internals' / name + '.html.in', + 'source': 'docs' / 'internals' / name + '.html.in', } endforeach diff --git a/docs/kbase/meson.build b/docs/kbase/meson.build index 8d8fd695ea..73dc11837f 100644 --- a/docs/kbase/meson.build +++ b/docs/kbase/meson.build @@ -31,7 +31,7 @@ foreach name : docs_kbase_files html_xslt_gen += { 'name': name, 'file': docs_rst2html5_gen.process(rst_file), - 'source': 'docs/kbase' / rst_file, + 'source': 'docs' / 'kbase' / rst_file, } endforeach diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build index fe91a43614..cafe29a545 100644 --- a/docs/manpages/meson.build +++ b/docs/manpages/meson.build @@ -125,7 +125,7 @@ foreach data : docs_man_files html_xslt_gen += { 'name': data['name'], 'file': html_in, - 'source': 'docs/manpages' / rst_in_file, + 'source': 'docs' / 'manpages' / rst_in_file, } endforeach diff --git a/src/security/meson.build b/src/security/meson.build index 6f5e1dec1d..6230b34aa4 100644 --- a/src/security/meson.build +++ b/src/security/meson.build @@ -47,7 +47,7 @@ if conf.has('WITH_LIBVIRTD') and conf.has('WITH_APPARMOR') conf_inc_dir, hypervisor_inc_dir, include_directories('.'), - include_directories('../storage_file'), + include_directories('..' / 'storage_file'), ], } endif diff --git a/src/storage/meson.build b/src/storage/meson.build index 915ae46f61..d1aa66b147 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -79,7 +79,7 @@ if conf.has('WITH_STORAGE') ], include_directories: [ conf_inc_dir, - include_directories('../storage_file'), + include_directories('..' / 'storage_file'), ], ) @@ -163,7 +163,7 @@ if conf.has('WITH_STORAGE_GLUSTER') glusterfs_dep, ], 'include': [ - include_directories('../storage_file'), + include_directories('..' / 'storage_file'), ], 'install_dir': storage_backend_install_dir, } -- 2.31.1

2 1

[PATCH v2 0/4] interface define: add support for validation against schema
by Kristina Hanicova 10 Aug '21

10 Aug '21

This is v2 of: https://listman.redhat.com/archives/libvir-list/2021-August/msg00187.html Changes since v1 (suggested by Peter): * split of the patch containing api and virsh adjustments into separate patches * change of documentation (which I forgot to do before) Kristina Hanicova (4): conf: propagate xmlDocPtr and flags into virInterfaceDefParseXML() api: add virInterfaceDefineFlags virsh: add support for '--validate' option in define interface interface_conf: add validation against schema in define docs/manpages/virsh.rst | 5 ++-- include/libvirt/libvirt-interface.h | 4 +++ src/conf/interface_conf.c | 38 ++++++++++++++++++------- src/conf/interface_conf.h | 6 ++-- src/conf/virinterfaceobj.c | 2 +- src/interface/interface_backend_netcf.c | 6 ++-- src/libvirt-interface.c | 2 +- src/test/test_driver.c | 4 +-- tests/interfacexml2xmltest.c | 2 +- tools/virsh-interface.c | 10 ++++++- 10 files changed, 55 insertions(+), 24 deletions(-) -- 2.31.1

2 6