From patchwork Thu Sep 22 21:04:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= X-Patchwork-Id: 9346955 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1C5EE60757 for ; Thu, 22 Sep 2016 21:06:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A25E2AAE6 for ; Thu, 22 Sep 2016 21:06:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F26C32AC8F; Thu, 22 Sep 2016 21:06:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1A6142AAE6 for ; Thu, 22 Sep 2016 21:06:58 +0000 (UTC) Received: from localhost ([::1]:33822 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bnBBi-0005N9-1E for patchwork-qemu-devel@patchwork.kernel.org; Thu, 22 Sep 2016 17:05:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50694) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bnBBA-0005Io-HB for qemu-devel@nongnu.org; Thu, 22 Sep 2016 17:05:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bnBB3-0007Vg-Pe for qemu-devel@nongnu.org; Thu, 22 Sep 2016 17:05:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59104) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bnBB2-0007Uv-OP for qemu-devel@nongnu.org; Thu, 22 Sep 2016 17:05:05 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (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 3DAA27CDE5; Thu, 22 Sep 2016 21:04:51 +0000 (UTC) Received: from potion (ovpn-204-106.brq.redhat.com [10.40.204.106]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id u8ML4mPm008614; Thu, 22 Sep 2016 17:04:48 -0400 Received: by potion (sSMTP sendmail emulation); Thu, 22 Sep 2016 23:04:47 +0200 From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= To: qemu-devel@nongnu.org Date: Thu, 22 Sep 2016 23:04:28 +0200 Message-Id: <20160922210432.18680-2-rkrcmar@redhat.com> In-Reply-To: <20160922210432.18680-1-rkrcmar@redhat.com> References: <20160922210432.18680-1-rkrcmar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 22 Sep 2016 21:04:51 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/5] apic: add global apic_get_class() 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: Eduardo Habkost , "Michael S. Tsirkin" , Peter Xu , Paolo Bonzini , Igor Mammedov , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Every configuration has only up to one APIC class and we'll be extending the class with a function that can be called without an instanced object, so a direct access to the class is convenient. Signed-off-by: Radim Krčmář --- hw/intc/apic_common.c | 14 ++++++++++++++ include/hw/i386/apic_internal.h | 3 +++ 2 files changed, 17 insertions(+) diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 14ac43c18666..86ef9c43e6df 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -18,6 +18,7 @@ * License along with this library; if not, see */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -296,6 +297,13 @@ static int apic_load_old(QEMUFile *f, void *opaque, int version_id) static const VMStateDescription vmstate_apic_common; +APICCommonClass *apic_class; + +APICCommonClass *apic_get_class(void) +{ + return apic_class; +} + static void apic_common_realize(DeviceState *dev, Error **errp) { APICCommonState *s = APIC_COMMON(dev); @@ -306,6 +314,12 @@ static void apic_common_realize(DeviceState *dev, Error **errp) info = APIC_COMMON_GET_CLASS(s); info->realize(dev, errp); + if (apic_class && apic_class != info) { + error_report("All APICs must be of the same class."); + exit(1); + } + apic_class = info; + /* Note: We need at least 1M to map the VAPIC option ROM */ if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK && ram_size >= 1024 * 1024) { diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h index 06c4e9f6f95b..9ba8a5c87f90 100644 --- a/include/hw/i386/apic_internal.h +++ b/include/hw/i386/apic_internal.h @@ -222,4 +222,7 @@ static inline int apic_get_bit(uint32_t *tab, int index) return !!(tab[i] & mask); } + +APICCommonClass *apic_get_class(void); + #endif /* QEMU_APIC_INTERNAL_H */