diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-12 11:33:26 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-12 11:33:26 +0000 |
| commit | cb5d19e8294486551c422759260883ed290226d9 (patch) | |
| tree | 0c3ecd590e8fd28131e299e03046a04f84ed9d1b | |
| parent | 674ee1245b4f14d998299d83410ac147e6e54eca (diff) | |
| parent | 6bfa035ec31f4f5a14499f17e08f62e8f14760cc (diff) | |
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-macppc-20201112' into staging
qemu-macppc fix for 5.2
# gpg: Signature made Thu 12 Nov 2020 09:50:45 GMT
# gpg: using RSA key CC621AB98E82200D915CC9C45BC2C56FAE0F321F
# gpg: issuer "mark.cave-ayland@ilande.co.uk"
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>" [full]
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C C9C4 5BC2 C56F AE0F 321F
* remotes/mcayland/tags/qemu-macppc-20201112:
macio: set user_creatable to false in macio_class_init()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/misc/macio/macio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c index 51368884d0..bb601f782c 100644 --- a/hw/misc/macio/macio.c +++ b/hw/misc/macio/macio.c @@ -456,6 +456,8 @@ static void macio_class_init(ObjectClass *klass, void *data) k->class_id = PCI_CLASS_OTHERS << 8; device_class_set_props(dc, macio_properties); set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); + /* Reason: requires PIC property links to be set in macio_*_realize() */ + dc->user_creatable = false; } static const TypeInfo macio_bus_info = { |