From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40886) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEP8z-0006Hw-G8 for qemu-devel@nongnu.org; Fri, 14 Feb 2014 15:13:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WEP8u-0002Wt-9T for qemu-devel@nongnu.org; Fri, 14 Feb 2014 15:13:53 -0500 Received: from cantor2.suse.de ([195.135.220.15]:52018 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEP8u-0002Wn-2X for qemu-devel@nongnu.org; Fri, 14 Feb 2014 15:13:48 -0500 Message-ID: <52FE78F8.6040400@suse.de> Date: Fri, 14 Feb 2014 21:13:44 +0100 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1392057426-31990-1-git-send-email-afaerber@suse.de> <1392057426-31990-34-git-send-email-afaerber@suse.de> In-Reply-To: <1392057426-31990-34-git-send-email-afaerber@suse.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PULL 33/48] ipack: Move IndustryPack out of hw/char/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alberto Garcia Am 10.02.2014 19:36, schrieb Andreas F=C3=A4rber: > 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/. >=20 > Acked-by: Alberto Garcia > Signed-off-by: Andreas F=C3=A4rber > --- > hw/Makefile.objs | 1 + > hw/char/Makefile.objs | 2 +- > hw/char/ipoctal232.c | 2 +- > hw/ipack/Makefile.objs | 2 ++ > hw/{char =3D> ipack}/ipack.c | 2 +- > hw/{char =3D> ipack}/tpci200.c | 2 +- > {hw/char =3D> include/hw/ipack}/ipack.h | 0 > 7 files changed, 7 insertions(+), 4 deletions(-) > create mode 100644 hw/ipack/Makefile.objs > rename hw/{char =3D> ipack}/ipack.c (99%) > rename hw/{char =3D> ipack}/tpci200.c (99%) > rename {hw/char =3D> 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) +=3D tests/qemu-iotests-qui= ck.sh # All QTests for now are POSIX-only, but the dependencies are # really in libqtest, not in the testcases themselves. -gcov-files-ipack-y +=3D hw/char/ipack.c +gcov-files-ipack-y +=3D hw/ipack/ipack.c check-qtest-ipack-y +=3D tests/ipoctal232-test$(EXESUF) gcov-files-ipack-y +=3D hw/char/ipoctal232.c @@ -89,7 +89,7 @@ gcov-files-pci-y +=3D $(gcov-files-virtio-y) hw/virtio/virtio-pci.c check-qtest-pci-y +=3D tests/tpci200-test$(EXESUF) gcov-files-pci-y +=3D hw/char/tpci200.c check-qtest-pci-y +=3D $(check-qtest-ipack-y) -gcov-files-pci-y +=3D $(gcov-files-ipack-y) hw/char/tpci200.c +gcov-files-pci-y +=3D $(gcov-files-ipack-y) hw/ipack/tpci200.c check-qtest-i386-y =3D tests/endianness-test$(EXESUF) check-qtest-i386-y +=3D tests/fdc-test$(EXESUF) Fixing for v2. Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC= rnberg