diff options
| author | Xiao Guangrong | 2015-12-02 08:20:56 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin | 2015-12-22 17:39:20 +0100 |
| commit | 5c42eef24314fb51600b0e90fb69c60653ea05bb (patch) | |
| tree | e2ca35859fec1f99d81a24c49312c2ca1ef8ce9d /hw | |
| parent | docs/pci_expander_bridge: fix typo (diff) | |
| download | qemu-5c42eef24314fb51600b0e90fb69c60653ea05bb.tar.gz qemu-5c42eef24314fb51600b0e90fb69c60653ea05bb.tar.xz qemu-5c42eef24314fb51600b0e90fb69c60653ea05bb.zip | |
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: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/acpi/memory_hotplug.c | 5 | ||||
| -rw-r--r-- | hw/mem/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/mem/nvdimm.c | 46 |
3 files changed, 52 insertions, 0 deletions
diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index e4b9a01f80..298e8682af 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -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) { diff --git a/hw/mem/Makefile.objs b/hw/mem/Makefile.objs index b000fb42bf..f12f8b97a2 100644 --- a/hw/mem/Makefile.objs +++ b/hw/mem/Makefile.objs @@ -1 +1,2 @@ common-obj-$(CONFIG_MEM_HOTPLUG) += pc-dimm.o +common-obj-$(CONFIG_NVDIMM) += nvdimm.o diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c new file mode 100644 index 0000000000..4fd397f015 --- /dev/null +++ b/hw/mem/nvdimm.c @@ -0,0 +1,46 @@ +/* + * 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) |