error: use GLib to remember the program name

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
e2k-bsd-user
Marc-André Lureau 12 months ago
parent 45297887dc
commit 336d354ba7
  1. 2
      include/qemu/error-report.h
  2. 10
      qemu-io.c
  3. 2
      softmmu/vl.c
  4. 2
      storage-daemon/qemu-storage-daemon.c
  5. 2
      trace/control.c
  6. 24
      util/qemu-error.c

@ -72,8 +72,6 @@ void error_init(const char *argv0);
fmt, ##__VA_ARGS__); \
})
const char *error_get_progname(void);
extern bool message_with_timestamp;
extern bool error_with_guestname;
extern const char *error_guest_name;

@ -323,7 +323,7 @@ static char *get_prompt(void)
static char prompt[FILENAME_MAX + 2 /*"> "*/ + 1 /*"\0"*/ ];
if (!prompt[0]) {
snprintf(prompt, sizeof(prompt), "%s> ", error_get_progname());
snprintf(prompt, sizeof(prompt), "%s> ", g_get_prgname());
}
return prompt;
@ -598,10 +598,10 @@ int main(int argc, char **argv)
break;
case 'V':
printf("%s version " QEMU_FULL_VERSION "\n"
QEMU_COPYRIGHT "\n", error_get_progname());
QEMU_COPYRIGHT "\n", g_get_prgname());
exit(0);
case 'h':
usage(error_get_progname());
usage(g_get_prgname());
exit(0);
case 'U':
force_share = true;
@ -613,13 +613,13 @@ int main(int argc, char **argv)
imageOpts = true;
break;
default:
usage(error_get_progname());
usage(g_get_prgname());
exit(1);
}
}
if ((argc - optind) > 1) {
usage(error_get_progname());
usage(g_get_prgname());
exit(1);
}

@ -836,7 +836,7 @@ static void help(int exitcode)
version();
printf("usage: %s [options] [disk_image]\n\n"
"'disk_image' is a raw hard disk image for IDE hard disk 0\n\n",
error_get_progname());
g_get_prgname());
#define DEF(option, opt_arg, opt_enum, opt_help, arch_mask) \
if ((arch_mask) & arch_type) \

@ -141,7 +141,7 @@ static void help(void)
" --pidfile <path> write process ID to a file after startup\n"
"\n"
QEMU_HELP_BOTTOM "\n",
error_get_progname());
g_get_prgname());
}
enum {

@ -161,7 +161,7 @@ void trace_list_events(FILE *f)
fprintf(f, "This list of names of trace points may be incomplete "
"when using the DTrace/SystemTap backends.\n"
"Run 'qemu-trace-stap list %s' to print the full list.\n",
error_get_progname());
g_get_prgname());
#endif
}

@ -146,22 +146,6 @@ void loc_set_file(const char *fname, int lno)
}
}
static const char *progname;
/*
* Set the program name for error_print_loc().
*/
static void error_set_progname(const char *argv0)
{
const char *p = strrchr(argv0, '/');
progname = p ? p + 1 : argv0;
}
const char *error_get_progname(void)
{
return progname;
}
/*
* Print current location to current monitor if we have one, else to stderr.
*/
@ -171,8 +155,8 @@ static void print_loc(void)
int i;
const char *const *argp;
if (!monitor_cur() && progname) {
fprintf(stderr, "%s:", progname);
if (!monitor_cur() && g_get_prgname()) {
fprintf(stderr, "%s:", g_get_prgname());
sep = " ";
}
switch (cur_loc->kind) {
@ -400,8 +384,10 @@ static void qemu_log_func(const gchar *log_domain,
void error_init(const char *argv0)
{
const char *p = strrchr(argv0, '/');
/* Set the program name for error_print_loc(). */
error_set_progname(argv0);
g_set_prgname(p ? p + 1 : argv0);
/*
* This sets up glib logging so libraries using it also print their logs

Loading…
Cancel
Save