[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 33/49] ipack: Move IndustryPack out of hw/char/
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL v2 33/49] ipack: Move IndustryPack out of hw/char/ |
Date: |
Mon, 17 Feb 2014 23:24:43 +0100 |
Move the header defining an IPackBus and IPackDevice base class into
a new include/ directory and move their implementation and a
PCI-IndustryPack bridge out of hw/char/ directory into a new hw/ipack/.
Acked-by: Alberto Garcia <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/Makefile.objs | 1 +
hw/char/Makefile.objs | 2 +-
hw/char/ipoctal232.c | 2 +-
hw/ipack/Makefile.objs | 2 ++
hw/{char => ipack}/ipack.c | 2 +-
hw/{char => ipack}/tpci200.c | 2 +-
{hw/char => include/hw/ipack}/ipack.h | 0
tests/Makefile | 4 ++--
8 files changed, 9 insertions(+), 6 deletions(-)
create mode 100644 hw/ipack/Makefile.objs
rename hw/{char => ipack}/ipack.c (99%)
rename hw/{char => ipack}/tpci200.c (99%)
rename {hw/char => include/hw/ipack}/ipack.h (100%)
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index d91b9cc..05a00dc 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -12,6 +12,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += i2c/
devices-dirs-$(CONFIG_SOFTMMU) += ide/
devices-dirs-$(CONFIG_SOFTMMU) += input/
devices-dirs-$(CONFIG_SOFTMMU) += intc/
+devices-dirs-$(CONFIG_IPACK) += ipack/
devices-dirs-$(CONFIG_SOFTMMU) += isa/
devices-dirs-$(CONFIG_SOFTMMU) += misc/
devices-dirs-$(CONFIG_SOFTMMU) += net/
diff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs
index be2a7d9..317385d 100644
--- a/hw/char/Makefile.objs
+++ b/hw/char/Makefile.objs
@@ -1,4 +1,4 @@
-common-obj-$(CONFIG_IPACK) += tpci200.o ipoctal232.o ipack.o
+common-obj-$(CONFIG_IPACK) += ipoctal232.o
common-obj-$(CONFIG_ESCC) += escc.o
common-obj-$(CONFIG_PARALLEL) += parallel.o
common-obj-$(CONFIG_PL011) += pl011.o
diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c
index 99bab4d..f9c388e 100644
--- a/hw/char/ipoctal232.c
+++ b/hw/char/ipoctal232.c
@@ -8,7 +8,7 @@
* later version.
*/
-#include "ipack.h"
+#include "hw/ipack/ipack.h"
#include "qemu/bitops.h"
#include "sysemu/char.h"
diff --git a/hw/ipack/Makefile.objs b/hw/ipack/Makefile.objs
new file mode 100644
index 0000000..8b9bdcb
--- /dev/null
+++ b/hw/ipack/Makefile.objs
@@ -0,0 +1,2 @@
+common-obj-$(CONFIG_IPACK) += ipack.o
+common-obj-$(CONFIG_IPACK) += tpci200.o
diff --git a/hw/char/ipack.c b/hw/ipack/ipack.c
similarity index 99%
rename from hw/char/ipack.c
rename to hw/ipack/ipack.c
index 15cef7b..ed63d2a 100644
--- a/hw/char/ipack.c
+++ b/hw/ipack/ipack.c
@@ -8,7 +8,7 @@
* later version.
*/
-#include "ipack.h"
+#include "hw/ipack/ipack.h"
IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot)
{
diff --git a/hw/char/tpci200.c b/hw/ipack/tpci200.c
similarity index 99%
rename from hw/char/tpci200.c
rename to hw/ipack/tpci200.c
index a49d2ed..e1b69b4 100644
--- a/hw/char/tpci200.c
+++ b/hw/ipack/tpci200.c
@@ -8,7 +8,7 @@
* later version.
*/
-#include "ipack.h"
+#include "hw/ipack/ipack.h"
#include "hw/pci/pci.h"
#include "qemu/bitops.h"
#include <stdio.h>
diff --git a/hw/char/ipack.h b/include/hw/ipack/ipack.h
similarity index 100%
rename from hw/char/ipack.h
rename to include/hw/ipack/ipack.h
diff --git a/tests/Makefile b/tests/Makefile
index 584fe4e..0ef8727 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -65,7 +65,7 @@ check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh
# All QTests for now are POSIX-only, but the dependencies are
# really in libqtest, not in the testcases themselves.
-gcov-files-ipack-y += hw/char/ipack.c
+gcov-files-ipack-y += hw/ipack/ipack.c
check-qtest-ipack-y += tests/ipoctal232-test$(EXESUF)
gcov-files-ipack-y += hw/char/ipoctal232.c
@@ -89,7 +89,7 @@ gcov-files-pci-y += $(gcov-files-virtio-y)
hw/virtio/virtio-pci.c
check-qtest-pci-y += tests/tpci200-test$(EXESUF)
gcov-files-pci-y += hw/char/tpci200.c
check-qtest-pci-y += $(check-qtest-ipack-y)
-gcov-files-pci-y += $(gcov-files-ipack-y) hw/char/tpci200.c
+gcov-files-pci-y += $(gcov-files-ipack-y) hw/ipack/tpci200.c
check-qtest-i386-y = tests/endianness-test$(EXESUF)
check-qtest-i386-y += tests/fdc-test$(EXESUF)
--
1.8.4.5
- [Qemu-devel] [PULL v2 24/49] tests: Add eepro100 qtest, (continued)
- [Qemu-devel] [PULL v2 24/49] tests: Add eepro100 qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 26/49] tests: Add virtio-net qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 28/49] tests: Add ipoctal232 qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 22/49] tests: Add rtl8139 qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 25/49] tests: Add ne2000 qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 23/49] tests: Add pcnet qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 27/49] tests: Add tpci200 qtest, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 29/49] ipack: Convert to QOM realize, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 31/49] ipack: QOM parent field cleanup for IPackDevice, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 30/49] ipack: QOM parent field cleanup for IPackBus, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 33/49] ipack: Move IndustryPack out of hw/char/,
Andreas Färber <=
- [Qemu-devel] [PULL v2 32/49] ipoctal232: QOM parent field cleanup, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 34/49] qtest: Don't segfault with invalid -qtest option, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 35/49] qapi: Add size parser to StringInputVisitor, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 36/49] qdev: Sizes are now parsed by StringInputVisitor, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 39/49] qdev: Legacy properties are just strings, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 37/49] qdev: Remove legacy parsers for hex8/32/64, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 40/49] qdev: Inline qdev_prop_parse(), Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 38/49] qdev: Legacy properties are now read-only, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 41/49] qapi: Add human mode to StringOutputVisitor, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 42/49] qdev: Use human mode in "info qtree", Andreas Färber, 2014/02/17