From: Lan Tianyu Date: Wed, 16 Aug 2017 00:22:13 +0000 (-0400) Subject: x86: Skip check apic_id_limit for Xen X-Git-Tag: v2.11.0-rc0~20^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a26f46692320f1981c95967e0d5af4443b5f0b1;p=thirdparty%2Fqemu.git x86: Skip check apic_id_limit for Xen 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 Message-Id: <1502842933-8323-1-git-send-email-tianyu.lan@intel.com> Signed-off-by: Eduardo Habkost --- diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 8e307f7affb..e11a65b5452 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 ||