Merge remote-tracking branch 'origin/master' into staging

* origin/master:
  qtest: fix memread and memwrite on 32 bit hosts

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/libqtest.c b/tests/libqtest.c
index d47969eae5..1ce6fa10df 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -356,7 +356,7 @@ void qtest_memread(QTestState *s, uint64_t addr, void *data, size_t size)
     gchar **args;
     size_t i;
 
-    qtest_sendf(s, "read 0x%x 0x%x\n", addr, size);
+    qtest_sendf(s, "read 0x%" PRIx64 " 0x%x\n", addr, size);
     args = qtest_rsp(s, 2);
 
     for (i = 0; i < size; i++) {
@@ -378,7 +378,7 @@ void qtest_memwrite(QTestState *s, uint64_t addr, const void *data, size_t size)
     const uint8_t *ptr = data;
     size_t i;
 
-    qtest_sendf(s, "write 0x%x 0x%x 0x", addr, size);
+    qtest_sendf(s, "write 0x%" PRIx64 " 0x%x 0x", addr, size);
     for (i = 0; i < size; i++) {
         qtest_sendf(s, "%02x", ptr[i]);
     }