2006-05-14 20:07:53 +08:00
|
|
|
# Makefile for QEMU.
|
|
|
|
|
|
2009-04-15 22:42:57 +08:00
|
|
|
ifneq ($(wildcard config-host.mak),)
|
2009-05-19 23:17:58 +08:00
|
|
|
# Put the all: rule here so that config-host.mak can contain dependencies.
|
|
|
|
|
all: build-all
|
2006-04-16 20:41:07 +08:00
|
|
|
include config-host.mak
|
2009-01-22 02:12:52 +08:00
|
|
|
include $(SRC_PATH)/rules.mak
|
2009-04-15 22:42:57 +08:00
|
|
|
else
|
|
|
|
|
config-host.mak:
|
|
|
|
|
@echo "Please call configure before running make!"
|
|
|
|
|
@exit 1
|
|
|
|
|
endif
|
2003-02-19 07:35:48 +08:00
|
|
|
|
2008-09-24 09:13:40 +08:00
|
|
|
.PHONY: all clean cscope distclean dvi html info install install-doc \
|
|
|
|
|
recurse-all speed tar tarbin test
|
2006-05-14 20:07:53 +08:00
|
|
|
|
2007-11-19 05:12:37 +08:00
|
|
|
VPATH=$(SRC_PATH):$(SRC_PATH)/hw
|
|
|
|
|
|
2009-08-03 20:47:06 +08:00
|
|
|
LIBS+=-lz $(LIBS_TOOLS)
|
2009-07-27 22:12:51 +08:00
|
|
|
|
2006-04-24 01:57:59 +08:00
|
|
|
ifdef BUILD_DOCS
|
2008-05-28 05:13:40 +08:00
|
|
|
DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8
|
2006-04-24 01:57:59 +08:00
|
|
|
else
|
|
|
|
|
DOCS=
|
|
|
|
|
endif
|
2003-05-26 00:41:18 +08:00
|
|
|
|
2009-07-31 20:18:32 +08:00
|
|
|
build-all: $(TOOLS) $(DOCS) recurse-all
|
2006-05-14 00:54:03 +08:00
|
|
|
|
2009-04-15 22:42:57 +08:00
|
|
|
config-host.mak: configure
|
|
|
|
|
ifneq ($(wildcard config-host.mak),)
|
|
|
|
|
@echo $@ is out-of-date, running configure
|
2009-04-18 04:01:12 +08:00
|
|
|
@sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh
|
2009-04-15 22:42:57 +08:00
|
|
|
endif
|
|
|
|
|
|
2009-05-07 09:00:31 +08:00
|
|
|
SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory)
|
2008-05-29 00:44:57 +08:00
|
|
|
SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
|
|
|
|
|
|
2008-12-07 23:21:23 +08:00
|
|
|
subdir-%:
|
2009-05-07 09:00:31 +08:00
|
|
|
$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" all,)
|
2006-05-13 21:55:08 +08:00
|
|
|
|
2008-05-29 00:44:57 +08:00
|
|
|
$(filter %-softmmu,$(SUBDIR_RULES)): libqemu_common.a
|
2009-07-31 20:18:32 +08:00
|
|
|
|
|
|
|
|
ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
|
|
|
|
|
romsubdir-%:
|
|
|
|
|
$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pc-bios/$* V="$(V)" TARGET_DIR="$*/",)
|
|
|
|
|
|
|
|
|
|
ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS))
|
|
|
|
|
|
|
|
|
|
recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
|
2006-08-02 00:21:11 +08:00
|
|
|
|
2007-11-11 10:51:17 +08:00
|
|
|
#######################################################################
|
2009-06-25 06:08:02 +08:00
|
|
|
# block-obj-y is code used by both qemu system emulation and qemu-img
|
2007-11-11 10:51:17 +08:00
|
|
|
|
2009-06-25 06:08:02 +08:00
|
|
|
block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o
|
2009-08-11 06:14:11 +08:00
|
|
|
block-obj-y += nbd.o block.o aio.o aes.o osdep.o
|
2009-08-11 05:39:39 +08:00
|
|
|
block-obj-$(CONFIG_POSIX) += posix-aio-compat.o
|
2009-08-20 22:58:35 +08:00
|
|
|
block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
|
2009-07-16 23:57:03 +08:00
|
|
|
|
2009-08-01 03:45:56 +08:00
|
|
|
block-nested-y += cow.o qcow.o vdi.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o
|
2009-07-16 23:57:03 +08:00
|
|
|
block-nested-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o
|
|
|
|
|
block-nested-y += parallels.o nbd.o
|
2009-07-27 22:13:08 +08:00
|
|
|
block-nested-$(CONFIG_WIN32) += raw-win32.o
|
|
|
|
|
block-nested-$(CONFIG_POSIX) += raw-posix.o
|
2009-07-16 23:57:03 +08:00
|
|
|
block-nested-$(CONFIG_CURL) += curl.o
|
|
|
|
|
|
|
|
|
|
block-obj-y += $(addprefix block/, $(block-nested-y))
|
2009-05-11 23:41:42 +08:00
|
|
|
|
2007-11-08 03:24:02 +08:00
|
|
|
######################################################################
|
2008-02-01 18:02:52 +08:00
|
|
|
# libqemu_common.a: Target independent part of system emulation. The
|
2007-11-08 03:24:02 +08:00
|
|
|
# long term path is to suppress *all* target specific code in case of
|
|
|
|
|
# system emulation, i.e. a single QEMU executable should support all
|
|
|
|
|
# CPUs and machines.
|
2004-05-18 04:06:42 +08:00
|
|
|
|
2009-06-25 06:08:07 +08:00
|
|
|
obj-y = $(block-obj-y)
|
2009-09-12 07:17:55 +08:00
|
|
|
obj-y += readline.o console.o
|
2009-06-25 06:08:07 +08:00
|
|
|
|
2009-09-21 03:20:05 +08:00
|
|
|
obj-y += tcg-runtime.o host-utils.o
|
2009-09-21 00:05:47 +08:00
|
|
|
obj-y += irq.o ptimer.o ioport.o
|
2009-06-25 06:08:07 +08:00
|
|
|
obj-y += i2c.o smbus.o smbus_eeprom.o max7310.o max111x.o wm8750.o
|
|
|
|
|
obj-y += ssd0303.o ssd0323.o ads7846.o stellaris_input.o twl92230.o
|
|
|
|
|
obj-y += tmp105.o lm832x.o eeprom93xx.o tsc2005.o
|
|
|
|
|
obj-y += scsi-disk.o cdrom.o
|
2009-08-31 20:24:04 +08:00
|
|
|
obj-y += scsi-generic.o scsi-bus.o
|
2009-06-25 06:08:07 +08:00
|
|
|
obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o
|
2009-08-31 20:23:59 +08:00
|
|
|
obj-y += usb-serial.o usb-net.o usb-bus.o
|
2009-06-25 06:08:07 +08:00
|
|
|
obj-y += sd.o ssi-sd.o
|
|
|
|
|
obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o
|
|
|
|
|
obj-y += bt-hci-csr.o
|
|
|
|
|
obj-y += buffered_file.o migration.o migration-tcp.o net.o qemu-sockets.o
|
2009-07-16 23:57:06 +08:00
|
|
|
obj-y += qemu-char.o aio.o net-checksum.o savevm.o
|
2009-06-25 06:08:07 +08:00
|
|
|
obj-y += msmouse.o ps2.o
|
2009-07-15 19:43:31 +08:00
|
|
|
obj-y += qdev.o qdev-properties.o ssi.o
|
2009-09-20 16:28:29 +08:00
|
|
|
obj-y += qint.o qstring.o qdict.o qemu-config.o
|
2007-11-18 01:14:51 +08:00
|
|
|
|
2009-06-25 06:08:09 +08:00
|
|
|
obj-$(CONFIG_BRLAPI) += baum.o
|
2009-07-27 22:13:08 +08:00
|
|
|
obj-$(CONFIG_WIN32) += tap-win32.o
|
2009-08-18 21:56:25 +08:00
|
|
|
obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o
|
2007-11-08 03:24:02 +08:00
|
|
|
|
2009-08-03 20:46:57 +08:00
|
|
|
audio/audio.o audio/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS)
|
2009-06-25 06:08:09 +08:00
|
|
|
|
|
|
|
|
audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o
|
|
|
|
|
audio-obj-$(CONFIG_SDL) += sdlaudio.o
|
|
|
|
|
audio-obj-$(CONFIG_OSS) += ossaudio.o
|
|
|
|
|
audio-obj-$(CONFIG_COREAUDIO) += coreaudio.o
|
|
|
|
|
audio-obj-$(CONFIG_ALSA) += alsaaudio.o
|
|
|
|
|
audio-obj-$(CONFIG_DSOUND) += dsoundaudio.o
|
|
|
|
|
audio-obj-$(CONFIG_FMOD) += fmodaudio.o
|
|
|
|
|
audio-obj-$(CONFIG_ESD) += esdaudio.o
|
|
|
|
|
audio-obj-$(CONFIG_PA) += paaudio.o
|
2009-08-03 20:46:59 +08:00
|
|
|
audio-obj-$(CONFIG_AUDIO_PT_INT) += audio_pt_int.o
|
2009-06-25 06:08:03 +08:00
|
|
|
audio-obj-y += wavcapture.o
|
2009-06-25 06:08:07 +08:00
|
|
|
obj-y += $(addprefix audio/, $(audio-obj-y))
|
2007-11-08 03:24:02 +08:00
|
|
|
|
2009-06-25 06:08:07 +08:00
|
|
|
obj-y += keymaps.o
|
2009-06-25 06:08:09 +08:00
|
|
|
obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o
|
|
|
|
|
obj-$(CONFIG_CURSES) += curses.o
|
2009-06-25 06:08:07 +08:00
|
|
|
obj-y += vnc.o acl.o d3des.o
|
2009-06-25 06:08:09 +08:00
|
|
|
obj-$(CONFIG_VNC_TLS) += vnc-tls.o vnc-auth-vencrypt.o
|
|
|
|
|
obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o
|
|
|
|
|
obj-$(CONFIG_COCOA) += cocoa.o
|
|
|
|
|
obj-$(CONFIG_IOTHREAD) += qemu-thread.o
|
2009-04-25 02:03:15 +08:00
|
|
|
|
2009-06-25 06:08:04 +08:00
|
|
|
slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o
|
|
|
|
|
slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o
|
|
|
|
|
slirp-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o tftp.o
|
2009-06-25 06:08:09 +08:00
|
|
|
obj-$(CONFIG_SLIRP) += $(addprefix slirp/, $(slirp-obj-y))
|
2007-11-08 03:24:02 +08:00
|
|
|
|
2009-05-21 23:54:48 +08:00
|
|
|
# xen backend driver support
|
2009-06-25 06:08:09 +08:00
|
|
|
obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o
|
|
|
|
|
obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o
|
2009-05-21 23:54:48 +08:00
|
|
|
|
2009-08-03 20:46:21 +08:00
|
|
|
QEMU_CFLAGS+=$(CURL_CFLAGS)
|
2009-05-11 23:41:42 +08:00
|
|
|
|
2007-11-08 03:24:02 +08:00
|
|
|
cocoa.o: cocoa.m
|
|
|
|
|
|
2009-03-07 04:27:10 +08:00
|
|
|
keymaps.o: keymaps.c keymaps.h
|
|
|
|
|
|
2009-06-24 18:58:25 +08:00
|
|
|
sdl_zoom.o: sdl_zoom.c sdl_zoom.h sdl_zoom_template.h
|
|
|
|
|
|
|
|
|
|
sdl.o: sdl.c keymaps.h sdl_keysym.h sdl_zoom.h
|
2009-01-22 02:12:44 +08:00
|
|
|
|
2009-08-03 20:46:21 +08:00
|
|
|
sdl.o audio/sdlaudio.o sdl_zoom.o baum.o: QEMU_CFLAGS += $(SDL_CFLAGS)
|
2007-11-08 03:24:02 +08:00
|
|
|
|
Support ACLs for controlling VNC access ("Daniel P. Berrange")
This patch introduces a generic internal API for access control lists
to be used by network servers in QEMU. It adds support for checking
these ACL in the VNC server, in two places. The first ACL is for the
SASL authentication mechanism, checking the SASL username. This ACL
is called 'vnc.username'. The second is for the TLS authentication
mechanism, when x509 client certificates are turned on, checking against
the Distinguished Name of the client. This ACL is called 'vnc.x509dname'
The internal API provides for an ACL with the following characteristics
- A unique name, eg vnc.username, and vnc.x509dname.
- A default policy, allow or deny
- An ordered series of match rules, with allow or deny policy
If none of the match rules apply, then the default policy is
used.
There is a monitor API to manipulate the ACLs, which I'll describe via
examples
(qemu) acl show vnc.username
policy: allow
(qemu) acl policy vnc.username denya
acl: policy set to 'deny'
(qemu) acl allow vnc.username fred
acl: added rule at position 1
(qemu) acl allow vnc.username bob
acl: added rule at position 2
(qemu) acl allow vnc.username joe 1
acl: added rule at position 1
(qemu) acl show vnc.username
policy: deny
0: allow fred
1: allow joe
2: allow bob
(qemu) acl show vnc.x509dname
policy: allow
(qemu) acl policy vnc.x509dname deny
acl: policy set to 'deny'
(qemu) acl allow vnc.x509dname C=GB,O=ACME,L=London,CN=*
acl: added rule at position 1
(qemu) acl allow vnc.x509dname C=GB,O=ACME,L=Boston,CN=bob
acl: added rule at position 2
(qemu) acl show vnc.x509dname
policy: deny
0: allow C=GB,O=ACME,L=London,CN=*
1: allow C=GB,O=ACME,L=Boston,CN=bob
By default the VNC server will not use any ACLs, allowing access to
the server if the user successfully authenticates. To enable use of
ACLs to restrict user access, the ',acl' flag should be given when
starting QEMU. The initial ACL activated will be a 'deny all' policy
and should be customized using monitor commands.
eg enable SASL auth and ACLs
qemu .... -vnc localhost:1,sasl,acl
The next patch will provide a way to load a pre-defined ACL when
starting up
Makefile | 6 +
b/acl.c | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
b/acl.h | 74 ++++++++++++++++++++++
configure | 18 +++++
monitor.c | 95 ++++++++++++++++++++++++++++
qemu-doc.texi | 49 ++++++++++++++
vnc-auth-sasl.c | 16 +++-
vnc-auth-sasl.h | 7 ++
vnc-tls.c | 19 +++++
vnc-tls.h | 3
vnc.c | 21 ++++++
vnc.h | 3
12 files changed, 491 insertions(+), 5 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6726 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-07 04:27:37 +08:00
|
|
|
acl.o: acl.h acl.c
|
|
|
|
|
|
Add SASL authentication support ("Daniel P. Berrange")
This patch adds the new SASL authentication protocol to the VNC server.
It is enabled by setting the 'sasl' flag when launching VNC. SASL can
optionally provide encryption via its SSF layer, if a suitable mechanism
is configured (eg, GSSAPI/Kerberos, or Digest-MD5). If an SSF layer is
not available, then it should be combined with the x509 VNC authentication
protocol which provides encryption.
eg, if using GSSAPI
qemu -vnc localhost:1,sasl
eg if using TLS/x509 for encryption
qemu -vnc localhost:1,sasl,tls,x509
By default the Cyrus SASL library will look for its configuration in
the file /etc/sasl2/qemu.conf. For non-root users, this can be overridden
by setting the SASL_CONF_PATH environment variable, eg to make it look in
$HOME/.sasl2. NB unprivileged users may not have access to the full range
of SASL mechanisms, since some of them require some administrative privileges
to configure. The patch includes an example SASL configuration file which
illustrates config for GSSAPI and Digest-MD5, though it should be noted that
the latter is not really considered secure any more.
Most of the SASL authentication code is located in a separate source file,
vnc-auth-sasl.c. The main vnc.c file only contains minimal integration
glue, specifically parsing of command line flags / setup, and calls to
start the SASL auth process, to do encoding/decoding for data.
There are several possible stacks for reading & writing of data, depending
on the combo of VNC authentication methods in use
- Clear. read/write straight to socket
- TLS. read/write via GNUTLS helpers
- SASL. encode/decode via SASL SSF layer, then read/write to socket
- SASL+TLS. encode/decode via SASL SSF layer, then read/write via GNUTLS
Hence, the vnc_client_read & vnc_client_write methods have been refactored
a little.
vnc_client_read: main entry point for reading, calls either
- vnc_client_read_plain reading, with no intermediate decoding
- vnc_client_read_sasl reading, with SASL SSF decoding
These two methods, then call vnc_client_read_buf(). This decides
whether to write to the socket directly or write via GNUTLS.
The situation is the same for writing data. More extensive comments
have been added in the code / patch. The vnc_client_read_sasl and
vnc_client_write_sasl method implementations live in the separate
vnc-auth-sasl.c file.
The state required for the SASL auth mechanism is kept in a separate
VncStateSASL struct, defined in vnc-auth-sasl.h and included in the
main VncState.
The configure script probes for SASL and automatically enables it
if found, unless --disable-vnc-sasl was given to override it.
Makefile | 7
Makefile.target | 5
b/qemu.sasl | 34 ++
b/vnc-auth-sasl.c | 626 ++++++++++++++++++++++++++++++++++++++++++++++++++++
b/vnc-auth-sasl.h | 67 +++++
configure | 34 ++
qemu-doc.texi | 97 ++++++++
vnc-auth-vencrypt.c | 12
vnc.c | 249 ++++++++++++++++++--
vnc.h | 31 ++
10 files changed, 1129 insertions(+), 33 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6724 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-07 04:27:28 +08:00
|
|
|
vnc.h: vnc-tls.h vnc-auth-vencrypt.h vnc-auth-sasl.h keymaps.h
|
2009-03-07 04:27:23 +08:00
|
|
|
|
Support ACLs for controlling VNC access ("Daniel P. Berrange")
This patch introduces a generic internal API for access control lists
to be used by network servers in QEMU. It adds support for checking
these ACL in the VNC server, in two places. The first ACL is for the
SASL authentication mechanism, checking the SASL username. This ACL
is called 'vnc.username'. The second is for the TLS authentication
mechanism, when x509 client certificates are turned on, checking against
the Distinguished Name of the client. This ACL is called 'vnc.x509dname'
The internal API provides for an ACL with the following characteristics
- A unique name, eg vnc.username, and vnc.x509dname.
- A default policy, allow or deny
- An ordered series of match rules, with allow or deny policy
If none of the match rules apply, then the default policy is
used.
There is a monitor API to manipulate the ACLs, which I'll describe via
examples
(qemu) acl show vnc.username
policy: allow
(qemu) acl policy vnc.username denya
acl: policy set to 'deny'
(qemu) acl allow vnc.username fred
acl: added rule at position 1
(qemu) acl allow vnc.username bob
acl: added rule at position 2
(qemu) acl allow vnc.username joe 1
acl: added rule at position 1
(qemu) acl show vnc.username
policy: deny
0: allow fred
1: allow joe
2: allow bob
(qemu) acl show vnc.x509dname
policy: allow
(qemu) acl policy vnc.x509dname deny
acl: policy set to 'deny'
(qemu) acl allow vnc.x509dname C=GB,O=ACME,L=London,CN=*
acl: added rule at position 1
(qemu) acl allow vnc.x509dname C=GB,O=ACME,L=Boston,CN=bob
acl: added rule at position 2
(qemu) acl show vnc.x509dname
policy: deny
0: allow C=GB,O=ACME,L=London,CN=*
1: allow C=GB,O=ACME,L=Boston,CN=bob
By default the VNC server will not use any ACLs, allowing access to
the server if the user successfully authenticates. To enable use of
ACLs to restrict user access, the ',acl' flag should be given when
starting QEMU. The initial ACL activated will be a 'deny all' policy
and should be customized using monitor commands.
eg enable SASL auth and ACLs
qemu .... -vnc localhost:1,sasl,acl
The next patch will provide a way to load a pre-defined ACL when
starting up
Makefile | 6 +
b/acl.c | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
b/acl.h | 74 ++++++++++++++++++++++
configure | 18 +++++
monitor.c | 95 ++++++++++++++++++++++++++++
qemu-doc.texi | 49 ++++++++++++++
vnc-auth-sasl.c | 16 +++-
vnc-auth-sasl.h | 7 ++
vnc-tls.c | 19 +++++
vnc-tls.h | 3
vnc.c | 21 ++++++
vnc.h | 3
12 files changed, 491 insertions(+), 5 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6726 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-07 04:27:37 +08:00
|
|
|
vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h acl.h
|
2007-11-08 03:24:02 +08:00
|
|
|
|
2009-08-03 20:46:21 +08:00
|
|
|
vnc.o: QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
|
2008-02-11 00:33:14 +08:00
|
|
|
|
2009-03-07 04:27:23 +08:00
|
|
|
vnc-tls.o: vnc-tls.c vnc.h
|
|
|
|
|
|
|
|
|
|
vnc-auth-vencrypt.o: vnc-auth-vencrypt.c vnc.h
|
|
|
|
|
|
Add SASL authentication support ("Daniel P. Berrange")
This patch adds the new SASL authentication protocol to the VNC server.
It is enabled by setting the 'sasl' flag when launching VNC. SASL can
optionally provide encryption via its SSF layer, if a suitable mechanism
is configured (eg, GSSAPI/Kerberos, or Digest-MD5). If an SSF layer is
not available, then it should be combined with the x509 VNC authentication
protocol which provides encryption.
eg, if using GSSAPI
qemu -vnc localhost:1,sasl
eg if using TLS/x509 for encryption
qemu -vnc localhost:1,sasl,tls,x509
By default the Cyrus SASL library will look for its configuration in
the file /etc/sasl2/qemu.conf. For non-root users, this can be overridden
by setting the SASL_CONF_PATH environment variable, eg to make it look in
$HOME/.sasl2. NB unprivileged users may not have access to the full range
of SASL mechanisms, since some of them require some administrative privileges
to configure. The patch includes an example SASL configuration file which
illustrates config for GSSAPI and Digest-MD5, though it should be noted that
the latter is not really considered secure any more.
Most of the SASL authentication code is located in a separate source file,
vnc-auth-sasl.c. The main vnc.c file only contains minimal integration
glue, specifically parsing of command line flags / setup, and calls to
start the SASL auth process, to do encoding/decoding for data.
There are several possible stacks for reading & writing of data, depending
on the combo of VNC authentication methods in use
- Clear. read/write straight to socket
- TLS. read/write via GNUTLS helpers
- SASL. encode/decode via SASL SSF layer, then read/write to socket
- SASL+TLS. encode/decode via SASL SSF layer, then read/write via GNUTLS
Hence, the vnc_client_read & vnc_client_write methods have been refactored
a little.
vnc_client_read: main entry point for reading, calls either
- vnc_client_read_plain reading, with no intermediate decoding
- vnc_client_read_sasl reading, with SASL SSF decoding
These two methods, then call vnc_client_read_buf(). This decides
whether to write to the socket directly or write via GNUTLS.
The situation is the same for writing data. More extensive comments
have been added in the code / patch. The vnc_client_read_sasl and
vnc_client_write_sasl method implementations live in the separate
vnc-auth-sasl.c file.
The state required for the SASL auth mechanism is kept in a separate
VncStateSASL struct, defined in vnc-auth-sasl.h and included in the
main VncState.
The configure script probes for SASL and automatically enables it
if found, unless --disable-vnc-sasl was given to override it.
Makefile | 7
Makefile.target | 5
b/qemu.sasl | 34 ++
b/vnc-auth-sasl.c | 626 ++++++++++++++++++++++++++++++++++++++++++++++++++++
b/vnc-auth-sasl.h | 67 +++++
configure | 34 ++
qemu-doc.texi | 97 ++++++++
vnc-auth-vencrypt.c | 12
vnc.c | 249 ++++++++++++++++++--
vnc.h | 31 ++
10 files changed, 1129 insertions(+), 33 deletions(-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6724 c046a42c-6fe2-441c-8c8c-71466251a162
2009-03-07 04:27:28 +08:00
|
|
|
vnc-auth-sasl.o: vnc-auth-sasl.c vnc.h
|
|
|
|
|
|
2009-03-07 04:27:10 +08:00
|
|
|
curses.o: curses.c keymaps.h curses_keys.h
|
2008-09-29 07:49:55 +08:00
|
|
|
|
2009-08-03 20:46:21 +08:00
|
|
|
bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS)
|
2007-11-08 03:24:02 +08:00
|
|
|
|
2009-06-25 06:08:07 +08:00
|
|
|
libqemu_common.a: $(obj-y)
|
2007-11-08 03:24:02 +08:00
|
|
|
|
|
|
|
|
######################################################################
|
|
|
|
|
|
2009-06-07 07:42:17 +08:00
|
|
|
qemu-img.o: qemu-img-cmds.h
|
|
|
|
|
|
2009-08-11 06:14:11 +08:00
|
|
|
qemu-img$(EXESUF): qemu-img.o qemu-tool.o $(block-obj-y)
|
2007-11-08 03:24:02 +08:00
|
|
|
|
2009-08-11 06:14:11 +08:00
|
|
|
qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o $(block-obj-y)
|
2009-01-22 02:13:02 +08:00
|
|
|
|
2009-08-11 06:14:11 +08:00
|
|
|
qemu-io$(EXESUF): qemu-io.o qemu-tool.o cmd.o $(block-obj-y)
|
2009-04-06 02:41:23 +08:00
|
|
|
|
2009-06-07 07:42:17 +08:00
|
|
|
qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
|
|
|
|
|
$(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $@")
|
|
|
|
|
|
2009-08-29 02:27:29 +08:00
|
|
|
check-qint: check-qint.o qint.o qemu-malloc.o
|
2009-08-29 02:27:30 +08:00
|
|
|
check-qstring: check-qstring.o qstring.o qemu-malloc.o
|
2009-08-29 02:27:32 +08:00
|
|
|
check-qdict: check-qdict.o qdict.o qint.o qstring.o qemu-malloc.o
|
2009-08-29 02:27:29 +08:00
|
|
|
|
2003-02-19 06:55:36 +08:00
|
|
|
clean:
|
2003-08-12 07:01:33 +08:00
|
|
|
# avoid old build problems by removing potentially incorrect old files
|
2007-09-17 05:08:06 +08:00
|
|
|
rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
|
2008-12-07 23:21:23 +08:00
|
|
|
rm -f *.o *.d *.a $(TOOLS) TAGS cscope.* *.pod *~ */*~
|
2009-05-10 06:14:19 +08:00
|
|
|
rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d
|
2009-06-10 02:45:16 +08:00
|
|
|
rm -f qemu-img-cmds.h
|
2004-05-13 03:32:15 +08:00
|
|
|
$(MAKE) -C tests clean
|
2009-07-31 20:18:32 +08:00
|
|
|
for d in $(ALL_SUBDIRS) libhw32 libhw64; do \
|
2004-05-13 03:32:15 +08:00
|
|
|
$(MAKE) -C $$d $@ || exit 1 ; \
|
2003-08-11 05:39:31 +08:00
|
|
|
done
|
2003-02-19 06:55:36 +08:00
|
|
|
|
2003-03-07 07:23:54 +08:00
|
|
|
distclean: clean
|
2009-07-23 04:37:40 +08:00
|
|
|
rm -f config-host.mak config-host.h config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi
|
2006-05-14 20:07:53 +08:00
|
|
|
rm -f qemu-{doc,tech}.{info,aux,cp,dvi,fn,info,ky,log,pg,toc,tp,vr}
|
2009-05-19 23:17:58 +08:00
|
|
|
for d in $(TARGET_DIRS) libhw32 libhw64; do \
|
2003-10-28 08:12:52 +08:00
|
|
|
rm -rf $$d || exit 1 ; \
|
2003-08-11 07:41:46 +08:00
|
|
|
done
|
2003-03-07 07:23:54 +08:00
|
|
|
|
2004-12-13 06:18:34 +08:00
|
|
|
KEYMAPS=da en-gb et fr fr-ch is lt modifiers no pt-br sv \
|
|
|
|
|
ar de en-us fi fr-be hr it lv nl pl ru th \
|
|
|
|
|
common de-ch es fo fr-ca hu ja mk nl-be pt sl tr
|
|
|
|
|
|
2008-11-27 23:45:16 +08:00
|
|
|
ifdef INSTALL_BLOBS
|
|
|
|
|
BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
|
2009-01-09 19:01:31 +08:00
|
|
|
video.x openbios-sparc32 openbios-sparc64 openbios-ppc \
|
|
|
|
|
pxe-ne2k_pci.bin pxe-rtl8139.bin pxe-pcnet.bin pxe-e1000.bin \
|
2009-06-29 21:37:40 +08:00
|
|
|
bamboo.dtb petalogix-s3adsp1800.dtb \
|
|
|
|
|
multiboot.bin
|
2008-11-27 23:45:16 +08:00
|
|
|
else
|
|
|
|
|
BLOBS=
|
|
|
|
|
endif
|
|
|
|
|
|
2006-05-01 07:54:18 +08:00
|
|
|
install-doc: $(DOCS)
|
2009-04-18 23:36:02 +08:00
|
|
|
$(INSTALL_DIR) "$(DESTDIR)$(docdir)"
|
|
|
|
|
$(INSTALL_DATA) qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)"
|
2009-08-03 20:47:00 +08:00
|
|
|
ifdef CONFIG_POSIX
|
2009-04-18 23:36:02 +08:00
|
|
|
$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
|
|
|
|
|
$(INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
|
|
|
|
|
$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8"
|
|
|
|
|
$(INSTALL_DATA) qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"
|
2006-05-01 07:54:18 +08:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
install: all $(if $(BUILD_DOCS),install-doc)
|
2009-04-18 23:36:02 +08:00
|
|
|
$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
|
2007-10-21 02:29:34 +08:00
|
|
|
ifneq ($(TOOLS),)
|
2009-04-18 23:36:02 +08:00
|
|
|
$(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
|
2007-10-21 02:29:34 +08:00
|
|
|
endif
|
2008-11-27 23:45:16 +08:00
|
|
|
ifneq ($(BLOBS),)
|
2009-04-18 23:36:02 +08:00
|
|
|
$(INSTALL_DIR) "$(DESTDIR)$(datadir)"
|
2008-11-27 23:45:16 +08:00
|
|
|
set -e; for x in $(BLOBS); do \
|
2009-04-18 23:36:02 +08:00
|
|
|
$(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
|
2006-04-16 20:41:07 +08:00
|
|
|
done
|
2008-11-27 23:45:16 +08:00
|
|
|
endif
|
2009-04-18 23:36:02 +08:00
|
|
|
$(INSTALL_DIR) "$(DESTDIR)$(datadir)/keymaps"
|
2008-03-06 02:16:09 +08:00
|
|
|
set -e; for x in $(KEYMAPS); do \
|
2009-05-28 16:11:42 +08:00
|
|
|
$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
|
2006-04-16 20:41:07 +08:00
|
|
|
done
|
2003-08-11 05:39:31 +08:00
|
|
|
for d in $(TARGET_DIRS); do \
|
2004-05-13 03:32:15 +08:00
|
|
|
$(MAKE) -C $$d $@ || exit 1 ; \
|
2003-08-11 05:39:31 +08:00
|
|
|
done
|
2003-03-23 01:31:19 +08:00
|
|
|
|
2003-03-02 01:13:26 +08:00
|
|
|
# various test targets
|
2007-11-14 18:34:57 +08:00
|
|
|
test speed: all
|
2004-05-13 03:32:15 +08:00
|
|
|
$(MAKE) -C tests $@
|
2003-02-19 06:55:36 +08:00
|
|
|
|
2009-08-07 22:43:11 +08:00
|
|
|
.PHONY: TAGS
|
2007-09-17 05:08:06 +08:00
|
|
|
TAGS:
|
2009-08-07 22:43:11 +08:00
|
|
|
find "$(SRC_PATH)" -name '*.[hc]' -print0 | xargs -0 etags
|
2003-02-19 06:55:36 +08:00
|
|
|
|
2005-08-21 17:23:39 +08:00
|
|
|
cscope:
|
|
|
|
|
rm -f ./cscope.*
|
2008-10-02 05:46:58 +08:00
|
|
|
find . -name "*.[ch]" -print | sed 's,^\./,,' > ./cscope.files
|
2005-08-21 17:23:39 +08:00
|
|
|
cscope -b
|
|
|
|
|
|
2003-03-24 04:17:16 +08:00
|
|
|
# documentation
|
2004-04-04 23:21:17 +08:00
|
|
|
%.html: %.texi
|
2009-04-06 01:40:46 +08:00
|
|
|
$(call quiet-command,texi2html -I=. -monolithic -number $<," GEN $@")
|
2003-03-24 04:17:16 +08:00
|
|
|
|
2006-05-01 06:51:54 +08:00
|
|
|
%.info: %.texi
|
2009-04-06 01:40:46 +08:00
|
|
|
$(call quiet-command,makeinfo -I . $< -o $@," GEN $@")
|
2006-05-01 06:51:54 +08:00
|
|
|
|
|
|
|
|
%.dvi: %.texi
|
2009-04-06 01:40:46 +08:00
|
|
|
$(call quiet-command,texi2dvi -I . $<," GEN $@")
|
2009-03-28 14:44:27 +08:00
|
|
|
|
|
|
|
|
qemu-options.texi: $(SRC_PATH)/qemu-options.hx
|
2009-04-06 01:40:46 +08:00
|
|
|
$(call quiet-command,sh $(SRC_PATH)/hxtool -t < $< > $@," GEN $@")
|
2006-05-01 06:51:54 +08:00
|
|
|
|
2009-06-06 16:22:04 +08:00
|
|
|
qemu-monitor.texi: $(SRC_PATH)/qemu-monitor.hx
|
|
|
|
|
$(call quiet-command,sh $(SRC_PATH)/hxtool -t < $< > $@," GEN $@")
|
|
|
|
|
|
2009-06-07 07:42:17 +08:00
|
|
|
qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx
|
|
|
|
|
$(call quiet-command,sh $(SRC_PATH)/hxtool -t < $< > $@," GEN $@")
|
|
|
|
|
|
2009-06-06 16:22:04 +08:00
|
|
|
qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi
|
2009-04-06 01:40:46 +08:00
|
|
|
$(call quiet-command, \
|
|
|
|
|
perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu.pod && \
|
|
|
|
|
pod2man --section=1 --center=" " --release=" " qemu.pod > $@, \
|
|
|
|
|
" GEN $@")
|
2003-10-01 08:13:48 +08:00
|
|
|
|
2009-06-07 07:42:17 +08:00
|
|
|
qemu-img.1: qemu-img.texi qemu-img-cmds.texi
|
2009-04-06 01:40:46 +08:00
|
|
|
$(call quiet-command, \
|
|
|
|
|
perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu-img.pod && \
|
|
|
|
|
pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@, \
|
|
|
|
|
" GEN $@")
|
2004-11-16 06:57:26 +08:00
|
|
|
|
2008-05-28 05:13:40 +08:00
|
|
|
qemu-nbd.8: qemu-nbd.texi
|
2009-04-06 01:40:46 +08:00
|
|
|
$(call quiet-command, \
|
|
|
|
|
perl -Ww -- $(SRC_PATH)/texi2pod.pl $< qemu-nbd.pod && \
|
|
|
|
|
pod2man --section=8 --center=" " --release=" " qemu-nbd.pod > $@, \
|
|
|
|
|
" GEN $@")
|
2008-05-28 05:13:40 +08:00
|
|
|
|
2006-05-14 20:07:53 +08:00
|
|
|
info: qemu-doc.info qemu-tech.info
|
|
|
|
|
|
|
|
|
|
dvi: qemu-doc.dvi qemu-tech.dvi
|
|
|
|
|
|
|
|
|
|
html: qemu-doc.html qemu-tech.html
|
|
|
|
|
|
2009-06-07 07:42:17 +08:00
|
|
|
qemu-doc.dvi qemu-doc.html qemu-doc.info: qemu-img.texi qemu-nbd.texi qemu-options.texi qemu-monitor.texi qemu-img-cmds.texi
|
2008-09-24 09:13:40 +08:00
|
|
|
|
2007-01-25 06:56:36 +08:00
|
|
|
VERSION ?= $(shell cat VERSION)
|
|
|
|
|
FILE = qemu-$(VERSION)
|
2003-03-03 23:02:29 +08:00
|
|
|
|
2003-10-01 04:54:24 +08:00
|
|
|
# tar release (use 'make -k tar' on a checkouted tree)
|
2003-03-03 23:02:29 +08:00
|
|
|
tar:
|
|
|
|
|
rm -rf /tmp/$(FILE)
|
2003-10-01 04:54:24 +08:00
|
|
|
cp -r . /tmp/$(FILE)
|
2008-04-23 04:45:30 +08:00
|
|
|
cd /tmp && tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude CVS --exclude .git --exclude .svn
|
2003-03-03 23:02:29 +08:00
|
|
|
rm -rf /tmp/$(FILE)
|
|
|
|
|
|
2003-10-28 08:47:44 +08:00
|
|
|
# generate a binary distribution
|
2003-03-25 05:58:34 +08:00
|
|
|
tarbin:
|
2008-03-06 02:16:09 +08:00
|
|
|
cd / && tar zcvf ~/qemu-$(VERSION)-$(ARCH).tar.gz \
|
2005-04-28 04:49:23 +08:00
|
|
|
$(bindir)/qemu \
|
|
|
|
|
$(bindir)/qemu-system-x86_64 \
|
2009-01-03 20:35:57 +08:00
|
|
|
$(bindir)/qemu-system-arm \
|
|
|
|
|
$(bindir)/qemu-system-cris \
|
|
|
|
|
$(bindir)/qemu-system-m68k \
|
2005-07-25 02:44:35 +08:00
|
|
|
$(bindir)/qemu-system-mips \
|
2006-03-11 22:51:13 +08:00
|
|
|
$(bindir)/qemu-system-mipsel \
|
2007-04-01 19:16:48 +08:00
|
|
|
$(bindir)/qemu-system-mips64 \
|
|
|
|
|
$(bindir)/qemu-system-mips64el \
|
2009-01-03 20:35:57 +08:00
|
|
|
$(bindir)/qemu-system-ppc \
|
|
|
|
|
$(bindir)/qemu-system-ppcemb \
|
|
|
|
|
$(bindir)/qemu-system-ppc64 \
|
2007-09-30 05:18:26 +08:00
|
|
|
$(bindir)/qemu-system-sh4 \
|
2007-12-09 13:10:03 +08:00
|
|
|
$(bindir)/qemu-system-sh4eb \
|
2009-01-03 20:35:57 +08:00
|
|
|
$(bindir)/qemu-system-sparc \
|
2004-05-13 02:54:06 +08:00
|
|
|
$(bindir)/qemu-i386 \
|
2008-01-07 02:27:12 +08:00
|
|
|
$(bindir)/qemu-x86_64 \
|
2009-01-03 20:35:57 +08:00
|
|
|
$(bindir)/qemu-alpha \
|
|
|
|
|
$(bindir)/qemu-arm \
|
|
|
|
|
$(bindir)/qemu-armeb \
|
|
|
|
|
$(bindir)/qemu-cris \
|
|
|
|
|
$(bindir)/qemu-m68k \
|
|
|
|
|
$(bindir)/qemu-mips \
|
|
|
|
|
$(bindir)/qemu-mipsel \
|
|
|
|
|
$(bindir)/qemu-ppc \
|
|
|
|
|
$(bindir)/qemu-ppc64 \
|
|
|
|
|
$(bindir)/qemu-ppc64abi32 \
|
|
|
|
|
$(bindir)/qemu-sh4 \
|
|
|
|
|
$(bindir)/qemu-sh4eb \
|
|
|
|
|
$(bindir)/qemu-sparc \
|
|
|
|
|
$(bindir)/qemu-sparc64 \
|
|
|
|
|
$(bindir)/qemu-sparc32plus \
|
|
|
|
|
$(bindir)/qemu-img \
|
|
|
|
|
$(bindir)/qemu-nbd \
|
2004-05-13 02:54:06 +08:00
|
|
|
$(datadir)/bios.bin \
|
|
|
|
|
$(datadir)/vgabios.bin \
|
2004-06-06 23:50:03 +08:00
|
|
|
$(datadir)/vgabios-cirrus.bin \
|
2004-06-22 03:54:47 +08:00
|
|
|
$(datadir)/ppc_rom.bin \
|
2005-07-03 22:00:51 +08:00
|
|
|
$(datadir)/video.x \
|
2006-06-14 20:36:32 +08:00
|
|
|
$(datadir)/openbios-sparc32 \
|
2008-04-24 03:38:07 +08:00
|
|
|
$(datadir)/openbios-sparc64 \
|
2009-01-09 19:01:31 +08:00
|
|
|
$(datadir)/openbios-ppc \
|
2009-01-03 20:35:57 +08:00
|
|
|
$(datadir)/pxe-ne2k_pci.bin \
|
2007-02-06 05:22:42 +08:00
|
|
|
$(datadir)/pxe-rtl8139.bin \
|
2009-01-03 20:35:57 +08:00
|
|
|
$(datadir)/pxe-pcnet.bin \
|
2008-07-27 00:53:22 +08:00
|
|
|
$(datadir)/pxe-e1000.bin \
|
2004-05-08 22:44:43 +08:00
|
|
|
$(docdir)/qemu-doc.html \
|
|
|
|
|
$(docdir)/qemu-tech.html \
|
2009-01-03 20:35:57 +08:00
|
|
|
$(mandir)/man1/qemu.1 \
|
|
|
|
|
$(mandir)/man1/qemu-img.1 \
|
2008-05-28 05:13:40 +08:00
|
|
|
$(mandir)/man8/qemu-nbd.8
|
2003-03-25 05:58:34 +08:00
|
|
|
|
2007-11-08 03:24:02 +08:00
|
|
|
# Include automatically generated dependency files
|
2009-05-10 06:14:19 +08:00
|
|
|
-include $(wildcard *.d audio/*.d slirp/*.d block/*.d)
|