]> git.proxmox.com Git - mirror_qemu.git/commitdiff
x86: Skip check apic_id_limit for Xen
authorLan Tianyu <tianyu.lan@intel.com>
Wed, 16 Aug 2017 00:22:13 +0000 (20:22 -0400)
committerEduardo Habkost <ehabkost@redhat.com>
Fri, 27 Oct 2017 14:04:28 +0000 (16:04 +0200)
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

index 8e307f7affb6bce6f94711a9dd0122e28c48a2a4..e11a65b5452e9103454a1dae72de566a8cab02ff 100644 (file)
@@ -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 ||