From 695e02fdf90a0487f70b26b276e71e0924a817dc Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 16 Jan 2014 15:25:19 -0500 Subject: [PATCH 13/14] qdev: Document that pointer properties kill device_add MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-id: <1389885919-16158-3-git-send-email-armbru@redhat.com> Patchwork-id: 56749 O-Subject: [PATCH 7.0 qemu-kvm 2/2] qdev: Document that pointer properties kill device_add Bugzilla: 1031098 RH-Acked-by: Paolo Bonzini RH-Acked-by: Laszlo Ersek RH-Acked-by: Miroslav Rezanina Ask users of DEFINE_PROP_PTR() to set cannot_instantiate_with_device_add_yet, or explain why it's not needed. Signed-off-by: Markus Armbruster Signed-off-by: Andreas Färber (cherry picked from commit c272758f93b9c88c884461a2baa37b8f4008bf02) --- include/hw/qdev-properties.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) Signed-off-by: Miroslav Rezanina --- include/hw/qdev-properties.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 692f82e..77c6f7c 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -122,8 +122,25 @@ extern PropertyInfo qdev_prop_arraylen; #define DEFINE_PROP_PCI_DEVFN(_n, _s, _f, _d) \ DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_pci_devfn, int32_t) +/* + * Please avoid pointer properties. If you must use them, you must + * cover them in their device's class init function as follows: + * + * - If the property must be set, the device cannot be used with + * device_add, so add code like this: + * |* Reason: pointer property "NAME-OF-YOUR-PROP" *| + * DeviceClass *dc = DEVICE_CLASS(class); + * dc->cannot_instantiate_with_device_add_yet = true; + * + * - If the property may safely remain null, document it like this: + * |* + * * Note: pointer property "interrupt_vector" may remain null, thus + * * no need for dc->cannot_instantiate_with_device_add_yet = true; + * *| + */ #define DEFINE_PROP_PTR(_n, _s, _f) \ DEFINE_PROP(_n, _s, _f, qdev_prop_ptr, void*) + #define DEFINE_PROP_CHR(_n, _s, _f) \ DEFINE_PROP(_n, _s, _f, qdev_prop_chr, CharDriverState*) #define DEFINE_PROP_STRING(_n, _s, _f) \ -- 1.8.3.1