On Tue, Feb 04, 2020 at 03:55:23PM +0100, Igor Mammedov wrote:
> On Thu, 30 Jan 2020 05:47:59 -0600
> Shivaprasad G Bhat <sb...@linux.ibm.com> wrote:
>
> > For ppc64, PAPR requires the nvdimm device to have UUID property
> > set in the device tree. Add an option to get it from the user.
> >
> > Signed-off-by: Shivaprasad G Bhat <sb...@linux.ibm.com>
> > Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
> > ---
> > hw/mem/nvdimm.c | 40 ++++++++++++++++++++++++++++++++++++++++
> > include/hw/mem/nvdimm.h | 7 +++++++
> > 2 files changed, 47 insertions(+)
> >
> > diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c
> > index 39f1426d1f..8e426d24bb 100644
> > --- a/hw/mem/nvdimm.c
> > +++ b/hw/mem/nvdimm.c
> > @@ -69,11 +69,51 @@ out:
> > error_propagate(errp, local_err);
> > }
> >
> > +static void nvdimm_get_uuid(Object *obj, Visitor *v, const char *name,
> > + void *opaque, Error **errp)
> > +{
> > + NVDIMMDevice *nvdimm = NVDIMM(obj);
> > + char *value = NULL;
> > +
> > + value = qemu_uuid_unparse_strdup(&nvdimm->uuid);
> > +
> > + visit_type_str(v, name, &value, errp);
> > + g_free(value);
> > +}
> > +
> > +
> > +static void nvdimm_set_uuid(Object *obj, Visitor *v, const char *name,
> > + void *opaque, Error **errp)
> > +{
> > + NVDIMMDevice *nvdimm = NVDIMM(obj);
> > + Error *local_err = NULL;
> > + char *value;
> > +
> > + visit_type_str(v, name, &value, &local_err);
> > + if (local_err) {
> > + goto out;
> > + }
> > +
> > + if (qemu_uuid_parse(value, &nvdimm->uuid) != 0) {
> > + error_setg(errp, "Property '%s.%s' has invalid value",
> > + object_get_typename(obj), name);
> > + goto out;
> > + }
> > + g_free(value);
> > +
> > +out:
> > + error_propagate(errp, local_err);
> > +}
> > +
> > +
> > static void nvdimm_init(Object *obj)
> > {
> > object_property_add(obj, NVDIMM_LABEL_SIZE_PROP, "int",
> > nvdimm_get_label_size, nvdimm_set_label_size, NULL,
> > NULL, NULL);
> > +
> > + object_property_add(obj, NVDIMM_UUID_PROP, "QemuUUID", nvdimm_get_uuid,
> why it's named "QemuUUID" and not just "uuid"
I almost got caught by that one. The name is NVDIMM_UUID_PROP, which
is indeed just "uuid". The "QemuUUID" is the property type identifier.
>
>
> > + nvdimm_set_uuid, NULL, NULL, NULL);
> > }
> >
> > static void nvdimm_finalize(Object *obj)
> > diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h
> > index 523a9b3d4a..4807ca615b 100644
> > --- a/include/hw/mem/nvdimm.h
> > +++ b/include/hw/mem/nvdimm.h
> > @@ -25,6 +25,7 @@
> >
> > #include "hw/mem/pc-dimm.h"
> > #include "hw/acpi/bios-linker-loader.h"
> > +#include "qemu/uuid.h"
> >
> > #define NVDIMM_DEBUG 0
> > #define nvdimm_debug(fmt, ...) \
> > @@ -49,6 +50,7 @@
> > TYPE_NVDIMM)
> >
> > #define NVDIMM_LABEL_SIZE_PROP "label-size"
> > +#define NVDIMM_UUID_PROP "uuid"
> > #define NVDIMM_UNARMED_PROP "unarmed"
> >
> > struct NVDIMMDevice {
> > @@ -83,6 +85,11 @@ struct NVDIMMDevice {
> > * the guest write persistence.
> > */
> > bool unarmed;
> > +
> > + /*
> > + * The PPC64 - spapr requires each nvdimm device have a uuid.
> > + */
> > + QemuUUID uuid;
> > };
> > typedef struct NVDIMMDevice NVDIMMDevice;
> >
> >
>
--
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
