From: Steve Sistare <steven.sistare@oracle.com>
To: qemu-devel@nongnu.org
Cc: "Daniel P. Berrange" <berrange@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Jason Zeng" <jason.zeng@linux.intel.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Juan Quintela" <quintela@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Eric Blake" <eblake@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Steve Sistare" <steven.sistare@oracle.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH V4 10/25] util: env var helpers
Date: Tue, 6 Jul 2021 09:45:41 -0700 [thread overview]
Message-ID: <1625589956-81651-11-git-send-email-steven.sistare@oracle.com> (raw)
In-Reply-To: <1625589956-81651-1-git-send-email-steven.sistare@oracle.com>
Add functions for saving fd's and other values in the environment via
setenv, and for reading them back via getenv.
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
---
MAINTAINERS | 2 ++
include/qemu/env.h | 23 +++++++++++++
util/env.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
util/meson.build | 1 +
4 files changed, 121 insertions(+)
create mode 100644 include/qemu/env.h
create mode 100644 util/env.c
diff --git a/MAINTAINERS b/MAINTAINERS
index d4d1e9d..b844f3f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2850,6 +2850,8 @@ S: Maintained
F: include/migration/cpr.h
F: migration/cpr.c
F: qapi/cpr.json
+F: include/qemu/env.h
+F: util/env.c
Record/replay
M: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
diff --git a/include/qemu/env.h b/include/qemu/env.h
new file mode 100644
index 0000000..3dad503
--- /dev/null
+++ b/include/qemu/env.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2021 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#ifndef QEMU_ENV_H
+#define QEMU_ENV_H
+
+#define FD_PREFIX "QEMU_FD_"
+
+typedef int (*walkenv_cb)(const char *name, const char *val, void *handle);
+
+int getenv_fd(const char *name);
+void setenv_fd(const char *name, int fd);
+void unsetenv_fd(const char *name);
+void unsetenv_fdv(const char *fmt, ...);
+int walkenv(const char *prefix, walkenv_cb cb, void *handle);
+void printenv(void);
+
+#endif
diff --git a/util/env.c b/util/env.c
new file mode 100644
index 0000000..863678d
--- /dev/null
+++ b/util/env.c
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2021 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include "qemu/cutils.h"
+#include "qemu/env.h"
+
+static uint64_t getenv_ulong(const char *prefix, const char *name, int *err)
+{
+ char var[80], *val;
+ uint64_t res = 0;
+
+ snprintf(var, sizeof(var), "%s%s", prefix, name);
+ val = getenv(var);
+ if (val) {
+ *err = qemu_strtoul(val, NULL, 10, &res);
+ } else {
+ *err = -ENOENT;
+ }
+ return res;
+}
+
+static void setenv_ulong(const char *prefix, const char *name, uint64_t val)
+{
+ char var[80], val_str[80];
+ snprintf(var, sizeof(var), "%s%s", prefix, name);
+ snprintf(val_str, sizeof(val_str), "%"PRIu64, val);
+ setenv(var, val_str, 1);
+}
+
+static void unsetenv_ulong(const char *prefix, const char *name)
+{
+ char var[80];
+ snprintf(var, sizeof(var), "%s%s", prefix, name);
+ unsetenv(var);
+}
+
+int getenv_fd(const char *name)
+{
+ int err;
+ int fd = getenv_ulong(FD_PREFIX, name, &err);
+ return err ? -1 : fd;
+}
+
+void setenv_fd(const char *name, int fd)
+{
+ setenv_ulong(FD_PREFIX, name, fd);
+}
+
+void unsetenv_fd(const char *name)
+{
+ unsetenv_ulong(FD_PREFIX, name);
+}
+
+void unsetenv_fdv(const char *fmt, ...)
+{
+ va_list args;
+ char buf[80];
+ va_start(args, fmt);
+ vsnprintf(buf, sizeof(buf), fmt, args);
+ va_end(args);
+}
+
+int walkenv(const char *prefix, walkenv_cb cb, void *handle)
+{
+ char *str, name[128];
+ char **envp = environ;
+ size_t prefix_len = strlen(prefix);
+
+ while (*envp) {
+ str = *envp++;
+ if (!strncmp(str, prefix, prefix_len)) {
+ char *val = strchr(str, '=');
+ str += prefix_len;
+ strncpy(name, str, val - str);
+ name[val - str] = 0;
+ if (cb(name, val + 1, handle)) {
+ return 1;
+ }
+ }
+ }
+ return 0;
+}
+
+void printenv(void)
+{
+ char **ptr = environ;
+ while (*ptr) {
+ puts(*ptr++);
+ }
+}
diff --git a/util/meson.build b/util/meson.build
index 510765c..d2d90cc 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -22,6 +22,7 @@ util_ss.add(files('host-utils.c'))
util_ss.add(files('bitmap.c', 'bitops.c'))
util_ss.add(files('fifo8.c'))
util_ss.add(files('cacheinfo.c', 'cacheflush.c'))
+util_ss.add(files('env.c'))
util_ss.add(files('error.c', 'qemu-error.c'))
util_ss.add(files('qemu-print.c'))
util_ss.add(files('id.c'))
--
1.8.3.1
next prev parent reply other threads:[~2021-07-06 16:57 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-06 16:45 [PATCH V4 00/25] Live Update Steve Sistare
2021-07-06 16:45 ` [PATCH V4 01/25] qemu_ram_volatile Steve Sistare
2021-07-06 16:45 ` [PATCH V4 02/25] cpr: reboot mode Steve Sistare
2021-07-06 16:45 ` [PATCH V4 03/25] cpr: QMP interfaces for reboot Steve Sistare
2021-07-06 16:45 ` [PATCH V4 04/25] cpr: HMP " Steve Sistare
2021-07-06 16:45 ` [PATCH V4 05/25] as_flat_walk Steve Sistare
2021-07-06 16:45 ` [PATCH V4 06/25] oslib: qemu_clr_cloexec Steve Sistare
2021-07-06 16:45 ` [PATCH V4 07/25] machine: memfd-alloc option Steve Sistare
2021-07-06 16:45 ` [PATCH V4 08/25] vl: add helper to request re-exec Steve Sistare
2021-07-06 16:45 ` [PATCH V4 09/25] string to strList Steve Sistare
2021-07-06 16:45 ` Steve Sistare [this message]
2021-07-06 16:45 ` [PATCH V4 11/25] cpr: restart mode Steve Sistare
2021-07-06 16:45 ` [PATCH V4 12/25] cpr: QMP interfaces for restart Steve Sistare
2021-07-06 16:45 ` [PATCH V4 13/25] cpr: HMP " Steve Sistare
2021-07-06 16:45 ` [PATCH V4 14/25] pci: export functions for cpr Steve Sistare
2021-07-06 16:45 ` [PATCH V4 15/25] vfio-pci: refactor " Steve Sistare
2021-07-06 16:45 ` [PATCH V4 16/25] vfio-pci: cpr part 1 Steve Sistare
2021-07-06 16:45 ` [PATCH V4 17/25] vfio-pci: cpr part 2 Steve Sistare
2021-07-06 16:45 ` [PATCH V4 18/25] vhost: reset vhost devices upon cprsave Steve Sistare
2021-07-13 15:47 ` Michael S. Tsirkin
2021-07-06 16:45 ` [PATCH V4 19/25] hostmem-memfd: cpr support Steve Sistare
2021-07-06 16:45 ` [PATCH V4 20/25] chardev: cpr framework Steve Sistare
2021-07-06 16:45 ` [PATCH V4 21/25] chardev: cpr for simple devices Steve Sistare
2021-07-06 16:45 ` [PATCH V4 22/25] chardev: cpr for pty Steve Sistare
2021-07-06 16:45 ` [PATCH V4 23/25] chardev: cpr for sockets Steve Sistare
2021-07-06 16:45 ` [PATCH V4 24/25] cpr: only-cpr-capable option Steve Sistare
2021-07-06 16:45 ` [PATCH V4 25/25] simplify savevm Steve Sistare
2021-07-07 12:31 ` [PATCH V4 00/25] Live Update Marc-André Lureau
2021-07-07 12:36 ` Steven Sistare
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1625589956-81651-11-git-send-email-steven.sistare@oracle.com \
--to=steven.sistare@oracle.com \
--cc=alex.bennee@linaro.org \
--cc=alex.williamson@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=jason.zeng@linux.intel.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).