From nobody Mon Feb 9 02:13:43 2026 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.zoho.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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1486106399627784.801025652766; Thu, 2 Feb 2017 23:19:59 -0800 (PST) Received: from localhost ([::1]:60541 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZYA1-0007J5-MN for importer@patchew.org; Fri, 03 Feb 2017 02:19:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50268) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZY8f-0006jT-Bg for qemu-devel@nongnu.org; Fri, 03 Feb 2017 02:18:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cZY8e-000775-Jv for qemu-devel@nongnu.org; Fri, 03 Feb 2017 02:18:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45018) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cZY8e-00076t-E9 for qemu-devel@nongnu.org; Fri, 03 Feb 2017 02:18:32 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A4DF081231; Fri, 3 Feb 2017 07:18:32 +0000 (UTC) Received: from pxdev.xzpeter.org.com (ovpn-8-19.pek2.redhat.com [10.72.8.19]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v137IPu1009296; Fri, 3 Feb 2017 02:18:30 -0500 From: Peter Xu To: qemu-devel@nongnu.org Date: Fri, 3 Feb 2017 15:18:17 +0800 Message-Id: <1486106298-3699-3-git-send-email-peterx@redhat.com> In-Reply-To: <1486106298-3699-1-git-send-email-peterx@redhat.com> References: <1486106298-3699-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 03 Feb 2017 07:18:32 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/3] ioapic: fix error report value of def version 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: Paolo Bonzini , peterx@redhat.com, Peter Maydell 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" It should be 0x20, rather than 0x11. Signed-off-by: Peter Xu --- hw/intc/ioapic.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index 9047b89..37c4386 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -408,13 +408,15 @@ static void ioapic_machine_done_notify(Notifier *noti= fier, void *data) #endif } =20 +#define IOAPIC_VER_DEF 0x20 + static void ioapic_realize(DeviceState *dev, Error **errp) { IOAPICCommonState *s =3D IOAPIC_COMMON(dev); =20 if (s->version !=3D 0x11 && s->version !=3D 0x20) { error_report("IOAPIC only supports version 0x11 or 0x20 " - "(default: 0x11)."); + "(default: 0x%x).", IOAPIC_VER_DEF); exit(1); } =20 @@ -429,7 +431,7 @@ static void ioapic_realize(DeviceState *dev, Error **er= rp) } =20 static Property ioapic_properties[] =3D { - DEFINE_PROP_UINT8("version", IOAPICCommonState, version, 0x20), + DEFINE_PROP_UINT8("version", IOAPICCommonState, version, IOAPIC_VER_DE= F), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 2.7.4