From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carlo Marcelo Arenas Belon Subject: [PATCH] qemu: remove conflicting dependency to Date: Fri, 28 Mar 2008 04:09:06 -0500 Message-ID: <20080328090906.GC20149@tapir> References: <20080327232723.GB15662@tapir> <20080327234049.GF15662@tapir> <47EC981D.7040104@qumranet.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm-devel To: Avi Kivity Return-path: Content-Disposition: inline In-Reply-To: <47EC981D.7040104@qumranet.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces@lists.sourceforge.net Errors-To: kvm-devel-bounces@lists.sourceforge.net List-Id: kvm.vger.kernel.org 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 --- qemu/hw/pci.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) 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 -/* PCI bus */ +/* imported from */ +#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, -- 1.5.3.7 ------------------------------------------------------------------------- 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