- Devel - libvirt List Archives

[libvirt] [PATCH 0/3] Remove unused virFile*() functions
by Fabiano Fidêncio 18 Dec '19

18 Dec '19

- virFileSkipRoot() is no longer used since faf2d811f3e9a4; - virFileIsAbsPath() is no longer used since faf2d811f3e9a4; - VIR_FILE_IS_DIR_SEPARATOR is no longer used since virFileIsAbsPath has been dropped; Fabiano Fidêncio (3): util: Remove virFileSkipRoot() util: Remove virFileIsAbsPath() util: Remove VIR_FILE_IS_DIR_SEPARATOR src/libvirt_private.syms | 2 -- src/util/virfile.c | 73 ---------------------------------------- src/util/virfile.h | 4 --- 3 files changed, 79 deletions(-) -- 2.23.0

3 5

[libvirt] [PATCH] docs: Only distribute sanlock manpage if WITH_SANLOCK
by Cole Robinson 18 Dec '19

18 Dec '19

This fixes mingw-libvirt RPM build Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- docs/Makefile.am | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index eb8de80b9c..66f164a1ac 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -214,9 +214,7 @@ manpages7_rst = \ $(KEYCODES:%=manpages/virkeycode-%.rst) \ $(KEYNAMES:%=manpages/virkeyname-%.rst) \ $(NULL) -manpages8_rst = \ - manpages/virt-sanlock-cleanup.rst \ - $(NULL) +manpages8_rst = $(NULL) manpages_rst += \ $(manpages1_rst) \ $(manpages7_rst) \ @@ -245,6 +243,11 @@ if WITH_LOGIN_SHELL else ! WITH_LOGIN_SHELL manpages_rst += manpages/virt-login-shell.rst endif ! WITH_LOGIN_SHELL +if WITH_SANLOCK + manpages8_rst += manpages/virt-sanlock-cleanup.rst +else ! WITH_SANLOCK + manpages_rst += manpages/virt-sanlock-cleanup.rst +endif ! WITH_SANLOCK manpages_rst_html_in = \ $(manpages_rst:%.rst=%.html.in) manpages_html = \ -- 2.23.0

2 1

[libvirt] [PATCH] util: Simplify Windows version of virGetUserDirectoryByUID()
by Fabiano Fidêncio 18 Dec '19

18 Dec '19

Let's just use the plain g_get_home_dir(), from GLib, instead of maintaining a code adapted from the GLib's one. Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- src/util/virutil.c | 92 +--------------------------------------------- 1 file changed, 1 insertion(+), 91 deletions(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index a28feb3daa..4075047cf9 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1070,100 +1070,10 @@ virDoesGroupExist(const char *name G_GNUC_UNUSED) } # ifdef WIN32 -/* These methods are adapted from GLib2 under terms of LGPLv2+ */ -static int -virGetWin32SpecialFolder(int csidl, char **path) -{ - char buf[MAX_PATH+1]; - LPITEMIDLIST pidl = NULL; - int ret = 0; - - *path = NULL; - - if (SHGetSpecialFolderLocation(NULL, csidl, &pidl) == S_OK) { - if (SHGetPathFromIDList(pidl, buf)) - *path = g_strdup(buf); - CoTaskMemFree(pidl); - } - return ret; -} - -static int -virGetWin32DirectoryRoot(char **path) -{ - char windowsdir[MAX_PATH]; - - *path = NULL; - - if (GetWindowsDirectory(windowsdir, G_N_ELEMENTS(windowsdir))) { - const char *tmp; - /* Usually X:\Windows, but in terminal server environments - * might be an UNC path, AFAIK. - */ - tmp = virFileSkipRoot(windowsdir); - if (VIR_FILE_IS_DIR_SEPARATOR(tmp[-1]) && - tmp[-2] != ':') - tmp--; - - windowsdir[tmp - windowsdir] = '\0'; - } else { - strcpy(windowsdir, "C:\\"); - } - - *path = g_strdup(windowsdir); - return 0; -} - - - char * virGetUserDirectoryByUID(uid_t uid G_GNUC_UNUSED) { - /* Since Windows lacks setuid binaries, and since we already fake - * geteuid(), we can safely assume that this is only called when - * querying about the current user */ - const char *dir; - char *ret; - - dir = getenv("HOME"); - - /* Only believe HOME if it is an absolute path and exists */ - if (dir) { - if (!virFileIsAbsPath(dir) || - !virFileExists(dir)) - dir = NULL; - } - - /* In case HOME is Unix-style (it happens), convert it to - * Windows style. - */ - if (dir) { - char *p; - while ((p = strchr(dir, '/')) != NULL) - *p = '\\'; - } - - if (!dir) - /* USERPROFILE is probably the closest equivalent to $HOME? */ - dir = getenv("USERPROFILE"); - - ret = g_strdup(dir); - - if (!ret && - virGetWin32SpecialFolder(CSIDL_PROFILE, &ret) < 0) - return NULL; - - if (!ret && - virGetWin32DirectoryRoot(&ret) < 0) - return NULL; - - if (!ret) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to determine home directory")); - return NULL; - } - - return ret; + return g_strdup(g_get_home_dir()); } char * -- 2.23.0

