From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bastian Blank <waldi@debian.org>
Subject: Re: Upstreaming Debian patches for Xen Qemu DM
Date: Thu, 25 Mar 2010 00:05:27 +0100
Message-ID: <20100324230527.GA30472@wavehammer.waldi.eu.org>
References: <4BA88FFF.6060403@goirand.fr>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
In-Reply-To: <4BA88FFF.6060403@goirand.fr>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Thomas Goirand <thomas@goirand.fr>
Cc: xen-devel@lists.xensource.com, Ian Jackson <Ian.Jackson@eu.citrix.com>, Christian Motschke <christian@motschke.de>, Stefano Stabellini <stefano.stabellini@eu.citrix.com>, Samuel Thibault <sthibault@debian.org>
List-Id: xen-devel@lists.xenproject.org

On Tue, Mar 23, 2010 at 05:55:11PM +0800, Thomas Goirand wrote:
> --- 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

This looks rather similar to my patch. Please explain why this would be
applicable to upstream.

> --- 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

Audio for a server?

> --- 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

Debian specific.

> --- 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" " " " "

This tool is called qemu-img and included in qemu-utils.

Bastian

-- 
Those who hate and fight must stop themselves -- otherwise it is not stopped.
		-- Spock, "Day of the Dove", stardate unknown