Hi
On Fri, Nov 24, 2017 at 4:36 PM, Roman Kagan <rka...@virtuozzo.com> wrote:
> Switch vmgenid device to use the UUID property type introduced in the
> previous patch for its 'guid' property.
>
> One semantic change it introduces is that post-realize modification of
> 'guid' via HMP or QMP will now be rejected with an error; however,
> according to docs/specs/vmgenid.txt this is actually desirable.
>
> Signed-off-by: Roman Kagan <rka...@virtuozzo.com>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> hw/acpi/vmgenid.c | 30 ++++++++----------------------
> 1 file changed, 8 insertions(+), 22 deletions(-)
>
> diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c
> index 105044f666..84ff015bda 100644
> --- a/hw/acpi/vmgenid.c
> +++ b/hw/acpi/vmgenid.c
> @@ -162,21 +162,6 @@ static void vmgenid_update_guest(VmGenIdState *vms)
> }
> }
>
> -static void vmgenid_set_guid(Object *obj, const char *value, Error **errp)
> -{
> - VmGenIdState *vms = VMGENID(obj);
> -
> - if (!strcmp(value, "auto")) {
> - qemu_uuid_generate(&vms->guid);
> - } else if (qemu_uuid_parse(value, &vms->guid) < 0) {
> - error_setg(errp, "'%s. %s': Failed to parse GUID string: %s",
> - object_get_typename(OBJECT(vms)), VMGENID_GUID, value);
> - return;
> - }
> -
> - vmgenid_update_guest(vms);
> -}
> -
> /* After restoring an image, we need to update the guest memory and notify
> * it of a potential change to VM Generation ID
> */
> @@ -224,23 +209,24 @@ static void vmgenid_realize(DeviceState *dev, Error
> **errp)
> }
>
> qemu_register_reset(vmgenid_handle_reset, vms);
> +
> + vmgenid_update_guest(vms);
> }
>
> +static Property vmgenid_device_properties[] = {
> + DEFINE_PROP_UUID("guid", VmGenIdState, guid),
> + DEFINE_PROP_END_OF_LIST(),
> +};
> +
> static void vmgenid_device_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
>
> dc->vmsd = &vmstate_vmgenid;
> dc->realize = vmgenid_realize;
> + dc->props = vmgenid_device_properties;
> dc->hotpluggable = false;
> set_bit(DEVICE_CATEGORY_MISC, dc->categories);
> -
> - object_class_property_add_str(klass, VMGENID_GUID, NULL,
> - vmgenid_set_guid, NULL);
> - object_class_property_set_description(klass, VMGENID_GUID,
> - "Set Global Unique Identifier "
> - "(big-endian) or auto for random value",
> - NULL);
> }
>
> static const TypeInfo vmgenid_device_info = {
> --
> 2.14.3
>
>
--
Marc-André Lureau
