[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/16] hw/arm/sysbus-fdt: Only call match_fn callback
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 04/16] hw/arm/sysbus-fdt: Only call match_fn callback if the type matches |
Date: |
Mon, 12 Nov 2018 17:08:04 +0000 |
From: Eric Auger <address@hidden>
Commit af7d64ede0b9 (hw/arm/sysbus-fdt: Allow device matching with DT
compatible value) introduced a match_fn callback which gets called
for each registered combo to check whether a sysbus device can be
dynamically instantiated. However the callback gets called even if
the device type does not match the binding combo typename field.
This causes an assert when passing "-device ramfb" to the qemu
command line as vfio_platform_match() gets called on a non
vfio-platform device.
To fix this regression, let's change the add_fdt_node() logic so
that we first check the type and if the match_fn callback is defined,
then we also call it.
Binding combos only requesting a type check do not define the
match_fn callback.
Fixes: af7d64ede0b9 (hw/arm/sysbus-fdt: Allow device matching with
DT compatible value)
Signed-off-by: Eric Auger <address@hidden>
Reported-by: Thomas Huth <address@hidden>
Reviewed-by: Alex Williamson <address@hidden>
Tested-by: Geert Uytterhoeven <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
hw/arm/sysbus-fdt.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c
index 0e24c803a1c..ad698d4832c 100644
--- a/hw/arm/sysbus-fdt.c
+++ b/hw/arm/sysbus-fdt.c
@@ -449,7 +449,7 @@ static bool type_match(SysBusDevice *sbdev, const
BindingEntry *entry)
return !strcmp(object_get_typename(OBJECT(sbdev)), entry->typename);
}
-#define TYPE_BINDING(type, add_fn) {(type), NULL, (add_fn), type_match}
+#define TYPE_BINDING(type, add_fn) {(type), NULL, (add_fn), NULL}
/* list of supported dynamic sysbus bindings */
static const BindingEntry bindings[] = {
@@ -481,10 +481,12 @@ static void add_fdt_node(SysBusDevice *sbdev, void
*opaque)
for (i = 0; i < ARRAY_SIZE(bindings); i++) {
const BindingEntry *iter = &bindings[i];
- if (iter->match_fn(sbdev, iter)) {
- ret = iter->add_fn(sbdev, opaque);
- assert(!ret);
- return;
+ if (type_match(sbdev, iter)) {
+ if (!iter->match_fn || iter->match_fn(sbdev, iter)) {
+ ret = iter->add_fn(sbdev, opaque);
+ assert(!ret);
+ return;
+ }
}
}
error_report("Device %s can not be dynamically instantiated",
--
2.19.1
- [Qemu-devel] [PULL 15/16] target/arm: Hyp mode R14 is shared with User and System, (continued)
- [Qemu-devel] [PULL 15/16] target/arm: Hyp mode R14 is shared with User and System, Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 12/16] Revert "target/arm: Implement HCR.VI and VF", Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 10/16] arm: use symbolic MDCR_TDE in arm_debug_target_el, Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 13/16] target/arm: Track the state of our irq lines from the GIC explicitly, Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 11/16] arm: fix aa64_generate_debug_exceptions to work with EL2, Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 09/16] tests/guest-debug: fix scoping of failcount, Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 07/16] target/arm64: hold BQL when calling do_interrupt(), Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 08/16] target/arm64: kvm debug set target_el when passing exception to guest, Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 06/16] target/arm64: properly handle DBGVR RESS bits, Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 05/16] target/arm: Fix typo in tlbi_aa64_vmalle1_write, Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 04/16] hw/arm/sysbus-fdt: Only call match_fn callback if the type matches,
Peter Maydell <=
- [Qemu-devel] [PULL 03/16] MAINTAINERS: Add an entry for the 'collie' machine, Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 02/16] target/arm: Remove antique TODO comment, Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 01/16] target/arm: Remove workaround for small SAU regions, Peter Maydell, 2018/11/12
- [Qemu-devel] [PULL 00/16] target-arm queue, Peter Maydell, 2018/11/13