diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2014-06-19 13:08:35 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-06-19 18:44:22 +0300 |
| commit | 705456c0d7f24fbd76733c891525b8eeea332e8b (patch) | |
| tree | bee4c5a40977adac6ee33eedacf7bd80045a1627 | |
| parent | 56fdfb6106276b761e360a84321bab0765bfa15d (diff) | |
| download | focaccia-qemu-705456c0d7f24fbd76733c891525b8eeea332e8b.tar.gz focaccia-qemu-705456c0d7f24fbd76733c891525b8eeea332e8b.zip | |
numa: use RAM_ADDR_FMT with ram_addr_t
commit 4407ab055be995e64633322a78e64dfa376dc534
vl.c: extend -m option to support options for memory hotplug
prints ram_addr_t with u64 format, this is wrong for
some systems, in particular w32.
print ram_addr_t with RAM_ADDR_FMT to fix build on w32.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | vl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vl.c b/vl.c index b27c2a6422..54b46271c2 100644 --- a/vl.c +++ b/vl.c @@ -3302,16 +3302,16 @@ int main(int argc, char **argv, char **envp) sz = qemu_opt_get_size(opts, "maxmem", 0); if (sz < ram_size) { fprintf(stderr, "qemu: invalid -m option value: maxmem " - "(%" PRIu64 ") <= initial memory (%" - PRIu64 ")\n", sz, ram_size); + "(%" PRIu64 ") <= initial memory (" + RAM_ADDR_FMT ")\n", sz, ram_size); exit(EXIT_FAILURE); } slots = qemu_opt_get_number(opts, "slots", 0); if ((sz > ram_size) && !slots) { fprintf(stderr, "qemu: invalid -m option value: maxmem " - "(%" PRIu64 ") more than initial memory (%" - PRIu64 ") but no hotplug slots where " + "(%" PRIu64 ") more than initial memory (" + RAM_ADDR_FMT ") but no hotplug slots where " "specified\n", sz, ram_size); exit(EXIT_FAILURE); } @@ -3319,8 +3319,8 @@ int main(int argc, char **argv, char **envp) if ((sz <= ram_size) && slots) { fprintf(stderr, "qemu: invalid -m option value: %" PRIu64 " hotplug slots where specified but " - "maxmem (%" PRIu64 ") <= initial memory (%" - PRIu64 ")\n", slots, sz, ram_size); + "maxmem (%" PRIu64 ") <= initial memory (" + RAM_ADDR_FMT ")\n", slots, sz, ram_size); exit(EXIT_FAILURE); } maxram_size = sz; |