diff options
| author | Markus Armbruster <armbru@redhat.com> | 2019-08-12 07:23:34 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2019-08-16 13:31:51 +0200 |
| commit | 1b53ecd909bc59bb5f54892a5cbb8721a3467ede (patch) | |
| tree | bc32554bf52aa9261f4246bee31d5ba130f70ccd /hw/net | |
| parent | abb3d37d0c3c1be630d535d488fc5193ff2f5264 (diff) | |
| download | qemu-1b53ecd909bc59bb5f54892a5cbb8721a3467ede.zip qemu-1b53ecd909bc59bb5f54892a5cbb8721a3467ede.tar.gz qemu-1b53ecd909bc59bb5f54892a5cbb8721a3467ede.tar.bz2 | |
memory: Fix type of IOMMUMemoryRegionClass member @parent_class
TYPE_IOMMU_MEMORY_REGION is a direct subtype of TYPE_MEMORY_REGION.
Its instance struct is IOMMUMemoryRegion, and its first member is a
MemoryRegion. Correct. Its class struct is IOMMUMemoryRegionClass,
and its first member is a DeviceClass. Wrong. Messed up when commit
1221a474676 introduced the QOM type. It even included hw/qdev-core.h
just for that.
TYPE_MEMORY_REGION doesn't bother to define a class struct. This is
fine, it simply defaults to its super-type TYPE_OBJECT's class struct
ObjectClass. Changing IOMMUMemoryRegionClass's first member's type to
ObjectClass would be a minimal fix, if a bit brittle: if
TYPE_MEMORY_REGION ever acquired own class struct, we'd have to update
IOMMUMemoryRegionClass to use it.
Fix it the clean and robust way instead: give TYPE_MEMORY_REGION its
own class struct MemoryRegionClass now, and use it for
IOMMUMemoryRegionClass's first member.
Revert the include of hw/qdev-core.h, and fix the few files that have
come to rely on it.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20190812052359.30071-5-armbru@redhat.com>
Diffstat (limited to 'hw/net')
| -rw-r--r-- | hw/net/pcnet.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/net/pcnet.h b/hw/net/pcnet.h index 40831a7..28d19a5 100644 --- a/hw/net/pcnet.h +++ b/hw/net/pcnet.h @@ -8,6 +8,7 @@ #define PCNET_LOOPTEST_NOCRC 2 #include "exec/memory.h" +#include "hw/irq.h" /* BUS CONFIGURATION REGISTERS */ #define BCR_MSRDA 0 |