| Message ID | 196e09a27b8f13e96fe8ef6559abed8fd479a740.1424912878.git.zhugh.fnst@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Feb 26, 2015 at 09:16:43AM +0800, Zhu Guihua wrote: > From: Tang Chen <tangchen@cn.fujitsu.com> > > Replace string "slot" in acpi_memory_plug_cb() with MACRO PC_DIMM_SLOT_PROP. Probably should be "macro". > Reviewed-by: Igor Mammedov <imammedo@redhat.com> > Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com> > Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com> Applied, thanks. > --- > hw/acpi/memory_hotplug.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c > index ed39241..c6580da 100644 > --- a/hw/acpi/memory_hotplug.c > +++ b/hw/acpi/memory_hotplug.c > @@ -168,7 +168,8 @@ void acpi_memory_plug_cb(ACPIREGS *ar, qemu_irq irq, MemHotplugState *mem_st, > { > MemStatus *mdev; > Error *local_err = NULL; > - int slot = object_property_get_int(OBJECT(dev), "slot", &local_err); > + int slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP, > + &local_err); > > if (local_err) { > error_propagate(errp, local_err); > -- > 1.9.3
diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index ed39241..c6580da 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -168,7 +168,8 @@ void acpi_memory_plug_cb(ACPIREGS *ar, qemu_irq irq, MemHotplugState *mem_st, { MemStatus *mdev; Error *local_err = NULL; - int slot = object_property_get_int(OBJECT(dev), "slot", &local_err); + int slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP, + &local_err); if (local_err) { error_propagate(errp, local_err);