+Thomas (meson) & Marc-André (conditional QAPI)
On 22/2/23 17:49, Jonathan Cameron wrote:
+# Type of uncorrectable CXL error to inject. These errors are reported via
+# an AER uncorrectable internal error with additional information logged at
+# the CXL device.
+#
+# @cache-data-parity: Data error such as data parity or data ECC error
CXL.cache
+# @cache-address-parity: Address parity or other errors associated with the
+# address field on CXL.cache
+# @cache-be-parity: Byte enable parity or other byte enable errors on CXL.cache
+# @cache-data-ecc: ECC error on CXL.cache
+# @mem-data-parity: Data error such as data parity or data ECC error on CXL.mem
+# @mem-address-parity: Address parity or other errors associated with the
+# address field on CXL.mem
+# @mem-be-parity: Byte enable parity or other byte enable errors on CXL.mem.
+# @mem-data-ecc: Data ECC error on CXL.mem.
+# @reinit-threshold: REINIT threshold hit.
+# @rsvd-encoding: Received unrecognized encoding.
+# @poison-received: Received poison from the peer.
+# @receiver-overflow: Buffer overflows (first 3 bits of header log indicate
which)
+# @internal: Component specific error
+# @cxl-ide-tx: Integrity and data encryption tx error.
+# @cxl-ide-rx: Integrity and data encryption rx error.
+##
+
+{ 'enum': 'CxlUncorErrorType',
Doesn't these need
'if': 'CONFIG_CXL_MEM_DEVICE',
?
If I make this change I get a bunch of
./qapi/qapi-types-cxl.h:18:13: error: attempt to use poisoned
"CONFIG_CXL_MEM_DEVICE"
18 | #if defined(CONFIG_CXL_MEM_DEVICE)
Err, I meant the generic CONFIG_CXL, not CONFIG_CXL_MEM_DEVICE.
It's a target specific define (I think) as built alongside PCI_EXPRESS
Only CXL_ACPI is specifically included by x86 and arm64 (out of tree)
To be honest though I don't fully understand the QEMU build system so the reason
for the error might be wrong.
You need to restrict to system emulation (the 'have_system' check):
This doesn't help - still have
attempt to used poisoned "CONFIG_CXL"
-- >8 --
diff --git a/qapi/meson.build b/qapi/meson.build
index fbdb442fdf..643c76d61c 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -31,6 +31,7 @@ qapi_all_modules = [
'compat',
'control',
'crypto',
- 'cxl',
'dump',
'error',
'introspect',
@@ -58,6 +59,7 @@ if have_system
'audio',
'qdev',
'pci',
+ 'cxl',
'rdma',
'rocker',
'tpm',
---
