From patchwork Thu Jun 19 16:51:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Nikolaev X-Patchwork-Id: 361926 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D2659140076 for ; Fri, 20 Jun 2014 02:52:27 +1000 (EST) Received: from localhost ([::1]:36754 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxfZa-0004Ss-5j for incoming@patchwork.ozlabs.org; Thu, 19 Jun 2014 12:52:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35999) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxfZF-00049f-CT for qemu-devel@nongnu.org; Thu, 19 Jun 2014 12:52:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxfZ8-0005o2-MD for qemu-devel@nongnu.org; Thu, 19 Jun 2014 12:52:05 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:34467) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxfZ8-0005n9-Ge for qemu-devel@nongnu.org; Thu, 19 Jun 2014 12:51:58 -0400 Received: by mail-wg0-f44.google.com with SMTP id x13so2533285wgg.3 for ; Thu, 19 Jun 2014 09:51:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:from:to:cc:date:message-id:user-agent :mime-version:content-type:content-transfer-encoding; bh=U9k9FGPifExznGT5utCOyG5X7m62qDn+uS6qqmuMri0=; b=iNGxOv+ynSqBeDXlHB9AofgG3yExcg6W99426uaQMvTAiJbfISjVaiOkO1UolZXUbN fLU1EfAdnruEzYqnseo5ZmWj2a0DGNuNGBnoranUJYn+Gjjr/Bra2U/ozFG8+hmOFiEw Sk+2Ih21+SsB4iF+xsgbMKN2eg9fzQusYsMcPNyHUAlDaaNDf3ffWQgzmup7GZ0nNDN2 pxnQcxTPaVYatm9HF+JIGforOWIDLnWCP/H8y7s58krZ77HqNKjNariqJ/2B+YGS0o0/ yUI9R0TX9bXZZSpnbDa6bDTCADwf8YlOi14EtnVzOxFEzIJx7HBwphAjvbnu1CkMiZAb 67UA== X-Gm-Message-State: ALoCoQmdKpR3puVD9lXxGPUrY3z/2Gwe4HsrHozuDMMUvODkdwDuWsVo9Vh6QLT8uSGyletmtESQ X-Received: by 10.194.10.69 with SMTP id g5mr6324415wjb.116.1403196717615; Thu, 19 Jun 2014 09:51:57 -0700 (PDT) Received: from [0.0.14.236] ([82.146.27.14]) by mx.google.com with ESMTPSA id br5sm9833175wjc.9.2014.06.19.09.51.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jun 2014 09:51:56 -0700 (PDT) From: Nikolay Nikolaev To: snabb-devel@googlegroups.com, qemu-devel@nongnu.org, mst@redhat.com Date: Thu, 19 Jun 2014 19:51:50 +0300 Message-ID: <20140619165125.15863.13008.stgit@3820> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.44 Cc: tech@virtualopensystems.com, n.nikolaev@virtualopensystems.com Subject: [Qemu-devel] [PATCH] fixup! libqemustub: add more stubs for qemu-char 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 Fix build break when --disable-spice. Reported-by: Andrew Jones Signed-off-by: Nikolay Nikolaev --- stubs/qemu-chr-open-spice.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stubs/qemu-chr-open-spice.c b/stubs/qemu-chr-open-spice.c index 40a29a9..83d8a66 100644 --- a/stubs/qemu-chr-open-spice.c +++ b/stubs/qemu-chr-open-spice.c @@ -1,12 +1,16 @@ #include "qemu-common.h" #include "ui/qemu-spice.h" +#ifdef CONFIG_SPICE CharDriverState *qemu_chr_open_spice_vmc(const char *type) { return NULL; } +#if SPICE_SERVER_VERSION >= 0x000c02 CharDriverState *qemu_chr_open_spice_port(const char *name) { return NULL; } +#endif +#endif