2009-08-04 15:24:23 +02:00
|
|
|
# -*- Mode: makefile -*-
|
|
|
|
|
2009-11-22 17:25:30 +01:00
|
|
|
GENERATED_HEADERS = config-target.h
|
2010-12-22 11:54:48 +01:00
|
|
|
CONFIG_NO_PCI = $(if $(subst n,,$(CONFIG_PCI)),n,y)
|
2010-04-19 20:59:30 +02:00
|
|
|
CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y)
|
2011-06-21 22:59:07 +02:00
|
|
|
CONFIG_NO_XEN = $(if $(subst n,,$(CONFIG_XEN)),n,y)
|
2009-11-05 17:19:57 +01:00
|
|
|
|
2009-10-07 02:40:57 +02:00
|
|
|
include ../config-host.mak
|
2009-10-07 02:41:02 +02:00
|
|
|
include config-devices.mak
|
2009-10-07 02:41:00 +02:00
|
|
|
include config-target.mak
|
2009-01-21 19:12:52 +01:00
|
|
|
include $(SRC_PATH)/rules.mak
|
2010-01-06 20:24:05 +01:00
|
|
|
ifneq ($(HWDIR),)
|
|
|
|
include $(HWDIR)/config.mak
|
|
|
|
endif
|
2003-08-10 23:39:31 +02:00
|
|
|
|
2005-01-04 00:38:40 +01:00
|
|
|
TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH)
|
2009-12-21 10:06:55 +01:00
|
|
|
$(call set-vpath, $(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw)
|
2011-06-23 10:05:12 +02:00
|
|
|
ifdef CONFIG_LINUX
|
|
|
|
QEMU_CFLAGS += -I../linux-headers
|
|
|
|
endif
|
|
|
|
QEMU_CFLAGS += -I.. -I$(TARGET_PATH) -DNEED_CPU_H
|
2008-01-31 12:32:10 +01:00
|
|
|
|
2010-01-06 20:24:05 +01:00
|
|
|
include $(SRC_PATH)/Makefile.objs
|
|
|
|
|
2011-12-04 00:10:08 +01:00
|
|
|
QEMU_CFLAGS+=-I$(SRC_PATH)/include
|
|
|
|
|
2008-01-31 12:32:10 +01:00
|
|
|
ifdef CONFIG_USER_ONLY
|
|
|
|
# user emulator name
|
|
|
|
QEMU_PROG=qemu-$(TARGET_ARCH2)
|
|
|
|
else
|
2003-09-30 22:54:24 +02:00
|
|
|
# system emulator name
|
2011-12-22 11:18:53 +01:00
|
|
|
ifneq (,$(findstring -mwindows,$(LIBS)))
|
|
|
|
# Terminate program name with a 'w' because the linker builds a windows executable.
|
|
|
|
QEMU_PROGW=qemu-system-$(TARGET_ARCH2)w$(EXESUF)
|
|
|
|
endif # windows executable
|
2008-01-31 12:32:10 +01:00
|
|
|
QEMU_PROG=qemu-system-$(TARGET_ARCH2)$(EXESUF)
|
2004-04-12 22:39:29 +02:00
|
|
|
endif
|
2003-08-10 23:39:31 +02:00
|
|
|
|
2008-01-31 12:32:10 +01:00
|
|
|
PROGS=$(QEMU_PROG)
|
2011-12-22 11:18:53 +01:00
|
|
|
ifdef QEMU_PROGW
|
|
|
|
PROGS+=$(QEMU_PROGW)
|
|
|
|
endif
|
2010-11-16 21:07:07 +01:00
|
|
|
STPFILES=
|
2003-08-10 23:39:31 +02:00
|
|
|
|
2010-09-20 00:50:45 +02:00
|
|
|
ifndef CONFIG_HAIKU
|
2003-08-10 23:39:31 +02:00
|
|
|
LIBS+=-lm
|
2010-09-20 00:50:45 +02:00
|
|
|
endif
|
2007-01-18 21:06:33 +01:00
|
|
|
|
2009-10-07 02:41:01 +02:00
|
|
|
config-target.h: config-target.h-timestamp
|
|
|
|
config-target.h-timestamp: config-target.mak
|
|
|
|
|
2011-08-31 20:30:43 +02:00
|
|
|
ifdef CONFIG_TRACE_SYSTEMTAP
|
2010-11-12 14:20:25 +01:00
|
|
|
stap: $(QEMU_PROG).stp
|
|
|
|
|
|
|
|
ifdef CONFIG_USER_ONLY
|
|
|
|
TARGET_TYPE=user
|
|
|
|
else
|
|
|
|
TARGET_TYPE=system
|
|
|
|
endif
|
|
|
|
|
2012-03-18 08:47:15 +01:00
|
|
|
$(QEMU_PROG).stp: $(SRC_PATH)/trace-events
|
2011-01-20 21:54:21 +01:00
|
|
|
$(call quiet-command,sh $(SRC_PATH)/scripts/tracetool \
|
2010-11-12 14:20:25 +01:00
|
|
|
--$(TRACE_BACKEND) \
|
|
|
|
--binary $(bindir)/$(QEMU_PROG) \
|
|
|
|
--target-arch $(TARGET_ARCH) \
|
|
|
|
--target-type $(TARGET_TYPE) \
|
|
|
|
--stap < $(SRC_PATH)/trace-events > $(QEMU_PROG).stp," GEN $(QEMU_PROG).stp")
|
|
|
|
else
|
|
|
|
stap:
|
|
|
|
endif
|
|
|
|
|
|
|
|
all: $(PROGS) stap
|
2009-10-07 02:41:01 +02:00
|
|
|
|
2009-05-25 19:54:53 +02:00
|
|
|
# Dummy command so that make thinks it has done something
|
|
|
|
@true
|
2003-08-10 23:39:31 +02:00
|
|
|
|
2008-01-31 12:32:10 +01:00
|
|
|
#########################################################
|
2003-08-10 23:39:31 +02:00
|
|
|
# cpu emulator library
|
2009-09-20 21:20:05 +02:00
|
|
|
libobj-y = exec.o translate-all.o cpu-exec.o translate.o
|
2011-07-07 14:37:12 +02:00
|
|
|
libobj-y += tcg/tcg.o tcg/optimize.o
|
2011-10-19 07:07:18 +02:00
|
|
|
libobj-$(CONFIG_TCG_INTERPRETER) += tci.o
|
2011-05-15 14:09:18 +02:00
|
|
|
libobj-y += fpu/softfloat.o
|
2011-08-01 14:19:05 +02:00
|
|
|
ifneq ($(TARGET_BASE_ARCH), sparc)
|
2012-03-24 17:51:13 +01:00
|
|
|
ifneq ($(TARGET_BASE_ARCH), alpha)
|
2011-08-01 14:19:05 +02:00
|
|
|
libobj-y += op_helper.o
|
|
|
|
endif
|
2012-03-24 17:51:13 +01:00
|
|
|
endif
|
2011-08-01 14:19:05 +02:00
|
|
|
libobj-y += helper.o
|
2010-03-11 14:38:55 +01:00
|
|
|
ifeq ($(TARGET_BASE_ARCH), i386)
|
2012-04-02 22:22:12 +02:00
|
|
|
libobj-y += cpu.o
|
2010-03-11 14:38:55 +01:00
|
|
|
endif
|
2011-08-01 09:37:45 +02:00
|
|
|
libobj-$(TARGET_SPARC64) += vis_helper.o
|
2009-08-03 14:46:52 +02:00
|
|
|
libobj-$(CONFIG_NEED_MMU) += mmu.o
|
2009-08-03 14:47:04 +02:00
|
|
|
libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o
|
2012-03-29 06:50:31 +02:00
|
|
|
libobj-$(TARGET_ARM) += cpu.o
|
2012-04-11 01:22:08 +02:00
|
|
|
libobj-$(TARGET_LM32) += cpu.o
|
2012-04-02 11:39:23 +02:00
|
|
|
libobj-$(TARGET_S390X) += cpu.o
|
2011-09-11 11:33:40 +02:00
|
|
|
ifeq ($(TARGET_BASE_ARCH), sparc)
|
2011-08-01 12:15:51 +02:00
|
|
|
libobj-y += fop_helper.o cc_helper.o win_helper.o mmu_helper.o ldst_helper.o
|
2012-04-05 01:29:39 +02:00
|
|
|
libobj-y += cpu.o
|
2011-09-11 11:33:40 +02:00
|
|
|
endif
|
|
|
|
libobj-$(TARGET_SPARC) += int32_helper.o
|
|
|
|
libobj-$(TARGET_SPARC64) += int64_helper.o
|
2012-02-14 01:16:17 +01:00
|
|
|
libobj-$(TARGET_UNICORE32) += cpu.o
|
2012-04-11 18:24:48 +02:00
|
|
|
libobj-$(TARGET_XTENSA) += cpu.o
|
2012-03-24 17:51:13 +01:00
|
|
|
libobj-$(TARGET_ALPHA) += int_helper.o fpu_helper.o sys_helper.o mem_helper.o
|
2012-04-06 19:46:48 +02:00
|
|
|
libobj-$(TARGET_ALPHA) += cpu.o
|
2007-04-05 22:46:02 +02:00
|
|
|
|
2009-06-25 00:08:00 +02:00
|
|
|
libobj-y += disas.o
|
2011-10-19 07:07:18 +02:00
|
|
|
libobj-$(CONFIG_TCI_DIS) += tci-dis.o
|
|
|
|
|
|
|
|
tci-dis.o: QEMU_CFLAGS += -I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/tci
|
2003-08-10 23:39:31 +02:00
|
|
|
|
2010-01-06 20:24:05 +01:00
|
|
|
$(libobj-y): $(GENERATED_HEADERS)
|
2008-01-31 12:32:10 +01:00
|
|
|
|
2011-08-01 14:19:05 +02:00
|
|
|
# HELPER_CFLAGS is used for all the legacy code compiled with static register
|
2008-01-31 12:32:10 +01:00
|
|
|
# variables
|
2011-08-01 14:19:05 +02:00
|
|
|
ifneq ($(TARGET_BASE_ARCH), sparc)
|
|
|
|
op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
|
|
|
endif
|
|
|
|
user-exec.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
2008-01-31 12:32:10 +01:00
|
|
|
|
2009-08-03 14:46:24 +02:00
|
|
|
# Note: this is a workaround. The real fix is to avoid compiling
|
2011-05-08 13:22:38 +02:00
|
|
|
# cpu_signal_handler() in user-exec.c.
|
2009-08-03 14:46:24 +02:00
|
|
|
signal.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
|
|
|
|
2008-01-31 12:32:10 +01:00
|
|
|
#########################################################
|
|
|
|
# Linux user emulator target
|
|
|
|
|
|
|
|
ifdef CONFIG_LINUX_USER
|
|
|
|
|
2009-12-21 10:06:55 +01:00
|
|
|
$(call set-vpath, $(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR))
|
|
|
|
|
2011-02-07 07:05:54 +01:00
|
|
|
QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) -I$(SRC_PATH)/linux-user
|
2009-08-15 09:51:59 +02:00
|
|
|
obj-y = main.o syscall.o strace.o mmap.o signal.o thunk.o \
|
2010-05-21 19:37:52 +02:00
|
|
|
elfload.o linuxload.o uaccess.o gdbstub.o cpu-uname.o \
|
2011-08-21 05:23:03 +02:00
|
|
|
user-exec.o $(oslib-obj-y)
|
2009-08-15 09:52:19 +02:00
|
|
|
|
2009-06-25 00:08:10 +02:00
|
|
|
obj-$(TARGET_HAS_BFLT) += flatload.o
|
2008-01-31 12:32:10 +01:00
|
|
|
|
2009-08-03 14:47:04 +02:00
|
|
|
obj-$(TARGET_I386) += vm86.o
|
2009-07-16 18:34:03 +02:00
|
|
|
|
2009-08-16 09:39:33 +02:00
|
|
|
obj-i386-y += ioport-user.o
|
2009-08-15 09:52:19 +02:00
|
|
|
|
2009-08-03 14:47:01 +02:00
|
|
|
nwfpe-obj-y = fpa11.o fpa11_cpdo.o fpa11_cpdt.o fpa11_cprt.o fpopcode.o
|
2009-07-16 17:57:04 +02:00
|
|
|
nwfpe-obj-y += single_cpdo.o double_cpdo.o extended_cpdo.o
|
2009-07-16 18:34:03 +02:00
|
|
|
obj-arm-y += $(addprefix nwfpe/, $(nwfpe-obj-y))
|
|
|
|
obj-arm-y += arm-semi.o
|
|
|
|
|
|
|
|
obj-m68k-y += m68k-sim.o m68k-semi.o
|
2008-01-31 12:32:10 +01:00
|
|
|
|
2010-01-06 20:24:05 +01:00
|
|
|
$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)
|
|
|
|
|
2012-03-04 21:32:36 +01:00
|
|
|
obj-y += $(addprefix ../, $(universal-obj-y))
|
2010-01-06 20:24:05 +01:00
|
|
|
obj-y += $(addprefix ../libuser/, $(user-obj-y))
|
2010-03-21 09:28:47 +01:00
|
|
|
obj-y += $(addprefix ../libdis-user/, $(libdis-y))
|
2010-01-06 20:24:05 +01:00
|
|
|
obj-y += $(libobj-y)
|
2009-09-27 18:26:02 +02:00
|
|
|
|
2008-01-31 12:32:10 +01:00
|
|
|
endif #CONFIG_LINUX_USER
|
|
|
|
|
|
|
|
#########################################################
|
|
|
|
# Darwin user emulator target
|
|
|
|
|
|
|
|
ifdef CONFIG_DARWIN_USER
|
|
|
|
|
2009-12-21 10:06:55 +01:00
|
|
|
$(call set-vpath, $(SRC_PATH)/darwin-user)
|
|
|
|
|
2009-08-03 14:46:21 +02:00
|
|
|
QEMU_CFLAGS+=-I$(SRC_PATH)/darwin-user -I$(SRC_PATH)/darwin-user/$(TARGET_ARCH)
|
2008-01-31 12:32:10 +01:00
|
|
|
|
|
|
|
# Leave some space for the regular program loading zone
|
|
|
|
LDFLAGS+=-Wl,-segaddr,__STD_PROG_ZONE,0x1000 -image_base 0x0e000000
|
|
|
|
|
|
|
|
LIBS+=-lmx
|
|
|
|
|
2009-06-25 00:08:01 +02:00
|
|
|
obj-y = main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o \
|
2011-05-08 13:22:38 +02:00
|
|
|
gdbstub.o user-exec.o
|
2009-08-15 09:52:19 +02:00
|
|
|
|
2009-08-16 09:39:33 +02:00
|
|
|
obj-i386-y += ioport-user.o
|
2008-01-31 12:32:10 +01:00
|
|
|
|
2010-01-06 20:24:05 +01:00
|
|
|
$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)
|
|
|
|
|
2012-03-04 21:32:36 +01:00
|
|
|
obj-y += $(addprefix ../, $(universal-obj-y))
|
2010-01-06 20:24:05 +01:00
|
|
|
obj-y += $(addprefix ../libuser/, $(user-obj-y))
|
2010-03-21 09:28:47 +01:00
|
|
|
obj-y += $(addprefix ../libdis-user/, $(libdis-y))
|
2010-01-06 20:24:05 +01:00
|
|
|
obj-y += $(libobj-y)
|
2008-01-31 12:32:10 +01:00
|
|
|
|
|
|
|
endif #CONFIG_DARWIN_USER
|
|
|
|
|
2008-10-26 21:33:16 +01:00
|
|
|
#########################################################
|
|
|
|
# BSD user emulator target
|
|
|
|
|
|
|
|
ifdef CONFIG_BSD_USER
|
|
|
|
|
2009-12-21 10:06:55 +01:00
|
|
|
$(call set-vpath, $(SRC_PATH)/bsd-user)
|
|
|
|
|
2009-08-03 14:46:21 +02:00
|
|
|
QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH)
|
2008-10-26 21:33:16 +01:00
|
|
|
|
2009-08-15 09:51:59 +02:00
|
|
|
obj-y = main.o bsdload.o elfload.o mmap.o signal.o strace.o syscall.o \
|
2011-05-08 13:22:38 +02:00
|
|
|
gdbstub.o uaccess.o user-exec.o
|
2009-08-15 09:52:19 +02:00
|
|
|
|
2009-08-16 09:39:33 +02:00
|
|
|
obj-i386-y += ioport-user.o
|
2008-10-26 21:33:16 +01:00
|
|
|
|
2010-01-06 20:24:05 +01:00
|
|
|
$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)
|
|
|
|
|
2012-03-04 21:32:36 +01:00
|
|
|
obj-y += $(addprefix ../, $(universal-obj-y))
|
2010-01-06 20:24:05 +01:00
|
|
|
obj-y += $(addprefix ../libuser/, $(user-obj-y))
|
2010-03-21 09:28:47 +01:00
|
|
|
obj-y += $(addprefix ../libdis-user/, $(libdis-y))
|
2010-01-06 20:24:05 +01:00
|
|
|
obj-y += $(libobj-y)
|
2008-10-26 21:33:16 +01:00
|
|
|
|
|
|
|
endif #CONFIG_BSD_USER
|
|
|
|
|
2008-01-31 12:32:10 +01:00
|
|
|
#########################################################
|
|
|
|
# System emulator target
|
2009-08-03 14:46:41 +02:00
|
|
|
ifdef CONFIG_SOFTMMU
|
2008-01-31 12:32:10 +01:00
|
|
|
|
2011-09-26 13:52:26 +02:00
|
|
|
obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o ioport.o
|
2008-12-18 02:56:22 +01:00
|
|
|
# virtio has to be here due to weird dependency between PCI and virtio-net.
|
|
|
|
# need to fix this properly
|
2010-12-22 11:54:48 +01:00
|
|
|
obj-$(CONFIG_NO_PCI) += pci-stub.o
|
2011-07-14 17:22:20 +02:00
|
|
|
obj-$(CONFIG_VIRTIO) += virtio.o virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o
|
2012-03-16 19:21:35 +01:00
|
|
|
obj-$(CONFIG_VIRTIO) += virtio-scsi.o
|
2010-03-17 12:08:17 +01:00
|
|
|
obj-y += vhost_net.o
|
|
|
|
obj-$(CONFIG_VHOST_NET) += vhost.o
|
2011-06-01 09:05:13 +02:00
|
|
|
obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o
|
2009-06-25 00:08:01 +02:00
|
|
|
obj-$(CONFIG_KVM) += kvm.o kvm-all.o
|
2010-04-19 20:59:30 +02:00
|
|
|
obj-$(CONFIG_NO_KVM) += kvm-stub.o
|
2011-10-01 18:33:43 +02:00
|
|
|
obj-$(CONFIG_VGA) += vga.o
|
2011-12-20 14:59:12 +01:00
|
|
|
obj-y += memory.o savevm.o
|
2008-01-31 12:32:10 +01:00
|
|
|
LIBS+=-lz
|
2007-11-07 20:24:02 +01:00
|
|
|
|
2012-01-23 20:59:14 +01:00
|
|
|
obj-i386-$(CONFIG_KVM) += hyperv.o
|
2011-12-18 21:48:13 +01:00
|
|
|
|
2009-08-03 14:46:21 +02:00
|
|
|
QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
|
|
|
|
QEMU_CFLAGS += $(VNC_SASL_CFLAGS)
|
2010-07-07 20:57:49 +02:00
|
|
|
QEMU_CFLAGS += $(VNC_JPEG_CFLAGS)
|
2010-07-07 20:57:56 +02:00
|
|
|
QEMU_CFLAGS += $(VNC_PNG_CFLAGS)
|
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-06 21:27:28 +01:00
|
|
|
|
2010-08-19 13:27:56 +02:00
|
|
|
# xen support
|
2011-06-21 22:59:09 +02:00
|
|
|
obj-$(CONFIG_XEN) += xen-all.o xen_machine_pv.o xen_domainbuild.o xen-mapcache.o
|
2010-08-19 13:27:56 +02:00
|
|
|
obj-$(CONFIG_NO_XEN) += xen-stub.o
|
|
|
|
|
2011-06-16 18:05:17 +02:00
|
|
|
obj-i386-$(CONFIG_XEN) += xen_platform.o
|
|
|
|
|
RESEND: Inter-VM shared memory PCI device
resend for bug fix related to removal of irqfd
Support an inter-vm shared memory device that maps a shared-memory object as a
PCI device in the guest. This patch also supports interrupts between guest by
communicating over a unix domain socket. This patch applies to the qemu-kvm
repository.
-device ivshmem,size=<size in format accepted by -m>[,shm=<shm name>]
Interrupts are supported between multiple VMs by using a shared memory server
by using a chardev socket.
-device ivshmem,size=<size in format accepted by -m>[,shm=<shm name>]
[,chardev=<id>][,msi=on][,ioeventfd=on][,vectors=n][,role=peer|master]
-chardev socket,path=<path>,id=<id>
The shared memory server, sample programs and init scripts are in a git repo here:
www.gitorious.org/nahanni
Signed-off-by: Cam Macdonell <cam@cs.ualberta.ca>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-07-27 18:54:13 +02:00
|
|
|
# Inter-VM PCI shared memory
|
2011-03-29 15:29:28 +02:00
|
|
|
CONFIG_IVSHMEM =
|
|
|
|
ifeq ($(CONFIG_KVM), y)
|
|
|
|
ifeq ($(CONFIG_PCI), y)
|
|
|
|
CONFIG_IVSHMEM = y
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
obj-$(CONFIG_IVSHMEM) += ivshmem.o
|
RESEND: Inter-VM shared memory PCI device
resend for bug fix related to removal of irqfd
Support an inter-vm shared memory device that maps a shared-memory object as a
PCI device in the guest. This patch also supports interrupts between guest by
communicating over a unix domain socket. This patch applies to the qemu-kvm
repository.
-device ivshmem,size=<size in format accepted by -m>[,shm=<shm name>]
Interrupts are supported between multiple VMs by using a shared memory server
by using a chardev socket.
-device ivshmem,size=<size in format accepted by -m>[,shm=<shm name>]
[,chardev=<id>][,msi=on][,ioeventfd=on][,vectors=n][,role=peer|master]
-chardev socket,path=<path>,id=<id>
The shared memory server, sample programs and init scripts are in a git repo here:
www.gitorious.org/nahanni
Signed-off-by: Cam Macdonell <cam@cs.ualberta.ca>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-07-27 18:54:13 +02:00
|
|
|
|
2010-08-23 23:40:28 +02:00
|
|
|
# Generic hotplugging
|
|
|
|
obj-y += device-hotplug.o
|
|
|
|
|
2004-04-12 22:39:29 +02:00
|
|
|
# Hardware support
|
2011-10-16 11:53:17 +02:00
|
|
|
obj-i386-y += mc146818rtc.o pc.o
|
2012-02-17 18:31:19 +01:00
|
|
|
obj-i386-y += apic_common.o apic.o kvmvapic.o
|
|
|
|
obj-i386-y += sga.o ioapic_common.o ioapic.o piix_pci.o
|
2011-02-13 13:31:28 +01:00
|
|
|
obj-i386-y += vmport.o
|
2010-08-23 23:40:28 +02:00
|
|
|
obj-i386-y += pci-hotplug.o smbios.o wdt_ib700.o
|
2010-03-21 20:47:10 +01:00
|
|
|
obj-i386-y += debugcon.o multiboot.o
|
2011-06-23 10:05:12 +02:00
|
|
|
obj-i386-y += pc_piix.o
|
2012-02-22 08:18:51 +01:00
|
|
|
obj-i386-y += pc_sysfw.o
|
2012-03-02 20:28:49 +01:00
|
|
|
obj-i386-$(CONFIG_KVM) += kvm/clock.o kvm/apic.o kvm/i8259.o kvm/ioapic.o kvm/i8254.o
|
2010-04-27 11:50:11 +02:00
|
|
|
obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o
|
2009-07-16 18:33:58 +02:00
|
|
|
|
2007-10-29 00:42:18 +01:00
|
|
|
# shared objects
|
2011-09-13 06:00:32 +02:00
|
|
|
obj-ppc-y = ppc.o ppc_booke.o
|
2007-10-29 00:42:18 +01:00
|
|
|
# PREP target
|
2011-10-16 11:53:17 +02:00
|
|
|
obj-ppc-y += mc146818rtc.o
|
2010-03-29 21:24:04 +02:00
|
|
|
obj-ppc-y += ppc_prep.o
|
2007-10-29 00:42:18 +01:00
|
|
|
# OldWorld PowerMac
|
2010-03-30 19:36:23 +02:00
|
|
|
obj-ppc-y += ppc_oldworld.o
|
2007-10-29 00:42:18 +01:00
|
|
|
# NewWorld PowerMac
|
2010-03-30 19:36:23 +02:00
|
|
|
obj-ppc-y += ppc_newworld.o
|
2011-04-01 06:15:21 +02:00
|
|
|
# IBM pSeries (sPAPR)
|
2011-08-10 14:21:41 +02:00
|
|
|
obj-ppc-$(CONFIG_PSERIES) += spapr.o spapr_hcall.o spapr_rtas.o spapr_vio.o
|
|
|
|
obj-ppc-$(CONFIG_PSERIES) += xics.o spapr_vty.o spapr_llan.o spapr_vscsi.o
|
2011-10-30 18:16:46 +01:00
|
|
|
obj-ppc-$(CONFIG_PSERIES) += spapr_pci.o device-hotplug.o pci-hotplug.o
|
2007-10-29 00:42:18 +01:00
|
|
|
# PowerPC 4xx boards
|
2010-03-29 21:23:55 +02:00
|
|
|
obj-ppc-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o
|
2012-01-10 19:39:38 +01:00
|
|
|
obj-ppc-y += ppc440_bamboo.o
|
2009-03-02 17:42:23 +01:00
|
|
|
# PowerPC E500 boards
|
2011-07-22 13:32:29 +02:00
|
|
|
obj-ppc-y += ppce500_mpc8544ds.o mpc8544_guts.o ppce500_spin.o
|
2010-09-29 15:31:44 +02:00
|
|
|
# PowerPC 440 Xilinx ML507 reference board.
|
|
|
|
obj-ppc-y += virtex_ml507.o
|
2009-07-16 18:33:58 +02:00
|
|
|
obj-ppc-$(CONFIG_KVM) += kvm_ppc.o
|
2009-07-27 16:12:52 +02:00
|
|
|
obj-ppc-$(CONFIG_FDT) += device_tree.o
|
2011-07-21 00:49:45 +02:00
|
|
|
# PowerPC OpenPIC
|
|
|
|
obj-ppc-y += openpic.o
|
2009-07-16 18:33:58 +02:00
|
|
|
|
2010-09-29 15:31:44 +02:00
|
|
|
# Xilinx PPC peripherals
|
|
|
|
obj-ppc-y += xilinx_intc.o
|
|
|
|
obj-ppc-y += xilinx_timer.o
|
|
|
|
obj-ppc-y += xilinx_uartlite.o
|
|
|
|
obj-ppc-y += xilinx_ethlite.o
|
|
|
|
|
2011-02-17 23:45:14 +01:00
|
|
|
# LM32 boards
|
|
|
|
obj-lm32-y += lm32_boards.o
|
2011-03-07 23:32:44 +01:00
|
|
|
obj-lm32-y += milkymist.o
|
2011-02-17 23:45:14 +01:00
|
|
|
|
2011-02-17 23:45:02 +01:00
|
|
|
# LM32 peripherals
|
2011-02-17 23:45:07 +01:00
|
|
|
obj-lm32-y += lm32_pic.o
|
2011-02-17 23:45:08 +01:00
|
|
|
obj-lm32-y += lm32_juart.o
|
2011-02-17 23:45:10 +01:00
|
|
|
obj-lm32-y += lm32_timer.o
|
2011-02-17 23:45:11 +01:00
|
|
|
obj-lm32-y += lm32_uart.o
|
2011-02-17 23:45:12 +01:00
|
|
|
obj-lm32-y += lm32_sys.o
|
2011-03-07 23:32:32 +01:00
|
|
|
obj-lm32-y += milkymist-ac97.o
|
2011-03-07 23:32:33 +01:00
|
|
|
obj-lm32-y += milkymist-hpdmc.o
|
2011-03-07 23:32:34 +01:00
|
|
|
obj-lm32-y += milkymist-memcard.o
|
2011-04-13 00:29:36 +02:00
|
|
|
obj-lm32-y += milkymist-minimac2.o
|
2011-03-07 23:32:36 +01:00
|
|
|
obj-lm32-y += milkymist-pfpu.o
|
2011-03-07 23:32:37 +01:00
|
|
|
obj-lm32-y += milkymist-softusb.o
|
2011-03-07 23:32:38 +01:00
|
|
|
obj-lm32-y += milkymist-sysctl.o
|
2011-03-07 23:32:40 +01:00
|
|
|
obj-lm32-$(CONFIG_OPENGL) += milkymist-tmu2.o
|
2011-03-07 23:32:41 +01:00
|
|
|
obj-lm32-y += milkymist-uart.o
|
2011-03-07 23:32:42 +01:00
|
|
|
obj-lm32-y += milkymist-vgafb.o
|
|
|
|
obj-lm32-y += framebuffer.o
|
2011-02-17 23:45:02 +01:00
|
|
|
|
2009-07-16 18:33:58 +02:00
|
|
|
obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
|
2010-03-14 21:20:59 +01:00
|
|
|
obj-mips-y += mips_addr.o mips_timer.o mips_int.o
|
2010-05-22 09:59:01 +02:00
|
|
|
obj-mips-y += gt64xxx.o mc146818rtc.o
|
2010-06-29 04:50:43 +02:00
|
|
|
obj-mips-$(CONFIG_FULONG) += bonito.o vt82c686.o mips_fulong2e.o
|
2009-07-16 18:33:58 +02:00
|
|
|
|
|
|
|
obj-microblaze-y = petalogix_s3adsp1800_mmu.o
|
2011-03-14 11:29:19 +01:00
|
|
|
obj-microblaze-y += petalogix_ml605_mmu.o
|
2012-03-04 12:03:51 +01:00
|
|
|
obj-microblaze-y += microblaze_boot.o
|
2009-07-16 18:33:58 +02:00
|
|
|
|
|
|
|
obj-microblaze-y += microblaze_pic_cpu.o
|
|
|
|
obj-microblaze-y += xilinx_intc.o
|
|
|
|
obj-microblaze-y += xilinx_timer.o
|
|
|
|
obj-microblaze-y += xilinx_uartlite.o
|
|
|
|
obj-microblaze-y += xilinx_ethlite.o
|
2011-03-14 11:13:55 +01:00
|
|
|
obj-microblaze-y += xilinx_axidma.o
|
|
|
|
obj-microblaze-y += xilinx_axienet.o
|
2009-07-16 18:33:58 +02:00
|
|
|
|
2009-07-27 16:12:52 +02:00
|
|
|
obj-microblaze-$(CONFIG_FDT) += device_tree.o
|
2009-07-16 18:33:58 +02:00
|
|
|
|
2009-01-07 13:19:50 +01:00
|
|
|
# Boards
|
2010-06-10 14:45:46 +02:00
|
|
|
obj-cris-y = cris_pic_cpu.o
|
|
|
|
obj-cris-y += cris-boot.o
|
|
|
|
obj-cris-y += axis_dev88.o
|
2009-01-07 13:19:50 +01:00
|
|
|
|
|
|
|
# IO blocks
|
2009-07-16 18:33:58 +02:00
|
|
|
obj-cris-y += etraxfs_dma.o
|
|
|
|
obj-cris-y += etraxfs_pic.o
|
|
|
|
obj-cris-y += etraxfs_eth.o
|
|
|
|
obj-cris-y += etraxfs_timer.o
|
|
|
|
obj-cris-y += etraxfs_ser.o
|
|
|
|
|
2005-07-02 16:31:34 +02:00
|
|
|
ifeq ($(TARGET_ARCH), sparc64)
|
2010-05-22 09:59:01 +02:00
|
|
|
obj-sparc-y = sun4u.o apb_pci.o
|
2010-03-21 20:47:11 +01:00
|
|
|
obj-sparc-y += mc146818rtc.o
|
2005-07-02 16:31:34 +02:00
|
|
|
else
|
2010-04-03 09:35:50 +02:00
|
|
|
obj-sparc-y = sun4m.o lance.o tcx.o sun4m_iommu.o slavio_intctl.o
|
2010-03-21 20:47:06 +01:00
|
|
|
obj-sparc-y += slavio_timer.o slavio_misc.o sparc32_dma.o
|
2011-01-24 12:56:55 +01:00
|
|
|
obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o leon3.o
|
|
|
|
|
|
|
|
# GRLIB
|
|
|
|
obj-sparc-y += grlib_gptimer.o grlib_irqmp.o grlib_apbuart.o
|
2009-07-16 18:33:58 +02:00
|
|
|
endif
|
|
|
|
|
2009-11-19 17:42:45 +01:00
|
|
|
obj-arm-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o
|
2009-07-16 18:33:58 +02:00
|
|
|
obj-arm-y += arm_boot.o pl011.o pl031.o pl050.o pl080.o pl110.o pl181.o pl190.o
|
|
|
|
obj-arm-y += versatile_pci.o
|
2012-03-05 05:39:10 +01:00
|
|
|
obj-arm-y += cadence_uart.o
|
2012-03-05 05:39:11 +01:00
|
|
|
obj-arm-y += cadence_ttc.o
|
2012-03-05 05:39:12 +01:00
|
|
|
obj-arm-y += cadence_gem.o
|
2012-03-05 05:39:13 +01:00
|
|
|
obj-arm-y += xilinx_zynq.o zynq_slcr.o
|
2012-04-13 13:39:07 +02:00
|
|
|
obj-arm-y += arm_gic.o
|
2009-11-19 17:45:21 +01:00
|
|
|
obj-arm-y += realview_gic.o realview.o arm_sysctl.o arm11mpcore.o a9mpcore.o
|
2012-02-16 10:56:05 +01:00
|
|
|
obj-arm-y += exynos4210_gic.o exynos4210_combiner.o exynos4210.o
|
2012-02-16 10:56:05 +01:00
|
|
|
obj-arm-y += exynos4_boards.o exynos4210_uart.o exynos4210_pwm.o
|
2012-02-16 10:56:06 +01:00
|
|
|
obj-arm-y += exynos4210_pmu.o exynos4210_mct.o exynos4210_fimd.o
|
2011-12-29 07:19:54 +01:00
|
|
|
obj-arm-y += arm_l2x0.o
|
2012-02-16 10:56:07 +01:00
|
|
|
obj-arm-y += arm_mptimer.o a15mpcore.o
|
2009-07-16 18:33:58 +02:00
|
|
|
obj-arm-y += armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o
|
2012-01-26 12:43:49 +01:00
|
|
|
obj-arm-y += highbank.o
|
2009-07-16 18:33:58 +02:00
|
|
|
obj-arm-y += pl061.o
|
2012-01-26 12:43:47 +01:00
|
|
|
obj-arm-y += xgmac.o
|
2009-07-16 18:33:58 +02:00
|
|
|
obj-arm-y += arm-semi.o
|
|
|
|
obj-arm-y += pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o
|
|
|
|
obj-arm-y += pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o
|
2010-03-29 21:23:56 +02:00
|
|
|
obj-arm-y += gumstix.o
|
2010-03-27 07:20:53 +01:00
|
|
|
obj-arm-y += zaurus.o ide/microdrive.o spitz.o tosa.o tc6393xb.o
|
2010-05-31 17:54:23 +02:00
|
|
|
obj-arm-y += omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o \
|
|
|
|
omap_gpio.o omap_intc.o omap_uart.o
|
2010-05-31 17:54:22 +02:00
|
|
|
obj-arm-y += omap2.o omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \
|
|
|
|
omap_gpmc.o omap_sdrc.o omap_spi.o omap_tap.o omap_l4.o
|
2009-07-16 18:33:58 +02:00
|
|
|
obj-arm-y += omap_sx1.o palm.o tsc210x.o
|
2012-03-07 14:55:18 +01:00
|
|
|
obj-arm-y += nseries.o blizzard.o onenand.o cbus.o tusb6010.o usb/hcd-musb.o
|
2009-07-16 18:33:58 +02:00
|
|
|
obj-arm-y += mst_fpga.o mainstone.o
|
2011-07-06 15:52:49 +02:00
|
|
|
obj-arm-y += z2.o
|
2010-03-29 21:23:55 +02:00
|
|
|
obj-arm-y += musicpal.o bitbang_i2c.o marvell_88w8618_audio.o
|
2009-07-16 18:33:58 +02:00
|
|
|
obj-arm-y += framebuffer.o
|
2011-03-07 12:10:32 +01:00
|
|
|
obj-arm-y += vexpress.o
|
2011-04-19 16:56:45 +02:00
|
|
|
obj-arm-y += strongarm.o
|
2011-04-19 16:56:46 +02:00
|
|
|
obj-arm-y += collie.o
|
2011-10-28 11:55:37 +02:00
|
|
|
obj-arm-y += pl041.o lm4549.o
|
2012-03-02 12:56:38 +01:00
|
|
|
obj-arm-$(CONFIG_FDT) += device_tree.o
|
2009-07-16 18:33:58 +02:00
|
|
|
|
|
|
|
obj-sh4-y = shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o
|
2010-03-21 20:47:11 +01:00
|
|
|
obj-sh4-y += sh_timer.o sh_serial.o sh_intc.o sh_pci.o sm501.o
|
2010-03-27 07:20:53 +01:00
|
|
|
obj-sh4-y += ide/mmio.o
|
2009-07-16 18:33:58 +02:00
|
|
|
|
|
|
|
obj-m68k-y = an5206.o mcf5206.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o
|
|
|
|
obj-m68k-y += m68k-semi.o dummy_m68k.o
|
|
|
|
|
2009-12-05 12:44:28 +01:00
|
|
|
obj-s390x-y = s390-virtio-bus.o s390-virtio.o
|
2009-12-05 12:44:27 +01:00
|
|
|
|
2011-10-16 11:53:17 +02:00
|
|
|
obj-alpha-y = mc146818rtc.o
|
2011-08-25 23:38:59 +02:00
|
|
|
obj-alpha-y += alpha_pci.o alpha_dp264.o alpha_typhoon.o
|
2009-12-28 03:30:03 +01:00
|
|
|
|
2011-09-06 01:55:25 +02:00
|
|
|
obj-xtensa-y += xtensa_pic.o
|
2011-10-16 00:56:07 +02:00
|
|
|
obj-xtensa-y += xtensa_sim.o
|
2011-10-16 00:56:46 +02:00
|
|
|
obj-xtensa-y += xtensa_lx60.o
|
2011-09-06 01:55:47 +02:00
|
|
|
obj-xtensa-y += xtensa-semi.o
|
2011-10-16 00:56:05 +02:00
|
|
|
obj-xtensa-y += core-dc232b.o
|
2012-04-15 17:12:16 +02:00
|
|
|
obj-xtensa-y += core-dc233c.o
|
2011-10-16 00:56:06 +02:00
|
|
|
obj-xtensa-y += core-fsf.o
|
2011-09-06 01:55:25 +02:00
|
|
|
|
2010-03-29 21:23:52 +02:00
|
|
|
main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
|
2009-03-28 07:44:27 +01:00
|
|
|
|
2011-09-02 19:34:47 +02:00
|
|
|
monitor.o: hmp-commands.h qmp-commands-old.h
|
2009-06-06 10:22:04 +02:00
|
|
|
|
2010-01-06 20:24:05 +01:00
|
|
|
$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)
|
|
|
|
|
2012-03-04 21:32:36 +01:00
|
|
|
obj-y += $(addprefix ../, $(universal-obj-y))
|
2010-01-06 20:24:05 +01:00
|
|
|
obj-y += $(addprefix ../, $(common-obj-y))
|
2010-03-21 09:28:47 +01:00
|
|
|
obj-y += $(addprefix ../libdis/, $(libdis-y))
|
2010-01-06 20:24:05 +01:00
|
|
|
obj-y += $(libobj-y)
|
|
|
|
obj-y += $(addprefix $(HWDIR)/, $(hw-obj-y))
|
2011-09-15 22:45:42 +02:00
|
|
|
obj-y += $(addprefix ../, $(trace-obj-y))
|
2003-08-10 23:39:31 +02:00
|
|
|
|
2009-08-03 14:46:41 +02:00
|
|
|
endif # CONFIG_SOFTMMU
|
2006-10-28 14:19:07 +02:00
|
|
|
|
libcacard: initial commit
libcacard emulates a Common Access Card (CAC) which is a standard
for smartcards. It is used by the emulated ccid card introduced in
a following patch. Docs are available in docs/libcacard.txt
Signed-off-by: Alon Levy <alevy@redhat.com>
---
changes from v24->v25:
* Fix out of tree builds.
* Fix build with linux-user targets.
changes from v23->v24: (Jes Sorensen review 2)
* Makefile.target: use obj-$(CONFIG_*) +=
* remove unrequired includes, include qemu-common before qemu-thread
* required adding #define NO_NSPR_10_SUPPORT (harmless)
changes from v22->v23:
* configure fixes: (reported by Stefan Hajnoczi)
* test a = b, not a == b (second isn't portable)
* quote $source_path in case it contains spaces
- this doesn't really help since there are many other places
that need similar fixes, not introduced by this patch.
changes from v21->v22:
* fix configure to not link libcacard if nss not found
(reported by Stefan Hajnoczi)
* fix vscclient linkage with simpletrace backend
(reported by Stefan Hajnoczi)
* card_7816.c: add missing break in ERROR_DATA_NOT_FOUND
(reported by William van de Velde)
changes from v20->v21: (Jes Sorensen review)
* use qemu infrastructure: qemu-thread, qemu-common (qemu_malloc
and qemu_free), error_report
* assert instead of ASSERT
* cosmetic fixes
* use strpbrk and isspace
* add --disable-nss --enable-nss here, instead of in the final patch.
* split vscclient, passthru and docs to following patches.
changes from v19->v20:
* checkpatch.pl
changes from v15->v16:
Build:
* don't erase self with distclean
* fix make clean after make distclean
* Makefile: make vscclient link quiet
Behavioral:
* vcard_emul_nss: load coolkey in more situations
* vscclient:
* use hton,ntoh
* send init on connect, only start vevent thread on response
* read payload after header check, before type switch
* remove Reconnect
* update for vscard_common changes, empty Flush implementation
Style/Whitespace:
* fix wrong variable usage
* remove unused variable
* use only C style comments
* add copyright header
* fix tabulation
Signed-off-by: Alon Levy <alevy@redhat.com>
libcacard: fix out of tree builds
2010-11-28 15:36:38 +01:00
|
|
|
ifndef CONFIG_LINUX_USER
|
2011-08-22 22:39:59 +02:00
|
|
|
ifndef CONFIG_BSD_USER
|
libcacard: initial commit
libcacard emulates a Common Access Card (CAC) which is a standard
for smartcards. It is used by the emulated ccid card introduced in
a following patch. Docs are available in docs/libcacard.txt
Signed-off-by: Alon Levy <alevy@redhat.com>
---
changes from v24->v25:
* Fix out of tree builds.
* Fix build with linux-user targets.
changes from v23->v24: (Jes Sorensen review 2)
* Makefile.target: use obj-$(CONFIG_*) +=
* remove unrequired includes, include qemu-common before qemu-thread
* required adding #define NO_NSPR_10_SUPPORT (harmless)
changes from v22->v23:
* configure fixes: (reported by Stefan Hajnoczi)
* test a = b, not a == b (second isn't portable)
* quote $source_path in case it contains spaces
- this doesn't really help since there are many other places
that need similar fixes, not introduced by this patch.
changes from v21->v22:
* fix configure to not link libcacard if nss not found
(reported by Stefan Hajnoczi)
* fix vscclient linkage with simpletrace backend
(reported by Stefan Hajnoczi)
* card_7816.c: add missing break in ERROR_DATA_NOT_FOUND
(reported by William van de Velde)
changes from v20->v21: (Jes Sorensen review)
* use qemu infrastructure: qemu-thread, qemu-common (qemu_malloc
and qemu_free), error_report
* assert instead of ASSERT
* cosmetic fixes
* use strpbrk and isspace
* add --disable-nss --enable-nss here, instead of in the final patch.
* split vscclient, passthru and docs to following patches.
changes from v19->v20:
* checkpatch.pl
changes from v15->v16:
Build:
* don't erase self with distclean
* fix make clean after make distclean
* Makefile: make vscclient link quiet
Behavioral:
* vcard_emul_nss: load coolkey in more situations
* vscclient:
* use hton,ntoh
* send init on connect, only start vevent thread on response
* read payload after header check, before type switch
* remove Reconnect
* update for vscard_common changes, empty Flush implementation
Style/Whitespace:
* fix wrong variable usage
* remove unused variable
* use only C style comments
* add copyright header
* fix tabulation
Signed-off-by: Alon Levy <alevy@redhat.com>
libcacard: fix out of tree builds
2010-11-28 15:36:38 +01:00
|
|
|
# libcacard needs qemu-thread support, and besides is only needed by devices
|
2011-08-22 22:39:59 +02:00
|
|
|
# so not requires with linux-user / bsd-user targets
|
libcacard: initial commit
libcacard emulates a Common Access Card (CAC) which is a standard
for smartcards. It is used by the emulated ccid card introduced in
a following patch. Docs are available in docs/libcacard.txt
Signed-off-by: Alon Levy <alevy@redhat.com>
---
changes from v24->v25:
* Fix out of tree builds.
* Fix build with linux-user targets.
changes from v23->v24: (Jes Sorensen review 2)
* Makefile.target: use obj-$(CONFIG_*) +=
* remove unrequired includes, include qemu-common before qemu-thread
* required adding #define NO_NSPR_10_SUPPORT (harmless)
changes from v22->v23:
* configure fixes: (reported by Stefan Hajnoczi)
* test a = b, not a == b (second isn't portable)
* quote $source_path in case it contains spaces
- this doesn't really help since there are many other places
that need similar fixes, not introduced by this patch.
changes from v21->v22:
* fix configure to not link libcacard if nss not found
(reported by Stefan Hajnoczi)
* fix vscclient linkage with simpletrace backend
(reported by Stefan Hajnoczi)
* card_7816.c: add missing break in ERROR_DATA_NOT_FOUND
(reported by William van de Velde)
changes from v20->v21: (Jes Sorensen review)
* use qemu infrastructure: qemu-thread, qemu-common (qemu_malloc
and qemu_free), error_report
* assert instead of ASSERT
* cosmetic fixes
* use strpbrk and isspace
* add --disable-nss --enable-nss here, instead of in the final patch.
* split vscclient, passthru and docs to following patches.
changes from v19->v20:
* checkpatch.pl
changes from v15->v16:
Build:
* don't erase self with distclean
* fix make clean after make distclean
* Makefile: make vscclient link quiet
Behavioral:
* vcard_emul_nss: load coolkey in more situations
* vscclient:
* use hton,ntoh
* send init on connect, only start vevent thread on response
* read payload after header check, before type switch
* remove Reconnect
* update for vscard_common changes, empty Flush implementation
Style/Whitespace:
* fix wrong variable usage
* remove unused variable
* use only C style comments
* add copyright header
* fix tabulation
Signed-off-by: Alon Levy <alevy@redhat.com>
libcacard: fix out of tree builds
2010-11-28 15:36:38 +01:00
|
|
|
obj-$(CONFIG_SMARTCARD_NSS) += $(addprefix ../libcacard/, $(libcacard-y))
|
2011-08-22 22:39:59 +02:00
|
|
|
endif # CONFIG_BSD_USER
|
libcacard: initial commit
libcacard emulates a Common Access Card (CAC) which is a standard
for smartcards. It is used by the emulated ccid card introduced in
a following patch. Docs are available in docs/libcacard.txt
Signed-off-by: Alon Levy <alevy@redhat.com>
---
changes from v24->v25:
* Fix out of tree builds.
* Fix build with linux-user targets.
changes from v23->v24: (Jes Sorensen review 2)
* Makefile.target: use obj-$(CONFIG_*) +=
* remove unrequired includes, include qemu-common before qemu-thread
* required adding #define NO_NSPR_10_SUPPORT (harmless)
changes from v22->v23:
* configure fixes: (reported by Stefan Hajnoczi)
* test a = b, not a == b (second isn't portable)
* quote $source_path in case it contains spaces
- this doesn't really help since there are many other places
that need similar fixes, not introduced by this patch.
changes from v21->v22:
* fix configure to not link libcacard if nss not found
(reported by Stefan Hajnoczi)
* fix vscclient linkage with simpletrace backend
(reported by Stefan Hajnoczi)
* card_7816.c: add missing break in ERROR_DATA_NOT_FOUND
(reported by William van de Velde)
changes from v20->v21: (Jes Sorensen review)
* use qemu infrastructure: qemu-thread, qemu-common (qemu_malloc
and qemu_free), error_report
* assert instead of ASSERT
* cosmetic fixes
* use strpbrk and isspace
* add --disable-nss --enable-nss here, instead of in the final patch.
* split vscclient, passthru and docs to following patches.
changes from v19->v20:
* checkpatch.pl
changes from v15->v16:
Build:
* don't erase self with distclean
* fix make clean after make distclean
* Makefile: make vscclient link quiet
Behavioral:
* vcard_emul_nss: load coolkey in more situations
* vscclient:
* use hton,ntoh
* send init on connect, only start vevent thread on response
* read payload after header check, before type switch
* remove Reconnect
* update for vscard_common changes, empty Flush implementation
Style/Whitespace:
* fix wrong variable usage
* remove unused variable
* use only C style comments
* add copyright header
* fix tabulation
Signed-off-by: Alon Levy <alevy@redhat.com>
libcacard: fix out of tree builds
2010-11-28 15:36:38 +01:00
|
|
|
endif # CONFIG_LINUX_USER
|
|
|
|
|
2009-10-07 02:41:04 +02:00
|
|
|
obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
|
|
|
|
|
2011-12-22 11:18:53 +01:00
|
|
|
ifdef QEMU_PROGW
|
|
|
|
# The linker builds a windows executable. Make also a console executable.
|
|
|
|
$(QEMU_PROGW): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)
|
|
|
|
$(call LINK,$^)
|
|
|
|
$(QEMU_PROG): $(QEMU_PROGW)
|
|
|
|
$(call quiet-command,$(OBJCOPY) --subsystem console $(QEMU_PROGW) $(QEMU_PROG)," GEN $(TARGET_DIR)$(QEMU_PROG)")
|
|
|
|
else
|
2010-01-06 20:24:05 +01:00
|
|
|
$(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)
|
2011-08-31 20:30:30 +02:00
|
|
|
$(call LINK,$^)
|
2011-12-22 11:18:53 +01:00
|
|
|
endif
|
2009-07-16 18:34:04 +02:00
|
|
|
|
2011-01-20 21:54:21 +01:00
|
|
|
gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh
|
|
|
|
$(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@")
|
2008-10-11 19:55:29 +02:00
|
|
|
|
2010-09-30 21:00:22 +02:00
|
|
|
hmp-commands.h: $(SRC_PATH)/hmp-commands.hx
|
2011-01-20 21:54:21 +01:00
|
|
|
$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@")
|
2009-06-06 10:22:04 +02:00
|
|
|
|
2011-09-02 19:34:47 +02:00
|
|
|
qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx
|
2011-01-20 21:54:21 +01:00
|
|
|
$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@")
|
2009-06-06 10:22:04 +02:00
|
|
|
|
2003-08-10 23:39:31 +02:00
|
|
|
clean:
|
2009-06-06 10:22:04 +02:00
|
|
|
rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o
|
2011-10-15 10:01:27 +02:00
|
|
|
rm -f *.d */*.d tcg/*.o ide/*.o 9pfs/*.o kvm/*.o
|
2011-09-02 19:34:47 +02:00
|
|
|
rm -f hmp-commands.h qmp-commands-old.h gdbstub-xml.c
|
2011-08-31 20:30:43 +02:00
|
|
|
ifdef CONFIG_TRACE_SYSTEMTAP
|
2010-11-12 14:20:25 +01:00
|
|
|
rm -f *.stp
|
|
|
|
endif
|
2003-09-30 22:54:24 +02:00
|
|
|
|
2007-09-16 23:08:06 +02:00
|
|
|
install: all
|
2004-03-26 23:43:34 +01:00
|
|
|
ifneq ($(PROGS),)
|
2010-08-05 02:21:34 +02:00
|
|
|
$(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
|
|
|
|
ifneq ($(STRIP),)
|
|
|
|
$(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS))
|
|
|
|
endif
|
2004-03-26 23:43:34 +01:00
|
|
|
endif
|
2011-08-31 20:30:43 +02:00
|
|
|
ifdef CONFIG_TRACE_SYSTEMTAP
|
2010-11-12 14:20:25 +01:00
|
|
|
$(INSTALL_DIR) "$(DESTDIR)$(datadir)/../systemtap/tapset"
|
|
|
|
$(INSTALL_DATA) $(QEMU_PROG).stp "$(DESTDIR)$(datadir)/../systemtap/tapset"
|
|
|
|
endif
|
2003-08-10 23:39:31 +02:00
|
|
|
|
2007-10-28 14:07:12 +01:00
|
|
|
# Include automatically generated dependency files
|
|
|
|
-include $(wildcard *.d */*.d)
|