[PULL 0/1] qemu-macppc queue 20201112

[PULL 0/1] qemu-macppc queue 20201112

[Mark Cave-Ayland]

The following changes since commit a4c141dca466ed3e9451f147efe6304b1b659ff5:

  Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/tracing-pull-request' into staging (2020-11-11 19:53:15 +0000)

are available in the Git repository at:

  git://github.com/mcayland/qemu.git tags/qemu-macppc-20201112

for you to fetch changes up to 6bfa035ec31f4f5a14499f17e08f62e8f14760cc:

  macio: set user_creatable to false in macio_class_init() (2020-11-12 09:26:20 +0000)

----------------------------------------------------------------
qemu-macppc fix for 5.2

----------------------------------------------------------------
Mark Cave-Ayland (1):
      macio: set user_creatable to false in macio_class_init()

 hw/misc/macio/macio.c | 2 ++
 1 file changed, 2 insertions(+)

[PULL 1/1] macio: set user_creatable to false in macio_class_init()

[Mark Cave-Ayland]

Commit 348b8d1a76 "macio: don't reference serial_hd() directly within the device"
removed the setting of user_creatable to false on the basis that the restriction
was due to the use of serial_hd() in macio_instance_init().

Unfortunately this isn't the full story since the PIC object property links
must still be set before the device is realized. Whilst it is possible to update
the macio device and Mac machines to resolve this, the fix is too invasive at
this point in the release cycle.

For now simply set user_creatable back to false in macio_class_init() to
prevent QEMU from segfaulting in anticipation of the proper fix arriving in
QEMU 6.0.

Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20201110103111.18395-1-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/misc/macio/macio.c | 2 ++
 1 file changed, 2 insertions(+)

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 = {
-- 
2.20.1

Re: [PULL 0/1] qemu-macppc queue 20201112

[Peter Maydell]

On Thu, 12 Nov 2020 at 09:56, Mark Cave-Ayland
<mark.cave-ayland@ilande.co.uk> wrote:
>
> The following changes since commit a4c141dca466ed3e9451f147efe6304b1b659ff5:
>
>   Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/tracing-pull-request' into staging (2020-11-11 19:53:15 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/mcayland/qemu.git tags/qemu-macppc-20201112
>
> for you to fetch changes up to 6bfa035ec31f4f5a14499f17e08f62e8f14760cc:
>
>   macio: set user_creatable to false in macio_class_init() (2020-11-12 09:26:20 +0000)
>
> ----------------------------------------------------------------
> qemu-macppc fix for 5.2
>
> ----------------------------------------------------------------


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.2
for any user-visible changes.

-- PMM