Commit 70fc9cb0 authored by Daniel Henrique Barboza's avatar Daniel Henrique Barboza Committed by David Gibson
Browse files

spapr_nvdimm.c: make 'label-size' mandatory 



The pseries machine does not support NVDIMM modules without label.
Attempting to do so, even if the overall block size is aligned with
256MB, will seg fault the guest kernel during NVDIMM probe. This
can be avoided by forcing 'label-size' to always be present for
sPAPR NVDIMMs.

The verification was put before the alignment check because the
presence of label-size affects the alignment calculation, so
it's not optimal to warn the user about an alignment error,
then about the lack of label-size, then about a new alignment
error when the user sets a label-size.

Signed-off-by: default avatarDaniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20200413203628.31636-1-danielhb413@gmail.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent d04ea940

hw/ppc/spapr_nvdimm.c

+6 −0
Original line number Diff line number Diff line
@@ -37,6 +37,12 @@ void spapr_nvdimm_validate_opts(NVDIMMDevice *nvdimm, uint64_t size, 
    QemuUUID uuid;

    int ret;



    if (object_property_get_int(OBJECT(nvdimm), NVDIMM_LABEL_SIZE_PROP,

                                &error_abort) == 0) {

        error_setg(errp, "NVDIMM device requires label-size to be set");

        return;

    }



    if (size % SPAPR_MINIMUM_SCM_BLOCK_SIZE) {

        error_setg(errp, "NVDIMM memory size excluding the label area"

                   " must be a multiple of %" PRIu64 "MB",