[libvirt] [PATCH v2 01/16] qemu: extract out qemuFetchConfigs from firmware

[Ján Tomko]

On Fri, Aug 23, 2019 at 12:21:45PM -0400, Cole Robinson wrote:
>From: Marc-André Lureau <marcandre.lureau at redhat.com>
>
>The same config files disovery & priority rules are used for
>vhost-user backends.
>
>Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
>Signed-off-by: Cole Robinson <crobinso at redhat.com>
>---
> src/qemu/Makefile.inc.am |   2 +
> src/qemu/qemu_configs.c  | 183 +++++++++++++++++++++++++++++++++++++++
> src/qemu/qemu_configs.h  |  28 ++++++
> src/qemu/qemu_firmware.c | 144 +-----------------------------
> 4 files changed, 215 insertions(+), 142 deletions(-)
> create mode 100644 src/qemu/qemu_configs.c
> create mode 100644 src/qemu/qemu_configs.h
>
>diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
>index 30a9751cfd..f7a0fa4a84 100644
>--- a/src/qemu/Makefile.inc.am
>+++ b/src/qemu/Makefile.inc.am
>@@ -30,6 +30,8 @@ QEMU_DRIVER_SOURCES = \
> 	qemu/qemu_hotplugpriv.h \
> 	qemu/qemu_conf.c \
> 	qemu/qemu_conf.h \
>+	qemu/qemu_configs.c \
>+	qemu/qemu_configs.h \
> 	qemu/qemu_process.c \
> 	qemu/qemu_process.h \
> 	qemu/qemu_processpriv.h \
>diff --git a/src/qemu/qemu_configs.c b/src/qemu/qemu_configs.c
>new file mode 100644
>index 0000000000..39b8906be5
>--- /dev/null
>+++ b/src/qemu/qemu_configs.c
>@@ -0,0 +1,183 @@
>+/*
>+ * qemu_configs.c: QEMU firmware/vhost-user etc configs
>+ *
>+ * Copyright (C) 2019 Red Hat, 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/>.
>+ */
>+
>+#include <config.h>
>+
>+#include "qemu_configs.h"
>+#include "configmake.h"
>+#include "viralloc.h"
>+#include "virenum.h"
>+#include "virfile.h"
>+#include "virhash.h"
>+#include "virlog.h"
>+#include "virstring.h"
>+
>+#define VIR_FROM_THIS VIR_FROM_QEMU
>+
>+VIR_LOG_INIT("qemu.qemu_configs");
>+
>+static int
>+qemuBuildFileList(virHashTablePtr files, const char *dir)
>+{
>+    DIR *dirp;
>+    struct dirent *ent = NULL;
>+    int rc;
>+    int ret = -1;
>+
>+    if ((rc = virDirOpenIfExists(&dirp, dir)) < 0)
>+        return -1;
>+
>+    if (rc == 0)
>+        return 0;
>+
>+    while ((rc = virDirRead(dirp, &ent, dir)) > 0) {
>+        VIR_AUTOFREE(char *) filename = NULL;
>+        VIR_AUTOFREE(char *) path = NULL;
>+        struct stat sb;
>+
>+        if (STRPREFIX(ent->d_name, "."))
>+            continue;
>+
>+        if (VIR_STRDUP(filename, ent->d_name) < 0)
>+            goto cleanup;
>+
>+        if (virAsprintf(&path, "%s/%s", dir, filename) < 0)
>+            goto cleanup;
>+
>+        if (stat(path, &sb) < 0) {
>+            virReportSystemError(errno, _("Unable to access %s"), path);
>+            goto cleanup;
>+        }
>+
>+        if (!S_ISREG(sb.st_mode) && !S_ISLNK(sb.st_mode))
>+            continue;
>+
>+        if (virHashUpdateEntry(files, filename, path) < 0)
>+            goto cleanup;
>+
>+        path = NULL;
>+    }
>+
>+    if (rc < 0)
>+        goto cleanup;
>+
>+    ret = 0;
>+ cleanup:
>+    virDirClose(&dirp);
>+    return ret;
>+}
>+
>+static int
>+qemuConfigFilesSorter(const virHashKeyValuePair *a,
>+                        const virHashKeyValuePair *b)

Indentation is off.

>+{
>+    return strcmp(a->key, b->key);
>+}
>+
>+#define QEMU_SYSTEM_LOCATION PREFIX "/share/qemu"
>+#define QEMU_ETC_LOCATION SYSCONFDIR "/qemu"
>+
>+int
>+qemuFetchConfigs(const char *name,
>+                 char ***configs,
>+                 bool privileged)
>+{
>+    VIR_AUTOPTR(virHashTable) files = NULL;
>+    VIR_AUTOFREE(char *) homeConfig = NULL;
>+    VIR_AUTOFREE(char *) xdgConfig = NULL;

>+    VIR_AUTOFREE(char *) sysLocation = virFileBuildPath(QEMU_SYSTEM_LOCATION, name, NULL);
>+    VIR_AUTOFREE(char *) etcLocation = virFileBuildPath(QEMU_ETC_LOCATION, name, NULL);

These variables were not part of the original function.

I'd expect a commit called 'extract out' to not have any functional
impact and any changes would be done later.

>+    VIR_AUTOFREE(virHashKeyValuePairPtr) pairs = NULL;
>+    virHashKeyValuePairPtr tmp = NULL;
>+
>+    *configs = NULL;
>+

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20190827/286ce90e/attachment-0001.sig>