diff mbox series

[1/5] pc-dimm: Drop @errp argument of pc_dimm_plug()

Message ID 160309728447.2739814.12831204841251148202.stgit@bahia.lan
State Superseded
Headers show
Series spapr: Error handling fixes and cleanups (round 3) | expand

Commit Message

Greg Kurz Oct. 19, 2020, 8:48 a.m. UTC 
pc_dimm_plug() doesn't use it. It only aborts on error.

Drop @errp and adapt the callers accordingly.

Signed-off-by: Greg Kurz <groug@kaod.org>
---
 hw/arm/virt.c            |    9 +--------
 hw/i386/pc.c             |    8 +-------
 hw/mem/pc-dimm.c         |    2 +-
 hw/ppc/spapr.c           |    5 +----
 include/hw/mem/pc-dimm.h |    2 +-
 5 files changed, 5 insertions(+), 21 deletions(-)

Comments

Vladimir Sementsov-Ogievskiy Oct. 21, 2020, 2:29 p.m. UTC | #1 
19.10.2020 11:48, Greg Kurz wrote:
> pc_dimm_plug() doesn't use it. It only aborts on error.

> 

> Drop @errp and adapt the callers accordingly.

> 

> Signed-off-by: Greg Kurz<groug@kaod.org>


Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>


-- 
Best regards,
Vladimir
David Gibson Oct. 22, 2020, 4:06 a.m. UTC | #2 
On Mon, Oct 19, 2020 at 10:48:04AM +0200, Greg Kurz wrote:
> pc_dimm_plug() doesn't use it. It only aborts on error.

> 

> Drop @errp and adapt the callers accordingly.

> 

> Signed-off-by: Greg Kurz <groug@kaod.org>


Reviewed-by: David Gibson <david@gibson.dropbear.id.au>


ppc parts
Acked-by: David Gibson <david@gibson.dropbear.id.au>


> ---

>  hw/arm/virt.c            |    9 +--------

>  hw/i386/pc.c             |    8 +-------

>  hw/mem/pc-dimm.c         |    2 +-

>  hw/ppc/spapr.c           |    5 +----

>  include/hw/mem/pc-dimm.h |    2 +-

>  5 files changed, 5 insertions(+), 21 deletions(-)

> 

> diff --git a/hw/arm/virt.c b/hw/arm/virt.c

> index e465a988d683..27dbeb549ef1 100644

> --- a/hw/arm/virt.c

> +++ b/hw/arm/virt.c

> @@ -2261,12 +2261,8 @@ static void virt_memory_plug(HotplugHandler *hotplug_dev,

>      VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);

>      MachineState *ms = MACHINE(hotplug_dev);

>      bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);

> -    Error *local_err = NULL;

>  

> -    pc_dimm_plug(PC_DIMM(dev), MACHINE(vms), &local_err);

> -    if (local_err) {

> -        goto out;

> -    }

> +    pc_dimm_plug(PC_DIMM(dev), MACHINE(vms));

>  

>      if (is_nvdimm) {

>          nvdimm_plug(ms->nvdimms_state);

> @@ -2274,9 +2270,6 @@ static void virt_memory_plug(HotplugHandler *hotplug_dev,

>  

>      hotplug_handler_plug(HOTPLUG_HANDLER(vms->acpi_dev),

>                           dev, &error_abort);

> -

> -out:

> -    error_propagate(errp, local_err);

>  }

>  

>  static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,

> diff --git a/hw/i386/pc.c b/hw/i386/pc.c

> index e87be5d29a01..38b1be78e707 100644

> --- a/hw/i386/pc.c

> +++ b/hw/i386/pc.c

> @@ -1265,24 +1265,18 @@ static void pc_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,

>  static void pc_memory_plug(HotplugHandler *hotplug_dev,

>                             DeviceState *dev, Error **errp)

>  {

> -    Error *local_err = NULL;

>      PCMachineState *pcms = PC_MACHINE(hotplug_dev);

>      X86MachineState *x86ms = X86_MACHINE(hotplug_dev);

>      MachineState *ms = MACHINE(hotplug_dev);

>      bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);

>  

> -    pc_dimm_plug(PC_DIMM(dev), MACHINE(pcms), &local_err);

> -    if (local_err) {

> -        goto out;

> -    }

> +    pc_dimm_plug(PC_DIMM(dev), MACHINE(pcms));

>  

>      if (is_nvdimm) {

>          nvdimm_plug(ms->nvdimms_state);

>      }

>  

>      hotplug_handler_plug(x86ms->acpi_dev, dev, &error_abort);

> -out:

> -    error_propagate(errp, local_err);

>  }

