From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:56491) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3JlV-0006XH-Ss for qemu-devel@nongnu.org; Mon, 11 Mar 2019 08:10:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3JlU-0000MJ-O3 for qemu-devel@nongnu.org; Mon, 11 Mar 2019 08:10:45 -0400 Date: Mon, 11 Mar 2019 13:10:23 +0100 From: Igor Mammedov Message-ID: <20190311131023.18849710@redhat.com> In-Reply-To: <20190308182053.5487-2-eric.auger@redhat.com> References: <20190308182053.5487-1-eric.auger@redhat.com> <20190308182053.5487-2-eric.auger@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v4 1/2] nvdimm: Rename AcpiNVDIMMState into NVDIMMState 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:52 +0100 Eric Auger wrote: > As we intend to migrate the acpi_nvdimm_state into > the base machine with a new dimms_state name, let's > also rename the datatype. >=20 > Signed-off-by: Eric Auger > Suggested-by: Igor Mammedov > Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Igor Mammedov > --- > hw/acpi/nvdimm.c | 18 +++++++++--------- > hw/i386/pc.c | 2 +- > include/hw/i386/pc.h | 2 +- > include/hw/mem/nvdimm.h | 10 +++++----- > 4 files changed, 16 insertions(+), 16 deletions(-) >=20 > diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c > index e53b2cb681..f73cfb9d90 100644 > --- a/hw/acpi/nvdimm.c > +++ b/hw/acpi/nvdimm.c > @@ -382,7 +382,7 @@ nvdimm_build_structure_caps(GArray *structures, uint3= 2_t capabilities) > nfit_caps->capabilities =3D cpu_to_le32(capabilities); > } > =20 > -static GArray *nvdimm_build_device_structure(AcpiNVDIMMState *state) > +static GArray *nvdimm_build_device_structure(NVDIMMState *state) > { > GSList *device_list =3D nvdimm_get_device_list(); > GArray *structures =3D g_array_new(false, true /* clear */, 1); > @@ -416,7 +416,7 @@ static void nvdimm_init_fit_buffer(NvdimmFitBuffer *f= it_buf) > fit_buf->fit =3D g_array_new(false, true /* clear */, 1); > } > =20 > -static void nvdimm_build_fit_buffer(AcpiNVDIMMState *state) > +static void nvdimm_build_fit_buffer(NVDIMMState *state) > { > NvdimmFitBuffer *fit_buf =3D &state->fit_buf; > =20 > @@ -425,12 +425,12 @@ static void nvdimm_build_fit_buffer(AcpiNVDIMMState= *state) > fit_buf->dirty =3D true; > } > =20 > -void nvdimm_plug(AcpiNVDIMMState *state) > +void nvdimm_plug(NVDIMMState *state) > { > nvdimm_build_fit_buffer(state); > } > =20 > -static void nvdimm_build_nfit(AcpiNVDIMMState *state, GArray *table_offs= ets, > +static void nvdimm_build_nfit(NVDIMMState *state, GArray *table_offsets, > GArray *table_data, BIOSLinker *linker) > { > NvdimmFitBuffer *fit_buf =3D &state->fit_buf; > @@ -570,7 +570,7 @@ nvdimm_dsm_no_payload(uint32_t func_ret_status, hwadd= r dsm_mem_addr) > #define NVDIMM_QEMU_RSVD_HANDLE_ROOT 0x10000 > =20 > /* Read FIT data, defined in docs/specs/acpi_nvdimm.txt. */ > -static void nvdimm_dsm_func_read_fit(AcpiNVDIMMState *state, NvdimmDsmIn= *in, > +static void nvdimm_dsm_func_read_fit(NVDIMMState *state, NvdimmDsmIn *in, > hwaddr dsm_mem_addr) > { > NvdimmFitBuffer *fit_buf =3D &state->fit_buf; > @@ -619,7 +619,7 @@ exit: > } > =20 > static void > -nvdimm_dsm_handle_reserved_root_method(AcpiNVDIMMState *state, > +nvdimm_dsm_handle_reserved_root_method(NVDIMMState *state, > NvdimmDsmIn *in, hwaddr dsm_mem_a= ddr) > { > switch (in->function) { > @@ -863,7 +863,7 @@ nvdimm_dsm_read(void *opaque, hwaddr addr, unsigned s= ize) > static void > nvdimm_dsm_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) > { > - AcpiNVDIMMState *state =3D opaque; > + NVDIMMState *state =3D opaque; > NvdimmDsmIn *in; > hwaddr dsm_mem_addr =3D val; > =20 > @@ -925,7 +925,7 @@ void nvdimm_acpi_plug_cb(HotplugHandler *hotplug_dev,= DeviceState *dev) > } > } > =20 > -void nvdimm_init_acpi_state(AcpiNVDIMMState *state, MemoryRegion *io, > +void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io, > FWCfgState *fw_cfg, Object *owner) > { > memory_region_init_io(&state->io_mr, owner, &nvdimm_dsm_ops, state, > @@ -1319,7 +1319,7 @@ static void nvdimm_build_ssdt(GArray *table_offsets= , GArray *table_data, > } > =20 > void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data, > - BIOSLinker *linker, AcpiNVDIMMState *state, > + BIOSLinker *linker, NVDIMMState *state, > uint32_t ram_slots) > { > GSList *device_list; > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 42128183e9..0338dbe9da 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -2571,7 +2571,7 @@ static void pc_machine_set_nvdimm_persistence(Objec= t *obj, const char *value, > Error **errp) > { > PCMachineState *pcms =3D PC_MACHINE(obj); > - AcpiNVDIMMState *nvdimm_state =3D &pcms->acpi_nvdimm_state; > + NVDIMMState *nvdimm_state =3D &pcms->acpi_nvdimm_state; > =20 > if (strcmp(value, "cpu") =3D=3D 0) > nvdimm_state->persistence =3D 3; > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 54222a202d..94fb620d65 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -45,7 +45,7 @@ struct PCMachineState { > OnOffAuto vmport; > OnOffAuto smm; > =20 > - AcpiNVDIMMState acpi_nvdimm_state; > + NVDIMMState acpi_nvdimm_state; > =20 > bool acpi_build_enabled; > bool smbus_enabled; > diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h > index c5c9b3c7f8..523a9b3d4a 100644 > --- a/include/hw/mem/nvdimm.h > +++ b/include/hw/mem/nvdimm.h > @@ -123,7 +123,7 @@ struct NvdimmFitBuffer { > }; > typedef struct NvdimmFitBuffer NvdimmFitBuffer; > =20 > -struct AcpiNVDIMMState { > +struct NVDIMMState { > /* detect if NVDIMM support is enabled. */ > bool is_enabled; > =20 > @@ -141,13 +141,13 @@ struct AcpiNVDIMMState { > int32_t persistence; > char *persistence_string; > }; > -typedef struct AcpiNVDIMMState AcpiNVDIMMState; > +typedef struct NVDIMMState NVDIMMState; > =20 > -void nvdimm_init_acpi_state(AcpiNVDIMMState *state, MemoryRegion *io, > +void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io, > FWCfgState *fw_cfg, Object *owner); > void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data, > - BIOSLinker *linker, AcpiNVDIMMState *state, > + BIOSLinker *linker, NVDIMMState *state, > uint32_t ram_slots); > -void nvdimm_plug(AcpiNVDIMMState *state); > +void nvdimm_plug(NVDIMMState *state); > void nvdimm_acpi_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev); > #endif