| Message ID | 1446184587-142784-17-git-send-email-guangrong.xiao@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 30.10.2015 08:56, Xiao Guangrong wrote: > 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 > > Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> > --- > 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 <http://www.gnu.org/licenses/> > */ > > -#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) > { Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
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 <http://www.gnu.org/licenses/> */ -#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) {
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 Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> --- 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%)