Upstreaming Debian patches for Xen Qemu DM

Upstreaming Debian patches for Xen Qemu DM

[Thomas Goirand]

[-- Attachment #1: Type: text/plain, Size: 595 bytes --]

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

[-- Attachment #2: add-rules.patch --]
[-- Type: text/x-diff, Size: 2635 bytes --]

--- 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 <<END >>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-%-$*,%,$@)

[-- Attachment #3: adds-audio-card-config.patch --]
[-- Type: text/x-diff, Size: 431 bytes --]

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

[-- Attachment #4: alsaaudio-spelling-mistake.patch --]
[-- Type: text/x-diff, Size: 403 bytes --]

--- 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);
     }
 

[-- Attachment #5: change-script-path.patch --]
[-- Type: text/x-diff, Size: 494 bytes --]

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

[-- Attachment #6: qemu-img-xen.1.diff --]
[-- Type: text/x-diff, Size: 1330 bytes --]

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

[-- Attachment #7: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: Upstreaming Debian patches for Xen Qemu DM

[Samuel Thibault]

Thomas Goirand, le Tue 23 Mar 2010 17:55:11 +0800, a écrit :
> 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?

I don't have the time to do it.

Samuel

Re: Upstreaming Debian patches for Xen Qemu DM

[Bastian Blank]

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

Re: Upstreaming Debian patches for Xen Qemu DM

[Christian Motschke]

Am 25.03.2010 um 00:05 schrieb Bastian Blank:

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

I have some existing configurations of virtualized Windows XP machines that are configured with sound hardware (yes, I know, that it is not needed). And I know a company, that has configured some of its VMs with a sound card too (maybe they don't even know it, that it is not neccessary). If we do not want to break some existing setups, we should support sound hardware with qemu-dm (the 3.2.1 lenny version had it too). 2nd, I used a screen recording software, that only worked, when a sound card was installed. Maybe I should use better software, but … ;-)

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

Re: Upstreaming Debian patches for Xen Qemu DM

[Martinx - ジェームズ]

[-- Attachment #1.1: Type: text/plain, Size: 3410 bytes --]

Hi!

 Someone knows if the Debian Squeeze will have the paravirt_ops dom0 based
on 2.6.32.10 from Jeremy's tree, HVM normal domains and HVM stubdomains?

Thanks!
Thiago

On 25 March 2010 07:09, Christian Motschke <christian@motschke.de> wrote:

> Am 25.03.2010 um 00:05 schrieb Bastian Blank:
>
> > 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?
>
> I have some existing configurations of virtualized Windows XP machines that
> are configured with sound hardware (yes, I know, that it is not needed). And
> I know a company, that has configured some of its VMs with a sound card too
> (maybe they don't even know it, that it is not neccessary). If we do not
> want to break some existing setups, we should support sound hardware with
> qemu-dm (the 3.2.1 lenny version had it too). 2nd, I used a screen recording
> software, that only worked, when a sound card was installed. Maybe I should
> use better software, but … ;-)
>
> >
> >> --- 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
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel
>

[-- Attachment #1.2: Type: text/html, Size: 4607 bytes --]

[-- Attachment #2: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel