yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 10:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: rename QmpInputVisitor to QObjectInputVisitor

Browse source 
The QmpInputVisitor has no direct dependency on QMP. It is
valid to use it anywhere that one has a QObject. Rename it
to better reflect its functionality as a generic QObject
to QAPI converter.

The previous commit renamed the files, this one renames C identifiers.

Backports commit 09e68369a88d7de0f988972bf28eec1b80cc47f9 from qemu
This commit is contained in:
Daniel P. Berrange 2018-02-26 15:53:02 -05:00 committed by Lioncash
parent 228f122248
commit 2949a90977
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
17 changed files with 367 additions and 367 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
qemu/aarch64.h
View file

@ -2474,26 +2474,26 @@
#define qlist_size qlist_size_aarch64 #define qlist_size qlist_size_aarch64
#define qlist_size_iter qlist_size_iter_aarch64 #define qlist_size_iter qlist_size_iter_aarch64
#define qlist_type qlist_type_aarch64 #define qlist_type qlist_type_aarch64
#define qmp_input_end_implicit_struct qmp_input_end_implicit_struct_aarch64 #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_aarch64
#define qmp_input_end_list qmp_input_end_list_aarch64 #define qobject_input_end_list qobject_input_end_list_aarch64
#define qmp_input_end_struct qmp_input_end_struct_aarch64 #define qobject_input_end_struct qobject_input_end_struct_aarch64
#define qmp_input_get_next_type qmp_input_get_next_type_aarch64 #define qobject_input_get_next_type qobject_input_get_next_type_aarch64
#define qmp_input_get_object qmp_input_get_object_aarch64 #define qobject_input_get_object qobject_input_get_object_aarch64
#define qmp_input_get_visitor qmp_input_get_visitor_aarch64 #define qobject_input_get_visitor qobject_input_get_visitor_aarch64
#define qmp_input_next_list qmp_input_next_list_aarch64 #define qobject_input_next_list qobject_input_next_list_aarch64
#define qmp_input_optional qmp_input_optional_aarch64 #define qobject_input_optional qobject_input_optional_aarch64
#define qmp_input_pop qmp_input_pop_aarch64 #define qobject_input_pop qobject_input_pop_aarch64
#define qmp_input_push qmp_input_push_aarch64 #define qobject_input_push qobject_input_push_aarch64
#define qmp_input_start_implicit_struct qmp_input_start_implicit_struct_aarch64 #define qobject_input_start_implicit_struct qobject_input_start_implicit_struct_aarch64
#define qmp_input_start_list qmp_input_start_list_aarch64 #define qobject_input_start_list qobject_input_start_list_aarch64
#define qmp_input_start_struct qmp_input_start_struct_aarch64 #define qobject_input_start_struct qobject_input_start_struct_aarch64
#define qmp_input_type_bool qmp_input_type_bool_aarch64 #define qobject_input_type_bool qobject_input_type_bool_aarch64
#define qmp_input_type_int qmp_input_type_int_aarch64 #define qobject_input_type_int qobject_input_type_int_aarch64
#define qmp_input_type_number qmp_input_type_number_aarch64 #define qobject_input_type_number qobject_input_type_number_aarch64
#define qmp_input_type_str qmp_input_type_str_aarch64 #define qobject_input_type_str qobject_input_type_str_aarch64
#define qmp_input_visitor_cleanup qmp_input_visitor_cleanup_aarch64 #define qobject_input_visitor_cleanup qobject_input_visitor_cleanup_aarch64
#define qmp_input_visitor_new qmp_input_visitor_new_aarch64 #define qobject_input_visitor_new qobject_input_visitor_new_aarch64
#define qmp_input_visitor_new_strict qmp_input_visitor_new_strict_aarch64 #define qobject_input_visitor_new_strict qobject_input_visitor_new_strict_aarch64
#define qmp_output_add_obj qmp_output_add_obj_aarch64 #define qmp_output_add_obj qmp_output_add_obj_aarch64
#define qmp_output_end_list qmp_output_end_list_aarch64 #define qmp_output_end_list qmp_output_end_list_aarch64
#define qmp_output_end_struct qmp_output_end_struct_aarch64 #define qmp_output_end_struct qmp_output_end_struct_aarch64

40
qemu/aarch64eb.h
View file

@ -2474,26 +2474,26 @@
#define qlist_size qlist_size_aarch64eb #define qlist_size qlist_size_aarch64eb
#define qlist_size_iter qlist_size_iter_aarch64eb #define qlist_size_iter qlist_size_iter_aarch64eb
#define qlist_type qlist_type_aarch64eb #define qlist_type qlist_type_aarch64eb
#define qmp_input_end_implicit_struct qmp_input_end_implicit_struct_aarch64eb #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_aarch64eb
#define qmp_input_end_list qmp_input_end_list_aarch64eb #define qobject_input_end_list qobject_input_end_list_aarch64eb
#define qmp_input_end_struct qmp_input_end_struct_aarch64eb #define qobject_input_end_struct qobject_input_end_struct_aarch64eb
#define qmp_input_get_next_type qmp_input_get_next_type_aarch64eb #define qobject_input_get_next_type qobject_input_get_next_type_aarch64eb
#define qmp_input_get_object qmp_input_get_object_aarch64eb #define qobject_input_get_object qobject_input_get_object_aarch64eb
#define qmp_input_get_visitor qmp_input_get_visitor_aarch64eb #define qobject_input_get_visitor qobject_input_get_visitor_aarch64eb
#define qmp_input_next_list qmp_input_next_list_aarch64eb #define qobject_input_next_list qobject_input_next_list_aarch64eb
#define qmp_input_optional qmp_input_optional_aarch64eb #define qobject_input_optional qobject_input_optional_aarch64eb
#define qmp_input_pop qmp_input_pop_aarch64eb #define qobject_input_pop qobject_input_pop_aarch64eb
#define qmp_input_push qmp_input_push_aarch64eb #define qobject_input_push qobject_input_push_aarch64eb
#define qmp_input_start_implicit_struct qmp_input_start_implicit_struct_aarch64eb #define qobject_input_start_implicit_struct qobject_input_start_implicit_struct_aarch64eb
#define qmp_input_start_list qmp_input_start_list_aarch64eb #define qobject_input_start_list qobject_input_start_list_aarch64eb
#define qmp_input_start_struct qmp_input_start_struct_aarch64eb #define qobject_input_start_struct qobject_input_start_struct_aarch64eb
#define qmp_input_type_bool qmp_input_type_bool_aarch64eb #define qobject_input_type_bool qobject_input_type_bool_aarch64eb
#define qmp_input_type_int qmp_input_type_int_aarch64eb #define qobject_input_type_int qobject_input_type_int_aarch64eb
#define qmp_input_type_number qmp_input_type_number_aarch64eb #define qobject_input_type_number qobject_input_type_number_aarch64eb
#define qmp_input_type_str qmp_input_type_str_aarch64eb #define qobject_input_type_str qobject_input_type_str_aarch64eb
#define qmp_input_visitor_cleanup qmp_input_visitor_cleanup_aarch64eb #define qobject_input_visitor_cleanup qobject_input_visitor_cleanup_aarch64eb
#define qmp_input_visitor_new qmp_input_visitor_new_aarch64eb #define qobject_input_visitor_new qobject_input_visitor_new_aarch64eb
#define qmp_input_visitor_new_strict qmp_input_visitor_new_strict_aarch64eb #define qobject_input_visitor_new_strict qobject_input_visitor_new_strict_aarch64eb
#define qmp_output_add_obj qmp_output_add_obj_aarch64eb #define qmp_output_add_obj qmp_output_add_obj_aarch64eb
#define qmp_output_end_list qmp_output_end_list_aarch64eb #define qmp_output_end_list qmp_output_end_list_aarch64eb
#define qmp_output_end_struct qmp_output_end_struct_aarch64eb #define qmp_output_end_struct qmp_output_end_struct_aarch64eb

