From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49923) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxsRi-0006FX-Pr for qemu-devel@nongnu.org; Sun, 15 Nov 2015 03:13:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxsRf-0000nc-Ih for qemu-devel@nongnu.org; Sun, 15 Nov 2015 03:13:58 -0500 Received: from v220110690675601.yourvserver.net ([37.221.199.173]:52315) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxsRf-0000nV-9x for qemu-devel@nongnu.org; Sun, 15 Nov 2015 03:13:55 -0500 Message-ID: <56483EB0.8080903@weilnetz.de> Date: Sun, 15 Nov 2015 09:13:36 +0100 From: Stefan Weil MIME-Version: 1.0 References: <1441727278-18450-1-git-send-email-mdroth@linux.vnet.ibm.com> <55EFFF1B.2000600@redhat.com> In-Reply-To: <55EFFF1B.2000600@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] build: qemu-ga: add 'qemu-ga' build target for w32 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , Michael Roth , qemu-devel@nongnu.org Cc: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Am 09.09.2015 um 11:42 schrieb Paolo Bonzini: > > On 08/09/2015 17:47, Michael Roth wrote: >> Currently POSIX builds rely on 'qemu-ga' target to do qga-only >> distributable build. On w32, as with most standalone binary targets, >> we rely on 'qemu-ga.exe' target. >> >> Unlike with POSIX, qemu-ga for w32 has a number of related targets >> such as VSS DLL and MSI package. We can do the full distributable >> qga-only build on w32 with: >> >> make qemu-ga.exe >> >> or: >> >> make msi >> >> To make that work, we tie VSS dependencies onto qemu-ga.exe. >> However, in reality the DLL isn't part of the binary, so we use a >> filter to pull them out of the LINK recipe, which attempts to link >> against prereqs for binary targets. Additionally, it could be argued >> that VSS is a separate distributable, and shouldn't be implied by >> qemu-ga.exe binary target. >> >> To avoid this, we can tie the VSS dependencies only to the 'msi' >> target, but that would make it impossible to do a qga-only build of >> the w32 distributable without building the 'msi' package, which was >> supported in the past. >> >> An alternative approach is to add a new target to build the whole >> distributable. w32 allows us to use the same build target we use >> on POSIX, 'qemu-ga', since the current binary-only target on w32 >> is 'qemu-ga.exe'. >> >> To further simplify the build, we also make 'qemu-ga' build the MSI >> package if the appropriate ./configure options are set, making the >> full qga-only build the same on both POSIX and w32: `make qemu-ga` >> >> Cc: Paolo Bonzini >> Cc: Marc-Andr=C3=A9 Lureau >> Signed-off-by: Michael Roth >> --- >> Makefile | 14 ++++++++------ >> configure | 2 +- >> 2 files changed, 9 insertions(+), 7 deletions(-) >> >> diff --git a/Makefile b/Makefile >> index 9ce3972..7efca5e 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -290,18 +290,15 @@ $(qapi-modules) $(SRC_PATH)/scripts/qapi-command= s.py $(qapi-py) >> QGALIB_GEN=3D$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qa= pi-visit.h qga-qmp-commands.h) >> $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) >> =20 >> -# we require QGA_VSS_PROVIDER files to be built alongside qemu-ga >> -# executable since they are shipped together, but we don't want to ac= tually >> -# link against them >> -qemu-ga$(EXESUF): $(qga-obj-y) libqemuutil.a libqemustub.a $(QGA_VSS_= PROVIDER) >> - $(call LINK, $(filter-out $(QGA_VSS_PROVIDER), $^)) >> +qemu-ga$(EXESUF): $(qga-obj-y) libqemuutil.a libqemustub.a >> + $(call LINK, $^) >> =20 >> ifdef QEMU_GA_MSI_ENABLED >> QEMU_GA_MSI=3Dqemu-ga-$(ARCH).msi >> =20 >> msi: $(QEMU_GA_MSI) >> =20 >> -$(QEMU_GA_MSI): qemu-ga.exe >> +$(QEMU_GA_MSI): qemu-ga.exe $(QGA_VSS_PROVIDER) >> =20 >> $(QEMU_GA_MSI): config-host.mak >> =20 >> @@ -313,6 +310,11 @@ msi: >> @echo "MSI build not configured or dependency resolution failed (rec= onfigure with --enable-guest-agent-msi option)" >> endif >> =20 >> +ifneq ($(EXESUF),) >> +.PHONY: qemu-ga >> +qemu-ga: qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI) >> +endif >> + >> clean: >> # avoid old build problems by removing potentially incorrect old file= s >> rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm= .h gen-op-arm.h >> diff --git a/configure b/configure >> index d854936..fc34443 100755 >> --- a/configure >> +++ b/configure >> @@ -4350,7 +4350,7 @@ fi >> =20 >> if [ "$guest_agent" !=3D "no" ]; then >> if [ "$linux" =3D "yes" -o "$bsd" =3D "yes" -o "$solaris" =3D "yes"= -o "$mingw32" =3D "yes" ] ; then >> - tools=3D"qemu-ga\$(EXESUF) $tools" >> + tools=3D"qemu-ga $tools" >> guest_agent=3Dyes >> elif [ "$guest_agent" !=3D yes ]; then >> guest_agent=3Dno >> > Looks good, thanks! > > Paolo Looks good, but introduced a regression for cross builds: 'make install' now fails with an error: install: cannot stat 'qemu-ga': No such file or directory Reverting the change in configure fixes this. Stefan