| Message ID | 20201030202131.796967-17-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | qdev/qom: Remove explicit type names from error_setg() calls | expand |
On Fri, 30 Oct 2020 16:21:27 -0400 Eduardo Habkost <ehabkost@redhat.com> wrote: > object_property_parse() will add a > "Property '<TYPE>.<PROP>' can't take value '<VALUE>'" > prefix automatically for us. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > Cc: Xiao Guangrong <xiaoguangrong.eric@gmail.com> > Cc: "Michael S. Tsirkin" <mst@redhat.com> > Cc: Igor Mammedov <imammedo@redhat.com> > Cc: qemu-devel@nongnu.org > --- > hw/mem/nvdimm.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c > index e1574bc07c..b9a99d58ed 100644 > --- a/hw/mem/nvdimm.c > +++ b/hw/mem/nvdimm.c > @@ -56,8 +56,7 @@ static void nvdimm_set_label_size(Object *obj, Visitor *v, const char *name, > return; > } > if (value < MIN_NAMESPACE_LABEL_SIZE) { > - error_setg(errp, "Property '%s.%s' (0x%" PRIx64 ") is required" > - " at least 0x%lx", object_get_typename(obj), name, value, > + error_setg(errp, "label size should be at least 0x%lx", > MIN_NAMESPACE_LABEL_SIZE); > return; > } > @@ -89,8 +88,7 @@ static void nvdimm_set_uuid(Object *obj, Visitor *v, const char *name, > } > > if (qemu_uuid_parse(value, &nvdimm->uuid) != 0) { > - error_setg(errp, "Property '%s.%s' has invalid value", > - object_get_typename(obj), name); > + error_setg(errp, "invalid UUID"); > } > > g_free(value);
diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c index e1574bc07c..b9a99d58ed 100644 --- a/hw/mem/nvdimm.c +++ b/hw/mem/nvdimm.c @@ -56,8 +56,7 @@ static void nvdimm_set_label_size(Object *obj, Visitor *v, const char *name, return; } if (value < MIN_NAMESPACE_LABEL_SIZE) { - error_setg(errp, "Property '%s.%s' (0x%" PRIx64 ") is required" - " at least 0x%lx", object_get_typename(obj), name, value, + error_setg(errp, "label size should be at least 0x%lx", MIN_NAMESPACE_LABEL_SIZE); return; } @@ -89,8 +88,7 @@ static void nvdimm_set_uuid(Object *obj, Visitor *v, const char *name, } if (qemu_uuid_parse(value, &nvdimm->uuid) != 0) { - error_setg(errp, "Property '%s.%s' has invalid value", - object_get_typename(obj), name); + error_setg(errp, "invalid UUID"); } g_free(value);
object_property_parse() will add a "Property '<TYPE>.<PROP>' can't take value '<VALUE>'" prefix automatically for us. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- Cc: Xiao Guangrong <xiaoguangrong.eric@gmail.com> Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: Igor Mammedov <imammedo@redhat.com> Cc: qemu-devel@nongnu.org --- hw/mem/nvdimm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)