mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 18:21:39 +01:00
Stefano Stabellini
ce8ffdb551
This patch implements the new protocol for handling pv consoles and emulated serials as described in the document docs/misc/console.txt. The changes are: - xenconsoled: do not write the pty under serial in xenstore if xenconsoled is handling a consolepath; - xenconsole: implement support for an explicit console type parameter; the parameter can be "pv", to specify that the user wants to connect to a pv console, or "serial", to specify that the user wants to connect to an emulated serial. If the type parameter hasn't been specified be the user, xenconsole tries to guess which type of console it has to connect to, defaulting to pv console for pv guests and emulated serial for hvm guests. - xenconsole: use the new xenstore paths; - libxl: rename libxl_console_constype to libxl_console_consback: constype is used to to specify whether qemu or xenconsoled provides the backend, so I renamed it to libxl_console_consback to make it more obvious that we are talking about backends; - libxl: add a new libxl_console_constype to specify if the console is an emulated serial or a pv console; - libxl: support the new xenconsole "type" command line parameter; - libxl: use the "output" node under console in xenstore to tell qemu where do we want the output of this pv console to go; - remove the legacy "serialpath" from xenconsoled altogether Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> Also: update the QEMU_TAG to pull in the qemu part of these changes. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
188 lines
6.7 KiB
Makefile
188 lines
6.7 KiB
Makefile
# -*- mode: Makefile; -*-
|
|
|
|
# A debug build of Xen and tools?
|
|
debug ?= y
|
|
|
|
XEN_COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/ \
|
|
-e s/i86pc/x86_32/ -e s/amd64/x86_64/)
|
|
XEN_TARGET_ARCH ?= $(XEN_COMPILE_ARCH)
|
|
XEN_OS ?= $(shell uname -s)
|
|
|
|
CONFIG_$(XEN_OS) := y
|
|
|
|
SHELL ?= /bin/sh
|
|
|
|
# Tools to run on system hosting the build
|
|
HOSTCC = gcc
|
|
HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
|
|
HOSTCFLAGS += -fno-strict-aliasing
|
|
|
|
DISTDIR ?= $(XEN_ROOT)/dist
|
|
DESTDIR ?= /
|
|
|
|
# Allow phony attribute to be listed as dependency rather than fake target
|
|
.PHONY: .phony
|
|
|
|
include $(XEN_ROOT)/config/$(XEN_OS).mk
|
|
include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk
|
|
|
|
SHAREDIR ?= $(PREFIX)/share
|
|
DOCDIR ?= $(SHAREDIR)/doc/xen
|
|
MANDIR ?= $(SHAREDIR)/man
|
|
BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d
|
|
|
|
ifneq ($(EXTRA_PREFIX),)
|
|
EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
|
|
EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBLEAFDIR)
|
|
endif
|
|
|
|
BISON ?= bison
|
|
FLEX ?= flex
|
|
|
|
PYTHON ?= python
|
|
PYTHON_PREFIX_ARG ?= --prefix="$(PREFIX)"
|
|
# The above requires that PREFIX contains *no spaces*. This variable is here
|
|
# to permit the user to set PYTHON_PREFIX_ARG to '' to workaround this bug:
|
|
# https://bugs.launchpad.net/ubuntu/+bug/362570
|
|
|
|
# cc-option: Check if compiler supports first option, else fall back to second.
|
|
# Usage: cflags-y += $(call cc-option,$(CC),-march=winchip-c6,-march=i586)
|
|
cc-option = $(shell if test -z "`$(1) $(2) -S -o /dev/null -xc \
|
|
/dev/null 2>&1`"; then echo "$(2)"; else echo "$(3)"; fi ;)
|
|
|
|
# cc-option-add: Add an option to compilation flags, but only if supported.
|
|
# Usage: $(call cc-option-add CFLAGS,CC,-march=winchip-c6)
|
|
cc-option-add = $(eval $(call cc-option-add-closure,$(1),$(2),$(3)))
|
|
define cc-option-add-closure
|
|
ifneq ($$(call cc-option,$$($(2)),$(3),n),n)
|
|
$(1) += $(3)
|
|
endif
|
|
endef
|
|
|
|
cc-options-add = $(foreach o,$(3),$(call cc-option-add,$(1),$(2),$(o)))
|
|
|
|
# cc-ver: Check compiler is at least specified version. Return boolean 'y'/'n'.
|
|
# Usage: ifeq ($(call cc-ver,$(CC),0x030400),y)
|
|
cc-ver = $(shell if [ $$((`$(1) -dumpversion | awk -F. \
|
|
'{ printf "0x%02x%02x%02x", $$1, $$2, $$3}'`)) -ge $$(($(2))) ]; \
|
|
then echo y; else echo n; fi ;)
|
|
|
|
# cc-ver-check: Check compiler is at least specified version, else fail.
|
|
# Usage: $(call cc-ver-check,CC,0x030400,"Require at least gcc-3.4")
|
|
cc-ver-check = $(eval $(call cc-ver-check-closure,$(1),$(2),$(3)))
|
|
define cc-ver-check-closure
|
|
ifeq ($$(call cc-ver,$$($(1)),$(2)),n)
|
|
override $(1) = echo "*** FATAL BUILD ERROR: "$(3) >&2; exit 1;
|
|
cc-option := n
|
|
endif
|
|
endef
|
|
|
|
define absolutify_xen_root
|
|
case "$(XEN_ROOT)" in \
|
|
/*) XEN_ROOT=$(XEN_ROOT) ;; \
|
|
*) xen_root_lhs=`pwd`; \
|
|
xen_root_rhs=$(XEN_ROOT)/; \
|
|
while [ "x$${xen_root_rhs#../}" != "x$$xen_root_rhs" ]; do \
|
|
xen_root_rhs="$${xen_root_rhs#../}"; \
|
|
xen_root_rhs="$${xen_root_rhs#/}"; \
|
|
xen_root_rhs="$${xen_root_rhs#/}"; \
|
|
xen_root_lhs="$${xen_root_lhs%/*}"; \
|
|
done; \
|
|
XEN_ROOT="$$xen_root_lhs/$$xen_root_rhs" ;; \
|
|
esac; \
|
|
export XEN_ROOT
|
|
endef
|
|
|
|
define buildmakevars2shellvars
|
|
PREFIX="$(PREFIX)"; \
|
|
XEN_SCRIPT_DIR="$(XEN_SCRIPT_DIR)"; \
|
|
export PREFIX; \
|
|
export XEN_SCRIPT_DIR
|
|
endef
|
|
|
|
buildmakevars2file = $(eval $(call buildmakevars2file-closure,$(1)))
|
|
define buildmakevars2file-closure
|
|
.PHONY: genpath
|
|
genpath:
|
|
rm -f $(1); \
|
|
echo "SBINDIR=\"$(SBINDIR)\"" >> $(1); \
|
|
echo "BINDIR=\"$(BINDIR)\"" >> $(1); \
|
|
echo "LIBEXEC=\"$(LIBEXEC)\"" >> $(1); \
|
|
echo "LIBDIR=\"$(LIBDIR)\"" >> $(1); \
|
|
echo "SHAREDIR=\"$(SHAREDIR)\"" >> $(1); \
|
|
echo "PRIVATE_BINDIR=\"$(PRIVATE_BINDIR)\"" >> $(1); \
|
|
echo "XENFIRMWAREDIR=\"$(XENFIRMWAREDIR)\"" >> $(1); \
|
|
echo "XEN_CONFIG_DIR=\"$(XEN_CONFIG_DIR)\"" >> $(1); \
|
|
echo "XEN_SCRIPT_DIR=\"$(XEN_SCRIPT_DIR)\"" >> $(1)
|
|
endef
|
|
|
|
ifeq ($(debug),y)
|
|
CFLAGS += -g
|
|
endif
|
|
|
|
CFLAGS += -fno-strict-aliasing
|
|
|
|
CFLAGS += -std=gnu99
|
|
|
|
CFLAGS += -Wall -Wstrict-prototypes
|
|
|
|
# -Wunused-value makes GCC 4.x too aggressive for my taste: ignoring the
|
|
# result of any casted expression causes a warning.
|
|
CFLAGS += -Wno-unused-value
|
|
|
|
$(call cc-option-add,HOSTCFLAGS,HOSTCC,-Wdeclaration-after-statement)
|
|
$(call cc-option-add,CFLAGS,CC,-Wdeclaration-after-statement)
|
|
|
|
LDFLAGS += $(foreach i, $(EXTRA_LIB), -L$(i))
|
|
CFLAGS += $(foreach i, $(EXTRA_INCLUDES), -I$(i))
|
|
|
|
EMBEDDED_EXTRA_CFLAGS := -nopie -fno-stack-protector -fno-stack-protector-all
|
|
EMBEDDED_EXTRA_CFLAGS += -fno-exceptions
|
|
|
|
# Enable XSM security module. Enabling XSM requires selection of an
|
|
# XSM security module (FLASK_ENABLE or ACM_SECURITY).
|
|
XSM_ENABLE ?= n
|
|
FLASK_ENABLE ?= n
|
|
ACM_SECURITY ?= n
|
|
|
|
# Download GIT repositories via HTTP or GIT's own protocol?
|
|
# GIT's protocol is faster and more robust, when it works at all (firewalls
|
|
# may block it). We make it the default, but if your GIT repository downloads
|
|
# fail or hang, please specify GIT_HTTP=y in your environment.
|
|
GIT_HTTP ?= n
|
|
|
|
XEN_EXTFILES_URL=http://xenbits.xensource.com/xen-extfiles
|
|
# All the files at that location were downloaded from elsewhere on
|
|
# the internet. The original download URL is preserved as a comment
|
|
# near the place in the Xen Makefiles where the file is used.
|
|
|
|
ifeq ($(GIT_HTTP),y)
|
|
QEMU_REMOTE=http://xenbits.xensource.com/git-http/qemu-xen-unstable.git
|
|
else
|
|
QEMU_REMOTE=git://xenbits.xensource.com/qemu-xen-unstable.git
|
|
endif
|
|
|
|
# Specify which qemu-dm to use. This may be `ioemu' to use the old
|
|
# Mercurial in-tree version, or a local directory, or a git URL.
|
|
# CONFIG_QEMU ?= ../qemu-xen.git
|
|
CONFIG_QEMU ?= $(QEMU_REMOTE)
|
|
|
|
QEMU_TAG ?= 466608f3a32e1f9808acdf832a5843af37e5fcec
|
|
# Mon Aug 16 13:29:36 2010 +0100
|
|
# support multiple pv consoles for hvm guests too
|
|
|
|
# Optional components
|
|
XENSTAT_XENTOP ?= y
|
|
VTPM_TOOLS ?= n
|
|
LIBXENAPI_BINDINGS ?= n
|
|
PYTHON_TOOLS ?= y
|
|
OCAML_TOOLS ?= y
|
|
CONFIG_MINITERM ?= n
|
|
CONFIG_LOMOUNT ?= n
|
|
|
|
ifeq ($(OCAML_TOOLS),y)
|
|
OCAML_TOOLS := $(shell ocamlopt -v > /dev/null 2>&1 && echo "y" || echo "n")
|
|
endif
|
|
|
|
-include $(XEN_ROOT)/.config
|