On 02/24/2016 06:01 PM, Michael Roth wrote: > 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 <peter.mayd...@linaro.org> > Signed-off-by: Michael Roth <mdr...@linux.vnet.ibm.com> > ---
Reviewed-by: Eric Blake <ebl...@redhat.com> (but I'm not set up to provide Tested-by on this one) -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature