haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

storage-daemon: include current command line option in the errors

Browse source 
Use the location management facilities that the emulator uses, so that
the current command line option appears in the error message.

Before:

  $ storage-daemon/qemu-storage-daemon --nbd key..=
  qemu-storage-daemon: Invalid parameter 'key..'

After:

  $ storage-daemon/qemu-storage-daemon --nbd key..=
  qemu-storage-daemon: --nbd key..=: Invalid parameter 'key..'

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210301152844.291799-3-pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Paolo Bonzini 2021-03-01 10:28:44 -05:00 committed by Kevin Wolf
parent a5ef35052e
commit 501a4b3681
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
storage-daemon/qemu-storage-daemon.c
View file

@ -152,6 +152,20 @@ static void init_qmp_commands(void)
qmp_marshal_qmp_capabilities, QCO_ALLOW_PRECONFIG); qmp_marshal_qmp_capabilities, QCO_ALLOW_PRECONFIG);
} }
static int getopt_set_loc(int argc, char **argv, const char *optstring,
const struct option *longopts)
{
int c, save_index;
optarg = NULL;
save_index = optind;
c = getopt_long(argc, argv, optstring, longopts, NULL);
if (optarg) {
loc_set_cmdline(argv, save_index, MAX(1, optind - save_index));
}
return c;
}
static void process_options(int argc, char *argv[]) static void process_options(int argc, char *argv[])
{ {
int c; int c;
@ -174,7 +188,7 @@ static void process_options(int argc, char *argv[])
* they are given on the command lines. This means that things must be * they are given on the command lines. This means that things must be
* defined first before they can be referenced in another option. * defined first before they can be referenced in another option.
*/ */
while ((c = getopt_long(argc, argv, "-hT:V", long_options, NULL)) != -1) { while ((c = getopt_set_loc(argc, argv, "-hT:V", long_options)) != -1) {
switch (c) { switch (c) {
case '?': case '?':
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -276,12 +290,13 @@ static void process_options(int argc, char *argv[])
break; break;
} }
case 1: case 1:
error_report("Unexpected argument: %s", optarg); error_report("Unexpected argument");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
default: default:
g_assert_not_reached(); g_assert_not_reached();
} }
} }
loc_set_none();
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])