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>

diff --git a/hw/pci/msi.c b/hw/pci/msi.c
index 33037a80e90faa83924a6d3287f99a7f7776747b..680e4637d75d6e3a401f497f646e5db928789687 100644 (file)
--- a/hw/pci/msi.c
+++ b/hw/pci/msi.c
@@ -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 */

diff --git a/hw/pci/msi.h b/hw/pci/msi.h
index 150b09a19da5f96dd5db85757cd11e272f038c48..81a3848a3136adafc0f05cb592f04b21aba983a9 100644 (file)
--- a/hw/pci/msi.h
+++ b/hw/pci/msi.h
@@ -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;

diff --git a/hw/pci/msix.c b/hw/pci/msix.c
index 136ef093730b592775bea8c6a2f49b0d6d12347e..917327bfe66601076c8aebe0cc13bee52349d2da 100644 (file)
--- a/hw/pci/msix.c
+++ b/hw/pci/msix.c
@@ -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

diff --git a/hw/pci/msix.h b/hw/pci/msix.h
index 15211cb592740cf4ed8595631310632502428705..ff07ae2e8ff41068c74001202daf0fa3ab8b6c66 100644 (file)
--- a/hw/pci/msix.h
+++ b/hw/pci/msix.h
@@ -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,

diff --git a/hw/pci/pci-hotplug.c b/hw/pci/pci-hotplug.c
index 3bcfdcc1a64b32f75b73004cc53e2b85a9c5a991..4b4c931c74feeffd23452530955b8074782b3450 100644 (file)
--- a/hw/pci/pci-hotplug.c
+++ b/hw/pci/pci-hotplug.c
@@ -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"

diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c
index 134c4484b68fef8929cd8ecd7d635249ee7019c7..b5c43a935b2f4ca9e58c42a4454fda89b93180f2 100644 (file)
--- a/hw/pci/pci-stub.c
+++ b/hw/pci/pci-stub.c
@@ -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)

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 97a0cd77c14c9d65571d5e4aa817ffaa96924856..c107fe223227bd9afac8616fb0c89b4fde491264 100644 (file)
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -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

diff --git a/hw/pci/pci.h b/hw/pci/pci.h
index 4da0c2a4c9d743a8b78a9427c33a4116afd49ac6..41e5ddd1c48244c881c29d231d45ff5286841a43 100644 (file)
--- a/hw/pci/pci.h
+++ b/hw/pci/pci.h
@@ -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

diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c
index 4680501e4eab53bde922f28b79b0551cd6056c39..eb6b70bb645df112ada1a9280fb48796ff0f21c9 100644 (file)
--- a/hw/pci/pci_bridge.c
+++ b/hw/pci/pci_bridge.c
@@ -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 */

diff --git a/hw/pci/pci_bridge.h b/hw/pci/pci_bridge.h
index a00accc172f77801b4cbe5cdb6fd4852fab0cc03..455cb6677a79be6db33155adf2666b22968ebb6b 100644 (file)
--- a/hw/pci/pci_bridge.h
+++ b/hw/pci/pci_bridge.h
@@ -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);

diff --git a/hw/pci/pci_host.c b/hw/pci/pci_host.c
index 68e328cd23b4ff458d3a4383ff7a8dcd493da3a7..daca1c1ea0c31a3813fe46ba2e8fcc0c213ce16b 100644 (file)
--- a/hw/pci/pci_host.c
+++ b/hw/pci/pci_host.c
@@ -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

diff --git a/hw/pci/pci_host.h b/hw/pci/pci_host.h
index 4b9c300fcf93e6cb4657af589ce22060cb4571b2..1845d4dfd584a6a3ed6d8084c482e9bde633393e 100644 (file)
--- a/hw/pci/pci_host.h
+++ b/hw/pci/pci_host.h
@@ -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) \

diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
index 7c92f193e7d2cb9e152c01fdd22d04ab4a36d048..b98adbf87af9e81f254031baa97d28b2b5236222 100644 (file)
--- a/hw/pci/pcie.c
+++ b/hw/pci/pcie.c
@@ -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

diff --git a/hw/pci/pcie.h b/hw/pci/pcie.h
index 4889194ae6d84a837b71d867bc2a624c39f1e621..31604e2742310e6664dccb5d95c32e32f5e5068d 100644 (file)
--- a/hw/pci/pcie.h
+++ b/hw/pci/pcie.h
@@ -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 */

diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index b04c164e22bee1e8cfa902a7ba44fb38032caeb3..3026b66916dee2ae4b3eb06cbc3f4523f61799b1 100644 (file)
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@@ -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

diff --git a/hw/pci/pcie_aer.h b/hw/pci/pcie_aer.h
index 7539500cd8b92acdaa09d4099f80d4ca2f1fb767..bcac80a7b07f37d5dd2dae5ce72e6d56195dfa7f 100644 (file)
--- a/hw/pci/pcie_aer.h
+++ b/hw/pci/pcie_aer.h
@@ -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 */
 

diff --git a/hw/pci/pcie_host.c b/hw/pci/pcie_host.c
index c257fb43cacd52206f8e0e00e44f0988e05e6745..ab8d251de6f2ae1251cbf3eb849e153ce489ade3 100644 (file)
--- a/hw/pci/pcie_host.c
+++ b/hw/pci/pcie_host.c
@@ -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"
 
 /*

diff --git a/hw/pci/pcie_host.h b/hw/pci/pcie_host.h
index 392193530d4160518711b5b244d12415ab376073..150bef97360f8f4ce64c567f5e70fb7e1199ebc2 100644 (file)
--- a/hw/pci/pcie_host.h
+++ b/hw/pci/pcie_host.h
@@ -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"

diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c
index d6350e5e73f3deb48cecb187dbfcb0a9f3290cf5..33a6b0a08ac07ccd5e8b8eb3ddf7ebb66f80d0eb 100644 (file)
--- a/hw/pci/pcie_port.c
+++ b/hw/pci/pcie_port.c
@@ -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)
 {

diff --git a/hw/pci/pcie_port.h b/hw/pci/pcie_port.h
index 3709583cc0f0e18976ba01ad2ed8f8f09f97bf56..3259e6a9b92871083336247dec2631fdf8a0ec7e 100644 (file)
--- a/hw/pci/pcie_port.h
+++ b/hw/pci/pcie_port.h
@@ -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;

diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c
index 4597bbde75b2063e392a00e38d9c8c849045eedd..38693f759fc95d6be7fea1d9dd80e8e152d812bf 100644 (file)
--- a/hw/pci/shpc.c
+++ b/hw/pci/shpc.c
@@ -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 */

diff --git a/hw/pci/slotid_cap.c b/hw/pci/slotid_cap.c
index 01064521a948ec0a93ddddd994ce3987f2d7db2b..99a30f429da65a9c5652dce2c6951fdc145a2c2d 100644 (file)
--- a/hw/pci/slotid_cap.c
+++ b/hw/pci/slotid_cap.c
@@ -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)