aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-04-23 15:02:53 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-04-23 15:02:53 -0500
commit092dfc7714ad7983aeb0cada5d5983e9fde8d84c (patch)
tree2c7ddeda8cf73d6c2181ba7046f441740f7cfe42 /tests
parent645467842339207d895c41f4e4526507b95a636a (diff)
parentce6bf17a97aa53496a385db5642a323ce3b877a1 (diff)
downloadqemu-092dfc7714ad7983aeb0cada5d5983e9fde8d84c.zip
qemu-092dfc7714ad7983aeb0cada5d5983e9fde8d84c.tar.gz
qemu-092dfc7714ad7983aeb0cada5d5983e9fde8d84c.tar.bz2
Merge remote-tracking branch 'origin/master' into staging
* origin/master: qtest: fix memread and memwrite on 32 bit hosts
Diffstat (limited to 'tests')
-rw-r--r--tests/libqtest.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/libqtest.c b/tests/libqtest.c
index d47969e..1ce6fa1 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]);
}