[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/15] hw/i386/pc: Restrict CXL to PCI-based machines
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 09/15] hw/i386/pc: Restrict CXL to PCI-based machines |
Date: |
Tue, 2 Apr 2024 16:24:24 +0200 |
CXL is based on PCIe. In is pointless to initialize
its context on non-PCI machines.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Message-ID: <20240327161642.33574-1-philmd@linaro.org>
---
hw/i386/pc.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index e80f02bef4..5c21b0c4db 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1738,7 +1738,9 @@ static void pc_machine_initfn(Object *obj)
pcms->pcspk = isa_new(TYPE_PC_SPEAKER);
object_property_add_alias(OBJECT(pcms), "pcspk-audiodev",
OBJECT(pcms->pcspk), "audiodev");
- cxl_machine_init(obj, &pcms->cxl_devices_state);
+ if (pcmc->pci_enabled) {
+ cxl_machine_init(obj, &pcms->cxl_devices_state);
+ }
pcms->machine_done.notify = pc_machine_done;
qemu_add_machine_init_done_notifier(&pcms->machine_done);
--
2.41.0
- [PULL 00/15] Misc HW patches for 2024-04-02, Philippe Mathieu-Daudé, 2024/04/02
- [PULL 01/15] accel/tcg/plugin: Remove CONFIG_SOFTMMU_GATE definition, Philippe Mathieu-Daudé, 2024/04/02
- [PULL 02/15] gdbstub: Correct invalid mentions of 'softmmu' by 'system', Philippe Mathieu-Daudé, 2024/04/02
- [PULL 03/15] gdbstub/system: Rename 'user_ctx' argument as 'ctx', Philippe Mathieu-Daudé, 2024/04/02
- [PULL 04/15] target/ppc: Rename init_excp_4xx_softmmu() -> init_excp_4xx(), Philippe Mathieu-Daudé, 2024/04/02
- [PULL 05/15] hw/arm/smmu: Avoid using inlined functions with external linkage again, Philippe Mathieu-Daudé, 2024/04/02
- [PULL 06/15] accel/hvf: Un-inline hvf_arch_supports_guest_debug(), Philippe Mathieu-Daudé, 2024/04/02
- [PULL 08/15] MAINTAINERS: Fix error-report.c entry, Philippe Mathieu-Daudé, 2024/04/02
- [PULL 07/15] qtest/libqos: Reduce size_to_prdtl() declaration scope, Philippe Mathieu-Daudé, 2024/04/02
- [PULL 09/15] hw/i386/pc: Restrict CXL to PCI-based machines,
Philippe Mathieu-Daudé <=
- [PULL 10/15] block: Remove unnecessary NULL check in bdrv_pad_request(), Philippe Mathieu-Daudé, 2024/04/02
- [PULL 11/15] plugins: fix -Werror=maybe-uninitialized false-positive, Philippe Mathieu-Daudé, 2024/04/02
- [PULL 12/15] hw/nvme: fix -Werror=maybe-uninitialized, Philippe Mathieu-Daudé, 2024/04/02
- [PULL 15/15] hw/net/virtio-net: fix qemu set used ring flag even vhost started, Philippe Mathieu-Daudé, 2024/04/02
- [PULL 13/15] gpio/pca955x: Update maintainer email address, Philippe Mathieu-Daudé, 2024/04/02
- [PULL 14/15] hw/xen_evtchn: Initialize flush_kvm_routes, Philippe Mathieu-Daudé, 2024/04/02
- Re: [PULL 00/15] Misc HW patches for 2024-04-02, Peter Maydell, 2024/04/02