ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

error: Clean up error strings with embedded newlines 

The arguments of error_report() should yield a short error string
without newlines.

A few places try to print additional help after the error message by
embedding newlines in the error string.  That's nice, but let's do it
the right way.

Since I'm touching these lines anyway, drop a stray preposition and
some tabs.  We don't use tabs for similar messages elsewhere.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 1360354939-10994-2-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Markus Armbruster 2013-02-08 21:22:14 +01:00 committed by Anthony Liguori
parent 2da2e52dce
commit 474c21349f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/kvm/pci-assign.c
View File

@ -936,8 +936,8 @@ retry:
/* Retry with host-side MSI. There might be an IRQ conflict and /* Retry with host-side MSI. There might be an IRQ conflict and
* either the kernel or the device doesn't support sharing. */ * either the kernel or the device doesn't support sharing. */
error_report("Host-side INTx sharing not supported, " error_report("Host-side INTx sharing not supported, "
"using MSI instead.\n" "using MSI instead");
"Some devices do not to work properly in this mode."); error_printf("Some devices do not work properly in this mode.\n");
dev->features |= ASSIGNED_DEVICE_PREFER_MSI_MASK; dev->features |= ASSIGNED_DEVICE_PREFER_MSI_MASK;
goto retry; goto retry;
} }
@ -1903,10 +1903,10 @@ static void assigned_dev_load_option_rom(AssignedDevice *dev)
memset(ptr, 0xff, st.st_size); memset(ptr, 0xff, st.st_size);
if (!fread(ptr, 1, st.st_size, fp)) { if (!fread(ptr, 1, st.st_size, fp)) {
error_report("pci-assign: Cannot read from host %s\n" error_report("pci-assign: Cannot read from host %s", rom_file);
"\tDevice option ROM contents are probably invalid " error_printf("Device option ROM contents are probably invalid "
"(check dmesg).\n\tSkip option ROM probe with rombar=0, " "(check dmesg).\nSkip option ROM probe with rombar=0, "
"or load from file with romfile=", rom_file); "or load from file with romfile=\n");
memory_region_destroy(&dev->dev.rom); memory_region_destroy(&dev->dev.rom);
goto close_rom; goto close_rom;
} }