On Mon, Jun 18, 2018 at 04:47:57PM +0200, David Hildenbrand wrote: > We can assign and verify the slot before realizing and trying to plug. > reading/writing the slot property should never fail, so let's reduce > error handling a bit by using &error_abort. > > To do this during pre_plug, add and use (x86, ppc) pc_dimm_pre_plug(). > > Signed-off-by: David Hildenbrand <da...@redhat.com>
Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
and ppc portion
Acked-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
> hw/i386/pc.c | 2 ++
> hw/mem/pc-dimm.c | 35 ++++++++++++++++++-----------------
> hw/ppc/spapr.c | 1 +
> include/hw/mem/pc-dimm.h | 1 +
> 4 files changed, 22 insertions(+), 17 deletions(-)
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index f310040351..bf986baf91 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1695,6 +1695,8 @@ static void pc_memory_pre_plug(HotplugHandler
> *hotplug_dev, DeviceState *dev,
> error_setg(errp, "nvdimm is not enabled: missing 'nvdimm' in '-M'");
> return;
> }
> +
> + pc_dimm_pre_plug(dev, MACHINE(hotplug_dev), errp);
> }
>
> static void pc_memory_plug(HotplugHandler *hotplug_dev,
> diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
> index 65843bc52a..e56c4daef2 100644
> --- a/hw/mem/pc-dimm.c
> +++ b/hw/mem/pc-dimm.c
> @@ -29,10 +29,27 @@
>
> static int pc_dimm_get_free_slot(const int *hint, int max_slots, Error
> **errp);
>
> +void pc_dimm_pre_plug(DeviceState *dev, MachineState *machine, Error **errp)
> +{
> + Error *local_err = NULL;
> + int slot;
> +
> + slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP,
> + &error_abort);
> + slot = pc_dimm_get_free_slot(slot == PC_DIMM_UNASSIGNED_SLOT ? NULL :
> &slot,
> + machine->ram_slots, &local_err);
> + if (local_err) {
> + goto out;
> + }
> + object_property_set_int(OBJECT(dev), slot, PC_DIMM_SLOT_PROP,
> &error_abort);
> + trace_mhp_pc_dimm_assigned_slot(slot);
> +out:
> + error_propagate(errp, local_err);
> +}
> +
> void pc_dimm_plug(DeviceState *dev, MachineState *machine, uint64_t align,
> Error **errp)
> {
> - int slot;
> PCDIMMDevice *dimm = PC_DIMM(dev);
> PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
> MemoryRegion *vmstate_mr = ddc->get_vmstate_memory_region(dimm,
> @@ -59,22 +76,6 @@ void pc_dimm_plug(DeviceState *dev, MachineState *machine,
> uint64_t align,
> }
> trace_mhp_pc_dimm_assigned_address(addr);
>
> - slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP,
> &local_err);
> - if (local_err) {
> - goto out;
> - }
> -
> - slot = pc_dimm_get_free_slot(slot == PC_DIMM_UNASSIGNED_SLOT ? NULL :
> &slot,
> - machine->ram_slots, &local_err);
> - if (local_err) {
> - goto out;
> - }
> - object_property_set_int(OBJECT(dev), slot, PC_DIMM_SLOT_PROP,
> &local_err);
> - if (local_err) {
> - goto out;
> - }
> - trace_mhp_pc_dimm_assigned_slot(slot);
> -
> memory_device_plug_region(machine, mr, addr);
> vmstate_register_ram(vmstate_mr, dev);
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 6934abc21e..9da233588b 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -3211,6 +3211,7 @@ static void spapr_memory_pre_plug(HotplugHandler
> *hotplug_dev, DeviceState *dev,
> goto out;
> }
>
> + pc_dimm_pre_plug(dev, MACHINE(hotplug_dev), errp);
> out:
> g_free(mem_dev);
> }
> diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h
> index 26ebb7d5e9..7b120416d1 100644
> --- a/include/hw/mem/pc-dimm.h
> +++ b/include/hw/mem/pc-dimm.h
> @@ -79,6 +79,7 @@ typedef struct PCDIMMDeviceClass {
> Error **errp);
> } PCDIMMDeviceClass;
>
> +void pc_dimm_pre_plug(DeviceState *dev, MachineState *machine, Error **errp);
> void pc_dimm_plug(DeviceState *dev, MachineState *machine, uint64_t align,
> Error **errp);
> void pc_dimm_unplug(DeviceState *dev, MachineState *machine);
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
