| Message ID | 20201107111307.262263-2-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [PATCH-for-5.2,1/5] hw/usb/hcd-xhci: Make xhci base model abstract | expand |
On Sat, Nov 07, 2020 at 12:13:03PM +0100, Philippe Mathieu-Daudé wrote: > The TYPE_XHCI model is abstract and can not be used as it. > It is meant to be overloaded by children classes. Restore > it as abstract type. Breaks "make check". MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} QTEST_QEMU_IMG=./qemu-img G_TEST_DBUS_DAEMON=/home/kraxel/projects/qemu/tests/dbus-vmstate-daemon.sh QTEST_QEMU_BINARY=./qemu-system-x86_64 tests/qtest/usb-hcd-xhci-test --tap -k ** ERROR:../../qom/object.c:506:object_initialize_with_type: assertion failed: (type->abstract == false) take care, Gerd
> static void test_xhci_hotplug(void) > { > - usb_test_hotplug(global_qtest, "xhci", "1", NULL); > + usb_test_hotplug(global_qtest, "nec-usb-xhci", "1", NULL); > } Better use qemu-xhci. I'm wondering how that worked before ... take care, Gerd
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 79ce5c4be6c..57b692ad849 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -3595,6 +3595,7 @@ static const TypeInfo xhci_info = { .parent = TYPE_DEVICE, .instance_size = sizeof(XHCIState), .class_init = xhci_class_init, + .abstract = true, }; static void xhci_register_types(void)
The TYPE_XHCI model is abstract and can not be used as it. It is meant to be overloaded by children classes. Restore it as abstract type. Fixes: 8ddab8dd3d8 ("usb/hcd-xhci: Split pci wrapper for xhci base model") Reported-by: Miroslav Rezanina <mrezanin@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/usb/hcd-xhci.c | 1 + 1 file changed, 1 insertion(+)