2 1

[libvirt] [PATCH v6 0/4] PCI hostdev partial assignment support
by Daniel Henrique Barboza 18 Dec '19

18 Dec '19

changes from previous version 5 [1]: - changes in the commit message of patch 1 and the documentation included in patches 3 and 4, all of them suggested/hinted by Alex Williamson. Daniel Henrique Barboza (4): Introducing new address type='unassigned' for PCI hostdevs qemu: handle unassigned PCI hostdevs in command line formatdomain.html.in: document <address type='unassigned'/> news.xml: add address type='unassigned' entry [1] https://www.redhat.com/archives/libvir-list/2019-December/msg01097.html docs/formatdomain.html.in | 10 ++++ docs/news.xml | 14 +++++ docs/schemas/domaincommon.rng | 5 ++ src/conf/device_conf.c | 2 + src/conf/device_conf.h | 1 + src/conf/domain_conf.c | 7 ++- src/qemu/qemu_command.c | 5 ++ src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain_address.c | 5 ++ .../hostdev-pci-address-unassigned.args | 31 ++++++++++ .../hostdev-pci-address-unassigned.xml | 42 ++++++++++++++ tests/qemuxml2argvtest.c | 4 ++ .../hostdev-pci-address-unassigned.xml | 58 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 14 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args create mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-unassigned.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.xml -- 2.23.0

3 6

[libvirt] [PATCH v2 0/4] move qemucaps validations from qemu_command to qemu_domain
by Daniel Henrique Barboza 18 Dec '19

18 Dec '19

Most of the patches were pushed in the first version. These are the patches that didn't make the cut and needed new versions. After these patches I'll refrain from doing more validation moves to qemu_domain.c. I'll send a RFC discussing how we can move all the validations to a new file first, then we can resume this work in the definitive location instead. Changes from previous version 1 [1]: - patch 1 (former patch 04): moved the validation to a new qemuDomainDeviceDefValidateMemory() function which is called by qemuDomainDeviceDefValidate(). - patch 2 (former patch 23): added the missing "if (graphics->data.egl_headless.rendernode)" check. - patch 3 (former patch 24): virReportEnumRangeError is now being used in the "default" label error case. - patch 4 (new): added the VMCOREINFO validation case that I mentioned about in the cover letter of [1] as a difficult case, but Cole mentioned that it was simpler than that and that I was probably missing something. Cole was right. [1] https://www.redhat.com/archives/libvir-list/2019-December/msg00570.html Daniel Henrique Barboza (4): qemu: command: move NVDIMM validation to qemu_domain.c qemu: command: move qemuBuildGraphicsEGLHeadlessCommandLine validation to qemu_domain.c qemu: move qemuBuildSmartcardCommandLine validation to qemu_domain.c qemu: command: move validation of vmcoreinfo to qemu_domain.c src/qemu/qemu_command.c | 51 ++---------------------------- src/qemu/qemu_domain.c | 70 +++++++++++++++++++++++++++++++++++++++-- tests/qemuxml2xmltest.c | 30 +++++++++--------- 3 files changed, 87 insertions(+), 64 deletions(-) -- 2.23.0

