Commit 340065e5 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

Revert "pc: memhp: force gaps between DIMM's GPA" 

This reverts commit aa8580cd.

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: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 3945ecf1

hw/i386/pc.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

hw/i386/pc_piix.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

}

hw/i386/pc_q35.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

}

include/hw/i386/pc.h

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ struct PCMachineClass { 


    /*< public >*/

    bool broken_reserved_end;

    bool inter_dimm_gap;

    HotplugHandler *(*get_hotplug_handler)(MachineState *machine,

                                           DeviceState *dev);

};