From patchwork Wed Aug 16 00:22:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9903091 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 32CB760231 for ; Wed, 16 Aug 2017 06:31:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1DD1128966 for ; Wed, 16 Aug 2017 06:31:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1293F28976; Wed, 16 Aug 2017 06:31:40 +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=-2.7 required=2.0 tests=BAYES_00, DATE_IN_PAST_06_12, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9AC2128966 for ; Wed, 16 Aug 2017 06:31:39 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dhrp5-00014t-VG; Wed, 16 Aug 2017 06:28:59 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dhrp5-00014n-5R for xen-devel@lists.xenproject.org; Wed, 16 Aug 2017 06:28:59 +0000 Received: from [193.109.254.147] by server-6.bemta-6.messagelabs.com id 8E/5D-03937-A26E3995; Wed, 16 Aug 2017 06:28:58 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBLMWRWlGSWpSXmKPExsXS1tYhoav1bHK kwZn1jBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aErVNYCz6zVtz5d42tgfENSxcjF4eQwHRG iRt3JrF1MXJySAjwShxZNoMVwg6QeLpuIxOILSTQwSix8mMuiM0moC5xYvFERhBbREBS4nfXa WaQQcwCGxkltmw7yQKSEBYwk9j4Zi17FyMHB4uAqsT77TwgYV4BZ4l3M+6wQ8xXkJjy8D3zBE buBYwMqxg1ilOLylKLdA2N9JKKMtMzSnITM3N0DQ3M9HJTi4sT01NzEpOK9ZLzczcxAv3LAAQ 7GC9vDDjEKMnBpCTKu+jspEghvqT8lMqMxOKM+KLSnNTiQ4wyHBxKErzTnkyOFBIsSk1PrUjL zAEGGkxagoNHSYR3Lkiat7ggMbc4Mx0idYrRmKPpw5YvTByvJvz/xiTEkpeflyolzsv6FKhUA KQ0ozQPbhAsAi4xykoJ8zICnSbEU5BalJtZgir/ilGcg1FJmPcRyEKezLwSuH2vgE5hAjrlSv skkFNKEhFSUg2Mfhlrg/50fwkUOJR07Z1JKF+dRo7wnZqa+coOYmHFH2wrOm/U/Vxx6/uW0s5 JU7ZYCc7oXuWp6jVxZvkd34bcO7fnJge1tsWxNx1ZpLBEuKSr2tpR4FSI5BdG/hX+oRw5LBV2 Tq+YYsvfPU7WF/o/W66o8PCWlRoOLDq/rx20m/EzlMeT7ZQSS3FGoqEWc1FxIgCoSdUdewIAA A== X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1502864935!80174349!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzkwOTcx\n X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5924 invoked from network); 16 Aug 2017 06:28:57 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-11.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 16 Aug 2017 06:28:57 -0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Aug 2017 23:28:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.41,381,1498546800"; d="scan'208"; a="1183241751" Received: from sky-ws.sh.intel.com (HELO localhost) ([10.239.48.141]) by fmsmga001.fm.intel.com with ESMTP; 15 Aug 2017 23:28:53 -0700 From: Lan Tianyu To: qemu-devel@nongnu.org Date: Tue, 15 Aug 2017 20:22:13 -0400 Message-Id: <1502842933-8323-1-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.8.3.1 Cc: Lan Tianyu , ehabkost@redhat.com, mst@redhat.com, xen-devel@lists.xenproject.org, anthony.perard@citrix.com, pbonzini@redhat.com, rth@twiddle.net Subject: [Xen-devel] [PATCH] x86: Skip check apic_id_limit for Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Xen vIOMMU device model will be in Xen hypervisor. Skip vIOMMU check for Xen here when vcpu number is more than 255. Signed-off-by: Lan Tianyu Acked-by: Michael S. Tsirkin --- hw/i386/pc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 5943539..fc17885 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1260,7 +1260,7 @@ void pc_machine_done(Notifier *notifier, void *data) fw_cfg_modify_i16(pcms->fw_cfg, FW_CFG_NB_CPUS, pcms->boot_cpus); } - if (pcms->apic_id_limit > 255) { + if (pcms->apic_id_limit > 255 && !xen_enabled()) { IntelIOMMUState *iommu = INTEL_IOMMU_DEVICE(x86_iommu_get_default()); if (!iommu || !iommu->x86_iommu.intr_supported ||