From: Akio Takebe Subject: [Patch] support small buffer to read_console_ring() Date: Sun, 11 Jun 2006 10:25:20 +0900 Message-ID: <9EC68CF5E73689takebe_akio@jp.fujitsu.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-IbEkrvt8hmsnB732kQTe9" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --Boundary-IbEkrvt8hmsnB732kQTe9 Content-Type: text/plain; charset=iso-2022-jp Content-Transfer-Encoding: 7bit Content-Description: Mail message body Hi, read_console_ring() hung up when we pass smaller buffer than conringp - configc. Doesn't read_console_ring() support small buffer than CONRING_SIZE? I make a patch to support small buffer of read_console_ring. Am I right? Signed-off-by: Akio Takebe diff -r aa2298739112 xen/drivers/char/console.c --- a/xen/drivers/char/console.c Fri Jun 09 10:40:31 2006 -0600 +++ b/xen/drivers/char/console.c Sun Jun 11 10:14:04 2006 +0900 @@ -238,6 +238,8 @@ long read_console_ring(XEN_GUEST_HANDLE( len = CONRING_SIZE - idx; if ( (sofar + len) > max ) len = max - sofar; + if ( len == 0 ) + break; if ( copy_to_guest_offset(str, sofar, &conring[idx], len) ) return -EFAULT; sofar += len; @@ -247,7 +249,7 @@ long read_console_ring(XEN_GUEST_HANDLE( if ( clear ) { spin_lock_irqsave(&console_lock, flags); - conringc = conringp; + conringc += sofar; spin_unlock_irqrestore(&console_lock, flags); } Best Regards, Akio Takebe --Boundary-IbEkrvt8hmsnB732kQTe9 Content-Type: application/octet-stream; name="fix_readconsolering.patch" Content-Disposition: attachment; filename="fix_readconsolering.patch" Content-Transfer-Encoding: base64 ZGlmZiAtciBhYTIyOTg3MzkxMTIgeGVuL2RyaXZlcnMvY2hhci9jb25zb2xlLmMKLS0tIGEv eGVuL2RyaXZlcnMvY2hhci9jb25zb2xlLmMJRnJpIEp1biAwOSAxMDo0MDozMSAyMDA2IC0w NjAwCisrKyBiL3hlbi9kcml2ZXJzL2NoYXIvY29uc29sZS5jCVN1biBKdW4gMTEgMTA6MTQ6 MDQgMjAwNiArMDkwMApAQCAtMjM4LDYgKzIzOCw4IEBAIGxvbmcgcmVhZF9jb25zb2xlX3Jp bmcoWEVOX0dVRVNUX0hBTkRMRSgKICAgICAgICAgICAgIGxlbiA9IENPTlJJTkdfU0laRSAt IGlkeDsKICAgICAgICAgaWYgKCAoc29mYXIgKyBsZW4pID4gbWF4ICkKICAgICAgICAgICAg IGxlbiA9IG1heCAtIHNvZmFyOworICAgICAgICBpZiAoIGxlbiA9PSAwICkKKyAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICBpZiAoIGNvcHlfdG9fZ3Vlc3Rfb2Zmc2V0KHN0ciwgc29m YXIsICZjb25yaW5nW2lkeF0sIGxlbikgKQogICAgICAgICAgICAgcmV0dXJuIC1FRkFVTFQ7 CiAgICAgICAgIHNvZmFyICs9IGxlbjsKQEAgLTI0Nyw3ICsyNDksNyBAQCBsb25nIHJlYWRf Y29uc29sZV9yaW5nKFhFTl9HVUVTVF9IQU5ETEUoCiAgICAgaWYgKCBjbGVhciApCiAgICAg ewogICAgICAgICBzcGluX2xvY2tfaXJxc2F2ZSgmY29uc29sZV9sb2NrLCBmbGFncyk7Ci0g ICAgICAgIGNvbnJpbmdjID0gY29ucmluZ3A7CisgICAgICAgIGNvbnJpbmdjICs9IHNvZmFy OwogICAgICAgICBzcGluX3VubG9ja19pcnFyZXN0b3JlKCZjb25zb2xlX2xvY2ssIGZsYWdz KTsKICAgICB9CiAK --Boundary-IbEkrvt8hmsnB732kQTe9 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 --Boundary-IbEkrvt8hmsnB732kQTe9--