Re: [Qemu-devel] [PULL 33/48] ipack: Move IndustryPack out of hw/char/

[Andreas Färber]

Am 10.02.2014 19:36, schrieb Andreas Färber:
> 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
>  7 files changed, 7 insertions(+), 4 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%)

Doh! If we're applying this file movement after all, we also need:

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)

Fixing for v2.

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg