From patchwork Thu Oct 6 10:24:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 118060 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 C784EB6F97 for ; Thu, 6 Oct 2011 22:34:00 +1100 (EST) Received: from localhost ([::1]:53015 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBmD2-0002i5-Q4 for incoming@patchwork.ozlabs.org; Thu, 06 Oct 2011 07:33:52 -0400 Received: from eggs.gnu.org ([140.186.70.92]:52402) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBl7x-0005rm-TE for qemu-devel@nongnu.org; Thu, 06 Oct 2011 06:24:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RBl7w-0002W1-Si for qemu-devel@nongnu.org; Thu, 06 Oct 2011 06:24:33 -0400 Received: from mtagate1.uk.ibm.com ([194.196.100.161]:59991) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBl7w-0002Vj-G2; Thu, 06 Oct 2011 06:24:32 -0400 Received: from d06nrmr1707.portsmouth.uk.ibm.com (d06nrmr1707.portsmouth.uk.ibm.com [9.149.39.225]) by mtagate1.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p96AOU8F020757; Thu, 6 Oct 2011 10:24:30 GMT Received: from d06av08.portsmouth.uk.ibm.com (d06av08.portsmouth.uk.ibm.com [9.149.37.249]) by d06nrmr1707.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p96AOUJk2359390; Thu, 6 Oct 2011 11:24:30 +0100 Received: from d06av08.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p96AOUxV016659; Thu, 6 Oct 2011 11:24:30 +0100 Received: from localhost (dyn-9-174-219-31.manchester-maybrook.uk.ibm.com [9.174.219.31]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p96AOTxg016637; Thu, 6 Oct 2011 11:24:30 +0100 From: Stefan Hajnoczi To: Date: Thu, 6 Oct 2011 11:24:12 +0100 Message-Id: <1317896652-3393-1-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.6.3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 194.196.100.161 Cc: qemu-trivial@nongnu.org, Alon Levy , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH] qemu-options: avoid #if in spicevmc texi help 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 Preprocessor directives cannot be used in STEXI/ETEXI sections since they are not passed through the preprocessor. The spicevmc chardev option help currently uses #if, which is included verbatim in the man page output. Fix this by simply stating that spicevmc chardevs are available only in builds with spice support. Signed-off-by: Stefan Hajnoczi --- qemu-options.hx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index dfbabd0..d4fe990 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1673,15 +1673,15 @@ Connect to a local parallel port. @option{path} specifies the path to the parallel port device. @option{path} is required. -#if defined(CONFIG_SPICE) @item -chardev spicevmc ,id=@var{id} ,debug=@var{debug}, name=@var{name} +@option{spicevmc} is only available when spice support is built in. + @option{debug} debug level for spicevmc @option{name} name of spice channel to connect to Connect to a spice virtual machine channel, such as vdiport. -#endif @end table ETEXI