pci: fix path for local includes

Include dependencies from pci core using the correct path.
This is required now that it's in the separate directory.
Need to check whether they can be minimized, for now,
keep the code as is.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2012-12-12 23:05:42 +02:00
parent a2cb15b0dd
commit c759b24fae
22 changed files with 62 additions and 62 deletions

View File

@ -18,7 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "msi.h"
#include "hw/pci/msi.h"
#include "range.h"
/* Eventually those constants should go to Linux pci_regs.h */

View File

@ -22,7 +22,7 @@
#define QEMU_MSI_H
#include "qemu-common.h"
#include "pci.h"
#include "hw/pci/pci.h"
struct MSIMessage {
uint64_t address;

View File

@ -14,10 +14,10 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
#include "msi.h"
#include "msix.h"
#include "pci.h"
#include "hw/hw.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
#include "hw/pci/pci.h"
#include "range.h"
#define MSIX_CAP_LENGTH 12

View File

@ -2,7 +2,7 @@
#define QEMU_MSIX_H
#include "qemu-common.h"
#include "pci.h"
#include "hw/pci/pci.h"
void msix_set_message(PCIDevice *dev, int vector, MSIMessage msg);
int msix_init(PCIDevice *dev, unsigned short nentries,

View File

@ -22,14 +22,14 @@
* THE SOFTWARE.
*/
#include "hw.h"
#include "boards.h"
#include "pci.h"
#include "hw/hw.h"
#include "hw/boards.h"
#include "hw/pci/pci.h"
#include "net.h"
#include "pc.h"
#include "hw/pc.h"
#include "monitor.h"
#include "scsi.h"
#include "virtio-blk.h"
#include "hw/scsi.h"
#include "hw/virtio-blk.h"
#include "qemu-config.h"
#include "blockdev.h"
#include "error.h"

View File

@ -20,7 +20,7 @@
#include "sysemu.h"
#include "monitor.h"
#include "pci.h"
#include "hw/pci/pci.h"
#include "qmp-commands.h"
PciInfoList *qmp_query_pci(Error **errp)

View File

@ -21,18 +21,18 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "hw.h"
#include "pci.h"
#include "pci_bridge.h"
#include "pci_internals.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pci_internals.h"
#include "monitor.h"
#include "net.h"
#include "sysemu.h"
#include "loader.h"
#include "hw/loader.h"
#include "range.h"
#include "qmp-commands.h"
#include "msi.h"
#include "msix.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
#include "exec-memory.h"
//#define DEBUG_PCI

View File

@ -3,14 +3,14 @@
#include "qemu-common.h"
#include "qdev.h"
#include "hw/qdev.h"
#include "memory.h"
#include "dma.h"
/* PCI includes legacy ISA access. */
#include "isa.h"
#include "hw/isa.h"
#include "pcie.h"
#include "hw/pci/pcie.h"
/* PCI bus */
@ -21,7 +21,7 @@
#define PCI_FUNC_MAX 8
/* Class, Vendor and Device IDs from Linux's pci_ids.h */
#include "pci_ids.h"
#include "hw/pci/pci_ids.h"
/* QEMU-specific Vendor and Device ID definitions */
@ -100,7 +100,7 @@ typedef struct PCIIORegion {
#define PCI_ROM_SLOT 6
#define PCI_NUM_REGIONS 7
#include "pci_regs.h"
#include "hw/pci/pci_regs.h"
/* PCI HEADER_TYPE */
#define PCI_HEADER_TYPE_MULTI_FUNCTION 0x80

View File

@ -29,8 +29,8 @@
* VA Linux Systems Japan K.K.
*/
#include "pci_bridge.h"
#include "pci_internals.h"
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pci_internals.h"
#include "range.h"
/* PCI bridge subsystem vendor ID helper functions */

View File

@ -26,7 +26,7 @@
#ifndef QEMU_PCI_BRIDGE_H
#define QEMU_PCI_BRIDGE_H
#include "pci.h"
#include "hw/pci/pci.h"
int pci_bridge_ssvid_init(PCIDevice *dev, uint8_t offset,
uint16_t svid, uint16_t ssid);

View File

@ -18,8 +18,8 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "pci.h"
#include "pci_host.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
/* debug PCI */
//#define DEBUG_PCI

View File

@ -28,7 +28,7 @@
#ifndef PCI_HOST_H
#define PCI_HOST_H
#include "sysbus.h"
#include "hw/sysbus.h"
#define TYPE_PCI_HOST_BRIDGE "pci-host-bridge"
#define PCI_HOST_BRIDGE(obj) \

View File

@ -19,12 +19,12 @@
*/
#include "qemu-common.h"
#include "pci_bridge.h"
#include "pcie.h"
#include "msix.h"
#include "msi.h"
#include "pci_internals.h"
#include "pcie_regs.h"
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pcie.h"
#include "hw/pci/msix.h"
#include "hw/pci/msi.h"
#include "hw/pci/pci_internals.h"
#include "hw/pci/pcie_regs.h"
#include "range.h"
//#define DEBUG_PCIE

View File

@ -21,10 +21,10 @@
#ifndef QEMU_PCIE_H
#define QEMU_PCIE_H
#include "hw.h"
#include "pci_regs.h"
#include "pcie_regs.h"
#include "pcie_aer.h"
#include "hw/hw.h"
#include "hw/pci/pci_regs.h"
#include "hw/pci/pcie_regs.h"
#include "hw/pci/pcie_aer.h"
typedef enum {
/* for attention and power indicator */

View File

@ -21,12 +21,12 @@
#include "sysemu.h"
#include "qemu-objects.h"
#include "monitor.h"
#include "pci_bridge.h"
#include "pcie.h"
#include "msix.h"
#include "msi.h"
#include "pci_internals.h"
#include "pcie_regs.h"
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pcie.h"
#include "hw/pci/msix.h"
#include "hw/pci/msi.h"
#include "hw/pci/pci_internals.h"
#include "hw/pci/pcie_regs.h"
//#define DEBUG_PCIE
#ifdef DEBUG_PCIE

View File

@ -21,7 +21,7 @@
#ifndef QEMU_PCIE_AER_H
#define QEMU_PCIE_AER_H
#include "hw.h"
#include "hw/hw.h"
/* definitions which PCIExpressDevice uses */

View File

@ -19,9 +19,9 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw.h"
#include "pci.h"
#include "pcie_host.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pci/pcie_host.h"
#include "exec-memory.h"
/*

View File

@ -21,7 +21,7 @@
#ifndef PCIE_HOST_H
#define PCIE_HOST_H
#include "pci_host.h"
#include "hw/pci/pci_host.h"
#include "memory.h"
#define TYPE_PCIE_HOST_BRIDGE "pcie-host-bridge"

View File

@ -18,7 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "pcie_port.h"
#include "hw/pci/pcie_port.h"
void pcie_port_init_reg(PCIDevice *d)
{

View File

@ -21,8 +21,8 @@
#ifndef QEMU_PCIE_PORT_H
#define QEMU_PCIE_PORT_H
#include "pci_bridge.h"
#include "pci_internals.h"
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pci_internals.h"
struct PCIEPort {
PCIBridge br;

View File

@ -2,10 +2,10 @@
#include <stdint.h>
#include "range.h"
#include "range.h"
#include "shpc.h"
#include "pci.h"
#include "pci_internals.h"
#include "msi.h"
#include "hw/pci/shpc.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_internals.h"
#include "hw/pci/msi.h"
/* TODO: model power only and disabled slot states. */
/* TODO: handle SERR and wakeups */

View File

@ -1,5 +1,5 @@
#include "slotid_cap.h"
#include "pci.h"
#include "hw/pci/slotid_cap.h"
#include "hw/pci/pci.h"
#define SLOTID_CAP_LENGTH 4
#define SLOTID_NSLOTS_SHIFT (ffs(PCI_SID_ESR_NSLOTS) - 1)