|
 |
383d26 |
From cd99d0d882fc24428194547adb29399519ea09d5 Mon Sep 17 00:00:00 2001
|
|
|
383d26 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
383d26 |
Date: Mon, 29 Oct 2018 07:01:35 +0100
|
|
|
383d26 |
Subject: [PATCH 05/22] nvdimm: no need to overwrite
|
|
|
383d26 |
get_vmstate_memory_region()
|
|
|
383d26 |
MIME-Version: 1.0
|
|
|
383d26 |
Content-Type: text/plain; charset=UTF-8
|
|
|
383d26 |
Content-Transfer-Encoding: 8bit
|
|
|
383d26 |
|
|
|
383d26 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
383d26 |
Message-id: <20181029070137.21196-2-armbru@redhat.com>
|
|
|
383d26 |
Patchwork-id: 82901
|
|
|
383d26 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 1/3] nvdimm: no need to overwrite get_vmstate_memory_region()
|
|
|
383d26 |
Bugzilla: 1620373
|
|
|
383d26 |
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
383d26 |
|
|
|
383d26 |
From: David Hildenbrand <david@redhat.com>
|
|
|
383d26 |
|
|
|
383d26 |
Our parent class (PC_DIMM) provides exactly the same function.
|
|
|
383d26 |
|
|
|
383d26 |
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
|
|
|
383d26 |
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
383d26 |
Signed-off-by: David Hildenbrand <david@redhat.com>
|
|
|
383d26 |
Message-Id: <20180619134141.29478-7-david@redhat.com>
|
|
|
383d26 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
383d26 |
(cherry picked from commit 4ab56d04ede6e0f979fc8e4a54b381e99cf0a255)
|
|
|
383d26 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
383d26 |
---
|
|
|
383d26 |
hw/mem/nvdimm.c | 6 ------
|
|
|
383d26 |
1 file changed, 6 deletions(-)
|
|
|
383d26 |
|
|
|
383d26 |
diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c
|
|
|
383d26 |
index 0c962fd..5f1813d 100644
|
|
|
383d26 |
--- a/hw/mem/nvdimm.c
|
|
|
383d26 |
+++ b/hw/mem/nvdimm.c
|
|
|
383d26 |
@@ -173,11 +173,6 @@ static void nvdimm_write_label_data(NVDIMMDevice *nvdimm, const void *buf,
|
|
|
383d26 |
memory_region_set_dirty(mr, backend_offset, size);
|
|
|
383d26 |
}
|
|
|
383d26 |
|
|
|
383d26 |
-static MemoryRegion *nvdimm_get_vmstate_memory_region(PCDIMMDevice *dimm)
|
|
|
383d26 |
-{
|
|
|
383d26 |
- return host_memory_backend_get_memory(dimm->hostmem, &error_abort);
|
|
|
383d26 |
-}
|
|
|
383d26 |
-
|
|
|
383d26 |
static void nvdimm_class_init(ObjectClass *oc, void *data)
|
|
|
383d26 |
{
|
|
|
383d26 |
PCDIMMDeviceClass *ddc = PC_DIMM_CLASS(oc);
|
|
|
383d26 |
@@ -185,7 +180,6 @@ static void nvdimm_class_init(ObjectClass *oc, void *data)
|
|
|
383d26 |
|
|
|
383d26 |
ddc->realize = nvdimm_realize;
|
|
|
383d26 |
ddc->get_memory_region = nvdimm_get_memory_region;
|
|
|
383d26 |
- ddc->get_vmstate_memory_region = nvdimm_get_vmstate_memory_region;
|
|
|
383d26 |
|
|
|
383d26 |
nvc->read_label_data = nvdimm_read_label_data;
|
|
|
383d26 |
nvc->write_label_data = nvdimm_write_label_data;
|
|
|
383d26 |
--
|
|
|
383d26 |
1.8.3.1
|
|
|
383d26 |
|