From: Bastian Blank <waldi@debian.org>
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>
Subject: Re: Upstreaming Debian patches for Xen Qemu DM
Date: Thu, 25 Mar 2010 00:05:27 +0100 [thread overview]
Message-ID: <20100324230527.GA30472@wavehammer.waldi.eu.org> (raw)
In-Reply-To: <4BA88FFF.6060403@goirand.fr>
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
next prev parent reply other threads:[~2010-03-24 23:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-23 9:55 Upstreaming Debian patches for Xen Qemu DM Thomas Goirand
2010-03-23 10:04 ` Samuel Thibault
2010-03-24 23:05 ` Bastian Blank [this message]
2010-03-25 10:09 ` Christian Motschke
2010-03-29 19:32 ` Martinx - ジェームズ
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100324230527.GA30472@wavehammer.waldi.eu.org \
--to=waldi@debian.org \
--cc=Ian.Jackson@eu.citrix.com \
--cc=christian@motschke.de \
--cc=stefano.stabellini@eu.citrix.com \
--cc=sthibault@debian.org \
--cc=thomas@goirand.fr \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).