diff mbox series

[PULL,v2,39/39] x86: Skip check apic_id_limit for Xen

Message ID	20171027142107.15542-40-ehabkost@redhat.com
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B9EA8861B From: Eduardo Habkost <ehabkost@redhat.com> To: Peter Maydell <peter.maydell@linaro.org> Date: Fri, 27 Oct 2017 16:21:07 +0200 Message-Id: <20171027142107.15542-40-ehabkost@redhat.com> In-Reply-To: <20171027142107.15542-1-ehabkost@redhat.com> References: <20171027142107.15542-1-ehabkost@redhat.com> Subject: [Qemu-devel] [PULL v2 39/39] x86: Skip check apic_id_limit for Xen Precedence: list Cc: Lan Tianyu <tianyu.lan@intel.com>, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	[PULL,v2,01/39] alpha: cleanup cpu type name composition \| expand [PULL,v2,01/39] alpha: cleanup cpu type name composition [PULL,v2,02/39] alpha: use generic cpu_model parsing [PULL,v2,03/39] cris: cleanup cpu type name composition [PULL,v2,04/39] cris: use generic cpu_model parsing [PULL,v2,05/39] lm32: cleanup cpu type name composition [PULL,v2,06/39] lm32: milkymist: use generic cpu_model parsing [PULL,v2,07/39] lm32: lm32_boards: use generic cpu_model parsing [PULL,v2,08/39] m68k: cleanup cpu type name composition [PULL,v2,09/39] m68k: an5206: use generic cpu_model parsing [PULL,v2,10/39] m68k: mcf5208: use generic cpu_model parsing [PULL,v2,11/39] moxie: fix qemu-system-moxie failing to start with CLI "-cpu MoxieLite" [PULL,v2,12/39] moxie: cleanup cpu type name composition [PULL,v2,13/39] moxie: use generic cpu_model parsing [PULL,v2,14/39] openrisc: cleanup cpu type name composition [PULL,v2,15/39] openrisc: use generic cpu_model parsing [PULL,v2,16/39] sh4: r2d: use generic cpu_model parsing [PULL,v2,17/39] sh4: shix: use generic cpu_model parsing [PULL,v2,18/39] sh4: cleanup cpu type name composition [PULL,v2,19/39] sh4: simplify superh_cpu_class_by_name() [PULL,v2,20/39] sh4: remove SuperHCPUClass::name field [PULL,v2,21/39] xtensa: cleanup cpu type name composition [PULL,v2,22/39] xtensa: sim: use generic cpu_model parsing [PULL,v2,23/39] xtensa: lx60/lx200/ml605/kc705: use generic cpu_model parsing [PULL,v2,24/39] unicore32: cleanup cpu type name composition [PULL,v2,25/39] unicore32: use generic cpu_model parsing [PULL,v2,26/39] tricore: cleanup cpu type name composition [PULL,v2,27/39] tricore: use generic cpu_model parsing [PULL,v2,28/39] sparc: cleanup cpu type name composition [PULL,v2,29/39] sparc: sun4u/sun4v/niagara: use generic cpu_model parsing [PULL,v2,30/39] sparc: sparc: use generic cpu_model parsing [PULL,v2,31/39] sparc: leon3: use generic cpu_model parsing [PULL,v2,32/39] mips: use object_new() instead of gnew()+object_initialize() [PULL,v2,33/39] mips: malta/boston: replace cpu_model with cpu_type [PULL,v2,34/39] mips: fulong2e: replace cpu_model with cpu_type [PULL,v2,35/39] mips: Magnum/Acer Pica 61: replace cpu_model with cpu_type [PULL,v2,36/39] mips: mipssim: replace cpu_model with cpu_type [PULL,v2,37/39] mips: r4k: replace cpu_model with cpu_type [PULL,v2,38/39] numa: fixup parsed NumaNodeOptions earlier [PULL,v2,39/39] x86: Skip check apic_id_limit for Xen

Commit Message

Eduardo Habkost Oct. 27, 2017, 2:21 p.m. UTC

From: Lan Tianyu <tianyu.lan@intel.com>

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 <tianyu.lan@intel.com>
Message-Id: <1502842933-8323-1-git-send-email-tianyu.lan@intel.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 hw/i386/pc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 8e307f7aff..e11a65b545 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1228,7 +1228,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 ||