From patchwork Mon Dec 19 06:19:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: y@ozlabs.org X-Patchwork-Id: 132164 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8D1A3B7042 for ; Mon, 19 Dec 2011 17:20:15 +1100 (EST) Received: from localhost ([::1]:47835 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RcWZy-0005Pt-N7 for incoming@patchwork.ozlabs.org; Mon, 19 Dec 2011 01:20:06 -0500 Received: from eggs.gnu.org ([140.186.70.92]:46816) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RcWZa-0004HI-K9 for qemu-devel@nongnu.org; Mon, 19 Dec 2011 01:19:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RcWZX-00007q-SM for qemu-devel@nongnu.org; Mon, 19 Dec 2011 01:19:42 -0500 Received: from ozlabs.org ([203.10.76.45]:38157) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RcWZX-00007j-GM for qemu-devel@nongnu.org; Mon, 19 Dec 2011 01:19:39 -0500 Received: by ozlabs.org (Postfix, from userid 1034) id 4FC93B7045; Mon, 19 Dec 2011 17:19:37 +1100 (EST) From: y@ozlabs.org To: qemu-devel@nongnu.org Date: Mon, 19 Dec 2011 17:19:32 +1100 Message-Id: <1324275572-17752-3-git-send-email-y> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1324275572-17752-1-git-send-email-y> References: <1324275572-17752-1-git-send-email-y> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 203.10.76.45 Subject: [Qemu-devel] [PATCH 3/3] Documentation: Move balloon option out of i386 only section X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Michael Ellerman The balloon option is not i386 only, so move it into the standard options section. Signed-off-by: Michael Ellerman --- qemu-options.hx | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 749aee1..a60191f 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -456,6 +456,19 @@ modprobe i810_audio clocking=48000 @end example ETEXI +DEF("balloon", HAS_ARG, QEMU_OPTION_balloon, + "-balloon none disable balloon device\n" + "-balloon virtio[,addr=str]\n" + " enable virtio balloon device (default)\n", QEMU_ARCH_ALL) +STEXI +@item -balloon none +@findex -balloon +Disable balloon device. +@item -balloon virtio[,addr=@var{addr}] +Enable virtio balloon device (default), optionally with PCI address +@var{addr}. +ETEXI + STEXI @end table ETEXI @@ -1120,19 +1133,6 @@ STEXI Disable HPET support. ETEXI -DEF("balloon", HAS_ARG, QEMU_OPTION_balloon, - "-balloon none disable balloon device\n" - "-balloon virtio[,addr=str]\n" - " enable virtio balloon device (default)\n", QEMU_ARCH_ALL) -STEXI -@item -balloon none -@findex -balloon -Disable balloon device. -@item -balloon virtio[,addr=@var{addr}] -Enable virtio balloon device (default), optionally with PCI address -@var{addr}. -ETEXI - DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable, "-acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,{data|file}=file1[:file2]...]\n" " ACPI table description\n", QEMU_ARCH_I386)