2 5

[libvirt] [PATCH v4 0/4] Rewrite virGetUser*Directory() functions using g_get_*_dir()
by Fabiano Fidêncio 18 Dec '19

18 Dec '19

By rewriting virGetUser*Directory() functions using g_get_*_dir() functions allows us to drop all the different implementations we keep, as GLib already takes care of those for us. Changes since v3: https://www.redhat.com/archives/libvir-list/2019-December/msg01123.html - Used g_build_filename() instead of g_strdup_printf(); Changes since v2: https://www.redhat.com/archives/libvir-list/2019-December/msg01064.html - Addressed comments made by Cole about: - virGetUserDirectory() should return $HOME; - virGetUser*Directory() don't append "libvirt" to the returned path on Windows; Changes since v1: https://www.redhat.com/archives/libvir-list/2019-December/msg01055.html - Don't check for the return of g_get_*_dir(), as it cannot be NULL; Fabiano Fidêncio (4): util: Rewrite virGetUserDirectory() using g_get_home_dir() util: Rewrite virGetUserConfigDirectory() using g_get_user_config_dir() util: Rewrite virGetUserCacheDirectory() using g_get_user_cache_dir() util: Rewrite virGetUserRuntimeDirectory() using g_get_user_runtime_dir() src/util/virutil.c | 137 ++++++++++----------------------------------- 1 file changed, 31 insertions(+), 106 deletions(-) -- 2.23.0

2 5

[libvirt] [PATCH v2 0/4] Rewrite virGetUser*Directory() functions using g_get_*_dir()
by Fabiano Fidêncio 18 Dec '19

18 Dec '19

By rewriting virGetUser*Directory() functions using g_get_*_dir() functions allows us to drop all the different implementations we keep, as GLib already takes care of those for us. Changes since v1: https://www.redhat.com/archives/libvir-list/2019-December/msg01055.html - Don't check for the return of g_get_*_dir(), as it cannot be NULL; Fabiano Fidêncio (4): util: Rewrite virGetUserDirectory() using g_get_home_dir() util: Rewrite virGetUserConfigDirectory() using g_get_user_config_dir() util: Rewrite virGetUserCacheDirectory() using g_get_user_cache_dir() util: Rewrite virGetUserRuntimeDirectory() using g_get_user_runtime_dir() src/util/virutil.c | 125 +++++++-------------------------------------- 1 file changed, 19 insertions(+), 106 deletions(-) -- 2.23.0

4 12

[libvirt] [PATCH v3 0/1] qemu_command: tidy up qemuBuildHostdevCommandLine loop
by Daniel Henrique Barboza 18 Dec '19

18 Dec '19

This fella got buried a few months ago. Re-sending as a v3 due to rebase changes. changes from previous version [1]: - rebased to master at 6c17606b7c [1] https://www.redhat.com/archives/libvir-list/2019-October/msg00457.html Daniel Henrique Barboza (1): qemu_command: tidy up qemuBuildHostdevCommandLine loop src/qemu/qemu_command.c | 52 +++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 20 deletions(-) -- 2.23.0

2 2

[libvirt] [PATCH] qemu: store the emulator name in the capabilities XML
by Daniel P. Berrangé 18 Dec '19

18 Dec '19

