Message ID | 1422272804-25947-1-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show |
On 26 January 2015 at 11:46, Paolo Bonzini <pbonzini@redhat.com> wrote: > The following changes since commit a46b3aaf6bb038d4f6f192a84df204f10929e75c: > > Merge remote-tracking branch 'remotes/otubo/tags/pull-seccomp-20150123' into staging (2015-01-23 13:24:17 +0000) > > are available in the git repository at: > > > git://github.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to fc116efad0aadb2f8a49d51240bddbfe21b631a0: > > kvm_stat: Add RESET support for perf event ioctl (2015-01-26 12:27:05 +0100) > > ---------------------------------------------------------------- > - Many fixes from the floor as usual > - New "edu" device (v1->v2: fix 32-bit compilation) > - Disabling HLE and RTM on Haswell & Broadwell > - kvm_stat updates > - Added --enable-modules to Travis, in preparation for switching > the default > > ---------------------------------------------------------------- Applied, thanks. -- PMM
diff --git a/hw/misc/edu.c b/hw/misc/edu.c index 8b68d76..f601069 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -110,7 +110,7 @@ static dma_addr_t edu_clamp_addr(const EduState *edu, dma_addr_t addr) dma_addr_t res = addr & edu->dma_mask; if (addr != res) { - printf("EDU: clamping DMA 0x%.16lx to 0x%.16lx!\n", addr, res); + printf("EDU: clamping DMA %#.16"PRIx64" to %#.16"PRIx64"!\n", addr, res); } return res;