vl.c: extend -m option to support options for memory hotplug
Add following parameters: "slots" - total number of hotplug memory slots "maxmem" - maximum possible memory "slots" and "maxmem" should go in pair and "maxmem" should be greater than "mem" for memory hotplug to be enabled. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> MST: fix build on 32 bit
This commit is contained in:
parent
1f07048933
commit
c270fb9eff
|
@ -113,6 +113,8 @@ struct MachineState {
|
||||||
char *firmware;
|
char *firmware;
|
||||||
|
|
||||||
ram_addr_t ram_size;
|
ram_addr_t ram_size;
|
||||||
|
ram_addr_t maxram_size;
|
||||||
|
uint64_t ram_slots;
|
||||||
const char *boot_order;
|
const char *boot_order;
|
||||||
char *kernel_filename;
|
char *kernel_filename;
|
||||||
char *kernel_cmdline;
|
char *kernel_cmdline;
|
||||||
|
|
|
@ -210,17 +210,20 @@ use is discouraged as it may be removed from future versions.
|
||||||
ETEXI
|
ETEXI
|
||||||
|
|
||||||
DEF("m", HAS_ARG, QEMU_OPTION_m,
|
DEF("m", HAS_ARG, QEMU_OPTION_m,
|
||||||
"-m [size=]megs\n"
|
"-m[emory] [size=]megs[,slots=n,maxmem=size]\n"
|
||||||
" configure guest RAM\n"
|
" configure guest RAM\n"
|
||||||
" size: initial amount of guest memory (default: "
|
" size: initial amount of guest memory (default: "
|
||||||
stringify(DEFAULT_RAM_SIZE) "MiB)\n",
|
stringify(DEFAULT_RAM_SIZE) "MiB)\n"
|
||||||
|
" slots: number of hotplug slots (default: none)\n"
|
||||||
|
" maxmem: maximum amount of guest memory (default: none)\n",
|
||||||
QEMU_ARCH_ALL)
|
QEMU_ARCH_ALL)
|
||||||
STEXI
|
STEXI
|
||||||
@item -m [size=]@var{megs}
|
@item -m [size=]@var{megs}
|
||||||
@findex -m
|
@findex -m
|
||||||
Set virtual RAM size to @var{megs} megabytes. Default is 128 MiB. Optionally,
|
Set virtual RAM size to @var{megs} megabytes. Default is 128 MiB. Optionally,
|
||||||
a suffix of ``M'' or ``G'' can be used to signify a value in megabytes or
|
a suffix of ``M'' or ``G'' can be used to signify a value in megabytes or
|
||||||
gigabytes respectively.
|
gigabytes respectively. Optional pair @var{slots}, @var{maxmem} could be used
|
||||||
|
to set amount of hotluggable memory slots and possible maximum amount of memory.
|
||||||
ETEXI
|
ETEXI
|
||||||
|
|
||||||
DEF("mem-path", HAS_ARG, QEMU_OPTION_mempath,
|
DEF("mem-path", HAS_ARG, QEMU_OPTION_mempath,
|
||||||
|
|
51
vl.c
51
vl.c
|
@ -520,6 +520,14 @@ static QemuOptsList qemu_mem_opts = {
|
||||||
.name = "size",
|
.name = "size",
|
||||||
.type = QEMU_OPT_SIZE,
|
.type = QEMU_OPT_SIZE,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
.name = "slots",
|
||||||
|
.type = QEMU_OPT_NUMBER,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.name = "maxmem",
|
||||||
|
.type = QEMU_OPT_SIZE,
|
||||||
|
},
|
||||||
{ /* end of list */ }
|
{ /* end of list */ }
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
@ -2992,6 +3000,8 @@ int main(int argc, char **argv, char **envp)
|
||||||
const char *trace_file = NULL;
|
const char *trace_file = NULL;
|
||||||
const ram_addr_t default_ram_size = (ram_addr_t)DEFAULT_RAM_SIZE *
|
const ram_addr_t default_ram_size = (ram_addr_t)DEFAULT_RAM_SIZE *
|
||||||
1024 * 1024;
|
1024 * 1024;
|
||||||
|
ram_addr_t maxram_size = default_ram_size;
|
||||||
|
uint64_t ram_slots = 0;
|
||||||
|
|
||||||
atexit(qemu_run_exit_notifiers);
|
atexit(qemu_run_exit_notifiers);
|
||||||
error_set_progname(argv[0]);
|
error_set_progname(argv[0]);
|
||||||
|
@ -3327,6 +3337,7 @@ int main(int argc, char **argv, char **envp)
|
||||||
case QEMU_OPTION_m: {
|
case QEMU_OPTION_m: {
|
||||||
uint64_t sz;
|
uint64_t sz;
|
||||||
const char *mem_str;
|
const char *mem_str;
|
||||||
|
const char *maxmem_str, *slots_str;
|
||||||
|
|
||||||
opts = qemu_opts_parse(qemu_find_opts("memory"),
|
opts = qemu_opts_parse(qemu_find_opts("memory"),
|
||||||
optarg, 1);
|
optarg, 1);
|
||||||
|
@ -3368,6 +3379,44 @@ int main(int argc, char **argv, char **envp)
|
||||||
error_report("ram size too large");
|
error_report("ram size too large");
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
maxmem_str = qemu_opt_get(opts, "maxmem");
|
||||||
|
slots_str = qemu_opt_get(opts, "slots");
|
||||||
|
if (maxmem_str && slots_str) {
|
||||||
|
uint64_t slots;
|
||||||
|
|
||||||
|
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);
|
||||||
|
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 "
|
||||||
|
"specified\n", sz, ram_size);
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
maxram_size = sz;
|
||||||
|
ram_slots = slots;
|
||||||
|
} else if ((!maxmem_str && slots_str) ||
|
||||||
|
(maxmem_str && !slots_str)) {
|
||||||
|
fprintf(stderr, "qemu: invalid -m option value: missing "
|
||||||
|
"'%s' option\n", slots_str ? "maxmem" : "slots");
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#ifdef CONFIG_TPM
|
#ifdef CONFIG_TPM
|
||||||
|
@ -4436,6 +4485,8 @@ int main(int argc, char **argv, char **envp)
|
||||||
qdev_machine_init();
|
qdev_machine_init();
|
||||||
|
|
||||||
current_machine->ram_size = ram_size;
|
current_machine->ram_size = ram_size;
|
||||||
|
current_machine->maxram_size = maxram_size;
|
||||||
|
current_machine->ram_slots = ram_slots;
|
||||||
current_machine->boot_order = boot_order;
|
current_machine->boot_order = boot_order;
|
||||||
current_machine->cpu_model = cpu_model;
|
current_machine->cpu_model = cpu_model;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue