aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@linaro.org>2023-10-04 14:00:18 +0200
committerMarkus Armbruster <armbru@redhat.com>2023-10-06 13:27:48 +0200
commitfcd9a353798d09a6fe39e720fb1a52ed32cad91d (patch)
treeec324eb962997dc60c645a9f8f3186c344ea9591
parent48176a1d287179ea4e85122e1bc803f329773141 (diff)
downloadqemu-fcd9a353798d09a6fe39e720fb1a52ed32cad91d.zip
qemu-fcd9a353798d09a6fe39e720fb1a52ed32cad91d.tar.gz
qemu-fcd9a353798d09a6fe39e720fb1a52ed32cad91d.tar.bz2
sysemu/tpm: Clean up global variable shadowing
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>
-rw-r--r--include/sysemu/tpm.h2
-rw-r--r--softmmu/tpm.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h
index 66e3b45..1ee568b 100644
--- a/include/sysemu/tpm.h
+++ b/include/sysemu/tpm.h
@@ -17,7 +17,7 @@
#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);
void tpm_cleanup(void);
diff --git a/softmmu/tpm.c b/softmmu/tpm.c
index 578563f..7164ea7 100644
--- a/softmmu/tpm.c
+++ b/softmmu/tpm.c
@@ -175,15 +175,15 @@ int tpm_init(void)
* Parse the TPM configuration options.
* 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;
- if (!strcmp(optarg, "help")) {
+ if (!strcmp(optstr, "help")) {
tpm_display_backend_drivers();
return -1;
}
- opts = qemu_opts_parse_noisily(opts_list, optarg, true);
+ opts = qemu_opts_parse_noisily(opts_list, optstr, true);
if (!opts) {
return -1;
}