From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVFBq-0001HY-Hq for qemu-devel@nongnu.org; Wed, 12 Jul 2017 06:48:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVFBm-0007Gg-G2 for qemu-devel@nongnu.org; Wed, 12 Jul 2017 06:48:18 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:33283) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVFBm-0007GL-2l for qemu-devel@nongnu.org; Wed, 12 Jul 2017 06:48:14 -0400 Received: by mail-wr0-f195.google.com with SMTP id x23so4868133wrb.0 for ; Wed, 12 Jul 2017 03:48:13 -0700 (PDT) MIME-Version: 1.0 Sender: alistair23@gmail.com In-Reply-To: <87k23e9hpk.fsf@dusky.pond.sub.org> References: <87k23e9hpk.fsf@dusky.pond.sub.org> From: Alistair Francis Date: Wed, 12 Jul 2017 12:46:42 +0200 Message-ID: Content-Type: text/plain; charset="UTF-8" Subject: Re: [Qemu-devel] [PATCH v3 3/8] Convert error_report() to warn_report() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: Alistair Francis , "qemu-devel@nongnu.org Developers" , Peter Maydell , Cornelia Huck , Stefan Hajnoczi , "Michael S. Tsirkin" , Jeff Cody , Alexander Graf , Gerd Hoffmann , Eduardo Habkost , Rob Herring , Josh Durgin , Christian Borntraeger , Marcel Apfelbaum , David Gibson , Jason Wang , philippe@mathieu-daude.net, Peter Lieven , Greg Kurz , Peter Chubb , Ronnie Sahlberg , Igor Mammedov , Richard Henderson , Kevin Wolf , Peter Crosthwaite , Marcelo Tosatti , "Richard W.M. Jones" , Max Reitz , "Aneesh Kumar K.V" , Paolo Bonzini On Wed, Jul 12, 2017 at 10:34 AM, Markus Armbruster wrote: > Alistair Francis writes: > >> Convert all uses of error_report("warning:"... to use warn_report() >> instead. This helps standardise on a single method of printing warnings >> to the user. >> >> All of the warnings where changed using these two commands: > > s/where/were/ > >> find ./* -type f -exec sed -i \ >> 's|error_report(".*warning[,:] |warn_report("|Ig' {} + >> >> Then the white space changes where manually fixed afterwards. >> >> The test-qdev-global-props test case was manually updated to ensure that >> this patch passes make check (as the test cases are case sensitive). >> >> Signed-off-by: Alistair Francis >> Suggested-by: Thomas Huth >> Cc: Jeff Cody >> Cc: Kevin Wolf >> Cc: Max Reitz >> Cc: Ronnie Sahlberg >> Cc: Paolo Bonzini >> Cc: Peter Lieven >> Cc: Josh Durgin >> Cc: "Richard W.M. Jones" >> Cc: Markus Armbruster >> Cc: Peter Crosthwaite >> Cc: Richard Henderson >> Cc: "Aneesh Kumar K.V" >> Cc: Greg Kurz >> Cc: Rob Herring >> Cc: Peter Maydell >> Cc: Peter Chubb >> Cc: Eduardo Habkost >> Cc: Marcel Apfelbaum >> Cc: "Michael S. Tsirkin" >> Cc: Igor Mammedov >> Cc: David Gibson >> Cc: Alexander Graf >> Cc: Gerd Hoffmann >> Cc: Jason Wang >> Cc: Marcelo Tosatti >> Cc: Christian Borntraeger >> Cc: Cornelia Huck >> Cc: Stefan Hajnoczi >> Acked-by: David Gibson >> Acked-by: Greg Kurz >> Acked-by: Cornelia Huck >> Reviewed-by: Stefan Hajnoczi >> Reviewed by: Peter Chubb >> Acked-by: Max Reitz >> Acked-by: Marcel Apfelbaum >> --- >> V3: >> - Regenerate patch to ensure no manual edits where made >> - Tighten regex matches >> V2: >> - Fix quotation issues >> - Update commit message >> - Include full command >> >> Just a note: >> We will need to do a similar thing for fprintf. There are patches on >> the list at the moment that conflict with this series (by adding >> error_report() calls that shsould be warning), so I think I'm giong to >> have to do a follow up series converting more cases. I'll cover the >> fprintf cases when I do that. There are some manual cases as >> well that don't say warning or info, but really should. They will have >> to be converted as well. >> >> >> block/backup.c | 10 +++++----- >> block/gluster.c | 4 ++-- >> block/iscsi.c | 6 +++--- >> block/nfs.c | 12 ++++++------ >> block/rbd.c | 6 +++--- >> block/ssh.c | 4 ++-- >> blockdev.c | 2 +- >> cpus.c | 2 +- >> hw/9pfs/9p.c | 2 +- >> hw/arm/highbank.c | 6 +++--- >> hw/arm/imx25_pdk.c | 6 +++--- >> hw/arm/kzm.c | 6 +++--- >> hw/core/machine.c | 10 +++++----- >> hw/core/qdev-properties.c | 8 ++++---- >> hw/i386/acpi-build.c | 10 +++++----- >> hw/i386/kvm/pci-assign.c | 6 +++--- >> hw/i386/pc.c | 10 +++++----- >> hw/i386/pc_piix.c | 8 ++++---- >> hw/i386/pc_q35.c | 6 +++--- >> hw/misc/aspeed_sdmc.c | 8 ++++---- >> hw/nvram/fw_cfg.c | 2 +- >> hw/pci-host/piix.c | 2 +- >> hw/ppc/pnv.c | 6 +++--- >> hw/ppc/spapr.c | 4 ++-- >> hw/ppc/spapr_iommu.c | 2 +- >> hw/scsi/scsi-bus.c | 6 +++--- >> hw/usb/dev-smartcard-reader.c | 4 ++-- >> hw/usb/redirect.c | 2 +- >> net/tap-linux.c | 2 +- >> target/i386/cpu.c | 8 ++++---- >> target/i386/kvm.c | 4 ++-- >> target/s390x/cpu_models.c | 2 +- >> target/s390x/kvm.c | 2 +- >> tests/test-qdev-global-props.c | 6 +++--- >> trace/control.c | 4 ++-- >> vl.c | 20 ++++++++++---------- >> 36 files changed, 104 insertions(+), 104 deletions(-) >> >> diff --git a/block/backup.c b/block/backup.c >> index b69184eac5..44cc2b22ab 100644 >> --- a/block/backup.c >> +++ b/block/backup.c >> @@ -639,11 +639,11 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, >> ret = bdrv_get_info(target, &bdi); >> if (ret == -ENOTSUP && !target->backing) { >> /* Cluster size is not defined */ >> - error_report("WARNING: The target block device doesn't provide " >> - "information about the block size and it doesn't have a " >> - "backing file. The default block size of %u bytes is " >> - "used. If the actual block size of the target exceeds " >> - "this default, the backup may be unusable", >> + warn_report("The target block device doesn't provide " >> + "information about the block size and it doesn't have a " >> + "backing file. The default block size of %u bytes is " >> + "used. If the actual block size of the target exceeds " >> + "this default, the backup may be unusable", >> BACKUP_CLUSTER_SIZE_DEFAULT); > > As Max noted, indentation's off here. > > Preexisting, not this patch's problem: an error or warning message > should be a (short!) phrase, not a novel. If additional explanations > are needed, they go on separate lines, like this: > > warn_report("The target block device doesn't provide " > "information about the block size and it doesn't have a " > "backing file"); > error_printf("The default block size of %u bytes is used." > " If the actual block size of the target exceeds " > "this default, the backup may be unusable.", > BACKUP_CLUSTER_SIZE_DEFAULT); > > Note that the warning message is a *phrase*, not a sentence, let alone > three, and its followed by additional hints, which *are* sentences. > > More of the same below. Followup patches welcome. Yeah, there are still some things that need to be fixed. I'll keep this in mind for the next series. > >> job->cluster_size = BACKUP_CLUSTER_SIZE_DEFAULT; >> } else if (ret < 0 && !target->backing) { >> diff --git a/block/gluster.c b/block/gluster.c >> index addceed6eb..ba88fe116e 100644 >> --- a/block/gluster.c >> +++ b/block/gluster.c >> @@ -345,8 +345,8 @@ static int qemu_gluster_parse_uri(BlockdevOptionsGluster *gconf, >> is_unix = true; >> } else if (!strcmp(uri->scheme, "gluster+rdma")) { >> gsconf->type = SOCKET_ADDRESS_TYPE_INET; >> - error_report("Warning: rdma feature is not supported, falling " >> - "back to tcp"); >> + warn_report("rdma feature is not supported, falling " >> + "back to tcp"); > > Further cleanup: > > warn_report("rdma feature is not supported, falling back to tcp"); > > Could be done as a separate patch to keep this one as mechanical as > possible, but I think squashing it in would be okay, too. If we do, > then the commit message needs to updated. I think > > Indentation fixed up manually afterwards. > > instead of > > Then the white space changes where manually fixed afterwards. > > should do. > >> } else { >> ret = -EINVAL; >> goto out; >> diff --git a/block/iscsi.c b/block/iscsi.c >> index 54067e2620..3aa438a0b7 100644 >> --- a/block/iscsi.c >> +++ b/block/iscsi.c >> @@ -1761,9 +1761,9 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, >> * filename encoded options */ >> filename = qdict_get_try_str(options, "filename"); >> if (filename) { >> - error_report("Warning: 'filename' option specified. " >> - "This is an unsupported option, and may be deprecated " >> - "in the future"); >> + warn_report("'filename' option specified. " >> + "This is an unsupported option, and may be deprecated " >> + "in the future"); >> iscsi_parse_filename(filename, options, &local_err); >> if (local_err) { >> ret = -EINVAL; >> diff --git a/block/nfs.c b/block/nfs.c >> index c3c5de0113..43929c6f23 100644 >> --- a/block/nfs.c >> +++ b/block/nfs.c >> @@ -558,8 +558,8 @@ static int64_t nfs_client_open(NFSClient *client, QDict *options, >> } >> client->readahead = qemu_opt_get_number(opts, "readahead-size", 0); >> if (client->readahead > QEMU_NFS_MAX_READAHEAD_SIZE) { >> - error_report("NFS Warning: Truncating NFS readahead " >> - "size to %d", QEMU_NFS_MAX_READAHEAD_SIZE); >> + warn_report("Truncating NFS readahead " >> + "size to %d", QEMU_NFS_MAX_READAHEAD_SIZE); > > Similarly: > > warn_report("Truncating NFS readahead size to %d", > QEMU_NFS_MAX_READAHEAD_SIZE); > >> client->readahead = QEMU_NFS_MAX_READAHEAD_SIZE; >> } >> nfs_set_readahead(client->context, client->readahead); >> @@ -579,8 +579,8 @@ static int64_t nfs_client_open(NFSClient *client, QDict *options, >> } >> client->pagecache = qemu_opt_get_number(opts, "page-cache-size", 0); >> if (client->pagecache > QEMU_NFS_MAX_PAGECACHE_SIZE) { >> - error_report("NFS Warning: Truncating NFS pagecache " >> - "size to %d pages", QEMU_NFS_MAX_PAGECACHE_SIZE); >> + warn_report("Truncating NFS pagecache " >> + "size to %d pages", QEMU_NFS_MAX_PAGECACHE_SIZE); > > Similarly: > > warn_report("Truncating NFS pagecache size to %d pages", > QEMU_NFS_MAX_PAGECACHE_SIZE); > >> client->pagecache = QEMU_NFS_MAX_PAGECACHE_SIZE; >> } >> nfs_set_pagecache(client->context, client->pagecache); >> @@ -595,8 +595,8 @@ static int64_t nfs_client_open(NFSClient *client, QDict *options, >> /* limit the maximum debug level to avoid potential flooding >> * of our log files. */ >> if (client->debug > QEMU_NFS_MAX_DEBUG_LEVEL) { >> - error_report("NFS Warning: Limiting NFS debug level " >> - "to %d", QEMU_NFS_MAX_DEBUG_LEVEL); >> + warn_report("Limiting NFS debug level " >> + "to %d", QEMU_NFS_MAX_DEBUG_LEVEL); > > warn_report("Limiting NFS debug level to %d", > QEMU_NFS_MAX_DEBUG_LEVEL); > >> client->debug = QEMU_NFS_MAX_DEBUG_LEVEL; >> } >> nfs_set_debug(client->context, client->debug); >> diff --git a/block/rbd.c b/block/rbd.c >> index 9da02cdceb..d461f7dc87 100644 >> --- a/block/rbd.c >> +++ b/block/rbd.c >> @@ -555,9 +555,9 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, >> * filename encoded options */ >> filename = qdict_get_try_str(options, "filename"); >> if (filename) { >> - error_report("Warning: 'filename' option specified. " >> - "This is an unsupported option, and may be deprecated " >> - "in the future"); >> + warn_report("'filename' option specified. " >> + "This is an unsupported option, and may be deprecated " >> + "in the future"); >> qemu_rbd_parse_filename(filename, options, &local_err); >> if (local_err) { >> r = -EINVAL; >> diff --git a/block/ssh.c b/block/ssh.c >> index 52964416da..07a57eb466 100644 >> --- a/block/ssh.c >> +++ b/block/ssh.c >> @@ -1114,8 +1114,8 @@ static coroutine_fn int ssh_co_writev(BlockDriverState *bs, >> static void unsafe_flush_warning(BDRVSSHState *s, const char *what) >> { >> if (!s->unsafe_flush_warning) { >> - error_report("warning: ssh server %s does not support fsync", >> - s->inet->host); >> + warn_report("ssh server %s does not support fsync", >> + s->inet->host); >> if (what) { >> error_report("to support fsync, you need %s", what); >> } >> diff --git a/blockdev.c b/blockdev.c >> index e2016b6f37..a521c85956 100644 >> --- a/blockdev.c >> +++ b/blockdev.c >> @@ -914,7 +914,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) >> copy_on_read = qemu_opt_get_bool(legacy_opts, "copy-on-read", false); >> >> if (read_only && copy_on_read) { >> - error_report("warning: disabling copy-on-read on read-only drive"); >> + warn_report("disabling copy-on-read on read-only drive"); >> copy_on_read = false; >> } >> >> diff --git a/cpus.c b/cpus.c >> index 14bb8d552e..9bed61eefc 100644 >> --- a/cpus.c >> +++ b/cpus.c >> @@ -557,7 +557,7 @@ void qemu_start_warp_timer(void) >> if (deadline < 0) { >> static bool notified; >> if (!icount_sleep && !notified) { >> - error_report("WARNING: icount sleep disabled and no active timers"); >> + warn_report("icount sleep disabled and no active timers"); >> notified = true; >> } >> return; >> diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c >> index 6c92bad5b3..333dbb6f8e 100644 >> --- a/hw/9pfs/9p.c >> +++ b/hw/9pfs/9p.c >> @@ -2376,7 +2376,7 @@ static void coroutine_fn v9fs_flush(void *opaque) >> trace_v9fs_flush(pdu->tag, pdu->id, tag); >> >> if (pdu->tag == tag) { >> - error_report("Warning: the guest sent a self-referencing 9P flush request"); >> + warn_report("the guest sent a self-referencing 9P flush request"); >> } else { >> QLIST_FOREACH(cancel_pdu, &s->active_list, next) { >> if (cancel_pdu->tag == tag) { >> diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c >> index d209b97dee..750c463e2a 100644 >> --- a/hw/arm/highbank.c >> +++ b/hw/arm/highbank.c >> @@ -383,9 +383,9 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) >> highbank_binfo.write_board_setup = hb_write_board_setup; >> highbank_binfo.secure_board_setup = true; >> } else { >> - error_report("WARNING: cannot load built-in Monitor support " >> - "if KVM is enabled. Some guests (such as Linux) " >> - "may not boot."); >> + warn_report("cannot load built-in Monitor support " >> + "if KVM is enabled. Some guests (such as Linux) " >> + "may not boot."); >> } >> >> arm_load_kernel(ARM_CPU(first_cpu), &highbank_binfo); >> diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c >> index 44e741fde3..7d42c74001 100644 >> --- a/hw/arm/imx25_pdk.c >> +++ b/hw/arm/imx25_pdk.c >> @@ -80,9 +80,9 @@ static void imx25_pdk_init(MachineState *machine) >> >> /* We need to initialize our memory */ >> if (machine->ram_size > (FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE)) { >> - error_report("WARNING: RAM size " RAM_ADDR_FMT " above max supported, " >> - "reduced to %x", machine->ram_size, >> - FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE); >> + warn_report("RAM size " RAM_ADDR_FMT " above max supported, " >> + "reduced to %x", machine->ram_size, >> + FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE); >> machine->ram_size = FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE; >> } >> >> diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c >> index 2c96ee33b6..3ed6577a55 100644 >> --- a/hw/arm/kzm.c >> +++ b/hw/arm/kzm.c >> @@ -79,9 +79,9 @@ static void kzm_init(MachineState *machine) >> >> /* Check the amount of memory is compatible with the SOC */ >> if (machine->ram_size > (FSL_IMX31_SDRAM0_SIZE + FSL_IMX31_SDRAM1_SIZE)) { >> - error_report("WARNING: RAM size " RAM_ADDR_FMT " above max supported, " >> - "reduced to %x", machine->ram_size, >> - FSL_IMX31_SDRAM0_SIZE + FSL_IMX31_SDRAM1_SIZE); >> + warn_report("RAM size " RAM_ADDR_FMT " above max supported, " >> + "reduced to %x", machine->ram_size, >> + FSL_IMX31_SDRAM0_SIZE + FSL_IMX31_SDRAM1_SIZE); >> machine->ram_size = FSL_IMX31_SDRAM0_SIZE + FSL_IMX31_SDRAM1_SIZE; >> } >> >> diff --git a/hw/core/machine.c b/hw/core/machine.c >> index ecb55528e8..dc431fabf5 100644 >> --- a/hw/core/machine.c >> +++ b/hw/core/machine.c >> @@ -741,11 +741,11 @@ static void machine_numa_finish_init(MachineState *machine) >> } >> } >> if (s->len && !qtest_enabled()) { >> - error_report("warning: CPU(s) not present in any NUMA nodes: %s", >> - s->str); >> - error_report("warning: All CPU(s) up to maxcpus should be described " >> - "in NUMA config, ability to start up with partial NUMA " >> - "mappings is obsoleted and will be removed in future"); >> + warn_report("CPU(s) not present in any NUMA nodes: %s", >> + s->str); >> + warn_report("All CPU(s) up to maxcpus should be described " >> + "in NUMA config, ability to start up with partial NUMA " >> + "mappings is obsoleted and will be removed in future"); > > Preexisting, not this patch's problem: the resulting output looks like > two independent issues instead of one. Multiple error_report() / > warn_report() in a row are almost always inappropriate. > > warn_report("CPU(s) not present in any NUMA nodes: %s", s->str); > error_printf("All CPU(s) up to maxcpus should be described " > "in NUMA config, ability to start up with partial NUMA " > "mappings is obsoleted and will be removed in future"); > > More of the same below. Followup patches welcome. > >> } >> g_string_free(s, true); >> } >> diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c >> index f11d57831b..f5983c83da 100644 >> --- a/hw/core/qdev-properties.c >> +++ b/hw/core/qdev-properties.c >> @@ -1132,15 +1132,15 @@ int qdev_prop_check_globals(void) >> oc = object_class_by_name(prop->driver); >> oc = object_class_dynamic_cast(oc, TYPE_DEVICE); >> if (!oc) { >> - error_report("Warning: global %s.%s has invalid class name", >> - prop->driver, prop->property); >> + warn_report("global %s.%s has invalid class name", >> + prop->driver, prop->property); >> ret = 1; >> continue; >> } >> dc = DEVICE_CLASS(oc); >> if (!dc->hotpluggable && !prop->used) { >> - error_report("Warning: global %s.%s=%s not used", >> - prop->driver, prop->property, prop->value); >> + warn_report("global %s.%s=%s not used", >> + prop->driver, prop->property, prop->value); >> ret = 1; >> continue; >> } >> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c >> index 5464977424..6b7bade183 100644 >> --- a/hw/i386/acpi-build.c >> +++ b/hw/i386/acpi-build.c >> @@ -2766,17 +2766,17 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) >> ACPI_BUILD_ALIGN_SIZE); >> if (tables_blob->len > legacy_table_size) { >> /* Should happen only with PCI bridges and -M pc-i440fx-2.0. */ >> - error_report("Warning: migration may not work."); >> + warn_report("migration may not work."); > > Could use a tree-wide sweep to drop periods from the end of error > messages. I'm not asking you to do this now. > >> } >> g_array_set_size(tables_blob, legacy_table_size); >> } else { >> /* Make sure we have a buffer in case we need to resize the tables. */ >> if (tables_blob->len > ACPI_BUILD_TABLE_SIZE / 2) { >> /* As of QEMU 2.1, this fires with 160 VCPUs and 255 memory slots. */ >> - error_report("Warning: ACPI tables are larger than 64k."); >> - error_report("Warning: migration may not work."); >> - error_report("Warning: please remove CPUs, NUMA nodes, " >> - "memory slots or PCI bridges."); >> + warn_report("ACPI tables are larger than 64k."); >> + warn_report("migration may not work."); >> + warn_report("please remove CPUs, NUMA nodes, " >> + "memory slots or PCI bridges."); >> } >> acpi_align_size(tables_blob, ACPI_BUILD_TABLE_SIZE); >> } >> diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c >> index 9f2615cbe0..33e20cb3e8 100644 >> --- a/hw/i386/kvm/pci-assign.c >> +++ b/hw/i386/kvm/pci-assign.c >> @@ -1353,9 +1353,9 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev, Error **errp) >> PCI_CAP_ID_EXP); >> return -EINVAL; >> } else if (size != 0x3c) { >> - error_report("WARNING, %s: PCIe cap-id 0x%x has " >> - "non-standard size 0x%x; std size should be 0x3c", >> - __func__, PCI_CAP_ID_EXP, size); >> + warn_report("%s: PCIe cap-id 0x%x has " >> + "non-standard size 0x%x; std size should be 0x3c", >> + __func__, PCI_CAP_ID_EXP, size); >> } >> } else if (version == 0) { >> uint16_t vid, did; >> diff --git a/hw/i386/pc.c b/hw/i386/pc.c >> index 224fe58fe7..465e91cc5b 100644 >> --- a/hw/i386/pc.c >> +++ b/hw/i386/pc.c >> @@ -381,8 +381,8 @@ ISADevice *pc_find_fdc0(void) >> } >> >> if (state.multiple) { >> - error_report("warning: multiple floppy disk controllers with " >> - "iobase=0x3f0 have been found"); >> + warn_report("multiple floppy disk controllers with " >> + "iobase=0x3f0 have been found"); >> error_printf("the one being picked for CMOS setup might not reflect " >> "your intent\n"); >> } >> @@ -2087,9 +2087,9 @@ static void pc_machine_set_max_ram_below_4g(Object *obj, Visitor *v, >> } >> >> if (value < (1ULL << 20)) { >> - error_report("Warning: small max_ram_below_4g(%"PRIu64 >> - ") less than 1M. BIOS may not work..", >> - value); >> + warn_report("small max_ram_below_4g(%"PRIu64 > > Let's insert a space between string literal and PRIu64 while there. > >> + ") less than 1M. BIOS may not work..", >> + value); >> } >> >> pcms->max_ram_below_4g = value; >> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c >> index 22dbef64c6..11b4336a42 100644 >> --- a/hw/i386/pc_piix.c >> +++ b/hw/i386/pc_piix.c >> @@ -131,10 +131,10 @@ static void pc_init1(MachineState *machine, >> lowmem = 0xc0000000; >> } >> if (lowmem & ((1ULL << 30) - 1)) { >> - error_report("Warning: Large machine and max_ram_below_4g " >> - "(%" PRIu64 ") not a multiple of 1G; " >> - "possible bad performance.", >> - pcms->max_ram_below_4g); >> + warn_report("Large machine and max_ram_below_4g " >> + "(%" PRIu64 ") not a multiple of 1G; " >> + "possible bad performance.", >> + pcms->max_ram_below_4g); >> } >> } >> } >> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c >> index 8f696b7cb6..1653a47f0a 100644 >> --- a/hw/i386/pc_q35.c >> +++ b/hw/i386/pc_q35.c >> @@ -101,9 +101,9 @@ static void pc_q35_init(MachineState *machine) >> lowmem = pcms->max_ram_below_4g; >> if (machine->ram_size - lowmem > lowmem && >> lowmem & ((1ULL << 30) - 1)) { >> - error_report("Warning: Large machine and max_ram_below_4g(%"PRIu64 >> - ") not a multiple of 1G; possible bad performance.", >> - pcms->max_ram_below_4g); >> + warn_report("Large machine and max_ram_below_4g(%"PRIu64 >> + ") not a multiple of 1G; possible bad performance.", >> + pcms->max_ram_below_4g); > > Let's insert a space between string literal and PRIu64 while there. These ones are fixed in next patch, so I'm just going to leave them as is in this patch. > >> } >> } >> >> diff --git a/hw/misc/aspeed_sdmc.c b/hw/misc/aspeed_sdmc.c >> index 5f3ac0b6f6..633fa4510e 100644 >> --- a/hw/misc/aspeed_sdmc.c >> +++ b/hw/misc/aspeed_sdmc.c >> @@ -157,8 +157,8 @@ static int ast2400_rambits(AspeedSDMCState *s) >> } >> >> /* use a common default */ >> - error_report("warning: Invalid RAM size 0x%" PRIx64 >> - ". Using default 256M", s->ram_size); >> + warn_report("Invalid RAM size 0x%" PRIx64 >> + ". Using default 256M", s->ram_size); > > warn_report("Invalid RAM size 0x%" PRIx64 ". Using default 256M", > s->ram_size); > >> s->ram_size = 256 << 20; >> return ASPEED_SDMC_DRAM_256MB; >> } >> @@ -179,8 +179,8 @@ static int ast2500_rambits(AspeedSDMCState *s) >> } >> >> /* use a common default */ >> - error_report("warning: Invalid RAM size 0x%" PRIx64 >> - ". Using default 512M", s->ram_size); >> + warn_report("Invalid RAM size 0x%" PRIx64 >> + ". Using default 512M", s->ram_size); > > warn_report("Invalid RAM size 0x%" PRIx64 ". Using default 512M", > s->ram_size); > >> s->ram_size = 512 << 20; >> return ASPEED_SDMC_AST2500_512MB; >> } >> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c >> index 99bdbc2233..e881e3b812 100644 >> --- a/hw/nvram/fw_cfg.c >> +++ b/hw/nvram/fw_cfg.c >> @@ -781,7 +781,7 @@ static int get_fw_cfg_order(FWCfgState *s, const char *name) >> } >> >> /* Stick unknown stuff at the end. */ >> - error_report("warning: Unknown firmware file in legacy mode: %s", name); >> + warn_report("Unknown firmware file in legacy mode: %s", name); >> return FW_CFG_ORDER_OVERRIDE_LAST; >> } >> >> diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c >> index a2c1033dbe..072a04e318 100644 >> --- a/hw/pci-host/piix.c >> +++ b/hw/pci-host/piix.c >> @@ -307,7 +307,7 @@ static void i440fx_realize(PCIDevice *dev, Error **errp) >> dev->config[I440FX_SMRAM] = 0x02; >> >> if (object_property_get_bool(qdev_get_machine(), "iommu", NULL)) { >> - error_report("warning: i440fx doesn't support emulated iommu"); >> + warn_report("i440fx doesn't support emulated iommu"); >> } >> } >> >> diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c >> index a4cd733cba..47221158d4 100644 >> --- a/hw/ppc/pnv.c >> +++ b/hw/ppc/pnv.c >> @@ -160,13 +160,13 @@ static void powernv_create_core_node(PnvChip *chip, PnvCore *pc, void *fdt) >> _FDT((fdt_setprop_cell(fdt, offset, "d-cache-size", >> pcc->l1_dcache_size))); >> } else { >> - error_report("Warning: Unknown L1 dcache size for cpu"); >> + warn_report("Unknown L1 dcache size for cpu"); >> } >> if (pcc->l1_icache_size) { >> _FDT((fdt_setprop_cell(fdt, offset, "i-cache-size", >> pcc->l1_icache_size))); >> } else { >> - error_report("Warning: Unknown L1 icache size for cpu"); >> + warn_report("Unknown L1 icache size for cpu"); >> } >> >> _FDT((fdt_setprop_cell(fdt, offset, "timebase-frequency", tbfreq))); >> @@ -556,7 +556,7 @@ static void ppc_powernv_init(MachineState *machine) >> >> /* allocate RAM */ >> if (machine->ram_size < (1 * G_BYTE)) { >> - error_report("Warning: skiboot may not work with < 1GB of RAM"); >> + warn_report("skiboot may not work with < 1GB of RAM"); >> } >> >> ram = g_new(MemoryRegion, 1); >> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c >> index 0ee9fac50b..fdd55d4820 100644 >> --- a/hw/ppc/spapr.c >> +++ b/hw/ppc/spapr.c >> @@ -534,13 +534,13 @@ static void spapr_populate_cpu_dt(CPUState *cs, void *fdt, int offset, >> _FDT((fdt_setprop_cell(fdt, offset, "d-cache-size", >> pcc->l1_dcache_size))); >> } else { >> - error_report("Warning: Unknown L1 dcache size for cpu"); >> + warn_report("Unknown L1 dcache size for cpu"); >> } >> if (pcc->l1_icache_size) { >> _FDT((fdt_setprop_cell(fdt, offset, "i-cache-size", >> pcc->l1_icache_size))); >> } else { >> - error_report("Warning: Unknown L1 icache size for cpu"); >> + warn_report("Unknown L1 icache size for cpu"); >> } >> >> _FDT((fdt_setprop_cell(fdt, offset, "timebase-frequency", tbfreq))); >> diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c >> index 8656a54a3e..583afc1a46 100644 >> --- a/hw/ppc/spapr_iommu.c >> +++ b/hw/ppc/spapr_iommu.c >> @@ -334,7 +334,7 @@ void spapr_tce_table_enable(sPAPRTCETable *tcet, >> uint32_t nb_table) >> { >> if (tcet->nb_table) { >> - error_report("Warning: trying to enable already enabled TCE table"); >> + warn_report("trying to enable already enabled TCE table"); >> return; >> } >> >> diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c >> index f5574469c8..23c51de66a 100644 >> --- a/hw/scsi/scsi-bus.c >> +++ b/hw/scsi/scsi-bus.c >> @@ -282,9 +282,9 @@ void scsi_bus_legacy_handle_cmdline(SCSIBus *bus, bool deprecated) >> continue; /* claimed */ >> } >> if (!dinfo->is_default) { >> - error_report("warning: bus=%d,unit=%d is deprecated with this" >> - " machine type", >> - bus->busnr, unit); >> + warn_report("bus=%d,unit=%d is deprecated with this" >> + " machine type", >> + bus->busnr, unit); >> } >> } >> scsi_bus_legacy_add_drive(bus, blk_by_legacy_dinfo(dinfo), >> diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c >> index 49cb1829b5..79cd2758a5 100644 >> --- a/hw/usb/dev-smartcard-reader.c >> +++ b/hw/usb/dev-smartcard-reader.c >> @@ -1314,12 +1314,12 @@ static int ccid_card_init(DeviceState *qdev) >> int ret = 0; >> >> if (card->slot != 0) { >> - error_report("Warning: usb-ccid supports one slot, can't add %d", >> + warn_report("usb-ccid supports one slot, can't add %d", >> card->slot); > > Let's fix indentation while there. > >> return -1; >> } >> if (s->card != NULL) { >> - error_report("Warning: usb-ccid card already full, not adding"); >> + warn_report("usb-ccid card already full, not adding"); >> return -1; >> } >> ret = ccid_card_initfn(card); >> diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c >> index aa22d69216..5b65965cc2 100644 >> --- a/hw/usb/redirect.c >> +++ b/hw/usb/redirect.c >> @@ -193,7 +193,7 @@ static void usbredir_handle_status(USBRedirDevice *dev, USBPacket *p, >> #define WARNING(...) \ >> do { \ >> if (dev->debug >= usbredirparser_warning) { \ >> - error_report("usb-redir warning: " __VA_ARGS__); \ >> + warn_report("" __VA_ARGS__); \ >> } \ >> } while (0) >> #define INFO(...) \ >> diff --git a/net/tap-linux.c b/net/tap-linux.c >> index a503fa9c6e..535b1ddb61 100644 >> --- a/net/tap-linux.c >> +++ b/net/tap-linux.c >> @@ -55,7 +55,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, >> ifr.ifr_flags = IFF_TAP | IFF_NO_PI; >> >> if (ioctl(fd, TUNGETFEATURES, &features) == -1) { >> - error_report("warning: TUNGETFEATURES failed: %s", strerror(errno)); >> + warn_report("TUNGETFEATURES failed: %s", strerror(errno)); >> features = 0; >> } >> >> diff --git a/target/i386/cpu.c b/target/i386/cpu.c >> index c57177278b..c078c8e7f1 100644 >> --- a/target/i386/cpu.c >> +++ b/target/i386/cpu.c >> @@ -2060,13 +2060,13 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features, >> name = featurestr; >> >> if (g_list_find_custom(plus_features, name, compare_string)) { >> - error_report("warning: Ambiguous CPU model string. " >> + warn_report("Ambiguous CPU model string. " >> "Don't mix both \"+%s\" and \"%s=%s\"", >> name, name, val); > > Indentation's off. > >> ambiguous = true; >> } >> if (g_list_find_custom(minus_features, name, compare_string)) { >> - error_report("warning: Ambiguous CPU model string. " >> + warn_report("Ambiguous CPU model string. " >> "Don't mix both \"-%s\" and \"%s=%s\"", >> name, name, val); > > Likewise. > >> ambiguous = true; >> @@ -2096,7 +2096,7 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features, >> } >> >> if (ambiguous) { >> - error_report("warning: Compatibility of ambiguous CPU model " >> + warn_report("Compatibility of ambiguous CPU model " >> "strings won't be kept on future QEMU versions"); > > Likewise. > >> } >> } >> @@ -3547,7 +3547,7 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) >> */ >> if (cpu->phys_bits != host_phys_bits && cpu->phys_bits != 0 && >> !warned) { >> - error_report("Warning: Host physical bits (%u)" >> + warn_report("Host physical bits (%u)" >> " does not match phys-bits property (%u)", >> host_phys_bits, cpu->phys_bits); > > Let's fix indentation while there. > >> warned = true; >> diff --git a/target/i386/kvm.c b/target/i386/kvm.c >> index f84a49d366..2ea1d8c728 100644 >> --- a/target/i386/kvm.c >> +++ b/target/i386/kvm.c >> @@ -600,7 +600,7 @@ static int kvm_arch_set_tsc_khz(CPUState *cs) >> kvm_vcpu_ioctl(cs, KVM_GET_TSC_KHZ) : >> -ENOTSUP; >> if (cur_freq <= 0 || cur_freq != env->tsc_khz) { >> - error_report("warning: TSC frequency mismatch between " >> + warn_report("TSC frequency mismatch between " >> "VM (%" PRId64 " kHz) and host (%d kHz), " >> "and TSC scaling unavailable", >> env->tsc_khz, cur_freq); > > Indentation's off. > >> @@ -919,7 +919,7 @@ int kvm_arch_init_vcpu(CPUState *cs) >> error_report("kvm: LMCE not supported"); >> return -ENOTSUP; >> } >> - error_report("warning: Unsupported MCG_CAP bits: 0x%" PRIx64, >> + warn_report("Unsupported MCG_CAP bits: 0x%" PRIx64, >> unsupported_caps); > > Likewise. > >> } >> >> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c >> index 7cb55dc7e3..8db2dfd6d4 100644 >> --- a/target/s390x/cpu_models.c >> +++ b/target/s390x/cpu_models.c >> @@ -677,7 +677,7 @@ static void check_consistency(const S390CPUModel *model) >> for (i = 0; i < ARRAY_SIZE(dep); i++) { >> if (test_bit(dep[i][0], model->features) && >> !test_bit(dep[i][1], model->features)) { >> - error_report("Warning: \'%s\' requires \'%s\'.", >> + warn_report("\'%s\' requires \'%s\'.", >> s390_feat_def(dep[i][0])->name, >> s390_feat_def(dep[i][1])->name); > > Likewise. > >> } >> diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c >> index a3d00196f4..8e956ae39c 100644 >> --- a/target/s390x/kvm.c >> +++ b/target/s390x/kvm.c >> @@ -2675,7 +2675,7 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp) >> /* enable CMM via CMMA - disable on hugetlbfs */ >> if (test_bit(S390_FEAT_CMM, model->features)) { >> if (mem_path) { >> - error_report("Warning: CMM will not be enabled because it is not " >> + warn_report("CMM will not be enabled because it is not " >> "compatible to hugetlbfs."); > > Likewise. > >> } else { >> kvm_s390_enable_cmma(); >> diff --git a/tests/test-qdev-global-props.c b/tests/test-qdev-global-props.c >> index 48e5b7315f..b25fe892ed 100644 >> --- a/tests/test-qdev-global-props.c >> +++ b/tests/test-qdev-global-props.c >> @@ -232,10 +232,10 @@ static void test_dynamic_globalprop(void) >> g_test_trap_assert_passed(); >> g_test_trap_assert_stderr_unmatched("*prop1*"); >> g_test_trap_assert_stderr_unmatched("*prop2*"); >> - g_test_trap_assert_stderr("*Warning: global dynamic-prop-type-bad.prop3 has invalid class name\n*"); >> + g_test_trap_assert_stderr("*warning: global dynamic-prop-type-bad.prop3 has invalid class name\n*"); >> g_test_trap_assert_stderr_unmatched("*prop4*"); >> - g_test_trap_assert_stderr("*Warning: global nohotplug-type.prop5=105 not used\n*"); >> - g_test_trap_assert_stderr("*Warning: global nondevice-type.prop6 has invalid class name\n*"); >> + g_test_trap_assert_stderr("*warning: global nohotplug-type.prop5=105 not used\n*"); >> + g_test_trap_assert_stderr("*warning: global nondevice-type.prop6 has invalid class name\n*"); >> g_test_trap_assert_stdout(""); >> } >> >> diff --git a/trace/control.c b/trace/control.c >> index 9b157b0ca7..bda1000554 100644 >> --- a/trace/control.c >> +++ b/trace/control.c >> @@ -171,7 +171,7 @@ static void do_trace_enable_events(const char *line_buf) >> while ((ev = trace_event_iter_next(&iter)) != NULL) { >> if (!trace_event_get_state_static(ev)) { >> if (!is_pattern) { >> - error_report("WARNING: trace event '%s' is not traceable", >> + warn_report("trace event '%s' is not traceable", >> line_ptr); > > Likewise. > >> return; >> } >> @@ -186,7 +186,7 @@ static void do_trace_enable_events(const char *line_buf) >> } >> >> if (!is_pattern) { >> - error_report("WARNING: trace event '%s' does not exist", >> + warn_report("trace event '%s' does not exist", >> line_ptr); > > Likewise. > >> } >> } >> diff --git a/vl.c b/vl.c >> index d17c863409..d5342fe816 100644 >> --- a/vl.c >> +++ b/vl.c >> @@ -952,8 +952,8 @@ static void bt_vhci_add(int vlan_id) >> struct bt_scatternet_s *vlan = qemu_find_bt_vlan(vlan_id); >> >> if (!vlan->slave) >> - error_report("warning: adding a VHCI to an empty scatternet %i", >> - vlan_id); >> + warn_report("adding a VHCI to an empty scatternet %i", >> + vlan_id); >> >> bt_vhci_init(bt_new_hci(vlan)); >> } >> @@ -979,8 +979,8 @@ static struct bt_device_s *bt_device_add(const char *opt) >> vlan = qemu_find_bt_vlan(vlan_id); >> >> if (!vlan->slave) >> - error_report("warning: adding a slave device to an empty scatternet %i", >> - vlan_id); >> + warn_report("adding a slave device to an empty scatternet %i", >> + vlan_id); >> >> if (!strcmp(devname, "keyboard")) >> return bt_keyboard_init(vlan); >> @@ -2302,8 +2302,8 @@ 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 " >> - "should be prefixed with \"opt/\""); >> + warn_report("externally provided fw_cfg item names " >> + "should be prefixed with \"opt/\""); >> } >> if (nonempty_str(str)) { >> size = strlen(str); /* NUL terminator NOT included in fw_cfg blob */ >> @@ -3760,7 +3760,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: ignoring deprecated option"); >> + warn_report("ignoring deprecated option"); >> break; >> } >> case QEMU_OPTION_no_kvm_pit_reinjection: { >> @@ -3770,8 +3770,8 @@ int main(int argc, char **argv, char **envp) >> .value = "discard", >> }; >> >> - error_report("warning: deprecated, replaced by " >> - "-global kvm-pit.lost_tick_policy=discard"); >> + warn_report("deprecated, replaced by " >> + "-global kvm-pit.lost_tick_policy=discard"); >> qdev_prop_register_global(&kvm_pit_lost_tick_policy); >> break; >> } >> @@ -3896,7 +3896,7 @@ int main(int argc, char **argv, char **envp) >> } >> break; >> case QEMU_OPTION_tdf: >> - error_report("warning: ignoring deprecated option"); >> + warn_report("ignoring deprecated option"); >> break; >> case QEMU_OPTION_name: >> opts = qemu_opts_parse_noisily(qemu_find_opts("name"), > > Nothing remotely serious here, but too many little touch-ups for me to > volunteer doing them on commit, sorry. No worries, I'll prepare a new version. Thanks, Alistair