 b243c73cf4
			
		
	
	
		b243c73cf4
		
	
	
	
	
		
			
			The qtest/libqos directory is included via the "-I" option to search for header files when building qtest. Unfortunately the malloc.h has a name conflict with the standard libc header, leading to a build failure on the Windows host, due to the MinGW libc stdlib.h header file includes malloc.h and it now gets wrongly pointed to the one in the qtest/libqos directory. Rename "qtest/libqos/malloc.h" to "qtest/libqos/libqos-malloc.h" to avoid the namespace pollution. Signed-off-by: Xuzhou Cheng <xuzhou.cheng@windriver.com> Signed-off-by: Bin Meng <bin.meng@windriver.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-Id: <20220824094029.1634519-26-bmeng.cn@gmail.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
		
			
				
	
	
		
			42 lines
		
	
	
		
			935 B
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			42 lines
		
	
	
		
			935 B
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * libqos PCI bindings for SPAPR
 | |
|  *
 | |
|  * This work is licensed under the terms of the GNU GPL, version 2 or later.
 | |
|  * See the COPYING file in the top-level directory.
 | |
|  */
 | |
| 
 | |
| #ifndef LIBQOS_PCI_SPAPR_H
 | |
| #define LIBQOS_PCI_SPAPR_H
 | |
| 
 | |
| #include "libqos-malloc.h"
 | |
| #include "pci.h"
 | |
| #include "qgraph.h"
 | |
| 
 | |
| /* From include/hw/pci-host/spapr.h */
 | |
| 
 | |
| typedef struct QPCIWindow {
 | |
|     uint64_t pci_base;    /* window address in PCI space */
 | |
|     uint64_t size;        /* window size */
 | |
| } QPCIWindow;
 | |
| 
 | |
| typedef struct QPCIBusSPAPR {
 | |
|     QOSGraphObject obj;
 | |
|     QPCIBus bus;
 | |
|     QGuestAllocator *alloc;
 | |
| 
 | |
|     uint64_t buid;
 | |
| 
 | |
|     uint64_t pio_cpu_base;
 | |
|     QPCIWindow pio;
 | |
| 
 | |
|     uint64_t mmio32_cpu_base;
 | |
|     QPCIWindow mmio32;
 | |
| } QPCIBusSPAPR;
 | |
| 
 | |
| void qpci_init_spapr(QPCIBusSPAPR *ret, QTestState *qts,
 | |
|                      QGuestAllocator *alloc);
 | |
| QPCIBus *qpci_new_spapr(QTestState *qts, QGuestAllocator *alloc);
 | |
| void     qpci_free_spapr(QPCIBus *bus);
 | |
| 
 | |
| #endif
 |