From patchwork Mon Nov 2 09:13:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 538935 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BA476140311 for ; Mon, 2 Nov 2015 20:39:17 +1100 (AEDT) Received: from localhost ([::1]:41020 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtBa7-0006oB-QC for incoming@patchwork.ozlabs.org; Mon, 02 Nov 2015 04:39:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtBHm-0007yJ-70 for qemu-devel@nongnu.org; Mon, 02 Nov 2015 04:20:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtBHh-0003xc-SO for qemu-devel@nongnu.org; Mon, 02 Nov 2015 04:20:18 -0500 Received: from mga02.intel.com ([134.134.136.20]:48573) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtBHh-0003xN-It for qemu-devel@nongnu.org; Mon, 02 Nov 2015 04:20:13 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP; 02 Nov 2015 01:19:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,234,1444719600"; d="scan'208";a="840963182" Received: from xiaoreal1.sh.intel.com (HELO xiaoreal1.sh.intel.com.sh.intel.com) ([10.239.48.79]) by fmsmga002.fm.intel.com with ESMTP; 02 Nov 2015 01:19:49 -0800 From: Xiao Guangrong To: pbonzini@redhat.com, imammedo@redhat.com Date: Mon, 2 Nov 2015 17:13:20 +0800 Message-Id: <1446455617-129562-19-git-send-email-guangrong.xiao@linux.intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1446455617-129562-1-git-send-email-guangrong.xiao@linux.intel.com> References: <1446455617-129562-1-git-send-email-guangrong.xiao@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.20 Cc: vsementsov@virtuozzo.com, Xiao Guangrong , ehabkost@redhat.com, kvm@vger.kernel.org, mst@redhat.com, gleb@kernel.org, mtosatti@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, dan.j.williams@intel.com, rth@twiddle.net Subject: [Qemu-devel] [PATCH v7 18/35] pc-dimm: rename pc-dimm.c and pc-dimm.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Rename: pc-dimm.c => dimm.c pc-dimm.h => dimm.h It prepares the work which abstracts dimm device type for both pc-dimm and nvdimm Reviewed-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Xiao Guangrong --- hw/Makefile.objs | 2 +- hw/acpi/ich9.c | 2 +- hw/acpi/memory_hotplug.c | 4 ++-- hw/acpi/piix4.c | 2 +- hw/i386/pc.c | 2 +- hw/mem/Makefile.objs | 2 +- hw/mem/{pc-dimm.c => dimm.c} | 2 +- hw/ppc/spapr.c | 2 +- include/hw/i386/pc.h | 2 +- include/hw/mem/{pc-dimm.h => dimm.h} | 0 include/hw/ppc/spapr.h | 2 +- numa.c | 2 +- qmp.c | 2 +- stubs/qmp_dimm_device_list.c | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) rename hw/mem/{pc-dimm.c => dimm.c} (99%) rename include/hw/mem/{pc-dimm.h => dimm.h} (100%) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 7e7c241..12ecda9 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -30,8 +30,8 @@ devices-dirs-$(CONFIG_SOFTMMU) += vfio/ devices-dirs-$(CONFIG_VIRTIO) += virtio/ devices-dirs-$(CONFIG_SOFTMMU) += watchdog/ devices-dirs-$(CONFIG_SOFTMMU) += xen/ -devices-dirs-$(CONFIG_MEM_HOTPLUG) += mem/ devices-dirs-$(CONFIG_SMBIOS) += smbios/ +devices-dirs-y += mem/ devices-dirs-y += core/ common-obj-y += $(devices-dirs-y) obj-y += $(devices-dirs-y) diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index b0d6a67..1e9ae20 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -35,7 +35,7 @@ #include "exec/address-spaces.h" #include "hw/i386/ich9.h" -#include "hw/mem/pc-dimm.h" +#include "hw/mem/dimm.h" //#define DEBUG diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index e687852..20d3093 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -1,6 +1,6 @@ #include "hw/acpi/memory_hotplug.h" #include "hw/acpi/pc-hotplug.h" -#include "hw/mem/pc-dimm.h" +#include "hw/mem/dimm.h" #include "hw/boards.h" #include "hw/qdev-core.h" #include "trace.h" @@ -148,7 +148,7 @@ static void acpi_memory_hotplug_write(void *opaque, hwaddr addr, uint64_t data, dev = DEVICE(mdev->dimm); hotplug_ctrl = qdev_get_hotplug_handler(dev); - /* call pc-dimm unplug cb */ + /* call dimm unplug cb */ hotplug_handler_unplug(hotplug_ctrl, dev, &local_err); if (local_err) { trace_mhp_acpi_dimm_delete_failed(mem_st->selector); diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 0b2cb6e..b2f5b2c 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -33,7 +33,7 @@ #include "hw/acpi/pcihp.h" #include "hw/acpi/cpu_hotplug.h" #include "hw/hotplug.h" -#include "hw/mem/pc-dimm.h" +#include "hw/mem/dimm.h" #include "hw/acpi/memory_hotplug.h" #include "hw/acpi/acpi_dev_interface.h" #include "hw/xen/xen.h" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 67ecc4f..6bf569a 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -62,7 +62,7 @@ #include "hw/boards.h" #include "hw/pci/pci_host.h" #include "acpi-build.h" -#include "hw/mem/pc-dimm.h" +#include "hw/mem/dimm.h" #include "qapi/visitor.h" #include "qapi-visit.h" diff --git a/hw/mem/Makefile.objs b/hw/mem/Makefile.objs index b000fb4..7563ef5 100644 --- a/hw/mem/Makefile.objs +++ b/hw/mem/Makefile.objs @@ -1 +1 @@ -common-obj-$(CONFIG_MEM_HOTPLUG) += pc-dimm.o +common-obj-$(CONFIG_MEM_HOTPLUG) += dimm.o diff --git a/hw/mem/pc-dimm.c b/hw/mem/dimm.c similarity index 99% rename from hw/mem/pc-dimm.c rename to hw/mem/dimm.c index 67afc53..9f55cee 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/dimm.c @@ -18,7 +18,7 @@ * License along with this library; if not, see */ -#include "hw/mem/pc-dimm.h" +#include "hw/mem/dimm.h" #include "qemu/config-file.h" #include "qapi/visitor.h" #include "qemu/range.h" diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index ab6eb83..9ff24fd 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2199,7 +2199,7 @@ static void spapr_machine_device_plug(HotplugHandler *hotplug_dev, * * - Memory gets hotplugged to a different node than what the user * specified. - * - Since pc-dimm subsystem in QEMU still thinks that memory belongs + * - Since dimm subsystem in QEMU still thinks that memory belongs * to memory-less node, a reboot will set things accordingly * and the previously hotplugged memory now ends in the right node. * This appears as if some memory moved from one node to another. diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 606dbc2..62e8fb5 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -16,7 +16,7 @@ #include "hw/pci/pci.h" #include "hw/boards.h" #include "hw/compat.h" -#include "hw/mem/pc-dimm.h" +#include "hw/mem/dimm.h" #define HPET_INTCAP "hpet-intcap" diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/dimm.h similarity index 100% rename from include/hw/mem/pc-dimm.h rename to include/hw/mem/dimm.h diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 5baa906..0ae3abe 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -5,7 +5,7 @@ #include "hw/boards.h" #include "hw/ppc/xics.h" #include "hw/ppc/spapr_drc.h" -#include "hw/mem/pc-dimm.h" +#include "hw/mem/dimm.h" struct VIOsPAPRBus; struct sPAPRPHBState; diff --git a/numa.c b/numa.c index cb69965..34c6d6b 100644 --- a/numa.c +++ b/numa.c @@ -34,7 +34,7 @@ #include "hw/boards.h" #include "sysemu/hostmem.h" #include "qmp-commands.h" -#include "hw/mem/pc-dimm.h" +#include "hw/mem/dimm.h" #include "qemu/option.h" #include "qemu/config-file.h" diff --git a/qmp.c b/qmp.c index 169b981..5ae37f7 100644 --- a/qmp.c +++ b/qmp.c @@ -31,7 +31,7 @@ #include "qapi/qmp-input-visitor.h" #include "hw/boards.h" #include "qom/object_interfaces.h" -#include "hw/mem/pc-dimm.h" +#include "hw/mem/dimm.h" #include "hw/acpi/acpi_dev_interface.h" NameInfo *qmp_query_name(Error **errp) diff --git a/stubs/qmp_dimm_device_list.c b/stubs/qmp_dimm_device_list.c index b2704c6..fb66400 100644 --- a/stubs/qmp_dimm_device_list.c +++ b/stubs/qmp_dimm_device_list.c @@ -1,5 +1,5 @@ #include "qom/object.h" -#include "hw/mem/pc-dimm.h" +#include "hw/mem/dimm.h" int qmp_dimm_device_list(Object *obj, void *opaque) {