From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V5Mis-0000M0-OA for qemu-devel@nongnu.org; Fri, 02 Aug 2013 17:17:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V5Mim-0007i0-LQ for qemu-devel@nongnu.org; Fri, 02 Aug 2013 17:17:18 -0400 Received: from cantor2.suse.de ([195.135.220.15]:33281 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V5Mim-0007hl-A1 for qemu-devel@nongnu.org; Fri, 02 Aug 2013 17:17:12 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 2 Aug 2013 23:17:01 +0200 Message-Id: <1375478221-22722-7-git-send-email-afaerber@suse.de> In-Reply-To: <1375478221-22722-1-git-send-email-afaerber@suse.de> References: <1375478221-22722-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-next for-next 6/6] 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 , =?UTF-8?q?Andreas=20F=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/. 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 (98%) rename hw/{char =3D> ipack}/tpci200.c (99%) rename {hw/char =3D> include/hw/ipack}/ipack.h (100%) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 0243d6a..d2c8469 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -12,6 +12,7 @@ devices-dirs-$(CONFIG_SOFTMMU) +=3D i2c/ devices-dirs-$(CONFIG_SOFTMMU) +=3D ide/ devices-dirs-$(CONFIG_SOFTMMU) +=3D input/ devices-dirs-$(CONFIG_SOFTMMU) +=3D intc/ +devices-dirs-$(CONFIG_IPACK) +=3D ipack/ devices-dirs-$(CONFIG_SOFTMMU) +=3D isa/ devices-dirs-$(CONFIG_SOFTMMU) +=3D misc/ devices-dirs-$(CONFIG_SOFTMMU) +=3D net/ diff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs index f8f3dbc..494f45e 100644 --- a/hw/char/Makefile.objs +++ b/hw/char/Makefile.objs @@ -1,4 +1,4 @@ -common-obj-$(CONFIG_IPACK) +=3D tpci200.o ipoctal232.o ipack.o +common-obj-$(CONFIG_IPACK) +=3D ipoctal232.o common-obj-$(CONFIG_ESCC) +=3D escc.o common-obj-$(CONFIG_PARALLEL) +=3D parallel.o common-obj-$(CONFIG_PL011) +=3D pl011.o diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c index 4af9678..1ff3624 100644 --- a/hw/char/ipoctal232.c +++ b/hw/char/ipoctal232.c @@ -8,7 +8,7 @@ * later version. */ =20 -#include "ipack.h" +#include "hw/ipack/ipack.h" #include "qemu/bitops.h" #include "sysemu/char.h" =20 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) +=3D ipack.o +common-obj-$(CONFIG_IPACK) +=3D tpci200.o diff --git a/hw/char/ipack.c b/hw/ipack/ipack.c similarity index 98% rename from hw/char/ipack.c rename to hw/ipack/ipack.c index 0758fdd..66175fa 100644 --- a/hw/char/ipack.c +++ b/hw/ipack/ipack.c @@ -8,7 +8,7 @@ * later version. */ =20 -#include "ipack.h" +#include "hw/ipack/ipack.h" =20 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 d9e17b2..b521721 100644 --- a/hw/char/tpci200.c +++ b/hw/ipack/tpci200.c @@ -8,7 +8,7 @@ * later version. */ =20 -#include "ipack.h" +#include "hw/ipack/ipack.h" #include "hw/pci/pci.h" #include "qemu/bitops.h" #include 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 --=20 1.8.1.4