From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYzJR-0001qv-5i for qemu-devel@nongnu.org; Thu, 25 Feb 2016 12:02:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYzJL-0007YZ-5v for qemu-devel@nongnu.org; Thu, 25 Feb 2016 12:02:49 -0500 Received: from e31.co.us.ibm.com ([32.97.110.149]:39203) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYzJK-0007YI-Vr for qemu-devel@nongnu.org; Thu, 25 Feb 2016 12:02:43 -0500 Received: from localhost by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 25 Feb 2016 10:02:41 -0700 Received: from b03cxnp08025.gho.boulder.ibm.com (b03cxnp08025.gho.boulder.ibm.com [9.17.130.17]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id 041B61FF0025 for ; Thu, 25 Feb 2016 09:50:48 -0700 (MST) 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 u1PH2cqh34275462 for ; Thu, 25 Feb 2016 10:02:38 -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 u1PH2b8w011767 for ; Thu, 25 Feb 2016 10:02:37 -0700 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Roth In-Reply-To: <1456362069-13087-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1456362069-13087-1-git-send-email-mdroth@linux.vnet.ibm.com> Message-ID: <20160225170225.29588.71296@loki> Date: Thu, 25 Feb 2016 11:02:25 -0600 Subject: Re: [Qemu-devel] [PATCH] qga: fix w32 breakage due to missing osdep.h includes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell Quoting Michael Roth (2016-02-24 19:01:09) > requester.h relied on qemu/compiler.h definitions to > handle GCC_FMT_ATTR() stub, but this include was removed as part > of scripted clean-ups via 30456d5: > = > all: Clean up includes > = > under the assumption that all C files would have included it via > qemu/osdep.h at that point. requester.cpp was likely missed > due to C++ files requiring manual/special handling as well as > VSS build options needing to be enabled to trigger build failures. > = > Fix this by including qemu/osdep.h. That in turn pulls in a > macro from qapi/error.h that conflicts with a struct field name > in requester.h, so fix that as well by renaming the field. > = > While we're at it, fix up provider.cpp/install.cpp to include > osdep.h as well. > = > Cc: Peter Maydell > Signed-off-by: Michael Roth Thanks, applied to qga tree: https://github.com/mdroth/qemu/commits/qga > --- > qga/vss-win32.c | 2 +- > qga/vss-win32/install.cpp | 3 +-- > qga/vss-win32/provider.cpp | 2 +- > qga/vss-win32/requester.cpp | 8 ++++---- > qga/vss-win32/requester.h | 2 +- > 5 files changed, 8 insertions(+), 9 deletions(-) > = > diff --git a/qga/vss-win32.c b/qga/vss-win32.c > index 5182e3b..9a0e463 100644 > --- a/qga/vss-win32.c > +++ b/qga/vss-win32.c > @@ -150,7 +150,7 @@ void qga_vss_fsfreeze(int *nr_volume, Error **errp, b= ool freeze) > const char *func_name =3D freeze ? "requester_freeze" : "requester_t= haw"; > QGAVSSRequesterFunc func; > ErrorSet errset =3D { > - .error_setg_win32 =3D error_setg_win32_internal, > + .error_setg_win32_wrapper =3D error_setg_win32_internal, > .errp =3D errp, > }; > = > diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp > index b0e4426..cd9cdb4 100644 > --- a/qga/vss-win32/install.cpp > +++ b/qga/vss-win32/install.cpp > @@ -10,8 +10,7 @@ > * See the COPYING file in the top-level directory. > */ > = > -#include > -#include > +#include "qemu/osdep.h" > = > #include "vss-common.h" > #include "inc/win2003/vscoordint.h" > diff --git a/qga/vss-win32/provider.cpp b/qga/vss-win32/provider.cpp > index d5129f8..d977393 100644 > --- a/qga/vss-win32/provider.cpp > +++ b/qga/vss-win32/provider.cpp > @@ -10,7 +10,7 @@ > * See the COPYING file in the top-level directory. > */ > = > -#include > +#include "qemu/osdep.h" > #include "vss-common.h" > #include "inc/win2003/vscoordint.h" > #include "inc/win2003/vsprov.h" > diff --git a/qga/vss-win32/requester.cpp b/qga/vss-win32/requester.cpp > index 9b3e310..b57d517 100644 > --- a/qga/vss-win32/requester.cpp > +++ b/qga/vss-win32/requester.cpp > @@ -10,7 +10,7 @@ > * See the COPYING file in the top-level directory. > */ > = > -#include > +#include "qemu/osdep.h" > #include "vss-common.h" > #include "requester.h" > #include "assert.h" > @@ -23,9 +23,9 @@ > /* Call QueryStatus every 10 ms while waiting for frozen event */ > #define VSS_TIMEOUT_EVENT_MSEC 10 > = > -#define err_set(e, err, fmt, ...) \ > - ((e)->error_setg_win32((e)->errp, __FILE__, __LINE__, __func__, \ > - err, fmt, ## __VA_ARGS__)) > +#define err_set(e, err, fmt, ...) = \ > + ((e)->error_setg_win32_wrapper((e)->errp, __FILE__, __LINE__, __func= __, \ > + err, fmt, ## __VA_ARGS__)) > /* Bad idea, works only when (e)->errp !=3D NULL: */ > #define err_is_set(e) ((e)->errp && *(e)->errp) > /* To lift this restriction, error_propagate(), like we do in QEMU code = */ > diff --git a/qga/vss-win32/requester.h b/qga/vss-win32/requester.h > index ad2bf3d..2a39d73 100644 > --- a/qga/vss-win32/requester.h > +++ b/qga/vss-win32/requester.h > @@ -27,7 +27,7 @@ typedef void (*ErrorSetFunc)(struct Error **errp, > int win32_err, const char *fmt, ...) > GCC_FMT_ATTR(6, 7); > typedef struct ErrorSet { > - ErrorSetFunc error_setg_win32; > + ErrorSetFunc error_setg_win32_wrapper; > struct Error **errp; /* restriction: must not be null */ > } ErrorSet; > = > -- = > 1.9.1 >=20