[PULL v2 00/20] Misc patches for QEMU 5.2-rc1

[PULL v2 00/20] Misc patches for QEMU 5.2-rc1

[Paolo Bonzini]

The following changes since commit 83851c7c60c90e9fb6a23ff48076387a77bc33cd:

  Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2020-10-27-v3-tag' into staging (2020-11-03 12:47:58 +0000)

are available in the Git repository at:

  https://gitlab.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to 372bcb2585cd2f06a01f13b1a208370ccf7479cf:

  qapi, qemu-options: make all parsing visitors parse boolean options the same (2020-11-04 12:00:40 -0500)

----------------------------------------------------------------
Doc and bug fixes

----------------------------------------------------------------
v1->v2: adjust error message

AlexChen (1):
      tests/qtest: Fix potential NULL pointer dereference in qos_build_main_args()

Alexander Bulekov (5):
      scripts/oss-fuzz: rename bin/qemu-fuzz-i386
      qtest: add a reproducer for LP#1878642
      fuzz: fix writing DMA patterns
      fuzz: check the MR in the DMA callback
      fuzz: fuzz offsets within pio/mmio regions

Bruce Rogers (1):
      configure: fix gio_libs reference

Marc Hartmayer (1):
      meson: vhost-user-gpu/virtiofsd: use absolute path

Paolo Bonzini (8):
      cutils: replace strdup with g_strdup
      docs: expand sourceset documentation
      meson: use b_staticpic=false for meson >=0.56.0
      meson: fix warning for bad sphinx-build
      semihosting: fix order of initialization functions
      ivshmem-test: do not use short-form boolean option
      qtest: escape device name in device-introspect-test
      qapi, qemu-options: make all parsing visitors parse boolean options the same

Peter Maydell (2):
      tests/qtest/libqtest.c: Check for setsockopt() failure
      tests/qtest/libqos/ahci.c: Avoid NULL dereference in ahci_exec()

Philippe Mathieu-Daudé (2):
      exec: Remove dead code (CID 1432876)
      hw/isa/lpc_ich9: Ignore reserved/invalid SCI IRQ

 configure                            |   8 +-
 contrib/vhost-user-gpu/meson.build   |   2 +-
 docs/devel/build-system.rst          | 158 +++++++++++++++++++++++------------
 docs/devel/kconfig.rst               |   2 +
 docs/meson.build                     |   3 +-
 hw/isa/lpc_ich9.c                    |  14 +++-
 include/hw/i386/ich9.h               |   1 +
 include/qapi/util.h                  |   2 +
 include/qemu/cutils.h                |   1 +
 meson.build                          |   4 +-
 qapi/opts-visitor.c                  |  14 +---
 qapi/qapi-util.c                     |  23 +++++
 qapi/qobject-input-visitor.c         |   6 +-
 qapi/string-input-visitor.c          |  17 +---
 scripts/oss-fuzz/build.sh            |   4 +-
 softmmu/physmem.c                    |  10 +--
 softmmu/vl.c                         |   4 +-
 tests/qtest/device-introspect-test.c |  10 ++-
 tests/qtest/fuzz-test.c              |  15 ++++
 tests/qtest/fuzz/generic_fuzz.c      |  44 +++++-----
 tests/qtest/fuzz/qos_fuzz.c          |   3 +-
 tests/qtest/ivshmem-test.c           |   2 +-
 tests/qtest/libqos/ahci.c            |   5 +-
 tests/qtest/libqtest.c               |   9 +-
 tools/virtiofsd/meson.build          |   2 +-
 util/cutils.c                        |   2 +-
 util/qemu-option.c                   |  20 +----
 27 files changed, 227 insertions(+), 158 deletions(-)
-- 
2.26.2

[PULL v2 20/20] qapi, qemu-options: make all parsing visitors parse boolean options the same

[Paolo Bonzini]

