From: Sasha Levin <levinsasha928@gmail.com>
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 <levinsasha928@gmail.com>
Subject: [PATCH 4/5 V2] kvm tools: Update makefile and feature tests
Date: Mon, 23 May 2011 14:19:12 +0300 [thread overview]
Message-ID: <1306149553-26793-4-git-send-email-levinsasha928@gmail.com> (raw)
In-Reply-To: <1306149553-26793-1-git-send-email-levinsasha928@gmail.com>
Update feature tests to test for libvncserver.
VESA support doesn't get compiled in unless libvncserver
is installed.
Signed-off-by: John Floren <john@jfloren.net>
[ turning code into patches and cleanup ]
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
---
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 <rfb/rfb.h>
+
+int main(void)
+{
+ rfbIsActive((void *)0);
+ return 0;
+}
+endef
--
1.7.5.rc3
next prev parent reply other threads:[~2011-05-23 11:19 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-23 11:19 [PATCH 1/5 V2] kvm tools: Add BIOS INT10 handler Sasha Levin
2011-05-23 11:19 ` [PATCH 2/5 V2] kvm tools: Add video mode to kernel initialization Sasha Levin
2011-05-23 11:30 ` Ingo Molnar
2011-05-23 11:19 ` [PATCH 3/5 V2] kvm tools: Add VESA device Sasha Levin
2011-05-23 11:32 ` Ingo Molnar
2011-05-23 11:19 ` Sasha Levin [this message]
2011-05-23 11:19 ` [PATCH 5/5 V2] kvm tools: Initialize and use VESA and VNC Sasha Levin
2011-05-23 11:38 ` Ingo Molnar
2011-05-23 11:45 ` Pekka Enberg
2011-05-24 8:37 ` Paolo Bonzini
2011-05-24 8:50 ` Ingo Molnar
2011-05-24 9:10 ` Paolo Bonzini
2011-05-24 9:55 ` Pekka Enberg
2011-05-24 11:22 ` Avi Kivity
2011-05-24 11:26 ` Pekka Enberg
2011-05-24 11:30 ` Sasha Levin
2011-05-24 11:30 ` Avi Kivity
2011-05-24 11:38 ` Pekka Enberg
2011-05-24 11:41 ` Avi Kivity
2011-05-24 11:56 ` Pekka Enberg
2011-05-24 12:27 ` Paolo Bonzini
2011-05-24 14:38 ` Avi Kivity
2011-05-24 14:37 ` Avi Kivity
2011-05-24 14:54 ` Pekka Enberg
2011-05-24 19:03 ` Ingo Molnar
2011-05-24 19:00 ` Ingo Molnar
2011-05-24 19:16 ` Ingo Molnar
2011-05-24 9:18 ` Paolo Bonzini
2011-05-24 19:40 ` Ingo Molnar
2011-05-25 8:21 ` Paolo Bonzini
2011-05-25 8:32 ` Ingo Molnar
2011-05-25 9:15 ` Paolo Bonzini
2011-05-25 9:36 ` Ingo Molnar
2011-05-25 10:01 ` Paolo Bonzini
2011-05-25 10:17 ` Ingo Molnar
2011-05-25 10:44 ` Paolo Bonzini
2011-05-25 12:53 ` Ingo Molnar
2011-05-25 15:37 ` Paolo Bonzini
2011-05-25 9:49 ` Ingo Molnar
2011-05-25 8:38 ` Ingo Molnar
2011-05-24 8:51 ` Cyrill Gorcunov
2011-05-23 14:10 ` Pekka Enberg
2011-05-23 11:29 ` [PATCH 1/5 V2] kvm tools: Add BIOS INT10 handler Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1306149553-26793-4-git-send-email-levinsasha928@gmail.com \
--to=levinsasha928@gmail.com \
--cc=asias.hejun@gmail.com \
--cc=gorcunov@gmail.com \
--cc=john@jfloren.net \
--cc=kvm@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=penberg@kernel.org \
--cc=prasadjoshi124@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox