Immutable QString, and also one JSON writer less
Subsystems (2)
cover Immutable QString, and also one JSON writer less
Based-on: <[email protected]>
Markus Armbruster (20):
hmp: Simplify how qmp_human_monitor_command() gets output
monitor: Use GString instead of QString for output buffer
qobject: Make qobject_to_json_pretty() take a pretty argument
qobject: Use GString instead of QString to accumulate JSON
qobject: Change qobject_to_json()'s value to GString Revert "qstring: add qstring_free()"
hw/rdma: Replace QList by GQueue
qobject: Move internals to qobject-internal.h
qmp: Fix tracing of non-string command IDs
block: Avoid qobject_get_try_str()
Revert "qobject: let object_property_get_str() use new API"
qobject: Drop qobject_get_try_str()
qobject: Drop qstring_get_try_str()
qobject: Factor quoted_str() out of to_json()
qobject: Factor JSON writer out of qobject_to_json()
migration: Replace migration's JSON writer by the general one
json: Use GString instead of QString to accumulate strings
keyval: Use GString to accumulate value strings
block: Use GString instead of QString to build filenames
qobject: Make QString immutable
hw/rdma/rdma_backend_defs.h | 2 +- hw/rdma/rdma_utils.h | 15 +- include/migration/vmstate.h | 7 +- include/qapi/qmp/json-writer.h | 35 ++++ include/qapi/qmp/qbool.h | 2 - include/qapi/qmp/qdict.h | 2 - include/qapi/qmp/qjson.h | 4 +- include/qapi/qmp/qlist.h | 2 - include/qapi/qmp/qnull.h | 2 - include/qapi/qmp/qnum.h | 3 - include/qapi/qmp/qobject.h | 9 +- include/qapi/qmp/qstring.h | 14 +- include/qemu/typedefs.h | 4 +- migration/qjson.h | 29 ---- monitor/monitor-internal.h | 2 +- qobject/qobject-internal.h | 39 +++++ block.c | 23 +-- block/rbd.c | 2 +- hw/display/virtio-gpu.c | 2 +- hw/intc/s390_flic_kvm.c | 2 +- hw/nvram/eeprom93xx.c | 2 +- hw/nvram/fw_cfg.c | 2 +- hw/pci/msix.c | 2 +- hw/pci/pci.c | 4 +- hw/pci/shpc.c | 2 +- hw/rdma/rdma_backend.c | 10 +- hw/rdma/rdma_utils.c | 29 ++-- hw/rtc/twl92230.c | 2 +- hw/scsi/scsi-bus.c | 2 +- hw/usb/redirect.c | 7 +- hw/virtio/virtio.c | 4 +- migration/qjson.c | 114 ------------- migration/savevm.c | 53 ++++--- migration/vmstate-types.c | 38 ++--- migration/vmstate.c | 52 +++--- monitor/misc.c | 6 +- monitor/monitor.c | 20 +-- monitor/qmp.c | 46 +++--- qemu-img.c | 33 ++-- qga/main.c | 22 +-- qobject/json-parser.c | 30 ++-- qobject/json-writer.c | 247 +++++++++++++++++++++++++++++ qobject/qbool.c | 1 + qobject/qdict.c | 1 + qobject/qjson.c | 144 ++++------------- qobject/qlist.c | 1 + qobject/qnull.c | 1 + qobject/qnum.c | 6 +- qobject/qobject.c | 1 + qobject/qstring.c | 117 +++----------- qom/object.c | 9 +- qom/object_interfaces.c | 4 +- qom/qom-hmp-cmds.c | 7 +- target/alpha/machine.c | 2 +- target/arm/machine.c | 6 +- target/avr/machine.c | 4 +- target/hppa/machine.c | 4 +- target/microblaze/machine.c | 2 +- target/mips/machine.c | 4 +- target/openrisc/machine.c | 2 +- target/ppc/machine.c | 10 +- target/sparc/machine.c | 2 +- tests/check-qjson.c | 67 ++++---- tests/check-qobject.c | 3 +- tests/check-qstring.c | 16 -- tests/qtest/libqtest.c | 20 ++- tests/test-visitor-serialization.c | 6 +- util/keyval.c | 11 +- migration/meson.build | 1 - qobject/meson.build | 5 +- 70 files changed, 679 insertions(+), 705 deletions(-) create mode 100644 include/qapi/qmp/json-writer.h delete mode 100644 migration/qjson.h create mode 100644 qobject/qobject-internal.h delete mode 100644 migration/qjson.c create mode 100644 qobject/json-writer.c
Signature · 1 line
2.26.2
PATCH 1/20 hmp: Simplify how qmp_human_monitor_command() gets output
Commit 48c043d0d1 "hmp: human-monitor-command: stop using the Memory chardev driver" left us "if string is non-empty, duplicate it, else duplicate the empty string". Meh. Duplicate it unconditionally.
--- monitor/misc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
monitor/misc.c +1 -5
@@ -136,11 +136,7 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,handle_hmp_command (&hmp, command_line); WITH_QEMU_LOCK_GUARD(&hmp.common.mon_lock) { -if (qstring_get_length (hmp.common.outbuf) >0 ) { - output =g_strdup (qstring_get_str (hmp.common.outbuf)); - }else { - output =g_strdup ("" ); - } + output =g_strdup (qstring_get_str (hmp.common.outbuf)); } out:
Signature · 1 line
2.26.2
Re: [PATCH 01/20] hmp: Simplify how qmp_human_monitor_command() gets output
Quoted 6 lines · * Markus Armbruster ([email protected]) wrote:
Commit
48c043d0d1"hmp: human-monitor-command: stop using the Memory chardev driver" left us "if string is non-empty, duplicate it, else duplicate the empty string". Meh. Duplicate it unconditionally.Cc Dr. David Alan Gilbert <[email protected]>Signed-off-by Markus Armbruster <[email protected]>
Quoted 24 lines
--- monitor/misc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)monitor/misc.c +1
-5@@ -136,11 +136,7 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,handle_hmp_command (&hmp, command_line); WITH_QEMU_LOCK_GUARD(&hmp.common.mon_lock) { -if (qstring_get_length (hmp.common.outbuf) >0 ) { - output =g_strdup (qstring_get_str (hmp.common.outbuf)); - }else { - output =g_strdup ("" ); - } + output =g_strdup (qstring_get_str (hmp.common.outbuf)); } out:Signature · 1 line
2.26.2
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
PATCH 2/20 monitor: Use GString instead of QString for output buffer
In reply to Markus ArmbrusterGString has a richer set of string operations than QString. It should be preferred to QString except where we need a QObject or reference counting. We don't here. Switch to GString, and put its richer interface to use.
--- monitor/monitor-internal.h | 2 +- monitor/misc.c | 2 +- monitor/monitor.c | 20 ++++++++------------ 3 files changed, 10 insertions(+), 14 deletions(-)
monitor/monitor-internal.h +1 -1
@@ -105,7 +105,7 @@ struct Monitor {* Members that are protected by the per-monitor lock */ QLIST_HEAD(, mon_fd_t) fds; -QString *outbuf; +GString *outbuf;guint out_watch;/* Read under either BQL or mon_lock, written with BQL+mon_lock. */ int mux_out;
monitor/misc.c +1 -1
@@ -136,7 +136,7 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,handle_hmp_command (&hmp, command_line); WITH_QEMU_LOCK_GUARD(&hmp.common.mon_lock) { - output =g_strdup (qstring_get_str (hmp.common.outbuf)); + output =g_strdup (hmp.common.outbuf->str); } out:
monitor/monitor.c +8 -12
@@ -29,7 +29,6 @@#include "qapi/qapi-emit-events.h" #include "qapi/qapi-visit-control.h" #include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" #include "qemu/error-report.h" #include "qemu/option.h" #include "sysemu/qtest.h"
@@ -181,22 +180,19 @@ static void monitor_flush_locked(Monitor *mon)return ; } - buf =qstring_get_str (mon->outbuf); - len =qstring_get_length (mon->outbuf); + buf = mon->outbuf->str; + len = mon->outbuf->len;if (len && !mon->mux_out) { rc =qemu_chr_fe_write (&mon->chr, (const uint8_t *) buf, len);if ((rc <0 && errno !=EAGAIN ) || (rc == len)) {/* all flushed or error */ -qobject_unref (mon->outbuf); - mon->outbuf =qstring_new (); +g_string_truncate (mon->outbuf,0 );return ; }if (rc >0 ) {/* partial write */ -QString *tmp =qstring_from_str (buf + rc); -qobject_unref (mon->outbuf); - mon->outbuf = tmp; +g_string_erase (mon->outbuf,0 , rc); }if (mon->out_watch ==0 ) { mon->out_watch =
@@ -223,9 +219,9 @@ int monitor_puts(Monitor *mon, const char *str)for (i =0 ; str[i]; i++) { c = str[i];if (c =='\n' ) { -qstring_append_chr (mon->outbuf,'\r' ); +g_string_append_c (mon->outbuf,'\r' ); } -qstring_append_chr (mon->outbuf, c); +g_string_append_c (mon->outbuf, c);if (c =='\n' ) {monitor_flush_locked (mon); }
@@ -602,7 +598,7 @@ void monitor_data_init(Monitor *mon, bool is_qmp, bool skip_flush, }qemu_mutex_init (&mon->mon_lock); mon->is_qmp = is_qmp; - mon->outbuf =qstring_new (); + mon->outbuf =g_string_new (NULL ); mon->skip_flush = skip_flush; mon->use_io_thread = use_io_thread; }
@@ -616,7 +612,7 @@ void monitor_data_destroy(Monitor *mon) }else {readline_free (container_of (mon, MonitorHMP, common)->rs); } -qobject_unref (mon->outbuf); +g_string_free (mon->outbuf, true);qemu_mutex_destroy (&mon->mon_lock); }
Signature · 1 line
2.26.2
Re: [PATCH 02/20] monitor: Use GString instead of QString for output buffer
Quoted 7 lines · * Markus Armbruster ([email protected]) wrote:
GString has a richer set of string operations than QString. It should be preferred to QString except where we need a QObject or reference counting. We don't here. Switch to GString, and put its richer interface to use.
Cc Dr. David Alan Gilbert <[email protected]>Signed-off-by Markus Armbruster <[email protected]>
Quoted 104 lines
--- monitor/monitor-internal.h | 2 +- monitor/misc.c | 2 +- monitor/monitor.c | 20 ++++++++------------ 3 files changed, 10 insertions(+), 14 deletions(-)monitor/monitor-internal.h +1
-1@@ -105,7 +105,7 @@ struct Monitor {* Members that are protected by the per-monitor lock */ QLIST_HEAD(, mon_fd_t) fds; -QString *outbuf; +GString *outbuf;guint out_watch;/* Read under either BQL or mon_lock, written with BQL+mon_lock. */ int mux_out;monitor/misc.c +1
-1@@ -136,7 +136,7 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,handle_hmp_command (&hmp, command_line); WITH_QEMU_LOCK_GUARD(&hmp.common.mon_lock) { - output =g_strdup (qstring_get_str (hmp.common.outbuf)); + output =g_strdup (hmp.common.outbuf->str); } out:monitor/monitor.c +8
-12@@ -29,7 +29,6 @@#include "qapi/qapi-emit-events.h" #include "qapi/qapi-visit-control.h" #include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" #include "qemu/error-report.h" #include "qemu/option.h" #include "sysemu/qtest.h" @@ -181,22 +180,19 @@ static void monitor_flush_locked(Monitor *mon)return ; } - buf =qstring_get_str (mon->outbuf); - len =qstring_get_length (mon->outbuf); + buf = mon->outbuf->str; + len = mon->outbuf->len;if (len && !mon->mux_out) { rc =qemu_chr_fe_write (&mon->chr, (const uint8_t *) buf, len);if ((rc <0 && errno !=EAGAIN ) || (rc == len)) {/* all flushed or error */ -qobject_unref (mon->outbuf); - mon->outbuf =qstring_new (); +g_string_truncate (mon->outbuf,0 );return ; }if (rc >0 ) {/* partial write */ -QString *tmp =qstring_from_str (buf + rc); -qobject_unref (mon->outbuf); - mon->outbuf = tmp; +g_string_erase (mon->outbuf,0 , rc); }if (mon->out_watch ==0 ) { mon->out_watch =@@ -223,9 +219,9 @@ int monitor_puts(Monitor *mon, const char *str)for (i =0 ; str[i]; i++) { c = str[i];if (c =='\n' ) { -qstring_append_chr (mon->outbuf,'\r' ); +g_string_append_c (mon->outbuf,'\r' ); } -qstring_append_chr (mon->outbuf, c); +g_string_append_c (mon->outbuf, c);if (c =='\n' ) {monitor_flush_locked (mon); }@@ -602,7 +598,7 @@ void monitor_data_init(Monitor *mon, bool is_qmp, bool skip_flush, }qemu_mutex_init (&mon->mon_lock); mon->is_qmp = is_qmp; - mon->outbuf =qstring_new (); + mon->outbuf =g_string_new (NULL ); mon->skip_flush = skip_flush; mon->use_io_thread = use_io_thread; }@@ -616,7 +612,7 @@ void monitor_data_destroy(Monitor *mon) }else {readline_free (container_of (mon, MonitorHMP, common)->rs); } -qobject_unref (mon->outbuf); +g_string_free (mon->outbuf, true);qemu_mutex_destroy (&mon->mon_lock); }Signature · 1 line
2.26.2
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
PATCH 3/20 qobject: Make qobject_to_json_pretty() take a pretty argument
In reply to Markus Armbruster--- include/qapi/qmp/qjson.h | 2 +- monitor/qmp.c | 2 +- qemu-img.c | 8 ++++---- qobject/qjson.c | 28 +++++++++++----------------- qom/qom-hmp-cmds.c | 2 +- tests/qtest/libqtest.c | 2 +- 6 files changed, 19 insertions(+), 25 deletions(-)
include/qapi/qmp/qjson.h +1 -1
@@ -26,6 +26,6 @@ QDict *qdict_from_jsonf_nofail(const char *string, ...)GCC_FMT_ATTR (1 ,2 );QString *qobject_to_json (const QObject *obj); -QString *qobject_to_json_pretty (const QObject *obj); +QString *qobject_to_json_pretty (const QObject *obj,bool pretty);#endif /* QJSON_H */
monitor/qmp.c +1 -1
@@ -112,7 +112,7 @@ void qmp_send_response(MonitorQMP *mon, const QDict *rsp)const QObject *data =QOBJECT (rsp);QString *json; - json = mon->pretty ?qobject_to_json_pretty (data) :qobject_to_json (data); + json =qobject_to_json_pretty (data, mon->pretty);assert (json !=NULL );qstring_append_chr (json,'\n' );
qemu-img.c +4 -4
@@ -633,7 +633,7 @@ static void dump_json_image_check(ImageCheck *check, bool quiet)visit_type_ImageCheck (v,NULL , &check, &error_abort);visit_complete (v, &obj); - str =qobject_to_json_pretty (obj); + str =qobject_to_json_pretty (obj, true);assert (str !=NULL );qprintf (quiet,"%s\n" ,qstring_get_str (str));qobject_unref (obj);
@@ -2796,7 +2796,7 @@ static void dump_json_image_info_list(ImageInfoList *list)visit_type_ImageInfoList (v,NULL , &list, &error_abort);visit_complete (v, &obj); - str =qobject_to_json_pretty (obj); + str =qobject_to_json_pretty (obj, true);assert (str !=NULL );printf ("%s\n" ,qstring_get_str (str));qobject_unref (obj);
@@ -2812,7 +2812,7 @@ static void dump_json_image_info(ImageInfo *info)visit_type_ImageInfo (v,NULL , &info, &error_abort);visit_complete (v, &obj); - str =qobject_to_json_pretty (obj); + str =qobject_to_json_pretty (obj, true);assert (str !=NULL );printf ("%s\n" ,qstring_get_str (str));qobject_unref (obj);
@@ -5243,7 +5243,7 @@ static void dump_json_block_measure_info(BlockMeasureInfo *info)visit_type_BlockMeasureInfo (v,NULL , &info, &error_abort);visit_complete (v, &obj); - str =qobject_to_json_pretty (obj); + str =qobject_to_json_pretty (obj, true);assert (str !=NULL );printf ("%s\n" ,qstring_get_str (str));qobject_unref (obj);
qobject/qjson.c +11 -17
@@ -149,8 +149,6 @@ QDict *qdict_from_jsonf_nofail(const char *string, ...)return qdict; } -static void to_json (const QObject *obj,QString *str,int pretty,int indent); -static void json_pretty_newline (QString *str,bool pretty,int indent) {int i;
@@ -163,7 +161,7 @@ static void json_pretty_newline(QString *str, bool pretty, int indent) } } -static void to_json (const QObject *obj,QString *str,int pretty,int indent) +static void to_json (const QObject *obj,QString *str,bool pretty,int indent) {switch (qobject_type (obj)) {case QTYPE_QNULL :
@@ -294,20 +292,16 @@ static void to_json(const QObject *obj, QString *str, int pretty, int indent) } } +QString *qobject_to_json_pretty (const QObject *obj,bool pretty) +{ +QString *str =qstring_new (); + +to_json (obj, str, pretty,0 ); + +return str; +} +QString *qobject_to_json (const QObject *obj) { -QString *str =qstring_new (); - -to_json (obj, str,0 ,0 ); - -return str; -} - -QString *qobject_to_json_pretty (const QObject *obj) -{ -QString *str =qstring_new (); - -to_json (obj, str,1 ,0 ); - -return str; +return qobject_to_json_pretty (obj, false); }
qom/qom-hmp-cmds.c +1 -1
@@ -78,7 +78,7 @@ void hmp_qom_get(Monitor *mon, const QDict *qdict)QObject *obj =qmp_qom_get (path, property, &err);if (err ==NULL ) { -QString *str =qobject_to_json_pretty (obj); +QString *str =qobject_to_json_pretty (obj, true);monitor_printf (mon,"%s\n" ,qstring_get_str (str));qobject_unref (str); }
tests/qtest/libqtest.c +1 -1
@@ -1197,7 +1197,7 @@ void qtest_qmp_assert_success(QTestState *qts, const char *fmt, ...)g_assert (response);if (!qdict_haskey (response,"return" )) { -QString *s =qobject_to_json_pretty (QOBJECT (response)); +QString *s =qobject_to_json_pretty (QOBJECT (response), true);g_test_message ("%s" ,qstring_get_str (s));qobject_unref (s); }
Signature · 1 line
2.26.2
PATCH 4/20 qobject: Use GString instead of QString to accumulate JSON
In reply to Markus ArmbrusterQString supports modifying its string, but it's quite limited: you can only append. The remaining callers use it for building an initial string, never for modifying it later.
Use of GString for building the initial string is actually more convenient here. Change qobject_to_json() & friends to do that.
Once all such uses are replaced this way, QString can become immutable.
--- include/qapi/qmp/qstring.h | 1 + qobject/qjson.c | 85 +++++++++++++++++--------------------- qobject/qstring.c | 19 +++++++++ 3 files changed, 58 insertions(+), 47 deletions(-)
include/qapi/qmp/qstring.h +1 -0
@@ -25,6 +25,7 @@ struct QString {QString *qstring_new (void );QString *qstring_from_str (const char *str);QString *qstring_from_substr (const char *str,size_t start,size_t end); +QString *qstring_from_gstring (GString *gstr);size_t qstring_get_length (const QString *qstring);const char *qstring_get_str (const QString *qstring);const char *qstring_get_try_str (const QString *qstring);
qobject/qjson.c +38 -47
183 lines not on this page · raw message
qobject/qstring.c +19 -0
@@ -66,6 +66,25 @@ QString *qstring_from_str(const char *str)return qstring_from_substr (str,0 ,strlen (str)); } +/** +* qstring_from_gstring(): Convert a GString to a QString +* +* Return strong reference. +*/ + +QString *qstring_from_gstring (GString *gstr) +{ +QString *qstring; + + qstring =g_malloc (sizeof (*qstring)); +qobject_init (QOBJECT (qstring),QTYPE_QSTRING ); + qstring->length = gstr->len; + qstring->capacity = gstr->allocated_len; + qstring->string =g_string_free (gstr, false); +return qstring; +} + +static void capacity_increase (QString *qstring,size_t len) {if (qstring->capacity < (qstring->length + len)) {
Signature · 1 line
2.26.2
PATCH 5/20 qobject: Change qobject_to_json()'s value to GString
In reply to Markus Armbrusterqobject_to_json() and qobject_to_json_pretty() build a GString, then covert it to QString. Just one of the callers actually needs a
QString: qemu_rbd_parse_filename(). A few others need a string they can modify: qmp_send_response(), qga's send_response(), to_json_str(), and qmp_fd_vsend_fds(). The remainder just need a string.
Change qobject_to_json() and qobject_to_json_pretty() to return the GString.
qemu_rbd_parse_filename() now has to convert to QString. All others save a QString temporary. to_json_str() actually becomes a bit simpler, because GString provides more convenient modification functions.
--- include/qapi/qmp/qjson.h | 4 +-- block.c | 6 ++-- block/rbd.c | 2 +- monitor/qmp.c | 14 ++++---- qemu-img.c | 25 +++++++------ qga/main.c | 22 ++++-------- qobject/qjson.c | 6 ++-- qom/object_interfaces.c | 4 +-- qom/qom-hmp-cmds.c | 7 ++-- tests/check-qjson.c | 56 ++++++++++++++---------------- tests/qtest/libqtest.c | 20 +++++------ tests/test-visitor-serialization.c | 6 ++-- 12 files changed, 79 insertions(+), 93 deletions(-)
include/qapi/qmp/qjson.h +2 -2
@@ -25,7 +25,7 @@ QDict *qdict_from_vjsonf_nofail(const char *string, va_list ap)QDict *qdict_from_jsonf_nofail (const char *string, ...)GCC_FMT_ATTR (1 ,2 ); -QString *qobject_to_json (const QObject *obj); -QString *qobject_to_json_pretty (const QObject *obj,bool pretty); +GString *qobject_to_json (const QObject *obj); +GString *qobject_to_json_pretty (const QObject *obj,bool pretty);#endif /* QJSON_H */
block.c +3 -3
@@ -6979,13 +6979,13 @@ void bdrv_refresh_filename(BlockDriverState *bs)if (bs->exact_filename[0 ]) {pstrcpy (bs->filename,sizeof (bs->filename), bs->exact_filename); }else { -QString *json =qobject_to_json (QOBJECT (bs->full_open_options)); +GString *json =qobject_to_json (QOBJECT (bs->full_open_options));if (snprintf (bs->filename,sizeof (bs->filename),"json:%s" , -qstring_get_str (json)) >=sizeof (bs->filename)) { + json->str) >=sizeof (bs->filename)) {/* Give user a hint if we truncated things. */ strcpy (bs->filename +sizeof (bs->filename) -4 ,"..." ); } -qobject_unref (json); +g_string_free (json, true); } }
block/rbd.c +1 -1
@@ -232,7 +232,7 @@ static void qemu_rbd_parse_filename(const char *filename, QDict *options,if (keypairs) {qdict_put (options,"=keyvalue-pairs" , -qobject_to_json (QOBJECT (keypairs))); +qstring_from_gstring (qobject_to_json (QOBJECT (keypairs)))); } done:
monitor/qmp.c +7 -7
@@ -110,15 +110,15 @@ static void monitor_qmp_cleanup_queue_and_resume(MonitorQMP *mon)void qmp_send_response (MonitorQMP *mon,const QDict *rsp) {const QObject *data =QOBJECT (rsp); -QString *json; +GString *json; json =qobject_to_json_pretty (data, mon->pretty);assert (json !=NULL ); -qstring_append_chr (json,'\n' ); -monitor_puts (&mon->common,qstring_get_str (json)); +g_string_append_c (json,'\n' ); +monitor_puts (&mon->common, json->str); -qobject_unref (json); +g_string_free (json, true); }/*
@@ -320,9 +320,9 @@ static void handle_qmp_command(void *opaque, QObject *req, Error *err) }/* else will fail qmp_dispatch() */ if (req &&trace_event_get_state_backends (TRACE_HANDLE_QMP_COMMAND )) { -QString *req_json =qobject_to_json (req); -trace_handle_qmp_command (mon,qstring_get_str (req_json)); -qobject_unref (req_json); +GString *req_json =qobject_to_json (req); +trace_handle_qmp_command (mon, req_json->str); +g_string_free (req_json, true); }if (qdict &&qmp_is_oob (qdict)) {
qemu-img.c +12 -13
@@ -33,7 +33,6 @@#include "qapi/qobject-output-visitor.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" #include "qemu/cutils.h" #include "qemu/config-file.h" #include "qemu/option.h"
@@ -627,7 +626,7 @@ fail:static void dump_json_image_check (ImageCheck *check,bool quiet) { -QString *str; +GString *str;QObject *obj;Visitor *v =qobject_output_visitor_new (&obj);
@@ -635,10 +634,10 @@ static void dump_json_image_check(ImageCheck *check, bool quiet)visit_complete (v, &obj); str =qobject_to_json_pretty (obj, true);assert (str !=NULL ); -qprintf (quiet,"%s\n" ,qstring_get_str (str)); +qprintf (quiet,"%s\n" , str->str);qobject_unref (obj);visit_free (v); -qobject_unref (str); +g_string_free (str, true); }static void dump_human_image_check (ImageCheck *check,bool quiet)
@@ -2790,7 +2789,7 @@ static void dump_snapshots(BlockDriverState *bs)static void dump_json_image_info_list (ImageInfoList *list) { -QString *str; +GString *str;QObject *obj;Visitor *v =qobject_output_visitor_new (&obj);
@@ -2798,15 +2797,15 @@ static void dump_json_image_info_list(ImageInfoList *list)visit_complete (v, &obj); str =qobject_to_json_pretty (obj, true);assert (str !=NULL ); -printf ("%s\n" ,qstring_get_str (str)); +printf ("%s\n" , str->str);qobject_unref (obj);visit_free (v); -qobject_unref (str); +g_string_free (str, true); }static void dump_json_image_info (ImageInfo *info) { -QString *str; +GString *str;QObject *obj;Visitor *v =qobject_output_visitor_new (&obj);
@@ -2814,10 +2813,10 @@ static void dump_json_image_info(ImageInfo *info)visit_complete (v, &obj); str =qobject_to_json_pretty (obj, true);assert (str !=NULL ); -printf ("%s\n" ,qstring_get_str (str)); +printf ("%s\n" , str->str);qobject_unref (obj);visit_free (v); -qobject_unref (str); +g_string_free (str, true); }static void dump_human_image_info_list (ImageInfoList *list)
@@ -5237,7 +5236,7 @@ out:static void dump_json_block_measure_info (BlockMeasureInfo *info) { -QString *str; +GString *str;QObject *obj;Visitor *v =qobject_output_visitor_new (&obj);
@@ -5245,10 +5244,10 @@ static void dump_json_block_measure_info(BlockMeasureInfo *info)visit_complete (v, &obj); str =qobject_to_json_pretty (obj, true);assert (str !=NULL ); -printf ("%s\n" ,qstring_get_str (str)); +printf ("%s\n" , str->str);qobject_unref (obj);visit_free (v); -qobject_unref (str); +g_string_free (str, true); }static int img_measure (int argc,char **argv)
qga/main.c +7 -15
@@ -22,7 +22,6 @@#include "qapi/qmp/json-parser.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" -#include "qapi/qmp/qstring.h" #include "guest-agent-core.h" #include "qga-qapi-init-commands.h" #include "qapi/qmp/qerror.h"
@@ -528,8 +527,7 @@ fail:static int send_response (GAState *s,const QDict *rsp) { -const char *buf; -QString *payload_qstr, *response_qstr; +GString *response;GIOStatus status;g_assert (s->channel);
@@ -538,25 +536,19 @@ static int send_response(GAState *s, const QDict *rsp)return 0 ; } - payload_qstr =qobject_to_json (QOBJECT (rsp)); -if (!payload_qstr) { + response =qobject_to_json (QOBJECT (rsp)); +if (!response) {return -EINVAL ; }if (s->delimit_response) { s->delimit_response = false; - response_qstr =qstring_new (); -qstring_append_chr (response_qstr,QGA_SENTINEL_BYTE ); -qstring_append (response_qstr,qstring_get_str (payload_qstr)); -qobject_unref (payload_qstr); - }else { - response_qstr = payload_qstr; +g_string_prepend_c (response,QGA_SENTINEL_BYTE ); } -qstring_append_chr (response_qstr,'\n' ); - buf =qstring_get_str (response_qstr); - status =ga_channel_write_all (s->channel, buf,strlen (buf)); -qobject_unref (response_qstr); +g_string_append_c (response,'\n' ); + status =ga_channel_write_all (s->channel, response->str, response->len); +g_string_free (response, true);if (status !=G_IO_STATUS_NORMAL ) {return -EIO ; }
qobject/qjson.c +3 -3
@@ -284,15 +284,15 @@ static void to_json(const QObject *obj, GString *accu, bool pretty, int indent) } } -QString *qobject_to_json_pretty (const QObject *obj,bool pretty) +GString *qobject_to_json_pretty (const QObject *obj,bool pretty) {GString *accu =g_string_new (NULL );to_json (obj, accu, pretty,0 ); -return qstring_from_gstring (accu); +return accu; } -QString *qobject_to_json (const QObject *obj) +GString *qobject_to_json (const QObject *obj) {return qobject_to_json_pretty (obj, false); }
qom/object_interfaces.c +2 -2
@@ -5,7 +5,6 @@#include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qjson.h" -#include "qapi/qmp/qstring.h" #include "qapi/qobject-input-visitor.h" #include "qom/object_interfaces.h" #include "qemu/help_option.h"
@@ -207,7 +206,8 @@ char *object_property_help(const char *name, const char *type,g_string_append (str, description); }if (defval) { - g_autofree char *def_json = qstring_free(qobject_to_json(defval), TRUE); + g_autofree char *def_json = g_string_free(qobject_to_json(defval), + true);g_string_append_printf (str," (default: %s)" , def_json); }
qom/qom-hmp-cmds.c +3 -4
@@ -13,7 +13,6 @@#include "qapi/qapi-commands-qom.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" -#include "qapi/qmp/qstring.h" #include "qom/object.h" void hmp_qom_list (Monitor *mon,const QDict *qdict)
@@ -78,9 +77,9 @@ void hmp_qom_get(Monitor *mon, const QDict *qdict)QObject *obj =qmp_qom_get (path, property, &err);if (err ==NULL ) { -QString *str =qobject_to_json_pretty (obj, true); -monitor_printf (mon,"%s\n" ,qstring_get_str (str)); -qobject_unref (str); +GString *str =qobject_to_json_pretty (obj, true); +monitor_printf (mon,"%s\n" , str->str); +g_string_free (str, true); }qobject_unref (obj);
tests/check-qjson.c +27 -29
167 lines not on this page · raw message
tests/qtest/libqtest.c +9 -11
@@ -652,27 +652,25 @@ void qmp_fd_vsend_fds(int fd, int *fds, size_t fds_num,/* No need to send anything for an empty QObject. */ if (qobj) {int log =getenv ("QTEST_LOG" ) !=NULL ; -QString *qstr =qobject_to_json (qobj); -const char *str; +GString *str =qobject_to_json (qobj);/* * BUG: QMP doesn't react to input until it sees a newline, an * object, or an array. Work-around: give it a newline. */ -qstring_append_chr (qstr,'\n' ); - str =qstring_get_str (qstr); +g_string_append_c (str,'\n' );if (log) { -fprintf (stderr,"%s" , str); +fprintf (stderr,"%s" , str->str); }/* Send QMP request */ if (fds && fds_num >0 ) { -socket_send_fds (fd, fds, fds_num, str,qstring_get_length (qstr)); +socket_send_fds (fd, fds, fds_num, str->str, str->len); }else { -socket_send (fd, str,qstring_get_length (qstr)); +socket_send (fd, str->str, str->len); } -qobject_unref (qstr); +g_string_free (str, true);qobject_unref (qobj); } }
@@ -1197,9 +1195,9 @@ void qtest_qmp_assert_success(QTestState *qts, const char *fmt, ...)g_assert (response);if (!qdict_haskey (response,"return" )) { -QString *s =qobject_to_json_pretty (QOBJECT (response), true); -g_test_message ("%s" ,qstring_get_str (s)); -qobject_unref (s); +GString *s =qobject_to_json_pretty (QOBJECT (response), true); +g_test_message ("%s" , s->str); +g_string_free (s, true); }g_assert (qdict_haskey (response,"return" ));qobject_unref (response);
tests/test-visitor-serialization.c +3 -3
@@ -1044,15 +1044,15 @@ static void qmp_deserialize(void **native_out, void *datap, VisitorFunc visit, Error **errp) { QmpSerializeData *d = datap; -QString *output_json; +GString *output_json;QObject *obj_orig, *obj;visit_complete (d->qov, &d->obj); obj_orig = d->obj; output_json =qobject_to_json (obj_orig); - obj =qobject_from_json (qstring_get_str (output_json), &error_abort); + obj =qobject_from_json (output_json->str, &error_abort); -qobject_unref (output_json); +g_string_free (output_json, true); d->qiv =qobject_input_visitor_new (obj);qobject_unref (obj_orig);qobject_unref (obj);
Signature · 1 line
2.26.2
Re: [PATCH 05/20] qobject: Change qobject_to_json()'s value to GString
Quoted 9 lines · Markus Armbruster
qobject_to_json()andqobject_to_json_pretty()build a GString, then covert it to QString. Just one of the callers actually needs a
QString:qemu_rbd_parse_filename(). A few others need a string they can modify:qmp_send_response(), qga'ssend_response(),to_json_str(), andqmp_fd_vsend_fds(). The remainder just need a string.Change
qobject_to_json()andqobject_to_json_pretty()to return the GString.
Quoted 6 lines
qemu_rbd_parse_filename()now has to convert to QString. All others save a QString temporary.to_json_str()actually becomes a bit simpler, because GString provides more convenient modification functions.Signed-off-by Markus Armbruster <[email protected]>
Hi Markus!
This patch broke the output of default values in the device help. With commit eab3a4678b07267c39e72:
$ ./qemu-system-x86_64 -device pvpanic,help pvpanic options: events=<uint8> - (default: (null)) ioport=<uint16> - (default: (null)) pvpanic[0]=<child<qemu:memory-region>>
With the commit right before that one:
$ ./qemu-system-x86_64 -device pvpanic,help pvpanic options: events=<uint8> - (default: 3) ioport=<uint16> - (default: 1285) pvpanic[0]=<child<qemu:memory-region>>
Any ideas how to fix that?
Thomas
Re: [PATCH 05/20] qobject: Change qobject_to_json()'s value to GString
Quoted 27 lines · Thomas Huth
Quoted 11 lines · Markus Armbruster
qobject_to_json()andqobject_to_json_pretty()build a GString, then covert it to QString. Just one of the callers actually needs a
QString:qemu_rbd_parse_filename(). A few others need a string they can modify:qmp_send_response(), qga'ssend_response(),to_json_str(), andqmp_fd_vsend_fds(). The remainder just need a string. Changeqobject_to_json()andqobject_to_json_pretty()to return the GString.qemu_rbd_parse_filename()now has to convert to QString. All others save a QString temporary.to_json_str()actually becomes a bit simpler, because GString provides more convenient modification functions.Quoted 1 line
Signed-off-by Markus Armbruster <[email protected]>Hi Markus!
This patch broke the output of default values in the device help. With commit
eab3a4678b07267c39e72:$ ./qemu-system-x86_64 -device pvpanic,help pvpanic options: events=<uint8> - (default: (null)) ioport=<uint16> - (default: (null)) pvpanic[0]=<child<qemu:memory-region>>With the commit right before that one:
Quoted 7 lines
$ ./qemu-system-x86_64 -device pvpanic,help pvpanic options: events=<uint8> - (default: 3) ioport=<uint16> - (default: 1285) pvpanic[0]=<child<qemu:memory-region>>Any ideas how to fix that?
Yes:
qom/object_interfaces.c +1 -1
@@ -159,7 +159,7 @@ char *object_property_help(const char *name, const char *type, }if (defval) { g_autofree char *def_json = g_string_free(qobject_to_json(defval), - true); + false);g_string_append_printf (str," (default: %s)" , def_json); }
I'll post a proper patch. Sorry for the dumb mistake, and thanks for pinpointing the commit!
PATCH 6/20 Revert "qstring: add qstring_free()"
In reply to Markus ArmbrusterThis reverts commit 164c374b75f87c6765a705c4418ab7005a2d356f.
A free function for a reference-counted object is in bad taste. Fortunately, this one is now also unused. Drop it.
--- include/qapi/qmp/qstring.h | 1 - qobject/qstring.c | 27 +++++---------------------- 2 files changed, 5 insertions(+), 23 deletions(-)
include/qapi/qmp/qstring.h +0 -1
@@ -34,7 +34,6 @@ void qstring_append_int(QString *qstring, int64_t value);void qstring_append (QString *qstring,const char *str);void qstring_append_chr (QString *qstring,int c);bool qstring_is_equal (const QObject *x,const QObject *y); -char *qstring_free (QString *qstring,bool return_str);void qstring_destroy_obj (QObject *obj);#endif /* QSTRING_H */
qobject/qstring.c +5 -22
@@ -168,33 +168,16 @@ bool qstring_is_equal(const QObject *x, const QObject *y) qobject_to(QString, y)->string); } -/** -* qstring_free(): Free the memory allocated by a QString object -* -* Return: if @return_str, return the underlying string, to be -* g_free(), otherwise NULL is returned. -*/ -char *qstring_free (QString *qstring,bool return_str) -{ -char *rv =NULL ; - -if (return_str) { - rv = qstring->string; - }else { -g_free (qstring->string); - } - -g_free (qstring); - -return rv; -} -/** * qstring_destroy_obj(): Free all memory allocated by a QString * object */ void qstring_destroy_obj (QObject *obj) { +QString *qs; +assert (obj !=NULL ); -qstring_free (qobject_to (QString, obj), FALSE); + qs =qobject_to (QString, obj); +g_free (qs->string); +g_free (qs); }
Signature · 1 line
2.26.2
PATCH 7/20 hw/rdma: Replace QList by GQueue
In reply to Markus ArmbrusterRdmaProtectedQList provides a thread-safe queue of int64_t on top of a QList.
rdma_protected_qlist_destroy() calls qlist_destroy_obj() directly. qlist_destroy_obj() is actually for use by qobject_destroy() only. The next commit will make that obvious.
The minimal fix would be calling qobject_unref() instead. But QList is actually a bad fit here. It's designed for representing JSON arrays. We're better off with a GQueue here. Replace.
--- hw/rdma/rdma_backend_defs.h | 2 +- hw/rdma/rdma_utils.h | 15 ++++++++------- hw/rdma/rdma_backend.c | 10 +++++----- hw/rdma/rdma_utils.c | 29 ++++++++++++++++------------- 4 files changed, 30 insertions(+), 26 deletions(-)
hw/rdma/rdma_backend_defs.h +1 -1
@@ -43,7 +43,7 @@ typedef struct RdmaBackendDev {struct ibv_context *context;struct ibv_comp_channel *channel;uint8_t port_num; -RdmaProtectedQList recv_mads_list; +RdmaProtectedGQueue recv_mads_list;RdmaCmMux rdmacm_mux; } RdmaBackendDev;
hw/rdma/rdma_utils.h +8 -7
@@ -28,10 +28,10 @@#define rdma_info_report (fmt, ...) \ info_report("%s: " fmt, "rdma", ## __VA_ARGS__) -typedef struct RdmaProtectedQList { +typedef struct RdmaProtectedGQueue {QemuMutex lock; -QList *list; -}RdmaProtectedQList ; +GQueue *list; +}RdmaProtectedGQueue ; typedef struct RdmaProtectedGSList { QemuMutex lock;
@@ -40,10 +40,11 @@ typedef struct RdmaProtectedGSList {void *rdma_pci_dma_map (PCIDevice *dev,dma_addr_t addr,dma_addr_t plen);void rdma_pci_dma_unmap (PCIDevice *dev,void *buffer,dma_addr_t len); -void rdma_protected_qlist_init (RdmaProtectedQList *list); -void rdma_protected_qlist_destroy (RdmaProtectedQList *list); -void rdma_protected_qlist_append_int64 (RdmaProtectedQList *list,int64_t value); -int64_t rdma_protected_qlist_pop_int64 (RdmaProtectedQList *list); +void rdma_protected_gqueue_init (RdmaProtectedGQueue *list); +void rdma_protected_gqueue_destroy (RdmaProtectedGQueue *list); +void rdma_protected_gqueue_append_int64 (RdmaProtectedGQueue *list, +int64_t value); +int64_t rdma_protected_gqueue_pop_int64 (RdmaProtectedGQueue *list);void rdma_protected_gslist_init (RdmaProtectedGSList *list);void rdma_protected_gslist_destroy (RdmaProtectedGSList *list); void rdma_protected_gslist_append_int32(RdmaProtectedGSList *list,
hw/rdma/rdma_backend.c +5 -5
@@ -78,7 +78,7 @@ static void clean_recv_mads(RdmaBackendDev *backend_dev)unsigned long cqe_ctx_id; do { - cqe_ctx_id = rdma_protected_qlist_pop_int64(&backend_dev-> + cqe_ctx_id = rdma_protected_gqueue_pop_int64(&backend_dev-> recv_mads_list); if (cqe_ctx_id != -ENOENT) { qatomic_inc(&backend_dev->rdma_dev_res->stats.missing_cqe);
@@ -597,7 +597,7 @@ static unsigned int save_mad_recv_buffer(RdmaBackendDev *backend_dev, bctx->up_ctx = ctx; bctx->sge = *sge; -rdma_protected_qlist_append_int64 (&backend_dev->recv_mads_list, bctx_id); +rdma_protected_gqueue_append_int64 (&backend_dev->recv_mads_list, bctx_id);return 0 ; }
@@ -1111,7 +1111,7 @@ static void process_incoming_mad_req(RdmaBackendDev *backend_dev,trace_mad_message ("recv" , msg->umad.mad, msg->umad_len); - cqe_ctx_id =rdma_protected_qlist_pop_int64 (&backend_dev->recv_mads_list); + cqe_ctx_id =rdma_protected_gqueue_pop_int64 (&backend_dev->recv_mads_list);if (cqe_ctx_id == -ENOENT ) {rdma_warn_report ("No more free MADs buffers, waiting for a while" );sleep (THR_POLL_TO );
@@ -1185,7 +1185,7 @@ static int mad_init(RdmaBackendDev *backend_dev, CharBackend *mad_chr_be)return -EIO ; } -rdma_protected_qlist_init (&backend_dev->recv_mads_list); +rdma_protected_gqueue_init (&backend_dev->recv_mads_list);enable_rdmacm_mux_async (backend_dev);
@@ -1205,7 +1205,7 @@ static void mad_fini(RdmaBackendDev *backend_dev) {disable_rdmacm_mux_async (backend_dev);qemu_chr_fe_disconnect (backend_dev->rdmacm_mux.chr_be); -rdma_protected_qlist_destroy (&backend_dev->recv_mads_list); +rdma_protected_gqueue_destroy (&backend_dev->recv_mads_list); } int rdma_backend_get_gid_index(RdmaBackendDev *backend_dev,
hw/rdma/rdma_utils.c +16 -13
@@ -14,8 +14,6 @@*/ #include "qemu/osdep.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnum.h" #include "trace.h" #include "rdma_utils.h"
@@ -54,41 +52,46 @@ void rdma_pci_dma_unmap(PCIDevice *dev, void *buffer, dma_addr_t len) } } -void rdma_protected_qlist_init (RdmaProtectedQList *list) +void rdma_protected_gqueue_init (RdmaProtectedGQueue *list) {qemu_mutex_init (&list->lock); - list->list =qlist_new (); + list->list =g_queue_new (); } -void rdma_protected_qlist_destroy (RdmaProtectedQList *list) +void rdma_protected_gqueue_destroy (RdmaProtectedGQueue *list) {if (list->list) { -qlist_destroy_obj (QOBJECT (list->list)); +g_queue_free_full (list->list, g_free);qemu_mutex_destroy (&list->lock); list->list =NULL ; } } -void rdma_protected_qlist_append_int64 (RdmaProtectedQList *list,int64_t value) +void rdma_protected_gqueue_append_int64 (RdmaProtectedGQueue *list, +int64_t value) {qemu_mutex_lock (&list->lock); -qlist_append_int (list->list, value); +g_queue_push_tail (list->list,g_memdup (&value,sizeof (value)));qemu_mutex_unlock (&list->lock); } -int64_t rdma_protected_qlist_pop_int64 (RdmaProtectedQList *list) +int64_t rdma_protected_gqueue_pop_int64 (RdmaProtectedGQueue *list) { -QObject *obj; +int64_t *valp; +int64_t val;qemu_mutex_lock (&list->lock); - obj =qlist_pop (list->list); + + valp =g_queue_pop_head (list->list);qemu_mutex_unlock (&list->lock); -if (!obj) { +if (!valp) {return -ENOENT ; } -return qnum_get_uint (qobject_to (QNum, obj)); + val = *valp; +g_free (valp); +return val; }void rdma_protected_gslist_init (RdmaProtectedGSList *list)
Signature · 1 line
2.26.2
PATCH 8/20 qobject: Move internals to qobject-internal.h
In reply to Markus Armbruster--- include/qapi/qmp/qbool.h | 2 -- include/qapi/qmp/qdict.h | 2 -- include/qapi/qmp/qlist.h | 2 -- include/qapi/qmp/qnull.h | 2 -- include/qapi/qmp/qnum.h | 3 --- include/qapi/qmp/qobject.h | 9 +-------- include/qapi/qmp/qstring.h | 2 -- qobject/qobject-internal.h | 39 ++++++++++++++++++++++++++++++++++++++ qobject/qbool.c | 1 + qobject/qdict.c | 1 + qobject/qlist.c | 1 + qobject/qnull.c | 1 + qobject/qnum.c | 1 + qobject/qobject.c | 1 + qobject/qstring.c | 1 + 15 files changed, 47 insertions(+), 21 deletions(-) create mode 100644 qobject/qobject-internal.h
include/qapi/qmp/qbool.h +0 -2
@@ -23,7 +23,5 @@ struct QBool {QBool *qbool_from_bool (bool value);bool qbool_get_bool (const QBool *qb); -bool qbool_is_equal (const QObject *x,const QObject *y); -void qbool_destroy_obj (QObject *obj);#endif /* QBOOL_H */
include/qapi/qmp/qdict.h +0 -2
@@ -39,10 +39,8 @@ void qdict_put_obj(QDict *qdict, const char *key, QObject *value);void qdict_del (QDict *qdict,const char *key);int qdict_haskey (const QDict *qdict,const char *key);QObject *qdict_get (const QDict *qdict,const char *key); -bool qdict_is_equal (const QObject *x,const QObject *y);const QDictEntry *qdict_first (const QDict *qdict);const QDictEntry *qdict_next (const QDict *qdict,const QDictEntry *entry); -void qdict_destroy_obj (QObject *obj);/* Helper to qdict_put_obj(), accepts any object */ #define qdict_put (qdict, key, obj) \
include/qapi/qmp/qlist.h +0 -2
@@ -51,8 +51,6 @@ QObject *qlist_pop(QList *qlist);QObject *qlist_peek (QList *qlist);int qlist_empty (const QList *qlist);size_t qlist_size (const QList *qlist); -bool qlist_is_equal (const QObject *x,const QObject *y); -void qlist_destroy_obj (QObject *obj);static inline const QListEntry *qlist_first (const QList *qlist) {
include/qapi/qmp/qnull.h +0 -2
@@ -26,6 +26,4 @@ static inline QNull *qnull(void) return qobject_ref(&qnull_); } -bool qnull_is_equal (const QObject *x,const QObject *y); -#endif /* QNULL_H */
include/qapi/qmp/qnum.h +0 -3
@@ -68,7 +68,4 @@ double qnum_get_double(QNum *qn);char *qnum_to_string (QNum *qn); -bool qnum_is_equal (const QObject *x,const QObject *y); -void qnum_destroy_obj (QObject *obj); -#endif /* QNUM_H */
include/qapi/qmp/qobject.h +1 -8
@@ -64,14 +64,6 @@ QEMU_BUILD_BUG_MSG(QTYPE__MAX != 7,#define qobject_to (type, obj) \ ((type *)qobject_check_type(obj, glue(QTYPE_CAST_TO_, type))) -/* Initialize an object to default values */ -static inline void qobject_init (QObject *obj,QType type) -{ -assert (QTYPE_NONE < type && type <QTYPE__MAX ); - obj->base.refcnt =1 ; - obj->base.type = type; -} -static inline void qobject_ref_impl (QObject *obj) {if (obj) {
@@ -90,6 +82,7 @@ bool qobject_is_equal(const QObject *x, const QObject *y);/** * qobject_destroy(): Free resources used by the object +* For use via qobject_unref() only! */ void qobject_destroy (QObject *obj);
include/qapi/qmp/qstring.h +0 -2
@@ -33,7 +33,5 @@ const char *qobject_get_try_str(const QObject *qstring);void qstring_append_int (QString *qstring,int64_t value);void qstring_append (QString *qstring,const char *str);void qstring_append_chr (QString *qstring,int c); -bool qstring_is_equal (const QObject *x,const QObject *y); -void qstring_destroy_obj (QObject *obj);#endif /* QSTRING_H */
qobject/qobject-internal.h new file +39 -0
@@ -0,0 +1,39 @@ +/* +* QObject internals +* +* Copyright (C) 2015 Red Hat, Inc. +* +* This work is licensed under the terms of the GNU LGPL, version 2.1 +* or later. See the COPYING.LIB file in the top-level directory. +*/ + +#ifndef QOBJECT_INTERNAL_H +#define QOBJECT_INTERNAL_H + +#include "qapi/qmp/qobject.h" + +static inline void qobject_init (QObject *obj,QType type) +{ +assert (QTYPE_NONE < type && type <QTYPE__MAX ); + obj->base.refcnt =1 ; + obj->base.type = type; +} + +void qbool_destroy_obj (QObject *obj); +bool qbool_is_equal (const QObject *x,const QObject *y); + +void qdict_destroy_obj (QObject *obj); +bool qdict_is_equal (const QObject *x,const QObject *y); + +void qlist_destroy_obj (QObject *obj); +bool qlist_is_equal (const QObject *x,const QObject *y); + +bool qnull_is_equal (const QObject *x,const QObject *y); + +void qnum_destroy_obj (QObject *obj); +bool qnum_is_equal (const QObject *x,const QObject *y); + +void qstring_destroy_obj (QObject *obj); +bool qstring_is_equal (const QObject *x,const QObject *y); + +#endif
qobject/qbool.c +1 -0
@@ -13,6 +13,7 @@#include "qemu/osdep.h" #include "qapi/qmp/qbool.h" +#include "qobject-internal.h" /** * qbool_from_bool(): Create a new QBool from a bool
qobject/qdict.c +1 -0
@@ -16,6 +16,7 @@#include "qapi/qmp/qbool.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qstring.h" +#include "qobject-internal.h" /** * qdict_new(): Create a new QDict
qobject/qlist.c +1 -0
@@ -17,6 +17,7 @@#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "qemu/queue.h" +#include "qobject-internal.h" /** * qlist_new(): Create a new QList
qobject/qnull.c +1 -0
@@ -12,6 +12,7 @@#include "qemu/osdep.h" #include "qapi/qmp/qnull.h" +#include "qobject-internal.h" QNull qnull_ = { .base = {
qobject/qnum.c +1 -0
@@ -14,6 +14,7 @@#include "qemu/osdep.h" #include "qapi/qmp/qnum.h" +#include "qobject-internal.h" /** * qnum_from_int(): Create a new QNum from an int64_t
qobject/qobject.c +1 -0
@@ -14,6 +14,7 @@#include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" #include "qapi/qmp/qstring.h" +#include "qobject-internal.h" QEMU_BUILD_BUG_MSG( offsetof(QNull, base) != 0 ||
qobject/qstring.c +1 -0
@@ -12,6 +12,7 @@#include "qemu/osdep.h" #include "qapi/qmp/qstring.h" +#include "qobject-internal.h" /** * qstring_new(): Create a new empty QString
Signature · 1 line
2.26.2
PATCH 9/20 qmp: Fix tracing of non-string command IDs
In reply to Markus ArmbrusterTracepoints monitor_qmp_cmd_in_band and monitor_qmp_cmd_out_of_band (commit cf869d5317 "qmp: support out-of-band (oob) execution") treat non-string "id" like absent "id". Fix that.
--- monitor/qmp.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-)
monitor/qmp.c +18 -12
@@ -31,7 +31,6 @@#include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qlist.h" -#include "qapi/qmp/qstring.h" #include "trace.h" struct QMPRequest {
@@ -276,9 +275,15 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *data) mon->qmp_requests->length ==QMP_REQ_QUEUE_LEN_MAX -1 ;qemu_mutex_unlock (&mon->qmp_queue_lock);if (req_obj->req) { -QDict *qdict =qobject_to (QDict, req_obj->req); -QObject *id = qdict ?qdict_get (qdict,"id" ) :NULL ; -trace_monitor_qmp_cmd_in_band (qobject_get_try_str (id) ?:"" ); +if (trace_event_get_state (TRACE_MONITOR_QMP_CMD_IN_BAND )) { +QDict *qdict =qobject_to (QDict, req_obj->req); +QObject *id = qdict ?qdict_get (qdict,"id" ) :NULL ; +GString *id_json; + + id_json = id ?qobject_to_json (id) :g_string_new (NULL ); +trace_monitor_qmp_cmd_in_band (id_json->str); +g_string_free (id_json, true); + }monitor_qmp_dispatch (mon, req_obj->req); }else {assert (req_obj->err);
@@ -308,17 +313,11 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *data)static void handle_qmp_command (void *opaque,QObject *req,Error *err) {MonitorQMP *mon = opaque; -QObject *id =NULL ; -QDict *qdict; +QDict *qdict =qobject_to (QDict, req);QMPRequest *req_obj;assert (!req != !err); - qdict =qobject_to (QDict, req); -if (qdict) { - id =qdict_get (qdict,"id" ); - }/* else will fail qmp_dispatch() */ -if (req &&trace_event_get_state_backends (TRACE_HANDLE_QMP_COMMAND )) {GString *req_json =qobject_to_json (req);trace_handle_qmp_command (mon, req_json->str);
@@ -327,7 +326,14 @@ static void handle_qmp_command(void *opaque, QObject *req, Error *err)if (qdict &&qmp_is_oob (qdict)) {/* OOB commands are executed immediately */ -trace_monitor_qmp_cmd_out_of_band (qobject_get_try_str (id) ?:"" ); +if (trace_event_get_state (TRACE_MONITOR_QMP_CMD_OUT_OF_BAND )) { +QObject *id =qdict_get (qdict,"id" ); +GString *id_json; + + id_json = id ?qobject_to_json (id) :g_string_new (NULL ); +trace_monitor_qmp_cmd_out_of_band (id_json->str); +g_string_free (id_json, true); + }monitor_qmp_dispatch (mon, req);qobject_unref (req);return ;
Signature · 1 line
2.26.2
PATCH 10/20 block: Avoid qobject_get_try_str()
In reply to Markus ArmbrusterI'm about to remove qobject_get_try_str(). Use qstring_get_str() instead. Safe because the argument is known to be a QString here.
--- block.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
block.c +3 -3
@@ -4015,7 +4015,7 @@ static int bdrv_reopen_parse_backing(BDRVReopenState *reopen_state, new_backing_bs =NULL ;break ;case QTYPE_QSTRING : - str =qobject_get_try_str (value); + str =qstring_get_str (qobject_to (QString, value)); new_backing_bs =bdrv_lookup_bs (NULL , str, errp);if (new_backing_bs ==NULL ) {return -EINVAL ;
@@ -4278,8 +4278,8 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue, }if (child) { -const char *str =qobject_get_try_str (new); -if (!strcmp (child->bs->node_name, str)) { +if (!strcmp (child->bs->node_name, +qstring_get_str (qobject_to (QString, new)))) {continue ;/* Found child with this name, skip option */ } }
Signature · 1 line
2.26.2
Re: [PATCH 10/20] block: Avoid qobject_get_try_str()
Quoted 7 lines · Markus Armbruster
I'm about to remove
qobject_get_try_str(). Useqstring_get_str()instead. Safe because the argument is known to be a QString here.Cc Kevin Wolf<[email protected]>Cc Max Reitz<[email protected]>Signed-off-by Markus Armbruster<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH 11/20 Revert "qobject: let object_property_get_str() use new API"
In reply to Markus ArmbrusterCommit aafb21a0b9 "qobject: let object_property_get_str() use new API" isn't much of a simplification. Not worth having object_property_get_str() differ from the other object_property_get_FOO(). Revert.
This reverts commit aafb21a0b9cea5fa0fe52e68111bb6bd13837a02.
--- qom/object.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
qom/object.c +6 -3
@@ -1414,15 +1414,18 @@ char *object_property_get_str(Object *obj, const char *name, Error **errp) {QObject *ret =object_property_get_qobject (obj, name, errp); +QString *qstring;char *retval;if (!ret) {return NULL ; } - - retval =g_strdup (qobject_get_try_str (ret)); -if (!retval) { + qstring =qobject_to (QString, ret); +if (!qstring) {error_setg (errp,QERR_INVALID_PARAMETER_TYPE , name,"string" ); + retval =NULL ; + }else { + retval =g_strdup (qstring_get_str (qstring)); }qobject_unref (ret);
Signature · 1 line
2.26.2
Re: [PATCH 11/20] Revert "qobject: let object_property_get_str() use new API"
Quoted 11 lines · Markus Armbruster
Commit
aafb21a0b9"qobject: letobject_property_get_str()use new API" isn't much of a simplification. Not worth havingobject_property_get_str()differ from the otherobject_property_get_FOO(). Revert.This reverts commit
aafb21a0b9cea5fa0fe52e68111bb6bd13837a02.Cc Paolo Bonzini <[email protected]>Cc Daniel P. Berrangé <[email protected]>Cc Eduardo Habkost <[email protected]>Signed-off-by Markus Armbruster <[email protected]>
Signature · 1 line
Eduardo
PATCH 12/20 qobject: Drop qobject_get_try_str()
In reply to Markus Armbruster--- include/qapi/qmp/qstring.h | 1 - qobject/qstring.c | 11 ----------- 2 files changed, 12 deletions(-)
include/qapi/qmp/qstring.h +0 -1
@@ -29,7 +29,6 @@ QString *qstring_from_gstring(GString *gstr);size_t qstring_get_length (const QString *qstring);const char *qstring_get_str (const QString *qstring);const char *qstring_get_try_str (const QString *qstring); -const char *qobject_get_try_str (const QObject *qstring);void qstring_append_int (QString *qstring,int64_t value);void qstring_append (QString *qstring,const char *str);void qstring_append_chr (QString *qstring,int c);
qobject/qstring.c +0 -11
@@ -149,17 +149,6 @@ const char *qstring_get_try_str(const QString *qstring)return qstring ?qstring_get_str (qstring) :NULL ; } -/** -* qobject_get_try_str(): Return a pointer to the corresponding string -* -* NOTE: the string will only be returned if the object is valid, and -* its type is QString, otherwise NULL is returned. -*/ -const char *qobject_get_try_str (const QObject *qstring) -{ -return qstring_get_try_str (qobject_to (QString, qstring)); -} -/** * qstring_is_equal(): Test whether the two QStrings are equal */
Signature · 1 line
2.26.2
PATCH 13/20 qobject: Drop qstring_get_try_str()
In reply to Markus ArmbrusterNo users left outside tests/, and the ones in tests/ can just as well use qstring_get_str(). Do that, and drop the function.
--- include/qapi/qmp/qstring.h | 1 - qobject/qstring.c | 10 ---------- tests/check-qjson.c | 11 +++++------ 3 files changed, 5 insertions(+), 17 deletions(-)
include/qapi/qmp/qstring.h +0 -1
@@ -28,7 +28,6 @@ QString *qstring_from_substr(const char *str, size_t start, size_t end);QString *qstring_from_gstring (GString *gstr);size_t qstring_get_length (const QString *qstring);const char *qstring_get_str (const QString *qstring); -const char *qstring_get_try_str (const QString *qstring);void qstring_append_int (QString *qstring,int64_t value);void qstring_append (QString *qstring,const char *str);void qstring_append_chr (QString *qstring,int c);
qobject/qstring.c +0 -10
@@ -139,16 +139,6 @@ const char *qstring_get_str(const QString *qstring)return qstring->string; } -/** -* qstring_get_try_str(): Return a pointer to the stored string -* -* NOTE: will return NULL if qstring is not provided. -*/ -const char *qstring_get_try_str (const QString *qstring) -{ -return qstring ?qstring_get_str (qstring) :NULL ; -} -/** * qstring_is_equal(): Test whether the two QStrings are equal */
tests/check-qjson.c +5 -6
@@ -89,7 +89,7 @@ static void escaped_string(void)for (j =0 ; j <2 ; j++) {if (test_cases[i].utf8_out) { cstr =from_json_str (test_cases[i].json_in, j, &error_abort); -g_assert_cmpstr (qstring_get_try_str (cstr), +g_assert_cmpstr (qstring_get_str (cstr), ==, test_cases[i].utf8_out);if (!test_cases[i].skip) { jstr =to_json_str (cstr);
@@ -751,7 +751,7 @@ static void utf8_string(void)/* Parse @json_in, expect @utf8_out */ if (utf8_out) { str =from_json_str (json_in, j, &error_abort); - g_assert_cmpstr(qstring_get_try_str(str), ==, utf8_out); + g_assert_cmpstr(qstring_get_str(str), ==, utf8_out);qobject_unref (str); }else { str =from_json_str (json_in, j,NULL );
@@ -782,7 +782,7 @@ static void utf8_string(void)/* Parse @json_out right back, unless it has replacements */ if (!strstr (json_out,"\\uFFFD" )) { str =from_json_str (json_out, j, &error_abort); - g_assert_cmpstr(qstring_get_try_str(str), ==, utf8_in); + g_assert_cmpstr(qstring_get_str(str), ==, utf8_in);qobject_unref (str); } }
@@ -1021,9 +1021,8 @@ static void interpolation_valid(void)/* string */ - qstr =qobject_to (QString, -qobject_from_jsonf_nofail ("%s" , value_s)); - g_assert_cmpstr(qstring_get_try_str(qstr), ==, value_s); + qstr =qobject_to (QString,qobject_from_jsonf_nofail ("%s" , value_s)); + g_assert_cmpstr(qstring_get_str(qstr), ==, value_s);qobject_unref (qstr);/* object */
Signature · 1 line
2.26.2
PATCH 14/20 qobject: Factor quoted_str() out of to_json()
In reply to Markus Armbruster--- qobject/qjson.c | 110 ++++++++++++++++++++++++------------------------ 1 file changed, 54 insertions(+), 56 deletions(-)
qobject/qjson.c +54 -56
@@ -156,6 +156,58 @@ static void json_pretty_newline(GString *accu, bool pretty, int indent) } } +static void quoted_str (const char *str,GString *accu) +{ +const char *ptr; +int cp; +char *end; + +g_string_append_c (accu,'"' ); + +for (ptr = str; *ptr; ptr = end) { + cp =mod_utf8_codepoint (ptr,6 , &end); +switch (cp) { +case '\"' : +g_string_append (accu,"\\\"" ); +break ; +case '\\' : +g_string_append (accu,"\\\\" ); +break ; +case '\b' : +g_string_append (accu,"\\b" ); +break ; +case '\f' : +g_string_append (accu,"\\f" ); +break ; +case '\n' : +g_string_append (accu,"\\n" ); +break ; +case '\r' : +g_string_append (accu,"\\r" ); +break ; +case '\t' : +g_string_append (accu,"\\t" ); +break ; +default : +if (cp <0 ) { + cp =0xFFFD ;/* replacement character */ + } +if (cp >0xFFFF ) { +/* beyond BMP; need a surrogate pair */ +g_string_append_printf (accu,"\\u%04X\\u%04X" , +0xD800 + ((cp -0x10000 ) >>10 ), +0xDC00 + ((cp -0x10000 ) &0x3FF )); + }else if (cp <0x20 || cp >=0x7F ) { +g_string_append_printf (accu,"\\u%04X" , cp); + }else { +g_string_append_c (accu, cp); + } + } + }; + +g_string_append_c (accu,'"' ); +} +static void to_json (const QObject *obj,GString *accu,bool pretty,int indent) {switch (qobject_type (obj)) {
@@ -170,56 +222,7 @@ static void to_json(const QObject *obj, GString *accu, bool pretty, int indent)break ; }case QTYPE_QSTRING : { -QString *val =qobject_to (QString, obj); -const char *ptr; -int cp; -char *end; - - ptr =qstring_get_str (val); -g_string_append_c (accu,'"' ); - -for (; *ptr; ptr = end) { - cp =mod_utf8_codepoint (ptr,6 , &end); -switch (cp) { -case '\"' : -g_string_append (accu,"\\\"" ); -break ; -case '\\' : -g_string_append (accu,"\\\\" ); -break ; -case '\b' : -g_string_append (accu,"\\b" ); -break ; -case '\f' : -g_string_append (accu,"\\f" ); -break ; -case '\n' : -g_string_append (accu,"\\n" ); -break ; -case '\r' : -g_string_append (accu,"\\r" ); -break ; -case '\t' : -g_string_append (accu,"\\t" ); -break ; -default : -if (cp <0 ) { - cp =0xFFFD ;/* replacement character */ - } -if (cp >0xFFFF ) { -/* beyond BMP; need a surrogate pair */ -g_string_append_printf (accu,"\\u%04X\\u%04X" , -0xD800 + ((cp -0x10000 ) >>10 ), -0xDC00 + ((cp -0x10000 ) &0x3FF )); - }else if (cp <0x20 || cp >=0x7F ) { -g_string_append_printf (accu,"\\u%04X" , cp); - }else { -g_string_append_c (accu, cp); - } - } - }; - -g_string_append_c (accu,'"' ); +quoted_str (qstring_get_str (qobject_to (QString, obj)), accu);break ; }case QTYPE_QDICT : {
@@ -227,7 +230,6 @@ static void to_json(const QObject *obj, GString *accu, bool pretty, int indent)const char *comma = pretty ?"," :", " ;const char *sep ="" ;const QDictEntry *entry; -QString *qkey;g_string_append_c (accu,'{' );
@@ -236,11 +238,7 @@ static void to_json(const QObject *obj, GString *accu, bool pretty, int indent) entry = qdict_next(val, entry)) {g_string_append (accu, sep);json_pretty_newline (accu, pretty, indent +1 ); - - qkey =qstring_from_str (qdict_entry_key (entry)); -to_json (QOBJECT (qkey), accu, pretty, indent +1 ); -qobject_unref (qkey); - +quoted_str (qdict_entry_key (entry), accu);g_string_append (accu,": " );to_json (qdict_entry_value (entry), accu, pretty, indent +1 ); sep = comma;
Signature · 1 line
2.26.2
PATCH 15/20 qobject: Factor JSON writer out of qobject_to_json()
In reply to Markus ArmbrusterWe have two JSON writers written in C: qobject/qjson.c provides qobject_to_json(), and migration/qjson.c provides a more low level imperative interface. They don't share code. The latter tacitly limits numbers to int64_t, and strings contents to characters that don't need escaping.
Factor out qobject_to_json()'s JSON writer as qobject/json-writer.c. Straightforward, except for numbers: since the writer is to be independent of QObject, it can't use qnum_to_string(). Open-code it instead. This is actually an improvement of sorts, because it liberates qnum_to_string() from JSON's needs: its JSON-related FIXMEs move to the JSON writer, where they belong.
The next commit will replace migration/qjson.c.
--- include/qapi/qmp/json-writer.h | 37 +++++ qobject/json-writer.c | 247 +++++++++++++++++++++++++++++++++ qobject/qjson.c | 125 +++++------------ qobject/qnum.c | 5 - qobject/meson.build | 5 +- 5 files changed, 318 insertions(+), 101 deletions(-) create mode 100644 include/qapi/qmp/json-writer.h create mode 100644 qobject/json-writer.c
include/qapi/qmp/json-writer.h new file +37 -0
@@ -0,0 +1,37 @@ +/* +* JSON Writer +* +* Copyright (c) 2020 Red Hat Inc. +* +* Authors: +* Markus Armbruster <[email protected]> +* +* This work is licensed under the terms of the GNU LGPL, version 2.1 or later. +* See the COPYING.LIB file in the top-level directory. +* +*/ + +#ifndef JSON_WRITER_H +#define JSON_WRITER_H + +typedef struct JSONWriter JSONWriter ; + +JSONWriter *json_writer_new (bool pretty); +const char *json_writer_get (JSONWriter *); +GString *json_writer_get_and_free (JSONWriter *); +void json_writer_free (JSONWriter *); + +G_DEFINE_AUTOPTR_CLEANUP_FUNC(JSONWriter, json_writer_free) + +void json_writer_start_object (JSONWriter *,const char *name); +void json_writer_end_object (JSONWriter *); +void json_writer_start_array (JSONWriter *,const char *name); +void json_writer_end_array (JSONWriter *); +void json_writer_bool (JSONWriter *,const char *name,bool val); +void json_writer_null (JSONWriter *,const char *name); +void json_writer_int64 (JSONWriter *,const char *name,int64_t val); +void json_writer_uint64 (JSONWriter *,const char *name,uint64_t val); +void json_writer_double (JSONWriter *,const char *name,double val); +void json_writer_str (JSONWriter *,const char *name,const char *str); + +#endif
qobject/json-writer.c new file +247 -0
247 lines not on this page · raw message
qobject/qjson.c +31 -94
186 lines not on this page · raw message
qobject/qnum.c +0 -5
@@ -168,11 +168,6 @@ char *qnum_to_string(QNum *qn)case QNUM_U64 :return g_strdup_printf ("%" PRIu64, qn->u.u64);case QNUM_DOUBLE : -/* FIXME: g_strdup_printf() is locale dependent; but JSON requires -* numbers to be formatted as if in the C locale. Dependence -* on C locale is a pervasive issue in QEMU. */ -/* FIXME: This risks printing Inf or NaN, which are not valid -* JSON values. */ /* 17 digits suffice for IEEE double */ return g_strdup_printf ("%.17g" , qn->u.dbl); }
qobject/meson.build +3 -2
@@ -1,3 +1,4 @@ -util_ss.add(files('qnull.c', 'qnum.c', 'qstring.c', 'qdict.c', 'qlist.c', 'qbool.c', - 'qlit.c', 'qjson.c', 'qobject.c', 'json-lexer.c', 'json-streamer.c', 'json-parser.c', +util_ss.add(files('qnull.c', 'qnum.c', 'qstring.c', 'qdict.c', + 'qlist.c', 'qbool.c', 'qlit.c', 'qjson.c', 'qobject.c', + 'json-writer.c', 'json-lexer.c', 'json-streamer.c', 'json-parser.c', 'block-qdict.c'))
Signature · 1 line
2.26.2
PATCH 16/20 migration: Replace migration's JSON writer by the general one
In reply to Markus ArmbrusterCommit 8118f0950f "migration: Append JSON description of migration stream" needs a JSON writer. The existing qobject_to_json() wasn't a good fit, because it requires building a QObject to convert. Instead, migration got its very own JSON writer, in commit 190c882ce2 "QJSON:
Add JSON writer". It tacitly limits numbers to int64_t, and strings contents to characters that don't need escaping, unlike qobject_to_json().
The previous commit factored the JSON writer out of qobject_to_json(). Replace migration's JSON writer by it.
--- include/migration/vmstate.h | 7 +- include/qapi/qmp/json-writer.h | 2 - include/qemu/typedefs.h | 4 +- migration/qjson.h | 29 --------- hw/display/virtio-gpu.c | 2 +- hw/intc/s390_flic_kvm.c | 2 +- hw/nvram/eeprom93xx.c | 2 +- hw/nvram/fw_cfg.c | 2 +- hw/pci/msix.c | 2 +- hw/pci/pci.c | 4 +- hw/pci/shpc.c | 2 +- hw/rtc/twl92230.c | 2 +- hw/scsi/scsi-bus.c | 2 +- hw/usb/redirect.c | 7 +- hw/virtio/virtio.c | 4 +- migration/qjson.c | 114 --------------------------------- migration/savevm.c | 53 +++++++-------- migration/vmstate-types.c | 38 +++++------ migration/vmstate.c | 52 +++++++-------- target/alpha/machine.c | 2 +- target/arm/machine.c | 6 +- target/avr/machine.c | 4 +- target/hppa/machine.c | 4 +- target/microblaze/machine.c | 2 +- target/mips/machine.c | 4 +- target/openrisc/machine.c | 2 +- target/ppc/machine.c | 10 +-- target/sparc/machine.c | 2 +- migration/meson.build | 1 - 29 files changed, 114 insertions(+), 253 deletions(-) delete mode 100644 migration/qjson.h delete mode 100644 migration/qjson.c
include/migration/vmstate.h +4 -3
@@ -43,7 +43,7 @@ struct VMStateInfo {const char *name;int (*get)(QEMUFile *f,void *pv,size_t size,const VMStateField *field);int (*put)(QEMUFile *f,void *pv,size_t size,const VMStateField *field, -QJSON *vmdesc); +JSONWriter *vmdesc); };enum VMStateFlags {
@@ -1169,9 +1169,10 @@ extern const VMStateInfo vmstate_info_qlist;int vmstate_load_state (QEMUFile *f,const VMStateDescription *vmsd,void *opaque,int version_id);int vmstate_save_state (QEMUFile *f,const VMStateDescription *vmsd, -void *opaque,QJSON *vmdesc); +void *opaque,JSONWriter *vmdesc);int vmstate_save_state_v (QEMUFile *f,const VMStateDescription *vmsd, -void *opaque,QJSON *vmdesc,int version_id); +void *opaque,JSONWriter *vmdesc, +int version_id);bool vmstate_save_needed (const VMStateDescription *vmsd,void *opaque);
include/qapi/qmp/json-writer.h +0 -2
@@ -14,8 +14,6 @@#ifndef JSON_WRITER_H #define JSON_WRITER_H -typedef struct JSONWriter JSONWriter ; -JSONWriter *json_writer_new (bool pretty);const char *json_writer_get (JSONWriter *);GString *json_writer_get_and_free (JSONWriter *);
include/qemu/typedefs.h +2 -2
@@ -57,8 +57,8 @@ typedef struct IOMMUMemoryRegion IOMMUMemoryRegion;typedef struct ISABus ISABus ;typedef struct ISADevice ISADevice ;typedef struct IsaDma IsaDma ; +typedef struct JSONWriter JSONWriter ;typedef struct MACAddr MACAddr ; -typedef struct ReservedRegion ReservedRegion ;typedef struct MachineClass MachineClass ;typedef struct MachineState MachineState ;typedef struct MemoryListener MemoryListener ;
@@ -107,7 +107,6 @@ typedef struct QEMUSGList QEMUSGList;typedef struct QemuSpin QemuSpin ;typedef struct QEMUTimer QEMUTimer ;typedef struct QEMUTimerListGroup QEMUTimerListGroup ; -typedef struct QJSON QJSON ;typedef struct QList QList ;typedef struct QNull QNull ;typedef struct QNum QNum ;
@@ -115,6 +114,7 @@ typedef struct QObject QObject;typedef struct QString QString ;typedef struct RAMBlock RAMBlock ;typedef struct Range Range ; +typedef struct ReservedRegion ReservedRegion ;typedef struct SavedIOTLB SavedIOTLB ;typedef struct SHPCDevice SHPCDevice ;typedef struct SSIBus SSIBus ;
migration/qjson.h deleted +0 -29
@@ -1,29 +0,0 @@ -/* -* QEMU JSON writer -* -* Copyright Alexander Graf -* -* Authors: -* Alexander Graf <[email protected]> -* -* This work is licensed under the terms of the GNU LGPL, version 2.1 or later. -* See the COPYING.LIB file in the top-level directory. -* -*/ -#ifndef QEMU_QJSON_H -#define QEMU_QJSON_H - -QJSON *qjson_new (void ); -void qjson_destroy (QJSON *json); -void json_prop_str (QJSON *json,const char *name,const char *str); -void json_prop_int (QJSON *json,const char *name,int64_t val); -void json_end_array (QJSON *json); -void json_start_array (QJSON *json,const char *name); -void json_end_object (QJSON *json); -void json_start_object (QJSON *json,const char *name); -const char *qjson_get_str (QJSON *json); -void qjson_finish (QJSON *json); - -G_DEFINE_AUTOPTR_CLEANUP_FUNC(QJSON, qjson_destroy) - -#endif /* QEMU_QJSON_H */
hw/display/virtio-gpu.c +1 -1
@@ -970,7 +970,7 @@ static const VMStateDescription vmstate_virtio_gpu_scanouts = { };static int virtio_gpu_save (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {VirtIOGPU *g = opaque;struct virtio_gpu_simple_resource *res;
hw/intc/s390_flic_kvm.c +1 -1
@@ -386,7 +386,7 @@ static void kvm_s390_release_adapter_routes(S390FLICState *fs,* reached */ static int kvm_flic_save (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {KVMS390FLICState *flic = opaque;int len =FLIC_SAVE_INITIAL_SIZE ;
hw/nvram/eeprom93xx.c +1 -1
@@ -104,7 +104,7 @@ static int get_uint16_from_uint8(QEMUFile *f, void *pv, size_t size, }static int put_unused (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {fprintf (stderr,"uint16_from_uint8 is used only for backwards compatibility.\n" );fprintf (stderr,"Never should be used to write a new state.\n" );
hw/nvram/fw_cfg.c +1 -1
@@ -582,7 +582,7 @@ static int get_uint32_as_uint16(QEMUFile *f, void *pv, size_t size, }static int put_unused (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {fprintf (stderr,"uint32_as_uint16 is only used for backward compatibility.\n" );fprintf (stderr,"This functions shouldn't be called.\n" );
hw/pci/msix.c +1 -1
@@ -631,7 +631,7 @@ void msix_unset_vector_notifiers(PCIDevice *dev) }static int put_msix_state (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {msix_save (pv, f);
hw/pci/pci.c +2 -2
@@ -558,7 +558,7 @@ static int get_pci_config_device(QEMUFile *f, void *pv, size_t size,/* just put buffer */ static int put_pci_config_device (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {const uint8_t **v = pv;assert (size ==pci_config_size (container_of (pv, PCIDevice, config)));
@@ -596,7 +596,7 @@ static int get_pci_irq_state(QEMUFile *f, void *pv, size_t size, }static int put_pci_irq_state (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {int i;PCIDevice *s =container_of (pv, PCIDevice, irq_state);
hw/pci/shpc.c +1 -1
@@ -699,7 +699,7 @@ void shpc_cap_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) }static int shpc_save (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {PCIDevice *d =container_of (pv, PCIDevice, shpc);qemu_put_buffer (f, d->shpc->config,SHPC_SIZEOF (d));
hw/rtc/twl92230.c +1 -1
@@ -762,7 +762,7 @@ static int get_int32_as_uint16(QEMUFile *f, void *pv, size_t size, }static int put_int32_as_uint16 (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {int *v = pv;qemu_put_be16 (f, *v);
hw/scsi/scsi-bus.c +1 -1
@@ -1634,7 +1634,7 @@ static char *scsibus_get_fw_dev_path(DeviceState *dev)/* SCSI request list. For simplicity, pv points to the whole device */ static int put_scsi_requests (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {SCSIDevice *s = pv;SCSIBus *bus =DO_UPCAST (SCSIBus, qbus, s->qdev.parent_bus);
hw/usb/redirect.c +4 -3
@@ -2227,7 +2227,7 @@ static int usbredir_post_load(void *priv, int version_id)/* For usbredirparser migration */ static int usbredir_put_parser (QEMUFile *f,void *priv,size_t unused, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {USBRedirDevice *dev = priv;uint8_t *data;
@@ -2294,7 +2294,7 @@ static const VMStateInfo usbredir_parser_vmstate_info = {/* For buffered packets (iso/irq) queue migration */ static int usbredir_put_bufpq (QEMUFile *f,void *priv,size_t unused, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {struct endp_data *endp = priv;USBRedirDevice *dev = endp->dev;
@@ -2421,7 +2421,8 @@ static const VMStateDescription usbredir_ep_vmstate = {/* For PacketIdQueue migration */ static int usbredir_put_packet_id_q (QEMUFile *f,void *priv,size_t unused, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field, +JSONWriter *vmdesc) {struct PacketIdQueue *q = priv;USBRedirDevice *dev = q->dev;
hw/virtio/virtio.c +2 -2
@@ -2745,7 +2745,7 @@ static int get_extra_state(QEMUFile *f, void *pv, size_t size, }static int put_extra_state (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {VirtIODevice *vdev = pv;BusState *qbus =qdev_get_parent_bus (DEVICE (vdev));
@@ -2919,7 +2919,7 @@ int virtio_save(VirtIODevice *vdev, QEMUFile *f)/* A wrapper for use as a VMState .put function */ static int virtio_device_put (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {return virtio_save (VIRTIO_DEVICE (opaque), f); }
migration/qjson.c deleted +0 -114
114 lines not on this page · raw message
migration/savevm.c +28 -25
124 lines not on this page · raw message
migration/vmstate-types.c +19 -19
@@ -29,7 +29,7 @@ static int get_bool(QEMUFile *f, void *pv, size_t size, }static int put_bool (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {bool *v = pv;qemu_put_byte (f, *v);
@@ -53,7 +53,7 @@ static int get_int8(QEMUFile *f, void *pv, size_t size, }static int put_int8 (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {int8_t *v = pv;qemu_put_s8s (f, v);
@@ -77,7 +77,7 @@ static int get_int16(QEMUFile *f, void *pv, size_t size, }static int put_int16 (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {int16_t *v = pv;qemu_put_sbe16s (f, v);
@@ -101,7 +101,7 @@ static int get_int32(QEMUFile *f, void *pv, size_t size, }static int put_int32 (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {int32_t *v = pv;qemu_put_sbe32s (f, v);
@@ -178,7 +178,7 @@ static int get_int64(QEMUFile *f, void *pv, size_t size, }static int put_int64 (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {int64_t *v = pv;qemu_put_sbe64s (f, v);
@@ -202,7 +202,7 @@ static int get_uint8(QEMUFile *f, void *pv, size_t size, }static int put_uint8 (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {uint8_t *v = pv;qemu_put_8s (f, v);
@@ -226,7 +226,7 @@ static int get_uint16(QEMUFile *f, void *pv, size_t size, }static int put_uint16 (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {uint16_t *v = pv;qemu_put_be16s (f, v);
@@ -250,7 +250,7 @@ static int get_uint32(QEMUFile *f, void *pv, size_t size, }static int put_uint32 (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {uint32_t *v = pv;qemu_put_be32s (f, v);
@@ -300,7 +300,7 @@ static int get_uint64(QEMUFile *f, void *pv, size_t size, }static int put_uint64 (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {uint64_t *v = pv;qemu_put_be64s (f, v);
@@ -325,7 +325,7 @@ static int get_nullptr(QEMUFile *f, void *pv, size_t size, }static int put_nullptr (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {if (pv ==NULL ) {
@@ -432,7 +432,7 @@ static int get_cpudouble(QEMUFile *f, void *pv, size_t size, }static int put_cpudouble (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {CPU_DoubleU *v = pv;qemu_put_be32s (f, &v->l.upper);
@@ -457,7 +457,7 @@ static int get_buffer(QEMUFile *f, void *pv, size_t size, }static int put_buffer (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {uint8_t *v = pv;qemu_put_buffer (f, v, size);
@@ -488,7 +488,7 @@ static int get_unused_buffer(QEMUFile *f, void *pv, size_t size, }static int put_unused_buffer (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {static const uint8_t buf[1024 ];int block_len;
@@ -530,7 +530,7 @@ static int get_tmp(QEMUFile *f, void *pv, size_t size, }static int put_tmp (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {const VMStateDescription *vmsd = field->vmsd;void *tmp =g_malloc (size);
@@ -573,7 +573,7 @@ static int get_bitmap(QEMUFile *f, void *pv, size_t size, }static int put_bitmap (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {unsigned long *bmp = pv;int i, idx =0 ;
@@ -637,7 +637,7 @@ static int get_qtailq(QEMUFile *f, void *pv, size_t unused_size,/* put for QTAILQ */ static int put_qtailq (QEMUFile *f,void *pv,size_t unused_size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {const VMStateDescription *vmsd = field->vmsd;/* offset of the QTAILQ entry in a QTAILQ element*/
@@ -670,7 +670,7 @@ struct put_gtree_data {QEMUFile *f;const VMStateDescription *key_vmsd;const VMStateDescription *val_vmsd; -QJSON *vmdesc; +JSONWriter *vmdesc;int ret; };
@@ -703,7 +703,7 @@ static gboolean put_gtree_elem(gpointer key, gpointer value, gpointer data) }static int put_gtree (QEMUFile *f,void *pv,size_t unused_size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {bool direct_key = (!field->start);const VMStateDescription *key_vmsd = direct_key ?NULL : &field->vmsd[1 ];
@@ -819,7 +819,7 @@ const VMStateInfo vmstate_info_gtree = { };static int put_qlist (QEMUFile *f,void *pv,size_t unused_size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {const VMStateDescription *vmsd = field->vmsd;/* offset of the QTAILQ entry in a QTAILQ element*/
migration/vmstate.c +27 -25
152 lines not on this page · raw message
target/alpha/machine.c +1 -1
@@ -11,7 +11,7 @@ static int get_fpcr(QEMUFile *f, void *opaque, size_t size, }static int put_fpcr (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {CPUAlphaState *env = opaque;qemu_put_be64 (f,cpu_alpha_load_fpcr (env));
target/arm/machine.c +3 -3
@@ -27,7 +27,7 @@ static int get_fpscr(QEMUFile *f, void *opaque, size_t size, }static int put_fpscr (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {ARMCPU *cpu = opaque;CPUARMState *env = &cpu->env;
@@ -573,7 +573,7 @@ static int get_cpsr(QEMUFile *f, void *opaque, size_t size, }static int put_cpsr (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {ARMCPU *cpu = opaque;CPUARMState *env = &cpu->env;
@@ -608,7 +608,7 @@ static int get_power(QEMUFile *f, void *opaque, size_t size, }static int put_power (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {ARMCPU *cpu = opaque;
target/avr/machine.c +2 -2
@@ -34,7 +34,7 @@ static int get_sreg(QEMUFile *f, void *opaque, size_t size, }static int put_sreg (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {CPUAVRState *env = opaque;uint8_t sreg =cpu_get_sreg (env);
@@ -61,7 +61,7 @@ static int get_segment(QEMUFile *f, void *opaque, size_t size, }static int put_segment (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {uint32_t *ramp = opaque;uint8_t temp = *ramp >>16 ;
target/hppa/machine.c +2 -2
@@ -52,7 +52,7 @@ static int get_psw(QEMUFile *f, void *opaque, size_t size, }static int put_psw (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {CPUHPPAState *env = opaque;qemu_put_betr (f,cpu_hppa_get_psw (env));
@@ -93,7 +93,7 @@ static int get_tlb(QEMUFile *f, void *opaque, size_t size, }static int put_tlb (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {hppa_tlb_entry *ent = opaque;uint32_t val =0 ;
target/microblaze/machine.c +1 -1
@@ -46,7 +46,7 @@ static int get_msr(QEMUFile *f, void *opaque, size_t size, }static int put_msr (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {CPUMBState *env =container_of (opaque, CPUMBState, msr);
target/mips/machine.c +2 -2
@@ -31,7 +31,7 @@ static int get_fpr(QEMUFile *f, void *pv, size_t size, }static int put_fpr (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {int i;fpr_t *v = pv;
@@ -156,7 +156,7 @@ static int get_tlb(QEMUFile *f, void *pv, size_t size, }static int put_tlb (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {r4k_tlb_t *v = pv;
target/openrisc/machine.c +1 -1
@@ -55,7 +55,7 @@ static int get_sr(QEMUFile *f, void *opaque, size_t size, }static int put_sr (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {CPUOpenRISCState *env = opaque;qemu_put_be32 (f,cpu_get_sr (env));
target/ppc/machine.c +5 -5
@@ -134,7 +134,7 @@ static int get_avr(QEMUFile *f, void *pv, size_t size, }static int put_avr (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {ppc_avr_t *v = pv;
@@ -166,7 +166,7 @@ static int get_fpr(QEMUFile *f, void *pv, size_t size, }static int put_fpr (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {ppc_vsr_t *v = pv;
@@ -197,7 +197,7 @@ static int get_vsr(QEMUFile *f, void *pv, size_t size, }static int put_vsr (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {ppc_vsr_t *v = pv;
@@ -455,7 +455,7 @@ static int get_vscr(QEMUFile *f, void *opaque, size_t size, }static int put_vscr (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {PowerPCCPU *cpu = opaque;qemu_put_be32 (f,helper_mfvscr (&cpu->env));
@@ -580,7 +580,7 @@ static int get_slbe(QEMUFile *f, void *pv, size_t size, }static int put_slbe (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {ppc_slb_t *v = pv;
target/sparc/machine.c +1 -1
@@ -68,7 +68,7 @@ static int get_psr(QEMUFile *f, void *opaque, size_t size, }static int put_psr (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {SPARCCPU *cpu = opaque;CPUSPARCState *env = &cpu->env;
migration/meson.build +0 -1
@@ -6,7 +6,6 @@ migration_files = files( 'vmstate.c', 'qemu-file-channel.c', 'qemu-file.c', - 'qjson.c', ) softmmu_ss.add(migration_files)
Signature · 1 line
2.26.2
Re: [PATCH 16/20] migration: Replace migration's JSON writer by the general one
Quoted 8 lines · * Markus Armbruster ([email protected]) wrote:
Commit
8118f0950f"migration: Append JSON description of migration stream" needs a JSON writer. The existingqobject_to_json()wasn't a good fit, because it requires building a QObject to convert. Instead, migration got its very own JSON writer, in commit190c882ce2"QJSON:
Add JSON writer". It tacitly limits numbers toint64_t, and strings contents to characters that don't need escaping, unlikeqobject_to_json().
Quoted 6 lines
The previous commit factored the JSON writer out of
qobject_to_json(). Replace migration's JSON writer by it.Cc Juan Quintela <[email protected]>Cc Dr. David Alan Gilbert <[email protected]>Signed-off-by Markus Armbruster <[email protected]>
(Copying in Alex)
This looks OK to me, so:
but, can I just check, have you checked scripts/analyze-migration.py is still happy with the output?
Dave
Quoted 1,131 lines
--- include/migration/vmstate.h | 7 +- include/qapi/qmp/json-writer.h | 2 - include/qemu/typedefs.h | 4 +- migration/qjson.h | 29 --------- hw/display/virtio-gpu.c | 2 +- hw/intc/s390_flic_kvm.c | 2 +- hw/nvram/eeprom93xx.c | 2 +- hw/nvram/fw_cfg.c | 2 +- hw/pci/msix.c | 2 +- hw/pci/pci.c | 4 +- hw/pci/shpc.c | 2 +- hw/rtc/twl92230.c | 2 +- hw/scsi/scsi-bus.c | 2 +- hw/usb/redirect.c | 7 +- hw/virtio/virtio.c | 4 +- migration/qjson.c | 114 --------------------------------- migration/savevm.c | 53 +++++++-------- migration/vmstate-types.c | 38 +++++------ migration/vmstate.c | 52 +++++++-------- target/alpha/machine.c | 2 +- target/arm/machine.c | 6 +- target/avr/machine.c | 4 +- target/hppa/machine.c | 4 +- target/microblaze/machine.c | 2 +- target/mips/machine.c | 4 +- target/openrisc/machine.c | 2 +- target/ppc/machine.c | 10 +-- target/sparc/machine.c | 2 +- migration/meson.build | 1 - 29 files changed, 114 insertions(+), 253 deletions(-) delete mode 100644 migration/qjson.h delete mode 100644 migration/qjson.cinclude/migration/vmstate.h +4
-3@@ -43,7 +43,7 @@ struct VMStateInfo {const char *name;int (*get)(QEMUFile *f,void *pv,size_t size,const VMStateField *field);int (*put)(QEMUFile *f,void *pv,size_t size,const VMStateField *field, -QJSON *vmdesc); +JSONWriter *vmdesc); };enum VMStateFlags {@@ -1169,9 +1169,10 @@ extern const VMStateInfo vmstate_info_qlist;int vmstate_load_state (QEMUFile *f,const VMStateDescription *vmsd,void *opaque,int version_id);int vmstate_save_state (QEMUFile *f,const VMStateDescription *vmsd, -void *opaque,QJSON *vmdesc); +void *opaque,JSONWriter *vmdesc);int vmstate_save_state_v (QEMUFile *f,const VMStateDescription *vmsd, -void *opaque,QJSON *vmdesc,int version_id); +void *opaque,JSONWriter *vmdesc, +int version_id);bool vmstate_save_needed (const VMStateDescription *vmsd,void *opaque);include/qapi/qmp/json-writer.h +0
-2@@ -14,8 +14,6 @@#ifndef JSON_WRITER_H #define JSON_WRITER_H -typedef struct JSONWriter JSONWriter ; -JSONWriter *json_writer_new (bool pretty);const char *json_writer_get (JSONWriter *);GString *json_writer_get_and_free (JSONWriter *);include/qemu/typedefs.h +2
-2@@ -57,8 +57,8 @@ typedef struct IOMMUMemoryRegion IOMMUMemoryRegion;typedef struct ISABus ISABus ;typedef struct ISADevice ISADevice ;typedef struct IsaDma IsaDma ; +typedef struct JSONWriter JSONWriter ;typedef struct MACAddr MACAddr ; -typedef struct ReservedRegion ReservedRegion ;typedef struct MachineClass MachineClass ;typedef struct MachineState MachineState ;typedef struct MemoryListener MemoryListener ;@@ -107,7 +107,6 @@ typedef struct QEMUSGList QEMUSGList;typedef struct QemuSpin QemuSpin ;typedef struct QEMUTimer QEMUTimer ;typedef struct QEMUTimerListGroup QEMUTimerListGroup ; -typedef struct QJSON QJSON ;typedef struct QList QList ;typedef struct QNull QNull ;typedef struct QNum QNum ;@@ -115,6 +114,7 @@ typedef struct QObject QObject;typedef struct QString QString ;typedef struct RAMBlock RAMBlock ;typedef struct Range Range ; +typedef struct ReservedRegion ReservedRegion ;typedef struct SavedIOTLB SavedIOTLB ;typedef struct SHPCDevice SHPCDevice ;typedef struct SSIBus SSIBus ;migration/qjson.h deleted +0
-29@@ -1,29 +0,0 @@ -/* -* QEMU JSON writer -* -* Copyright Alexander Graf -* -* Authors: -* Alexander Graf <[email protected]> -* -* This work is licensed under the terms of the GNU LGPL, version 2.1 or later. -* See the COPYING.LIB file in the top-level directory. -* -*/ -#ifndef QEMU_QJSON_H -#define QEMU_QJSON_H - -QJSON *qjson_new (void ); -void qjson_destroy (QJSON *json); -void json_prop_str (QJSON *json,const char *name,const char *str); -void json_prop_int (QJSON *json,const char *name,int64_t val); -void json_end_array (QJSON *json); -void json_start_array (QJSON *json,const char *name); -void json_end_object (QJSON *json); -void json_start_object (QJSON *json,const char *name); -const char *qjson_get_str (QJSON *json); -void qjson_finish (QJSON *json); - -G_DEFINE_AUTOPTR_CLEANUP_FUNC(QJSON, qjson_destroy) - -#endif /* QEMU_QJSON_H */ hw/display/virtio-gpu.c +1
-1@@ -970,7 +970,7 @@ static const VMStateDescription vmstate_virtio_gpu_scanouts = { };static int virtio_gpu_save (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {VirtIOGPU *g = opaque;struct virtio_gpu_simple_resource *res;hw/intc/s390_flic_kvm.c +1
-1@@ -386,7 +386,7 @@ static void kvm_s390_release_adapter_routes(S390FLICState *fs,* reached */ static int kvm_flic_save (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {KVMS390FLICState *flic = opaque;int len =FLIC_SAVE_INITIAL_SIZE ;hw/nvram/eeprom93xx.c +1
-1@@ -104,7 +104,7 @@ static int get_uint16_from_uint8(QEMUFile *f, void *pv, size_t size, }static int put_unused (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {fprintf (stderr,"uint16_from_uint8 is used only for backwards compatibility.\n" );fprintf (stderr,"Never should be used to write a new state.\n" );hw/nvram/fw_cfg.c +1
-1@@ -582,7 +582,7 @@ static int get_uint32_as_uint16(QEMUFile *f, void *pv, size_t size, }static int put_unused (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {fprintf (stderr,"uint32_as_uint16 is only used for backward compatibility.\n" );fprintf (stderr,"This functions shouldn't be called.\n" );hw/pci/msix.c +1
-1@@ -631,7 +631,7 @@ void msix_unset_vector_notifiers(PCIDevice *dev) }static int put_msix_state (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {msix_save (pv, f);hw/pci/pci.c +2
-2@@ -558,7 +558,7 @@ static int get_pci_config_device(QEMUFile *f, void *pv, size_t size,/* just put buffer */ static int put_pci_config_device (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {const uint8_t **v = pv;assert (size ==pci_config_size (container_of (pv, PCIDevice, config)));@@ -596,7 +596,7 @@ static int get_pci_irq_state(QEMUFile *f, void *pv, size_t size, }static int put_pci_irq_state (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {int i;PCIDevice *s =container_of (pv, PCIDevice, irq_state);hw/pci/shpc.c +1
-1@@ -699,7 +699,7 @@ void shpc_cap_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) }static int shpc_save (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {PCIDevice *d =container_of (pv, PCIDevice, shpc);qemu_put_buffer (f, d->shpc->config,SHPC_SIZEOF (d));hw/rtc/twl92230.c +1
-1@@ -762,7 +762,7 @@ static int get_int32_as_uint16(QEMUFile *f, void *pv, size_t size, }static int put_int32_as_uint16 (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {int *v = pv;qemu_put_be16 (f, *v);hw/scsi/scsi-bus.c +1
-1@@ -1634,7 +1634,7 @@ static char *scsibus_get_fw_dev_path(DeviceState *dev)/* SCSI request list. For simplicity, pv points to the whole device */ static int put_scsi_requests (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {SCSIDevice *s = pv;SCSIBus *bus =DO_UPCAST (SCSIBus, qbus, s->qdev.parent_bus);hw/usb/redirect.c +4
-3@@ -2227,7 +2227,7 @@ static int usbredir_post_load(void *priv, int version_id)/* For usbredirparser migration */ static int usbredir_put_parser (QEMUFile *f,void *priv,size_t unused, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {USBRedirDevice *dev = priv;uint8_t *data;@@ -2294,7 +2294,7 @@ static const VMStateInfo usbredir_parser_vmstate_info = {/* For buffered packets (iso/irq) queue migration */ static int usbredir_put_bufpq (QEMUFile *f,void *priv,size_t unused, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {struct endp_data *endp = priv;USBRedirDevice *dev = endp->dev;@@ -2421,7 +2421,8 @@ static const VMStateDescription usbredir_ep_vmstate = {/* For PacketIdQueue migration */ static int usbredir_put_packet_id_q (QEMUFile *f,void *priv,size_t unused, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field, +JSONWriter *vmdesc) {struct PacketIdQueue *q = priv;USBRedirDevice *dev = q->dev;hw/virtio/virtio.c +2
-2@@ -2745,7 +2745,7 @@ static int get_extra_state(QEMUFile *f, void *pv, size_t size, }static int put_extra_state (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {VirtIODevice *vdev = pv;BusState *qbus =qdev_get_parent_bus (DEVICE (vdev));@@ -2919,7 +2919,7 @@ int virtio_save(VirtIODevice *vdev, QEMUFile *f)/* A wrapper for use as a VMState .put function */ static int virtio_device_put (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {return virtio_save (VIRTIO_DEVICE (opaque), f); }migration/qjson.c deleted +0
-114@@ -1,114 +0,0 @@ -/* -* A simple JSON writer -* -* Copyright Alexander Graf -* -* Authors: -* Alexander Graf <[email protected]> -* -* This work is licensed under the terms of the GNU LGPL, version 2.1 or later. -* See the COPYING.LIB file in the top-level directory. -* -*/ - -/* -* Type QJSON lets you build JSON text. Its interface mirrors (a -* subset of) abstract JSON syntax. -* -* It does *not* detect incorrect use. It happily produces invalid -* JSON then. This is what migration wants. -* -* QAPI output visitors also produce JSON text. However, they do -* assert their preconditions and invariants, and therefore abort on -* incorrect use. -*/ - -#include "qemu/osdep.h" -#include "qapi/qmp/qstring.h" -#include "qjson.h" - -struct QJSON { -QString *str; -bool omit_comma; -}; - -static void json_emit_element (QJSON *json,const char *name) -{ -/* Check whether we need to print a , before an element */ -if (json->omit_comma) { - json->omit_comma = false; - }else { -qstring_append (json->str,", " ); - } - -if (name) { -qstring_append (json->str,"\"" ); -qstring_append (json->str, name); -qstring_append (json->str,"\" : " ); - } -} - -void json_start_object (QJSON *json,const char *name) -{ -json_emit_element (json, name); -qstring_append (json->str,"{ " ); - json->omit_comma = true; -} - -void json_end_object (QJSON *json) -{ -qstring_append (json->str," }" ); - json->omit_comma = false; -} - -void json_start_array (QJSON *json,const char *name) -{ -json_emit_element (json, name); -qstring_append (json->str,"[ " ); - json->omit_comma = true; -} - -void json_end_array (QJSON *json) -{ -qstring_append (json->str," ]" ); - json->omit_comma = false; -} - -void json_prop_int (QJSON *json,const char *name,int64_t val) -{ -json_emit_element (json, name); -qstring_append_int (json->str, val); -} - -void json_prop_str (QJSON *json,const char *name,const char *str) -{ -json_emit_element (json, name); -qstring_append_chr (json->str,'"' ); -qstring_append (json->str, str); -qstring_append_chr (json->str,'"' ); -} - -const char *qjson_get_str (QJSON *json) -{ -return qstring_get_str (json->str); -} - -QJSON *qjson_new (void ) -{ -QJSON *json =g_new0 (QJSON ,1 ); - - json->str =qstring_from_str ("{ " ); - json->omit_comma = true; -return json; -} - -void qjson_finish (QJSON *json) -{ -json_end_object (json); -} - -void qjson_destroy (QJSON *json) -{ -qobject_unref (json->str); -g_free (json); -}migration/savevm.c +28
-25@@ -42,6 +42,7 @@#include "postcopy-ram.h" #include "qapi/error.h" #include "qapi/qapi-commands-migration.h" +#include "qapi/qmp/json-writer.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "sysemu/cpus.h" @@ -58,7 +59,6 @@#include "sysemu/runstate.h" #include "sysemu/sysemu.h" #include "sysemu/xen.h" -#include "qjson.h" #include "migration/colo.h" #include "qemu/bitmap.h" #include "net/announce.h" @@ -209,7 +209,7 @@ static int get_timer(QEMUFile *f, void *pv, size_t size, }static int put_timer (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {QEMUTimer *v = pv;timer_put (f, v);@@ -406,7 +406,7 @@ static int get_capability(QEMUFile *f, void *pv, size_t size, }static int put_capability (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {MigrationCapability *capability = pv;const char *capability_str =MigrationCapability_str (*capability);@@ -884,7 +884,8 @@ static int vmstate_load(QEMUFile *f, SaveStateEntry *se)return vmstate_load_state (f, se->vmsd, se->opaque, se->load_version_id); } -static void vmstate_save_old_style (QEMUFile *f,SaveStateEntry *se,QJSON *vmdesc) +static void vmstate_save_old_style (QEMUFile *f,SaveStateEntry *se, +JSONWriter *vmdesc) {int64_t old_offset, size;@@ -893,18 +894,19 @@ static void vmstate_save_old_style(QEMUFile *f, SaveStateEntry *se, QJSON *vmdes size =qemu_ftell_fast (f) - old_offset;if (vmdesc) { -json_prop_int (vmdesc,"size" , size); -json_start_array (vmdesc,"fields" ); -json_start_object (vmdesc,NULL ); -json_prop_str (vmdesc,"name" ,"data" ); -json_prop_int (vmdesc,"size" , size); -json_prop_str (vmdesc,"type" ,"buffer" ); -json_end_object (vmdesc); -json_end_array (vmdesc); +json_writer_int64 (vmdesc,"size" , size); +json_writer_start_array (vmdesc,"fields" ); +json_writer_start_object (vmdesc,NULL ); +json_writer_str (vmdesc,"name" ,"data" ); +json_writer_int64 (vmdesc,"size" , size); +json_writer_str (vmdesc,"type" ,"buffer" ); +json_writer_end_object (vmdesc); +json_writer_end_array (vmdesc); } } -static int vmstate_save (QEMUFile *f,SaveStateEntry *se,QJSON *vmdesc) +static int vmstate_save (QEMUFile *f,SaveStateEntry *se, +JSONWriter *vmdesc) {trace_vmstate_save (se->idstr, se->vmsd ? se->vmsd->name :"(old)" );if (!se->vmsd) {@@ -1357,14 +1359,15 @@ int qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f,bool in_postcopy, bool inactivate_disks) { -g_autoptr (QJSON ) vmdesc =NULL ; +g_autoptr (JSONWriter ) vmdesc =NULL ;int vmdesc_len;SaveStateEntry *se;int ret; - vmdesc =qjson_new (); -json_prop_int (vmdesc,"page_size" ,qemu_target_page_size ()); -json_start_array (vmdesc,"devices" ); + vmdesc =json_writer_new (false); +json_writer_start_object (vmdesc,NULL ); +json_writer_int64 (vmdesc,"page_size" ,qemu_target_page_size ()); +json_writer_start_array (vmdesc,"devices" ); QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {if ((!se->ops || !se->ops->save_state) && !se->vmsd) {@@ -1377,9 +1380,9 @@ int qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f,trace_savevm_section_start (se->idstr, se->section_id); -json_start_object (vmdesc,NULL ); -json_prop_str (vmdesc,"name" , se->idstr); -json_prop_int (vmdesc,"instance_id" , se->instance_id); +json_writer_start_object (vmdesc,NULL ); +json_writer_str (vmdesc,"name" , se->idstr); +json_writer_int64 (vmdesc,"instance_id" , se->instance_id);save_section_header (f, se,QEMU_VM_SECTION_FULL ); ret =vmstate_save (f, se, vmdesc);@@ -1390,7 +1393,7 @@ int qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f,trace_savevm_section_end (se->idstr, se->section_id,0 );save_section_footer (f, se); -json_end_object (vmdesc); +json_writer_end_object (vmdesc); }if (inactivate_disks) {@@ -1409,14 +1412,14 @@ int qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f,qemu_put_byte (f,QEMU_VM_EOF ); } -json_end_array (vmdesc); -qjson_finish (vmdesc); - vmdesc_len =strlen (qjson_get_str (vmdesc)); +json_writer_end_array (vmdesc); +json_writer_end_object (vmdesc); + vmdesc_len =strlen (json_writer_get (vmdesc));if (should_send_vmdesc ()) {qemu_put_byte (f,QEMU_VM_VMDESCRIPTION );qemu_put_be32 (f, vmdesc_len); -qemu_put_buffer (f, (uint8_t *)qjson_get_str (vmdesc), vmdesc_len); +qemu_put_buffer (f, (uint8_t *)json_writer_get (vmdesc), vmdesc_len); }return 0 ;migration/vmstate-types.c +19
-19@@ -29,7 +29,7 @@ static int get_bool(QEMUFile *f, void *pv, size_t size, }static int put_bool (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {bool *v = pv;qemu_put_byte (f, *v);@@ -53,7 +53,7 @@ static int get_int8(QEMUFile *f, void *pv, size_t size, }static int put_int8 (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {int8_t *v = pv;qemu_put_s8s (f, v);@@ -77,7 +77,7 @@ static int get_int16(QEMUFile *f, void *pv, size_t size, }static int put_int16 (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {int16_t *v = pv;qemu_put_sbe16s (f, v);@@ -101,7 +101,7 @@ static int get_int32(QEMUFile *f, void *pv, size_t size, }static int put_int32 (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {int32_t *v = pv;qemu_put_sbe32s (f, v);@@ -178,7 +178,7 @@ static int get_int64(QEMUFile *f, void *pv, size_t size, }static int put_int64 (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {int64_t *v = pv;qemu_put_sbe64s (f, v);@@ -202,7 +202,7 @@ static int get_uint8(QEMUFile *f, void *pv, size_t size, }static int put_uint8 (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {uint8_t *v = pv;qemu_put_8s (f, v);@@ -226,7 +226,7 @@ static int get_uint16(QEMUFile *f, void *pv, size_t size, }static int put_uint16 (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {uint16_t *v = pv;qemu_put_be16s (f, v);@@ -250,7 +250,7 @@ static int get_uint32(QEMUFile *f, void *pv, size_t size, }static int put_uint32 (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {uint32_t *v = pv;qemu_put_be32s (f, v);@@ -300,7 +300,7 @@ static int get_uint64(QEMUFile *f, void *pv, size_t size, }static int put_uint64 (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {uint64_t *v = pv;qemu_put_be64s (f, v);@@ -325,7 +325,7 @@ static int get_nullptr(QEMUFile *f, void *pv, size_t size, }static int put_nullptr (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {if (pv ==NULL ) {@@ -432,7 +432,7 @@ static int get_cpudouble(QEMUFile *f, void *pv, size_t size, }static int put_cpudouble (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {CPU_DoubleU *v = pv;qemu_put_be32s (f, &v->l.upper);@@ -457,7 +457,7 @@ static int get_buffer(QEMUFile *f, void *pv, size_t size, }static int put_buffer (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {uint8_t *v = pv;qemu_put_buffer (f, v, size);@@ -488,7 +488,7 @@ static int get_unused_buffer(QEMUFile *f, void *pv, size_t size, }static int put_unused_buffer (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {static const uint8_t buf[1024 ];int block_len;@@ -530,7 +530,7 @@ static int get_tmp(QEMUFile *f, void *pv, size_t size, }static int put_tmp (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {const VMStateDescription *vmsd = field->vmsd;void *tmp =g_malloc (size);@@ -573,7 +573,7 @@ static int get_bitmap(QEMUFile *f, void *pv, size_t size, }static int put_bitmap (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {unsigned long *bmp = pv;int i, idx =0 ;@@ -637,7 +637,7 @@ static int get_qtailq(QEMUFile *f, void *pv, size_t unused_size,/* put for QTAILQ */ static int put_qtailq (QEMUFile *f,void *pv,size_t unused_size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {const VMStateDescription *vmsd = field->vmsd;/* offset of the QTAILQ entry in a QTAILQ element*/ @@ -670,7 +670,7 @@ struct put_gtree_data {QEMUFile *f;const VMStateDescription *key_vmsd;const VMStateDescription *val_vmsd; -QJSON *vmdesc; +JSONWriter *vmdesc;int ret; };@@ -703,7 +703,7 @@ static gboolean put_gtree_elem(gpointer key, gpointer value, gpointer data) }static int put_gtree (QEMUFile *f,void *pv,size_t unused_size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {bool direct_key = (!field->start);const VMStateDescription *key_vmsd = direct_key ?NULL : &field->vmsd[1 ];@@ -819,7 +819,7 @@ const VMStateInfo vmstate_info_gtree = { };static int put_qlist (QEMUFile *f,void *pv,size_t unused_size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {const VMStateDescription *vmsd = field->vmsd;/* offset of the QTAILQ entry in a QTAILQ element*/ migration/vmstate.c +27
-25@@ -14,14 +14,14 @@#include "migration.h" #include "migration/vmstate.h" #include "savevm.h" +#include "qapi/qmp/json-writer.h" #include "qemu-file.h" #include "qemu/bitops.h" #include "qemu/error-report.h" #include "trace.h" -#include "qjson.h" static int vmstate_subsection_save (QEMUFile *f,const VMStateDescription *vmsd, -void *opaque,QJSON *vmdesc); +void *opaque,JSONWriter *vmdesc);static int vmstate_subsection_load (QEMUFile *f,const VMStateDescription *vmsd,void *opaque);@@ -249,7 +249,8 @@ static bool vmsd_can_compress(const VMStateField *field)return true; } -static void vmsd_desc_field_start (const VMStateDescription *vmsd,QJSON *vmdesc, +static void vmsd_desc_field_start (const VMStateDescription *vmsd, +JSONWriter *vmdesc,const VMStateField *field,int i,int max) {char *name, *old_name;@@ -270,25 +271,26 @@ static void vmsd_desc_field_start(const VMStateDescription *vmsd, QJSON *vmdesc,g_free (old_name); } -json_start_object (vmdesc,NULL ); -json_prop_str (vmdesc,"name" , name); +json_writer_start_object (vmdesc,NULL ); +json_writer_str (vmdesc,"name" , name);if (is_array) {if (can_compress) { -json_prop_int (vmdesc,"array_len" , max); +json_writer_int64 (vmdesc,"array_len" , max); }else { -json_prop_int (vmdesc,"index" , i); +json_writer_int64 (vmdesc,"index" , i); } } -json_prop_str (vmdesc,"type" ,vmfield_get_type_name (field)); +json_writer_str (vmdesc,"type" ,vmfield_get_type_name (field));if (field->flags &VMS_STRUCT ) { -json_start_object (vmdesc,"struct" ); +json_writer_start_object (vmdesc,"struct" ); }g_free (name); } -static void vmsd_desc_field_end (const VMStateDescription *vmsd,QJSON *vmdesc, +static void vmsd_desc_field_end (const VMStateDescription *vmsd, +JSONWriter *vmdesc,const VMStateField *field,size_t size,int i) {if (!vmdesc) {@@ -297,11 +299,11 @@ static void vmsd_desc_field_end(const VMStateDescription *vmsd, QJSON *vmdesc,if (field->flags &VMS_STRUCT ) {/* We printed a struct in between, close its child object */ -json_end_object (vmdesc); +json_writer_end_object (vmdesc); } -json_prop_int (vmdesc,"size" , size); -json_end_object (vmdesc); +json_writer_int64 (vmdesc,"size" , size); +json_writer_end_object (vmdesc); }@@ -316,13 +318,13 @@ bool vmstate_save_needed(const VMStateDescription *vmsd, void *opaque)int vmstate_save_state (QEMUFile *f,const VMStateDescription *vmsd, -void *opaque,QJSON *vmdesc_id) +void *opaque,JSONWriter *vmdesc_id) {return vmstate_save_state_v (f, vmsd, opaque, vmdesc_id, vmsd->version_id); }int vmstate_save_state_v (QEMUFile *f,const VMStateDescription *vmsd, -void *opaque,QJSON *vmdesc,int version_id) +void *opaque,JSONWriter *vmdesc,int version_id) {int ret =0 ;const VMStateField *field = vmsd->fields;@@ -339,9 +341,9 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd, }if (vmdesc) { -json_prop_str (vmdesc,"vmsd_name" , vmsd->name); -json_prop_int (vmdesc,"version" , version_id); -json_start_array (vmdesc,"fields" ); +json_writer_str (vmdesc,"vmsd_name" , vmsd->name); +json_writer_int64 (vmdesc,"version" , version_id); +json_writer_start_array (vmdesc,"fields" ); }while (field->name) {@@ -353,7 +355,7 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd,int i, n_elems =vmstate_n_elems (opaque, field);int size =vmstate_size (opaque, field);int64_t old_offset, written_bytes; -QJSON *vmdesc_loop = vmdesc; +JSONWriter *vmdesc_loop = vmdesc;trace_vmstate_save_state_loop (vmsd->name, field->name, n_elems);if (field->flags &VMS_POINTER ) {@@ -413,7 +415,7 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd, }if (vmdesc) { -json_end_array (vmdesc); +json_writer_end_array (vmdesc); } ret =vmstate_subsection_save (f, vmsd, opaque, vmdesc);@@ -491,7 +493,7 @@ static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd, }static int vmstate_subsection_save (QEMUFile *f,const VMStateDescription *vmsd, -void *opaque,QJSON *vmdesc) +void *opaque,JSONWriter *vmdesc) {const VMStateDescription **sub = vmsd->subsections;bool vmdesc_has_subsections = false;@@ -507,11 +509,11 @@ static int vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd,if (vmdesc) {/* Only create subsection array when we have any */ if (!vmdesc_has_subsections) { -json_start_array (vmdesc,"subsections" ); +json_writer_start_array (vmdesc,"subsections" ); vmdesc_has_subsections = true; } -json_start_object (vmdesc,NULL ); +json_writer_start_object (vmdesc,NULL ); }qemu_put_byte (f,QEMU_VM_SUBSECTION );@@ -525,14 +527,14 @@ static int vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd, }if (vmdesc) { -json_end_object (vmdesc); +json_writer_end_object (vmdesc); } } sub++; }if (vmdesc_has_subsections) { -json_end_array (vmdesc); +json_writer_end_array (vmdesc); }return ret;target/alpha/machine.c +1
-1@@ -11,7 +11,7 @@ static int get_fpcr(QEMUFile *f, void *opaque, size_t size, }static int put_fpcr (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {CPUAlphaState *env = opaque;qemu_put_be64 (f,cpu_alpha_load_fpcr (env));target/arm/machine.c +3
-3@@ -27,7 +27,7 @@ static int get_fpscr(QEMUFile *f, void *opaque, size_t size, }static int put_fpscr (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {ARMCPU *cpu = opaque;CPUARMState *env = &cpu->env;@@ -573,7 +573,7 @@ static int get_cpsr(QEMUFile *f, void *opaque, size_t size, }static int put_cpsr (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {ARMCPU *cpu = opaque;CPUARMState *env = &cpu->env;@@ -608,7 +608,7 @@ static int get_power(QEMUFile *f, void *opaque, size_t size, }static int put_power (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {ARMCPU *cpu = opaque;target/avr/machine.c +2
-2@@ -34,7 +34,7 @@ static int get_sreg(QEMUFile *f, void *opaque, size_t size, }static int put_sreg (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {CPUAVRState *env = opaque;uint8_t sreg =cpu_get_sreg (env);@@ -61,7 +61,7 @@ static int get_segment(QEMUFile *f, void *opaque, size_t size, }static int put_segment (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {uint32_t *ramp = opaque;uint8_t temp = *ramp >>16 ;target/hppa/machine.c +2
-2@@ -52,7 +52,7 @@ static int get_psw(QEMUFile *f, void *opaque, size_t size, }static int put_psw (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {CPUHPPAState *env = opaque;qemu_put_betr (f,cpu_hppa_get_psw (env));@@ -93,7 +93,7 @@ static int get_tlb(QEMUFile *f, void *opaque, size_t size, }static int put_tlb (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {hppa_tlb_entry *ent = opaque;uint32_t val =0 ;target/microblaze/machine.c +1
-1@@ -46,7 +46,7 @@ static int get_msr(QEMUFile *f, void *opaque, size_t size, }static int put_msr (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {CPUMBState *env =container_of (opaque, CPUMBState, msr);target/mips/machine.c +2
-2@@ -31,7 +31,7 @@ static int get_fpr(QEMUFile *f, void *pv, size_t size, }static int put_fpr (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {int i;fpr_t *v = pv;@@ -156,7 +156,7 @@ static int get_tlb(QEMUFile *f, void *pv, size_t size, }static int put_tlb (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {r4k_tlb_t *v = pv;target/openrisc/machine.c +1
-1@@ -55,7 +55,7 @@ static int get_sr(QEMUFile *f, void *opaque, size_t size, }static int put_sr (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {CPUOpenRISCState *env = opaque;qemu_put_be32 (f,cpu_get_sr (env));target/ppc/machine.c +5
-5@@ -134,7 +134,7 @@ static int get_avr(QEMUFile *f, void *pv, size_t size, }static int put_avr (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {ppc_avr_t *v = pv;@@ -166,7 +166,7 @@ static int get_fpr(QEMUFile *f, void *pv, size_t size, }static int put_fpr (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {ppc_vsr_t *v = pv;@@ -197,7 +197,7 @@ static int get_vsr(QEMUFile *f, void *pv, size_t size, }static int put_vsr (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {ppc_vsr_t *v = pv;@@ -455,7 +455,7 @@ static int get_vscr(QEMUFile *f, void *opaque, size_t size, }static int put_vscr (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {PowerPCCPU *cpu = opaque;qemu_put_be32 (f,helper_mfvscr (&cpu->env));@@ -580,7 +580,7 @@ static int get_slbe(QEMUFile *f, void *pv, size_t size, }static int put_slbe (QEMUFile *f,void *pv,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {ppc_slb_t *v = pv;target/sparc/machine.c +1
-1@@ -68,7 +68,7 @@ static int get_psr(QEMUFile *f, void *opaque, size_t size, }static int put_psr (QEMUFile *f,void *opaque,size_t size, -const VMStateField *field,QJSON *vmdesc) +const VMStateField *field,JSONWriter *vmdesc) {SPARCCPU *cpu = opaque;CPUSPARCState *env = &cpu->env;migration/meson.build +0
-1@@ -6,7 +6,6 @@ migration_files = files( 'vmstate.c', 'qemu-file-channel.c', 'qemu-file.c', - 'qjson.c', ) softmmu_ss.add(migration_files)Signature · 1 line
2.26.2
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [PATCH 16/20] migration: Replace migration's JSON writer by the general one
Quoted 16 lines · Dr. David Alan Gilbert
Quoted 8 lines · * Markus Armbruster ([email protected]) wrote:
Commit
8118f0950f"migration: Append JSON description of migration stream" needs a JSON writer. The existingqobject_to_json()wasn't a good fit, because it requires building a QObject to convert. Instead, migration got its very own JSON writer, in commit190c882ce2"QJSON:
Add JSON writer". It tacitly limits numbers toint64_t, and strings contents to characters that don't need escaping, unlikeqobject_to_json().Quoted 6 lines
The previous commit factored the JSON writer out of
qobject_to_json(). Replace migration's JSON writer by it.Cc Juan Quintela <[email protected]>Cc Dr. David Alan Gilbert <[email protected]>Signed-off-by Markus Armbruster <[email protected]>
Quoted 8 lines
(Copying in Alex)
This looks OK to me, so:
Reviewed-by Dr. David Alan Gilbert <[email protected]>but, can I just check, have you checked
scripts/analyze-migration.pyis still happy with the output?
Good point. I just did, following instructions in docs/devel/migration.rst. It prints stuff and succeeds. Anything else you'd like me to try?
Re: [PATCH 16/20] migration: Replace migration's JSON writer by the general one
Quoted 22 lines · * Markus Armbruster ([email protected]) wrote:
Quoted 20 lines · Dr. David Alan Gilbert
Quoted 8 lines · * Markus Armbruster ([email protected]) wrote:
Commit
8118f0950f"migration: Append JSON description of migration stream" needs a JSON writer. The existingqobject_to_json()wasn't a good fit, because it requires building a QObject to convert. Instead, migration got its very own JSON writer, in commit190c882ce2"QJSON:
Add JSON writer". It tacitly limits numbers toint64_t, and strings contents to characters that don't need escaping, unlikeqobject_to_json().Quoted 6 lines
The previous commit factored the JSON writer out of
qobject_to_json(). Replace migration's JSON writer by it.Cc Juan Quintela <[email protected]>Cc Dr. David Alan Gilbert <[email protected]>Signed-off-by Markus Armbruster <[email protected]>(Copying in Alex)
This looks OK to me, so:
Quoted 8 lines
Quoted 4 lines
Reviewed-by Dr. David Alan Gilbert <[email protected]>but, can I just check, have you checked
scripts/analyze-migration.pyis still happy with the output?Good point. I just did, following instructions in
docs/devel/migration.rst. It prints stuff and succeeds. Anything else you'd like me to try?
If it's happy, I'm happy.
Dave
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [PATCH 16/20] migration: Replace migration's JSON writer by the general one
In reply to Markus ArmbrusterQuoted 22 lines · * Markus Armbruster ([email protected]) wrote:
Quoted 20 lines · Dr. David Alan Gilbert
Quoted 8 lines · * Markus Armbruster ([email protected]) wrote:
Commit
8118f0950f"migration: Append JSON description of migration stream" needs a JSON writer. The existingqobject_to_json()wasn't a good fit, because it requires building a QObject to convert. Instead, migration got its very own JSON writer, in commit190c882ce2"QJSON:
Add JSON writer". It tacitly limits numbers toint64_t, and strings contents to characters that don't need escaping, unlikeqobject_to_json().Quoted 6 lines
The previous commit factored the JSON writer out of
qobject_to_json(). Replace migration's JSON writer by it.Cc Juan Quintela <[email protected]>Cc Dr. David Alan Gilbert <[email protected]>Signed-off-by Markus Armbruster <[email protected]>(Copying in Alex)
This looks OK to me, so:
Quoted 8 lines
Quoted 4 lines
Reviewed-by Dr. David Alan Gilbert <[email protected]>but, can I just check, have you checked
scripts/analyze-migration.pyis still happy with the output?Good point. I just did, following instructions in
docs/devel/migration.rst. It prints stuff and succeeds. Anything else you'd like me to try?
If it's happy, I'm happy.
Dave
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
PATCH 17/20 json: Use GString instead of QString to accumulate strings
In reply to Markus ArmbrusterQString supports modifying its string, but it's quite limited: you can only append. The remaining callers use it for building an initial string, never for modifying it later.
Change parse_string() to do build the initial string with GString. This is another step towards making QString immutable.
--- qobject/json-parser.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
qobject/json-parser.c +15 -15
@@ -130,7 +130,7 @@ static int cvt4hex(const char *s)static QString *parse_string (JSONParserContext *ctxt,JSONToken *token) {const char *ptr = token->str; -QString *str; +GString *str;char quote;const char *beg;int cp, trailing;
@@ -140,7 +140,7 @@ static QString *parse_string(JSONParserContext *ctxt, JSONToken *token)assert (*ptr =='"' || *ptr =='\'' ); quote = *ptr++; - str =qstring_new (); + str =g_string_new (NULL );while (*ptr != quote) {assert (*ptr);
@@ -149,31 +149,31 @@ static QString *parse_string(JSONParserContext *ctxt, JSONToken *token) beg = ptr++;switch (*ptr++) {case '"' : -qstring_append_chr (str,'"' ); +g_string_append_c (str,'"' );break ;case '\'' : -qstring_append_chr (str,'\'' ); +g_string_append_c (str,'\'' );break ;case '\\' : -qstring_append_chr (str,'\\' ); +g_string_append_c (str,'\\' );break ;case '/' : -qstring_append_chr (str,'/' ); +g_string_append_c (str,'/' );break ;case 'b' : -qstring_append_chr (str,'\b' ); +g_string_append_c (str,'\b' );break ;case 'f' : -qstring_append_chr (str,'\f' ); +g_string_append_c (str,'\f' );break ;case 'n' : -qstring_append_chr (str,'\n' ); +g_string_append_c (str,'\n' );break ;case 'r' : -qstring_append_chr (str,'\r' ); +g_string_append_c (str,'\r' );break ;case 't' : -qstring_append_chr (str,'\t' ); +g_string_append_c (str,'\t' );break ;case 'u' : cp =cvt4hex (ptr);
@@ -200,7 +200,7 @@ static QString *parse_string(JSONParserContext *ctxt, JSONToken *token) (int)(ptr - beg), beg); goto out; } -qstring_append (str, utf8_buf); +g_string_append (str, utf8_buf);break ;default :parse_error (ctxt, token,"invalid escape sequence in string" );
@@ -225,14 +225,14 @@ static QString *parse_string(JSONParserContext *ctxt, JSONToken *token) ptr = end; len =mod_utf8_encode (utf8_buf,sizeof (utf8_buf), cp);assert (len >=0 ); -qstring_append (str, utf8_buf); +g_string_append (str, utf8_buf); } } -return str; +return qstring_from_gstring (str); out: -qobject_unref (str); +g_string_free (str, true);return NULL ; }
Signature · 1 line
2.26.2
PATCH 18/20 keyval: Use GString to accumulate value strings
In reply to Markus ArmbrusterQString supports modifying its string, but it's quite limited: you can only append. The remaining callers use it for building an initial string, never for modifying it later.
Change keyval_parse_one() to do build the initial string with GString. This is another step towards making QString immutable.
--- util/keyval.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
util/keyval.c +6 -5
@@ -189,7 +189,7 @@ static const char *keyval_parse_one(QDict *qdict, const char *params,QDict *cur;int ret;QObject *next; -QString *val; +GString *val; key = params; val_end =NULL ;
@@ -263,7 +263,7 @@ static const char *keyval_parse_one(QDict *qdict, const char *params,if (key == implied_key) {assert (!*s); - val =qstring_from_substr (params,0 , val_end - params); + val =g_string_new_len (params, val_end - params); s = val_end;if (*s ==',' ) { s++;
@@ -276,7 +276,7 @@ static const char *keyval_parse_one(QDict *qdict, const char *params, } s++; - val =qstring_new (); + val =g_string_new (NULL );for (;;) {if (!*s) {break ;
@@ -286,11 +286,12 @@ static const char *keyval_parse_one(QDict *qdict, const char *params,break ; } } -qstring_append_chr (val, *s++); +g_string_append_c (val, *s++); } } -if (!keyval_parse_put (cur, key_in_cur, val, key, key_end, errp)) { +if (!keyval_parse_put (cur, key_in_cur,qstring_from_gstring (val), + key, key_end, errp)) {return NULL ; }return s;
Signature · 1 line
2.26.2
Re: [PATCH 18/20] keyval: Use GString to accumulate value strings
Quoted 8 lines · Markus Armbruster
QString supports modifying its string, but it's quite limited: you can only append. The remaining callers use it for building an initial string, never for modifying it later.
Change
keyval_parse_one()to do build the initial string with GString. This is another step towards making QString immutable.Signed-off-by Markus Armbruster <[email protected]>
It's a bit unfortunate that the infamous "keyval: accept escaped commas in implied option" patch was already getting rid of mutable QString.
It used a completely different mechanism, namely unescaping the string in place. This means that my patch was doing n+1 allocations, versus a best case of n and a generic case of O(n) for this patch. The difference does not really matter, though I still like my code better.
Paolo
Quoted 51 lines
--- util/keyval.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)util/keyval.c +6
-5@@ -189,7 +189,7 @@ static const char *keyval_parse_one(QDict *qdict, const char *params,QDict *cur;int ret;QObject *next; -QString *val; +GString *val; key = params; val_end =NULL ;@@ -263,7 +263,7 @@ static const char *keyval_parse_one(QDict *qdict, const char *params,if (key == implied_key) {assert (!*s); - val =qstring_from_substr (params,0 , val_end - params); + val =g_string_new_len (params, val_end - params); s = val_end;if (*s ==',' ) { s++;@@ -276,7 +276,7 @@ static const char *keyval_parse_one(QDict *qdict, const char *params, } s++; - val =qstring_new (); + val =g_string_new (NULL );for (;;) {if (!*s) {break ;@@ -286,11 +286,12 @@ static const char *keyval_parse_one(QDict *qdict, const char *params,break ; } } -qstring_append_chr (val, *s++); +g_string_append_c (val, *s++); } } -if (!keyval_parse_put (cur, key_in_cur, val, key, key_end, errp)) { +if (!keyval_parse_put (cur, key_in_cur,qstring_from_gstring (val), + key, key_end, errp)) {return NULL ; }return s;
Re: [PATCH 18/20] keyval: Use GString to accumulate value strings
Quoted 9 lines · Paolo Bonzini
Quoted 7 lines · Markus Armbruster
QString supports modifying its string, but it's quite limited: you can only append. The remaining callers use it for building an initial string, never for modifying it later.
Changekeyval_parse_one()to do build the initial string with GString.
This is another step towards making QString immutable.Signed-off-by Markus Armbruster <[email protected]>
Quoted 8 lines
It's a bit unfortunate that the infamous "keyval: accept escaped commas in implied option" patch was already getting rid of mutable QString.
It used a completely different mechanism, namely unescaping the string in place. This means that my patch was doing n+1 allocations, versus a best case of n and a generic case of O(n) for this patch. The difference does not really matter, though I still like my code better.
My patch is not intended as a replacement of yours. Mine does much less.
I had to choose between creating a conflict and holding back my series while we figure out what to do with your patch. The dilemma is my own doing; your patch is waiting just for me. I picked the conflict.
I can look into rebasing your patch on top of mine.
Re: [PATCH 18/20] keyval: Use GString to accumulate value strings
Quoted 5 lines · Markus Armbruster
I had to choose between creating a conflict and holding back my series while we figure out what to do with your patch. The dilemma is my own doing; your patch is waiting just for me. I picked the conflict.
I can look into rebasing your patch on top of mine.
No need to. My patch also removes the use of GString, so the code after my patch can be exactly the same. Or in other words, squashing a revert in front of my patch just works.
Paolo
PATCH 19/20 block: Use GString instead of QString to build filenames
In reply to Markus ArmbrusterQString supports modifying its string, but it's quite limited: you can only append. Just one caller remains:bdrv_parse_filename_strip_prefix() uses it just for building an initial string.
Change it to do build the initial string with GString. This is another step towards making QString immutable.
--- block.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
block.c +6 -5
@@ -216,7 +216,7 @@ void bdrv_parse_filename_strip_prefix(const char *filename, const char *prefix,/* Stripping the explicit protocol prefix may result in a protocol * prefix being (wrongly) detected (if the filename contains a colon) */ if (path_has_protocol (filename)) { -QString *fat_filename; +GString *fat_filename;/* This means there is some colon before the first slash; therefore, * this cannot be an absolute path */
@@ -224,12 +224,13 @@ void bdrv_parse_filename_strip_prefix(const char *filename, const char *prefix,/* And we can thus fix the protocol detection issue by prefixing it * by "./" */ - fat_filename =qstring_from_str ("./" ); -qstring_append (fat_filename, filename); + fat_filename =g_string_new ("./" ); +g_string_append (fat_filename, filename); -assert (!path_has_protocol (qstring_get_str (fat_filename))); +assert (!path_has_protocol (fat_filename->str)); -qdict_put (options,"filename" , fat_filename); +qdict_put (options,"filename" , +qstring_from_gstring (fat_filename)); }else {/* If no protocol prefix was detected, we can use the shortened * filename as-is */
Signature · 1 line
2.26.2
Re: [PATCH 19/20] block: Use GString instead of QString to build filenames
Quoted 5 lines · Markus Armbruster
QString supports modifying its string, but it's quite limited: you can only append. Just one caller remains:
bdrv_parse_filename_strip_prefix()uses it just for building an initial string.
Quoted 7 lines
Change it to do build the initial string with GString. This is another step towards making QString immutable.
Cc Kevin Wolf<[email protected]>Cc Max Reitz<[email protected]>Signed-off-by Markus Armbruster<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH 20/20 qobject: Make QString immutable
In reply to Markus ArmbrusterThe functions to modify a QString's string are all unused now. Drop them, and make the string immutable. Saves 16 bytes per QString on my system.
--- include/qapi/qmp/qstring.h | 8 +---- qobject/qstring.c | 65 ++------------------------------------ tests/check-qobject.c | 3 +- tests/check-qstring.c | 16 ---------- 4 files changed, 4 insertions(+), 88 deletions(-)
include/qapi/qmp/qstring.h +1 -7
@@ -17,19 +17,13 @@struct QString {struct QObjectBase_ base; -char *string; -size_t length; -size_t capacity; +const char *string; };QString *qstring_new (void );QString *qstring_from_str (const char *str);QString *qstring_from_substr (const char *str,size_t start,size_t end);QString *qstring_from_gstring (GString *gstr); -size_t qstring_get_length (const QString *qstring);const char *qstring_get_str (const QString *qstring); -void qstring_append_int (QString *qstring,int64_t value); -void qstring_append (QString *qstring,const char *str); -void qstring_append_chr (QString *qstring,int c);#endif /* QSTRING_H */
qobject/qstring.c +2 -63
95 lines not on this page · raw message
tests/check-qobject.c +1 -2
@@ -155,8 +155,7 @@ static void qobject_is_equal_string_test(void) str_case =qstring_from_str ("Foo" );/* Should yield "foo" */ - str_built =qstring_from_substr ("form" ,0 ,2 ); -qstring_append_chr (str_built,'o' ); + str_built =qstring_from_substr ("buffoon" ,3 ,6 );check_unequal (str_base, str_whitespace_0, str_whitespace_1, str_whitespace_2, str_whitespace_3, str_case);
tests/check-qstring.c +0 -16
@@ -47,21 +47,6 @@ static void qstring_get_str_test(void)qobject_unref (qstring); } -static void qstring_append_chr_test (void ) -{ -int i; -QString *qstring; -const char *str ="qstring append char unit-test" ; - - qstring =qstring_new (); - -for (i =0 ; str[i]; i++) -qstring_append_chr (qstring, str[i]); - -g_assert (strcmp (str,qstring_get_str (qstring)) ==0 ); -qobject_unref (qstring); -} -static void qstring_from_substr_test (void ) {QString *qs;
@@ -90,7 +75,6 @@ int main(int argc, char **argv)g_test_add_func ("/public/from_str" , qstring_from_str_test);g_test_add_func ("/public/get_str" , qstring_get_str_test); -g_test_add_func ("/public/append_chr" , qstring_append_chr_test);g_test_add_func ("/public/from_substr" , qstring_from_substr_test);g_test_add_func ("/public/to_qstring" , qobject_to_qstring_test);
Signature · 1 line
2.26.2
Quoted 12 lines · Markus Armbruster
Based-on: <[email protected]>
Cc Daniel P. Berrangé <[email protected]>Cc Dr. David Alan Gilbert <[email protected]>Cc Eduardo Habkost <[email protected]>Cc Juan Quintela <[email protected]>Cc Kevin Wolf <[email protected]>Cc Marcel Apfelbaum <[email protected]>Cc Max Reitz <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Yuval Shaia <[email protected]>
Looks good, my only comment was on conflicts with other pending series.
Paolo
Quoted 99 lines
Markus Armbruster (20):
hmp: Simplify howqmp_human_monitor_command()gets output
monitor: Use GString instead of QString for output buffer
qobject: Makeqobject_to_json_pretty()take a pretty argument
qobject: Use GString instead of QString to accumulate JSON
qobject: Change qobject_to_json()'s value to GString Revert "qstring: addqstring_free()"
hw/rdma: Replace QList by GQueue
qobject: Move internals toqobject-internal.h
qmp: Fix tracing of non-string command IDs
block: Avoidqobject_get_try_str()
Revert "qobject: letobject_property_get_str()use new API"
qobject: Dropqobject_get_try_str()
qobject: Dropqstring_get_try_str()
qobject: Factorquoted_str()out ofto_json()
qobject: Factor JSON writer out ofqobject_to_json()
migration: Replace migration's JSON writer by the general one
json: Use GString instead of QString to accumulate strings
keyval: Use GString to accumulate value strings
block: Use GString instead of QString to build filenames
qobject: Make QString immutablehw/rdma/rdma_backend_defs.h | 2 +- hw/rdma/rdma_utils.h | 15 +- include/migration/vmstate.h | 7 +- include/qapi/qmp/json-writer.h | 35 ++++ include/qapi/qmp/qbool.h | 2 - include/qapi/qmp/qdict.h | 2 - include/qapi/qmp/qjson.h | 4 +- include/qapi/qmp/qlist.h | 2 - include/qapi/qmp/qnull.h | 2 - include/qapi/qmp/qnum.h | 3 - include/qapi/qmp/qobject.h | 9 +- include/qapi/qmp/qstring.h | 14 +- include/qemu/typedefs.h | 4 +- migration/qjson.h | 29 ---- monitor/monitor-internal.h | 2 +- qobject/qobject-internal.h | 39 +++++ block.c | 23 +-- block/rbd.c | 2 +- hw/display/virtio-gpu.c | 2 +- hw/intc/s390_flic_kvm.c | 2 +- hw/nvram/eeprom93xx.c | 2 +- hw/nvram/fw_cfg.c | 2 +- hw/pci/msix.c | 2 +- hw/pci/pci.c | 4 +- hw/pci/shpc.c | 2 +- hw/rdma/rdma_backend.c | 10 +- hw/rdma/rdma_utils.c | 29 ++-- hw/rtc/twl92230.c | 2 +- hw/scsi/scsi-bus.c | 2 +- hw/usb/redirect.c | 7 +- hw/virtio/virtio.c | 4 +- migration/qjson.c | 114 ------------- migration/savevm.c | 53 ++++--- migration/vmstate-types.c | 38 ++--- migration/vmstate.c | 52 +++--- monitor/misc.c | 6 +- monitor/monitor.c | 20 +-- monitor/qmp.c | 46 +++--- qemu-img.c | 33 ++-- qga/main.c | 22 +-- qobject/json-parser.c | 30 ++-- qobject/json-writer.c | 247 +++++++++++++++++++++++++++++ qobject/qbool.c | 1 + qobject/qdict.c | 1 + qobject/qjson.c | 144 ++++------------- qobject/qlist.c | 1 + qobject/qnull.c | 1 + qobject/qnum.c | 6 +- qobject/qobject.c | 1 + qobject/qstring.c | 117 +++----------- qom/object.c | 9 +- qom/object_interfaces.c | 4 +- qom/qom-hmp-cmds.c | 7 +- target/alpha/machine.c | 2 +- target/arm/machine.c | 6 +- target/avr/machine.c | 4 +- target/hppa/machine.c | 4 +- target/microblaze/machine.c | 2 +- target/mips/machine.c | 4 +- target/openrisc/machine.c | 2 +- target/ppc/machine.c | 10 +- target/sparc/machine.c | 2 +- tests/check-qjson.c | 67 ++++---- tests/check-qobject.c | 3 +- tests/check-qstring.c | 16 -- tests/qtest/libqtest.c | 20 ++- tests/test-visitor-serialization.c | 6 +- util/keyval.c | 11 +- migration/meson.build | 1 - qobject/meson.build | 5 +- 70 files changed, 679 insertions(+), 705 deletions(-)create mode 100644
include/qapi/qmp/json-writer.hdelete mode 100644migration/qjson.hcreate mode 100644qobject/qobject-internal.hdelete mode 100644migration/qjson.ccreate mode 100644qobject/json-writer.c