Error reporting fixes
cover Error reporting fixes
I tagged this for 1.4 because the patches improve the user experience a bit, and are all low risk.
Markus Armbruster (6):
error: Clean up error strings with embedded newlines
error: Clean up abuse of error_report() for help
error: Strip trailing '\n' from error string arguments (again)
qemu-option: Disable two helpful messages that got broken recently
vl: Drop redundant "parse error" reports
vl: Exit unsuccessfully on option argument syntax error
block/gluster.c | 2 +- hmp.c | 2 +- hw/9pfs/virtio-9p-proxy.c | 2 +- hw/kvm/pci-assign.c | 10 ++-- hw/pci/pci.c | 2 +- hw/qdev.c | 4 +- hw/qxl.c | 2 +- hw/vfio_pci.c | 114 ++++++++++++++++++++++---------------------- hw/vhost_net.c | 4 +- migration.c | 2 +- qemu-char.c | 8 ++-- target-i386/cpu.c | 10 ++-- target-ppc/translate_init.c | 2 +- ui/console.c | 2 +- ui/input.c | 2 +- util/qemu-config.c | 6 +-- util/qemu-option.c | 4 ++ util/qemu-sockets.c | 6 +-- vl.c | 14 +++--- 19 files changed, 102 insertions(+), 96 deletions(-)
Signature · 1 line
1.7.11.7
PATCH 1/6 error: Clean up error strings with embedded newlines
The arguments of error_report() should yield a short error string without newlines.
A few places try to print additional help after the error message by embedding newlines in the error string. That's nice, but let's do it the right way.
--- hw/kvm/pci-assign.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
hw/kvm/pci-assign.c +5 -5
@@ -936,8 +936,8 @@ retry:/* Retry with host-side MSI. There might be an IRQ conflict and * either the kernel or the device doesn't support sharing. */ error_report ("Host-side INTx sharing not supported, " -"using MSI instead.\n" -"Some devices do not to work properly in this mode." ); +"using MSI instead" ); +error_printf ("Some devices do not to work properly in this mode." ); dev->features |=ASSIGNED_DEVICE_PREFER_MSI_MASK ; goto retry; }
@@ -1903,10 +1903,10 @@ static void assigned_dev_load_option_rom(AssignedDevice *dev)memset (ptr,0xff , st.st_size);if (!fread (ptr,1 , st.st_size, fp)) { -error_report ("pci-assign: Cannot read from host %s\n" -"\tDevice option ROM contents are probably invalid " +error_report ("pci-assign: Cannot read from host %s" , rom_file); +error_printf ("\tDevice option ROM contents are probably invalid " "(check dmesg).\n\tSkip option ROM probe with rombar=0, " -"or load from file with romfile=" , rom_file); +"or load from file with romfile=\n" );memory_region_destroy (&dev->dev.rom); goto close_rom; }
Signature · 1 line
1.7.11.7
Re: [Qemu-trivial] [Qemu-devel] [PATCH for-1.4 1/6] error: Clean up error strings with embedded newlines
Quoted 17 lines · Markus Armbruster
The arguments of
error_report()should yield a short error string without newlines.A few places try to print additional help after the error message by embedding newlines in the error string. That's nice, but let's do it the right way.
Signed-off-by Markus Armbruster <[email protected]>--- hw/kvm/pci-assign.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)hw/kvm/pci-assign.c +0
-0
hw/kvm/pci-assign.c retry: · line 940
Quoted 7 lines
hw/kvm/pci-assign.c +2
-2@@ -936,8 +936,8 @@ retry:/* Retry with host-side MSI. There might be an IRQ conflict and * either the kernel or the device doesn't support sharing. */ error_report ("Host-side INTx sharing not supported, " -"using MSI instead.\n" -"Some devices do not to work properly in this mode." ); +"using MSI instead" ); +error_printf ("Some devices do not to work properly in this mode." );
"do not work properly"
Quoted 4 lines
hw/kvm/pci-assign.c +0
-0dev->features |=ASSIGNED_DEVICE_PREFER_MSI_MASK ; goto retry; }
hw/kvm/pci-assign.c static void assigned_dev_load_option_rom(AssignedDevice *dev) · line 1909
Quoted 10 lines
hw/kvm/pci-assign.c +3
-3@@ -1903,10 +1903,10 @@ static void assigned_dev_load_option_rom(AssignedDevice *dev)memset (ptr,0xff , st.st_size);if (!fread (ptr,1 , st.st_size, fp)) { -error_report ("pci-assign: Cannot read from host %s\n" -"\tDevice option ROM contents are probably invalid " +error_report ("pci-assign: Cannot read from host %s" , rom_file); +error_printf ("\tDevice option ROM contents are probably invalid " "(check dmesg).\n\tSkip option ROM probe with rombar=0, " -"or load from file with romfile=" , rom_file); +"or load from file with romfile=\n" );
So should error_printf() strings end with \n or not? This one does, the one in the hunk above doesn't...
(also we should probably either drop those \t indents or have error_printf() add them automatically or otherwise indicate that this is followon additional info about a previous error.)
-- PMM
Re: [Qemu-trivial] [Qemu-devel] [PATCH for-1.4 1/6] error: Clean up error strings with embedded newlines
Quoted 13 lines · Peter Maydell
Quoted 12 lines · Markus Armbruster
The arguments of
error_report()should yield a short error string without newlines.A few places try to print additional help after the error message by embedding newlines in the error string. That's nice, but let's do it the right way.
Signed-off-by Markus Armbruster <[email protected]>--- hw/kvm/pci-assign.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Quoted 14 lines
hw/kvm/pci-assign.c retry: · line 940
Quoted 12 lines
hw/kvm/pci-assign.c +2
-2@@ -936,8 +936,8 @@ retry:/* Retry with host-side MSI. There might be an IRQ conflict and * either the kernel or the device doesn't support sharing. */ error_report ("Host-side INTx sharing not supported, " -"using MSI instead.\n" -"Some devices do not to work properly in this mode." ); +"using MSI instead" ); +error_printf ("Some devices do not to work properly in this mode." );"do not work properly"
Since I'm touching the line anyway...
Quoted 6 lines
Quoted 6 lines
hw/kvm/pci-assign.c +0
-0dev->features |=ASSIGNED_DEVICE_PREFER_MSI_MASK ; goto retry; }@@ -1903,10 +1903,10 @@ static void assigned_dev_load_option_rom(AssignedDevice *dev)memset (ptr,0xff , st.st_size);
Quoted 11 lines
hw/kvm/pci-assign.c static void assigned_dev_load_option_rom(AssignedDevice *dev) · line 1909
Quoted 8 lines
hw/kvm/pci-assign.c +3
-3if (!fread (ptr,1 , st.st_size, fp)) { -error_report ("pci-assign: Cannot read from host %s\n" -"\tDevice option ROM contents are probably invalid " +error_report ("pci-assign: Cannot read from host %s" , rom_file); +error_printf ("\tDevice option ROM contents are probably invalid " "(check dmesg).\n\tSkip option ROM probe with rombar=0, " -"or load from file with romfile=" , rom_file); +"or load from file with romfile=\n" );So should
error_printf()strings end with \n or not? This one does, the one in the hunk above doesn't...
The hunk above is a bug. Will fix.
Quoted 3 lines
(also we should probably either drop those \t indents or have
error_printf()add them automatically or otherwise indicate that this is followon additional info about a previous error.)
error_printf() is just like printf(), except it prints to wherever error messages go. In fact, error_report() uses error_printf() to print.
We could have an API to for emitting helpful text after an error message. Its implementation could print the text indented, if we so desire. I doubt it's really worthwhile.
Since this is the only place that indents text following an error message, let's just drop the tabs.
Thanks!
PATCH 2/6 error: Clean up abuse of error_report() for help
In reply to Markus ArmbrusterUse error_printf() instead, so the help gets presented more nicely.
--- hw/vfio_pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/vfio_pci.c +2 -2
@@ -1806,9 +1806,9 @@ static int vfio_get_device(VFIOGroup *group, const char *name, VFIODevice *vdev) ret =ioctl (group->fd,VFIO_GROUP_GET_DEVICE_FD , name);if (ret <0 ) { -error_report ("vfio: error getting device %s from group %d: %m\n" , +error_report ("vfio: error getting device %s from group %d: %m" , name, group->groupid); -error_report ("Verify all devices in group %d are bound to vfio-pci " +error_printf ("Verify all devices in group %d are bound to vfio-pci " "or pci-stub and not already in use\n" , group->groupid);return ret; }
Signature · 1 line
1.7.11.7
PATCH 3/6 error: Strip trailing '\n' from error string arguments (again)
In reply to Markus ArmbrusterCommit 6daf194d and be62a2eb got rid of a bunch, but they keep coming back. Tracked down with this Coccinelle semantic patch:
@r@
expression err, eno, cls, fmt;
position p;
@@
(
error_report(fmt, ...)@p
|
error_set(err, cls, fmt, ...)@p
|
error_set_errno(err, eno, cls, fmt, ...)@p
|
error_setg(err, fmt, ...)@p
|
error_setg_errno(err, eno, fmt, ...)@p
)
@script:python@
fmt << r.fmt;
p << r.p;
@@
if "\\n" in str(fmt):
print "%s:%s:%s:%s" % (p[0].file, p[0].line, p[0].column, fmt)--- block/gluster.c | 2 +- hmp.c | 2 +- hw/9pfs/virtio-9p-proxy.c | 2 +- hw/pci/pci.c | 2 +- hw/qdev.c | 4 +- hw/qxl.c | 2 +- hw/vfio_pci.c | 110 ++++++++++++++++++++++---------------------- hw/vhost_net.c | 4 +- migration.c | 2 +- qemu-char.c | 8 ++-- target-i386/cpu.c | 10 ++-- target-ppc/translate_init.c | 2 +- ui/console.c | 2 +- ui/input.c | 2 +- util/qemu-config.c | 6 +-- util/qemu-sockets.c | 6 +-- 16 files changed, 83 insertions(+), 83 deletions(-)
block/gluster.c +1 -1
@@ -217,7 +217,7 @@ static struct glfs *qemu_gluster_init(GlusterConf *gconf, const char *filename) ret =glfs_init (glfs);if (ret) {error_report ("Gluster connection failed for server=%s port=%d " -"volume=%s image=%s transport=%s\n" , gconf->server, gconf->port, +"volume=%s image=%s transport=%s" , gconf->server, gconf->port, gconf->volname, gconf->image, gconf->transport); goto out; }
hmp.c +1 -1
@@ -1365,7 +1365,7 @@ void hmp_chardev_add(Monitor *mon, const QDict *qdict) opts =qemu_opts_parse (qemu_find_opts ("chardev" ), args,1 );if (opts ==NULL ) { -error_setg (&err,"Parsing chardev args failed\n" ); +error_setg (&err,"Parsing chardev args failed" ); }else {qemu_chr_new_from_opts (opts,NULL , &err); }
hw/9pfs/virtio-9p-proxy.c +1 -1
@@ -521,7 +521,7 @@ static int v9fs_request(V9fsProxy *proxy, int type, }break ;default : -error_report ("Invalid type %d\n" , type); +error_report ("Invalid type %d" , type); retval = -EINVAL ;break ; }
hw/pci/pci.c +1 -1
@@ -1132,7 +1132,7 @@ PCIINTxRoute pci_device_route_intx_to_irq(PCIDevice *dev, int pin) }while (dev);if (!bus->route_intx_to_irq) { -error_report ("PCI: Bug - unimplemented PCI INTx routing (%s)\n" , +error_report ("PCI: Bug - unimplemented PCI INTx routing (%s)" ,object_get_typename (OBJECT (bus->qbus.parent)));return (PCIINTxRoute ) {PCI_INTX_DISABLED ,-1 }; }
hw/qdev.c +2 -2
@@ -114,11 +114,11 @@ DeviceState *qdev_create(BusState *bus, const char *name) dev =qdev_try_create (bus, name);if (!dev) {if (bus) { -error_report ("Unknown device '%s' for bus '%s'\n" , name, +error_report ("Unknown device '%s' for bus '%s'" , name,object_get_typename (OBJECT (bus)));abort (); }else { -error_report ("Unknown device '%s' for default sysbus\n" , name); +error_report ("Unknown device '%s' for default sysbus" , name);abort (); } }
hw/qxl.c +1 -1
@@ -2036,7 +2036,7 @@ static int qxl_init_common(PCIQXLDevice *qxl) qxl->ssd.qxl.base.sif = &qxl_interface.base; qxl->ssd.qxl.id = qxl->id;if (qemu_spice_add_interface (&qxl->ssd.qxl.base) !=0 ) { -error_report ("qxl interface %d.%d not supported by spice-server\n" , +error_report ("qxl interface %d.%d not supported by spice-server" ,SPICE_INTERFACE_QXL_MAJOR ,SPICE_INTERFACE_QXL_MINOR );return -1 ; }
hw/vfio_pci.c +55 -55
430 lines not on this page · raw message
hw/vhost_net.c +2 -2
@@ -214,7 +214,7 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,int r, i =0 ;if (!dev->binding->set_guest_notifiers) { -error_report ("binding does not support guest notifiers\n" ); +error_report ("binding does not support guest notifiers" ); r = -ENOSYS ; goto err; }
@@ -231,7 +231,7 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs, total_queues *2 , true);if (r <0 ) { -error_report ("Error binding guest notifier: %d\n" , -r); +error_report ("Error binding guest notifier: %d" , -r); goto err; }
migration.c +1 -1
@@ -85,7 +85,7 @@ void qemu_start_incoming_migration(const char *uri, Error **errp)fd_start_incoming_migration (p, errp);#endif else { -error_setg (errp,"unknown migration protocol: %s\n" , uri); +error_setg (errp,"unknown migration protocol: %s" , uri); } }
qemu-char.c +4 -4
@@ -3021,12 +3021,12 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts,int i;if (qemu_opts_id (opts) ==NULL ) { -error_setg (errp,"chardev: no id specified\n" ); +error_setg (errp,"chardev: no id specified" ); goto err; }if (qemu_opt_get (opts,"backend" ) ==NULL ) { -error_setg (errp,"chardev: \"%s\" missing backend\n" , +error_setg (errp,"chardev: \"%s\" missing backend" ,qemu_opts_id (opts)); goto err; }
@@ -3035,14 +3035,14 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts,break ; }if (i ==ARRAY_SIZE (backend_table)) { -error_setg (errp,"chardev: backend \"%s\" not found\n" , +error_setg (errp,"chardev: backend \"%s\" not found" ,qemu_opt_get (opts,"backend" )); goto err; } chr = backend_table[i].open (opts);if (!chr) { -error_setg (errp,"chardev: opening backend \"%s\" failed\n" , +error_setg (errp,"chardev: opening backend \"%s\" failed" ,qemu_opt_get (opts,"backend" )); goto err; }
target-i386/cpu.c +5 -5
@@ -1333,7 +1333,7 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, char *features, Error **errp) numvalue =strtoul (val, &err,0 );if (!*val || *err) { -error_setg (errp,"bad numerical value %s\n" , val); +error_setg (errp,"bad numerical value %s" , val); goto out; }if (numvalue <0x80000000 ) {
@@ -1355,7 +1355,7 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, char *features, Error **errp) tsc_freq =strtosz_suffix_unit (val, &err,STRTOSZ_DEFSUFFIX_B ,1000 );if (tsc_freq <0 || *err) { -error_setg (errp,"bad numerical value %s\n" , val); +error_setg (errp,"bad numerical value %s" , val); goto out; }snprintf (num,sizeof (num),"%" PRId64, tsc_freq);
@@ -1364,12 +1364,12 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, char *features, Error **errp)char *err; numvalue =strtoul (val, &err,0 );if (!*val || *err) { -error_setg (errp,"bad numerical value %s\n" , val); +error_setg (errp,"bad numerical value %s" , val); goto out; }hyperv_set_spinlock_retries (numvalue); }else { -error_setg (errp,"unrecognized feature %s\n" , featurestr); +error_setg (errp,"unrecognized feature %s" , featurestr); goto out; } }else if (!strcmp (featurestr,"check" )) {
@@ -1382,7 +1382,7 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, char *features, Error **errp)hyperv_enable_vapic_recommended (true); }else {error_setg (errp,"feature string `%s' not in format (+feature|" -"-feature|feature=xyz)\n" , featurestr); +"-feature|feature=xyz)" , featurestr); goto out; }if (error_is_set (errp)) {
target-ppc/translate_init.c +1 -1
@@ -9806,7 +9806,7 @@ static void create_ppc_opcodes(PowerPCCPU *cpu, Error **errp) ((opc->handler.type2 & def->insns_flags2) != 0)) {if (register_insn (env->opcodes, opc) <0 ) {error_setg (errp,"ERROR initializing PowerPC instruction " -"0x%02x 0x%02x 0x%02x\n" , opc->opc1, opc->opc2, +"0x%02x 0x%02x 0x%02x" , opc->opc1, opc->opc2, opc->opc3);return ; }
ui/console.c +1 -1
@@ -194,7 +194,7 @@ void qmp_screendump(const char *filename, Error **errp)if (consoles[0 ] && consoles[0 ]->hw_screen_dump) { consoles[0 ]->hw_screen_dump (consoles[0 ]->hw, filename, cswitch, errp); }else { -error_setg (errp,"device doesn't support screendump\n" ); +error_setg (errp,"device doesn't support screendump" ); }if (cswitch) {
ui/input.c +1 -1
@@ -269,7 +269,7 @@ void qmp_send_key(KeyValueList *keys, bool has_hold_time, int64_t hold_time,/* key down events */ keycode =keycode_from_keyvalue (p->value);if (keycode <0x01 || keycode >0xff ) { -error_setg (errp,"invalid hex keycode 0x%x\n" , keycode); +error_setg (errp,"invalid hex keycode 0x%x" , keycode);free_keycodes ();return ; }
util/qemu-config.c +3 -3
@@ -29,7 +29,7 @@ QemuOptsList *qemu_find_opts(const char *group) ret =find_list (vm_config_groups, group, &local_err);if (error_is_set (&local_err)) { -error_report ("%s\n" ,error_get_pretty (local_err)); +error_report ("%s" ,error_get_pretty (local_err));error_free (local_err); }
@@ -153,7 +153,7 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname)/* group with id */ list =find_list (lists, group, &local_err);if (error_is_set (&local_err)) { -error_report ("%s\n" ,error_get_pretty (local_err)); +error_report ("%s" ,error_get_pretty (local_err));error_free (local_err); goto out; }
@@ -164,7 +164,7 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname)/* group without id */ list =find_list (lists, group, &local_err);if (error_is_set (&local_err)) { -error_report ("%s\n" ,error_get_pretty (local_err)); +error_report ("%s" ,error_get_pretty (local_err));error_free (local_err); goto out; }
util/qemu-sockets.c +3 -3
@@ -720,7 +720,7 @@ int unix_connect_opts(QemuOpts *opts, Error **errp,int sock, rc;if (NULL == path) { -error_setg (errp,"unix connect: no path specified\n" ); +error_setg (errp,"unix connect: no path specified" );return -1 ; }
@@ -854,7 +854,7 @@ SocketAddress *socket_parse(const char *str, Error **errp) addr =g_new (SocketAddress,1 );if (strstart (str,"unix:" ,NULL )) {if (str[5 ] =='\0' ) { -error_setg (errp,"invalid Unix socket address\n" ); +error_setg (errp,"invalid Unix socket address" ); goto fail; }else { addr->kind =SOCKET_ADDRESS_KIND_UNIX ;
@@ -863,7 +863,7 @@ SocketAddress *socket_parse(const char *str, Error **errp) } }else if (strstart (str,"fd:" ,NULL )) {if (str[3 ] =='\0' ) { -error_setg (errp,"invalid file descriptor address\n" ); +error_setg (errp,"invalid file descriptor address" ); goto fail; }else { addr->kind =SOCKET_ADDRESS_KIND_FD ;
Signature · 1 line
1.7.11.7
PATCH 4/6 qemu-option: Disable two helpful messages that got broken recently
In reply to Markus Armbrustercommit 8be7e7e4 and commit ec7b2ccb messed up the ordering of error message and the helpful explanation that should follow it, like this:
$ qemu-system-x86_64 --nodefaults -S --vnc :0 --chardev null,id=,
Identifiers consist of letters, digits, '-', '.', '_', starting with a letter.
qemu-system-x86_64: -chardev null,id=,: Parameter 'id' expects an identifier $ qemu-system-x86_64 --nodefaults -S --vnc :0 --machine kvm_shadow_mem=dunno
You may use k, M, G or T suffixes for kilobytes, megabytes, gigabytes and terabytes.
qemu-system-x86_64: -machine kvm_shadow_mem=dunno: Parameter 'kvm_shadow_mem' expects a sizePity. Disable them for now.
--- util/qemu-option.c | 4 ++++ 1 file changed, 4 insertions(+)
util/qemu-option.c +4 -0
@@ -231,8 +231,10 @@ static void parse_option_size(const char *name, const char *value,break ;default :error_set (errp,QERR_INVALID_PARAMETER_VALUE , name,"a size" ); +#if 0 /* conversion from qerror_report() to error_set() broke this: */ error_printf_unless_qmp ("You may use k, M, G or T suffixes for " "kilobytes, megabytes, gigabytes and terabytes.\n" ); +#endif return ; } }else {
@@ -771,7 +773,9 @@ QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id,if (id) {if (!id_wellformed (id)) {error_set (errp,QERR_INVALID_PARAMETER_VALUE ,"id" ,"an identifier" ); +#if 0 /* conversion from qerror_report() to error_set() broke this: */ error_printf_unless_qmp ("Identifiers consist of letters, digits, '-', '.', '_', starting with a letter.\n" ); +#endif return NULL ; } opts =qemu_opts_find (list, id);
Signature · 1 line
1.7.11.7
PATCH 5/6 vl: Drop redundant "parse error" reports
In reply to Markus Armbrusterqemu_opts_parse() reports the error already, and in a much more useful way.
--- vl.c | 4 ---- 1 file changed, 4 deletions(-)
vl.c +0 -4
@@ -3334,7 +3334,6 @@ int main(int argc, char **argv, char **envp) } opts =qemu_opts_parse (olist, optarg,1 );if (!opts) { -fprintf (stderr,"parse error: %s\n" , optarg);exit (1 ); }break ;
@@ -3350,7 +3349,6 @@ int main(int argc, char **argv, char **envp) } opts =qemu_opts_parse (olist, optarg,1 );if (!opts) { -fprintf (stderr,"parse error: %s\n" , optarg);exit (1 ); }
@@ -3521,7 +3519,6 @@ int main(int argc, char **argv, char **envp) olist =qemu_find_opts ("machine" ); opts =qemu_opts_parse (olist, optarg,1 );if (!opts) { -fprintf (stderr,"parse error: %s\n" , optarg);exit (1 ); } optarg =qemu_opt_get (opts,"type" );
@@ -3755,7 +3752,6 @@ int main(int argc, char **argv, char **envp) } opts =qemu_opts_parse (olist, optarg,0 );if (!opts) { -fprintf (stderr,"parse error: %s\n" , optarg);exit (1 ); }break ;
Signature · 1 line
1.7.11.7
PATCH 6/6 vl: Exit unsuccessfully on option argument syntax error
In reply to Markus ArmbrusterWe exit successfully after reporting syntax error for argument of --sandbox and --add-fd.
We continue undaunted after reporting it for argument of --option-rom and --object then.
Change all four to exit unsuccessfully, like the other options.
--- vl.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
vl.c +8 -2
@@ -3623,6 +3623,9 @@ int main(int argc, char **argv, char **envp)exit (1 ); } opts =qemu_opts_parse (qemu_find_opts ("option-rom" ), optarg,1 ); +if (!opts) { +exit (1 ); + } option_rom[nb_option_roms].name =qemu_opt_get (opts,"romfile" ); option_rom[nb_option_roms].bootindex =qemu_opt_get_number (opts,"bootindex" ,-1 );
@@ -3780,14 +3783,14 @@ int main(int argc, char **argv, char **envp)case QEMU_OPTION_sandbox: opts =qemu_opts_parse (qemu_find_opts ("sandbox" ), optarg,1 );if (!opts) { -exit (0 ); +exit (1 ); }break ;case QEMU_OPTION_add_fd:#ifndef _WIN32 opts =qemu_opts_parse (qemu_find_opts ("add-fd" ), optarg,0 );if (!opts) { -exit (0 ); +exit (1 ); }#else error_report("File descriptor passing is disabled on this "
@@ -3797,6 +3800,9 @@ int main(int argc, char **argv, char **envp)break ;case QEMU_OPTION_object: opts =qemu_opts_parse (qemu_find_opts ("object" ), optarg,1 ); +if (!opts) { +exit (1 ); + }break ;default :os_parse_cmd_args (popt->index, optarg);
Signature · 1 line
1.7.11.7