mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysemu/tpm: Clean up global variable shadowing

Browse Source 
Fix:

  softmmu/tpm.c:178:59: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
  int tpm_config_parse(QemuOptsList *opts_list, 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-16-philmd@linaro.org>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2023-10-04 14:00:18 +02:00 committed by Markus Armbruster
parent 48176a1d28
commit fcd9a35379
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sysemu/tpm.h
View File

@ -17,7 +17,7 @@
#ifdef CONFIG_TPM #ifdef CONFIG_TPM
int tpm_config_parse(QemuOptsList *opts_list, const char *optarg); int tpm_config_parse(QemuOptsList *opts_list, const char *optstr);
int tpm_init(void); int tpm_init(void);
void tpm_cleanup(void); void tpm_cleanup(void);

6
softmmu/tpm.c
View File

@ -175,15 +175,15 @@ int tpm_init(void)
* Parse the TPM configuration options. * Parse the TPM configuration options.
* To display all available TPM backends the user may use '-tpmdev help' * To display all available TPM backends the user may use '-tpmdev help'
*/ */
int tpm_config_parse(QemuOptsList *opts_list, const char *optarg) int tpm_config_parse(QemuOptsList *opts_list, const char *optstr)
{ {
QemuOpts *opts; QemuOpts *opts;
if (!strcmp(optarg, "help")) { if (!strcmp(optstr, "help")) {
tpm_display_backend_drivers(); tpm_display_backend_drivers();
return -1; return -1;
} }
opts = qemu_opts_parse_noisily(opts_list, optarg, true); opts = qemu_opts_parse_noisily(opts_list, optstr, true);
if (!opts) { if (!opts) {
return -1; return -1;
} }