We don't need this for any functional purpose, but when debugging hosts it is useful to know what binary a given capabilities XML document is associated with. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_capabilities.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2223589058..7d47fa4d02 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3852,6 +3852,7 @@ virQEMUCapsParseSEVInfo(virQEMUCapsPtr qemuCaps, xmlXPathContextPtr ctxt) * Parsing a doc that looks like * * <qemuCaps> + * <emulator>/some/path</emulator> * <qemuctime>234235253</qemuctime> * <selfctime>234235253</selfctime> * <selfvers>1002016</selfvers> @@ -3895,6 +3896,18 @@ virQEMUCapsLoadCache(virArch hostArch, goto cleanup; } + if (!(str = virXPathString("string(./emulator)", ctxt))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("missing emulator in QEMU capabilities cache")); + goto cleanup; + } + if (!STREQ(str, qemuCaps->binary)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Expected caps for '%s' but saw '%s'"), + qemuCaps->binary, str); + goto cleanup; + } + VIR_FREE(str); if (virXPathLongLong("string(./qemuctime)", ctxt, &l) < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing qemuctime in QEMU capabilities XML")); @@ -4232,6 +4245,8 @@ virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps) virBufferAddLit(&buf, "<qemuCaps>\n"); virBufferAdjustIndent(&buf, 2); + virBufferEscapeString(&buf, "<emulator>%s</emulator>\n", + qemuCaps->binary); virBufferAsprintf(&buf, "<qemuctime>%llu</qemuctime>\n", (long long)qemuCaps->ctime); virBufferAsprintf(&buf, "<selfctime>%llu</selfctime>\n", -- 2.23.0

3 3

[libvirt] [PATCH] conf: fix populating of fake NUMA in multi-node hosts
by Daniel P. Berrangé 18 Dec '19

18 Dec '19

