On Mon, 7 Nov 2016 19:13:44 +0800 Xiao Guangrong <guangrong.xiao@xxxxxxxxxxxxxxx> wrote: > Rename it to nvdimm_plug() > > Suggested-by: Igor Mammedov <imammedo@xxxxxxxxxx> > Signed-off-by: Xiao Guangrong <guangrong.xiao@xxxxxxxxxxxxxxx> Reviewed-by: Igor Mammedov <imammedo@xxxxxxxxxx> > --- > hw/acpi/nvdimm.c | 2 +- > hw/i386/pc.c | 2 +- > include/hw/mem/nvdimm.h | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c > index 148999e..7733f14 100644 > --- a/hw/acpi/nvdimm.c > +++ b/hw/acpi/nvdimm.c > @@ -380,7 +380,7 @@ static void nvdimm_build_fit_buffer(NvdimmFitBuffer *fit_buf) > fit_buf->dirty = true; > } > > -void nvdimm_acpi_hotplug(AcpiNVDIMMState *state) > +void nvdimm_plug(AcpiNVDIMMState *state) > { > nvdimm_build_fit_buffer(&state->fit_buf); > } > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 97e23c4..edc96a6 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1716,7 +1716,7 @@ static void pc_dimm_plug(HotplugHandler *hotplug_dev, > } > > if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) { > - nvdimm_acpi_hotplug(&pcms->acpi_nvdimm_state); > + nvdimm_plug(&pcms->acpi_nvdimm_state); > } > > hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev); > diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h > index 60585c3..03e1ff9 100644 > --- a/include/hw/mem/nvdimm.h > +++ b/include/hw/mem/nvdimm.h > @@ -130,6 +130,6 @@ void nvdimm_init_acpi_state(AcpiNVDIMMState *state, MemoryRegion *io, > void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data, > BIOSLinker *linker, AcpiNVDIMMState *state, > uint32_t ram_slots); > -void nvdimm_acpi_hotplug(AcpiNVDIMMState *state); > +void nvdimm_plug(AcpiNVDIMMState *state); > void nvdimm_acpi_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev); > #endif -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html