40
qemu/arm.h
View file

@ -2474,26 +2474,26 @@
#define qlist_size qlist_size_arm #define qlist_size qlist_size_arm
#define qlist_size_iter qlist_size_iter_arm #define qlist_size_iter qlist_size_iter_arm
#define qlist_type qlist_type_arm #define qlist_type qlist_type_arm
#define qmp_input_end_implicit_struct qmp_input_end_implicit_struct_arm #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_arm
#define qmp_input_end_list qmp_input_end_list_arm #define qobject_input_end_list qobject_input_end_list_arm
#define qmp_input_end_struct qmp_input_end_struct_arm #define qobject_input_end_struct qobject_input_end_struct_arm
#define qmp_input_get_next_type qmp_input_get_next_type_arm #define qobject_input_get_next_type qobject_input_get_next_type_arm
#define qmp_input_get_object qmp_input_get_object_arm #define qobject_input_get_object qobject_input_get_object_arm
#define qmp_input_get_visitor qmp_input_get_visitor_arm #define qobject_input_get_visitor qobject_input_get_visitor_arm
#define qmp_input_next_list qmp_input_next_list_arm #define qobject_input_next_list qobject_input_next_list_arm
#define qmp_input_optional qmp_input_optional_arm #define qobject_input_optional qobject_input_optional_arm
#define qmp_input_pop qmp_input_pop_arm #define qobject_input_pop qobject_input_pop_arm
#define qmp_input_push qmp_input_push_arm #define qobject_input_push qobject_input_push_arm
#define qmp_input_start_implicit_struct qmp_input_start_implicit_struct_arm #define qobject_input_start_implicit_struct qobject_input_start_implicit_struct_arm
#define qmp_input_start_list qmp_input_start_list_arm #define qobject_input_start_list qobject_input_start_list_arm
#define qmp_input_start_struct qmp_input_start_struct_arm #define qobject_input_start_struct qobject_input_start_struct_arm
#define qmp_input_type_bool qmp_input_type_bool_arm #define qobject_input_type_bool qobject_input_type_bool_arm
#define qmp_input_type_int qmp_input_type_int_arm #define qobject_input_type_int qobject_input_type_int_arm
#define qmp_input_type_number qmp_input_type_number_arm #define qobject_input_type_number qobject_input_type_number_arm
#define qmp_input_type_str qmp_input_type_str_arm #define qobject_input_type_str qobject_input_type_str_arm
#define qmp_input_visitor_cleanup qmp_input_visitor_cleanup_arm #define qobject_input_visitor_cleanup qobject_input_visitor_cleanup_arm
#define qmp_input_visitor_new qmp_input_visitor_new_arm #define qobject_input_visitor_new qobject_input_visitor_new_arm
#define qmp_input_visitor_new_strict qmp_input_visitor_new_strict_arm #define qobject_input_visitor_new_strict qobject_input_visitor_new_strict_arm
#define qmp_output_add_obj qmp_output_add_obj_arm #define qmp_output_add_obj qmp_output_add_obj_arm
#define qmp_output_end_list qmp_output_end_list_arm #define qmp_output_end_list qmp_output_end_list_arm
#define qmp_output_end_struct qmp_output_end_struct_arm #define qmp_output_end_struct qmp_output_end_struct_arm

40
qemu/armeb.h
View file

@ -2474,26 +2474,26 @@
#define qlist_size qlist_size_armeb #define qlist_size qlist_size_armeb
#define qlist_size_iter qlist_size_iter_armeb #define qlist_size_iter qlist_size_iter_armeb
#define qlist_type qlist_type_armeb #define qlist_type qlist_type_armeb
#define qmp_input_end_implicit_struct qmp_input_end_implicit_struct_armeb #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_armeb
#define qmp_input_end_list qmp_input_end_list_armeb #define qobject_input_end_list qobject_input_end_list_armeb
#define qmp_input_end_struct qmp_input_end_struct_armeb #define qobject_input_end_struct qobject_input_end_struct_armeb
#define qmp_input_get_next_type qmp_input_get_next_type_armeb #define qobject_input_get_next_type qobject_input_get_next_type_armeb
#define qmp_input_get_object qmp_input_get_object_armeb #define qobject_input_get_object qobject_input_get_object_armeb
#define qmp_input_get_visitor qmp_input_get_visitor_armeb #define qobject_input_get_visitor qobject_input_get_visitor_armeb
#define qmp_input_next_list qmp_input_next_list_armeb #define qobject_input_next_list qobject_input_next_list_armeb
#define qmp_input_optional qmp_input_optional_armeb #define qobject_input_optional qobject_input_optional_armeb
#define qmp_input_pop qmp_input_pop_armeb #define qobject_input_pop qobject_input_pop_armeb
#define qmp_input_push qmp_input_push_armeb #define qobject_input_push qobject_input_push_armeb
#define qmp_input_start_implicit_struct qmp_input_start_implicit_struct_armeb #define qobject_input_start_implicit_struct qobject_input_start_implicit_struct_armeb
#define qmp_input_start_list qmp_input_start_list_armeb #define qobject_input_start_list qobject_input_start_list_armeb
#define qmp_input_start_struct qmp_input_start_struct_armeb #define qobject_input_start_struct qobject_input_start_struct_armeb
#define qmp_input_type_bool qmp_input_type_bool_armeb #define qobject_input_type_bool qobject_input_type_bool_armeb
#define qmp_input_type_int qmp_input_type_int_armeb #define qobject_input_type_int qobject_input_type_int_armeb
#define qmp_input_type_number qmp_input_type_number_armeb #define qobject_input_type_number qobject_input_type_number_armeb
#define qmp_input_type_str qmp_input_type_str_armeb #define qobject_input_type_str qobject_input_type_str_armeb
#define qmp_input_visitor_cleanup qmp_input_visitor_cleanup_armeb #define qobject_input_visitor_cleanup qobject_input_visitor_cleanup_armeb
#define qmp_input_visitor_new qmp_input_visitor_new_armeb #define qobject_input_visitor_new qobject_input_visitor_new_armeb
#define qmp_input_visitor_new_strict qmp_input_visitor_new_strict_armeb #define qobject_input_visitor_new_strict qobject_input_visitor_new_strict_armeb
#define qmp_output_add_obj qmp_output_add_obj_armeb #define qmp_output_add_obj qmp_output_add_obj_armeb
#define qmp_output_end_list qmp_output_end_list_armeb #define qmp_output_end_list qmp_output_end_list_armeb
#define qmp_output_end_struct qmp_output_end_struct_armeb #define qmp_output_end_struct qmp_output_end_struct_armeb

40
qemu/header_gen.py
View file

