Skip to contentSkip to conversation

hw/misc/macio: Add the nvram as child of the MacIO south bridge

PATCH In review Philippe Mathieu-Daudé 3 participants 3 messages Jul 1, 2019 – Jul 2, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/misc/macio: Add the nvram as child of the MacIO south bridge

Avoid another QOM orphean, link it back to its parent.

---
 hw/misc/macio/macio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
hw/misc/macio/macio.c +2 -1
index 82492096f8..e02882be28 100644
@@ -243,7 +243,8 @@ static void macio_oldworld_init(Object *obj)
 
     macio_init_child_obj(s, "cuda", &s->cuda, sizeof(s->cuda), TYPE_CUDA);
 
-    object_initialize(&os->nvram, sizeof(os->nvram), TYPE_MACIO_NVRAM);
+    object_initialize_child(s, "nvram",  &os->nvram, sizeof(os->nvram),
+                            TYPE_MACIO_NVRAM, &error_abort, NULL);
     dev = DEVICE(&os->nvram);
     qdev_prop_set_uint32(dev, "size", 0x2000);
     qdev_prop_set_uint32(dev, "it_shift", 4);
Signature · 1 line
2.20.1
#1 lore raw
Patchew URL: https://patchew.org/QEMU/[email protected]/

Patchew URL: https://patchew.org/QEMU/[email protected]/

Hi,

This series failed build test on s390x host. Please find the details below.

=== TEST SCRIPT BEGIN ===
#!/bin/bash
# Testing script will be invoked under the git checkout with # HEAD pointing to a commit that has the patches applied on top of "base"

# branch
set -e

echo
echo "=== ENV ==="
env

echo
echo "=== PACKAGES ==="
rpm -qa

echo
echo "=== UNAME ==="
uname -a

CC=$HOME/bin/cc
INSTALL=$PWD/install
BUILD=$PWD/build
mkdir -p $BUILD $INSTALL
SRC=$PWD
cd $BUILD
$SRC/configure --cc=$CC --prefix=$INSTALL
make -j4
# XXX: we need reliable clean up

# make check -j4 V=1
make install
=== TEST SCRIPT END ===

CC hw/misc/macio/pmu.o
CC hw/misc/macio/mac_dbdma.o
/var/tmp/patchew-tester-tmp-58xxnaif/src/hw/misc/macio/macio.c: In function ‘macio_oldworld_init’:
/var/tmp/patchew-tester-tmp-58xxnaif/src/hw/misc/macio/macio.c:246:29: error: passing argument 1 of ‘object_initialize_child’ from incompatible pointer type [-Werror=incompatible-pointer-types]

  246 |     object_initialize_child(s, "nvram",  &os->nvram, sizeof(os->nvram),
      |                             ^
      |                             |

The full log is available at
http://patchew.org/logs/[email protected]/testing.s390x/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]

#2 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 12 lines · Philippe Mathieu-Daudé

Avoid another QOM orphean, link it back to its parent.

---
 hw/misc/macio/macio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
hw/misc/macio/macio.c +0 -0
index 82492096f8..e02882be28 100644

hw/misc/macio/macio.c static void macio_oldworld_init(Object *obj) · line 250

Quoted 9 lines
hw/misc/macio/macio.c +2 -1
@@ -243,7 +243,8 @@ static void macio_oldworld_init(Object *obj)
 
     macio_init_child_obj(s, "cuda", &s->cuda, sizeof(s->cuda), TYPE_CUDA);
 
-    object_initialize(&os->nvram, sizeof(os->nvram), TYPE_MACIO_NVRAM);
+    object_initialize_child(s, "nvram",  &os->nvram, sizeof(os->nvram),
+                            TYPE_MACIO_NVRAM, &error_abort, NULL);
     dev = DEVICE(&os->nvram);
     qdev_prop_set_uint32(dev, "size", 0x2000);
     qdev_prop_set_uint32(dev, "it_shift", 4);

Hmmm actually I think this should be using macio_init_child_obj() which does the same as you have done above, plus it sets the qbus correctly too. And also a minor nit on the subject line: you should mention that this just for Old World Macs, since for New World Macs the NVRAM is located elsewhere.

In fact it looks like there are also a few cases in macio_newworld_realize() where this function should be used too, if you fancy touching those up whilst you're in the area.

ATB,

Mark.