diff mbox series

[14/19] Disable options unsupported on Emscripten

Message ID c2e3a58825c39678fcde361b685d1bd69d2fb1dd.1744787186.git.ktokunaga.mail@gmail.com (mailing list archive)
State New
Headers show
Series Enable QEMU TCI to run 32bit guests on browsers | expand

Commit Message

Kohei Tokunaga April 16, 2025, 8:14 a.m. UTC
Daemonizing and run-with aren't supported on Emscripten so disable these
flags.

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
---
 qemu-options.hx | 4 +++-
 system/vl.c     | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

Comments

Philippe Mathieu-Daudé April 16, 2025, 9:03 a.m. UTC | #1
On 16/4/25 10:14, Kohei Tokunaga wrote:
> Daemonizing and run-with aren't supported on Emscripten so disable these
> flags.
> 
> Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
> ---
>   qemu-options.hx | 4 +++-
>   system/vl.c     | 4 ++--
>   2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/qemu-options.hx b/qemu-options.hx
> index dc694a99a3..20ed22afe2 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -4863,9 +4863,11 @@ SRST
>   ERST
>   
>   #ifndef _WIN32
> +#ifndef EMSCRIPTEN

#if !defined(_WIN32) && !defined(EMSCRIPTEN)

?

>   DEF("daemonize", 0, QEMU_OPTION_daemonize, \
>       "-daemonize      daemonize QEMU after initializing\n", QEMU_ARCH_ALL)
>   #endif
> +#endif
>   SRST
>   ``-daemonize``
>       Daemonize the QEMU process after initialization. QEMU will not
> @@ -5249,7 +5251,7 @@ HXCOMM Internal use
>   DEF("qtest", HAS_ARG, QEMU_OPTION_qtest, "", QEMU_ARCH_ALL)
>   DEF("qtest-log", HAS_ARG, QEMU_OPTION_qtest_log, "", QEMU_ARCH_ALL)
>   
> -#ifdef CONFIG_POSIX
> +#if defined(CONFIG_POSIX) && !defined(EMSCRIPTEN)
>   DEF("run-with", HAS_ARG, QEMU_OPTION_run_with,
>       "-run-with [async-teardown=on|off][,chroot=dir][user=username|uid:gid]\n"
>       "                Set miscellaneous QEMU process lifecycle options:\n"
Kohei Tokunaga April 17, 2025, 9:33 a.m. UTC | #2
Hi Philippe,

> >   #ifndef _WIN32
> > +#ifndef EMSCRIPTEN
>
> #if !defined(_WIN32) && !defined(EMSCRIPTEN)
>
> ?

Thank you for the sueggestion. I'll apply this in the next version of the
series.
diff mbox series

Patch

diff --git a/qemu-options.hx b/qemu-options.hx
index dc694a99a3..20ed22afe2 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -4863,9 +4863,11 @@  SRST
 ERST
 
 #ifndef _WIN32
+#ifndef EMSCRIPTEN
 DEF("daemonize", 0, QEMU_OPTION_daemonize, \
     "-daemonize      daemonize QEMU after initializing\n", QEMU_ARCH_ALL)
 #endif
+#endif
 SRST
 ``-daemonize``
     Daemonize the QEMU process after initialization. QEMU will not
@@ -5249,7 +5251,7 @@  HXCOMM Internal use
 DEF("qtest", HAS_ARG, QEMU_OPTION_qtest, "", QEMU_ARCH_ALL)
 DEF("qtest-log", HAS_ARG, QEMU_OPTION_qtest_log, "", QEMU_ARCH_ALL)
 
-#ifdef CONFIG_POSIX
+#if defined(CONFIG_POSIX) && !defined(EMSCRIPTEN)
 DEF("run-with", HAS_ARG, QEMU_OPTION_run_with,
     "-run-with [async-teardown=on|off][,chroot=dir][user=username|uid:gid]\n"
     "                Set miscellaneous QEMU process lifecycle options:\n"
diff --git a/system/vl.c b/system/vl.c
index 8d89394b45..255ea3be6b 100644
--- a/system/vl.c
+++ b/system/vl.c
@@ -766,7 +766,7 @@  static QemuOptsList qemu_smp_opts = {
     },
 };
 
-#if defined(CONFIG_POSIX)
+#if defined(CONFIG_POSIX) && !defined(EMSCRIPTEN)
 static QemuOptsList qemu_run_with_opts = {
     .name = "run-with",
     .head = QTAILQ_HEAD_INITIALIZER(qemu_run_with_opts.head),
@@ -3677,7 +3677,7 @@  void qemu_init(int argc, char **argv)
             case QEMU_OPTION_nouserconfig:
                 /* Nothing to be parsed here. Especially, do not error out below. */
                 break;
-#if defined(CONFIG_POSIX)
+#if defined(CONFIG_POSIX) && !defined(EMSCRIPTEN)
             case QEMU_OPTION_daemonize:
                 os_set_daemonize(true);
                 break;