On Wed, May 24, 2017 at 11:55:13AM +0200, Greg Kurz wrote: 1;4601;0c> On Wed, 24 May 2017 14:52:36 +1000 > David Gibson <da...@gibson.dropbear.id.au> wrote: > [...] > > > > This patch seems like a good idea regardless of the rest, so I've > > fixed the minor nits Greg pointed out and merged to ppc-for-2.10. > > > > David, > > Commit d2e4c6a1437fab2fbb4553b598f25e282c475199 in your ppc-for-2.10 branch > doesn't compile: > > +static void spapr_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState > *dev, > + Error **errp) > +{ > + PCDIMMDevice *dimm = PC_DIMM(dev); > + PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm); > + MemoryRegion *mr = ddc->get_memory_region(dimm); > + uint64_t size = memory_region_size(mr); > + char *mem_dev; > + > + if (size % SPAPR_MEMORY_BLOCK_SIZE) { > + error_setg(&local_err, "Hotplugged memory size must be a multiple of > " > > s/&local_err/errp/ > > + "%lld MB", SPAPR_MEMORY_BLOCK_SIZE / M_BYTE); > + goto out; > > s/goto out/return/ > > + } > + > + mem_dev = object_property_get_str(OBJECT(dimm), PC_DIMM_MEMDEV_PROP, > NULL); > + if (mem_dev && !kvmppc_is_mem_backend_page_size_ok(mem_dev)) { > + error_setg(errp, "Memory backend has bad page size. " > + "Use 'memory-backend-file' with correct mem-path."); > + } > +} > +
Sorry, I found and fixed that already, but forgot to push the update. -- 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