From: Marc-André Lureau <marcandre.lureau@redhat.com>
The same config files disovery & priority rules are used for
vhost-user backends.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Cole Robinson <crobinso@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)
+{
+ 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);
+ VIR_AUTOFREE(virHashKeyValuePairPtr) pairs = NULL;
+ virHashKeyValuePairPtr tmp = NULL;
+
+ *configs = NULL;
+
+ if (!privileged) {
+ /* This is a slight divergence from the specification.
+ * Since the system daemon runs as root, it doesn't make
+ * much sense to parse files in root's home directory. It
+ * makes sense only for session daemon which runs under
+ * regular user. */
+ if (VIR_STRDUP(xdgConfig, getenv("XDG_CONFIG_HOME")) < 0)
+ return -1;
+
+ if (!xdgConfig) {
+ VIR_AUTOFREE(char *) home = virGetUserDirectory();
+
+ if (!home)
+ return -1;
+
+ if (virAsprintf(&xdgConfig, "%s/.config", home) < 0)
+ return -1;
+ }
+
+ if (virAsprintf(&homeConfig, "%s/qemu/%s", xdgConfig, name) < 0)
+ return -1;
+ }
+
+ if (!(files = virHashCreate(10, virHashValueFree)))
+ return -1;
+
+ if (qemuBuildFileList(files, sysLocation) < 0)
+ return -1;
+
+ if (qemuBuildFileList(files, etcLocation) < 0)
+ return -1;
+
+ if (homeConfig &&
+ qemuBuildFileList(files, homeConfig) < 0)
+ return -1;
+
+ /* At this point, the @files hash table contains unique set of filenames
+ * where each filename (as key) has the highest priority full pathname
+ * associated with it. */
+
+ if (virHashSize(files) == 0)
+ return 0;
+
+ if (!(pairs = virHashGetItems(files, qemuConfigFilesSorter)))
+ return -1;
+
+ for (tmp = pairs; tmp->key; tmp++) {
+ const char *path = tmp->value;
+ off_t len;
+
+ if ((len = virFileLength(path, -1)) < 0) {
+ virReportSystemError(errno,
+ _("unable to get size of '%s'"),
+ path);
+ return -1;
+ }
+
+ VIR_DEBUG("%s description path '%s' len=%jd",
+ name, path, (intmax_t) len);
+
+ if (len == 0) {
+ /* Empty files are used to mask less specific instances
+ * of the same file. */
+ continue;
+ }
+
+ if (virStringListAdd(configs, path) < 0)
+ return -1;
+ }
+
+ return 0;
+}
diff --git a/src/qemu/qemu_configs.h b/src/qemu/qemu_configs.h
new file mode 100644
index 0000000000..5c113752d0
--- /dev/null
+++ b/src/qemu/qemu_configs.h
@@ -0,0 +1,28 @@
+/*
+ * qemu_configs.h: 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/>.
+ */
+
+#pragma once
+
+#include "internal.h"
+
+int
+qemuFetchConfigs(const char *name,
+ char ***configs,
+ bool privileged);
diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
index 983a7c83b2..f0a6953d8b 100644
--- a/src/qemu/qemu_firmware.c
+++ b/src/qemu/qemu_firmware.c
@@ -23,13 +23,12 @@
#include <fnmatch.h>
#include "qemu_firmware.h"
+#include "qemu_configs.h"
#include "configmake.h"
#include "qemu_capabilities.h"
#include "qemu_domain.h"
#include "qemu_process.h"
#include "virarch.h"
-#include "virfile.h"
-#include "virhash.h"
#include "virjson.h"
#include "virlog.h"
#include "virstring.h"
@@ -907,150 +906,11 @@ qemuFirmwareFormat(qemuFirmwarePtr fw)
}
-static int
-qemuFirmwareBuildFileList(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
-qemuFirmwareFilesSorter(const virHashKeyValuePair *a,
- const virHashKeyValuePair *b)
-{
- return strcmp(a->key, b->key);
-}
-
-#define QEMU_FIRMWARE_SYSTEM_LOCATION PREFIX "/share/qemu/firmware"
-#define QEMU_FIRMWARE_ETC_LOCATION SYSCONFDIR "/qemu/firmware"
-
int
qemuFirmwareFetchConfigs(char ***firmwares,
bool privileged)
{
- VIR_AUTOPTR(virHashTable) files = NULL;
- VIR_AUTOFREE(char *) homeConfig = NULL;
- VIR_AUTOFREE(char *) xdgConfig = NULL;
- VIR_AUTOFREE(virHashKeyValuePairPtr) pairs = NULL;
- virHashKeyValuePairPtr tmp = NULL;
-
- *firmwares = NULL;
-
- if (!privileged) {
- /* This is a slight divergence from the specification.
- * Since the system daemon runs as root, it doesn't make
- * much sense to parse files in root's home directory. It
- * makes sense only for session daemon which runs under
- * regular user. */
- if (VIR_STRDUP(xdgConfig, getenv("XDG_CONFIG_HOME")) < 0)
- return -1;
-
- if (!xdgConfig) {
- VIR_AUTOFREE(char *) home = virGetUserDirectory();
-
- if (!home)
- return -1;
-
- if (virAsprintf(&xdgConfig, "%s/.config", home) < 0)
- return -1;
- }
-
- if (virAsprintf(&homeConfig, "%s/qemu/firmware", xdgConfig) < 0)
- return -1;
- }
-
- if (!(files = virHashCreate(10, virHashValueFree)))
- return -1;
-
- if (qemuFirmwareBuildFileList(files, QEMU_FIRMWARE_SYSTEM_LOCATION) < 0)
- return -1;
-
- if (qemuFirmwareBuildFileList(files, QEMU_FIRMWARE_ETC_LOCATION) < 0)
- return -1;
-
- if (homeConfig &&
- qemuFirmwareBuildFileList(files, homeConfig) < 0)
- return -1;
-
- /* At this point, the @files hash table contains unique set of filenames
- * where each filename (as key) has the highest priority full pathname
- * associated with it. */
-
- if (virHashSize(files) == 0)
- return 0;
-
- if (!(pairs = virHashGetItems(files, qemuFirmwareFilesSorter)))
- return -1;
-
- for (tmp = pairs; tmp->key; tmp++) {
- const char *path = tmp->value;
- off_t len;
-
- if ((len = virFileLength(path, -1)) < 0) {
- virReportSystemError(errno,
- _("unable to get size of '%s'"),
- path);
- return -1;
- }
-
- VIR_DEBUG("firmware description path '%s' len=%jd",
- path, (intmax_t) len);
-
- if (len == 0) {
- /* Empty files are used to mask less specific instances
- * of the same file. */
- continue;
- }
-
- if (virStringListAdd(firmwares, path) < 0)
- return -1;
- }
-
- return 0;
+ return qemuFetchConfigs("firmware", firmwares, privileged);
}
--
2.21.0
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-listOn Fri, Aug 23, 2019 at 12:21:45PM -0400, Cole Robinson wrote:
>From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
>The same config files disovery & priority rules are used for
>vhost-user backends.
>
>Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>Signed-off-by: Cole Robinson <crobinso@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
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On 8/23/19 12:21 PM, Cole Robinson wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > The same config files disovery & priority rules are used for > vhost-user backends. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > Signed-off-by: Cole Robinson <crobinso@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 \ The code looks fine, but the 'configs' naming is too generic. I suggest going verbose with it, qemu_interop_json.[ch]. Functions then should be named qemuInteropJSONXXX I think you could start the series with this, and qemu_vhost_user.c but minus the one function that uses virDomainDef additions, and those two bits could be applied independent of the rest of the series IMO Thanks, Cole -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On 8/23/19 12:38 PM, Cole Robinson wrote: > On 8/23/19 12:21 PM, Cole Robinson wrote: >> From: Marc-André Lureau <marcandre.lureau@redhat.com> >> >> The same config files disovery & priority rules are used for >> vhost-user backends. >> >> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> >> Signed-off-by: Cole Robinson <crobinso@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 \ > > The code looks fine, but the 'configs' naming is too generic. I suggest > going verbose with it, qemu_interop_json.[ch]. Functions then should be > named qemuInteropJSONXXX > > I think you could start the series with this, and qemu_vhost_user.c but > minus the one function that uses virDomainDef additions, and those two > bits could be applied independent of the rest of the series IMO I realize now this file doesn't have anything json specific, so maybe qemu_interop or qemu_interop_config ? - Cole -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
© 2016 - 2026 Red Hat, Inc.