From patchwork Fri Feb 14 20:13:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 320519 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5BE7C2C0081 for ; Sat, 15 Feb 2014 07:14:17 +1100 (EST) Received: from localhost ([::1]:53706 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEP9J-0006Iu-Ng for incoming@patchwork.ozlabs.org; Fri, 14 Feb 2014 15:14:13 -0500 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 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 87B34AC5B; Fri, 14 Feb 2014 20:13:47 +0000 (UTC) Message-ID: <52FE78F8.6040400@suse.de> Date: Fri, 14 Feb 2014 21:13:44 +0100 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= Organization: SUSE LINUX Products GmbH User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: qemu-devel@nongnu.org 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> X-Enigmail-Version: 1.6 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.135.220.15 Cc: Alberto Garcia Subject: Re: [Qemu-devel] [PULL 33/48] ipack: Move IndustryPack out of hw/char/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 > Signed-off-by: Andreas Färber > --- > 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: check-qtest-i386-y += tests/fdc-test$(EXESUF) Fixing for v2. Andreas 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)