ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

* origin/master:
  qtest: fix memread and memwrite on 32 bit hosts
This commit is contained in:
Anthony Liguori 2012-04-23 15:02:53 -05:00
parent 6454678423 ce6bf17a97
commit 092dfc7714
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/libqtest.c
View File

@ -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]);
}