Commit 5c42eef2 authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Michael S. Tsirkin
Browse files

nvdimm: implement NVDIMM device abstract 



Introduce "nvdimm" device which is based on pc-dimm device type

Currently, nothing is specific for nvdimm but hotplug is disabled

Reviewed-by: default avatarStefan Hajnoczi <stefanha@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>
parent 40c52041

default-configs/i386-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ CONFIG_APIC=y 
CONFIG_IOAPIC=y

CONFIG_PVPANIC=y

CONFIG_MEM_HOTPLUG=y

CONFIG_NVDIMM=y

CONFIG_XIO3130=y

CONFIG_IOH3420=y

CONFIG_I82801B11=y

default-configs/x86_64-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ CONFIG_APIC=y 
CONFIG_IOAPIC=y

CONFIG_PVPANIC=y

CONFIG_MEM_HOTPLUG=y

CONFIG_NVDIMM=y

CONFIG_XIO3130=y

CONFIG_IOH3420=y

CONFIG_I82801B11=y

hw/acpi/memory_hotplug.c

+5 −0
Original line number Diff line number Diff line
@@ -231,6 +231,11 @@ void acpi_memory_plug_cb(ACPIREGS *ar, qemu_irq irq, MemHotplugState *mem_st, 
                         DeviceState *dev, Error **errp)

{

    MemStatus *mdev;

    DeviceClass *dc = DEVICE_GET_CLASS(dev);



    if (!dc->hotpluggable) {

        return;

    }



    mdev = acpi_memory_slot_status(mem_st, dev, errp);

    if (!mdev) {

hw/mem/Makefile.objs

+1 −0
Original line number Diff line number Diff line 
common-obj-$(CONFIG_MEM_HOTPLUG) += pc-dimm.o

common-obj-$(CONFIG_NVDIMM) += nvdimm.o

hw/mem/nvdimm.c

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/*

 * Non-Volatile Dual In-line Memory Module Virtualization Implementation

 *

 * Copyright(C) 2015 Intel Corporation.

 *

 * Author:

 *  Xiao Guangrong <guangrong.xiao@linux.intel.com>

 *

 * Currently, it only supports PMEM Virtualization.

 *

 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License as published by the Free Software Foundation; either

 * version 2 of the License, or (at your option) any later version.

 *

 * This library is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * Lesser General Public License for more details.

 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this library; if not, see <http://www.gnu.org/licenses/>

 */



#include "hw/mem/nvdimm.h"



static void nvdimm_class_init(ObjectClass *oc, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(oc);



    /* nvdimm hotplug has not been supported yet. */

    dc->hotpluggable = false;

}



static TypeInfo nvdimm_info = {

    .name          = TYPE_NVDIMM,

    .parent        = TYPE_PC_DIMM,

    .class_init    = nvdimm_class_init,

};



static void nvdimm_register_types(void)

{

    type_register_static(&nvdimm_info);

}



type_init(nvdimm_register_types)