On Wed, 25 Jun 2014 18:03:02 +0800
Hu Tao <hu...@cn.fujitsu.com> wrote:
> On Wed, Jun 25, 2014 at 11:58:09AM +0200, Igor Mammedov wrote:
> > fixes QEMU abort in case it's started without memory
> > hotplug enabled.
> >
> > as result of fix it will print following messages:
> > "
> > -device pc-dimm,id=d1,memdev=m1: memory hotplug is not enabled, enable it
> > on startup
> > -device pc-dimm,id=d1,memdev=m1: Device 'pc-dimm' could not be initialized
> > "
> >
> > Also fixup assert condition to detect hotplug address
> > space overflow.
> >
> > Signed-off-by: Igor Mammedov <imamm...@redhat.com>
> > Reported-by: Hu Tao <hu...@cn.fujitsu.com>
> > ---
> > hw/mem/pc-dimm.c | 7 ++++++-
> > 1 files changed, 6 insertions(+), 1 deletions(-)
> >
> > diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
> > index ad176b7..991f0f8 100644
> > --- a/hw/mem/pc-dimm.c
> > +++ b/hw/mem/pc-dimm.c
> > @@ -146,7 +146,12 @@ uint64_t pc_dimm_get_free_addr(uint64_t
> > address_space_start,
> > uint64_t new_addr, ret = 0;
> > uint64_t address_space_end = address_space_start + address_space_size;
> >
> > - assert(address_space_end > address_space_size);
> > + if (!address_space_size) {
> > + error_setg(errp, "memory hotplug is not enabled, enable it on
> > startup");
>
> I'm just thinking if it's more clear to user to explictly state -m
> maxmem,slots here.
> As there is little chance -m will change in the future for
> compatibility, sync with it here won't be a problem. What do you think?
Ok, maybe like mst've suggested:
"memory hotplug is not enabled, please add maxmem option"
>
> Hu
>
> > + goto out;
> > + }
> > +
> > + assert(address_space_end > address_space_start);
> > object_child_foreach(qdev_get_machine(), pc_dimm_built_list, &list);
> >
> > if (hint) {
> > --
> > 1.7.1
