Re: [Qemu-devel] [PATCH v2 42/47] hw/xen*: Replace fprintf(stderr, "*\n" with error_report()

[Anthony PERARD <anthony.perard@citrix.com>]

On Fri, Sep 29, 2017 at 05:17:12PM -0700, Alistair Francis wrote:
> Replace a large number of the fprintf(stderr, "*\n" calls with
> error_report(). The functions were renamed with these commands and then
> compiler issues where manually fixed.


> diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c
> index 632a938dcc..42ada2ac05 100644
> --- a/hw/xen/xen-common.c
> +++ b/hw/xen/xen-common.c
> @@ -9,6 +9,7 @@
>   */
>  
>  #include "qemu/osdep.h"
> +#include "qemu/error-report.h"
>  #include "hw/xen/xen_backend.h"
>  #include "qmp-commands.h"
>  #include "chardev/char.h"
> @@ -47,19 +48,19 @@ static int store_dev_info(int domid, Chardev *cs, const char *string)
>      /* We now have everything we need to set the xenstore entry. */
>      xs = xs_open(0);
>      if (xs == NULL) {
> -        fprintf(stderr, "Could not contact XenStore\n");
> +        error_report("Could not contact XenStore");
>          goto out;
>      }
>  
>      path = xs_get_domain_path(xs, domid);
>      if (path == NULL) {
> -        fprintf(stderr, "xs_get_domain_path() error\n");
> +        error_report("xs_get_domain_path() error");
>          goto out;
>      }
>      newpath = realloc(path, (strlen(path) + strlen(string) +
>                  strlen("/tty") + 1));
>      if (newpath == NULL) {
> -        fprintf(stderr, "realloc error\n");
> +        error_report("realloc error");
>          goto out;
>      }
>      path = newpath;
> @@ -96,13 +97,13 @@ static void xenstore_record_dm_state(struct xs_handle *xs, const char *state)
>      char path[50];
>  
>      if (xs == NULL) {
> -        fprintf(stderr, "xenstore connection not initialized\n");
> +        error_report("xenstore connection not initialized");
>          exit(1);
>      }
>  
>      snprintf(path, sizeof (path), "device-model/%u/state", xen_domid);
>      if (!xs_write(xs, XBT_NULL, path, state, strlen(state))) {
> -        fprintf(stderr, "error recording dm state\n");
> +        error_report("error recording dm state");
>          exit(1);
>      }
>  }

> diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c
> index 375efa68f6..e86d380d02 100644
> --- a/hw/xen/xen_pt.c
> +++ b/hw/xen/xen_pt.c
> @@ -73,7 +73,7 @@ void xen_pt_log(const PCIDevice *d, const char *f, ...)
>  
>      va_start(ap, f);
>      if (d) {
> -        fprintf(stderr, "[%02x:%02x.%d] ", pci_bus_num(d->bus),
> +        error_report("[%02x:%02x.%d] ", pci_bus_num(d->bus),

This is only part of a line of a comment, this is going to be more
complecated that just calling error_repport, right?

>                  PCI_SLOT(d->devfn), PCI_FUNC(d->devfn));
>      }
>      vfprintf(stderr, f, ap);

The second part of the line is printed here.

> @@ -87,7 +87,7 @@ static int xen_pt_pci_config_access_check(PCIDevice *d, uint32_t addr, int len)
>      /* check offset range */
>      if (addr > 0xFF) {
>          XEN_PT_ERR(d, "Failed to access register with offset exceeding 0xFF. "
> -                   "(addr: 0x%02x, len: %d)\n", addr, len);
> +                   "(addr: 0x%02x, len: %d)", addr, len);

If xen_pt_log is changed, there would be many more of the XEN_PT_ERR
call to change. (as well as XEN_PT_LOG and XEN_PT_WARN.)

>          return -1;
>      }
>  
> diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c
> index 027f76fad1..f5514ffec2 100644
> --- a/hw/xenpv/xen_domainbuild.c
> +++ b/hw/xenpv/xen_domainbuild.c
> @@ -25,22 +25,22 @@ static int xenstore_domain_mkdir(char *path)
>      int i;
>  
>      if (!xs_mkdir(xenstore, 0, path)) {
> -        fprintf(stderr, "%s: xs_mkdir %s: failed\n", __func__, path);
> -	return -1;
> +        error_report("%s: xs_mkdir %s: failed", __func__, path);
> +        return -1;
>      }
>      if (!xs_set_permissions(xenstore, 0, path, perms_ro, 2)) {
> -        fprintf(stderr, "%s: xs_set_permissions failed\n", __func__);
> -	return -1;
> +        error_report("%s: xs_set_permissions failed", __func__);
> +        return -1;
>      }
>  
>      for (i = 0; writable[i]; i++) {
>          snprintf(subpath, sizeof(subpath), "%s/%s", path, writable[i]);
>          if (!xs_mkdir(xenstore, 0, subpath)) {
> -            fprintf(stderr, "%s: xs_mkdir %s: failed\n", __func__, subpath);
> +            error_report("%s: xs_mkdir %s: failed", __func__, subpath);
>              return -1;
>          }
>          if (!xs_set_permissions(xenstore, 0, subpath, perms_rw, 2)) {
> -            fprintf(stderr, "%s: xs_set_permissions failed\n", __func__);
> +            error_report("%s: xs_set_permissions failed", __func__);
>              return -1;
>          }
>      }
> @@ -235,7 +235,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk,
>      memcpy(uuid, &qemu_uuid, sizeof(uuid));
>      rc = xen_domain_create(xen_xc, ssidref, uuid, flags, &xen_domid);
>      if (rc < 0) {
> -        fprintf(stderr, "xen: xc_domain_create() failed\n");
> +        error_report("xen: xc_domain_create() failed");
>          goto err;
>      }
>      qemu_log("xen: created domain %d\n", xen_domid);
> @@ -248,21 +248,21 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk,
>  
>      rc = xc_domain_max_vcpus(xen_xc, xen_domid, smp_cpus);
>      if (rc < 0) {
> -        fprintf(stderr, "xen: xc_domain_max_vcpus() failed\n");
> +        error_report("xen: xc_domain_max_vcpus() failed");
>          goto err;
>      }
>  
>  #if 0
>      rc = xc_domain_setcpuweight(xen_xc, xen_domid, 256);
>      if (rc < 0) {
> -        fprintf(stderr, "xen: xc_domain_setcpuweight() failed\n");
> +        error_report("xen: xc_domain_setcpuweight() failed");
>          goto err;
>      }
>  #endif
>  
>      rc = xc_domain_setmaxmem(xen_xc, xen_domid, ram_size >> 10);
>      if (rc < 0) {
> -        fprintf(stderr, "xen: xc_domain_setmaxmem() failed\n");
> +        error_report("xen: xc_domain_setmaxmem() failed");
>          goto err;
>      }
>  
> @@ -275,7 +275,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk,
>                          xenstore_port, &xenstore_mfn,
>                          console_port, &console_mfn);
>      if (rc < 0) {
> -        fprintf(stderr, "xen: xc_linux_build() failed\n");
> +        error_report("xen: xc_linux_build() failed");
>          goto err;
>      }
>  
> @@ -285,7 +285,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk,
>      qemu_log("xen: unpausing domain %d\n", xen_domid);
>      rc = xc_domain_unpause(xen_xc, xen_domid);
>      if (rc < 0) {
> -        fprintf(stderr, "xen: xc_domain_unpause() failed\n");
> +        error_report("xen: xc_domain_unpause() failed");
>          goto err;
>      }
>  
> diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c
> index 69a52a9f93..44d67b87c4 100644
> --- a/hw/xenpv/xen_machine_pv.c
> +++ b/hw/xenpv/xen_machine_pv.c
> @@ -23,6 +23,7 @@
>   */
>  
>  #include "qemu/osdep.h"
> +#include "qemu/error-report.h"
>  #include "hw/hw.h"
>  #include "hw/boards.h"
>  #include "hw/xen/xen_backend.h"
> @@ -36,7 +37,7 @@ static void xen_init_pv(MachineState *machine)
>  
>      /* Initialize backend core & drivers */
>      if (xen_be_init() != 0) {
> -        fprintf(stderr, "%s: xen backend core setup failed\n", __func__);
> +        error_report("%s: xen backend core setup failed", __func__);
>          exit(1);
>      }
>  
> @@ -51,18 +52,18 @@ static void xen_init_pv(MachineState *machine)
>          const char *initrd_filename = machine->initrd_filename;
>          if (xen_domain_build_pv(kernel_filename, initrd_filename,
>                                  kernel_cmdline) < 0) {
> -            fprintf(stderr, "xen pv domain creation failed\n");
> +            error_report("xen pv domain creation failed");
>              exit(1);
>          }
>          break;
>      }
>  #endif
>      case XEN_EMULATE:
> -        fprintf(stderr, "xen emulation not implemented (yet)\n");
> +        error_report("xen emulation not implemented (yet)");
>          exit(1);
>          break;
>      default:
> -        fprintf(stderr, "unhandled xen_mode %d\n", xen_mode);
> +        error_report("unhandled xen_mode %d", xen_mode);
>          exit(1);
>          break;
>      }


The rest of the patch looks good.

Thanks,

-- 
Anthony PERARD