From nobody Mon Feb 9 19:54:01 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 1487258928284862.1578877542437; Thu, 16 Feb 2017 07:28:48 -0800 (PST) Received: from localhost ([::1]:47335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ceNzB-0006M4-PX for importer@patchew.org; Thu, 16 Feb 2017 10:28:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ceN6J-0003W1-Fh for qemu-devel@nongnu.org; Thu, 16 Feb 2017 09:32:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ceN6I-00080I-NL for qemu-devel@nongnu.org; Thu, 16 Feb 2017 09:32:03 -0500 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:34873) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ceN6I-0007z6-HK for qemu-devel@nongnu.org; Thu, 16 Feb 2017 09:32:02 -0500 Received: by mail-wr0-x242.google.com with SMTP id q39so2263414wrb.2 for ; Thu, 16 Feb 2017 06:32:02 -0800 (PST) Received: from 640k.lan (94-39-187-56.adsl-ull.clienti.tiscali.it. [94.39.187.56]) by smtp.gmail.com with ESMTPSA id g5sm9203365wrd.0.2017.02.16.06.31.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Feb 2017 06:32:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=yLLGwLVlQnJ3EjGhuT76OIkM7bIWOEW8bHV0hhwEZ/M=; b=X9pvP8X97RDP/DZJ6xqUxP8mYo5i0ZS6YXruEMrV/jK8MTKZtW6VsEnkRtktCMbA3Z 17kGEK72Jvfp7cR0IASJW4Y4ZMVfoWPfRbc2QhwdrTxt0Zd8bA/GyAEUD1pPaCQVzo5G /4dK6c1UwXzNDf4rjtESHlQCsYvcIWRx0r28uW9OtfqBcB6mkaSr/4J1RZYmF41UEJo6 oUZIUsTFfFQ70wsFbtIIf1sFft7kBSSc9IJs7Dv6hfwKAOk4UqDFYriJ770tdb/UkCdo /3h+RKSCSJ68juLJdcZGoQTOWLuE4JjiuEePRhOWlmMVvfm3gpS1+vxVduS8FSUMJJEv 9ydA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=yLLGwLVlQnJ3EjGhuT76OIkM7bIWOEW8bHV0hhwEZ/M=; b=o3vFV3uu8VTw+zja1CrMugI1kXGkwDl8vkzLOqKfkqw4Yu+EhwSJfO0aHJfed7qbup T+x2d/2M+g8zKisPx+zjyjalwnkBNi+2AnRx+WN+M25eQ5dAN1Wwr1CuI0qeqYgiDEoI rUe7LTjFy1dj9e+mdy91fLtCU1EDjDpvnLjvJwxf3GsqtF+xH7oRWGE0+G23wDPwI7bj kWqrNt3zxX8dtctaH+Gj87UXf+KjnuYNgP6Mt1y0lI5CZ31SZ4b8+1Mf48PeM18qMvZb hcvvYnSivio0x3SLEgpug82o5aBYXnU44dxHoIfvebrfKI0lsjQ4UysoEnIVdg+nxKW1 laVw== X-Gm-Message-State: AMke39nu5hn+QBc68teOFDfiP/rhr29rniAigF/gQWMy+OmOpfypwKEm5esmyhSsVpcRqA== X-Received: by 10.223.175.71 with SMTP id z65mr2986924wrc.84.1487255521256; Thu, 16 Feb 2017 06:32:01 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 16 Feb 2017 15:31:26 +0100 Message-Id: <1487255507-106654-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1487255507-106654-1-git-send-email-pbonzini@redhat.com> References: <1487255507-106654-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PULL 02/23] 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: Peter Xu 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" From: Peter Xu It should be 0x20, rather than 0x11. Signed-off-by: Peter Xu Message-Id: <1486106298-3699-3-git-send-email-peterx@redhat.com> Signed-off-by: Paolo Bonzini --- 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 1.8.3.1