Commit 705456c0 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

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: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 56fdfb61

vl.c

+6 −6
Original line number Diff line number Diff line
@@ -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;