commit ddf6dae7e34271332fbc04921d0c91ab6a009b5a
author Kevin Wolf <kwolf@redhat.com> Fri Feb 19 18:14:01 2021 +0100
committer Kevin Wolf <kwolf@redhat.com> Fri Mar 19 10:17:14 2021 +0100
tree 589d41617710da49074d54040d8555717f72e9c2
parent da0a932bbf06a71210300893eeb4d51217238b11

qom: Add user_creatable_parse_str()

The system emulator has a more complicated way of handling command line
options in that it reorders options before it processes them. This means
that parsing object options and creating the object happen at two
different points. Split the parsing part into a separate function that
can be reused by the system emulator command line.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>

include/qom/object_interfaces.h

diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h
index 07511e6..fb32330 100644
--- a/include/qom/object_interfaces.h
+++ b/include/qom/object_interfaces.h
@@ -145,6 +145,21 @@
                                     QemuOpts *opts, Error **errp);
 
 /**
+ * user_creatable_parse_str:
+ * @optarg: the object definition string as passed on the command line
+ * @errp: if an error occurs, a pointer to an area to store the error
+ *
+ * Parses the option for the user creatable object with a keyval parser and
+ * implicit key 'qom-type', converting the result to ObjectOptions.
+ *
+ * If a help option is given, print help instead.
+ *
+ * Returns: ObjectOptions on success, NULL when an error occurred (*errp is set
+ * then) or help was printed (*errp is not set).
+ */
+ObjectOptions *user_creatable_parse_str(const char *optarg, Error **errp);
+
+/**
  * user_creatable_add_from_str:
  * @optarg: the object definition string as passed on the command line
  * @errp: if an error occurs, a pointer to an area to store the error

qom/object_interfaces.c

diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index 87f0db3..0614246 100644
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -293,7 +293,7 @@
     }
 }
 
-bool user_creatable_add_from_str(const char *optarg, Error **errp)
+ObjectOptions *user_creatable_parse_str(const char *optarg, Error **errp)
 {
     ERRP_GUARD();
     QDict *args;
@@ -303,12 +303,12 @@
 
     args = keyval_parse(optarg, "qom-type", &help, errp);
     if (*errp) {
-        return false;
+        return NULL;
     }
     if (help) {
         user_creatable_print_help_from_qdict(args);
         qobject_unref(args);
-        return false;
+        return NULL;
     }
 
     v = qobject_input_visitor_new_keyval(QOBJECT(args));
@@ -316,12 +316,20 @@
     visit_free(v);
     qobject_unref(args);
 
-    if (*errp) {
-        goto out;
+    return options;
+}
+
+bool user_creatable_add_from_str(const char *optarg, Error **errp)
+{
+    ERRP_GUARD();
+    ObjectOptions *options;
+
+    options = user_creatable_parse_str(optarg, errp);
+    if (!options) {
+        return false;
     }
 
     user_creatable_add_qapi(options, errp);
-out:
     qapi_free_ObjectOptions(options);
     return !*errp;
 }