[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/16] Revert "pc: memhp: force gaps between DIMM's G
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 12/16] Revert "pc: memhp: force gaps between DIMM's GPA" |
Date: |
Thu, 29 Oct 2015 11:39:51 +0200 |
This reverts commit aa8580cddf011e8cedcf87f7a0fdea7549fc4704.
As described in
http://article.gmane.org/gmane.comp.emulators.qemu/371432
that commit causes linux guests to crash on memory hot-unplug.
The original problem it's trying to solve has now
been addressed within virtio.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/i386/pc.h | 1 -
hw/i386/pc.c | 6 ++----
hw/i386/pc_piix.c | 1 -
hw/i386/pc_q35.c | 1 -
4 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 7037de0..606dbc2 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -60,7 +60,6 @@ struct PCMachineClass {
/*< public >*/
bool broken_reserved_end;
- bool inter_dimm_gap;
HotplugHandler *(*get_hotplug_handler)(MachineState *machine,
DeviceState *dev);
};
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 3d958ba..d234cae 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1616,7 +1616,6 @@ static void pc_dimm_plug(HotplugHandler *hotplug_dev,
HotplugHandlerClass *hhc;
Error *local_err = NULL;
PCMachineState *pcms = PC_MACHINE(hotplug_dev);
- PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
PCDIMMDevice *dimm = PC_DIMM(dev);
PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
MemoryRegion *mr = ddc->get_memory_region(dimm);
@@ -1632,8 +1631,8 @@ static void pc_dimm_plug(HotplugHandler *hotplug_dev,
goto out;
}
- pc_dimm_memory_plug(dev, &pcms->hotplug_memory, mr, align,
- pcmc->inter_dimm_gap, &local_err);
+ pc_dimm_memory_plug(dev, &pcms->hotplug_memory, mr, align, false,
+ &local_err);
if (local_err) {
goto out;
}
@@ -1953,7 +1952,6 @@ static void pc_machine_class_init(ObjectClass *oc, void
*data)
PCMachineClass *pcmc = PC_MACHINE_CLASS(oc);
HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);
- pcmc->inter_dimm_gap = true;
pcmc->get_hotplug_handler = mc->get_hotplug_handler;
mc->get_hotplug_handler = pc_get_hotpug_handler;
mc->cpu_index_to_socket_id = pc_cpu_index_to_socket_id;
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 9d4425a..393dcc4 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -487,7 +487,6 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m)
m->alias = NULL;
m->is_default = 0;
pcmc->broken_reserved_end = true;
- pcmc->inter_dimm_gap = false;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_4);
}
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 3744abd..2f8f396 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -385,7 +385,6 @@ static void pc_q35_2_4_machine_options(MachineClass *m)
pc_q35_2_5_machine_options(m);
m->alias = NULL;
pcmc->broken_reserved_end = true;
- pcmc->inter_dimm_gap = false;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_4);
}
--
MST
- [Qemu-devel] [PULL 00/16] virtio, pc, memory: fixes+features for 2.5, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 01/16] vhost-user: cleanup struct size math, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 03/16] vhost-user-test: fix up rhel6 build, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 02/16] vhost-user: cleanup msg size math, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 04/16] pc: memhp: do not emit inserting event for coldplugged DIMMs, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 05/16] mmap-alloc: fix error handling, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 06/16] virtio: introduce virtio_map, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 07/16] virtio: switch to virtio_map, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 10/16] virtio-scsi: convert to virtqueue_map, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 12/16] Revert "pc: memhp: force gaps between DIMM's GPA",
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 11/16] virtio: drop virtqueue_map_sg, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 09/16] virtio-serial: convert to virtio_map, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 08/16] virtio-blk: convert to virtqueue_map, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 13/16] Revert "memhp: extend address auto assignment to support gaps", Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 15/16] remove function during multi-function hot-add, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 14/16] tests/vhost-user-bridge: add vhost-user bridge application, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 16/16] enable multi-function hot-add, Michael S. Tsirkin, 2015/10/29
- Re: [Qemu-devel] [PULL 00/16] virtio, pc, memory: fixes+features for 2.5, Peter Maydell, 2015/10/29