>  

>  static void pc_memory_unplug_request(HotplugHandler *hotplug_dev,

> diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c

> index c30351070bb8..2ffc986734df 100644

> --- a/hw/mem/pc-dimm.c

> +++ b/hw/mem/pc-dimm.c

> @@ -64,7 +64,7 @@ void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine,

>                             errp);

>  }

>  

> -void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine, Error **errp)

> +void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine)

>  {

>      PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);

>      MemoryRegion *vmstate_mr = ddc->get_vmstate_memory_region(dimm,

> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c

> index ee716a12af73..4edd31b86915 100644

> --- a/hw/ppc/spapr.c

> +++ b/hw/ppc/spapr.c

> @@ -3438,10 +3438,7 @@ static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev,

>  

>      size = memory_device_get_region_size(MEMORY_DEVICE(dev), &error_abort);

>  

> -    pc_dimm_plug(dimm, MACHINE(ms), &local_err);

> -    if (local_err) {

> -        goto out;

> -    }

> +    pc_dimm_plug(dimm, MACHINE(ms));

>  

>      if (!is_nvdimm) {

>          addr = object_property_get_uint(OBJECT(dimm),

> diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h

> index aec9527fdd96..3d3db82641f8 100644

> --- a/include/hw/mem/pc-dimm.h

> +++ b/include/hw/mem/pc-dimm.h

> @@ -72,6 +72,6 @@ struct PCDIMMDeviceClass {

>  

>  void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine,

>                        const uint64_t *legacy_align, Error **errp);

> -void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine, Error **errp);

> +void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine);

>  void pc_dimm_unplug(PCDIMMDevice *dimm, MachineState *machine);

>  #endif

> 

> 


-- 
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
Igor Mammedov Oct. 23, 2020, 7:19 p.m. UTC | #3 
On Mon, 19 Oct 2020 10:48:04 +0200
Greg Kurz <groug@kaod.org> wrote:

> pc_dimm_plug() doesn't use it. It only aborts on error.
> 
> Drop @errp and adapt the callers accordingly.
> 
> Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>

arguably the same should be done in spapr.

> ---
>  hw/arm/virt.c            |    9 +--------
>  hw/i386/pc.c             |    8 +-------
>  hw/mem/pc-dimm.c         |    2 +-
>  hw/ppc/spapr.c           |    5 +----
>  include/hw/mem/pc-dimm.h |    2 +-
>  5 files changed, 5 insertions(+), 21 deletions(-)
> 
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index e465a988d683..27dbeb549ef1 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -2261,12 +2261,8 @@ static void virt_memory_plug(HotplugHandler *hotplug_dev,
>      VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
>      MachineState *ms = MACHINE(hotplug_dev);
>      bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
> -    Error *local_err = NULL;
>  
> -    pc_dimm_plug(PC_DIMM(dev), MACHINE(vms), &local_err);
> -    if (local_err) {
> -        goto out;
> -    }
> +    pc_dimm_plug(PC_DIMM(dev), MACHINE(vms));
>  
>      if (is_nvdimm) {
>          nvdimm_plug(ms->nvdimms_state);
> @@ -2274,9 +2270,6 @@ static void virt_memory_plug(HotplugHandler *hotplug_dev,
>  
>      hotplug_handler_plug(HOTPLUG_HANDLER(vms->acpi_dev),
>                           dev, &error_abort);
> -
> -out:
> -    error_propagate(errp, local_err);
>  }
>  
>  static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index e87be5d29a01..38b1be78e707 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1265,24 +1265,18 @@ static void pc_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
>  static void pc_memory_plug(HotplugHandler *hotplug_dev,
>                             DeviceState *dev, Error **errp)
>  {
> -    Error *local_err = NULL;
>      PCMachineState *pcms = PC_MACHINE(hotplug_dev);
>      X86MachineState *x86ms = X86_MACHINE(hotplug_dev);
>      MachineState *ms = MACHINE(hotplug_dev);
>      bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
>  
> -    pc_dimm_plug(PC_DIMM(dev), MACHINE(pcms), &local_err);
> -    if (local_err) {
> -        goto out;
> -    }
> +    pc_dimm_plug(PC_DIMM(dev), MACHINE(pcms));
>  
>      if (is_nvdimm) {
>          nvdimm_plug(ms->nvdimms_state);
>      }
>  
>      hotplug_handler_plug(x86ms->acpi_dev, dev, &error_abort);
> -out:
> -    error_propagate(errp, local_err);
>  }
>  
>  static void pc_memory_unplug_request(HotplugHandler *hotplug_dev,
> diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
> index c30351070bb8..2ffc986734df 100644
> --- a/hw/mem/pc-dimm.c
> +++ b/hw/mem/pc-dimm.c
> @@ -64,7 +64,7 @@ void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine,
>                             errp);
>  }
>  
> -void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine, Error **errp)
> +void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine)
>  {
>      PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
>      MemoryRegion *vmstate_mr = ddc->get_vmstate_memory_region(dimm,
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index ee716a12af73..4edd31b86915 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -3438,10 +3438,7 @@ static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
>  
>      size = memory_device_get_region_size(MEMORY_DEVICE(dev), &error_abort);
>  
> -    pc_dimm_plug(dimm, MACHINE(ms), &local_err);
> -    if (local_err) {
> -        goto out;
> -    }
> +    pc_dimm_plug(dimm, MACHINE(ms));
>  
>      if (!is_nvdimm) {
>          addr = object_property_get_uint(OBJECT(dimm),
> diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h
> index aec9527fdd96..3d3db82641f8 100644
> --- a/include/hw/mem/pc-dimm.h
> +++ b/include/hw/mem/pc-dimm.h
> @@ -72,6 +72,6 @@ struct PCDIMMDeviceClass {
>  
>  void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine,
>                        const uint64_t *legacy_align, Error **errp);
> -void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine, Error **errp);
> +void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine);
>  void pc_dimm_unplug(PCDIMMDevice *dimm, MachineState *machine);
>  #endif
> 
> 
>
Greg Kurz Oct. 25, 2020, 9:31 p.m. UTC | #4 
On Fri, 23 Oct 2020 21:19:19 +0200
Igor Mammedov <imammedo@redhat.com> wrote:

> On Mon, 19 Oct 2020 10:48:04 +0200

> Greg Kurz <groug@kaod.org> wrote:

> 

> > pc_dimm_plug() doesn't use it. It only aborts on error.

> > 

> > Drop @errp and adapt the callers accordingly.

> > 

> > Signed-off-by: Greg Kurz <groug@kaod.org>

> Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> 

> arguably the same should be done in spapr.

> 


As explained in another mail, we have to keep spapr_drc_attach()
at plug time and this can legitimately fail if an unplug operation
is pending for the device. We certainly prefer to report this as
an error rather than aborting.

> > ---

> >  hw/arm/virt.c            |    9 +--------

> >  hw/i386/pc.c             |    8 +-------

> >  hw/mem/pc-dimm.c         |    2 +-

> >  hw/ppc/spapr.c           |    5 +----

> >  include/hw/mem/pc-dimm.h |    2 +-

> >  5 files changed, 5 insertions(+), 21 deletions(-)

> > 

> > diff --git a/hw/arm/virt.c b/hw/arm/virt.c

> > index e465a988d683..27dbeb549ef1 100644

> > --- a/hw/arm/virt.c

> > +++ b/hw/arm/virt.c

> > @@ -2261,12 +2261,8 @@ static void virt_memory_plug(HotplugHandler *hotplug_dev,

> >      VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);

> >      MachineState *ms = MACHINE(hotplug_dev);

> >      bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);

> > -    Error *local_err = NULL;

> >  

> > -    pc_dimm_plug(PC_DIMM(dev), MACHINE(vms), &local_err);

> > -    if (local_err) {

> > -        goto out;

> > -    }

> > +    pc_dimm_plug(PC_DIMM(dev), MACHINE(vms));

> >  

> >      if (is_nvdimm) {

> >          nvdimm_plug(ms->nvdimms_state);

> > @@ -2274,9 +2270,6 @@ static void virt_memory_plug(HotplugHandler *hotplug_dev,

> >  

> >      hotplug_handler_plug(HOTPLUG_HANDLER(vms->acpi_dev),

> >                           dev, &error_abort);

> > -

> > -out:

> > -    error_propagate(errp, local_err);

> >  }

> >  

> >  static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,

> > diff --git a/hw/i386/pc.c b/hw/i386/pc.c

> > index e87be5d29a01..38b1be78e707 100644

> > --- a/hw/i386/pc.c

> > +++ b/hw/i386/pc.c

> > @@ -1265,24 +1265,18 @@ static void pc_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,

> >  static void pc_memory_plug(HotplugHandler *hotplug_dev,

> >                             DeviceState *dev, Error **errp)

> >  {

> > -    Error *local_err = NULL;

> >      PCMachineState *pcms = PC_MACHINE(hotplug_dev);

> >      X86MachineState *x86ms = X86_MACHINE(hotplug_dev);

> >      MachineState *ms = MACHINE(hotplug_dev);

> >      bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);

> >  

> > -    pc_dimm_plug(PC_DIMM(dev), MACHINE(pcms), &local_err);

> > -    if (local_err) {

> > -        goto out;

> > -    }

> > +    pc_dimm_plug(PC_DIMM(dev), MACHINE(pcms));

> >  

> >      if (is_nvdimm) {

> >          nvdimm_plug(ms->nvdimms_state);

> >      }

> >  

> >      hotplug_handler_plug(x86ms->acpi_dev, dev, &error_abort);

> > -out:

> > -    error_propagate(errp, local_err);

> >  }

> >  

> >  static void pc_memory_unplug_request(HotplugHandler *hotplug_dev,

> > diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c

> > index c30351070bb8..2ffc986734df 100644

> > --- a/hw/mem/pc-dimm.c

> > +++ b/hw/mem/pc-dimm.c

> > @@ -64,7 +64,7 @@ void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine,

> >                             errp);

> >  }

