[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/15] machine: record whether nvdimm= was set
From: |
Paolo Bonzini |
Subject: |
[PATCH 09/15] machine: record whether nvdimm= was set |
Date: |
Wed, 2 Dec 2020 03:18:48 -0500 |
This is needed for SPAPR which has different defaults than everyone else.
Right now it looks at the -machine QemuOpts, but those will go away.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/core/machine.c | 1 +
include/hw/mem/nvdimm.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 2c0bc15143..94992fa1c0 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -455,6 +455,7 @@ static void machine_set_nvdimm(Object *obj, bool value,
Error **errp)
{
MachineState *ms = MACHINE(obj);
+ ms->nvdimms_state->has_is_enabled = true;
ms->nvdimms_state->is_enabled = value;
}
diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h
index c699842dd0..14c101c180 100644
--- a/include/hw/mem/nvdimm.h
+++ b/include/hw/mem/nvdimm.h
@@ -129,7 +129,7 @@ typedef struct NvdimmFitBuffer NvdimmFitBuffer;
struct NVDIMMState {
/* detect if NVDIMM support is enabled. */
- bool is_enabled;
+ bool has_is_enabled, is_enabled;
/* the data of the fw_cfg file NVDIMM_DSM_MEM_FILE. */
GArray *dsm_mem;
--
2.26.2
- [PATCH 02/15] vl: remove separate preconfig main_loop, (continued)
- [PATCH 02/15] vl: remove separate preconfig main_loop, Paolo Bonzini, 2020/12/02
- [PATCH 04/15] vl: extract softmmu/runstate.c, Paolo Bonzini, 2020/12/02
- [PATCH 12/15] plugin: propagate errors, Paolo Bonzini, 2020/12/02
- [PATCH 13/15] memory: allow creating MemoryRegions before accelerators, Paolo Bonzini, 2020/12/02
- [PATCH 09/15] machine: record whether nvdimm= was set,
Paolo Bonzini <=
- [PATCH 07/15] chardev: do not use machine_init_done, Paolo Bonzini, 2020/12/02
- [PATCH 15/15] monitor: allow quitting while in preconfig state, Paolo Bonzini, 2020/12/02
- [PATCH 08/15] machine: introduce MachineInitPhase, Paolo Bonzini, 2020/12/02
- [PATCH 11/15] qtest: add a QOM object for qtest, Paolo Bonzini, 2020/12/02