From patchwork Mon May 23 11:19:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 808352 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 p4NBJg1M001859 for ; Mon, 23 May 2011 11:19:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753755Ab1EWLTi (ORCPT ); Mon, 23 May 2011 07:19:38 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:36635 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752925Ab1EWLTh (ORCPT ); Mon, 23 May 2011 07:19:37 -0400 Received: by wwa36 with SMTP id 36so6080884wwa.1 for ; Mon, 23 May 2011 04:19:36 -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=0EEOec9nBGlB4C8EOW22NG2lMEPZQyqiX7l1p+jzK3w=; b=V1LGEVTZpZxxfqwQiSdkByK3g4lOcLlGk5gZQw0wCY4W62eFPABRoz3ZrV6nzXSnIH kWhZ8xfMzJuufei3y/5vFSnYkhRAEcok4dXEkcPPuzsCh+fRHjRVwGeymxLGKX8ufimj 7q1UCPTWEw0xkRFbCVenYc1KzU+zRKtKvM7Ac= 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=rM0+iftKrejW8CEkvZbhbMKQgCh1Yz6b7S1/o510O/9JuXbk6tFMOG/3Apwa2iNPuW Vz6w8Lgb/gZYco3uW6fGibxCT8sGv7Mf/BeTgigul8oT9LEbINcWLqmpBdijEjUYpqOs J6Nb4oRdJWS8cI5zCcsctNayFyATbElWuxGvE= Received: by 10.216.254.90 with SMTP id g68mr2115169wes.16.1306149576023; Mon, 23 May 2011 04:19:36 -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 r29sm3208804weq.21.2011.05.23.04.19.34 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 May 2011 04:19:35 -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 V2] kvm tools: Update makefile and feature tests Date: Mon, 23 May 2011 14:19:12 +0300 Message-Id: <1306149553-26793-4-git-send-email-levinsasha928@gmail.com> X-Mailer: git-send-email 1.7.5.rc3 In-Reply-To: <1306149553-26793-1-git-send-email-levinsasha928@gmail.com> References: <1306149553-26793-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 11:19:43 +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 [ 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