vl.c: Error message rework
v3 cover vl.c: Error message rework
Changes v2 -> v3:
* Removed patch: "vl.c: Convert error sentences to simpler phrases"
* Removed patch: "vl.c: Reword -machine help error messages"
* Removed patch: "vl.c: Reword fw_cfg name prefix warning"
* Removed patch: "vl.c: Use US spelling for 'unrecognized'"
* New patch: "vl.c: Change 'fail to parse' error message to 'failed to parse'"
* Squashed "vl.c: trivial: Don't wrap lines unnecessarily"
into "vl.c: Replace fprintf(stderr) with error_report()"
Changes v1 -> v2:
* Extra patches for many suggestions I got when changing vl.c to use error_report()
Eduardo Habkost (11):
vl.c: Replace fprintf(stderr) with error_report() vl.c: Use error_report() when reporting shutdown signal vl.c: Remove periods and exclamation points from error messages vl.c: Use "warning:" prefix consistently on warnings vl.c: Use "cannot" instead of "can not" in error messages vl.c: Use 'quotes' instead of `quotes' in messages vl.c: Remove unnecessary uppercase in error messages vl.c: Change "fail to parse" error message to "failed to parse" vl.c: Simplify "ignoring deprecated option" warnings vl.c: Reword -no-kvm-pit-reinjection deprecation warning vl.c: Use "%s support is disabled" error messages consistently
vl.c | 256 +++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 125 insertions(+), 131 deletions(-)
Signature · 1 line
2.1.0
PATCH v3 1/11 vl.c: Replace fprintf(stderr) with error_report()
Replace most fprintf(stderr) calls on vl.c with error_report().
Multi-line messages were replaced by error_report() followed by error_printf().
The following changes were made to the error messages:
* The "invalid date format" message was reworded to better fit the new error_report()+error_printf() pattern.
* On the remaining messages, only the trailing newlines, "qemu:" and "error:" message prefixes were removed.
The only remaining fprintf(stderr) calls are the ones at qemu_kill_report(), because the error mesage is split in multiple fprintf() calls.
---
Changes v1 -> v2:
* Indentation fix at "No machine specified" error message
Changes v2 -> v3:
* Don't include newlines on error_report() strings, use error_report() followed by error_printf()
* Break a few long lines
* Avoid unnecessarily breaking some lines
--- vl.c | 231 +++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 115 insertions(+), 116 deletions(-)
vl.c +115 -116
@@ -674,9 +674,9 @@ void runstate_set(RunState new_state)assert (new_state <RUN_STATE_MAX );if (!runstate_valid_transitions[current_run_state][new_state]) { -fprintf (stderr,"ERROR: invalid runstate transition: '%s' -> '%s'\n" , - RunState_lookup[current_run_state], - RunState_lookup[new_state]); +error_report ("invalid runstate transition: '%s' -> '%s'" , + RunState_lookup[current_run_state], + RunState_lookup[new_state]);abort (); }trace_runstate_set (new_state);
@@ -828,8 +828,9 @@ static void configure_rtc_date_offset(const char *startdate, int legacy) rtc_start_date =mktimegm (&tm);if (rtc_start_date ==-1 ) { date_fail: -fprintf (stderr,"Invalid date format. Valid formats are:\n" -"'2006-06-17T16:01:21' or '2006-06-17'\n" ); +error_report ("invalid date format" ); +error_printf ("valid formats: " +"'2006-06-17T16:01:21' or '2006-06-17'\n" );exit (1 ); } rtc_date_offset =qemu_time () - rtc_start_date;
@@ -859,7 +860,7 @@ static void configure_rtc(QemuOpts *opts) }else if (!strcmp (value,"vm" )) { rtc_clock =QEMU_CLOCK_VIRTUAL ; }else { -fprintf (stderr,"qemu: invalid option value '%s'\n" , value); +error_report ("invalid option value '%s'" , value);exit (1 ); } }
@@ -879,7 +880,7 @@ static void configure_rtc(QemuOpts *opts) }else if (!strcmp (value,"none" )) {/* discard is default */ }else { -fprintf (stderr,"qemu: invalid option value '%s'\n" , value); +error_report ("invalid option value '%s'" , value);exit (1 ); } }
@@ -905,7 +906,7 @@ static int bt_hci_parse(const char *str)bdaddr_t bdaddr;if (nb_hcis >=MAX_NICS ) { -fprintf (stderr,"qemu: Too many bluetooth HCIs (max %i).\n" ,MAX_NICS ); +error_report ("Too many bluetooth HCIs (max %i)." ,MAX_NICS );return -1 ; }
@@ -931,8 +932,8 @@ static void bt_vhci_add(int vlan_id)struct bt_scatternet_s *vlan =qemu_find_bt_vlan (vlan_id);if (!vlan->slave) -fprintf (stderr,"qemu: warning: adding a VHCI to " -"an empty scatternet %i\n" , vlan_id); +error_report ("warning: adding a VHCI to an empty scatternet %i" , + vlan_id);bt_vhci_init (bt_new_hci (vlan)); }
@@ -950,7 +951,7 @@ static struct bt_device_s *bt_device_add(const char *opt)if (endp) { vlan_id =strtol (endp +6 , &endp,0 );if (*endp) { -fprintf (stderr,"qemu: unrecognised bluetooth vlan Id\n" ); +error_report ("unrecognised bluetooth vlan Id" );return 0 ; } }
@@ -958,13 +959,13 @@ static struct bt_device_s *bt_device_add(const char *opt) vlan =qemu_find_bt_vlan (vlan_id);if (!vlan->slave) -fprintf (stderr,"qemu: warning: adding a slave device to " -"an empty scatternet %i\n" , vlan_id); +error_report ("warning: adding a slave device to an empty scatternet %i" , + vlan_id);if (!strcmp (devname,"keyboard" ))return bt_keyboard_init (vlan); -fprintf (stderr,"qemu: unsupported bluetooth device `%s'\n" , devname); +error_report ("unsupported bluetooth device `%s'" , devname);return 0 ; }
@@ -987,11 +988,11 @@ static int bt_parse(const char *opt)if (strstart (endp,",vlan=" , &p)) { vlan =strtol (p, (char **) &endp,0 );if (*endp) { -fprintf (stderr,"qemu: bad scatternet '%s'\n" , p); +error_report ("bad scatternet '%s'" , p);return 1 ; } }else { -fprintf (stderr,"qemu: bad parameter '%s'\n" , endp +1 ); +error_report ("bad parameter '%s'" , endp +1 );return 1 ; } }else
@@ -1003,7 +1004,7 @@ static int bt_parse(const char *opt) }else if (strstart (opt,"device:" , &endp))return !bt_device_add (endp); -fprintf (stderr,"qemu: bad bluetooth parameter '%s'\n" , opt); +error_report ("bad bluetooth parameter '%s'" , opt);return 1 ; }
@@ -1220,18 +1221,19 @@ static void smp_parse(QemuOpts *opts) }else if (threads ==0 ) { threads = cpus / (cores * sockets); }else if (sockets * cores * threads < cpus) { -fprintf (stderr,"cpu topology: error: " -"sockets (%u) * cores (%u) * threads (%u) < " -"smp_cpus (%u)\n" , - sockets, cores, threads, cpus); +error_report ("cpu topology: " +"sockets (%u) * cores (%u) * threads (%u) < " +"smp_cpus (%u)" , + sockets, cores, threads, cpus);exit (1 ); } max_cpus =qemu_opt_get_number (opts,"maxcpus" , cpus);if (sockets * cores * threads > max_cpus) { -fprintf (stderr,"cpu topology: error: " -"sockets (%u) * cores (%u) * threads (%u) > maxcpus (%u)\n" , - sockets, cores, threads, max_cpus); +error_report ("cpu topology: " +"sockets (%u) * cores (%u) * threads (%u) > " +"maxcpus (%u)" , + sockets, cores, threads, max_cpus);exit (1 ); }
@@ -1246,11 +1248,11 @@ static void smp_parse(QemuOpts *opts) }if (max_cpus >MAX_CPUMASK_BITS ) { -fprintf (stderr,"Unsupported number of maxcpus\n" ); +error_report ("Unsupported number of maxcpus" );exit (1 ); }if (max_cpus < smp_cpus) { -fprintf (stderr,"maxcpus must be equal to or greater than smp\n" ); +error_report ("maxcpus must be equal to or greater than smp" );exit (1 ); }
@@ -1260,7 +1262,7 @@ static void realtime_init(void) {if (enable_mlock) {if (os_mlock () <0 ) { -fprintf (stderr,"qemu: locking memory failed\n" ); +error_report ("locking memory failed" );exit (1 ); } }
@@ -1414,7 +1416,7 @@ static int usb_parse(const char *cmdline)int r; r =usb_device_add (cmdline);if (r <0 ) { -fprintf (stderr,"qemu: could not add USB device '%s'\n" , cmdline); +error_report ("could not add USB device '%s'" , cmdline); }return r; }
@@ -1980,28 +1982,28 @@ static void select_vgahw (const char *p)if (vga_available ()) { vga_interface_type =VGA_STD ; }else { -fprintf (stderr,"Error: standard VGA not available\n" ); +error_report ("standard VGA not available" );exit (0 ); } }else if (strstart (p,"cirrus" , &opts)) {if (cirrus_vga_available ()) { vga_interface_type =VGA_CIRRUS ; }else { -fprintf (stderr,"Error: Cirrus VGA not available\n" ); +error_report ("Cirrus VGA not available" );exit (0 ); } }else if (strstart (p,"vmware" , &opts)) {if (vmware_vga_available ()) { vga_interface_type =VGA_VMWARE ; }else { -fprintf (stderr,"Error: VMWare SVGA not available\n" ); +error_report ("VMWare SVGA not available" );exit (0 ); } }else if (strstart (p,"virtio" , &opts)) {if (virtio_vga_available ()) { vga_interface_type =VGA_VIRTIO ; }else { -fprintf (stderr,"Error: Virtio VGA not available\n" ); +error_report ("Virtio VGA not available" );exit (0 ); } }else if (strstart (p,"xenfb" , &opts)) {
@@ -2010,26 +2012,26 @@ static void select_vgahw (const char *p)if (qxl_vga_available ()) { vga_interface_type =VGA_QXL ; }else { -fprintf (stderr,"Error: QXL VGA not available\n" ); +error_report ("QXL VGA not available" );exit (0 ); } }else if (strstart (p,"tcx" , &opts)) {if (tcx_vga_available ()) { vga_interface_type =VGA_TCX ; }else { -fprintf (stderr,"Error: TCX framebuffer not available\n" ); +error_report ("TCX framebuffer not available" );exit (0 ); } }else if (strstart (p,"cg3" , &opts)) {if (cg3_vga_available ()) { vga_interface_type =VGA_CG3 ; }else { -fprintf (stderr,"Error: CG3 framebuffer not available\n" ); +error_report ("CG3 framebuffer not available" );exit (0 ); } }else if (!strstart (p,"none" , &opts)) { invalid_vga: -fprintf (stderr,"Unknown vga type: %s\n" , p); +error_report ("Unknown vga type: %s" , p);exit (1 ); }while (*opts) {
@@ -2349,7 +2351,7 @@ static int mon_init_func(void *opaque, QemuOpts *opts, Error **errp) }else if (strcmp (mode,"control" ) ==0 ) { flags =MONITOR_USE_CONTROL ; }else { -fprintf (stderr,"unknown monitor mode \"%s\"\n" , mode); +error_report ("unknown monitor mode \"%s\"" , mode);exit (1 ); }
@@ -2362,7 +2364,7 @@ static int mon_init_func(void *opaque, QemuOpts *opts, Error **errp) chardev =qemu_opt_get (opts,"chardev" ); chr =qemu_chr_find (chardev);if (chr ==NULL ) { -fprintf (stderr,"chardev \"%s\" not found\n" , chardev); +error_report ("chardev \"%s\" not found" , chardev);exit (1 ); }
@@ -2390,7 +2392,7 @@ static void monitor_parse(const char *optarg, const char *mode, bool pretty) } opts =qemu_chr_parse_compat (label, optarg);if (!opts) { -fprintf (stderr,"parse error: %s\n" , optarg); +error_report ("parse error: %s" , optarg);exit (1 ); } }
@@ -2464,14 +2466,14 @@ static int serial_parse(const char *devname)if (strcmp (devname,"none" ) ==0 )return 0 ;if (index ==MAX_SERIAL_PORTS ) { -fprintf (stderr,"qemu: too many serial ports\n" ); +error_report ("too many serial ports" );exit (1 ); }snprintf (label,sizeof (label),"serial%d" , index); serial_hds[index] =qemu_chr_new (label, devname,NULL );if (!serial_hds[index]) { -fprintf (stderr,"qemu: could not connect serial device" -" to character backend '%s'\n" , devname); +error_report ("could not connect serial device" +" to character backend '%s'" , devname);return -1 ; } index++;
@@ -2486,14 +2488,14 @@ static int parallel_parse(const char *devname)if (strcmp (devname,"none" ) ==0 )return 0 ;if (index ==MAX_PARALLEL_PORTS ) { -fprintf (stderr,"qemu: too many parallel ports\n" ); +error_report ("too many parallel ports" );exit (1 ); }snprintf (label,sizeof (label),"parallel%d" , index); parallel_hds[index] =qemu_chr_new (label, devname,NULL );if (!parallel_hds[index]) { -fprintf (stderr,"qemu: could not connect parallel device" -" to character backend '%s'\n" , devname); +error_report ("could not connect parallel device" +" to character backend '%s'" , devname);return -1 ; } index++;
@@ -2510,7 +2512,7 @@ static int virtcon_parse(const char *devname)if (strcmp (devname,"none" ) ==0 )return 0 ;if (index ==MAX_VIRTIO_CONSOLES ) { -fprintf (stderr,"qemu: too many virtio consoles\n" ); +error_report ("too many virtio consoles" );exit (1 ); }
@@ -2527,8 +2529,8 @@ static int virtcon_parse(const char *devname)snprintf (label,sizeof (label),"virtcon%d" , index); virtcon_hds[index] =qemu_chr_new (label, devname,NULL );if (!virtcon_hds[index]) { -fprintf (stderr,"qemu: could not connect virtio console" -" to character backend '%s'\n" , devname); +error_report ("could not connect virtio console" +" to character backend '%s'" , devname);return -1 ; }qemu_opt_set (dev_opts,"chardev" , label, &error_abort);
@@ -2548,7 +2550,7 @@ static int sclp_parse(const char *devname)return 0 ; }if (index ==MAX_SCLP_CONSOLES ) { -fprintf (stderr,"qemu: too many sclp consoles\n" ); +error_report ("too many sclp consoles" );exit (1 ); }
@@ -2560,8 +2562,8 @@ static int sclp_parse(const char *devname)snprintf (label,sizeof (label),"sclpcon%d" , index); sclp_hds[index] =qemu_chr_new (label, devname,NULL );if (!sclp_hds[index]) { -fprintf (stderr,"qemu: could not connect sclp console" -" to character backend '%s'\n" , devname); +error_report ("could not connect sclp console" +" to character backend '%s'" , devname);return -1 ; }qemu_opt_set (dev_opts,"chardev" , label, &error_abort);
@@ -2579,7 +2581,7 @@ static int debugcon_parse(const char *devname) } opts =qemu_opts_create (qemu_find_opts ("device" ),"debugcon" ,1 ,NULL );if (!opts) { -fprintf (stderr,"qemu: already have a debugcon device\n" ); +error_report ("already have a debugcon device" );exit (1 ); }qemu_opt_set (opts,"driver" ,"isa-debugcon" , &error_abort);
@@ -3010,8 +3012,7 @@ int main(int argc, char **argv, char **envp)runstate_init ();if (qcrypto_init (&err) <0 ) { -fprintf (stderr,"Cannot initialize crypto: %s\n" , -error_get_pretty (err)); +error_report ("Cannot initialize crypto: %s" ,error_get_pretty (err));exit (1 ); } rtc_clock =QEMU_CLOCK_HOST ;
@@ -3169,7 +3170,7 @@ int main(int argc, char **argv, char **envp) } }else if (*p !='\0' ) { chs_fail: -fprintf (stderr,"qemu: invalid physical CHS format\n" ); +error_report ("invalid physical CHS format" );exit (1 ); }if (hda_opts !=NULL ) {
@@ -3212,7 +3213,7 @@ int main(int argc, char **argv, char **envp)#ifdef CONFIG_CURSES display_type =DT_CURSES ;#else -fprintf (stderr,"Curses support is disabled\n" ); +error_report ("Curses support is disabled" );exit (1 );#endif break ;
@@ -3223,8 +3224,7 @@ int main(int argc, char **argv, char **envp) graphic_rotate =strtol (optarg, (char **) &optarg,10 );if (graphic_rotate !=0 && graphic_rotate !=90 && graphic_rotate !=180 && graphic_rotate !=270 ) { -fprintf (stderr, -"qemu: only 90, 180, 270 deg rotation is available\n" ); +error_report ("only 90, 180, 270 deg rotation is available" );exit (1 ); }break ;
@@ -3375,7 +3375,7 @@ int main(int argc, char **argv, char **envp) w =strtol (p, (char **)&p,10 );if (w <=0 ) { graphic_error: -fprintf (stderr,"qemu: invalid resolution or depth\n" ); +error_report ("invalid resolution or depth" );exit (1 ); }if (*p !='x' )
@@ -3441,7 +3441,7 @@ int main(int argc, char **argv, char **envp)case QEMU_OPTION_fsdev: olist =qemu_find_opts ("fsdev" );if (!olist) { -fprintf (stderr,"fsdev is not supported by this qemu build.\n" ); +error_report ("fsdev is not supported by this qemu build." );exit (1 ); } opts =qemu_opts_parse_noisily (olist, optarg, true);
@@ -3456,7 +3456,7 @@ int main(int argc, char **argv, char **envp) olist =qemu_find_opts ("virtfs" );if (!olist) { -fprintf (stderr,"virtfs is not supported by this qemu build.\n" ); +error_report ("virtfs is not supported by this qemu build." );exit (1 ); } opts =qemu_opts_parse_noisily (olist, optarg, true);
@@ -3466,15 +3466,15 @@ int main(int argc, char **argv, char **envp)if (qemu_opt_get (opts,"fsdriver" ) ==NULL ||qemu_opt_get (opts,"mount_tag" ) ==NULL ) { -fprintf (stderr,"Usage: -virtfs fsdriver,mount_tag=tag.\n" ); +error_report ("Usage: -virtfs fsdriver,mount_tag=tag." );exit (1 ); } fsdev =qemu_opts_create (qemu_find_opts ("fsdev" ),qemu_opt_get (opts,"mount_tag" ),1 ,NULL );if (!fsdev) { -fprintf (stderr,"duplicate fsdev id: %s\n" , -qemu_opt_get (opts,"mount_tag" )); +error_report ("duplicate fsdev id: %s" , +qemu_opt_get (opts,"mount_tag" ));exit (1 ); }
@@ -3483,8 +3483,8 @@ int main(int argc, char **argv, char **envp)#ifdef CONFIG_SYNC_FILE_RANGE qemu_opt_set (fsdev,"writeout" , writeout, &error_abort);#else -fprintf (stderr,"writeout=immediate not supported on " -"this platform\n" ); +error_report ("writeout=immediate not supported " +"on this platform" );exit (1 );#endif }
@@ -3523,7 +3523,7 @@ int main(int argc, char **argv, char **envp) fsdev =qemu_opts_create (qemu_find_opts ("fsdev" ),"v_synth" ,1 ,NULL );if (!fsdev) { -fprintf (stderr,"duplicate option: %s\n" ,"virtfs_synth" ); +error_report ("duplicate option: %s" ,"virtfs_synth" );exit (1 ); }qemu_opt_set (fsdev,"fsdriver" ,"synth" , &error_abort);
@@ -3544,15 +3544,14 @@ int main(int argc, char **argv, char **envp)break ;case QEMU_OPTION_watchdog:if (watchdog) { -fprintf (stderr, -"qemu: only one watchdog option may be given\n" ); +error_report ("only one watchdog option may be given" );return 1 ; } watchdog = optarg;break ;case QEMU_OPTION_watchdog_action:if (select_watchdog_action (optarg) ==-1 ) { -fprintf (stderr,"Unknown -watchdog-action parameter\n" ); +error_report ("Unknown -watchdog-action parameter" );exit (1 ); }break ;
@@ -3596,7 +3595,7 @@ int main(int argc, char **argv, char **envp) display_type =DT_SDL ;break ;#else -fprintf (stderr,"SDL support is disabled\n" ); +error_report ("SDL support is disabled" );exit (1 );#endif case QEMU_OPTION_pidfile:
@@ -3658,8 +3657,8 @@ int main(int argc, char **argv, char **envp)qemu_opts_parse_noisily (olist,"accel=tcg" , false);break ;case QEMU_OPTION_no_kvm_pit: { -fprintf (stderr,"Warning: KVM PIT can no longer be disabled " -"separately.\n" ); +error_report ("Warning: KVM PIT can no longer be disabled " +"separately." );break ; }case QEMU_OPTION_no_kvm_pit_reinjection: {
@@ -3672,8 +3671,8 @@ int main(int argc, char **argv, char **envp) {/* end of list */ } }; -fprintf (stderr,"Warning: option deprecated, use " -"lost_tick_policy property of kvm-pit instead.\n" ); +error_report ("Warning: option deprecated, use " +"lost_tick_policy property of kvm-pit instead." );qdev_prop_register_global_list (kvm_pit_lost_tick_policy);break ; }
@@ -3708,7 +3707,7 @@ int main(int argc, char **argv, char **envp) exit(1); }#else -fprintf (stderr,"VNC support is disabled\n" ); +error_report ("VNC support is disabled" );exit (1 );#endif break ;
@@ -3721,7 +3720,7 @@ int main(int argc, char **argv, char **envp)break ;case QEMU_OPTION_balloon:if (balloon_parse (optarg) <0 ) { -fprintf (stderr,"Unknown -balloon argument %s\n" , optarg); +error_report ("Unknown -balloon argument %s" , optarg);exit (1 ); }break ;
@@ -3736,15 +3735,15 @@ int main(int argc, char **argv, char **envp)break ;case QEMU_OPTION_uuid:if (qemu_uuid_parse (optarg, qemu_uuid) <0 ) { -fprintf (stderr,"Fail to parse UUID string." -" Wrong format.\n" ); +error_report ("Fail to parse UUID string." +" Wrong format." );exit (1 ); } qemu_uuid_set = true;break ;case QEMU_OPTION_option_rom:if (nb_option_roms >=MAX_OPTION_ROMS ) { -fprintf (stderr,"Too many option ROMs\n" ); +error_report ("Too many option ROMs" );exit (1 ); } opts = qemu_opts_parse_noisily(qemu_find_opts("option-rom"),
@@ -3756,7 +3755,7 @@ int main(int argc, char **argv, char **envp) option_rom[nb_option_roms].bootindex =qemu_opt_get_number (opts,"bootindex" ,-1 );if (!option_rom[nb_option_roms].name) { -fprintf (stderr,"Option ROM file is not specified\n" ); +error_report ("Option ROM file is not specified" );exit (1 ); } nb_option_roms++;
@@ -3781,9 +3780,8 @@ int main(int argc, char **argv, char **envp) }else if (strcmp ("auto" , target) ==0 ) { semihosting.target =SEMIHOSTING_TARGET_AUTO ; }else { -fprintf (stderr,"Unsupported semihosting-config" -" %s\n" , - optarg); +error_report ("Unsupported semihosting-config %s" , + optarg);exit (1 ); } }else {
@@ -3793,14 +3791,14 @@ int main(int argc, char **argv, char **envp)qemu_opt_foreach (opts, add_semihosting_arg, &semihosting,NULL ); }else { -fprintf (stderr,"Unsupported semihosting-config %s\n" , - optarg); +error_report ("Unsupported semihosting-config %s" , + optarg);exit (1 ); }break ;case QEMU_OPTION_tdf: -fprintf (stderr,"Warning: user space PIT time drift fix " -"is no longer supported.\n" ); +error_report ("Warning: user space PIT time drift fix " +"is no longer supported." );break ;case QEMU_OPTION_name: opts = qemu_opts_parse_noisily(qemu_find_opts("name"),
@@ -3811,7 +3809,7 @@ int main(int argc, char **argv, char **envp)break ;case QEMU_OPTION_prom_env:if (nb_prom_envs >=MAX_PROM_ENVS ) { -fprintf (stderr,"Too many prom variables\n" ); +error_report ("Too many prom variables" );exit (1 ); } prom_envs[nb_prom_envs] = optarg;
@@ -3894,8 +3892,8 @@ int main(int argc, char **argv, char **envp) {int ret =qemu_read_config_file (optarg);if (ret <0 ) { -fprintf (stderr,"read config %s: %s\n" , optarg, -strerror (-ret)); +error_report ("read config %s: %s" , optarg, +strerror (-ret));exit (1 ); }break ;
@@ -3903,7 +3901,7 @@ int main(int argc, char **argv, char **envp)case QEMU_OPTION_spice: olist =qemu_find_opts ("spice" );if (!olist) { -fprintf (stderr,"spice is not supported by this qemu build.\n" ); +error_report ("spice is not supported by this qemu build." );exit (1 ); } opts =qemu_opts_parse_noisily (olist, optarg, false);
@@ -3920,7 +3918,8 @@ int main(int argc, char **argv, char **envp) }else { fp =fopen (optarg,"w" );if (fp ==NULL ) { -fprintf (stderr,"open %s: %s\n" , optarg,strerror (errno)); +error_report ("open %s: %s" , optarg, +strerror (errno));exit (1 ); } }
@@ -3981,13 +3980,13 @@ int main(int argc, char **argv, char **envp)break ;case QEMU_OPTION_dump_vmstate:if (vmstate_dump_file) { -fprintf (stderr,"qemu: only one '-dump-vmstate' " -"option may be given\n" ); +error_report ("only one '-dump-vmstate' " +"option may be given" );exit (1 ); } vmstate_dump_file =fopen (optarg,"w" );if (vmstate_dump_file ==NULL ) { -fprintf (stderr,"open %s: %s\n" , optarg,strerror (errno)); +error_report ("open %s: %s" , optarg,strerror (errno));exit (1 ); }break ;
@@ -4004,8 +4003,8 @@ int main(int argc, char **argv, char **envp) }if (machine_class ==NULL ) { -fprintf (stderr,"No machine specified, and there is no default.\n" -"Use -machine help to list supported machines!\n" ); +error_report ("No machine specified, and there is no default." ); +error_printf ("Use -machine help to list supported machines!\n" );exit (1 ); }
@@ -4106,9 +4105,9 @@ int main(int argc, char **argv, char **envp) machine_class->max_cpus = machine_class->max_cpus ?:1 ;/* Default to UP */ if (max_cpus > machine_class->max_cpus) { -fprintf (stderr,"Number of SMP CPUs requested (%d) exceeds max CPUs " -"supported by machine '%s' (%d)\n" , max_cpus, - machine_class->name, machine_class->max_cpus); +error_report ("Number of SMP CPUs requested (%d) exceeds max CPUs " +"supported by machine '%s' (%d)" , max_cpus, + machine_class->name, machine_class->max_cpus);exit (1 ); }
@@ -4169,12 +4168,12 @@ int main(int argc, char **argv, char **envp)if (display_type ==DT_NOGRAPHIC && (default_parallel || default_serial || default_monitor || default_virtcon)) { -fprintf (stderr,"-nographic can not be used with -daemonize\n" ); +error_report ("-nographic can not be used with -daemonize" );exit (1 ); }#ifdef CONFIG_CURSES if (display_type ==DT_CURSES ) { -fprintf (stderr,"curses display can not be used with -daemonize\n" ); +error_report ("curses display can not be used with -daemonize" );exit (1 ); }#endif
@@ -4233,12 +4232,12 @@ int main(int argc, char **argv, char **envp) }if ((no_frame || alt_grab || ctrl_grab) && display_type !=DT_SDL ) { -fprintf (stderr,"-no-frame, -alt-grab and -ctrl-grab are only valid " -"for SDL, ignoring option\n" ); +error_report ("-no-frame, -alt-grab and -ctrl-grab are only valid " +"for SDL, ignoring option" ); }if (no_quit && (display_type !=DT_GTK && display_type !=DT_SDL )) { -fprintf (stderr,"-no-quit is only valid for GTK and SDL, " -"ignoring option\n" ); +error_report ("-no-quit is only valid for GTK and SDL, " +"ignoring option" ); }#if defined(CONFIG_GTK )
@@ -4253,9 +4252,9 @@ int main(int argc, char **argv, char **envp)#endif if (request_opengl ==1 && display_opengl ==0 ) {#if defined(CONFIG_OPENGL ) -fprintf (stderr,"OpenGL is not supported by the display.\n" ); +error_report ("OpenGL is not supported by the display." );#else -fprintf (stderr,"QEMU was built without opengl support.\n" ); +error_report ("QEMU was built without opengl support." );#endif exit (1 ); }
@@ -4281,7 +4280,7 @@ int main(int argc, char **argv, char **envp)#endif if (pid_file &&qemu_create_pidfile (pid_file) !=0 ) { -fprintf (stderr,"Could not acquire pid file: %s\n" ,strerror (errno)); +error_report ("Could not acquire pid file: %s" ,strerror (errno));exit (1 ); }
@@ -4352,17 +4351,17 @@ int main(int argc, char **argv, char **envp) linux_boot = (kernel_filename !=NULL );if (!linux_boot && *kernel_cmdline !='\0' ) { -fprintf (stderr,"-append only allowed with -kernel option\n" ); +error_report ("-append only allowed with -kernel option" );exit (1 ); }if (!linux_boot && initrd_filename !=NULL ) { -fprintf (stderr,"-initrd only allowed with -kernel option\n" ); +error_report ("-initrd only allowed with -kernel option" );exit (1 ); }if (!linux_boot &&qemu_opt_get (machine_opts,"dtb" )) { -fprintf (stderr,"-dtb only allowed with -kernel option\n" ); +error_report ("-dtb only allowed with -kernel option" );exit (1 ); }
@@ -4381,7 +4380,7 @@ int main(int argc, char **argv, char **envp)cpu_ticks_init ();if (icount_opts) {if (kvm_enabled () ||xen_enabled ()) { -fprintf (stderr,"-icount is not allowed with kvm or xen\n" ); +error_report ("-icount is not allowed with kvm or xen" );exit (1 ); }configure_icount (icount_opts, &error_abort);
@@ -4414,7 +4413,7 @@ int main(int argc, char **argv, char **envp)if (!xen_enabled ()) {/* On 32-bit hosts, QEMU is limited by virtual address space */ if (ram_size > (2047 <<20 ) &&HOST_LONG_BITS ==32 ) { -fprintf (stderr,"qemu: at most 2047 MB RAM can be simulated\n" ); +error_report ("at most 2047 MB RAM can be simulated" );exit (1 ); } }
@@ -4601,7 +4600,7 @@ int main(int argc, char **argv, char **envp)qemu_run_machine_init_done_notifiers ();if (rom_check_and_register_reset () !=0 ) { -fprintf (stderr,"rom check and register reset failed\n" ); +error_report ("rom check and register reset failed" );exit (1 ); }
Signature · 1 line
2.1.0
PATCH v3 2/11 vl.c: Use error_report() when reporting shutdown signal
In reply to Eduardo HabkostThis usage of fprintf(stderr) can't be directly converted to error_report() like the others, because a single error message is split into multiple fprintf() calls. Make separate error_report() calls for each case.
--- vl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
vl.c +3 -3
@@ -1626,14 +1626,14 @@ static int qemu_shutdown_requested(void)static void qemu_kill_report (void ) {if (!qtest_driver () && shutdown_signal !=-1 ) { -fprintf (stderr,"qemu: terminating on signal %d" , shutdown_signal);if (shutdown_pid ==0 ) {/* This happens for eg ^C at the terminal, so it's worth * avoiding printing an odd message in that case. */ -fputc ('\n' , stderr); +error_report ("terminating on signal %d" , shutdown_signal); }else { -fprintf (stderr," from pid " FMT_pid"\n" , shutdown_pid); +error_report ("terminating on signal %d from pid " FMT_pid, + shutdown_signal, shutdown_pid); } shutdown_signal =-1 ; }
Signature · 1 line
2.1.0
PATCH v3 3/11 vl.c: Remove periods and exclamation points from error messages
In reply to Eduardo HabkostExcept for removing periods and exclamation points, no other changes were made to the error messages (yet).
---
Changes series v2 -> v3:
* Remove exclamation points from some messages too
* Fix "No machine specified, and there is no default" message, too
--- vl.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
vl.c +15 -15
@@ -906,7 +906,7 @@ static int bt_hci_parse(const char *str)bdaddr_t bdaddr;if (nb_hcis >=MAX_NICS ) { -error_report ("Too many bluetooth HCIs (max %i)." ,MAX_NICS ); +error_report ("Too many bluetooth HCIs (max %i)" ,MAX_NICS );return -1 ; }
@@ -2279,7 +2279,7 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp) }if (strncmp (name,"opt/" ,4 ) !=0 ) {error_report ("WARNING: externally provided fw_cfg item names " -"should be prefixed with \"opt/\"!" ); +"should be prefixed with \"opt/\"" ); }if (nonempty_str (str)) { size =strlen (str);/* NUL terminator NOT included in fw_cfg blob */
@@ -2637,7 +2637,7 @@ static gint machine_class_cmp(gconstpointer a, gconstpointer b) }if (name && !is_help_option (name)) {error_report ("Unsupported machine type" ); -error_printf ("Use -machine help to list supported machines!\n" ); +error_printf ("Use -machine help to list supported machines\n" ); }else {printf ("Supported machines are:\n" ); machines =g_slist_sort (machines, machine_class_cmp);
@@ -3441,7 +3441,7 @@ int main(int argc, char **argv, char **envp)case QEMU_OPTION_fsdev: olist =qemu_find_opts ("fsdev" );if (!olist) { -error_report ("fsdev is not supported by this qemu build." ); +error_report ("fsdev is not supported by this qemu build" );exit (1 ); } opts =qemu_opts_parse_noisily (olist, optarg, true);
@@ -3456,7 +3456,7 @@ int main(int argc, char **argv, char **envp) olist =qemu_find_opts ("virtfs" );if (!olist) { -error_report ("virtfs is not supported by this qemu build." ); +error_report ("virtfs is not supported by this qemu build" );exit (1 ); } opts =qemu_opts_parse_noisily (olist, optarg, true);
@@ -3466,7 +3466,7 @@ int main(int argc, char **argv, char **envp)if (qemu_opt_get (opts,"fsdriver" ) ==NULL ||qemu_opt_get (opts,"mount_tag" ) ==NULL ) { -error_report ("Usage: -virtfs fsdriver,mount_tag=tag." ); +error_report ("Usage: -virtfs fsdriver,mount_tag=tag" );exit (1 ); } fsdev = qemu_opts_create(qemu_find_opts("fsdev"),
@@ -3658,7 +3658,7 @@ int main(int argc, char **argv, char **envp)break ;case QEMU_OPTION_no_kvm_pit: {error_report ("Warning: KVM PIT can no longer be disabled " -"separately." ); +"separately" );break ; }case QEMU_OPTION_no_kvm_pit_reinjection: {
@@ -3672,7 +3672,7 @@ int main(int argc, char **argv, char **envp) };error_report ("Warning: option deprecated, use " -"lost_tick_policy property of kvm-pit instead." ); +"lost_tick_policy property of kvm-pit instead" );qdev_prop_register_global_list (kvm_pit_lost_tick_policy);break ; }
@@ -3736,7 +3736,7 @@ int main(int argc, char **argv, char **envp)case QEMU_OPTION_uuid:if (qemu_uuid_parse (optarg, qemu_uuid) <0 ) {error_report ("Fail to parse UUID string." -" Wrong format." ); +" Wrong format" );exit (1 ); } qemu_uuid_set = true;
@@ -3798,7 +3798,7 @@ int main(int argc, char **argv, char **envp)break ;case QEMU_OPTION_tdf:error_report ("Warning: user space PIT time drift fix " -"is no longer supported." ); +"is no longer supported" );break ;case QEMU_OPTION_name: opts = qemu_opts_parse_noisily(qemu_find_opts("name"),
@@ -3901,7 +3901,7 @@ int main(int argc, char **argv, char **envp)case QEMU_OPTION_spice: olist =qemu_find_opts ("spice" );if (!olist) { -error_report ("spice is not supported by this qemu build." ); +error_report ("spice is not supported by this qemu build" );exit (1 ); } opts =qemu_opts_parse_noisily (olist, optarg, false);
@@ -4003,8 +4003,8 @@ int main(int argc, char **argv, char **envp) }if (machine_class ==NULL ) { -error_report ("No machine specified, and there is no default." ); -error_printf ("Use -machine help to list supported machines!\n" ); +error_report ("No machine specified, and there is no default" ); +error_printf ("Use -machine help to list supported machines\n" );exit (1 ); }
@@ -4252,9 +4252,9 @@ int main(int argc, char **argv, char **envp)#endif if (request_opengl ==1 && display_opengl ==0 ) {#if defined(CONFIG_OPENGL ) -error_report ("OpenGL is not supported by the display." ); +error_report ("OpenGL is not supported by the display" );#else -error_report ("QEMU was built without opengl support." ); +error_report ("QEMU was built without opengl support" );#endif exit (1 ); }
Signature · 1 line
2.1.0
PATCH v3 4/11 vl.c: Use "warning:" prefix consistently on warnings
In reply to Eduardo Habkost--- vl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
vl.c +4 -4
@@ -2278,7 +2278,7 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp)return -1 ; }if (strncmp (name,"opt/" ,4 ) !=0 ) { -error_report ("WARNING: externally provided fw_cfg item names " +error_report ("warning: externally provided fw_cfg item names " "should be prefixed with \"opt/\"" ); }if (nonempty_str (str)) {
@@ -3657,7 +3657,7 @@ int main(int argc, char **argv, char **envp)qemu_opts_parse_noisily (olist,"accel=tcg" , false);break ;case QEMU_OPTION_no_kvm_pit: { -error_report ("Warning: KVM PIT can no longer be disabled " +error_report ("warning: KVM PIT can no longer be disabled " "separately" );break ; }
@@ -3671,7 +3671,7 @@ int main(int argc, char **argv, char **envp) {/* end of list */ } }; -error_report ("Warning: option deprecated, use " +error_report ("warning: option deprecated, use " "lost_tick_policy property of kvm-pit instead" );qdev_prop_register_global_list (kvm_pit_lost_tick_policy);break ;
@@ -3797,7 +3797,7 @@ int main(int argc, char **argv, char **envp) }break ;case QEMU_OPTION_tdf: -error_report ("Warning: user space PIT time drift fix " +error_report ("warning: user space PIT time drift fix " "is no longer supported" );break ;case QEMU_OPTION_name:
Signature · 1 line
2.1.0
PATCH v3 5/11 vl.c: Use "cannot" instead of "can not" in error messages
In reply to Eduardo Habkost--- vl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
vl.c +2 -2
@@ -4168,12 +4168,12 @@ int main(int argc, char **argv, char **envp)if (display_type ==DT_NOGRAPHIC && (default_parallel || default_serial || default_monitor || default_virtcon)) { -error_report ("-nographic can not be used with -daemonize" ); +error_report ("-nographic cannot be used with -daemonize" );exit (1 ); }#ifdef CONFIG_CURSES if (display_type ==DT_CURSES ) { -error_report ("curses display can not be used with -daemonize" ); +error_report ("curses display cannot be used with -daemonize" );exit (1 ); }#endif
Signature · 1 line
2.1.0
PATCH v3 6/11 vl.c: Use 'quotes' instead of `quotes' in messages
In reply to Eduardo Habkost--- vl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
vl.c +2 -2
@@ -965,7 +965,7 @@ static struct bt_device_s *bt_device_add(const char *opt)if (!strcmp (devname,"keyboard" ))return bt_keyboard_init (vlan); -error_report ("unsupported bluetooth device `%s'" , devname); +error_report ("unsupported bluetooth device '%s'" , devname);return 0 ; }
@@ -4578,7 +4578,7 @@ int main(int argc, char **argv, char **envp) vnc_init_func, NULL, NULL);if (show_vnc_port) {char *ret =vnc_display_local_addr ("default" ); -printf ("VNC server running on `%s'\n" , ret); +printf ("VNC server running on '%s'\n" , ret);g_free (ret); }#endif
Signature · 1 line
2.1.0
PATCH v3 7/11 vl.c: Remove unnecessary uppercase in error messages
In reply to Eduardo Habkost---
Changes series v2 -> v3:
* Converted two additional cases in the same patch:
"Cannot initialize crypto" and "curses support is disabled"
* Change from "fail to parse" to "failed to parse" will be done in a separate patch
--- vl.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-)
vl.c +19 -21
@@ -906,7 +906,7 @@ static int bt_hci_parse(const char *str)bdaddr_t bdaddr;if (nb_hcis >=MAX_NICS ) { -error_report ("Too many bluetooth HCIs (max %i)" ,MAX_NICS ); +error_report ("too many bluetooth HCIs (max %i)" ,MAX_NICS );return -1 ; }
@@ -1101,7 +1101,7 @@ static int parse_add_fd(void *opaque, QemuOpts *opts, Error **errp) }#endif if (dupfd ==-1 ) { -error_report ("Error duplicating fd: %s" ,strerror (errno)); +error_report ("error duplicating fd: %s" ,strerror (errno));return -1 ; }
@@ -1248,7 +1248,7 @@ static void smp_parse(QemuOpts *opts) }if (max_cpus >MAX_CPUMASK_BITS ) { -error_report ("Unsupported number of maxcpus" ); +error_report ("unsupported number of maxcpus" );exit (1 ); }if (max_cpus < smp_cpus) {
@@ -2031,7 +2031,7 @@ static void select_vgahw (const char *p) } }else if (!strstart (p,"none" , &opts)) { invalid_vga: -error_report ("Unknown vga type: %s" , p); +error_report ("unknown vga type: %s" , p);exit (1 ); }while (*opts) {
@@ -2107,7 +2107,7 @@ static DisplayType select_display(const char *p) } }else { invalid_sdl_args: -error_report ("Invalid SDL option string" ); +error_report ("invalid SDL option string" );exit (1 ); } opts = nextopt;
@@ -2136,7 +2136,7 @@ static DisplayType select_display(const char *p)#ifdef CONFIG_CURSES display =DT_CURSES ;#else -error_report ("Curses support is disabled" ); +error_report ("curses support is disabled" );exit (1 );#endif }else if (strstart (p,"gtk" , &opts)) {
@@ -2165,7 +2165,7 @@ static DisplayType select_display(const char *p) } }else { invalid_gtk_args: -error_report ("Invalid GTK option string" ); +error_report ("invalid GTK option string" );exit (1 ); } opts = nextopt;
@@ -2177,7 +2177,7 @@ static DisplayType select_display(const char *p) }else if (strstart (p,"none" , &opts)) { display =DT_NONE ; }else { -error_report ("Unknown display type" ); +error_report ("unknown display type" );exit (1 ); }
@@ -2636,7 +2636,7 @@ static gint machine_class_cmp(gconstpointer a, gconstpointer b)return mc; }if (name && !is_help_option (name)) { -error_report ("Unsupported machine type" ); +error_report ("unsupported machine type" );error_printf ("Use -machine help to list supported machines\n" ); }else {printf ("Supported machines are:\n" );
@@ -3012,7 +3012,7 @@ int main(int argc, char **argv, char **envp)runstate_init ();if (qcrypto_init (&err) <0 ) { -error_report ("Cannot initialize crypto: %s" ,error_get_pretty (err)); +error_report ("cannot initialize crypto: %s" ,error_get_pretty (err));exit (1 ); } rtc_clock =QEMU_CLOCK_HOST ;
@@ -3213,7 +3213,7 @@ int main(int argc, char **argv, char **envp)#ifdef CONFIG_CURSES display_type =DT_CURSES ;#else -error_report ("Curses support is disabled" ); +error_report ("curses support is disabled" );exit (1 );#endif break ;
@@ -3551,7 +3551,7 @@ int main(int argc, char **argv, char **envp)break ;case QEMU_OPTION_watchdog_action:if (select_watchdog_action (optarg) ==-1 ) { -error_report ("Unknown -watchdog-action parameter" ); +error_report ("unknown -watchdog-action parameter" );exit (1 ); }break ;
@@ -3720,7 +3720,7 @@ int main(int argc, char **argv, char **envp)break ;case QEMU_OPTION_balloon:if (balloon_parse (optarg) <0 ) { -error_report ("Unknown -balloon argument %s" , optarg); +error_report ("unknown -balloon argument %s" , optarg);exit (1 ); }break ;
@@ -3735,15 +3735,14 @@ int main(int argc, char **argv, char **envp)break ;case QEMU_OPTION_uuid:if (qemu_uuid_parse (optarg, qemu_uuid) <0 ) { -error_report ("Fail to parse UUID string." -" Wrong format" ); +error_report ("fail to parse UUID string: wrong format" );exit (1 ); } qemu_uuid_set = true;break ;case QEMU_OPTION_option_rom:if (nb_option_roms >=MAX_OPTION_ROMS ) { -error_report ("Too many option ROMs" ); +error_report ("too many option ROMs" );exit (1 ); } opts = qemu_opts_parse_noisily(qemu_find_opts("option-rom"),
@@ -3780,7 +3779,7 @@ int main(int argc, char **argv, char **envp) }else if (strcmp ("auto" , target) ==0 ) { semihosting.target =SEMIHOSTING_TARGET_AUTO ; }else { -error_report ("Unsupported semihosting-config %s" , +error_report ("unsupported semihosting-config %s" , optarg);exit (1 ); }
@@ -3791,8 +3790,7 @@ int main(int argc, char **argv, char **envp)qemu_opt_foreach (opts, add_semihosting_arg, &semihosting,NULL ); }else { -error_report ("Unsupported semihosting-config %s" , - optarg); +error_report ("unsupported semihosting-config %s" , optarg);exit (1 ); }break ;
@@ -3809,7 +3807,7 @@ int main(int argc, char **argv, char **envp)break ;case QEMU_OPTION_prom_env:if (nb_prom_envs >=MAX_PROM_ENVS ) { -error_report ("Too many prom variables" ); +error_report ("too many prom variables" );exit (1 ); } prom_envs[nb_prom_envs] = optarg;
@@ -4280,7 +4278,7 @@ int main(int argc, char **argv, char **envp)#endif if (pid_file &&qemu_create_pidfile (pid_file) !=0 ) { -error_report ("Could not acquire pid file: %s" ,strerror (errno)); +error_report ("could not acquire pid file: %s" ,strerror (errno));exit (1 ); }
Signature · 1 line
2.1.0
PATCH v3 8/11 vl.c: Change "fail to parse" error message to "failed to parse"
In reply to Eduardo Habkost--- vl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
vl.c +1 -1
@@ -3735,7 +3735,7 @@ int main(int argc, char **argv, char **envp)break ;case QEMU_OPTION_uuid:if (qemu_uuid_parse (optarg, qemu_uuid) <0 ) { -error_report ("fail to parse UUID string: wrong format" ); +error_report ("failed to parse UUID string: wrong format" );exit (1 ); } qemu_uuid_set = true;
Signature · 1 line
2.1.0
PATCH v3 9/11 vl.c: Simplify "ignoring deprecated option" warnings
In reply to Eduardo HabkostSimplify warnings about deprecated options by rewriting them as "warning: ignoring deprecated option".
---
Changes series v2 -> v3:
* No need to mention option name in error message, as it is already present in the prefix printed by error_report()
* Suggested-by: Markus Armbruster <[email protected]>
--- vl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
vl.c +2 -4
@@ -3657,8 +3657,7 @@ int main(int argc, char **argv, char **envp)qemu_opts_parse_noisily (olist,"accel=tcg" , false);break ;case QEMU_OPTION_no_kvm_pit: { -error_report ("warning: KVM PIT can no longer be disabled " -"separately" ); +error_report ("warning: ignoring deprecated option" );break ; }case QEMU_OPTION_no_kvm_pit_reinjection: {
@@ -3795,8 +3794,7 @@ int main(int argc, char **argv, char **envp) }break ;case QEMU_OPTION_tdf: -error_report ("warning: user space PIT time drift fix " -"is no longer supported" ); +error_report ("warning: ignoring deprecated option" );break ;case QEMU_OPTION_name: opts = qemu_opts_parse_noisily(qemu_find_opts("name"),
Signature · 1 line
2.1.0
PATCH v3 10/11 vl.c: Reword -no-kvm-pit-reinjection deprecation warning
In reply to Eduardo Habkost---
Changes series v2 -> v3:
* No need to mention option name in error message, as it is already present in the prefix printed by error_report()
* Suggested-by: Markus Armbruster <[email protected]>
--- vl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
vl.c +2 -2
@@ -3670,8 +3670,8 @@ int main(int argc, char **argv, char **envp) {/* end of list */ } }; -error_report ("warning: option deprecated, use " -"lost_tick_policy property of kvm-pit instead" ); +error_report ("warning: deprecated, replaced by " +"-global kvm-pit.lost_tick_policy=discard" );qdev_prop_register_global_list (kvm_pit_lost_tick_policy);break ; }
Signature · 1 line
2.1.0
PATCH v3 11/11 vl.c: Use "%s support is disabled" error messages consistently
In reply to Eduardo Habkost---
Changes series v2 -> v3:
* Use "support is disabled" instead of "support disabled"
* Suggested-by: Markus Armbruster <[email protected]>
* Suggested-by: Andrew Jones <[email protected]>
--- vl.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
vl.c +5 -6
@@ -1019,8 +1019,7 @@ static int parse_sandbox(void *opaque, QemuOpts *opts, Error **errp) return -1; }#else -error_report ("sandboxing request but seccomp is not compiled " -"into this build" ); +error_report ("seccomp support is disabled" );return -1 ;#endif }
@@ -3441,7 +3440,7 @@ int main(int argc, char **argv, char **envp)case QEMU_OPTION_fsdev: olist =qemu_find_opts ("fsdev" );if (!olist) { -error_report ("fsdev is not supported by this qemu build" ); +error_report ("fsdev support is disabled" );exit (1 ); } opts =qemu_opts_parse_noisily (olist, optarg, true);
@@ -3456,7 +3455,7 @@ int main(int argc, char **argv, char **envp) olist =qemu_find_opts ("virtfs" );if (!olist) { -error_report ("virtfs is not supported by this qemu build" ); +error_report ("virtfs support is disabled" );exit (1 ); } opts =qemu_opts_parse_noisily (olist, optarg, true);
@@ -3897,7 +3896,7 @@ int main(int argc, char **argv, char **envp)case QEMU_OPTION_spice: olist =qemu_find_opts ("spice" );if (!olist) { -error_report ("spice is not supported by this qemu build" ); +error_report ("spice support is disabled" );exit (1 ); } opts =qemu_opts_parse_noisily (olist, optarg, false);
@@ -4250,7 +4249,7 @@ int main(int argc, char **argv, char **envp)#if defined(CONFIG_OPENGL )error_report ("OpenGL is not supported by the display" );#else -error_report ("QEMU was built without opengl support" ); +error_report ("OpenGL support is disabled" );#endif exit (1 ); }
Signature · 1 line
2.1.0
Quoted 26 lines · Eduardo Habkost
Changes v2 -> v3:
* Removed patch: "vl.c: Convert error sentences to simpler phrases"
* Removed patch: "vl.c: Reword -machine help error messages"
* Removed patch: "vl.c: Rewordfw_cfgname prefix warning"
* Removed patch: "vl.c: Use US spelling for 'unrecognized'"
* New patch: "vl.c: Change 'fail to parse' error message to 'failed to parse'"
* Squashed "vl.c: trivial: Don't wrap lines unnecessarily"
into "vl.c: Replace fprintf(stderr) witherror_report()"Changes v1 -> v2:
* Extra patches for many suggestions I got when changingvl.cto useerror_report()Eduardo Habkost (11):
vl.c: Replace fprintf(stderr) witherror_report()vl.c: Useerror_report()when reporting shutdown signalvl.c: Remove periods and exclamation points from error messagesvl.c: Use "warning:" prefix consistently on warningsvl.c: Use "cannot" instead of "can not" in error messagesvl.c: Use 'quotes' instead of `quotes' in messagesvl.c: Remove unnecessary uppercase in error messagesvl.c: Change "fail to parse" error message to "failed to parse"vl.c: Simplify "ignoring deprecated option" warningsvl.c: Reword -no-kvm-pit-reinjection deprecation warningvl.c: Use "%s support is disabled" error messages consistently
Quoted 2 lines
vl.c | 256 +++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 125 insertions(+), 131 deletions(-)
I guess I would've squashed some of these together, and perhaps touched up the rest of the files listed in MAINTAINERS under "Main loop", too (cpus.c main-loop.c qemu-timer.c). Regardless, this looks ready to go through my tree.
Quoted 28 lines · Markus Armbruster
Quoted 26 lines · Eduardo Habkost
Changes v2 -> v3:
* Removed patch: "vl.c: Convert error sentences to simpler phrases"
* Removed patch: "vl.c: Reword -machine help error messages"
* Removed patch: "vl.c: Rewordfw_cfgname prefix warning"
* Removed patch: "vl.c: Use US spelling for 'unrecognized'"
* New patch: "vl.c: Change 'fail to parse' error message to 'failed to parse'"
* Squashed "vl.c: trivial: Don't wrap lines unnecessarily"
into "vl.c: Replace fprintf(stderr) witherror_report()"Changes v1 -> v2:
* Extra patches for many suggestions I got when changingvl.cto useerror_report()Eduardo Habkost (11):
vl.c: Replace fprintf(stderr) witherror_report()vl.c: Useerror_report()when reporting shutdown signalvl.c: Remove periods and exclamation points from error messagesvl.c: Use "warning:" prefix consistently on warningsvl.c: Use "cannot" instead of "can not" in error messagesvl.c: Use 'quotes' instead of `quotes' in messagesvl.c: Remove unnecessary uppercase in error messagesvl.c: Change "fail to parse" error message to "failed to parse"vl.c: Simplify "ignoring deprecated option" warningsvl.c: Reword -no-kvm-pit-reinjection deprecation warningvl.c: Use "%s support is disabled" error messages consistently
Quoted 7 lines
Quoted 2 lines
vl.c | 256 +++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 125 insertions(+), 131 deletions(-)I guess I would've squashed some of these together, and perhaps touched up the rest of the files listed in
MAINTAINERSunder "Main loop", too (cpus.cmain-loop.cqemu-timer.c). Regardless, this looks ready to go through my tree.
Thanks! Feel free to squash as many patches as you want together. I split the changes just to make them easier to review and discuss.
Signature · 1 line
Eduardo
Quoted 32 lines · Eduardo Habkost
Quoted 31 lines · Markus Armbruster
Quoted 28 lines · Eduardo Habkost
Changes v2 -> v3:
* Removed patch: "vl.c: Convert error sentences to simpler phrases"
* Removed patch: "vl.c: Reword -machine help error messages"
* Removed patch: "vl.c: Rewordfw_cfgname prefix warning"
* Removed patch: "vl.c: Use US spelling for 'unrecognized'"
* New patch: "vl.c: Change 'fail to parse' error message to 'failed to parse'"
* Squashed "vl.c: trivial: Don't wrap lines unnecessarily"
into "vl.c: Replace fprintf(stderr) witherror_report()"Changes v1 -> v2:
* Extra patches for many suggestions I got when changingvl.cto useerror_report()Eduardo Habkost (11):
vl.c: Replace fprintf(stderr) witherror_report()vl.c: Useerror_report()when reporting shutdown signalvl.c: Remove periods and exclamation points from error messagesvl.c: Use "warning:" prefix consistently on warningsvl.c: Use "cannot" instead of "can not" in error messagesvl.c: Use 'quotes' instead of `quotes' in messagesvl.c: Remove unnecessary uppercase in error messagesvl.c: Change "fail to parse" error message to "failed to parse"vl.c: Simplify "ignoring deprecated option" warningsvl.c: Reword -no-kvm-pit-reinjection deprecation warningvl.c: Use "%s support is disabled" error messages consistentlyvl.c | 256 +++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 125 insertions(+), 131 deletions(-)
Quoted 7 lines
Quoted 4 lines
I guess I would've squashed some of these together, and perhaps touched up the rest of the files listed in
MAINTAINERSunder "Main loop", too (cpus.cmain-loop.cqemu-timer.c). Regardless, this looks ready to go through my tree.Thanks! Feel free to squash as many patches as you want together. I split the changes just to make them easier to review and discuss.
Please have a look at pull-error-2015-11-03 in my tree at
<http://repo.or.cz/qemu/armbru.git>. Only squashing, no code change. If you like the result, I'll post a pull request.
Quoted 1 line · Markus Armbruster
Eduardo Habkost <[email protected]> writes:
[...]
Quoted 3 lines
Please have a look at pull-error-2015-11-03 in my tree at
<http://repo.or.cz/qemu/armbru.git>. Only squashing, no code change. If you like the result, I'll post a pull request.
Looks good to me. Thanks!
Signature · 1 line
Eduardo
Quoted 8 lines · Eduardo Habkost
Changes v2 -> v3:
* Removed patch: "vl.c: Convert error sentences to simpler phrases"
* Removed patch: "vl.c: Reword -machine help error messages"
* Removed patch: "vl.c: Rewordfw_cfgname prefix warning"
* Removed patch: "vl.c: Use US spelling for 'unrecognized'"
* New patch: "vl.c: Change 'fail to parse' error message to 'failed to parse'"
* Squashed "vl.c: trivial: Don't wrap lines unnecessarily"
into "vl.c: Replace fprintf(stderr) witherror_report()"
Forgot to include this on changelog:
* vl.c: Replace fprintf(stderr) with error_report():
* Don't include newlines on error_report() strings
* Break a few long lines
* vl.c: Remove periods and exclamation points from error messages
* Remove exclamation points from some messages too
* Fix "No machine specified, and there is no default" message, too
* vl.c: Remove unnecessary uppercase in error messages
* Converted two additional cases in the same patch:
"Cannot initialize crypto" and "curses support is disabled"
* vl.c: Simplify "ignoring deprecated option" warnings
* No need to mention option name in error message, as it is already present in the prefix printed by error_report()
* vl.c: Reword -no-kvm-pit-reinjection deprecation warning
* No need to mention option name in error message, as it is already present in the prefix printed by error_report()
* vl.c: Use "%s support is disabled" error messages consistently
* Use "support is disabled" instead of "support disabled"
Quoted 24 lines
Changes v1 -> v2:
* Extra patches for many suggestions I got when changingvl.cto useerror_report()Eduardo Habkost (11):
vl.c: Replace fprintf(stderr) witherror_report()vl.c: Useerror_report()when reporting shutdown signalvl.c: Remove periods and exclamation points from error messagesvl.c: Use "warning:" prefix consistently on warningsvl.c: Use "cannot" instead of "can not" in error messagesvl.c: Use 'quotes' instead of `quotes' in messagesvl.c: Remove unnecessary uppercase in error messagesvl.c: Change "fail to parse" error message to "failed to parse"vl.c: Simplify "ignoring deprecated option" warningsvl.c: Reword -no-kvm-pit-reinjection deprecation warningvl.c: Use "%s support is disabled" error messages consistentlyvl.c | 256 +++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 125 insertions(+), 131 deletions(-)Signature · 1 line
2.1.0
Signature · 1 line
Eduardo