From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andre Przywara <andre.przywara@amd.com>
Subject: [PATCH] [MiniOS] backporting mistake in 3.4-testing
Date: Tue, 27 Oct 2009 13:29:15 +0100
Message-ID: <4AE6E79B.3020801@amd.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------060304070703040908060503"
Return-path: <xen-devel-bounces@lists.xensource.com>
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: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

--------------060304070703040908060503
Content-Type: text/plain; charset="ISO-8859-1"; format=flowed
Content-Transfer-Encoding: 7bit

Hi,

in xen-3.4-testing.hg c/s 19793 introduced a backporting mistake in the 
MiniOS console preventing 3.4 MiniOS to be built. Attached patch fixes that.

Signed-off-by: Andre Przywara <andre.przywara@amd.com>

Regards,
Andre.

-- 
Andre Przywara
AMD-Operating System Research Center (OSRC), Dresden, Germany
Tel: +49 351 448 3567 12
----to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Andrew Bowd; Thomas M. McCoy; Giuliano Meroni
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

--------------060304070703040908060503
Content-Type: text/x-patch; name="3.4-minios-console.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="3.4-minios-console.patch"

diff -r 2a5604621e21 extras/mini-os/console/console.c
--- a/extras/mini-os/console/console.c	Fri Oct 23 10:34:01 2009 +0100
+++ b/extras/mini-os/console/console.c	Tue Oct 27 13:28:23 2009 +0100
@@ -99,7 +99,7 @@
             saved_char = *(curr_char+1);
             *(curr_char+1) = '\n';
             part_len = curr_char - copied_ptr + 2;
-            ring_send_fn(dev, copied_ptr, part_len);
+            ring_send_fn(copied_ptr, part_len);
             *(curr_char+1) = saved_char;
             copied_ptr = curr_char+1;
             length -= part_len - 1;
@@ -112,7 +112,7 @@
         length++;
     }
     
-    ring_send_fn(dev, copied_ptr, length);
+    ring_send_fn(copied_ptr, length);
 }
 
 void print(int direct, const char *fmt, va_list args)

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

--------------060304070703040908060503--