OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

General warn report fixups

Browse Source 
Tidy up some of the warn_report() messages after having converted them
to use warn_report().

Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <9cb1d23551898c9c9a5f84da6773e99871285120.1505158760.git.alistair.francis@xilinx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Alistair Francis 2017-09-11 12:52:56 -07:00 committed by Paolo Bonzini
parent 8297be80f7
commit b62e39b469
11 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
block/vvfat.c
View File

@ -1227,8 +1227,7 @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
switch (s->fat_type) {
case 32:
warn_report("FAT32 has not been tested. "
"You are welcome to do so!");
warn_report("FAT32 has not been tested. You are welcome to do so!");
break;
case 16:
case 12:

2
hw/arm/vexpress.c
View File

@ -494,7 +494,7 @@ static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt)
* happen with older device tree blobs.
*/
warn_report("couldn't find interrupt controller in "
"dtb; will not include virtio-mmio devices in the dtb.");
"dtb; will not include virtio-mmio devices in the dtb");
} else {
int i;
const hwaddr *map = daughterboard->motherboard_map;

2
hw/i386/xen/xen-mapcache.c
View File

@ -127,7 +127,7 @@ void xen_map_cache_init(phys_offset_to_gaddr_t f, void *opaque)
if (rlimit_as.rlim_max != RLIM_INFINITY) {
warn_report("QEMU's maximum size of virtual"
" memory is not infinity.");
" memory is not infinity");
}
if (rlimit_as.rlim_max < MCACHE_MAX_SIZE + NON_MCACHE_MEMORY_SIZE) {
mapcache->max_mcache_size = rlimit_as.rlim_max -

4
hw/mips/mips_malta.c
View File

@ -216,8 +216,8 @@ static void generate_eeprom_spd(uint8_t *eeprom, ram_addr_t ram_size)
}
if (ram_size) {
warn_report("SPD cannot represent final %dMB"
" of SDRAM", (int)ram_size);
warn_report("SPD cannot represent final " RAM_ADDR_FMT "MB"
" of SDRAM", ram_size);
}
/* fill in SPD memory information */

3
hw/mips/mips_r4k.c
View File

@ -254,8 +254,7 @@ void mips_r4k_init(MachineState *machine)
}
} else if (!qtest_enabled()) {
/* not fatal */
warn_report("could not load MIPS bios '%s'",
bios_name);
warn_report("could not load MIPS bios '%s'", bios_name);
}
g_free(filename);

14
hw/s390x/s390-virtio.c
View File

@ -141,9 +141,10 @@ void gtod_save(QEMUFile *f, void *opaque)
r = s390_get_clock(&tod_high, &tod_low);
if (r) {
warn_report("Unable to get guest clock for migration. "
"Error code %d. Guest clock will not be migrated "
"which could cause the guest to hang.", r);
warn_report("Unable to get guest clock for migration: %s",
strerror(-r));
error_printf("Guest clock will not be migrated "
"which could cause the guest to hang.");
qemu_put_byte(f, S390_TOD_CLOCK_VALUE_MISSING);
return;
}
@ -170,9 +171,10 @@ int gtod_load(QEMUFile *f, void *opaque, int version_id)
r = s390_set_clock(&tod_high, &tod_low);
if (r) {
warn_report("Unable to set guest clock value. "
"s390_get_clock returned error %d. This could cause "
"the guest to hang.", r);
warn_report("Unable to set guest clock for migration: %s",
strerror(-r));
error_printf("Guest clock will not be restored "
"which could cause the guest to hang.");
}
return 0;

6
net/hub.c
View File

@ -310,8 +310,7 @@ void net_hub_check_clients(void)
QLIST_FOREACH(port, &hub->ports, next) {
peer = port->nc.peer;
if (!peer) {
warn_report("hub port %s has no peer",
port->nc.name);
warn_report("hub port %s has no peer", port->nc.name);
continue;
}
@ -334,8 +333,7 @@ void net_hub_check_clients(void)
warn_report("vlan %d with no nics", hub->id);
}
if (has_nic && !has_host_dev) {
warn_report("vlan %d is not connected to host network",
hub->id);
warn_report("vlan %d is not connected to host network", hub->id);
}
}
}

5
net/net.c
View File

@ -1494,8 +1494,9 @@ void net_check_clients(void)
QTAILQ_FOREACH(nc, &net_clients, next) {
if (!nc->peer) {
warn_report("%s %s has no peer",
nc->info->type == NET_CLIENT_DRIVER_NIC ?
"nic" : "netdev", nc->name);
nc->info->type == NET_CLIENT_DRIVER_NIC
? "nic" : "netdev",
nc->name);
}
}

6
target/i386/hax-mem.c
View File

@ -12,6 +12,7 @@
#include "cpu.h"
#include "exec/address-spaces.h"
#include "exec/exec-all.h"
#include "qemu/error-report.h"
#include "target/i386/hax-i386.h"
#include "qemu/queue.h"
@ -178,9 +179,8 @@ static void hax_process_section(MemoryRegionSection *section, uint8_t flags)
if (!memory_region_is_ram(mr)) {
if (memory_region_is_romd(mr)) {
/* HAXM kernel module does not support ROMD yet */
warn_report("Ignoring ROMD region 0x%016" PRIx64
"->0x%016" PRIx64 "", __func__, start_pa,
start_pa + size);
warn_report("Ignoring ROMD region 0x%016" PRIx64 "->0x%016" PRIx64,
start_pa, start_pa + size);
}
return;
}

3
target/ppc/translate_init.c
View File

@ -9321,8 +9321,7 @@ static void init_ppc_proc(PowerPCCPU *cpu)
}
#endif
if (env->check_pow == NULL) {
warn_report("no power management check handler "
"registered."
warn_report("no power management check handler registered."
" Attempt QEMU to crash very soon !");
}
}

3
ui/keymaps.c
View File

@ -198,8 +198,7 @@ int keysym2scancode(void *kbd_layout, int keysym)
if (keysym < MAX_NORMAL_KEYCODE) {
if (k->keysym2keycode[keysym] == 0) {
trace_keymap_unmapped(keysym);
warn_report("no scancode found for keysym %d",
keysym);
warn_report("no scancode found for keysym %d", keysym);
}
return k->keysym2keycode[keysym];
} else {