Patchwork [for-1.4,07/12] qemu-char: Fix chardev "memory" not to drop IAC characters

login
register
mail settings
Submitter Markus Armbruster
Date Feb. 5, 2013, 4:22 p.m.
Message ID <1360081335-6594-8-git-send-email-armbru@redhat.com>
Download mbox | patch
Permalink /patch/218307/
State New
Headers show

Comments

Markus Armbruster - Feb. 5, 2013, 4:22 p.m.
Undocumented misfeature, get rid of it while we can.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 qemu-char.c | 5 -----
 1 file changed, 5 deletions(-)
Eric Blake - Feb. 5, 2013, 10:28 p.m.
On 02/05/2013 09:22 AM, Markus Armbruster wrote:
> Undocumented misfeature, get rid of it while we can.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  qemu-char.c | 5 -----
>  1 file changed, 5 deletions(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/qemu-char.c b/qemu-char.c
> index 0f91ca4..9460a9d 100644
> --- a/qemu-char.c
> +++ b/qemu-char.c
> @@ -2678,11 +2678,6 @@ static int cirmem_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
>      }
>  
>      for (i = 0; i < len; i++ ) {
> -        /* Avoid writing the IAC information to the queue. */
> -        if ((unsigned char)buf[i] == IAC) {
> -            continue;
> -        }
> -
>          d->cbuf[d->prod++ % d->size] = buf[i];
>          if ((d->prod - d->cons) > d->size) {
>              d->cons = d->prod - d->size;
>

Patch

diff --git a/qemu-char.c b/qemu-char.c
index 0f91ca4..9460a9d 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2678,11 +2678,6 @@  static int cirmem_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
     }
 
     for (i = 0; i < len; i++ ) {
-        /* Avoid writing the IAC information to the queue. */
-        if ((unsigned char)buf[i] == IAC) {
-            continue;
-        }
-
         d->cbuf[d->prod++ % d->size] = buf[i];
         if ((d->prod - d->cons) > d->size) {
             d->cons = d->prod - d->size;