OptsVisitor, StringInputVisitor and the keyval visitor have
three different ideas of how a human could write the value of
a boolean option.  Pay homage to the backwards-compatibility
gods and make the new common helper accept all four sets (on/off,
true/false, y/n and yes/no), but remove case-insensitivity.

Since OptsVisitor is supposed to match qemu-options, adjust
it as well.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201103161339.447118-1-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 include/qapi/util.h          |  2 ++
 qapi/opts-visitor.c          | 14 +-------------
 qapi/qapi-util.c             | 23 +++++++++++++++++++++++
 qapi/qobject-input-visitor.c |  6 +-----
 qapi/string-input-visitor.c  | 17 +----------------
 util/qemu-option.c           | 20 ++------------------
 6 files changed, 30 insertions(+), 52 deletions(-)

diff --git a/include/qapi/util.h b/include/qapi/util.h
index bc312e90aa..6178e98e97 100644
--- a/include/qapi/util.h
+++ b/include/qapi/util.h
@@ -19,6 +19,8 @@ typedef struct QEnumLookup {
 const char *qapi_enum_lookup(const QEnumLookup *lookup, int val);
 int qapi_enum_parse(const QEnumLookup *lookup, const char *buf,
                     int def, Error **errp);
+bool qapi_bool_parse(const char *name, const char *value, bool *obj,
+                     Error **errp);
 
 int parse_qapi_name(const char *name, bool complete);
 
diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
index 7781c23a42..587f31baf6 100644
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@@ -368,7 +368,6 @@ opts_type_str(Visitor *v, const char *name, char **obj, Error **errp)
 }
 
 
