From patchwork Mon May 23 08:44:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 808102 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4N8jmCA005751 for ; Mon, 23 May 2011 08:45:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750909Ab1EWIpp (ORCPT ); Mon, 23 May 2011 04:45:45 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:63394 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752870Ab1EWIpo (ORCPT ); Mon, 23 May 2011 04:45:44 -0400 Received: by mail-bw0-f46.google.com with SMTP id 15so4514519bwz.19 for ; Mon, 23 May 2011 01:45:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=gdrwFjLz2SEoHix4ne3xutCD9pgYZPrV2BzXMeAWEVo=; b=Ef+aVmcFPNmp0OkeBY1m+vvOSBBUUQXKMufltRKxJ8NlJYS06DzpWmitpebi/lpQki DSeA3nQg9TkRQ8ihlXsHA1E9oxS/54Qith/SuVkcX02AVnqsBcDuVGiOncgfOqWd+Gp0 irfn33iOvZODP+mv8fRoSxHkk5Jch2BY7sm0k= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=BQU/pdsswkWVbcfsIcifQHuCJ1T4Ox+zJ9Ep3vrwGJRXk7MWr6M0wOs/GzT7oNl61M COHhS404gnAiK/tZMYqqipa2I8h3S3aLMFx+RXVRO/9QDOy6PIq3VIYiSnfLUg5qhvy1 Nw8TBBtDYGXRs4jrHHSmCfJuocQFo8+J4y8h0= Received: by 10.204.7.211 with SMTP id e19mr1885454bke.139.1306140343723; Mon, 23 May 2011 01:45:43 -0700 (PDT) Received: from localhost.localdomain (bzq-79-179-199-121.red.bezeqint.net [79.179.199.121]) by mx.google.com with ESMTPS id q18sm3742392bka.15.2011.05.23.01.45.41 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 May 2011 01:45:43 -0700 (PDT) From: Sasha Levin To: penberg@kernel.org Cc: john@jfloren.net, kvm@vger.kernel.org, mingo@elte.hu, asias.hejun@gmail.com, gorcunov@gmail.com, prasadjoshi124@gmail.com, Sasha Levin Subject: [PATCH 4/5] kvm tools: Update makefile and feature tests Date: Mon, 23 May 2011 11:44:50 +0300 Message-Id: <1306140291-17493-4-git-send-email-levinsasha928@gmail.com> X-Mailer: git-send-email 1.7.5.rc3 In-Reply-To: <1306140291-17493-1-git-send-email-levinsasha928@gmail.com> References: <1306140291-17493-1-git-send-email-levinsasha928@gmail.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 23 May 2011 08:45:48 +0000 (UTC) Update feature tests to test for libvncserver. VESA support doesn't get compiled in unless libvncserver is installed. Signed-off-by: John Floren Signed-off-by: Sasha Levin --- tools/kvm/Makefile | 11 ++++++++++- tools/kvm/config/feature-tests.mak | 10 ++++++++++ 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile index e6e8d4e..2ebc86c 100644 --- a/tools/kvm/Makefile +++ b/tools/kvm/Makefile @@ -58,6 +58,14 @@ ifeq ($(has_bfd),y) LIBS += -lbfd endif +FLAGS_VNCSERVER=$(CFLAGS) -lvncserver +has_vncserver := $(call try-cc,$(SOURCE_VNCSERVER),$(FLAGS_VNCSERVER)) +ifeq ($(has_vncserver),y) + CFLAGS += -DCONFIG_HAS_VNCSERVER + OBJS += hw/vesa.o + LIBS += -lvncserver +endif + DEPS := $(patsubst %.o,%.d,$(OBJS)) # Exclude BIOS object files from header dependencies. @@ -153,9 +161,10 @@ bios/bios.o: bios/bios.S bios/bios-rom.bin bios/bios-rom.bin: bios/bios-rom.S bios/e820.c $(E) " CC " $@ $(Q) $(CC) -include code16gcc.h $(CFLAGS) $(BIOS_CFLAGS) -c -s bios/e820.c -o bios/e820.o + $(Q) $(CC) -include code16gcc.h $(CFLAGS) $(BIOS_CFLAGS) -c -s bios/int10.c -o bios/int10.o $(Q) $(CC) $(CFLAGS) $(BIOS_CFLAGS) -c -s bios/bios-rom.S -o bios/bios-rom.o $(E) " LD " $@ - $(Q) ld -T bios/rom.ld.S -o bios/bios-rom.bin.elf bios/bios-rom.o bios/e820.o + $(Q) ld -T bios/rom.ld.S -o bios/bios-rom.bin.elf bios/bios-rom.o bios/e820.o bios/int10.o $(E) " OBJCOPY " $@ $(Q) objcopy -O binary -j .text bios/bios-rom.bin.elf bios/bios-rom.bin $(E) " NM " $@ diff --git a/tools/kvm/config/feature-tests.mak b/tools/kvm/config/feature-tests.mak index 6170fd2..0801b54 100644 --- a/tools/kvm/config/feature-tests.mak +++ b/tools/kvm/config/feature-tests.mak @@ -126,3 +126,13 @@ int main(void) return 0; } endef + +define SOURCE_VNCSERVER +#include + +int main(void) +{ + rfbIsActive((void *)0); + return 0; +} +endef