diff options
author | Markus Armbruster <armbru@redhat.com> | 2016-03-09 13:44:19 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-03-22 22:20:16 +0100 |
commit | a7c4d9c7ca5178d32236fa5b31fa7fed4e4a7a9c (patch) | |
tree | f900455530666957f1512eb29982486f8a849eaf /include/qemu-common.h | |
parent | 0137fdc0941cfe214e91c5c1444f3fcf6a5548b8 (diff) | |
download | qemu-a7c4d9c7ca5178d32236fa5b31fa7fed4e4a7a9c.tar.gz qemu-a7c4d9c7ca5178d32236fa5b31fa7fed4e4a7a9c.tar.bz2 qemu-a7c4d9c7ca5178d32236fa5b31fa7fed4e4a7a9c.zip |
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 <armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include/qemu-common.h')
-rw-r--r-- | include/qemu-common.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/qemu-common.h b/include/qemu-common.h index ba37968503..5a2d9972bd 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -310,15 +310,6 @@ struct ParallelIOArg { typedef int (*DMA_transfer_handler) (void *opaque, int nchan, int pos, int size); -typedef uint64_t pcibus_t; - -typedef struct PCIHostDeviceAddress { - unsigned int domain; - unsigned int bus; - unsigned int slot; - unsigned int function; -} PCIHostDeviceAddress; - void tcg_exec_init(unsigned long tb_size); bool tcg_enabled(void); |