> >  

> > -void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine, Error **errp)

> > +void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine)

> >  {

> >      PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);

> >      MemoryRegion *vmstate_mr = ddc->get_vmstate_memory_region(dimm,

> > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c

> > index ee716a12af73..4edd31b86915 100644

> > --- a/hw/ppc/spapr.c

> > +++ b/hw/ppc/spapr.c

> > @@ -3438,10 +3438,7 @@ static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev,

> >  

> >      size = memory_device_get_region_size(MEMORY_DEVICE(dev), &error_abort);

> >  

> > -    pc_dimm_plug(dimm, MACHINE(ms), &local_err);

> > -    if (local_err) {

> > -        goto out;

> > -    }

> > +    pc_dimm_plug(dimm, MACHINE(ms));

> >  

> >      if (!is_nvdimm) {

> >          addr = object_property_get_uint(OBJECT(dimm),

> > diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h

> > index aec9527fdd96..3d3db82641f8 100644

> > --- a/include/hw/mem/pc-dimm.h

> > +++ b/include/hw/mem/pc-dimm.h

> > @@ -72,6 +72,6 @@ struct PCDIMMDeviceClass {

> >  

> >  void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine,

> >                        const uint64_t *legacy_align, Error **errp);

> > -void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine, Error **errp);

> > +void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine);

> >  void pc_dimm_unplug(PCDIMMDevice *dimm, MachineState *machine);

> >  #endif

> > 

> > 

> > 

> 

>
diff mbox series

Patch

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index e465a988d683..27dbeb549ef1 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -2261,12 +2261,8 @@  static void virt_memory_plug(HotplugHandler *hotplug_dev,
     VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
     MachineState *ms = MACHINE(hotplug_dev);
     bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
-    Error *local_err = NULL;
 
-    pc_dimm_plug(PC_DIMM(dev), MACHINE(vms), &local_err);
-    if (local_err) {
-        goto out;
-    }
+    pc_dimm_plug(PC_DIMM(dev), MACHINE(vms));
 
     if (is_nvdimm) {
         nvdimm_plug(ms->nvdimms_state);
@@ -2274,9 +2270,6 @@  static void virt_memory_plug(HotplugHandler *hotplug_dev,
 
     hotplug_handler_plug(HOTPLUG_HANDLER(vms->acpi_dev),
                          dev, &error_abort);
-
-out:
-    error_propagate(errp, local_err);
 }
 
 static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index e87be5d29a01..38b1be78e707 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1265,24 +1265,18 @@  static void pc_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
 static void pc_memory_plug(HotplugHandler *hotplug_dev,
                            DeviceState *dev, Error **errp)
 {
-    Error *local_err = NULL;
     PCMachineState *pcms = PC_MACHINE(hotplug_dev);
     X86MachineState *x86ms = X86_MACHINE(hotplug_dev);
     MachineState *ms = MACHINE(hotplug_dev);
     bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
 
-    pc_dimm_plug(PC_DIMM(dev), MACHINE(pcms), &local_err);
-    if (local_err) {
-        goto out;
-    }
+    pc_dimm_plug(PC_DIMM(dev), MACHINE(pcms));
 
     if (is_nvdimm) {
         nvdimm_plug(ms->nvdimms_state);
     }
 
     hotplug_handler_plug(x86ms->acpi_dev, dev, &error_abort);
-out:
-    error_propagate(errp, local_err);
 }
 
 static void pc_memory_unplug_request(HotplugHandler *hotplug_dev,
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index c30351070bb8..2ffc986734df 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -64,7 +64,7 @@  void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine,
                            errp);
 }
 
-void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine, Error **errp)
+void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine)
 {
     PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
     MemoryRegion *vmstate_mr = ddc->get_vmstate_memory_region(dimm,
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index ee716a12af73..4edd31b86915 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3438,10 +3438,7 @@  static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
 
     size = memory_device_get_region_size(MEMORY_DEVICE(dev), &error_abort);
 
-    pc_dimm_plug(dimm, MACHINE(ms), &local_err);
-    if (local_err) {
-        goto out;
-    }
+    pc_dimm_plug(dimm, MACHINE(ms));
 
     if (!is_nvdimm) {
         addr = object_property_get_uint(OBJECT(dimm),
diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h
index aec9527fdd96..3d3db82641f8 100644
--- a/include/hw/mem/pc-dimm.h
+++ b/include/hw/mem/pc-dimm.h
@@ -72,6 +72,6 @@  struct PCDIMMDeviceClass {
 
 void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine,
                       const uint64_t *legacy_align, Error **errp);
-void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine, Error **errp);
+void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine);
 void pc_dimm_unplug(PCDIMMDevice *dimm, MachineState *machine);
 #endif