From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=38589 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PAhmr-0002XJ-BS
	for qemu-devel@nongnu.org; Tue, 26 Oct 2010 07:33:56 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <roytam@gmail.com>) id 1PAhmm-0008A6-Ru
	for qemu-devel@nongnu.org; Tue, 26 Oct 2010 07:33:49 -0400
Received: from mail-ww0-f53.google.com ([74.125.82.53]:61466)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <roytam@gmail.com>) id 1PAhmm-00089m-NO
	for qemu-devel@nongnu.org; Tue, 26 Oct 2010 07:33:48 -0400
Received: by wwb31 with SMTP id 31so4388276wwb.10
	for <qemu-devel@nongnu.org>; Tue, 26 Oct 2010 04:33:46 -0700 (PDT)
MIME-Version: 1.0
From: Roy Tam <roytam@gmail.com>
Date: Tue, 26 Oct 2010 19:33:09 +0800
Message-ID: <AANLkTikyowWtW20bCCExc8GBek2ZN7JZ4-W0nZsPA2FN@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1
Subject: [Qemu-devel] [PATCH] QEMU_OPTION_spice is not guarded by ifdef
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel <qemu-devel@nongnu.org>, Gerd Hoffmann <kraxel@redhat.com>

Hi all,

commit 29b0040be6371c403dae0fef7fec36b814e300e8 breaks building when
"--disable-spice" configure switch is used. The following patch fix
this.

Best regards,
Roy

Signed-off-by: Roy Tam <roytam@gmail.com>
---

diff --git a/vl.c b/vl.c
index 7038952..6352673 100644
--- a/vl.c
+++ b/vl.c
@@ -2594,6 +2594,7 @@ int main(int argc, char **argv, char **envp)
                     }
                     break;
                 }
+#ifdef CONFIG_SPICE
             case QEMU_OPTION_spice:
                 olist = qemu_find_opts("spice");
                 if (!olist) {
@@ -2606,6 +2607,7 @@ int main(int argc, char **argv, char **envp)
                     exit(1);
                 }
                 break;
+#endif
             case QEMU_OPTION_writeconfig:
                 {
                     FILE *fp;