-/* mimics qemu-option.c::parse_option_bool() */
 static bool
 opts_type_bool(Visitor *v, const char *name, bool *obj, Error **errp)
 {
@@ -379,19 +378,8 @@ opts_type_bool(Visitor *v, const char *name, bool *obj, Error **errp)
     if (!opt) {
         return false;
     }
-
     if (opt->str) {
-        if (strcmp(opt->str, "on") == 0 ||
-            strcmp(opt->str, "yes") == 0 ||
-            strcmp(opt->str, "y") == 0) {
-            *obj = true;
-        } else if (strcmp(opt->str, "off") == 0 ||
-            strcmp(opt->str, "no") == 0 ||
-            strcmp(opt->str, "n") == 0) {
-            *obj = false;
-        } else {
-            error_setg(errp, QERR_INVALID_PARAMETER_VALUE, opt->name,
-                       "on|yes|y|off|no|n");
+        if (!qapi_bool_parse(opt->name, opt->str, obj, errp)) {
             return false;
         }
     } else {
diff --git a/qapi/qapi-util.c b/qapi/qapi-util.c
index 29a6c98b53..3c24bb3d45 100644
--- a/qapi/qapi-util.c
+++ b/qapi/qapi-util.c
@@ -13,6 +13,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/ctype.h"
+#include "qapi/qmp/qerror.h"
 
 const char *qapi_enum_lookup(const QEnumLookup *lookup, int val)
 {
@@ -40,6 +41,28 @@ int qapi_enum_parse(const QEnumLookup *lookup, const char *buf,
     return def;
 }
 
+bool qapi_bool_parse(const char *name, const char *value, bool *obj, Error **errp)
+{
+    if (g_str_equal(value, "on") ||
+        g_str_equal(value, "yes") ||
+        g_str_equal(value, "true") ||
+        g_str_equal(value, "y")) {
+        *obj = true;
+        return true;
+    }
+    if (g_str_equal(value, "off") ||
+        g_str_equal(value, "no") ||
+        g_str_equal(value, "false") ||
+        g_str_equal(value, "n")) {
+        *obj = false;
+        return true;
+    }
+
+    error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name,
+               "'on' or 'off'");
+    return false;
+}
+
 /*
  * Parse a valid QAPI name from @str.
  * A valid name consists of letters, digits, hyphen and underscore.
diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c
index 7b184b50a7..23843b242e 100644
--- a/qapi/qobject-input-visitor.c
+++ b/qapi/qobject-input-visitor.c
@@ -512,11 +512,7 @@ static bool qobject_input_type_bool_keyval(Visitor *v, const char *name,
         return false;
     }
 
-    if (!strcmp(str, "on")) {
-        *obj = true;
-    } else if (!strcmp(str, "off")) {
-        *obj = false;
-    } else {
+    if (!qapi_bool_parse(name, str, obj, NULL)) {
         error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
                    full_name(qiv, name), "'on' or 'off'");
         return false;
diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c
index 6e53396ea3..197139c1c0 100644
--- a/qapi/string-input-visitor.c
+++ b/qapi/string-input-visitor.c
@@ -332,22 +332,7 @@ static bool parse_type_bool(Visitor *v, const char *name, bool *obj,
     StringInputVisitor *siv = to_siv(v);
 
     assert(siv->lm == LM_NONE);
-    if (!strcasecmp(siv->string, "on") ||
-        !strcasecmp(siv->string, "yes") ||
-        !strcasecmp(siv->string, "true")) {
-        *obj = true;
-        return true;
-    }
-    if (!strcasecmp(siv->string, "off") ||
-        !strcasecmp(siv->string, "no") ||
-        !strcasecmp(siv->string, "false")) {
-        *obj = false;
-        return true;
-    }
-
-    error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
-               "boolean");
-    return false;
+    return qapi_bool_parse(name ? name : "null", siv->string, obj, errp);
 }
 
 static bool parse_type_str(Visitor *v, const char *name, char **obj,
diff --git a/util/qemu-option.c b/util/qemu-option.c
index b9f93a7f8b..acefbc23fa 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -96,21 +96,6 @@ const char *get_opt_value(const char *p, char **value)
     return offset;
 }
 
-static bool parse_option_bool(const char *name, const char *value, bool *ret,
-                              Error **errp)
-{
-    if (!strcmp(value, "on")) {
-        *ret = 1;
-    } else if (!strcmp(value, "off")) {
-        *ret = 0;
-    } else {
-        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
-                   name, "'on' or 'off'");
-        return false;
-    }
-    return true;
-}
-
 static bool parse_option_number(const char *name, const char *value,
                                 uint64_t *ret, Error **errp)
 {
@@ -363,7 +348,7 @@ static bool qemu_opt_get_bool_helper(QemuOpts *opts, const char *name,
     if (opt == NULL) {
         def_val = find_default_by_name(opts, name);
         if (def_val) {
-            parse_option_bool(name, def_val, &ret, &error_abort);
+            qapi_bool_parse(name, def_val, &ret, &error_abort);
         }
         return ret;
     }
@@ -471,8 +456,7 @@ static bool qemu_opt_parse(QemuOpt *opt, Error **errp)
         /* nothing */
         return true;
     case QEMU_OPT_BOOL:
-        return parse_option_bool(opt->name, opt->str, &opt->value.boolean,
-                                 errp);
+        return qapi_bool_parse(opt->name, opt->str, &opt->value.boolean, errp);
     case QEMU_OPT_NUMBER:
         return parse_option_number(opt->name, opt->str, &opt->value.uint,
                                    errp);
-- 
2.26.2

Re: [PULL v2 00/20] Misc patches for QEMU 5.2-rc1

[Peter Maydell]

On Wed, 4 Nov 2020 at 17:06, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit 83851c7c60c90e9fb6a23ff48076387a77bc33cd:
>
>   Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2020-10-27-v3-tag' into staging (2020-11-03 12:47:58 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 372bcb2585cd2f06a01f13b1a208370ccf7479cf:
>
>   qapi, qemu-options: make all parsing visitors parse boolean options the same (2020-11-04 12:00:40 -0500)
>
> ----------------------------------------------------------------
> Doc and bug fixes
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.2
for any user-visible changes.

-- PMM