From patchwork Fri Oct 30 05:56:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 7523981 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C5CC4BEEA4 for ; Fri, 30 Oct 2015 06:02:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5E68320816 for ; Fri, 30 Oct 2015 06:02:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA2BC2082A for ; Fri, 30 Oct 2015 06:02:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758596AbbJ3GCe (ORCPT ); Fri, 30 Oct 2015 02:02:34 -0400 Received: from mga11.intel.com ([192.55.52.93]:20541 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758538AbbJ3GCc (ORCPT ); Fri, 30 Oct 2015 02:02:32 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP; 29 Oct 2015 23:02:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,217,1444719600"; d="scan'208";a="590814118" Received: from xiaoreal1.sh.intel.com (HELO xiaoreal1.sh.intel.com.sh.intel.com) ([10.239.48.79]) by FMSMGA003.fm.intel.com with ESMTP; 29 Oct 2015 23:02:28 -0700 From: Xiao Guangrong To: pbonzini@redhat.com, imammedo@redhat.com Cc: gleb@kernel.org, mtosatti@redhat.com, stefanha@redhat.com, mst@redhat.com, rth@twiddle.net, ehabkost@redhat.com, dan.j.williams@intel.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, Xiao Guangrong Subject: [PATCH v6 17/33] dimm: abstract dimm device from pc-dimm Date: Fri, 30 Oct 2015 13:56:11 +0800 Message-Id: <1446184587-142784-18-git-send-email-guangrong.xiao@linux.intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1446184587-142784-1-git-send-email-guangrong.xiao@linux.intel.com> References: <1446184587-142784-1-git-send-email-guangrong.xiao@linux.intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A base device, dimm, is abstracted from pc-dimm, so that we can build nvdimm device based on dimm in the later patch Signed-off-by: Xiao Guangrong Reviewed-by: Vladimir Sementsov-Ogievskiy --- default-configs/i386-softmmu.mak | 1 + default-configs/ppc64-softmmu.mak | 1 + default-configs/x86_64-softmmu.mak | 1 + hw/mem/Makefile.objs | 3 ++- hw/mem/dimm.c | 11 ++------- hw/mem/pc-dimm.c | 46 ++++++++++++++++++++++++++++++++++++++ include/hw/mem/dimm.h | 4 ++-- include/hw/mem/pc-dimm.h | 7 ++++++ 8 files changed, 62 insertions(+), 12 deletions(-) create mode 100644 hw/mem/pc-dimm.c create mode 100644 include/hw/mem/pc-dimm.h diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 43c96d1..3ece8bb 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -18,6 +18,7 @@ CONFIG_FDC=y CONFIG_ACPI=y CONFIG_ACPI_X86=y CONFIG_ACPI_X86_ICH=y +CONFIG_DIMM=y CONFIG_ACPI_MEMORY_HOTPLUG=y CONFIG_ACPI_CPU_HOTPLUG=y CONFIG_APM=y diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index bb71b23..482b8a1 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -54,3 +54,4 @@ CONFIG_XICS_KVM=$(and $(CONFIG_PSERIES),$(CONFIG_KVM)) CONFIG_MC146818RTC=y CONFIG_ISA_TESTDEV=y CONFIG_MEM_HOTPLUG=y +CONFIG_DIMM=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index dfb8095..92ea7c1 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -18,6 +18,7 @@ CONFIG_FDC=y CONFIG_ACPI=y CONFIG_ACPI_X86=y CONFIG_ACPI_X86_ICH=y +CONFIG_DIMM=y CONFIG_ACPI_MEMORY_HOTPLUG=y CONFIG_ACPI_CPU_HOTPLUG=y CONFIG_APM=y diff --git a/hw/mem/Makefile.objs b/hw/mem/Makefile.objs index 7563ef5..cebb4b1 100644 --- a/hw/mem/Makefile.objs +++ b/hw/mem/Makefile.objs @@ -1 +1,2 @@ -common-obj-$(CONFIG_MEM_HOTPLUG) += dimm.o +common-obj-$(CONFIG_DIMM) += dimm.o +common-obj-$(CONFIG_MEM_HOTPLUG) += pc-dimm.o diff --git a/hw/mem/dimm.c b/hw/mem/dimm.c index 9f55cee..4a63409 100644 --- a/hw/mem/dimm.c +++ b/hw/mem/dimm.c @@ -1,5 +1,5 @@ /* - * Dimm device for Memory Hotplug + * Dimm device abstraction * * Copyright ProfitBricks GmbH 2012 * Copyright (C) 2014 Red Hat Inc @@ -429,21 +429,13 @@ static void dimm_realize(DeviceState *dev, Error **errp) } } -static MemoryRegion *dimm_get_memory_region(DIMMDevice *dimm) -{ - return host_memory_backend_get_memory(dimm->hostmem, &error_abort); -} - static void dimm_class_init(ObjectClass *oc, void *data) { DeviceClass *dc = DEVICE_CLASS(oc); - DIMMDeviceClass *ddc = DIMM_CLASS(oc); dc->realize = dimm_realize; dc->props = dimm_properties; dc->desc = "DIMM memory module"; - - ddc->get_memory_region = dimm_get_memory_region; } static TypeInfo dimm_info = { @@ -453,6 +445,7 @@ static TypeInfo dimm_info = { .instance_init = dimm_init, .class_init = dimm_class_init, .class_size = sizeof(DIMMDeviceClass), + .abstract = true, }; static void dimm_register_types(void) diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c new file mode 100644 index 0000000..38323e9 --- /dev/null +++ b/hw/mem/pc-dimm.c @@ -0,0 +1,46 @@ +/* + * Dimm device for Memory Hotplug + * + * Copyright ProfitBricks GmbH 2012 + * Copyright (C) 2014 Red Hat Inc + * + * 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 + */ + +#include "hw/mem/pc-dimm.h" + +static MemoryRegion *pc_dimm_get_memory_region(DIMMDevice *dimm) +{ + return host_memory_backend_get_memory(dimm->hostmem, &error_abort); +} + +static void pc_dimm_class_init(ObjectClass *oc, void *data) +{ + DIMMDeviceClass *ddc = DIMM_CLASS(oc); + + ddc->get_memory_region = pc_dimm_get_memory_region; +} + +static TypeInfo pc_dimm_info = { + .name = TYPE_PC_DIMM, + .parent = TYPE_DIMM, + .class_init = pc_dimm_class_init, +}; + +static void pc_dimm_register_types(void) +{ + type_register_static(&pc_dimm_info); +} + +type_init(pc_dimm_register_types) diff --git a/include/hw/mem/dimm.h b/include/hw/mem/dimm.h index ece8786..50f768a 100644 --- a/include/hw/mem/dimm.h +++ b/include/hw/mem/dimm.h @@ -1,5 +1,5 @@ /* - * PC DIMM device + * Dimm device abstraction * * Copyright ProfitBricks GmbH 2012 * Copyright (C) 2013-2014 Red Hat Inc @@ -20,7 +20,7 @@ #include "sysemu/hostmem.h" #include "hw/qdev.h" -#define TYPE_DIMM "pc-dimm" +#define TYPE_DIMM "dimm" #define DIMM(obj) \ OBJECT_CHECK(DIMMDevice, (obj), TYPE_DIMM) #define DIMM_CLASS(oc) \ diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h new file mode 100644 index 0000000..50818c2 --- /dev/null +++ b/include/hw/mem/pc-dimm.h @@ -0,0 +1,7 @@ +#ifndef QEMU_PC_DIMM_H +#define QEMU_PC_DIMM_H + +#include "hw/mem/dimm.h" + +#define TYPE_PC_DIMM "pc-dimm" +#endif