diff options
| author | Peter Maydell | 2019-07-30 10:43:32 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-07-30 10:43:32 +0200 |
| commit | ee9545ed1543020fba52fa5fb8f2b71c63e5389f (patch) | |
| tree | dcb2bfcffdf3559b5a9efd205000513d4aa3a00a /include | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' in... (diff) | |
| parent | pc-dimm: fix crash when invalid slot number is used (diff) | |
| download | qemu-ee9545ed1543020fba52fa5fb8f2b71c63e5389f.tar.gz qemu-ee9545ed1543020fba52fa5fb8f2b71c63e5389f.tar.xz qemu-ee9545ed1543020fba52fa5fb8f2b71c63e5389f.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio, pc: fixes
A couple of last minute bugfixes.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Mon 29 Jul 2019 22:13:22 BST
# gpg: using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67
# Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469
* remotes/mst/tags/for_upstream:
pc-dimm: fix crash when invalid slot number is used
Revert "hw: report invalid disable-legacy|modern usage for virtio-1-only devs"
Revert "Revert "globals: Allow global properties to be optional""
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/qdev-core.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index e157fc4acd..136df7774c 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -252,6 +252,8 @@ struct PropertyInfo { /** * GlobalProperty: * @used: Set to true if property was used when initializing a device. + * @optional: If set to true, GlobalProperty will be skipped without errors + * if the property doesn't exist. * * An error is fatal for non-hotplugged devices, when the global is applied. */ @@ -260,6 +262,7 @@ typedef struct GlobalProperty { const char *property; const char *value; bool used; + bool optional; } GlobalProperty; static inline void |