From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48436) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xz74N-0000Lo-Fu for qemu-devel@nongnu.org; Thu, 11 Dec 2014 11:58:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xz74I-0008B6-MJ for qemu-devel@nongnu.org; Thu, 11 Dec 2014 11:58:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52703) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xz74I-0008A5-DT for qemu-devel@nongnu.org; Thu, 11 Dec 2014 11:58:22 -0500 Date: Thu, 11 Dec 2014 16:58:09 +0000 From: "Dr. David Alan Gilbert" Message-ID: <20141211165809.GK2567@work-vm> References: <20141211072351.GI27208@grmbl.mre> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [PULL] Migration pull for 2.3 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Amit Shah , zhanghailiang , "Michael S. Tsirkin" , qemu list , Juan Quintela * Peter Maydell (peter.maydell@linaro.org) wrote: > On 11 December 2014 at 07:23, Amit Shah wrote: > > The following changes since commit 7fb8da2b8861795e0013e6ee97acd0363d868a35: > > > > Open 2.3 development tree (2014-12-09 21:48:34 +0000) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/virt/qemu/amit/migration.git tags/for-2.3-1 > > > > for you to fetch changes up to 26b6d4a4c837aeb3655090696d385d1d02f2d313: > > > > MAINTAINERS: Update for migrated migration code (2014-12-11 12:48:06 +0530) > > > > ---------------------------------------------------------------- > > Migration pull for 2.3. Mostly moving the code to the migration/ > > directory, and updating MAINTAINERS. > > > > I've also folded my other MAINTAINERS update patches into this, as > > they're small by themselves. > > Hi. I'm afraid "make check" fails to build on a linux-static config: > > CC tests/test-xbzrle.o > CC migration/xbzrle.o > cc1: error: migration: No such file or directory [-Werror] > cc1: all warnings being treated as errors > make: *** [migration/xbzrle.o] Error 1 > > The configure line for this build config is: > exec '../../configure' '--cc=ccache gcc' '--enable-debug' '--static' > '--disable-system' > > The problem is that the test wants to include the .o from migration/ > > gcov-files-test-xbzrle-y = migration/xbzrle.c > > but that .o isn't built (and the migration/ directory in > the build tree doesn't exist at all), because the line > common-obj-y += migration/ > in Makefile.objs is inside an ifeq ($(CONFIG_SOFTMMU),y) > guard. > > This used to work because the test makefile would cause the > xbzrle.o file to get built even on a non-softmmu build > (via the dependency), but that no longer works because > cc won't build into an output directory that doesn't exist. > > The simplest fix might be to make this test only run if > CONFIG_SOFTMMU, I guess. OK, thanks for spotting that; I'll guard that test as you suggest. > > thanks > -- PMM Dave -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK