From: Carlo Marcelo Arenas Belon <[EMAIL PROTECTED]>
remove dependency to the pci linux headers added since
c10bf6159ff24501852c91a342c3077d5388b184 and that was generating the
following conflict :
qemu/hw/cirrus_vga.c:193:1: warning: "PCI_COMMAND_SERR" redefined
In file included from /usr/include/linux/pci.h:21,
from qemu/hw/pci.h:6,
from qemu/hw/cirrus_vga.c:31:
/usr/include/linux/pci_regs.h:40:1: warning: this is the location of the
previous definition
Signed-off-by: Carlo Marcelo Arenas Belon <[EMAIL PROTECTED]>
Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>
diff --git a/qemu/hw/pci.h b/qemu/hw/pci.h
index 036e914..60e4094 100644
--- a/qemu/hw/pci.h
+++ b/qemu/hw/pci.h
@@ -3,10 +3,12 @@
/* PCI includes legacy ISA access. */
#include "isa.h"
-#include <linux/pci.h>
-/* PCI bus */
+/* imported from <linux/pci.h> */
+#define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f)
+#define PCI_FUNC(devfn) ((devfn) & 0x07)
+/* PCI bus */
extern target_phys_addr_t pci_mem_base;
typedef void PCIConfigWriteFunc(PCIDevice *pci_dev,
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
kvm-commits mailing list
kvm-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-commits
