From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55453) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJYw-0004NA-2L for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:33:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVJYr-0002WZ-5s for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:32:58 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:40262) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fVJYq-0002V7-U3 for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:32:53 -0400 From: Venu Busireddy Date: Tue, 19 Jun 2018 11:32:25 -0500 Message-Id: <20180619163228.13790-2-venu.busireddy@oracle.com> In-Reply-To: <20180619163228.13790-1-venu.busireddy@oracle.com> References: <20180619163228.13790-1-venu.busireddy@oracle.com> Subject: [Qemu-devel] [PATCH 1/3] Add a true or false option to the DEFINE_PROP_UUID macro. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: venu.busireddy@oracle.com, "Michael S . Tsirkin" , Marcel Apfelbaum Cc: virtio-dev@lists.oasis-open.org, qemu-devel@nongnu.org It may not always be desirable to have a random UUID stuffed into the '_field' member. Add a new option '_default' to the macro, that will allow the caller to specify if a random UUID needs be generated or not. Also modified the instance where this macro is used. Signed-off-by: Venu Busireddy --- hw/acpi/vmgenid.c | 2 +- include/hw/qdev-properties.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c index d78b579a20..6d53757ee5 100644 --- a/hw/acpi/vmgenid.c +++ b/hw/acpi/vmgenid.c @@ -215,7 +215,7 @@ static void vmgenid_realize(DeviceState *dev, Error **errp) } static Property vmgenid_device_properties[] = { - DEFINE_PROP_UUID(VMGENID_GUID, VmGenIdState, guid), + DEFINE_PROP_UUID(VMGENID_GUID, VmGenIdState, guid, true), DEFINE_PROP_END_OF_LIST(), }; diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 4f60cc88f3..7d39a4bdcd 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -218,12 +218,12 @@ extern const PropertyInfo qdev_prop_off_auto_pcibar; DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_off_auto_pcibar, \ OffAutoPCIBAR) -#define DEFINE_PROP_UUID(_name, _state, _field) { \ +#define DEFINE_PROP_UUID(_name, _state, _field, _default) { \ .name = (_name), \ .info = &qdev_prop_uuid, \ .offset = offsetof(_state, _field) \ + type_check(QemuUUID, typeof_field(_state, _field)), \ - .set_default = true, \ + .set_default = _default, \ } #define DEFINE_PROP_END_OF_LIST() \