From patchwork Mon May 23 12:15:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 808512 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4NCHMIQ000341 for ; Mon, 23 May 2011 12:17:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754806Ab1EWMRS (ORCPT ); Mon, 23 May 2011 08:17:18 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:52850 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754745Ab1EWMRJ (ORCPT ); Mon, 23 May 2011 08:17:09 -0400 Received: by mail-ww0-f44.google.com with SMTP id 36so6130979wwa.1 for ; Mon, 23 May 2011 05:17:08 -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=X3exmaYp5pt+s9CP6f02wAD3retTOTGtDRRAefqZJaA=; b=pFiAo2OU4IOO9CtUt/oiwA0qkoEG0b4+bRelwh0jDpYo+wFSEZTsOhTSSfo8bCmITi 7cw5BlenQecIVNx0/BPzUlHiouZPyfkj0woYKjNUjVzCCCEPkaFTJGL1iQpdmne1Q39p v+/CQlyiNZDh5+/4QNbPVpfIwhLgQ5XDBVrBY= 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=ZerbwJik+A0otIKfTA7AL5ql7/EwATXBWQ7vC9XVp/oZ1vHhnIBwjH4CzHd5DrsBz4 4MGVjhSquu+HkPV8AE1efN1m+z9gfQx7MHXH8ly11HtIi4Oz2q9JgGRzzNwGd/8RK8ng wTgqSuf6hUVL5trnxNRO4kulEDhYXk5K908/g= Received: by 10.216.134.66 with SMTP id r44mr2143770wei.92.1306153028717; Mon, 23 May 2011 05:17:08 -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 r29sm3236685weq.45.2011.05.23.05.17.07 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 May 2011 05:17:08 -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 V3 4/5] kvm tools: Update makefile and feature tests Date: Mon, 23 May 2011 15:15:17 +0300 Message-Id: <1306152918-29944-4-git-send-email-levinsasha928@gmail.com> X-Mailer: git-send-email 1.7.5.rc3 In-Reply-To: <1306152918-29944-1-git-send-email-levinsasha928@gmail.com> References: <1306152918-29944-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 (demeter2.kernel.org [140.211.167.43]); Mon, 23 May 2011 12:17:22 +0000 (UTC) From: John Floren Update feature tests to test for libvncserver. VESA support doesn't get compiled in unless libvncserver is installed. Signed-off-by: John Floren [ turning code into patches and cleanup ] 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