rpms/kernel/FC-6 xen-guest-hde-hangs.patch, NONE, 1.1.2.1 kernel-2.6.spec, 1.2857, 1.2857.8.1

[fedora-cvs-commits at redhat.com]

Author: gcosta

Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv20368

Modified Files:
      Tag: private-glommer-teste
	kernel-2.6.spec 
Added Files:
      Tag: private-glommer-teste
	xen-guest-hde-hangs.patch 
Log Message:
testing xen patching



xen-guest-hde-hangs.patch:
 xenstore.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xen-guest-hde-hangs.patch ---
# HG changeset patch
# User Ewan Mellor <ewan at xensource.com>
# Date 1163675477 0
# Node ID c677f4e756084a1499f6367a2b3e2c15f5b9e66d
# Parent  d0e9da9cc84a5c58c8b2a9591e02d74f50418d82
Fix clobbering bug when hde is specified; QEMU only supports up to hdd, but
hde is accepted and writes off the end of some tables.

>From Hiromichi Itou <ito at begi.net>.
Signed-off-by: Ewan Mellor <ewan at xensource.com>

diff -r d0e9da9cc84a -r c677f4e75608 tools/ioemu/xenstore.c
--- xen/tools/ioemu/xenstore.c	Thu Nov 16 10:52:03 2006 +0000
+++ xen/tools/ioemu/xenstore.c	Thu Nov 16 11:11:17 2006 +0000
@@ -100,7 +100,7 @@ void xenstore_parse_domain_config(int do
 	if (strncmp(dev, "hd", 2) || strlen(dev) != 3)
 	    continue;
 	hd_index = dev[2] - 'a';
-	if (hd_index > MAX_DISKS)
+	if (hd_index >= MAX_DISKS)
 	    continue;
 	/* read the type of the device */
 	if (pasprintf(&buf, "%s/device/vbd/%s/device-type", path, e[i]) == -1)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2857
retrieving revision 1.2857.8.1
diff -u -r1.2857 -r1.2857.8.1
--- kernel-2.6.spec	21 Nov 2006 12:10:44 -0000	1.2857
+++ kernel-2.6.spec	5 Dec 2006 15:37:26 -0000	1.2857.8.1
@@ -3,7 +3,7 @@
 # What parts do we want to build?  We must build at least one kernel.
 # These are the kernels that are built IF the architecture allows it.
 
-%define buildup 1
+%define buildup 0
 # Only used on archs without run-time support (ie ppc, sparc64)
 %define buildsmp 0
 %define buildpae 0
@@ -12,7 +12,7 @@
 # Whether to build the Xen kernels, disable if you want.
 %define buildxen 1
 %define builddoc 0
-%define buildkdump 1
+%define buildkdump 0
 %define buildheaders 1
 
 # Versions of various parts
@@ -32,7 +32,7 @@
 %define sublevel 18
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}-glommer
 %define signmodules 0
 %define xen_hv_cset 11774
 %define make_target bzImage
@@ -575,6 +575,7 @@
 Patch20000: xen-printf-rate-limit.patch
 Patch20001: xen-version-strings.patch
 Patch20002: xen-grant-security.patch
+Patch20003: xen-guest-hde-hangs.patch
 
 # END OF PATCH DEFINITIONS