include: move hw/stream.h to hw/core/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index e241690bdcee9549a80dde653e6c74e7f244d135..44d84aa243ae7146da114258965c2a203d819949 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3600,7 +3600,7 @@ Streams
 M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
 S: Maintained
 F: hw/core/stream.c
-F: include/hw/stream.h
+F: include/hw/core/stream.h
 
 Stubs
 M: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/hw/core/stream.c b/hw/core/stream.c
index 19477d0f2dfafbe494536d8a0bb7e33c8eaeaed5..bfcac9388024147231d8821bc2ff9eb2d124f380 100644 (file)
--- a/hw/core/stream.c
+++ b/hw/core/stream.c
@@ -1,5 +1,5 @@
 #include "qemu/osdep.h"
-#include "hw/stream.h"
+#include "hw/core/stream.h"
 #include "qemu/module.h"
 
 size_t

diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
index 7cdd76330f31073988181b07eb6f31187ee26901..90ba7bf0573236e75687c22740b20fc5c304f4bf 100644 (file)
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -34,7 +34,7 @@
 #include "qemu/module.h"
 
 #include "system/dma.h"
-#include "hw/stream.h"
+#include "hw/core/stream.h"
 #include "qom/object.h"
 #include "trace.h"
 

diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c
index ffe258cf31aad152cd9724a32a40423b372dbfe5..b390d0926997d66154a306c812e54af0830f33a8 100644 (file)
--- a/hw/dma/xlnx_csu_dma.c
+++ b/hw/dma/xlnx_csu_dma.c
@@ -27,7 +27,7 @@
 #include "migration/vmstate.h"
 #include "system/dma.h"
 #include "hw/core/ptimer.h"
-#include "hw/stream.h"
+#include "hw/core/stream.h"
 #include "hw/core/register.h"
 #include "hw/dma/xlnx_csu_dma.h"
 

diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index 9c2b0ff0b3760c95a9a391d528a4f8f3f3589b4d..51ee237d5841c758cb0905f0225089a1f68d4562 100644 (file)
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -41,7 +41,7 @@
 
 #include "boot.h"
 
-#include "hw/stream.h"
+#include "hw/core/stream.h"
 
 #define LMB_BRAM_SIZE  (128 * KiB)
 #define FLASH_SIZE     (32 * MiB)

diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index 36047a51c00ac0633dfab62a25f16e1babcd510e..451f8da2122d19b3aad50ca64f2efb8a8de0d3e3 100644 (file)
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -33,7 +33,7 @@
 
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/stream.h"
+#include "hw/core/stream.h"
 #include "qom/object.h"
 
 #define DPHY(x)

diff --git a/include/hw/stream.h b/include/hw/core/stream.h
similarity index 100%
rename from include/hw/stream.h
rename to include/hw/core/stream.h

diff --git a/include/hw/dma/xlnx_csu_dma.h b/include/hw/dma/xlnx_csu_dma.h
index 63af4586dd9fda6c1d890d44db2b853868e6ca82..4d6d18fb9b5ba6b4171f45ead6f78fb8082a34db 100644 (file)
--- a/include/hw/dma/xlnx_csu_dma.h
+++ b/include/hw/dma/xlnx_csu_dma.h
@@ -24,7 +24,7 @@
 #include "hw/sysbus.h"
 #include "hw/core/register.h"
 #include "hw/core/ptimer.h"
-#include "hw/stream.h"
+#include "hw/core/stream.h"
 
 #define TYPE_XLNX_CSU_DMA "xlnx.csu_dma"
 

diff --git a/include/hw/ssi/xilinx_spips.h b/include/hw/ssi/xilinx_spips.h
index 7a754bf67a25eeb2c1d68b6b5a830966d9c6a140..56cf69a37d2a9fdee11ca4e786bdc1cad7221144 100644 (file)
--- a/include/hw/ssi/xilinx_spips.h
+++ b/include/hw/ssi/xilinx_spips.h
@@ -27,7 +27,7 @@
 
 #include "hw/ssi/ssi.h"
 #include "qemu/fifo32.h"
-#include "hw/stream.h"
+#include "hw/core/stream.h"
 #include "hw/sysbus.h"
 #include "qom/object.h"