If the host OS doesn't have NUMA present, we fallback to populating fake NUMA info and the code thus assumes only a single NUMA node. Unfortunately we also fallback to fake NUMA if numactl-devel was not present, and in this case we can still have multiple NUMA nodes. In this case we create all CPUs, but only the CPUs in the first node have any data filled in, resulting in capabilities like: <topology> <cells num='1'> <cell id='0'> <memory unit='KiB'>15977572</memory> <cpus num='48'> <cpu id='0' socket_id='0' core_id='0' siblings='0'/> <cpu id='1' socket_id='0' core_id='0' siblings='1'/> <cpu id='2' socket_id='0' core_id='1' siblings='2'/> <cpu id='3' socket_id='0' core_id='1' siblings='3'/> <cpu id='4' socket_id='0' core_id='2' siblings='4'/> <cpu id='5' socket_id='0' core_id='2' siblings='5'/> <cpu id='6' socket_id='0' core_id='3' siblings='6'/> <cpu id='7' socket_id='0' core_id='3' siblings='7'/> <cpu id='8' socket_id='0' core_id='4' siblings='8'/> <cpu id='9' socket_id='0' core_id='4' siblings='9'/> <cpu id='10' socket_id='0' core_id='5' siblings='10'/> <cpu id='11' socket_id='0' core_id='5' siblings='11'/> <cpu id='0'/> <cpu id='0'/> <cpu id='0'/> <cpu id='0'/> <cpu id='0'/> <cpu id='0'/> <cpu id='0'/> <cpu id='0'/> <cpu id='0'/> <cpu id='0'/> <cpu id='0'/> </cpus> </cell> </cells> </topology> With this new code we get something slightly less broken <topology> <cells num='4'> <cell id='0'> <memory unit='KiB'>15977572</memory> <cpus num='12'> <cpu id='0' socket_id='0' core_id='0' siblings='0-1'/> <cpu id='1' socket_id='0' core_id='0' siblings='0-1'/> <cpu id='2' socket_id='0' core_id='1' siblings='2-3'/> <cpu id='3' socket_id='0' core_id='1' siblings='2-3'/> <cpu id='4' socket_id='0' core_id='2' siblings='4-5'/> <cpu id='5' socket_id='0' core_id='2' siblings='4-5'/> <cpu id='6' socket_id='0' core_id='3' siblings='6-7'/> <cpu id='7' socket_id='0' core_id='3' siblings='6-7'/> <cpu id='8' socket_id='0' core_id='4' siblings='8-9'/> <cpu id='9' socket_id='0' core_id='4' siblings='8-9'/> <cpu id='10' socket_id='0' core_id='5' siblings='10-11'/> <cpu id='11' socket_id='0' core_id='5' siblings='10-11'/> </cpus> </cell> <cell id='0'> <memory unit='KiB'>15977572</memory> <cpus num='12'> <cpu id='12' socket_id='0' core_id='0' siblings='12-13'/> <cpu id='13' socket_id='0' core_id='0' siblings='12-13'/> <cpu id='14' socket_id='0' core_id='1' siblings='14-15'/> <cpu id='15' socket_id='0' core_id='1' siblings='14-15'/> <cpu id='16' socket_id='0' core_id='2' siblings='16-17'/> <cpu id='17' socket_id='0' core_id='2' siblings='16-17'/> <cpu id='18' socket_id='0' core_id='3' siblings='18-19'/> <cpu id='19' socket_id='0' core_id='3' siblings='18-19'/> <cpu id='20' socket_id='0' core_id='4' siblings='20-21'/> <cpu id='21' socket_id='0' core_id='4' siblings='20-21'/> <cpu id='22' socket_id='0' core_id='5' siblings='22-23'/> <cpu id='23' socket_id='0' core_id='5' siblings='22-23'/> </cpus> </cell> </cells> </topology> The topology at least now reflects what 'virsh nodeinfo' reports. The main bug is that the CPU "id" values won't match what the Linux host actually uses. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/conf/capabilities.c | 67 ++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 81a2004dba..2a183d7070 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1593,7 +1593,7 @@ virCapabilitiesHostNUMAInitFake(virCapsHostNUMAPtr caps) virNodeInfo nodeinfo; virCapsHostNUMACellCPUPtr cpus; int ncpus; - int s, c, t; + int n, s, c, t; int id, cid; int onlinecpus G_GNUC_UNUSED; bool tmp; @@ -1602,47 +1602,52 @@ virCapabilitiesHostNUMAInitFake(virCapsHostNUMAPtr caps) return -1; ncpus = VIR_NODEINFO_MAXCPUS(nodeinfo); - onlinecpus = nodeinfo.cpus; - if (VIR_ALLOC_N(cpus, ncpus) < 0) - return -1; - id = cid = 0; - for (s = 0; s < nodeinfo.sockets; s++) { - for (c = 0; c < nodeinfo.cores; c++) { - for (t = 0; t < nodeinfo.threads; t++) { - if (virHostCPUGetOnline(id, &tmp) < 0) - goto error; - if (tmp) { - cpus[cid].id = id; - cpus[cid].socket_id = s; - cpus[cid].core_id = c; - if (!(cpus[cid].siblings = virBitmapNew(ncpus))) + id = 0; + for (n = 0; n < nodeinfo.nodes; n++) { + int nodecpus = nodeinfo.sockets * nodeinfo.cores * nodeinfo.threads; + cid = 0; + + if (VIR_ALLOC_N(cpus, nodecpus) < 0) + return -1; + + for (s = 0; s < nodeinfo.sockets; s++) { + for (c = 0; c < nodeinfo.cores; c++) { + g_autoptr(virBitmap) siblings = virBitmapNew(ncpus); + for (t = 0; t < nodeinfo.threads; t++) + ignore_value(virBitmapSetBit(siblings, id + t)); + + for (t = 0; t < nodeinfo.threads; t++) { + if (virHostCPUGetOnline(id, &tmp) < 0) goto error; - ignore_value(virBitmapSetBit(cpus[cid].siblings, id)); - cid++; + if (tmp) { + cpus[cid].id = id; + cpus[cid].socket_id = s; + cpus[cid].core_id = c; + if (!(cpus[cid].siblings = virBitmapNew(ncpus))) + goto error; + virBitmapCopy(cpus[cid].siblings, siblings); + cid++; + } + + id++; } - - id++; } } - } - virCapabilitiesHostNUMAAddCell(caps, 0, - nodeinfo.memory, -#ifdef __linux__ - onlinecpus, cpus, -#else - ncpus, cpus, -#endif - 0, NULL, - 0, NULL); + virCapabilitiesHostNUMAAddCell(caps, 0, + nodeinfo.memory, + cid, cpus, + 0, NULL, + 0, NULL); + } return 0; error: - for (; id >= 0; id--) - virBitmapFree(cpus[id].siblings); + for (; cid >= 0; cid--) + virBitmapFree(cpus[cid].siblings); VIR_FREE(cpus); return -1; } -- 2.23.0

2 1