mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-macppc fix for 5.2

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFSBAABCgA8FiEEzGIauY6CIA2RXMnEW8LFb64PMh8FAl+tBXUeHG1hcmsuY2F2
 ZS1heWxhbmRAaWxhbmRlLmNvLnVrAAoJEFvCxW+uDzIfoBIH/RVsunQCZFukuyr7
 vhp6Uf/nf95Rr9EN1Z7/JsmI8vGXaaZUxH3hEsMlW3lFqnobzNM0zhvy/KHkZcIo
 Id3a2jpS1MDTkuk5h0neataMmzpIF1xve5whwl5aLQOHQcYRwgWMhhMZcQKLk0nU
 EH0h/bfITeW353/N8aDmBBZixIsPNzQrG2nk+SDyGUC9eOtKEnwHtI5gsiWzJ3+x
 tpe78wGPCiNm31vGphNxx+QKoFWFOexGHT+pq9oGP+xKWVb0E8q1ebHZ7Yp56U9k
 CVOPjvI6lwpSgatmnhdq8CjMXyvWrPJCXhtKpgVl2cKNuifanDkzGKOh2kGoVKZ2
 5TiovgM=
 =DXCd
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2020-11-12 11:33:26 +00:00
commit cb5d19e829
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/misc/macio/macio.c
View File

@ -456,6 +456,8 @@ static void macio_class_init(ObjectClass *klass, void *data)
k->class_id = PCI_CLASS_OTHERS << 8; k->class_id = PCI_CLASS_OTHERS << 8;
device_class_set_props(dc, macio_properties); device_class_set_props(dc, macio_properties);
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); 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 = { static const TypeInfo macio_bus_info = {