Re: [Qemu-devel] [PULL 00/53] vhost, virtio, pci, pc, acpi

[Peter Maydell]

On 11 March 2016 at 15:07, Michael S. Tsirkin <address@hidden> wrote:
> AFAIK the two large patchsets still outstanding (posted before soft
> freeze) that I have a hand in are AMD IOMMU support and VFIO AER.
> That might still make it in the next pull request.
>
> The following changes since commit a648c137383d84bc4f95696e5293978d9541a26e:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160309-1' into 
> staging (2016-03-10 02:51:14 +0000)
>
> are available in the git repository at:
>
>   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
>
> for you to fetch changes up to 088548f44f4f811606f3b99f418dab019a2e4e3e:
>
>   fw-cfg: support writeable blobs (2016-03-11 16:59:13 +0200)
>
> ----------------------------------------------------------------
> vhost, virtio, pci, pc, acpi
>
> nvdimm work
> sparse cpu id rework
> ipmi enhancements
> fixes all over the place
>
> Signed-off-by: Michael S. Tsirkin <address@hidden>

w32 build failure :-(

/home/petmay01/linaro/qemu-for-merges/hw/ipmi/ipmi_bmc_sim.c:1357:0:
error: "min" redefined [-Werror]
 #define min(x, y) ((x) < (y) ? (x) : (y))
 ^
In file included from /usr/share/mingw-w64/include/windef.h:8:0,
                 from /usr/share/mingw-w64/include/windows.h:69,
                 from /usr/share/mingw-w64/include/winsock2.h:23,
                 from
/home/petmay01/linaro/qemu-for-merges/include/sysemu/os-win32.h:29,
                 from
/home/petmay01/linaro/qemu-for-merges/include/qemu/osdep.h:93,
                 from
/home/petmay01/linaro/qemu-for-merges/hw/ipmi/ipmi_bmc_sim.c:25:
/usr/share/mingw-w64/include/minwindef.h:160:0: note: this is the
location of the previous definition
 #define min(a, b) (((a) < (b)) ? (a) : (b))
 ^
/home/petmay01/linaro/qemu-for-merges/hw/ipmi/ipmi_bmc_sim.c:1358:0:
error: "max" redefined [-Werror]
 #define max(x, y) ((x) > (y) ? (x) : (y))
 ^
In file included from /usr/share/mingw-w64/include/windef.h:8:0,
                 from /usr/share/mingw-w64/include/windows.h:69,
                 from /usr/share/mingw-w64/include/winsock2.h:23,
                 from
/home/petmay01/linaro/qemu-for-merges/include/sysemu/os-win32.h:29,
                 from
/home/petmay01/linaro/qemu-for-merges/include/qemu/osdep.h:93,
                 from
/home/petmay01/linaro/qemu-for-merges/hw/ipmi/ipmi_bmc_sim.c:25:
/usr/share/mingw-w64/include/minwindef.h:156:0: note: this is the
location of the previous definition
 #define max(a, b) (((a) > (b)) ? (a) : (b))
 ^
cc1: all warnings being treated as errors


Better to dump the local definitions and just use osdep.h's
MIN and MAX macros.

thanks
-- PMM