From 5d77b17f99811f60c0a5f64d32dad76768d5cee8 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 9 Mar 2016 13:44:19 +0100 Subject: hw/pci/pci.h: Don't include qemu-common.h qemu-common.h should only be included by .c files. Its file comment explains why: "No header file should depend on qemu-common.h, as this would easily lead to circular header dependencies." hw/pci/pci.h includes qemu-common.h, but its users only need pcibus_t and PCIHostDeviceAddress from it. Move them to hw/pci/pci.h and drop the ill-advised include. Include hw/pci/pci.h where the moved stuff is now missing. Except we can't in target-i386/kvm_i386.h, because that would break the i386-linux-user compile. Add PCIHostDeviceAddress to qemu/typedefs.h instead. Signed-off-by: Markus Armbruster Signed-off-by: Paolo Bonzini --- hw/core/qdev-properties.c | 1 + 1 file changed, 1 insertion(+) (limited to 'hw/core/qdev-properties.c') diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 195012c..737d29c 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -2,6 +2,7 @@ #include "net/net.h" #include "hw/qdev.h" #include "qapi/error.h" +#include "hw/pci/pci.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "sysemu/block-backend.h" -- cgit v1.1