From patchwork Tue Jul 7 21:23:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 492602 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 1EA4F1402B1 for ; Wed, 8 Jul 2015 07:23:37 +1000 (AEST) Received: from localhost ([::1]:60487 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCaL0-000726-Tw for incoming@patchwork.ozlabs.org; Tue, 07 Jul 2015 17:23:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44955) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCaKi-0006lc-JR for qemu-devel@nongnu.org; Tue, 07 Jul 2015 17:23:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCaKe-0001bE-Dt for qemu-devel@nongnu.org; Tue, 07 Jul 2015 17:23:16 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:36794) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCaKe-0001b0-4y for qemu-devel@nongnu.org; Tue, 07 Jul 2015 17:23:12 -0400 Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 7 Jul 2015 15:23:11 -0600 Received: from d01dlp01.pok.ibm.com (9.56.250.166) by e39.co.us.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 7 Jul 2015 15:23:10 -0600 X-Helo: d01dlp01.pok.ibm.com X-MailFrom: mdroth@linux.vnet.ibm.com X-RcptTo: qemu-devel@nongnu.org Received: from b01cxnp23034.gho.pok.ibm.com (b01cxnp23034.gho.pok.ibm.com [9.57.198.29]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 62BB038C8052 for ; Tue, 7 Jul 2015 17:23:09 -0400 (EDT) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by b01cxnp23034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t67LN9dv56885430 for ; Tue, 7 Jul 2015 21:23:09 GMT Received: from d01av04.pok.ibm.com (localhost [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t67LN8Zf012295 for ; Tue, 7 Jul 2015 17:23:09 -0400 Received: from localhost ([9.41.105.109]) by d01av04.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t67LN87L012234; Tue, 7 Jul 2015 17:23:08 -0400 MIME-Version: 1.0 To: "Denis V. Lunev" , "Peter Maydell" From: Michael Roth In-Reply-To: <559C30C4.4050707@parallels.com> References: <1436289212-14756-1-git-send-email-okrishtal@parallels.com> <559C1521.6030306@parallels.com> <20150707200237.5523.75065@loki> <559C30C4.4050707@parallels.com> Message-ID: <20150707212305.5523.98383@loki> User-Agent: alot/0.3.6 Date: Tue, 07 Jul 2015 16:23:05 -0500 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15070721-0033-0000-0000-00000515D035 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 32.97.110.160 Cc: Olga Krishtal , den@paralles.com, QEMU Developers Subject: Re: [Qemu-devel] [PATCH] qga: fix build for older versions of mingw 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 Quoting Denis V. Lunev (2015-07-07 15:04:20) > On 07/07/15 23:02, Michael Roth wrote: > > 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" != "no" ; then > >>>> usb_redir="no" > >>>> fi > >>>> fi > >>>> - > >>>> ########################################## > >>>> # check if we have VSS SDK headers for win > >>>> > >>>> @@ -3820,6 +3819,14 @@ if test "$mingw32" = "yes" -a "$guest_agent" != > >>>> "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/ddk > >>>> +# Add ddk directory to lookup path automatically > >>>> +if test "$mingw32" = "yes" -a "$guest_agent" != "no"; then > >>>> + QEMU_INCLUDES="$QEMU_INCLUDES -I`$cc -print-sysroot`/mingw/include/ddk" > >>>> +fi > >>>> + > >>>> +########################################## > >>>> # Guest agent Window MSI package > >>>> > >>>> if test "$guest_agent" != 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 yours > > 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/include/ddk/winddk.h:1069: error: redefinition of ‘struct _DRIVE_LAYOUT_INFORMATION_MBR’ > > /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/include/ddk/winddk.h:1073: error: redefinition of ‘struct _DRIVE_LAYOUT_INFORMATION_GPT’ > > /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/include/ddk/winddk.h:1080: error: redefinition of ‘struct _PARTITION_INFORMATION_MBR’ > > 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/include/ddk/winddk.h:3575: error: nested redefinition of ‘enum _PARTITION_STYLE’ > > /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/include/ddk/winddk.h:3575: error: redeclaration of ‘enum _PARTITION_STYLE’ > > /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/include/ddk/winddk.h:3576: error: redeclaration of enumerator ‘PARTITION_STYLE_MBR’ > > /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/include/winioctl.h:208: error: previous definition of ‘PARTITION_STYLE_MBR’ was here > > /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/include/ddk/winddk.h:3578: error: redeclaration of enumerator ‘PARTITION_STYLE_GPT’ > > /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/include/winioctl.h:209: error: previous definition of ‘PARTITION_STYLE_GPT’ 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 > >> > > > > > yep :( this seems so thus we need to disable it if the header is not > available Hmm, well it seems it's *almost* possible. I can build with the following changes (ddk/ntddstor.h replaces winioctl.h): unfortunately-named 'PCIBus' enum that conflicts with QEMU defs. I don't think there's a reasonable way to work around this so we'll have to stick to the original plan. Since I have a build environment handy I'll go ahead and put together a patch to disable the feature via a configure check/flag. > diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 609f3c7..6ebb531 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -21,8 +21,11 @@ #include #include #include -#include -#include +#include +#include +#include #include #include #include "qga/guest-agent-core.h" But I have to modify ddk/winddk.h (pulled in by ddk/ntddk.h) due to an