On 20 September 2018 at 10:34, Eduardo Habkost <ehabk...@redhat.com> wrote:
> On Thu, Sep 20, 2018 at 07:08:32AM -0400, Mao Zhongyi wrote:
>> error_report and friends already add a "qemu-system-xxx" prefix
>> to the string, so a "qemu:" prefix is redundant in the string.
>> Just drop it.
>>
>> Reported-by: Thomas Huth <th...@redhat.com>
>> Signed-off-by: Mao Zhongyi <maozhon...@cmss.chinamobile.com>
>
> Reviewed-by: Eduardo Habkost <ehabk...@redhat.com>
>
> Markus, do you want to merge it through your tree?
>
> If we are already touching those messages, it would be nice if we
> removed punctuation too on some cases below[1].
>
>
>> ---
>> hw/i386/multiboot.c | 8 ++++----
>> hw/ppc/e500.c | 4 ++--
>> hw/ppc/sam460ex.c | 8 ++++----
>> hw/riscv/sifive_e.c | 2 +-
>> hw/riscv/sifive_u.c | 2 +-
>> hw/riscv/spike.c | 2 +-
>> hw/riscv/virt.c | 4 ++--
>> 7 files changed, 15 insertions(+), 15 deletions(-)
>>
>> diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
>> index d519e20..91118de 100644
>> --- a/hw/i386/multiboot.c
>> +++ b/hw/i386/multiboot.c
>> @@ -181,12 +181,12 @@ int load_multiboot(FWCfgState *fw_cfg,
>> if (!is_multiboot)
>> return 0; /* no multiboot */
>>
>> - mb_debug("qemu: I believe we found a multiboot image!");
>> + mb_debug("I believe we found a multiboot image!");
>> memset(bootinfo, 0, sizeof(bootinfo));
>> memset(&mbs, 0, sizeof(mbs));
>>
>> if (flags & 0x00000004) { /* MULTIBOOT_HEADER_HAS_VBE */
>> - error_report("qemu: multiboot knows VBE. we don't.");
>> + error_report("multiboot knows VBE. we don't.");
Since this one is intended to be a user-facing error message
rather than just a debug note, it could also be reasonably expanded
to be a bit more user friendly, eg:
"This multiboot image uses VBE, which QEMU does not support."
But that's a different patch.
thanks
-- PMM
