Commit 284197e4 authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Michael S. Tsirkin
Browse files

nvdimm acpi: rename nvdimm_acpi_hotplug 



Rename it to nvdimm_plug()

Suggested-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarXiao Guangrong <guangrong.xiao@linux.intel.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
parent 880f3612

hw/acpi/nvdimm.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

hw/i386/pc.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/hw/mem/nvdimm.h

+1 −1
Original line number Diff line number Diff line
@@ -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