ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

softmmu/vl: Clean up global variable shadowing 

Fix:

  softmmu/vl.c:1069:44: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
  static void parse_display_qapi(const char *optarg)
                                             ^
  softmmu/vl.c:1224:39: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
  static void monitor_parse(const char *optarg, const char *mode, bool pretty)
                                        ^
  softmmu/vl.c:1634:17: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
      const char *optarg = qdict_get_try_str(qdict, "type");
                  ^
  softmmu/vl.c:1784:45: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
  static void object_option_parse(const char *optarg)
                                              ^
  /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/getopt.h:77:14: note: previous declaration is here
  extern char *optarg;                    /* getopt(3) external variables */
               ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231004120019.93101-15-philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Tweak two parameter names]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2023-10-04 14:00:17 +02:00 committed by Markus Armbruster
parent a60e5736eb
commit 48176a1d28
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
softmmu/vl.c
View File

@ -1066,12 +1066,12 @@ static void select_vgahw(const MachineClass *machine_class, const char *p)
} }
} }
static void parse_display_qapi(const char *optarg) static void parse_display_qapi(const char *str)
{ {
DisplayOptions *opts; DisplayOptions *opts;
Visitor *v; Visitor *v;
v = qobject_input_visitor_new_str(optarg, "type", &error_fatal); v = qobject_input_visitor_new_str(str, "type", &error_fatal);
visit_type_DisplayOptions(v, NULL, &opts, &error_fatal); visit_type_DisplayOptions(v, NULL, &opts, &error_fatal);
QAPI_CLONE_MEMBERS(DisplayOptions, &dpy, opts); QAPI_CLONE_MEMBERS(DisplayOptions, &dpy, opts);
@ -1221,21 +1221,21 @@ static int mon_init_func(void *opaque, QemuOpts *opts, Error **errp)
return monitor_init_opts(opts, errp); return monitor_init_opts(opts, errp);
} }
static void monitor_parse(const char *optarg, const char *mode, bool pretty) static void monitor_parse(const char *str, const char *mode, bool pretty)
{ {
static int monitor_device_index = 0; static int monitor_device_index = 0;
QemuOpts *opts; QemuOpts *opts;
const char *p; const char *p;
char label[32]; char label[32];
if (strstart(optarg, "chardev:", &p)) { if (strstart(str, "chardev:", &p)) {
snprintf(label, sizeof(label), "%s", p); snprintf(label, sizeof(label), "%s", p);
} else { } else {
snprintf(label, sizeof(label), "compat_monitor%d", snprintf(label, sizeof(label), "compat_monitor%d",
monitor_device_index); monitor_device_index);
opts = qemu_chr_parse_compat(label, optarg, true); opts = qemu_chr_parse_compat(label, str, true);
if (!opts) { if (!opts) {
error_report("parse error: %s", optarg); error_report("parse error: %s", str);
exit(1); exit(1);
} }
} }
@ -1631,13 +1631,13 @@ static const QEMUOption *lookup_opt(int argc, char **argv,
static MachineClass *select_machine(QDict *qdict, Error **errp) static MachineClass *select_machine(QDict *qdict, Error **errp)
{ {
const char *optarg = qdict_get_try_str(qdict, "type"); const char *machine_type = qdict_get_try_str(qdict, "type");
GSList *machines = object_class_get_list(TYPE_MACHINE, false); GSList *machines = object_class_get_list(TYPE_MACHINE, false);
MachineClass *machine_class; MachineClass *machine_class;
Error *local_err = NULL; Error *local_err = NULL;
if (optarg) { if (machine_type) {
machine_class = find_machine(optarg, machines); machine_class = find_machine(machine_type, machines);
qdict_del(qdict, "type"); qdict_del(qdict, "type");
if (!machine_class) { if (!machine_class) {
error_setg(&local_err, "unsupported machine type"); error_setg(&local_err, "unsupported machine type");
@ -1781,20 +1781,20 @@ static void object_option_add_visitor(Visitor *v)
QTAILQ_INSERT_TAIL(&object_opts, opt, next); QTAILQ_INSERT_TAIL(&object_opts, opt, next);
} }
static void object_option_parse(const char *optarg) static void object_option_parse(const char *str)
{ {
QemuOpts *opts; QemuOpts *opts;
const char *type; const char *type;
Visitor *v; Visitor *v;
if (optarg[0] == '{') { if (str[0] == '{') {
QObject *obj = qobject_from_json(optarg, &error_fatal); QObject *obj = qobject_from_json(str, &error_fatal);
v = qobject_input_visitor_new(obj); v = qobject_input_visitor_new(obj);
qobject_unref(obj); qobject_unref(obj);
} else { } else {
opts = qemu_opts_parse_noisily(qemu_find_opts("object"), opts = qemu_opts_parse_noisily(qemu_find_opts("object"),
optarg, true); str, true);
if (!opts) { if (!opts) {
exit(1); exit(1);
} }