From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36243) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vsf8T-0006Ip-Vi for qemu-devel@nongnu.org; Mon, 16 Dec 2013 15:51:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vsf8L-0002tb-0y for qemu-devel@nongnu.org; Mon, 16 Dec 2013 15:51:29 -0500 Received: from e31.co.us.ibm.com ([32.97.110.149]:38563) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vsf8K-0002tF-Qq for qemu-devel@nongnu.org; Mon, 16 Dec 2013 15:51:20 -0500 Received: from /spool/local by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 16 Dec 2013 13:51:19 -0700 Received: from b03cxnp07028.gho.boulder.ibm.com (b03cxnp07028.gho.boulder.ibm.com [9.17.130.15]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id DD7C919D8045 for ; Mon, 16 Dec 2013 13:51:09 -0700 (MST) Received: from d03av06.boulder.ibm.com (d03av06.boulder.ibm.com [9.17.195.245]) by b03cxnp07028.gho.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rBGKpFRh3932670 for ; Mon, 16 Dec 2013 21:51:15 +0100 Received: from d03av06.boulder.ibm.com (loopback [127.0.0.1]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id rBGKsK0j003665 for ; Mon, 16 Dec 2013 13:54:21 -0700 From: Matthew Rosato Date: Mon, 16 Dec 2013 15:51:08 -0500 Message-Id: <1387227072-21965-2-git-send-email-mjrosato@linux.vnet.ibm.com> In-Reply-To: <1387227072-21965-1-git-send-email-mjrosato@linux.vnet.ibm.com> References: <1387227072-21965-1-git-send-email-mjrosato@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 1/5] Add the standby-mem machine option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: gleb@redhat.com, agraf@suse.de, borntraeger@de.ibm.com, aliguori@amazon.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, rth@twiddle.net Add the machine=...,standby-mem={size} option and associated documentation. Signed-off-by: Matthew Rosato --- qemu-options.hx | 6 +++++- vl.c | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/qemu-options.hx b/qemu-options.hx index af34483..def4493 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -35,7 +35,8 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " kernel_irqchip=on|off controls accelerated irqchip support\n" " kvm_shadow_mem=size of KVM shadow MMU\n" " dump-guest-core=on|off include guest memory in a core dump (default=on)\n" - " mem-merge=on|off controls memory merge support (default: on)\n", + " mem-merge=on|off controls memory merge support (default: on)\n" + " standby-mem=size sets size of additional offline memory\n", QEMU_ARCH_ALL) STEXI @item -machine [type=]@var{name}[,prop=@var{value}[,...]] @@ -58,6 +59,9 @@ Include guest memory in a core dump. The default is on. Enables or disables memory merge support. This feature, when supported by the host, de-duplicates identical memory pages among VMs instances (enabled by default). +@item standby-mem=size +Defines the size, in megabytes, of additional memory to be left offline for +future hotplug by the guest. @end table ETEXI diff --git a/vl.c b/vl.c index b0399de..7d58d24 100644 --- a/vl.c +++ b/vl.c @@ -187,6 +187,7 @@ DisplayType display_type = DT_DEFAULT; static int display_remote; const char* keyboard_layout = NULL; ram_addr_t ram_size; +ram_addr_t standby_mem_size; const char *mem_path = NULL; int mem_prealloc = 0; /* force preallocation of physical target memory */ int nb_nics; @@ -430,6 +431,10 @@ static QemuOptsList qemu_machine_opts = { .name = "firmware", .type = QEMU_OPT_STRING, .help = "firmware image", + },{ + .name = "standby-mem", + .type = QEMU_OPT_SIZE, + .help = "standby memory size", }, { /* End of list */ } }, @@ -2906,6 +2911,7 @@ int main(int argc, char **argv, char **envp) machine = find_default_machine(); cpu_model = NULL; ram_size = 0; + standby_mem_size = 0; snapshot = 0; cyls = heads = secs = 0; translation = BIOS_ATA_TRANSLATION_AUTO; -- 1.7.9.5