On Wed, 24 Jun 2020 at 11:51, Paolo Bonzini <pbonz...@redhat.com> wrote:
>
> The following changes since commit 171199f56f5f9bdf1e5d670d09ef1351d8f01bae:
>
> Merge remote-tracking branch
> 'remotes/alistair/tags/pull-riscv-to-apply-20200619-3' into staging
> (2020-06-22 14:45:25 +0100)
>
> are available in the Git repository at:
>
> git://github.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 7fc58934d34e939489e20af4c97aeb095c1f2b20:
>
> i386: Mask SVM features if nested SVM is disabled (2020-06-24 04:37:59
> -0400)
>
Hi; this has a 32-bit/64-bit format string issue, I'm afraid:
/Users/pm215/src/qemu-for-merges/exec.c:2383:32: error: format
specifies type 'unsigned long' but the argument has type 'uint64_t'
(aka 'unsigned long long') [-Werror,-Wformat]
file_align, mr->align);
~~~~~~~~~~~~^~~~~~~~~~
/Users/pm215/src/qemu-for-merges/include/qapi/error.h:166:35: note:
expanded from macro 'error_setg'
(fmt), ## __VA_ARGS__)
~~~ ^~~~~~~~~~~
(It also had a trivial rebase conflict with master in hw/arm/virt.c.)
thanks
-- PMM