@ -2480,26 +2480,26 @@ symbols = (
'qlist_size', 'qlist_size',
'qlist_size_iter', 'qlist_size_iter',
'qlist_type', 'qlist_type',
'qmp_input_end_implicit_struct', 'qobject_input_end_implicit_struct',
'qmp_input_end_list', 'qobject_input_end_list',
'qmp_input_end_struct', 'qobject_input_end_struct',
'qmp_input_get_next_type', 'qobject_input_get_next_type',
'qmp_input_get_object', 'qobject_input_get_object',
'qmp_input_get_visitor', 'qobject_input_get_visitor',
'qmp_input_next_list', 'qobject_input_next_list',
'qmp_input_optional', 'qobject_input_optional',
'qmp_input_pop', 'qobject_input_pop',
'qmp_input_push', 'qobject_input_push',
'qmp_input_start_implicit_struct', 'qobject_input_start_implicit_struct',
'qmp_input_start_list', 'qobject_input_start_list',
'qmp_input_start_struct', 'qobject_input_start_struct',
'qmp_input_type_bool', 'qobject_input_type_bool',
'qmp_input_type_int', 'qobject_input_type_int',
'qmp_input_type_number', 'qobject_input_type_number',
'qmp_input_type_str', 'qobject_input_type_str',
'qmp_input_visitor_cleanup', 'qobject_input_visitor_cleanup',
'qmp_input_visitor_new', 'qobject_input_visitor_new',
'qmp_input_visitor_new_strict', 'qobject_input_visitor_new_strict',
'qmp_output_add_obj', 'qmp_output_add_obj',
'qmp_output_end_list', 'qmp_output_end_list',
'qmp_output_end_struct', 'qmp_output_end_struct',

4
qemu/include/qapi/qobject-input-visitor.h
View file

@ -17,7 +17,7 @@
#include "qapi/visitor.h" #include "qapi/visitor.h"
#include "qapi/qmp/qobject.h" #include "qapi/qmp/qobject.h"
typedef struct QmpInputVisitor QmpInputVisitor; typedef struct QObjectInputVisitor QObjectInputVisitor;
/* /*
* Return a new input visitor that converts QMP to QAPI. * Return a new input visitor that converts QMP to QAPI.
@ -25,6 +25,6 @@ typedef struct QmpInputVisitor QmpInputVisitor;
* Set @strict to reject a parse that doesn't consume all keys of a * Set @strict to reject a parse that doesn't consume all keys of a
* dictionary; otherwise excess input is ignored. * dictionary; otherwise excess input is ignored.
*/ */
Visitor *qmp_input_visitor_new(QObject *obj, bool strict); Visitor *qobject_input_visitor_new(QObject *obj, bool strict);
#endif #endif

40
qemu/m68k.h
View file

@ -2474,26 +2474,26 @@
#define qlist_size qlist_size_m68k #define qlist_size qlist_size_m68k
#define qlist_size_iter qlist_size_iter_m68k #define qlist_size_iter qlist_size_iter_m68k
#define qlist_type qlist_type_m68k #define qlist_type qlist_type_m68k
#define qmp_input_end_implicit_struct qmp_input_end_implicit_struct_m68k #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_m68k
#define qmp_input_end_list qmp_input_end_list_m68k #define qobject_input_end_list qobject_input_end_list_m68k
#define qmp_input_end_struct qmp_input_end_struct_m68k #define qobject_input_end_struct qobject_input_end_struct_m68k
#define qmp_input_get_next_type qmp_input_get_next_type_m68k #define qobject_input_get_next_type qobject_input_get_next_type_m68k
#define qmp_input_get_object qmp_input_get_object_m68k #define qobject_input_get_object qobject_input_get_object_m68k
#define qmp_input_get_visitor qmp_input_get_visitor_m68k #define qobject_input_get_visitor qobject_input_get_visitor_m68k
#define qmp_input_next_list qmp_input_next_list_m68k #define qobject_input_next_list qobject_input_next_list_m68k
#define qmp_input_optional qmp_input_optional_m68k #define qobject_input_optional qobject_input_optional_m68k
#define qmp_input_pop qmp_input_pop_m68k #define qobject_input_pop qobject_input_pop_m68k
#define qmp_input_push qmp_input_push_m68k #define qobject_input_push qobject_input_push_m68k
#define qmp_input_start_implicit_struct qmp_input_start_implicit_struct_m68k #define qobject_input_start_implicit_struct qobject_input_start_implicit_struct_m68k
#define qmp_input_start_list qmp_input_start_list_m68k #define qobject_input_start_list qobject_input_start_list_m68k
#define qmp_input_start_struct qmp_input_start_struct_m68k #define qobject_input_start_struct qobject_input_start_struct_m68k
#define qmp_input_type_bool qmp_input_type_bool_m68k #define qobject_input_type_bool qobject_input_type_bool_m68k
#define qmp_input_type_int qmp_input_type_int_m68k #define qobject_input_type_int qobject_input_type_int_m68k
#define qmp_input_type_number qmp_input_type_number_m68k #define qobject_input_type_number qobject_input_type_number_m68k
#define qmp_input_type_str qmp_input_type_str_m68k #define qobject_input_type_str qobject_input_type_str_m68k
#define qmp_input_visitor_cleanup qmp_input_visitor_cleanup_m68k #define qobject_input_visitor_cleanup qobject_input_visitor_cleanup_m68k
#define qmp_input_visitor_new qmp_input_visitor_new_m68k #define qobject_input_visitor_new qobject_input_visitor_new_m68k
#define qmp_input_visitor_new_strict qmp_input_visitor_new_strict_m68k #define qobject_input_visitor_new_strict qobject_input_visitor_new_strict_m68k
#define qmp_output_add_obj qmp_output_add_obj_m68k #define qmp_output_add_obj qmp_output_add_obj_m68k
#define qmp_output_end_list qmp_output_end_list_m68k #define qmp_output_end_list qmp_output_end_list_m68k
#define qmp_output_end_struct qmp_output_end_struct_m68k #define qmp_output_end_struct qmp_output_end_struct_m68k

40
qemu/mips.h
View file

@ -2474,26 +2474,26 @@
#define qlist_size qlist_size_mips #define qlist_size qlist_size_mips
#define qlist_size_iter qlist_size_iter_mips #define qlist_size_iter qlist_size_iter_mips
#define qlist_type qlist_type_mips #define qlist_type qlist_type_mips
#define qmp_input_end_implicit_struct qmp_input_end_implicit_struct_mips #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_mips
#define qmp_input_end_list qmp_input_end_list_mips #define qobject_input_end_list qobject_input_end_list_mips
#define qmp_input_end_struct qmp_input_end_struct_mips #define qobject_input_end_struct qobject_input_end_struct_mips
#define qmp_input_get_next_type qmp_input_get_next_type_mips #define qobject_input_get_next_type qobject_input_get_next_type_mips
#define qmp_input_get_object qmp_input_get_object_mips #define qobject_input_get_object qobject_input_get_object_mips
#define qmp_input_get_visitor qmp_input_get_visitor_mips #define qobject_input_get_visitor qobject_input_get_visitor_mips
#define qmp_input_next_list qmp_input_next_list_mips #define qobject_input_next_list qobject_input_next_list_mips
#define qmp_input_optional qmp_input_optional_mips #define qobject_input_optional qobject_input_optional_mips
#define qmp_input_pop qmp_input_pop_mips #define qobject_input_pop qobject_input_pop_mips
#define qmp_input_push qmp_input_push_mips #define qobject_input_push qobject_input_push_mips
#define qmp_input_start_implicit_struct qmp_input_start_implicit_struct_mips #define qobject_input_start_implicit_struct qobject_input_start_implicit_struct_mips
#define qmp_input_start_list qmp_input_start_list_mips #define qobject_input_start_list qobject_input_start_list_mips
#define qmp_input_start_struct qmp_input_start_struct_mips #define qobject_input_start_struct qobject_input_start_struct_mips
#define qmp_input_type_bool qmp_input_type_bool_mips #define qobject_input_type_bool qobject_input_type_bool_mips
#define qmp_input_type_int qmp_input_type_int_mips #define qobject_input_type_int qobject_input_type_int_mips
#define qmp_input_type_number qmp_input_type_number_mips #define qobject_input_type_number qobject_input_type_number_mips
#define qmp_input_type_str qmp_input_type_str_mips #define qobject_input_type_str qobject_input_type_str_mips
#define qmp_input_visitor_cleanup qmp_input_visitor_cleanup_mips #define qobject_input_visitor_cleanup qobject_input_visitor_cleanup_mips
#define qmp_input_visitor_new qmp_input_visitor_new_mips #define qobject_input_visitor_new qobject_input_visitor_new_mips
#define qmp_input_visitor_new_strict qmp_input_visitor_new_strict_mips #define qobject_input_visitor_new_strict qobject_input_visitor_new_strict_mips
#define qmp_output_add_obj qmp_output_add_obj_mips #define qmp_output_add_obj qmp_output_add_obj_mips
#define qmp_output_end_list qmp_output_end_list_mips #define qmp_output_end_list qmp_output_end_list_mips
#define qmp_output_end_struct qmp_output_end_struct_mips #define qmp_output_end_struct qmp_output_end_struct_mips

40
qemu/mips64.h
View file

@ -2474,26 +2474,26 @@
#define qlist_size qlist_size_mips64 #define qlist_size qlist_size_mips64
#define qlist_size_iter qlist_size_iter_mips64 #define qlist_size_iter qlist_size_iter_mips64
#define qlist_type qlist_type_mips64 #define qlist_type qlist_type_mips64
#define qmp_input_end_implicit_struct qmp_input_end_implicit_struct_mips64 #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_mips64
#define qmp_input_end_list qmp_input_end_list_mips64 #define qobject_input_end_list qobject_input_end_list_mips64
#define qmp_input_end_struct qmp_input_end_struct_mips64 #define qobject_input_end_struct qobject_input_end_struct_mips64
#define qmp_input_get_next_type qmp_input_get_next_type_mips64 #define qobject_input_get_next_type qobject_input_get_next_type_mips64
#define qmp_input_get_object qmp_input_get_object_mips64 #define qobject_input_get_object qobject_input_get_object_mips64
#define qmp_input_get_visitor qmp_input_get_visitor_mips64 #define qobject_input_get_visitor qobject_input_get_visitor_mips64
#define qmp_input_next_list qmp_input_next_list_mips64 #define qobject_input_next_list qobject_input_next_list_mips64
#define qmp_input_optional qmp_input_optional_mips64 #define qobject_input_optional qobject_input_optional_mips64
#define qmp_input_pop qmp_input_pop_mips64 #define qobject_input_pop qobject_input_pop_mips64
#define qmp_input_push qmp_input_push_mips64 #define qobject_input_push qobject_input_push_mips64
#define qmp_input_start_implicit_struct qmp_input_start_implicit_struct_mips64 #define qobject_input_start_implicit_struct qobject_input_start_implicit_struct_mips64
#define qmp_input_start_list qmp_input_start_list_mips64 #define qobject_input_start_list qobject_input_start_list_mips64
#define qmp_input_start_struct qmp_input_start_struct_mips64 #define qobject_input_start_struct qobject_input_start_struct_mips64
#define qmp_input_type_bool qmp_input_type_bool_mips64 #define qobject_input_type_bool qobject_input_type_bool_mips64
#define qmp_input_type_int qmp_input_type_int_mips64 #define qobject_input_type_int qobject_input_type_int_mips64
#define qmp_input_type_number qmp_input_type_number_mips64 #define qobject_input_type_number qobject_input_type_number_mips64
#define qmp_input_type_str qmp_input_type_str_mips64 #define qobject_input_type_str qobject_input_type_str_mips64
#define qmp_input_visitor_cleanup qmp_input_visitor_cleanup_mips64 #define qobject_input_visitor_cleanup qobject_input_visitor_cleanup_mips64
#define qmp_input_visitor_new qmp_input_visitor_new_mips64 #define qobject_input_visitor_new qobject_input_visitor_new_mips64
#define qmp_input_visitor_new_strict qmp_input_visitor_new_strict_mips64 #define qobject_input_visitor_new_strict qobject_input_visitor_new_strict_mips64
#define qmp_output_add_obj qmp_output_add_obj_mips64 #define qmp_output_add_obj qmp_output_add_obj_mips64
#define qmp_output_end_list qmp_output_end_list_mips64 #define qmp_output_end_list qmp_output_end_list_mips64
#define qmp_output_end_struct qmp_output_end_struct_mips64 #define qmp_output_end_struct qmp_output_end_struct_mips64

40
qemu/mips64el.h
View file

@ -2474,26 +2474,26 @@
#define qlist_size qlist_size_mips64el #define qlist_size qlist_size_mips64el
#define qlist_size_iter qlist_size_iter_mips64el #define qlist_size_iter qlist_size_iter_mips64el
#define qlist_type qlist_type_mips64el #define qlist_type qlist_type_mips64el
#define qmp_input_end_implicit_struct qmp_input_end_implicit_struct_mips64el #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_mips64el
#define qmp_input_end_list qmp_input_end_list_mips64el #define qobject_input_end_list qobject_input_end_list_mips64el
#define qmp_input_end_struct qmp_input_end_struct_mips64el #define qobject_input_end_struct qobject_input_end_struct_mips64el
#define qmp_input_get_next_type qmp_input_get_next_type_mips64el #define qobject_input_get_next_type qobject_input_get_next_type_mips64el
#define qmp_input_get_object qmp_input_get_object_mips64el #define qobject_input_get_object qobject_input_get_object_mips64el
#define qmp_input_get_visitor qmp_input_get_visitor_mips64el #define qobject_input_get_visitor qobject_input_get_visitor_mips64el
#define qmp_input_next_list qmp_input_next_list_mips64el #define qobject_input_next_list qobject_input_next_list_mips64el
#define qmp_input_optional qmp_input_optional_mips64el #define qobject_input_optional qobject_input_optional_mips64el
#define qmp_input_pop qmp_input_pop_mips64el #define qobject_input_pop qobject_input_pop_mips64el
#define qmp_input_push qmp_input_push_mips64el #define qobject_input_push qobject_input_push_mips64el
#define qmp_input_start_implicit_struct qmp_input_start_implicit_struct_mips64el #define qobject_input_start_implicit_struct qobject_input_start_implicit_struct_mips64el
#define qmp_input_start_list qmp_input_start_list_mips64el #define qobject_input_start_list qobject_input_start_list_mips64el
#define qmp_input_start_struct qmp_input_start_struct_mips64el #define qobject_input_start_struct qobject_input_start_struct_mips64el
#define qmp_input_type_bool qmp_input_type_bool_mips64el #define qobject_input_type_bool qobject_input_type_bool_mips64el
#define qmp_input_type_int qmp_input_type_int_mips64el #define qobject_input_type_int qobject_input_type_int_mips64el
#define qmp_input_type_number qmp_input_type_number_mips64el #define qobject_input_type_number qobject_input_type_number_mips64el
#define qmp_input_type_str qmp_input_type_str_mips64el #define qobject_input_type_str qobject_input_type_str_mips64el
#define qmp_input_visitor_cleanup qmp_input_visitor_cleanup_mips64el #define qobject_input_visitor_cleanup qobject_input_visitor_cleanup_mips64el
#define qmp_input_visitor_new qmp_input_visitor_new_mips64el #define qobject_input_visitor_new qobject_input_visitor_new_mips64el
#define qmp_input_visitor_new_strict qmp_input_visitor_new_strict_mips64el #define qobject_input_visitor_new_strict qobject_input_visitor_new_strict_mips64el
#define qmp_output_add_obj qmp_output_add_obj_mips64el #define qmp_output_add_obj qmp_output_add_obj_mips64el
#define qmp_output_end_list qmp_output_end_list_mips64el #define qmp_output_end_list qmp_output_end_list_mips64el
#define qmp_output_end_struct qmp_output_end_struct_mips64el #define qmp_output_end_struct qmp_output_end_struct_mips64el

40
qemu/mipsel.h
View file

@ -2474,26 +2474,26 @@
#define qlist_size qlist_size_mipsel #define qlist_size qlist_size_mipsel
#define qlist_size_iter qlist_size_iter_mipsel #define qlist_size_iter qlist_size_iter_mipsel
#define qlist_type qlist_type_mipsel #define qlist_type qlist_type_mipsel
#define qmp_input_end_implicit_struct qmp_input_end_implicit_struct_mipsel #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_mipsel
#define qmp_input_end_list qmp_input_end_list_mipsel #define qobject_input_end_list qobject_input_end_list_mipsel
#define qmp_input_end_struct qmp_input_end_struct_mipsel #define qobject_input_end_struct qobject_input_end_struct_mipsel
#define qmp_input_get_next_type qmp_input_get_next_type_mipsel #define qobject_input_get_next_type qobject_input_get_next_type_mipsel
#define qmp_input_get_object qmp_input_get_object_mipsel #define qobject_input_get_object qobject_input_get_object_mipsel
#define qmp_input_get_visitor qmp_input_get_visitor_mipsel #define qobject_input_get_visitor qobject_input_get_visitor_mipsel
#define qmp_input_next_list qmp_input_next_list_mipsel #define qobject_input_next_list qobject_input_next_list_mipsel
#define qmp_input_optional qmp_input_optional_mipsel #define qobject_input_optional qobject_input_optional_mipsel
#define qmp_input_pop qmp_input_pop_mipsel #define qobject_input_pop qobject_input_pop_mipsel
#define qmp_input_push qmp_input_push_mipsel #define qobject_input_push qobject_input_push_mipsel
#define qmp_input_start_implicit_struct qmp_input_start_implicit_struct_mipsel #define qobject_input_start_implicit_struct qobject_input_start_implicit_struct_mipsel
#define qmp_input_start_list qmp_input_start_list_mipsel #define qobject_input_start_list qobject_input_start_list_mipsel
#define qmp_input_start_struct qmp_input_start_struct_mipsel #define qobject_input_start_struct qobject_input_start_struct_mipsel
#define qmp_input_type_bool qmp_input_type_bool_mipsel #define qobject_input_type_bool qobject_input_type_bool_mipsel
#define qmp_input_type_int qmp_input_type_int_mipsel #define qobject_input_type_int qobject_input_type_int_mipsel
#define qmp_input_type_number qmp_input_type_number_mipsel #define qobject_input_type_number qobject_input_type_number_mipsel
#define qmp_input_type_str qmp_input_type_str_mipsel #define qobject_input_type_str qobject_input_type_str_mipsel
#define qmp_input_visitor_cleanup qmp_input_visitor_cleanup_mipsel #define qobject_input_visitor_cleanup qobject_input_visitor_cleanup_mipsel
#define qmp_input_visitor_new qmp_input_visitor_new_mipsel #define qobject_input_visitor_new qobject_input_visitor_new_mipsel
#define qmp_input_visitor_new_strict qmp_input_visitor_new_strict_mipsel #define qobject_input_visitor_new_strict qobject_input_visitor_new_strict_mipsel
#define qmp_output_add_obj qmp_output_add_obj_mipsel #define qmp_output_add_obj qmp_output_add_obj_mipsel
#define qmp_output_end_list qmp_output_end_list_mipsel #define qmp_output_end_list qmp_output_end_list_mipsel
#define qmp_output_end_struct qmp_output_end_struct_mipsel #define qmp_output_end_struct qmp_output_end_struct_mipsel

40
qemu/powerpc.h
View file

@ -2474,26 +2474,26 @@
#define qlist_size qlist_size_powerpc #define qlist_size qlist_size_powerpc
#define qlist_size_iter qlist_size_iter_powerpc #define qlist_size_iter qlist_size_iter_powerpc
#define qlist_type qlist_type_powerpc #define qlist_type qlist_type_powerpc
#define qmp_input_end_implicit_struct qmp_input_end_implicit_struct_powerpc #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_powerpc
#define qmp_input_end_list qmp_input_end_list_powerpc #define qobject_input_end_list qobject_input_end_list_powerpc
#define qmp_input_end_struct qmp_input_end_struct_powerpc #define qobject_input_end_struct qobject_input_end_struct_powerpc
#define qmp_input_get_next_type qmp_input_get_next_type_powerpc #define qobject_input_get_next_type qobject_input_get_next_type_powerpc
#define qmp_input_get_object qmp_input_get_object_powerpc #define qobject_input_get_object qobject_input_get_object_powerpc
#define qmp_input_get_visitor qmp_input_get_visitor_powerpc #define qobject_input_get_visitor qobject_input_get_visitor_powerpc
#define qmp_input_next_list qmp_input_next_list_powerpc #define qobject_input_next_list qobject_input_next_list_powerpc
#define qmp_input_optional qmp_input_optional_powerpc #define qobject_input_optional qobject_input_optional_powerpc
#define qmp_input_pop qmp_input_pop_powerpc #define qobject_input_pop qobject_input_pop_powerpc
#define qmp_input_push qmp_input_push_powerpc #define qobject_input_push qobject_input_push_powerpc
#define qmp_input_start_implicit_struct qmp_input_start_implicit_struct_powerpc #define qobject_input_start_implicit_struct qobject_input_start_implicit_struct_powerpc
#define qmp_input_start_list qmp_input_start_list_powerpc #define qobject_input_start_list qobject_input_start_list_powerpc
#define qmp_input_start_struct qmp_input_start_struct_powerpc #define qobject_input_start_struct qobject_input_start_struct_powerpc
#define qmp_input_type_bool qmp_input_type_bool_powerpc #define qobject_input_type_bool qobject_input_type_bool_powerpc
#define qmp_input_type_int qmp_input_type_int_powerpc #define qobject_input_type_int qobject_input_type_int_powerpc
#define qmp_input_type_number qmp_input_type_number_powerpc #define qobject_input_type_number qobject_input_type_number_powerpc
#define qmp_input_type_str qmp_input_type_str_powerpc #define qobject_input_type_str qobject_input_type_str_powerpc
#define qmp_input_visitor_cleanup qmp_input_visitor_cleanup_powerpc #define qobject_input_visitor_cleanup qobject_input_visitor_cleanup_powerpc
#define qmp_input_visitor_new qmp_input_visitor_new_powerpc #define qobject_input_visitor_new qobject_input_visitor_new_powerpc
#define qmp_input_visitor_new_strict qmp_input_visitor_new_strict_powerpc #define qobject_input_visitor_new_strict qobject_input_visitor_new_strict_powerpc
#define qmp_output_add_obj qmp_output_add_obj_powerpc #define qmp_output_add_obj qmp_output_add_obj_powerpc
#define qmp_output_end_list qmp_output_end_list_powerpc #define qmp_output_end_list qmp_output_end_list_powerpc
#define qmp_output_end_struct qmp_output_end_struct_powerpc #define qmp_output_end_struct qmp_output_end_struct_powerpc

140
qemu/qapi/qobject-input-visitor.c
View file

@ -33,7 +33,7 @@ typedef struct StackObject
QSLIST_ENTRY(StackObject) node; QSLIST_ENTRY(StackObject) node;
} StackObject; } StackObject;
struct QmpInputVisitor struct QObjectInputVisitor
{ {
Visitor visitor; Visitor visitor;
@ -48,12 +48,12 @@ struct QmpInputVisitor
bool strict; bool strict;
}; };
static QmpInputVisitor *to_qiv(Visitor *v) static QObjectInputVisitor *to_qiv(Visitor *v)
{ {
return container_of(v, QmpInputVisitor, visitor); return container_of(v, QObjectInputVisitor, visitor);
} }
static QObject *qmp_input_get_object(QmpInputVisitor *qiv, static QObject *qobject_input_get_object(QObjectInputVisitor *qiv,
const char *name, const char *name,
bool consume, Error **errp) bool consume, Error **errp)
{ {
@ -101,7 +101,7 @@ static void qdict_add_key(const char *key, QObject *obj, void *opaque)
g_hash_table_insert(h, (gpointer) key, NULL); g_hash_table_insert(h, (gpointer) key, NULL);
} }
static const QListEntry *qmp_input_push(QmpInputVisitor *qiv, QObject *obj, static const QListEntry *qobject_input_push(QObjectInputVisitor *qiv, QObject *obj,
void *qapi, Error **errp) void *qapi, Error **errp)
{ {
GHashTable *h; GHashTable *h;
@ -124,16 +124,16 @@ static const QListEntry *qmp_input_push(QmpInputVisitor *qiv, QObject *obj,
return tos->entry; return tos->entry;
} }
/** Only for qmp_input_pop. */ /** Only for qobject_input_pop. */
static gboolean always_true(gpointer key, gpointer val, gpointer user_pkey) static gboolean always_true(gpointer key, gpointer val, gpointer user_pkey)
{ {
*(const char **)user_pkey = (const char *)key; *(const char **)user_pkey = (const char *)key;
return TRUE; return TRUE;
} }
static void qmp_input_check_struct(Visitor *v, Error **errp) static void qobject_input_check_struct(Visitor *v, Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QObjectInputVisitor *qiv = to_qiv(v);
StackObject *tos = QSLIST_FIRST(&qiv->stack); StackObject *tos = QSLIST_FIRST(&qiv->stack);
assert(tos && !tos->entry); assert(tos && !tos->entry);
@ -150,7 +150,7 @@ static void qmp_input_check_struct(Visitor *v, Error **errp)
} }
} }
static void qmp_input_stack_object_free(StackObject *tos) static void qobject_input_stack_object_free(StackObject *tos)
{ {
if (tos->h) { if (tos->h) {
g_hash_table_unref(tos->h); g_hash_table_unref(tos->h);
@ -159,21 +159,21 @@ static void qmp_input_stack_object_free(StackObject *tos)
g_free(tos); g_free(tos);
} }
static void qmp_input_pop(Visitor *v, void **obj) static void qobject_input_pop(Visitor *v, void **obj)
{ {
QmpInputVisitor *qiv = to_qiv(v); QObjectInputVisitor *qiv = to_qiv(v);
StackObject *tos = QSLIST_FIRST(&qiv->stack); StackObject *tos = QSLIST_FIRST(&qiv->stack);
assert(tos && tos->qapi == obj); assert(tos && tos->qapi == obj);
QSLIST_REMOVE_HEAD(&qiv->stack, node); QSLIST_REMOVE_HEAD(&qiv->stack, node);
qmp_input_stack_object_free(tos); qobject_input_stack_object_free(tos);
} }
static void qmp_input_start_struct(Visitor *v, const char *name, void **obj, static void qobject_input_start_struct(Visitor *v, const char *name, void **obj,
size_t size, Error **errp) size_t size, Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QObjectInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, true, errp); QObject *qobj = qobject_input_get_object(qiv, name, true, errp);
Error *err = NULL; Error *err = NULL;
if (obj) { if (obj) {
@ -188,7 +188,7 @@ static void qmp_input_start_struct(Visitor *v, const char *name, void **obj,
return; return;
} }
qmp_input_push(qiv, qobj, obj, &err); qobject_input_push(qiv, qobj, obj, &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);
return; return;
@ -199,11 +199,11 @@ static void qmp_input_start_struct(Visitor *v, const char *name, void **obj,
} }
} }
static void qmp_input_start_list(Visitor *v, const char *name, static void qobject_input_start_list(Visitor *v, const char *name,
GenericList **list, size_t size, Error **errp) GenericList **list, size_t size, Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QObjectInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, true, errp); QObject *qobj = qobject_input_get_object(qiv, name, true, errp);
const QListEntry *entry; const QListEntry *entry;
if (!qobj) { if (!qobj) {
@ -218,7 +218,7 @@ static void qmp_input_start_list(Visitor *v, const char *name,
return; return;
} }
entry = qmp_input_push(qiv, qobj, list, errp); entry = qobject_input_push(qiv, qobj, list, errp);
if (list) { if (list) {
if (entry) { if (entry) {
*list = g_malloc0(size); *list = g_malloc0(size);
@ -228,10 +228,10 @@ static void qmp_input_start_list(Visitor *v, const char *name,
} }
} }
static GenericList *qmp_input_next_list(Visitor *v, GenericList *tail, static GenericList *qobject_input_next_list(Visitor *v, GenericList *tail,
size_t size) size_t size)
{ {
QmpInputVisitor *qiv = to_qiv(v); QObjectInputVisitor *qiv = to_qiv(v);
StackObject *so = QSLIST_FIRST(&qiv->stack); StackObject *so = QSLIST_FIRST(&qiv->stack);
if (!so->entry) { if (!so->entry) {
@ -241,12 +241,12 @@ static GenericList *qmp_input_next_list(Visitor *v, GenericList *tail,
return tail->next; return tail->next;
} }
static void qmp_input_start_alternate(Visitor *v, const char *name, static void qobject_input_start_alternate(Visitor *v, const char *name,
GenericAlternate **obj, size_t size, GenericAlternate **obj, size_t size,
bool promote_int, Error **errp) bool promote_int, Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QObjectInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, false, errp); QObject *qobj = qobject_input_get_object(qiv, name, false, errp);
if (!qobj) { if (!qobj) {
*obj = NULL; *obj = NULL;
@ -259,11 +259,11 @@ static void qmp_input_start_alternate(Visitor *v, const char *name,
} }
} }
static void qmp_input_type_int64(Visitor *v, const char *name, int64_t *obj, static void qobject_input_type_int64(Visitor *v, const char *name, int64_t *obj,
Error **errp) Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QObjectInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, true, errp); QObject *qobj = qobject_input_get_object(qiv, name, true, errp);
QInt *qint; QInt *qint;
if (!qobj) { if (!qobj) {
@ -279,12 +279,12 @@ static void qmp_input_type_int64(Visitor *v, const char *name, int64_t *obj,
*obj = qint_get_int(qint); *obj = qint_get_int(qint);
} }
static void qmp_input_type_uint64(Visitor *v, const char *name, uint64_t *obj, static void qobject_input_type_uint64(Visitor *v, const char *name, uint64_t *obj,
Error **errp) Error **errp)
{ {
/* FIXME: qobject_to_qint mishandles values over INT64_MAX */ /* FIXME: qobject_to_qint mishandles values over INT64_MAX */
QmpInputVisitor *qiv = to_qiv(v); QObjectInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, true, errp); QObject *qobj = qobject_input_get_object(qiv, name, true, errp);
QInt *qint; QInt *qint;
if (!qobj) { if (!qobj) {
@ -300,11 +300,11 @@ static void qmp_input_type_uint64(Visitor *v, const char *name, uint64_t *obj,
*obj = qint_get_int(qint); *obj = qint_get_int(qint);
} }
static void qmp_input_type_bool(Visitor *v, const char *name, bool *obj, static void qobject_input_type_bool(Visitor *v, const char *name, bool *obj,
Error **errp) Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QObjectInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, true, errp); QObject *qobj = qobject_input_get_object(qiv, name, true, errp);
QBool *qbool; QBool *qbool;
if (!qobj) { if (!qobj) {
@ -320,11 +320,11 @@ static void qmp_input_type_bool(Visitor *v, const char *name, bool *obj,
*obj = qbool_get_bool(qbool); *obj = qbool_get_bool(qbool);
} }
static void qmp_input_type_str(Visitor *v, const char *name, char **obj, static void qobject_input_type_str(Visitor *v, const char *name, char **obj,
Error **errp) Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QObjectInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, true, errp); QObject *qobj = qobject_input_get_object(qiv, name, true, errp);
QString *qstr; QString *qstr;
*obj = NULL; *obj = NULL;
@ -341,11 +341,11 @@ static void qmp_input_type_str(Visitor *v, const char *name, char **obj,
*obj = g_strdup(qstring_get_str(qstr)); *obj = g_strdup(qstring_get_str(qstr));
} }
static void qmp_input_type_number(Visitor *v, const char *name, double *obj, static void qobject_input_type_number(Visitor *v, const char *name, double *obj,
Error **errp) Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QObjectInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, true, errp); QObject *qobj = qobject_input_get_object(qiv, name, true, errp);
QInt *qint; QInt *qint;
QFloat *qfloat; QFloat *qfloat;
@ -368,11 +368,11 @@ static void qmp_input_type_number(Visitor *v, const char *name, double *obj,
"number"); "number");
} }
static void qmp_input_type_any(Visitor *v, const char *name, QObject **obj, static void qobject_input_type_any(Visitor *v, const char *name, QObject **obj,
Error **errp) Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QObjectInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, true, errp); QObject *qobj = qobject_input_get_object(qiv, name, true, errp);
*obj = NULL; *obj = NULL;
if (!qobj) { if (!qobj) {
@ -383,10 +383,10 @@ static void qmp_input_type_any(Visitor *v, const char *name, QObject **obj,
*obj = qobj; *obj = qobj;
} }
static void qmp_input_type_null(Visitor *v, const char *name, Error **errp) static void qobject_input_type_null(Visitor *v, const char *name, Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QObjectInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, true, errp); QObject *qobj = qobject_input_get_object(qiv, name, true, errp);
if (!qobj) { if (!qobj) {
return; return;
@ -398,10 +398,10 @@ static void qmp_input_type_null(Visitor *v, const char *name, Error **errp)
} }
} }
static void qmp_input_optional(Visitor *v, const char *name, bool *present) static void qobject_input_optional(Visitor *v, const char *name, bool *present)
{ {
QmpInputVisitor *qiv = to_qiv(v); QObjectInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, false, NULL); QObject *qobj = qobject_input_get_object(qiv, name, false, NULL);
if (!qobj) { if (!qobj) {
*present = false; *present = false;
@ -411,44 +411,44 @@ static void qmp_input_optional(Visitor *v, const char *name, bool *present)
*present = true; *present = true;
} }
static void qmp_input_free(Visitor *v) static void qobject_input_free(Visitor *v)
{ {
QmpInputVisitor *qiv = to_qiv(v); QObjectInputVisitor *qiv = to_qiv(v);
while (!QSLIST_EMPTY(&qiv->stack)) { while (!QSLIST_EMPTY(&qiv->stack)) {
StackObject *tos = QSLIST_FIRST(&qiv->stack); StackObject *tos = QSLIST_FIRST(&qiv->stack);
QSLIST_REMOVE_HEAD(&qiv->stack, node); QSLIST_REMOVE_HEAD(&qiv->stack, node);
qmp_input_stack_object_free(tos); qobject_input_stack_object_free(tos);
} }
qobject_decref(qiv->root); qobject_decref(qiv->root);
g_free(qiv); g_free(qiv);
} }
Visitor *qmp_input_visitor_new(QObject *obj, bool strict) Visitor *qobject_input_visitor_new(QObject *obj, bool strict)
{ {
QmpInputVisitor *v; QObjectInputVisitor *v;
assert(obj); assert(obj);
v = g_malloc0(sizeof(*v)); v = g_malloc0(sizeof(*v));
v->visitor.type = VISITOR_INPUT; v->visitor.type = VISITOR_INPUT;
v->visitor.start_struct = qmp_input_start_struct; v->visitor.start_struct = qobject_input_start_struct;
v->visitor.check_struct = qmp_input_check_struct; v->visitor.check_struct = qobject_input_check_struct;
v->visitor.end_struct = qmp_input_pop; v->visitor.end_struct = qobject_input_pop;
v->visitor.start_alternate = qmp_input_start_alternate; v->visitor.start_alternate = qobject_input_start_alternate;
v->visitor.start_list = qmp_input_start_list; v->visitor.start_list = qobject_input_start_list;
v->visitor.next_list = qmp_input_next_list; v->visitor.next_list = qobject_input_next_list;
v->visitor.end_list = qmp_input_pop; v->visitor.end_list = qobject_input_pop;
v->visitor.type_int64 = qmp_input_type_int64; v->visitor.type_int64 = qobject_input_type_int64;
v->visitor.type_uint64 = qmp_input_type_uint64; v->visitor.type_uint64 = qobject_input_type_uint64;
v->visitor.type_bool = qmp_input_type_bool; v->visitor.type_bool = qobject_input_type_bool;
v->visitor.type_str = qmp_input_type_str; v->visitor.type_str = qobject_input_type_str;
v->visitor.type_number = qmp_input_type_number; v->visitor.type_number = qobject_input_type_number;
v->visitor.type_any = qmp_input_type_any; v->visitor.type_any = qobject_input_type_any;
v->visitor.type_null = qmp_input_type_null; v->visitor.type_null = qobject_input_type_null;
v->visitor.optional = qmp_input_optional; v->visitor.optional = qobject_input_optional;
v->visitor.free = qmp_input_free; v->visitor.free = qobject_input_free;
v->strict = strict; v->strict = strict;
v->root = obj; v->root = obj;

2
qemu/qom/qom-qobject.c
View file

@ -23,7 +23,7 @@ void object_property_set_qobject(struct uc_struct *uc, Object *obj, QObject *val
{ {
Visitor *v; Visitor *v;
/* TODO: Should we reject, rather than ignore, excess input? */ /* TODO: Should we reject, rather than ignore, excess input? */
v = qmp_input_visitor_new(value, false); v = qobject_input_visitor_new(value, false);
object_property_set(uc, obj, v, name, errp); object_property_set(uc, obj, v, name, errp);
visit_free(v); visit_free(v);
} }

40
qemu/sparc.h
View file

@ -2474,26 +2474,26 @@
#define qlist_size qlist_size_sparc #define qlist_size qlist_size_sparc
#define qlist_size_iter qlist_size_iter_sparc #define qlist_size_iter qlist_size_iter_sparc
#define qlist_type qlist_type_sparc #define qlist_type qlist_type_sparc
#define qmp_input_end_implicit_struct qmp_input_end_implicit_struct_sparc #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_sparc
#define qmp_input_end_list qmp_input_end_list_sparc #define qobject_input_end_list qobject_input_end_list_sparc
#define qmp_input_end_struct qmp_input_end_struct_sparc #define qobject_input_end_struct qobject_input_end_struct_sparc
#define qmp_input_get_next_type qmp_input_get_next_type_sparc #define qobject_input_get_next_type qobject_input_get_next_type_sparc
#define qmp_input_get_object qmp_input_get_object_sparc #define qobject_input_get_object qobject_input_get_object_sparc
#define qmp_input_get_visitor qmp_input_get_visitor_sparc #define qobject_input_get_visitor qobject_input_get_visitor_sparc
#define qmp_input_next_list qmp_input_next_list_sparc #define qobject_input_next_list qobject_input_next_list_sparc
#define qmp_input_optional qmp_input_optional_sparc #define qobject_input_optional qobject_input_optional_sparc
#define qmp_input_pop qmp_input_pop_sparc #define qobject_input_pop qobject_input_pop_sparc
#define qmp_input_push qmp_input_push_sparc #define qobject_input_push qobject_input_push_sparc
#define qmp_input_start_implicit_struct qmp_input_start_implicit_struct_sparc #define qobject_input_start_implicit_struct qobject_input_start_implicit_struct_sparc
#define qmp_input_start_list qmp_input_start_list_sparc #define qobject_input_start_list qobject_input_start_list_sparc
#define qmp_input_start_struct qmp_input_start_struct_sparc #define qobject_input_start_struct qobject_input_start_struct_sparc
#define qmp_input_type_bool qmp_input_type_bool_sparc #define qobject_input_type_bool qobject_input_type_bool_sparc
#define qmp_input_type_int qmp_input_type_int_sparc #define qobject_input_type_int qobject_input_type_int_sparc
#define qmp_input_type_number qmp_input_type_number_sparc #define qobject_input_type_number qobject_input_type_number_sparc
#define qmp_input_type_str qmp_input_type_str_sparc #define qobject_input_type_str qobject_input_type_str_sparc
#define qmp_input_visitor_cleanup qmp_input_visitor_cleanup_sparc #define qobject_input_visitor_cleanup qobject_input_visitor_cleanup_sparc
#define qmp_input_visitor_new qmp_input_visitor_new_sparc #define qobject_input_visitor_new qobject_input_visitor_new_sparc
#define qmp_input_visitor_new_strict qmp_input_visitor_new_strict_sparc #define qobject_input_visitor_new_strict qobject_input_visitor_new_strict_sparc
#define qmp_output_add_obj qmp_output_add_obj_sparc #define qmp_output_add_obj qmp_output_add_obj_sparc
#define qmp_output_end_list qmp_output_end_list_sparc #define qmp_output_end_list qmp_output_end_list_sparc
#define qmp_output_end_struct qmp_output_end_struct_sparc #define qmp_output_end_struct qmp_output_end_struct_sparc

40
qemu/sparc64.h
View file

@ -2474,26 +2474,26 @@
#define qlist_size qlist_size_sparc64 #define qlist_size qlist_size_sparc64
#define qlist_size_iter qlist_size_iter_sparc64 #define qlist_size_iter qlist_size_iter_sparc64
#define qlist_type qlist_type_sparc64 #define qlist_type qlist_type_sparc64
#define qmp_input_end_implicit_struct qmp_input_end_implicit_struct_sparc64 #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_sparc64
#define qmp_input_end_list qmp_input_end_list_sparc64 #define qobject_input_end_list qobject_input_end_list_sparc64
#define qmp_input_end_struct qmp_input_end_struct_sparc64 #define qobject_input_end_struct qobject_input_end_struct_sparc64
#define qmp_input_get_next_type qmp_input_get_next_type_sparc64 #define qobject_input_get_next_type qobject_input_get_next_type_sparc64
#define qmp_input_get_object qmp_input_get_object_sparc64 #define qobject_input_get_object qobject_input_get_object_sparc64
#define qmp_input_get_visitor qmp_input_get_visitor_sparc64 #define qobject_input_get_visitor qobject_input_get_visitor_sparc64
#define qmp_input_next_list qmp_input_next_list_sparc64 #define qobject_input_next_list qobject_input_next_list_sparc64
#define qmp_input_optional qmp_input_optional_sparc64 #define qobject_input_optional qobject_input_optional_sparc64
#define qmp_input_pop qmp_input_pop_sparc64 #define qobject_input_pop qobject_input_pop_sparc64
#define qmp_input_push qmp_input_push_sparc64 #define qobject_input_push qobject_input_push_sparc64
#define qmp_input_start_implicit_struct qmp_input_start_implicit_struct_sparc64 #define qobject_input_start_implicit_struct qobject_input_start_implicit_struct_sparc64
#define qmp_input_start_list qmp_input_start_list_sparc64 #define qobject_input_start_list qobject_input_start_list_sparc64
#define qmp_input_start_struct qmp_input_start_struct_sparc64 #define qobject_input_start_struct qobject_input_start_struct_sparc64
#define qmp_input_type_bool qmp_input_type_bool_sparc64 #define qobject_input_type_bool qobject_input_type_bool_sparc64
#define qmp_input_type_int qmp_input_type_int_sparc64 #define qobject_input_type_int qobject_input_type_int_sparc64
#define qmp_input_type_number qmp_input_type_number_sparc64 #define qobject_input_type_number qobject_input_type_number_sparc64
#define qmp_input_type_str qmp_input_type_str_sparc64 #define qobject_input_type_str qobject_input_type_str_sparc64
#define qmp_input_visitor_cleanup qmp_input_visitor_cleanup_sparc64 #define qobject_input_visitor_cleanup qobject_input_visitor_cleanup_sparc64
#define qmp_input_visitor_new qmp_input_visitor_new_sparc64 #define qobject_input_visitor_new qobject_input_visitor_new_sparc64
#define qmp_input_visitor_new_strict qmp_input_visitor_new_strict_sparc64 #define qobject_input_visitor_new_strict qobject_input_visitor_new_strict_sparc64
#define qmp_output_add_obj qmp_output_add_obj_sparc64 #define qmp_output_add_obj qmp_output_add_obj_sparc64
#define qmp_output_end_list qmp_output_end_list_sparc64 #define qmp_output_end_list qmp_output_end_list_sparc64
#define qmp_output_end_struct qmp_output_end_struct_sparc64 #define qmp_output_end_struct qmp_output_end_struct_sparc64

40
qemu/x86_64.h
View file

@ -2474,26 +2474,26 @@
#define qlist_size qlist_size_x86_64 #define qlist_size qlist_size_x86_64
#define qlist_size_iter qlist_size_iter_x86_64 #define qlist_size_iter qlist_size_iter_x86_64
#define qlist_type qlist_type_x86_64 #define qlist_type qlist_type_x86_64
#define qmp_input_end_implicit_struct qmp_input_end_implicit_struct_x86_64 #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_x86_64
#define qmp_input_end_list qmp_input_end_list_x86_64 #define qobject_input_end_list qobject_input_end_list_x86_64
#define qmp_input_end_struct qmp_input_end_struct_x86_64 #define qobject_input_end_struct qobject_input_end_struct_x86_64
#define qmp_input_get_next_type qmp_input_get_next_type_x86_64 #define qobject_input_get_next_type qobject_input_get_next_type_x86_64
#define qmp_input_get_object qmp_input_get_object_x86_64 #define qobject_input_get_object qobject_input_get_object_x86_64
#define qmp_input_get_visitor qmp_input_get_visitor_x86_64 #define qobject_input_get_visitor qobject_input_get_visitor_x86_64
#define qmp_input_next_list qmp_input_next_list_x86_64 #define qobject_input_next_list qobject_input_next_list_x86_64
#define qmp_input_optional qmp_input_optional_x86_64 #define qobject_input_optional qobject_input_optional_x86_64
#define qmp_input_pop qmp_input_pop_x86_64 #define qobject_input_pop qobject_input_pop_x86_64
#define qmp_input_push qmp_input_push_x86_64 #define qobject_input_push qobject_input_push_x86_64
#define qmp_input_start_implicit_struct qmp_input_start_implicit_struct_x86_64 #define qobject_input_start_implicit_struct qobject_input_start_implicit_struct_x86_64
#define qmp_input_start_list qmp_input_start_list_x86_64 #define qobject_input_start_list qobject_input_start_list_x86_64
#define qmp_input_start_struct qmp_input_start_struct_x86_64 #define qobject_input_start_struct qobject_input_start_struct_x86_64
#define qmp_input_type_bool qmp_input_type_bool_x86_64 #define qobject_input_type_bool qobject_input_type_bool_x86_64
#define qmp_input_type_int qmp_input_type_int_x86_64 #define qobject_input_type_int qobject_input_type_int_x86_64
#define qmp_input_type_number qmp_input_type_number_x86_64 #define qobject_input_type_number qobject_input_type_number_x86_64
#define qmp_input_type_str qmp_input_type_str_x86_64 #define qobject_input_type_str qobject_input_type_str_x86_64
#define qmp_input_visitor_cleanup qmp_input_visitor_cleanup_x86_64 #define qobject_input_visitor_cleanup qobject_input_visitor_cleanup_x86_64
#define qmp_input_visitor_new qmp_input_visitor_new_x86_64 #define qobject_input_visitor_new qobject_input_visitor_new_x86_64
#define qmp_input_visitor_new_strict qmp_input_visitor_new_strict_x86_64 #define qobject_input_visitor_new_strict qobject_input_visitor_new_strict_x86_64
#define qmp_output_add_obj qmp_output_add_obj_x86_64 #define qmp_output_add_obj qmp_output_add_obj_x86_64
#define qmp_output_end_list qmp_output_end_list_x86_64 #define qmp_output_end_list qmp_output_end_list_x86_64
#define qmp_output_end_struct qmp_output_end_struct_x86_64 #define qmp_output_end_struct qmp_output_end_struct_x86_64