machine: Move nvdimms state into struct MachineState
As NVDIMM support is looming for ARM and SPAPR, let's move the acpi_nvdimm_state to the generic machine struct instead of duplicating the same code in several machines. It is also renamed into nvdimms_state and becomes a pointer. nvdimm and nvdimm-persistence become generic machine options. They become guarded by a nvdimm_supported machine class member. We also add a description for those options. Signed-off-by: Eric Auger <eric.auger@redhat.com> Suggested-by: Igor Mammedov <imammedo@redhat.com> Message-Id: <20190308182053.5487-3-eric.auger@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
c1404bde9c
commit
f6a0d06ba7
|
@ -22,6 +22,7 @@
|
|||
#include "qemu/error-report.h"
|
||||
#include "sysemu/qtest.h"
|
||||
#include "hw/pci/pci.h"
|
||||
#include "hw/mem/nvdimm.h"
|
||||
|
||||
GlobalProperty hw_compat_3_1[] = {
|
||||
{ "pcie-root-port", "x-speed", "2_5" },
|
||||
|
@ -481,6 +482,47 @@ static void machine_set_memory_encryption(Object *obj, const char *value,
|
|||
ms->memory_encryption = g_strdup(value);
|
||||
}
|
||||
|
||||
static bool machine_get_nvdimm(Object *obj, Error **errp)
|
||||
{
|
||||
MachineState *ms = MACHINE(obj);
|
||||
|
||||
return ms->nvdimms_state->is_enabled;
|
||||
}
|
||||
|
||||
static void machine_set_nvdimm(Object *obj, bool value, Error **errp)
|
||||
{
|
||||
MachineState *ms = MACHINE(obj);
|
||||
|
||||
ms->nvdimms_state->is_enabled = value;
|
||||
}
|
||||
|
||||
static char *machine_get_nvdimm_persistence(Object *obj, Error **errp)
|
||||
{
|
||||
MachineState *ms = MACHINE(obj);
|
||||
|
||||
return g_strdup(ms->nvdimms_state->persistence_string);
|
||||
}
|
||||
|
||||
static void machine_set_nvdimm_persistence(Object *obj, const char *value,
|
||||
Error **errp)
|
||||
{
|
||||
MachineState *ms = MACHINE(obj);
|
||||
NVDIMMState *nvdimms_state = ms->nvdimms_state;
|
||||
|
||||
if (strcmp(value, "cpu") == 0) {
|
||||
nvdimms_state->persistence = 3;
|
||||
} else if (strcmp(value, "mem-ctrl") == 0) {
|
||||
nvdimms_state->persistence = 2;
|
||||
} else {
|
||||
error_setg(errp, "-machine nvdimm-persistence=%s: unsupported option",
|
||||
value);
|
||||
return;
|
||||
}
|
||||
|
||||
g_free(nvdimms_state->persistence_string);
|
||||
nvdimms_state->persistence_string = g_strdup(value);
|
||||
}
|
||||
|
||||
void machine_class_allow_dynamic_sysbus_dev(MachineClass *mc, const char *type)
|
||||
{
|
||||
strList *item = g_new0(strList, 1);
|
||||
|
@ -791,6 +833,28 @@ static void machine_initfn(Object *obj)
|
|||
ms->mem_merge = true;
|
||||
ms->enable_graphics = true;
|
||||
|
||||
if (mc->nvdimm_supported) {
|
||||
Object *obj = OBJECT(ms);
|
||||
|
||||
ms->nvdimms_state = g_new0(NVDIMMState, 1);
|
||||
object_property_add_bool(obj, "nvdimm",
|
||||
machine_get_nvdimm, machine_set_nvdimm,
|
||||
&error_abort);
|
||||
object_property_set_description(obj, "nvdimm",
|
||||
"Set on/off to enable/disable "
|
||||
"NVDIMM instantiation", NULL);
|
||||
|
||||
object_property_add_str(obj, "nvdimm-persistence",
|
||||
machine_get_nvdimm_persistence,
|
||||
machine_set_nvdimm_persistence,
|
||||
&error_abort);
|
||||
object_property_set_description(obj, "nvdimm-persistence",
|
||||
"Set NVDIMM persistence"
|
||||
"Valid values are cpu, mem-ctrl",
|
||||
NULL);
|
||||
}
|
||||
|
||||
|
||||
/* Register notifier when init is done for sysbus sanity checks */
|
||||
ms->sysbus_notifier.notify = machine_init_notify;
|
||||
qemu_add_machine_init_done_notifier(&ms->sysbus_notifier);
|
||||
|
@ -809,6 +873,7 @@ static void machine_finalize(Object *obj)
|
|||
g_free(ms->dt_compatible);
|
||||
g_free(ms->firmware);
|
||||
g_free(ms->device_memory);
|
||||
g_free(ms->nvdimms_state);
|
||||
}
|
||||
|
||||
bool machine_usb(MachineState *machine)
|
||||
|
|
|
@ -1867,7 +1867,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
|
|||
aml_append(scope, method);
|
||||
}
|
||||
|
||||
if (pcms->acpi_nvdimm_state.is_enabled) {
|
||||
if (machine->nvdimms_state->is_enabled) {
|
||||
method = aml_method("_E04", 0, AML_NOTSERIALIZED);
|
||||
aml_append(method, aml_notify(aml_name("\\_SB.NVDR"),
|
||||
aml_int(0x80)));
|
||||
|
@ -2704,9 +2704,9 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
|
|||
build_dmar_q35(tables_blob, tables->linker);
|
||||
}
|
||||
}
|
||||
if (pcms->acpi_nvdimm_state.is_enabled) {
|
||||
if (machine->nvdimms_state->is_enabled) {
|
||||
nvdimm_build_acpi(table_offsets, tables_blob, tables->linker,
|
||||
&pcms->acpi_nvdimm_state, machine->ram_slots);
|
||||
machine->nvdimms_state, machine->ram_slots);
|
||||
}
|
||||
|
||||
/* Add tables supplied by user (if any) */
|
||||
|
|
57
hw/i386/pc.c
57
hw/i386/pc.c
|
@ -2069,6 +2069,7 @@ static void pc_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|||
{
|
||||
const PCMachineState *pcms = PC_MACHINE(hotplug_dev);
|
||||
const PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
|
||||
const MachineState *ms = MACHINE(hotplug_dev);
|
||||
const bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
|
||||
const uint64_t legacy_align = TARGET_PAGE_SIZE;
|
||||
|
||||
|
@ -2083,7 +2084,7 @@ static void pc_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|||
return;
|
||||
}
|
||||
|
||||
if (is_nvdimm && !pcms->acpi_nvdimm_state.is_enabled) {
|
||||
if (is_nvdimm && !ms->nvdimms_state->is_enabled) {
|
||||
error_setg(errp, "nvdimm is not enabled: missing 'nvdimm' in '-M'");
|
||||
return;
|
||||
}
|
||||
|
@ -2097,6 +2098,7 @@ static void pc_memory_plug(HotplugHandler *hotplug_dev,
|
|||
{
|
||||
Error *local_err = NULL;
|
||||
PCMachineState *pcms = PC_MACHINE(hotplug_dev);
|
||||
MachineState *ms = MACHINE(hotplug_dev);
|
||||
bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
|
||||
|
||||
pc_dimm_plug(PC_DIMM(dev), MACHINE(pcms), &local_err);
|
||||
|
@ -2105,7 +2107,7 @@ static void pc_memory_plug(HotplugHandler *hotplug_dev,
|
|||
}
|
||||
|
||||
if (is_nvdimm) {
|
||||
nvdimm_plug(&pcms->acpi_nvdimm_state);
|
||||
nvdimm_plug(ms->nvdimms_state);
|
||||
}
|
||||
|
||||
hotplug_handler_plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &error_abort);
|
||||
|
@ -2546,47 +2548,6 @@ static void pc_machine_set_smm(Object *obj, Visitor *v, const char *name,
|
|||
visit_type_OnOffAuto(v, name, &pcms->smm, errp);
|
||||
}
|
||||
|
||||
static bool pc_machine_get_nvdimm(Object *obj, Error **errp)
|
||||
{
|
||||
PCMachineState *pcms = PC_MACHINE(obj);
|
||||
|
||||
return pcms->acpi_nvdimm_state.is_enabled;
|
||||
}
|
||||
|
||||
static void pc_machine_set_nvdimm(Object *obj, bool value, Error **errp)
|
||||
{
|
||||
PCMachineState *pcms = PC_MACHINE(obj);
|
||||
|
||||
pcms->acpi_nvdimm_state.is_enabled = value;
|
||||
}
|
||||
|
||||
static char *pc_machine_get_nvdimm_persistence(Object *obj, Error **errp)
|
||||
{
|
||||
PCMachineState *pcms = PC_MACHINE(obj);
|
||||
|
||||
return g_strdup(pcms->acpi_nvdimm_state.persistence_string);
|
||||
}
|
||||
|
||||
static void pc_machine_set_nvdimm_persistence(Object *obj, const char *value,
|
||||
Error **errp)
|
||||
{
|
||||
PCMachineState *pcms = PC_MACHINE(obj);
|
||||
NVDIMMState *nvdimm_state = &pcms->acpi_nvdimm_state;
|
||||
|
||||
if (strcmp(value, "cpu") == 0)
|
||||
nvdimm_state->persistence = 3;
|
||||
else if (strcmp(value, "mem-ctrl") == 0)
|
||||
nvdimm_state->persistence = 2;
|
||||
else {
|
||||
error_setg(errp, "-machine nvdimm-persistence=%s: unsupported option",
|
||||
value);
|
||||
return;
|
||||
}
|
||||
|
||||
g_free(nvdimm_state->persistence_string);
|
||||
nvdimm_state->persistence_string = g_strdup(value);
|
||||
}
|
||||
|
||||
static bool pc_machine_get_smbus(Object *obj, Error **errp)
|
||||
{
|
||||
PCMachineState *pcms = PC_MACHINE(obj);
|
||||
|
@ -2636,8 +2597,6 @@ static void pc_machine_initfn(Object *obj)
|
|||
pcms->max_ram_below_4g = 0; /* use default */
|
||||
pcms->smm = ON_OFF_AUTO_AUTO;
|
||||
pcms->vmport = ON_OFF_AUTO_AUTO;
|
||||
/* nvdimm is disabled on default. */
|
||||
pcms->acpi_nvdimm_state.is_enabled = false;
|
||||
/* acpi build is enabled by default if machine supports it */
|
||||
pcms->acpi_build_enabled = PC_MACHINE_GET_CLASS(pcms)->has_acpi_build;
|
||||
pcms->smbus_enabled = true;
|
||||
|
@ -2774,6 +2733,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
|
|||
hc->unplug = pc_machine_device_unplug_cb;
|
||||
nc->nmi_monitor_handler = x86_nmi;
|
||||
mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;
|
||||
mc->nvdimm_supported = true;
|
||||
|
||||
object_class_property_add(oc, PC_MACHINE_DEVMEM_REGION_SIZE, "int",
|
||||
pc_machine_get_device_memory_region_size, NULL,
|
||||
|
@ -2798,13 +2758,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
|
|||
object_class_property_set_description(oc, PC_MACHINE_VMPORT,
|
||||
"Enable vmport (pc & q35)", &error_abort);
|
||||
|
||||
object_class_property_add_bool(oc, PC_MACHINE_NVDIMM,
|
||||
pc_machine_get_nvdimm, pc_machine_set_nvdimm, &error_abort);
|
||||
|
||||
object_class_property_add_str(oc, PC_MACHINE_NVDIMM_PERSIST,
|
||||
pc_machine_get_nvdimm_persistence,
|
||||
pc_machine_set_nvdimm_persistence, &error_abort);
|
||||
|
||||
object_class_property_add_bool(oc, PC_MACHINE_SMBUS,
|
||||
pc_machine_get_smbus, pc_machine_set_smbus, &error_abort);
|
||||
|
||||
|
|
|
@ -297,8 +297,8 @@ static void pc_init1(MachineState *machine,
|
|||
PC_MACHINE_ACPI_DEVICE_PROP, &error_abort);
|
||||
}
|
||||
|
||||
if (pcms->acpi_nvdimm_state.is_enabled) {
|
||||
nvdimm_init_acpi_state(&pcms->acpi_nvdimm_state, system_io,
|
||||
if (machine->nvdimms_state->is_enabled) {
|
||||
nvdimm_init_acpi_state(machine->nvdimms_state, system_io,
|
||||
pcms->fw_cfg, OBJECT(pcms));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -329,8 +329,8 @@ static void pc_q35_init(MachineState *machine)
|
|||
pc_vga_init(isa_bus, host_bus);
|
||||
pc_nic_init(pcmc, isa_bus, host_bus);
|
||||
|
||||
if (pcms->acpi_nvdimm_state.is_enabled) {
|
||||
nvdimm_init_acpi_state(&pcms->acpi_nvdimm_state, system_io,
|
||||
if (machine->nvdimms_state->is_enabled) {
|
||||
nvdimm_init_acpi_state(machine->nvdimms_state, system_io,
|
||||
pcms->fw_cfg, OBJECT(pcms));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -210,6 +210,7 @@ struct MachineClass {
|
|||
int nb_nodes, ram_addr_t size);
|
||||
bool ignore_boot_device_suffixes;
|
||||
bool smbus_no_migration_support;
|
||||
bool nvdimm_supported;
|
||||
|
||||
HotplugHandler *(*get_hotplug_handler)(MachineState *machine,
|
||||
DeviceState *dev);
|
||||
|
@ -272,6 +273,7 @@ struct MachineState {
|
|||
const char *cpu_type;
|
||||
AccelState *accelerator;
|
||||
CPUArchIdList *possible_cpus;
|
||||
struct NVDIMMState *nvdimms_state;
|
||||
};
|
||||
|
||||
#define DEFINE_MACHINE(namestr, machine_initfn) \
|
||||
|
|
|
@ -45,8 +45,6 @@ struct PCMachineState {
|
|||
OnOffAuto vmport;
|
||||
OnOffAuto smm;
|
||||
|
||||
NVDIMMState acpi_nvdimm_state;
|
||||
|
||||
bool acpi_build_enabled;
|
||||
bool smbus_enabled;
|
||||
bool sata_enabled;
|
||||
|
@ -74,8 +72,6 @@ struct PCMachineState {
|
|||
#define PC_MACHINE_MAX_RAM_BELOW_4G "max-ram-below-4g"
|
||||
#define PC_MACHINE_VMPORT "vmport"
|
||||
#define PC_MACHINE_SMM "smm"
|
||||
#define PC_MACHINE_NVDIMM "nvdimm"
|
||||
#define PC_MACHINE_NVDIMM_PERSIST "nvdimm-persistence"
|
||||
#define PC_MACHINE_SMBUS "smbus"
|
||||
#define PC_MACHINE_SATA "sata"
|
||||
#define PC_MACHINE_PIT "pit"
|
||||
|
|
Loading…
Reference in New Issue