From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCZ4v-0003xC-9N for qemu-devel@nongnu.org; Tue, 07 Jul 2015 16:02:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCZ4r-00009Q-TO for qemu-devel@nongnu.org; Tue, 07 Jul 2015 16:02:53 -0400 Received: from e31.co.us.ibm.com ([32.97.110.149]:39789) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCZ4r-000099-Mk for qemu-devel@nongnu.org; Tue, 07 Jul 2015 16:02:49 -0400 Received: from /spool/local by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 7 Jul 2015 14:02:47 -0600 Received: from b03cxnp08025.gho.boulder.ibm.com (b03cxnp08025.gho.boulder.ibm.com [9.17.130.17]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id E99A519D8026 for ; Tue, 7 Jul 2015 13:53:45 -0600 (MDT) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by b03cxnp08025.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t67K21ER51445968 for ; Tue, 7 Jul 2015 13:02:01 -0700 Received: from d03av01.boulder.ibm.com (localhost [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t67K2j7o019196 for ; Tue, 7 Jul 2015 14:02:45 -0600 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Roth In-Reply-To: References: <1436289212-14756-1-git-send-email-okrishtal@parallels.com> <559C1521.6030306@parallels.com> Message-ID: <20150707200237.5523.75065@loki> Date: Tue, 07 Jul 2015 15:02:37 -0500 Subject: Re: [Qemu-devel] [PATCH] qga: fix build for older versions of mingw List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , "Denis V. Lunev" Cc: Olga Krishtal , den@paralles.com, QEMU Developers Quoting Peter Maydell (2015-07-07 14:16:29) > On 7 July 2015 at 19:06, Denis V. Lunev wrote: > > On 07/07/15 20:13, Olga Krishtal wrote: > >> > >> Peter, can you try this patch on your system? > >> > >> In mingw older than mingw64-headers-4.0.2-1.el7.noarch > >> header ntddscsi.h can be found in include/ddk, however > >> compiler does not look there. This breaks the compilation. > >> > >> The patch adds this directory in QEMU_INCLUDES. > >> > >> Signed-off-by: Olga Krishtal > >> --- > >> configure | 9 ++++++++- > >> 1 file changed, 8 insertions(+), 1 deletion(-) > >> > >> diff --git a/configure b/configure > >> index 52cfe18..ada8895 100755 > >> --- a/configure > >> +++ b/configure > >> @@ -3763,7 +3763,6 @@ if test "$usb_redir" !=3D "no" ; then > >> usb_redir=3D"no" > >> fi > >> fi > >> - > >> ########################################## > >> # check if we have VSS SDK headers for win > >> > >> @@ -3820,6 +3819,14 @@ if test "$mingw32" =3D "yes" -a "$guest_agent" = !=3D > >> "no" -a "$guest_agent_with_vss" > >> fi > >> > >> ########################################## > >> +# mingw package on Linux is quite different with different versions. > >> ntddscsi.h > >> +# can be found sys-root/mingw/include and in sys-root/mingw/include/d= dk > >> +# Add ddk directory to lookup path automatically > >> +if test "$mingw32" =3D "yes" -a "$guest_agent" !=3D "no"; then > >> + QEMU_INCLUDES=3D"$QEMU_INCLUDES -I`$cc -print-sysroot`/mingw/includ= e/ddk" > >> +fi > >> + > >> +########################################## > >> # Guest agent Window MSI package > >> > >> if test "$guest_agent" !=3D yes; then > >> > > > > actually this is a dirty hack, but we want to > > know whether additional include directory help or not. > > If this helps, we could think how to avoid extra > > configuration option and ifdef in the code. > = > I agree it's a pretty nasty hack :-) > = > Unfortunately my build machine is going to be running > flat out processing all the last-minute pull requests. > I won't be able to test this until tomorrow at best. I've gotten an ubuntu 14.04 mingw environment set up that I think matches y= ours fairly closely, so I can give any proposed fixes a spin. Unfortunately simply pointing to ddk/ntddscsi.h instead of ntddscsi.h doesn't quite do it: In file included from /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../= i586-mingw32msvc/include/ddk/ntddk.h:76, from /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../= i586-mingw32msvc/include/ddk/ntddscsi.h:34, from /home/mdroth/w/qemu4.git/qga/commands-win32.c:25: /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/inclu= de/ddk/winddk.h:1069: error: redefinition of =E2=80=98struct _DRIVE_LAYOUT_= INFORMATION_MBR=E2=80=99 /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/inclu= de/ddk/winddk.h:1073: error: redefinition of =E2=80=98struct _DRIVE_LAYOUT_= INFORMATION_GPT=E2=80=99 /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/inclu= de/ddk/winddk.h:1080: error: redefinition of =E2=80=98struct _PARTITION_INF= ORMATION_MBR=E2=80=99 In file included from /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../= i586-mingw32msvc/include/ddk/ntddk.h:76, from /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../= i586-mingw32msvc/include/ddk/ntddscsi.h:34, from /home/mdroth/w/qemu4.git/qga/commands-win32.c:25: /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/inclu= de/ddk/winddk.h:3575: error: nested redefinition of =E2=80=98enum _PARTITIO= N_STYLE=E2=80=99 /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/inclu= de/ddk/winddk.h:3575: error: redeclaration of =E2=80=98enum _PARTITION_STYL= E=E2=80=99 /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/inclu= de/ddk/winddk.h:3576: error: redeclaration of enumerator =E2=80=98PARTITION= _STYLE_MBR=E2=80=99 /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/inclu= de/winioctl.h:208: error: previous definition of =E2=80=98PARTITION_STYLE_M= BR=E2=80=99 was here /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/inclu= de/ddk/winddk.h:3578: error: redeclaration of enumerator =E2=80=98PARTITION= _STYLE_GPT=E2=80=99 /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/inclu= de/winioctl.h:209: error: previous definition of =E2=80=98PARTITION_STYLE_G= PT=E2=80=99 was here ... I'm still trying to make sense of how the headers are organized but the impression I'm getting is that stuff in ddk/ is meant for kernel code and doesn't play very nicely with userspace headers. At some point ntddscsi.h got moved out of ddk/ and #ifdef guards were added all over the place to make it useable, so it seems likely we'll have to disable the feature completely for the ddk/ntddscsi.h versions of mingw. > = > -- PMM >=20