From nobody Mon May 6 09:24:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1537947110165156.41858914627892; Wed, 26 Sep 2018 00:31:50 -0700 (PDT) Received: from localhost ([::1]:56783 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g54IN-0006Vn-9l for importer@patchew.org; Wed, 26 Sep 2018 03:31:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39628) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g54HN-0006EV-H7 for qemu-devel@nongnu.org; Wed, 26 Sep 2018 03:30:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g54HK-0005y4-At for qemu-devel@nongnu.org; Wed, 26 Sep 2018 03:30:37 -0400 Received: from cmccmta2.chinamobile.com ([221.176.66.80]:54601) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g54HJ-0005ta-Mp for qemu-devel@nongnu.org; Wed, 26 Sep 2018 03:30:34 -0400 Received: from spf.mail.chinamobile.com (unknown[172.16.121.19]) by rmmx-syy-dmz-app07-12007 (RichMail) with SMTP id 2ee75bab358d694-c5cc5; Wed, 26 Sep 2018 15:30:21 +0800 (CST) Received: from compute2.ovsnet.bclinux.org (unknown[223.105.0.243]) by rmsmtp-syy-appsvr10-12010 (RichMail) with SMTP id 2eea5bab357c306-0281d; Wed, 26 Sep 2018 15:30:21 +0800 (CST) X-RM-TRANSID: 2ee75bab358d694-c5cc5 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2eea5bab357c306-0281d From: Mao Zhongyi To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Wed, 26 Sep 2018 03:29:48 -0400 Message-Id: <1537946988-4051-1-git-send-email-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.80 Subject: [Qemu-devel] [PATCH] multiboot: Make the message more user friendly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ehabkost@redhat.com, Mao Zhongyi , mst@redhat.com, pbonzini@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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. Reported-by: Peter Maydell Signed-off-by: Mao Zhongyi Reviewed-by: Eric Blake --- hw/i386/multiboot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index 1a4344f..44fc7d8 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -186,7 +186,8 @@ int load_multiboot(FWCfgState *fw_cfg, memset(&mbs, 0, sizeof(mbs)); =20 if (flags & 0x00000004) { /* MULTIBOOT_HEADER_HAS_VBE */ - error_report("multiboot knows VBE. we don't"); + error_report("This multiboot image uses VBE, which QEMU " + "does not support"); } if (!(flags & 0x00010000)) { /* MULTIBOOT_HEADER_HAS_ADDR */ uint64_t elf_entry; --=20 1.8.3.1