From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a5d:610e:0:0:0:0:0 with SMTP id v14csp602882wrt; Mon, 11 Mar 2019 05:43:33 -0700 (PDT) X-Google-Smtp-Source: APXvYqwhLJAtjT/J4S6CAPSmg8OyUdAfP8fQ5NhR8vVKOjUneLJPBjVx5e+VIyneNW4xJrG7FPDh X-Received: by 2002:a25:d656:: with SMTP id n83mr25741778ybg.423.1552308213073; Mon, 11 Mar 2019 05:43:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552308213; cv=none; d=google.com; s=arc-20160816; b=ffNiNVZT/Qe5HJ6OzP8d9oVTAxvdCDiL8XybcRu7zq6CgXzd/pv9cksMrbg2l/AtEe 2IvkHKt8yVbARWAuZN7YzPTTELNUX0Dr7my/79qxuSLMRnecaHvbGg2UOUEkJ6Px8r4i TQrDFlrtKLhnhx57rEr5ucGTpmg1gCl/SvG/vNLJTis4u80BZ0M9GTaV6w/EHH8DZFhH bra8u81LXlQLxwLr7Ym+/AKaJCBSphFZY/mGPfPS15Hd0SE663QKB7DiIG6TbQ25n4UD Fg7UYFoDLsSu/IQ1eGadWBsKn7HFu0FDEx2P8rsaTcdIXIboHJ5/4QO6P/5K/MZP4+jx e/8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:to:from:date; bh=RnBMJsRTsTfJr7C4GfJy8YfrdO8iz5k5aNRgRsUkk2Y=; b=hlWC8iDrVlNfO9ZN4BRhuOicmvpkf4uqTX0v/t8/O0jS/ivZ754JNaTxAefHU/cO2I 7D+fbSFISf8uzk2sdpNzbwNJY/m4nyCLBVdm+9WhnoXajE0ixyylbP4z/aqpMVoxi/2z sHy7VDv1QsbuA23UgXuztYT8W4JD3I9IzdX1PrdFRf49ekhg1Q+ng0vckpU7NdDBHKbd Nubk0TZD875mD+ZmpkRJ0eZn2Sy9jpwb35ndgRqzlekE37XcMiVPpDE8jJja1Z0xt+n2 bsxxK/opPIZbErvldkYfLkVF06WPY44mZhDmGX4LdiY4DYTYEsKY5EFQ9jg6pJ4yIun9 l2CQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x63si2015228ywb.113.2019.03.11.05.43.32 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 11 Mar 2019 05:43:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([127.0.0.1]:32967 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3KHE-0008M3-G6 for alex.bennee@linaro.org; Mon, 11 Mar 2019 08:43:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3K9B-0001aj-SL for qemu-devel@nongnu.org; Mon, 11 Mar 2019 08:35:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3Jsj-00059H-6Q for qemu-devel@nongnu.org; Mon, 11 Mar 2019 08:18:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52256) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h3Jsh-00054b-3S; Mon, 11 Mar 2019 08:18:11 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EBA6330832D4; Mon, 11 Mar 2019 12:09:34 +0000 (UTC) Received: from localhost (unknown [10.43.2.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18EF35D705; Mon, 11 Mar 2019 12:09:25 +0000 (UTC) Date: Mon, 11 Mar 2019 13:09:24 +0100 From: Igor Mammedov To: Eric Auger Message-ID: <20190311130924.43df895b@redhat.com> In-Reply-To: <20190308182053.5487-3-eric.auger@redhat.com> References: <20190308182053.5487-1-eric.auger@redhat.com> <20190308182053.5487-3-eric.auger@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Mon, 11 Mar 2019 12:09:35 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH v4 2/2] machine: Move nvdimms state into struct MachineState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, ehabkost@redhat.com, sbhat@linux.ibm.com, david@redhat.com, richard.henderson@linaro.org, qemu-devel@nongnu.org, shameerali.kolothum.thodi@huawei.com, qemu-arm@nongnu.org, pbonzini@redhat.com, philmd@redhat.com, eric.auger.pro@gmail.com Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: EnIZdCZ60bdS On Fri, 8 Mar 2019 19:20:53 +0100 Eric Auger wrote: > 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 > Suggested-by: Igor Mammedov Reviewed-by: Igor Mammedov > > --- > v3 -> v4: > - s/object_class_property_*/object_property_* > v2 -> v3 > - nvdimms_state becomes a pointer > - add machine class nvdimm_supported > > v1 -> v2: > - s/acpi_nvdimm_state/nvdimms_state > - remove ms->nvdimms_state.is_enabled initialization to false. > --- > hw/core/machine.c | 65 ++++++++++++++++++++++++++++++++++++++++++++ > hw/i386/acpi-build.c | 6 ++-- > hw/i386/pc.c | 57 ++++---------------------------------- > hw/i386/pc_piix.c | 4 +-- > hw/i386/pc_q35.c | 4 +-- > include/hw/boards.h | 2 ++ > include/hw/i386/pc.h | 4 --- > 7 files changed, 79 insertions(+), 63 deletions(-) > > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 766ca5899d..743fef2898 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -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) > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 9ecc96dcc7..416da318ae 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -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) */ > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 0338dbe9da..71385cfac9 100644 > --- a/hw/i386/pc.c > +++ b/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); > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 8770ecada9..8ad8e885c6 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -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)); > } > } > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index cfb9043e12..372c6b73be 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -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)); > } > } > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 9690c71a6d..e231860666 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -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) \ > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 94fb620d65..263a6343ff 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -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" From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:59658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3K9B-0001aj-SL for qemu-devel@nongnu.org; Mon, 11 Mar 2019 08:35:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3Jsj-00059H-6Q for qemu-devel@nongnu.org; Mon, 11 Mar 2019 08:18:14 -0400 Date: Mon, 11 Mar 2019 13:09:24 +0100 From: Igor Mammedov Message-ID: <20190311130924.43df895b@redhat.com> In-Reply-To: <20190308182053.5487-3-eric.auger@redhat.com> References: <20190308182053.5487-1-eric.auger@redhat.com> <20190308182053.5487-3-eric.auger@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 2/2] machine: Move nvdimms state into struct MachineState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Auger Cc: eric.auger.pro@gmail.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, shameerali.kolothum.thodi@huawei.com, david@redhat.com, pbonzini@redhat.com, ehabkost@redhat.com, richard.henderson@linaro.org, sbhat@linux.ibm.com, philmd@redhat.com On Fri, 8 Mar 2019 19:20:53 +0100 Eric Auger wrote: > 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 > Suggested-by: Igor Mammedov Reviewed-by: Igor Mammedov > > --- > v3 -> v4: > - s/object_class_property_*/object_property_* > v2 -> v3 > - nvdimms_state becomes a pointer > - add machine class nvdimm_supported > > v1 -> v2: > - s/acpi_nvdimm_state/nvdimms_state > - remove ms->nvdimms_state.is_enabled initialization to false. > --- > hw/core/machine.c | 65 ++++++++++++++++++++++++++++++++++++++++++++ > hw/i386/acpi-build.c | 6 ++-- > hw/i386/pc.c | 57 ++++---------------------------------- > hw/i386/pc_piix.c | 4 +-- > hw/i386/pc_q35.c | 4 +-- > include/hw/boards.h | 2 ++ > include/hw/i386/pc.h | 4 --- > 7 files changed, 79 insertions(+), 63 deletions(-) > > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 766ca5899d..743fef2898 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -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) > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 9ecc96dcc7..416da318ae 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -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) */ > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 0338dbe9da..71385cfac9 100644 > --- a/hw/i386/pc.c > +++ b/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); > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 8770ecada9..8ad8e885c6 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -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)); > } > } > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index cfb9043e12..372c6b73be 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -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)); > } > } > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 9690c71a6d..e231860666 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -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) \ > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 94fb620d65..263a6343ff 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -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"