From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Goirand Subject: Upstreaming Debian patches for Xen Qemu DM Date: Tue, 23 Mar 2010 17:55:11 +0800 Message-ID: <4BA88FFF.6060403@goirand.fr> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------010608060703070605020807" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: Samuel Thibault , Ian Jackson , Christian Motschke , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------010608060703070605020807 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hi, For the moment, I'm using these 5 patches for Xen Qemu in my package. The most important part is the Audio subsystem that by default is not working. Would anyone care applying them to the Git? Also, it's been MONTHs since I'm calling for a sponsorship for the first upload in Debian (I'll manage later updates thanks to the Dm-Upload-Allowed field). Samuel, Ian, aren't you interested in sponsoring this one? http://ftparchive.gplhost.com/debian/pool/lenny/main/x/xen-qemu-dm-3.4/ http://ftparchive.gplhost.com/debian/pool/lenny/main/x/xen-qemu-dm-3.4/xen-qemu-dm-3.4_3.4.2-1.dsc Thomas --------------010608060703070605020807 Content-Type: text/x-diff; name="add-rules.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="add-rules.patch" --- a/xen-config-host.mak +++ b/xen-config-host.mak @@ -1,6 +1,6 @@ QEMU_ROOT ?= . -XEN_ROOT ?= $(QEMU_ROOT)/../xen-unstable.hg -include $(XEN_ROOT)/tools/Rules.mk +XEN_ROOT ?= /nonexistant +include $(QEMU_ROOT)/Rules.mk ifdef CONFIG_STUBDOM TARGET_DIRS=i386-stubdom --- a/xen-setup-stubdom +++ b/xen-setup-stubdom @@ -85,7 +85,7 @@ fi cat <>config-host.mak.new -include \$(XEN_ROOT)/tools/Rules.mk +include Rules.mk SUBDIR_RULES=subdir-\$(TARGET_DIRS) subdir-\$(TARGET_DIRS): libqemu_common.a -include \$(QEMU_ROOT)/xen-hooks.mak --- /dev/null +++ b/Rules.mk @@ -0,0 +1,67 @@ +# -*- mode: Makefile; -*- + +# `all' is the default target +all: + +#include $(XEN_ROOT)/Config.mk + +export _INSTALL := $(INSTALL) +INSTALL = $(XEN_ROOT)/tools/cross-install + +XEN_INCLUDE = $(XEN_ROOT)/tools/include +XEN_XC = $(XEN_ROOT)/tools/python/xen/lowlevel/xc +XEN_LIBXC = $(XEN_ROOT)/tools/libxc +XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore +XEN_LIBXENSTAT = $(XEN_ROOT)/tools/xenstat/libxenstat/src + +CFLAGS_include = -I$(XEN_INCLUDE) + +CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_include) +LDFLAGS_libxenctrl = -L$(XEN_LIBXC) -lxenctrl + +CFLAGS_libxenguest = -I$(XEN_LIBXC) $(CFLAGS_include) +LDFLAGS_libxenguest = -L$(XEN_LIBXC) -lxenguest + +CFLAGS_libxenstore = -I$(XEN_XENSTORE) $(CFLAGS_include) +LDFLAGS_libxenstore = -L$(XEN_XENSTORE) -lxenstore + +X11_LDPATH = -L/usr/X11R6/$(LIBLEAFDIR) + +CFLAGS += -D__XEN_TOOLS__ + +# Get gcc to generate the dependencies for us. +CFLAGS += -MMD -MF .$(@F).d +DEPS = .*.d + +ifneq ($(XEN_OS),NetBSD) +# Enable implicit LFS support *and* explicit LFS names. +CFLAGS += $(shell getconf LFS_CFLAGS) +CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE +LDFLAGS += $(shell getconf LFS_LDFLAGS) +endif + +# 32-bit x86 does not perform well with -ve segment accesses on Xen. +CFLAGS-$(CONFIG_X86_32) += $(call cc-option,$(CC),-mno-tls-direct-seg-refs) +CFLAGS += $(CFLAGS-y) + +# Require GCC v3.4+ (to avoid issues with alignment constraints in Xen headers) +check-$(CONFIG_X86) = $(call cc-ver-check,CC,0x030400,\ + "Xen requires at least gcc-3.4") +$(eval $(check-y)) + +%.opic: %.c + $(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $< + +%.o: %.c + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + +%.o: %.cc + $(CC) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< + +subdirs-all subdirs-clean subdirs-install: .phony + @set -e; for subdir in $(SUBDIRS) $(SUBDIRS-y); do \ + $(MAKE) subdir-$(patsubst subdirs-%,%,$@)-$$subdir; \ + done + +subdir-all-% subdir-clean-% subdir-install-%: .phony + $(MAKE) -C $* $(patsubst subdir-%-$*,%,$@) --------------010608060703070605020807 Content-Type: text/x-diff; name="adds-audio-card-config.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="adds-audio-card-config.patch" --- a/configure 2010-03-23 17:08:39.000000000 +0800 +++ b/configure 2010-03-23 17:09:30.000000000 +0800 @@ -1382,6 +1382,9 @@ echo "#define CONFIG_VDE 1" >> $config_h echo "VDE_LIBS=-lvdeplug" >> $config_mak fi +if ! test -z "$audio_card_list"; then + echo "CONFIG_AUDIO=yes" >> $config_mak +fi for card in $audio_card_list; do def=CONFIG_`echo $card | tr '[:lower:]' '[:upper:]'` echo "$def=yes" >> $config_mak --------------010608060703070605020807 Content-Type: text/x-diff; name="alsaaudio-spelling-mistake.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="alsaaudio-spelling-mistake.patch" --- a/audio/alsaaudio.c 2010-03-23 17:18:43.000000000 +0800 +++ b/audio/alsaaudio.c 2010-03-23 17:19:03.000000000 +0800 @@ -475,7 +475,7 @@ (obt->fmt != req->fmt || obt->nchannels != req->nchannels || obt->freq != req->freq)) { - dolog ("Audio paramters for %s\n", typ); + dolog ("Audio parameters for %s\n", typ); alsa_dump_info (req, obt); } --------------010608060703070605020807 Content-Type: text/x-diff; name="change-script-path.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="change-script-path.patch" --- a/xen-config-host.h 2010-01-06 14:18:11.000000000 +0800 +++ b/xen-config-host.h 2010-01-06 14:25:11.000000000 +0800 @@ -32,8 +32,8 @@ extern int xen_pause_requested; extern int vcpus; -#define DEFAULT_NETWORK_SCRIPT "/etc/xen/qemu-ifup" -#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/xen/qemu-ifdown" +#define DEFAULT_NETWORK_SCRIPT "/etc/xen/scripts/qemu-ifup" +#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/xen/scripts/qemu-ifdown" #ifdef CONFIG_STUBDOM #define bdrv_host_device bdrv_raw --------------010608060703070605020807 Content-Type: text/x-diff; name="qemu-img-xen.1.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="qemu-img-xen.1.diff" --- qemu-img-xen.1.orig 2009-12-24 00:51:05.000000000 +0800 +++ qemu-img-xen.1 2009-12-24 00:56:11.000000000 +0800 @@ -123,17 +123,17 @@ .rm #[ #] #H #V #F C .\" ======================================================================== .\" -.IX Title "QEMU-IMG 1" -.TH QEMU-IMG 1 "2009-12-24" " " " " +.IX Title "qemu-img-xen 1" +.TH qemu-img-xen 1 "2009-12-24" " " " " .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l .nh .SH "NAME" -qemu\-img \- QEMU disk image utility +qemu\-img\-xen \- QEMU disk image utility (Xen version) .SH "SYNOPSIS" .IX Header "SYNOPSIS" -usage: qemu-img command [command options] +usage: qemu-img-xen command [command options] .SH "OPTIONS" .IX Header "OPTIONS" The following commands are supported: @@ -177,7 +177,7 @@ being simple and easily exportable to all other emulators. If your file system supports \fIholes\fR (for example in ext2 or ext3 on Linux or \s-1NTFS\s0 on Windows), then only the written sectors will reserve -space. Use \f(CW\*(C`qemu\-img info\*(C'\fR to know the real size used by the +space. Use \f(CW\*(C`qemu\-img\-xen info\*(C'\fR to know the real size used by the image or \f(CW\*(C`ls \-ls\*(C'\fR on Unix/Linux. .ie n .IP """qcow2""" 4 .el .IP "\f(CWqcow2\fR" 4 --------------010608060703070605020807 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------010608060703070605020807--