On Thu, Mar 12, 2015 at 12:58 PM, Stefan Hajnoczi <stefa...@gmail.com> wrote: > On Thu, Mar 12, 2015 at 03:03:45PM +0000, Peter Maydell wrote: >> On 12 March 2015 at 14:43, Peter Maydell <peter.mayd...@linaro.org> wrote: >> > On 12 March 2015 at 14:33, Stefan Hajnoczi <stefa...@redhat.com> wrote: >> >> v4: >> >> * Drop clang 3.5.0 fixes since they break with older clang and w32 >> >> [Peter] >> >> >> >> v3: >> >> * Add clang 3.5.0 warning fixes >> >> * Squash David Ahern's clang struct definition warnings fix >> >> >> >> v2: >> >> * Squash in Jiri's fix for rocker format string specifiers [Peter] >> >> * Squash in Windows build fix [Peter] >> >> * Both build fixes are described in "rocker: add new rocker switch >> >> device" >> >> >> >> The following changes since commit >> >> ee74801035b0b5f1fdfd4e31d3a53f511f91c804: >> >> >> >> Merge remote-tracking branch 'remotes/lalrae/tags/mips-20150311' into >> >> staging (2015-03-11 18:22:15 +0000) >> >> >> >> are available in the git repository at: >> >> >> >> git://github.com/stefanha/qemu.git tags/net-pull-request >> >> >> >> for you to fetch changes up to 8d3f4f565fb4adf940a8824882a7f549304f34fd: >> >> >> >> rocker: timestamp on the debug logs helps correlate with events in the >> >> VM (2015-03-12 14:18:11 +0000) >> > >> > w32 build failure :-( >> > >> > cc1: warnings being treated as errors >> > /home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker.c: In >> > function 'rocker_io_readq': >> > /home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker.c:1109: >> > warning: integer constant is too large for 'long' type >> > >> > (64 bit constant without ULL suffix.) >> >> Also fails to build with our minimum glib version: >> >> /home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_of_dpa.c: >> In function 'of_dpa_init': >> /home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_of_dpa.c:2273: >> error: 'g_int64_hash' undeclared (first use in this function) >> /home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_of_dpa.c:2273: >> error: (Each undeclared identifier is reported only once >> /home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_of_dpa.c:2273: >> error: for each function it appears in.) >> /home/petmay01/linaro/qemu-for-merges/hw/net/rocker/rocker_of_dpa.c:2273: >> error: 'g_int64_equal' undeclared (first use in this function) >> >> (Both first introduced in glib 2.22.) > > I'm dropping the rocker patch series. > > David, Jiri, Scott: The minimum required glib version is 2.12 so glib > APIs that were added later cannot be used. Also note the Windows > integer constant warning above. > > My build environments didn't hit these issues so we need to go around > one more time. Please post fixes.
Ok, I posted v8 against master to address the two above issues (and included everything else you had before dropping from net-pull-request). I verified on glibc 2.13 for the second issue For the first issue, I wasn't able to get a x-compile env. setup for w32, but the change is to just add ULL suffix to a 64-bit constant, so should be low-risk. -scott
