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..' The first patch tweaks the command line parsing so that argv is not reordered by getopt_long and optind is only advanced by one option+argument on every call to getopt_long. This is required by loc_set_cmdline. Paolo Bonzini (2): storage-daemon: report unexpected arguments on the fly storage-daemon: include current command line option in the errors storage-daemon/qemu-storage-daemon.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) -- 2.26.2