Hi Peter, On 05/04/2018 07:58 PM, Peter Maydell wrote: > On 4 May 2018 at 18:15, Peter Maydell <peter.mayd...@linaro.org> wrote: >> target-arm queue: Eric's SMMUv3 patchset, and an array >> of minor bugfixes and improvements from various others. >> >> thanks >> -- PMM >> >> The following changes since commit c8b7e627b4269a3bc3ae41d9f420547a47e6d9b9: >> >> Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-05-04' into >> staging (2018-05-04 14:42:46 +0100) >> >> are available in the Git repository at: >> >> git://git.linaro.org/people/pmaydell/qemu-arm.git >> tags/pull-target-arm-20180504 >> >> for you to fetch changes up to 5680740c92993e9b3f3e011f2a2c394070e33f56: >> >> hw/arm/virt: Introduce the iommu option (2018-05-04 18:05:52 +0100) >> >> ---------------------------------------------------------------- >> target-arm queue: >> * Emulate the SMMUv3 (IOMMU); one will be created in the 'virt' board >> if the commandline includes "-machine iommu=smmuv3" >> * target/arm: Implement v8M VLLDM and VLSTM >> * hw/arm: Don't fail qtest due to missing SD card in -nodefaults mode >> * Some fixes to silence Coverity false-positives >> * arm: boot: set boot_info starting from first_cpu >> (fixes a technical bug not visible in practice) >> * hw/net/smc91c111: Convert away from old_mmio >> * hw/usb/tusb6010: Convert away from old_mmio >> * hw/char/cmsdk-apb-uart.c: Accept more input after character read >> * target/arm: Make MPUIR write-ignored on OMAP, StrongARM >> * hw/arm/virt: Add linux,pci-domain property > > Oops, 32-bit compile failures for format string issues; > > hw/arm/trace.h: In function ‘_nocheck__trace_smmu_ptw_level’: > hw/arm/trace.h:215:18: error: format ‘%lx’ expects argument of type > ‘long unsigned int’, but argument 7 has type ‘size_t {aka unsigned > int}’ [-Werror=format=] > qemu_log("%d@%zd.%06zd:smmu_ptw_level " "level=%d > iova=0x%"PRIx64" subpage_sz=0x%lx baseaddr=0x%"PRIx64" offset=%d => > pte=0x%"PRIx64 "\n", > ^ > hw/arm/trace.h: In function ‘_nocheck__trace_smmuv3_write_mmio_idr’: > hw/arm/trace.h:606:18: error: format ‘%lx’ expects argument of type > ‘long unsigned int’, but argument 5 has type ‘uint64_t {aka long long > unsigned int}’ [-Werror=format=] > qemu_log("%d@%zd.%06zd:smmuv3_write_mmio_idr " "write to > RO/Unimpl reg 0x%lx val64:0x%lx" "\n", > ^ > hw/arm/trace.h:606:18: error: format ‘%lx’ expects argument of type > ‘long unsigned int’, but argument 6 has type ‘uint64_t {aka long long > unsigned int}’ [-Werror=format=] > hw/arm/trace.h: In function ‘_nocheck__trace_smmuv3_find_ste_2lvl’: > hw/arm/trace.h:721:18: error: format ‘%lx’ expects argument of type > ‘long unsigned int’, but argument 5 has type ‘uint64_t {aka long long > unsigned int}’ [-Werror=format=] > qemu_log("%d@%zd.%06zd:smmuv3_find_ste_2lvl " > "strtab_base:0x%lx l1ptr:0x%"PRIx64" l1_off:0x%x, l2ptr:0x%"PRIx64" > l2_off:0x%x max_l2_ste:%d" "\n", > ^ > > size_t arguments need %zx, not %lx, and uint64_t arguments need > %"PRIx64", not %lx. I'll squash in the changes to the relevant patches.
OK. Thank you for taking this in charge! Eric > > thanks > -- PMM >