[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/41] hw/ppc: Only register spapr_nvdimm_properties if CONFIG_LIB
From: |
Paolo Bonzini |
Subject: |
[PULL 06/41] hw/ppc: Only register spapr_nvdimm_properties if CONFIG_LIBPMEM |
Date: |
Thu, 19 Dec 2024 09:31:53 +0100 |
From: Richard Henderson <richard.henderson@linaro.org>
Do not register an empty set of properties.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Link:
20241216035109.3486070-7-richard.henderson@linaro.org">https://lore.kernel.org/r/20241216035109.3486070-7-richard.henderson@linaro.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/ppc/spapr_nvdimm.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/ppc/spapr_nvdimm.c b/hw/ppc/spapr_nvdimm.c
index 2ef6f29f3dd..8bcce4146a5 100644
--- a/hw/ppc/spapr_nvdimm.c
+++ b/hw/ppc/spapr_nvdimm.c
@@ -884,22 +884,23 @@ static void spapr_nvdimm_unrealize(NVDIMMDevice *dimm)
vmstate_unregister(NULL, &vmstate_spapr_nvdimm_states, dimm);
}
-static const Property spapr_nvdimm_properties[] = {
#ifdef CONFIG_LIBPMEM
+static const Property spapr_nvdimm_properties[] = {
DEFINE_PROP_BOOL("pmem-override", SpaprNVDIMMDevice, pmem_override, false),
-#endif
DEFINE_PROP_END_OF_LIST(),
};
+#endif
static void spapr_nvdimm_class_init(ObjectClass *oc, void *data)
{
- DeviceClass *dc = DEVICE_CLASS(oc);
NVDIMMClass *nvc = NVDIMM_CLASS(oc);
nvc->realize = spapr_nvdimm_realize;
nvc->unrealize = spapr_nvdimm_unrealize;
- device_class_set_props(dc, spapr_nvdimm_properties);
+#ifdef CONFIG_LIBPMEM
+ device_class_set_props(DEVICE_CLASS(oc), spapr_nvdimm_properties);
+#endif
}
static void spapr_nvdimm_init(Object *obj)
--
2.47.1
- [PULL 00/41] Rust, qdev, target/i386 changes for 2024-12-19, Paolo Bonzini, 2024/12/19
- [PULL 01/41] migration: Constify migration_properties, Paolo Bonzini, 2024/12/19
- [PULL 02/41] hw/ide: Constify sysbus_ahci_properties, Paolo Bonzini, 2024/12/19
- [PULL 03/41] target/ppc: Remove empty property list, Paolo Bonzini, 2024/12/19
- [PULL 04/41] target/s390x: Use s390x_cpu_properties for system mode only, Paolo Bonzini, 2024/12/19
- [PULL 06/41] hw/ppc: Only register spapr_nvdimm_properties if CONFIG_LIBPMEM,
Paolo Bonzini <=
- [PULL 05/41] hw/pci-host/astro: Remove empty Property list, Paolo Bonzini, 2024/12/19
- [PULL 08/41] hw/s390x: Remove empty Property lists, Paolo Bonzini, 2024/12/19
- [PULL 09/41] hw/xen: Remove empty Property lists, Paolo Bonzini, 2024/12/19
- [PULL 10/41] hw/sparc: Remove empty Property lists, Paolo Bonzini, 2024/12/19
- [PULL 11/41] hw/virtio: Remove empty Property lists, Paolo Bonzini, 2024/12/19
- [PULL 12/41] include/hw/qdev-core: Detect most empty Property lists at compile time, Paolo Bonzini, 2024/12/19
- [PULL 07/41] hw/tricore: Remove empty Property lists, Paolo Bonzini, 2024/12/19
- [PULL 13/41] hw/core: Introduce device_class_set_props_n, Paolo Bonzini, 2024/12/19
- [PULL 15/41] hw/scsi/megasas: Use device_class_set_props_n, Paolo Bonzini, 2024/12/19
- [PULL 14/41] migration: Use device_class_set_props_n, Paolo Bonzini, 2024/12/19