diff mbox

[1/2,virtio-9p] Cleanup legacy 'dotu' variable.

Message ID 20100713105441.GA11854@linux.vnet.ibm.com
State New
Headers show

Commit Message

Arun Bharadwaj July 13, 2010, 10:54 a.m. UTC 
Hi,

This patch cleans up the legacy 'dotu' variable which is always set to
1 by default, since qemu doesnt support legacy 9p clients.

Signed-off-by: Arun R Bharadwaj <arun@linux.vnet.ibm.com>
---
 hw/virtio-9p-debug.c |   26 +++--------
 hw/virtio-9p-debug.h |    1 
 hw/virtio-9p.c       |  119 +++++++++++++++++++++++----------------------------
 3 files changed, 63 insertions(+), 83 deletions(-)

Comments

jvrao July 14, 2010, 11:25 a.m. UTC | #1 
Arun R Bharadwaj wrote:
> Hi,
> 
> This patch cleans up the legacy 'dotu' variable which is always set to
> 1 by default, since qemu doesnt support legacy 9p clients.

Do we have 2/2 in this series? Also please check the thread-id.
It is showing part of your other patch, TLERROR/RLERROR.

- JV

> 
> Signed-off-by: Arun R Bharadwaj <arun@linux.vnet.ibm.com>
> ---
>  hw/virtio-9p-debug.c |   26 +++--------
>  hw/virtio-9p-debug.h |    1 
>  hw/virtio-9p.c       |  119 +++++++++++++++++++++++----------------------------
>  3 files changed, 63 insertions(+), 83 deletions(-)
> 
> Index: qemu/hw/virtio-9p-debug.h
> ===================================================================
> --- qemu.orig/hw/virtio-9p-debug.h
> +++ qemu/hw/virtio-9p-debug.h
> @@ -1,7 +1,6 @@
>  #ifndef _QEMU_VIRTIO_9P_DEBUG_H
>  #define _QEMU_VIRTIO_9P_DEBUG_H
> 
> -extern int dotu;
>  void pprint_pdu(V9fsPDU *pdu);
> 
>  #endif
> Index: qemu/hw/virtio-9p-debug.c
> ===================================================================
> --- qemu.orig/hw/virtio-9p-debug.c
> +++ qemu/hw/virtio-9p-debug.c
> @@ -169,12 +169,10 @@ static void pprint_stat(V9fsPDU *pdu, in
>      pprint_str(pdu, rx, offsetp, ", uid");
>      pprint_str(pdu, rx, offsetp, ", gid");
>      pprint_str(pdu, rx, offsetp, ", muid");
> -    if (dotu) {
> -        pprint_str(pdu, rx, offsetp, ", extension");
> -        pprint_int32(pdu, rx, offsetp, ", uid");
> -        pprint_int32(pdu, rx, offsetp, ", gid");
> -        pprint_int32(pdu, rx, offsetp, ", muid");
> -    }
> +    pprint_str(pdu, rx, offsetp, ", extension");
> +    pprint_int32(pdu, rx, offsetp, ", uid");
> +    pprint_int32(pdu, rx, offsetp, ", gid");
> +    pprint_int32(pdu, rx, offsetp, ", muid");
>      fprintf(llogfile, "}");
>  }
> 
> @@ -343,9 +341,7 @@ void pprint_pdu(V9fsPDU *pdu)
>          pprint_int32(pdu, 0, &offset, "afid");
>          pprint_str(pdu, 0, &offset, ", uname");
>          pprint_str(pdu, 0, &offset, ", aname");
> -        if (dotu) {
> -            pprint_int32(pdu, 0, &offset, ", n_uname");
> -        }
> +        pprint_int32(pdu, 0, &offset, ", n_uname");
>          break;
>      case P9_RAUTH:
>          fprintf(llogfile, "RAUTH: (");
> @@ -357,9 +353,7 @@ void pprint_pdu(V9fsPDU *pdu)
>          pprint_int32(pdu, 0, &offset, ", afid");
>          pprint_str(pdu, 0, &offset, ", uname");
>          pprint_str(pdu, 0, &offset, ", aname");
> -        if (dotu) {
> -            pprint_int32(pdu, 0, &offset, ", n_uname");
> -        }
> +        pprint_int32(pdu, 0, &offset, ", n_uname");
>          break;
>      case P9_RATTACH:
>          fprintf(llogfile, "RATTACH: (");
> @@ -371,9 +365,7 @@ void pprint_pdu(V9fsPDU *pdu)
>      case P9_RERROR:
>          fprintf(llogfile, "RERROR: (");
>          pprint_str(pdu, 1, &offset, "ename");
> -        if (dotu) {
> -            pprint_int32(pdu, 1, &offset, ", ecode");
> -        }
> +        pprint_int32(pdu, 1, &offset, ", ecode");
>          break;
>      case P9_TFLUSH:
>          fprintf(llogfile, "TFLUSH: (");
> @@ -408,9 +400,7 @@ void pprint_pdu(V9fsPDU *pdu)
>          pprint_str(pdu, 0, &offset, ", name");
>          pprint_int32(pdu, 0, &offset, ", perm");
>          pprint_int8(pdu, 0, &offset, ", mode");
> -        if (dotu) {
> -            pprint_str(pdu, 0, &offset, ", extension");
> -        }
> +        pprint_str(pdu, 0, &offset, ", extension");
>          break;
>      case P9_RCREATE:
>          fprintf(llogfile, "RCREATE: (");
> Index: qemu/hw/virtio-9p.c
> ===================================================================
> --- qemu.orig/hw/virtio-9p.c
> +++ qemu/hw/virtio-9p.c
> @@ -18,7 +18,6 @@
>  #include "fsdev/qemu-fsdev.h"
>  #include "virtio-9p-debug.h"
> 
> -int dotu = 1;
>  int debug_9p_pdu;
> 
>  enum {
> @@ -753,9 +752,7 @@ static void complete_pdu(V9fsState *s, V
> 
>          len = 7;
>          len += pdu_marshal(pdu, len, "s", &str);
> -        if (dotu) {
> -            len += pdu_marshal(pdu, len, "d", err);
> -        }
> +        len += pdu_marshal(pdu, len, "d", err);
> 
>          id = P9_RERROR;
>      }
> @@ -785,22 +782,20 @@ static mode_t v9mode_to_mode(uint32_t mo
>          ret |= S_IFDIR;
>      }
> 
> -    if (dotu) {
> -        if (mode & P9_STAT_MODE_SYMLINK) {
> -            ret |= S_IFLNK;
> -        }
> -        if (mode & P9_STAT_MODE_SOCKET) {
> -            ret |= S_IFSOCK;
> -        }
> -        if (mode & P9_STAT_MODE_NAMED_PIPE) {
> -            ret |= S_IFIFO;
> -        }
> -        if (mode & P9_STAT_MODE_DEVICE) {
> -            if (extension && extension->data[0] == 'c') {
> -                ret |= S_IFCHR;
> -            } else {
> -                ret |= S_IFBLK;
> -            }
> +    if (mode & P9_STAT_MODE_SYMLINK) {
> +        ret |= S_IFLNK;
> +    }
> +    if (mode & P9_STAT_MODE_SOCKET) {
> +        ret |= S_IFSOCK;
> +    }
> +    if (mode & P9_STAT_MODE_NAMED_PIPE) {
> +        ret |= S_IFIFO;
> +    }
> +    if (mode & P9_STAT_MODE_DEVICE) {
> +        if (extension && extension->data[0] == 'c') {
> +            ret |= S_IFCHR;
> +        } else {
> +            ret |= S_IFBLK;
>          }
>      }
> 
> @@ -863,34 +858,32 @@ static uint32_t stat_to_v9mode(const str
>          mode |= P9_STAT_MODE_DIR;
>      }
> 
> -    if (dotu) {
> -        if (S_ISLNK(stbuf->st_mode)) {
> -            mode |= P9_STAT_MODE_SYMLINK;
> -        }
> +    if (S_ISLNK(stbuf->st_mode)) {
> +        mode |= P9_STAT_MODE_SYMLINK;
> +    }
> 
> -        if (S_ISSOCK(stbuf->st_mode)) {
> -            mode |= P9_STAT_MODE_SOCKET;
> -        }
> +    if (S_ISSOCK(stbuf->st_mode)) {
> +        mode |= P9_STAT_MODE_SOCKET;
> +    }
> 
> -        if (S_ISFIFO(stbuf->st_mode)) {
> -            mode |= P9_STAT_MODE_NAMED_PIPE;
> -        }
> +    if (S_ISFIFO(stbuf->st_mode)) {
> +        mode |= P9_STAT_MODE_NAMED_PIPE;
> +    }
> 
> -        if (S_ISBLK(stbuf->st_mode) || S_ISCHR(stbuf->st_mode)) {
> -            mode |= P9_STAT_MODE_DEVICE;
> -        }
> +    if (S_ISBLK(stbuf->st_mode) || S_ISCHR(stbuf->st_mode)) {
> +        mode |= P9_STAT_MODE_DEVICE;
> +    }
> 
> -        if (stbuf->st_mode & S_ISUID) {
> -            mode |= P9_STAT_MODE_SETUID;
> -        }
> +    if (stbuf->st_mode & S_ISUID) {
> +        mode |= P9_STAT_MODE_SETUID;
> +    }
> 
> -        if (stbuf->st_mode & S_ISGID) {
> -            mode |= P9_STAT_MODE_SETGID;
> -        }
> +    if (stbuf->st_mode & S_ISGID) {
> +        mode |= P9_STAT_MODE_SETGID;
> +    }
> 
> -        if (stbuf->st_mode & S_ISVTX) {
> -            mode |= P9_STAT_MODE_SETVTX;
> -        }
> +    if (stbuf->st_mode & S_ISVTX) {
> +        mode |= P9_STAT_MODE_SETVTX;
>      }
> 
>      return mode;
> @@ -915,29 +908,27 @@ static int stat_to_v9stat(V9fsState *s, 
>      v9fs_string_null(&v9stat->gid);
>      v9fs_string_null(&v9stat->muid);
> 
> -    if (dotu) {
> -        v9stat->n_uid = stbuf->st_uid;
> -        v9stat->n_gid = stbuf->st_gid;
> -        v9stat->n_muid = 0;
> -
> -        v9fs_string_null(&v9stat->extension);
> -
> -        if (v9stat->mode & P9_STAT_MODE_SYMLINK) {
> -            err = v9fs_do_readlink(s, name, &v9stat->extension);
> -            if (err == -1) {
> -                err = -errno;
> -                return err;
> -            }
> -            v9stat->extension.data[err] = 0;
> -            v9stat->extension.size = err;
> -        } else if (v9stat->mode & P9_STAT_MODE_DEVICE) {
> -            v9fs_string_sprintf(&v9stat->extension, "%c %u %u",
> -                    S_ISCHR(stbuf->st_mode) ? 'c' : 'b',
> -                    major(stbuf->st_rdev), minor(stbuf->st_rdev));
> -        } else if (S_ISDIR(stbuf->st_mode) || S_ISREG(stbuf->st_mode)) {
> -            v9fs_string_sprintf(&v9stat->extension, "%s %u",
> -                    "HARDLINKCOUNT", stbuf->st_nlink);
> +    v9stat->n_uid = stbuf->st_uid;
> +    v9stat->n_gid = stbuf->st_gid;
> +    v9stat->n_muid = 0;
> +
> +    v9fs_string_null(&v9stat->extension);
> +
> +    if (v9stat->mode & P9_STAT_MODE_SYMLINK) {
> +        err = v9fs_do_readlink(s, name, &v9stat->extension);
> +        if (err == -1) {
> +            err = -errno;
> +            return err;
>          }
> +        v9stat->extension.data[err] = 0;
> +        v9stat->extension.size = err;
> +    } else if (v9stat->mode & P9_STAT_MODE_DEVICE) {
> +        v9fs_string_sprintf(&v9stat->extension, "%c %u %u",
> +                S_ISCHR(stbuf->st_mode) ? 'c' : 'b',
> +                major(stbuf->st_rdev), minor(stbuf->st_rdev));
> +    } else if (S_ISDIR(stbuf->st_mode) || S_ISREG(stbuf->st_mode)) {
> +        v9fs_string_sprintf(&v9stat->extension, "%s %u",
> +                "HARDLINKCOUNT", stbuf->st_nlink);
>      }
> 
>      str = strrchr(name->data, '/');
>
Arun Bharadwaj July 15, 2010, 4:31 a.m. UTC | #2 
* Venkateswararao Jujjuri (JV) <jvrao@linux.vnet.ibm.com> [2010-07-14 04:25:21]:

> Arun R Bharadwaj wrote:
> > Hi,
> > 
> > This patch cleans up the legacy 'dotu' variable which is always set to
> > 1 by default, since qemu doesnt support legacy 9p clients.
> 
> Do we have 2/2 in this series? Also please check the thread-id.
> It is showing part of your other patch, TLERROR/RLERROR.
> 
> - JV
> 

Hi JV,

The cleanup patch is the 1/2 and the TLERROR/RLERROR patch is the 2/2.
I have put them this way because the TLERROR patch needs to be applied
after the cleanup patch is applied. Hence the same thread-id.

-arun
Sripathi Kodi July 20, 2010, 5 p.m. UTC | #3 
On Tue, 13 Jul 2010 16:24:41 +0530
Arun R Bharadwaj <arun@linux.vnet.ibm.com> wrote:

> Hi,
> 
> This patch cleans up the legacy 'dotu' variable which is always set to
> 1 by default, since qemu doesnt support legacy 9p clients.
> 
> Signed-off-by: Arun R Bharadwaj <arun@linux.vnet.ibm.com>

Acked-by: Sripathi Kodi <sripathik@in.ibm.com>

> ---
>  hw/virtio-9p-debug.c |   26 +++--------
>  hw/virtio-9p-debug.h |    1 
>  hw/virtio-9p.c       |  119 +++++++++++++++++++++++----------------------------
>  3 files changed, 63 insertions(+), 83 deletions(-)
> 
> Index: qemu/hw/virtio-9p-debug.h
> ===================================================================
> --- qemu.orig/hw/virtio-9p-debug.h
> +++ qemu/hw/virtio-9p-debug.h
> @@ -1,7 +1,6 @@
>  #ifndef _QEMU_VIRTIO_9P_DEBUG_H
>  #define _QEMU_VIRTIO_9P_DEBUG_H
> 
> -extern int dotu;
>  void pprint_pdu(V9fsPDU *pdu);
> 
>  #endif
> Index: qemu/hw/virtio-9p-debug.c
> ===================================================================
> --- qemu.orig/hw/virtio-9p-debug.c
> +++ qemu/hw/virtio-9p-debug.c
> @@ -169,12 +169,10 @@ static void pprint_stat(V9fsPDU *pdu, in
>      pprint_str(pdu, rx, offsetp, ", uid");
>      pprint_str(pdu, rx, offsetp, ", gid");
>      pprint_str(pdu, rx, offsetp, ", muid");
> -    if (dotu) {
> -        pprint_str(pdu, rx, offsetp, ", extension");
> -        pprint_int32(pdu, rx, offsetp, ", uid");
> -        pprint_int32(pdu, rx, offsetp, ", gid");
> -        pprint_int32(pdu, rx, offsetp, ", muid");
> -    }
> +    pprint_str(pdu, rx, offsetp, ", extension");
> +    pprint_int32(pdu, rx, offsetp, ", uid");
> +    pprint_int32(pdu, rx, offsetp, ", gid");
> +    pprint_int32(pdu, rx, offsetp, ", muid");
>      fprintf(llogfile, "}");
>  }
> 
> @@ -343,9 +341,7 @@ void pprint_pdu(V9fsPDU *pdu)
>          pprint_int32(pdu, 0, &offset, "afid");
>          pprint_str(pdu, 0, &offset, ", uname");
>          pprint_str(pdu, 0, &offset, ", aname");
> -        if (dotu) {
> -            pprint_int32(pdu, 0, &offset, ", n_uname");
> -        }
> +        pprint_int32(pdu, 0, &offset, ", n_uname");
>          break;
>      case P9_RAUTH:
>          fprintf(llogfile, "RAUTH: (");
> @@ -357,9 +353,7 @@ void pprint_pdu(V9fsPDU *pdu)
>          pprint_int32(pdu, 0, &offset, ", afid");
>          pprint_str(pdu, 0, &offset, ", uname");
>          pprint_str(pdu, 0, &offset, ", aname");
> -        if (dotu) {
> -            pprint_int32(pdu, 0, &offset, ", n_uname");
> -        }
> +        pprint_int32(pdu, 0, &offset, ", n_uname");
>          break;
>      case P9_RATTACH:
>          fprintf(llogfile, "RATTACH: (");
> @@ -371,9 +365,7 @@ void pprint_pdu(V9fsPDU *pdu)
>      case P9_RERROR:
>          fprintf(llogfile, "RERROR: (");
>          pprint_str(pdu, 1, &offset, "ename");
> -        if (dotu) {
> -            pprint_int32(pdu, 1, &offset, ", ecode");
> -        }
> +        pprint_int32(pdu, 1, &offset, ", ecode");
>          break;
>      case P9_TFLUSH:
>          fprintf(llogfile, "TFLUSH: (");
> @@ -408,9 +400,7 @@ void pprint_pdu(V9fsPDU *pdu)
>          pprint_str(pdu, 0, &offset, ", name");
>          pprint_int32(pdu, 0, &offset, ", perm");
>          pprint_int8(pdu, 0, &offset, ", mode");
> -        if (dotu) {
> -            pprint_str(pdu, 0, &offset, ", extension");
> -        }
> +        pprint_str(pdu, 0, &offset, ", extension");
>          break;
>      case P9_RCREATE:
>          fprintf(llogfile, "RCREATE: (");
> Index: qemu/hw/virtio-9p.c
> ===================================================================
> --- qemu.orig/hw/virtio-9p.c
> +++ qemu/hw/virtio-9p.c
> @@ -18,7 +18,6 @@
>  #include "fsdev/qemu-fsdev.h"
>  #include "virtio-9p-debug.h"
> 
> -int dotu = 1;
>  int debug_9p_pdu;
> 
>  enum {
> @@ -753,9 +752,7 @@ static void complete_pdu(V9fsState *s, V
> 
>          len = 7;
>          len += pdu_marshal(pdu, len, "s", &str);
> -        if (dotu) {
> -            len += pdu_marshal(pdu, len, "d", err);
> -        }
> +        len += pdu_marshal(pdu, len, "d", err);
> 
>          id = P9_RERROR;
>      }
> @@ -785,22 +782,20 @@ static mode_t v9mode_to_mode(uint32_t mo
>          ret |= S_IFDIR;
>      }
> 
> -    if (dotu) {
> -        if (mode & P9_STAT_MODE_SYMLINK) {
> -            ret |= S_IFLNK;
> -        }
> -        if (mode & P9_STAT_MODE_SOCKET) {
> -            ret |= S_IFSOCK;
> -        }
> -        if (mode & P9_STAT_MODE_NAMED_PIPE) {
> -            ret |= S_IFIFO;
> -        }
> -        if (mode & P9_STAT_MODE_DEVICE) {
> -            if (extension && extension->data[0] == 'c') {
> -                ret |= S_IFCHR;
> -            } else {
> -                ret |= S_IFBLK;
> -            }
> +    if (mode & P9_STAT_MODE_SYMLINK) {
> +        ret |= S_IFLNK;
> +    }
> +    if (mode & P9_STAT_MODE_SOCKET) {
> +        ret |= S_IFSOCK;
> +    }
> +    if (mode & P9_STAT_MODE_NAMED_PIPE) {
> +        ret |= S_IFIFO;
> +    }
> +    if (mode & P9_STAT_MODE_DEVICE) {
> +        if (extension && extension->data[0] == 'c') {
> +            ret |= S_IFCHR;
> +        } else {
> +            ret |= S_IFBLK;
>          }
>      }
> 
> @@ -863,34 +858,32 @@ static uint32_t stat_to_v9mode(const str
>          mode |= P9_STAT_MODE_DIR;
>      }
> 
> -    if (dotu) {
> -        if (S_ISLNK(stbuf->st_mode)) {
> -            mode |= P9_STAT_MODE_SYMLINK;
> -        }
> +    if (S_ISLNK(stbuf->st_mode)) {
> +        mode |= P9_STAT_MODE_SYMLINK;
> +    }
> 
> -        if (S_ISSOCK(stbuf->st_mode)) {
> -            mode |= P9_STAT_MODE_SOCKET;
> -        }
> +    if (S_ISSOCK(stbuf->st_mode)) {
> +        mode |= P9_STAT_MODE_SOCKET;
> +    }
> 
> -        if (S_ISFIFO(stbuf->st_mode)) {
> -            mode |= P9_STAT_MODE_NAMED_PIPE;
> -        }
> +    if (S_ISFIFO(stbuf->st_mode)) {
> +        mode |= P9_STAT_MODE_NAMED_PIPE;
> +    }
> 
> -        if (S_ISBLK(stbuf->st_mode) || S_ISCHR(stbuf->st_mode)) {
> -            mode |= P9_STAT_MODE_DEVICE;
> -        }
> +    if (S_ISBLK(stbuf->st_mode) || S_ISCHR(stbuf->st_mode)) {
> +        mode |= P9_STAT_MODE_DEVICE;
> +    }
> 
> -        if (stbuf->st_mode & S_ISUID) {
> -            mode |= P9_STAT_MODE_SETUID;
> -        }
> +    if (stbuf->st_mode & S_ISUID) {
> +        mode |= P9_STAT_MODE_SETUID;
> +    }
> 
> -        if (stbuf->st_mode & S_ISGID) {
> -            mode |= P9_STAT_MODE_SETGID;
> -        }
> +    if (stbuf->st_mode & S_ISGID) {
> +        mode |= P9_STAT_MODE_SETGID;
> +    }
> 
> -        if (stbuf->st_mode & S_ISVTX) {
> -            mode |= P9_STAT_MODE_SETVTX;
> -        }
> +    if (stbuf->st_mode & S_ISVTX) {
> +        mode |= P9_STAT_MODE_SETVTX;
>      }
> 
>      return mode;
> @@ -915,29 +908,27 @@ static int stat_to_v9stat(V9fsState *s, 
>      v9fs_string_null(&v9stat->gid);
>      v9fs_string_null(&v9stat->muid);
> 
> -    if (dotu) {
> -        v9stat->n_uid = stbuf->st_uid;
> -        v9stat->n_gid = stbuf->st_gid;
> -        v9stat->n_muid = 0;
> -
> -        v9fs_string_null(&v9stat->extension);
> -
> -        if (v9stat->mode & P9_STAT_MODE_SYMLINK) {
> -            err = v9fs_do_readlink(s, name, &v9stat->extension);
> -            if (err == -1) {
> -                err = -errno;
> -                return err;
> -            }
> -            v9stat->extension.data[err] = 0;
> -            v9stat->extension.size = err;
> -        } else if (v9stat->mode & P9_STAT_MODE_DEVICE) {
> -            v9fs_string_sprintf(&v9stat->extension, "%c %u %u",
> -                    S_ISCHR(stbuf->st_mode) ? 'c' : 'b',
> -                    major(stbuf->st_rdev), minor(stbuf->st_rdev));
> -        } else if (S_ISDIR(stbuf->st_mode) || S_ISREG(stbuf->st_mode)) {
> -            v9fs_string_sprintf(&v9stat->extension, "%s %u",
> -                    "HARDLINKCOUNT", stbuf->st_nlink);
> +    v9stat->n_uid = stbuf->st_uid;
> +    v9stat->n_gid = stbuf->st_gid;
> +    v9stat->n_muid = 0;
> +
> +    v9fs_string_null(&v9stat->extension);
> +
> +    if (v9stat->mode & P9_STAT_MODE_SYMLINK) {
> +        err = v9fs_do_readlink(s, name, &v9stat->extension);
> +        if (err == -1) {
> +            err = -errno;
> +            return err;
>          }
> +        v9stat->extension.data[err] = 0;
> +        v9stat->extension.size = err;
> +    } else if (v9stat->mode & P9_STAT_MODE_DEVICE) {
> +        v9fs_string_sprintf(&v9stat->extension, "%c %u %u",
> +                S_ISCHR(stbuf->st_mode) ? 'c' : 'b',
> +                major(stbuf->st_rdev), minor(stbuf->st_rdev));
> +    } else if (S_ISDIR(stbuf->st_mode) || S_ISREG(stbuf->st_mode)) {
> +        v9fs_string_sprintf(&v9stat->extension, "%s %u",
> +                "HARDLINKCOUNT", stbuf->st_nlink);
>      }
> 
>      str = strrchr(name->data, '/');
>
diff mbox

Patch

Index: qemu/hw/virtio-9p-debug.h
===================================================================
--- qemu.orig/hw/virtio-9p-debug.h
+++ qemu/hw/virtio-9p-debug.h
@@ -1,7 +1,6 @@ 
 #ifndef _QEMU_VIRTIO_9P_DEBUG_H
 #define _QEMU_VIRTIO_9P_DEBUG_H
 
-extern int dotu;
 void pprint_pdu(V9fsPDU *pdu);
 
 #endif
Index: qemu/hw/virtio-9p-debug.c
===================================================================
--- qemu.orig/hw/virtio-9p-debug.c
+++ qemu/hw/virtio-9p-debug.c
@@ -169,12 +169,10 @@  static void pprint_stat(V9fsPDU *pdu, in
     pprint_str(pdu, rx, offsetp, ", uid");
     pprint_str(pdu, rx, offsetp, ", gid");
     pprint_str(pdu, rx, offsetp, ", muid");
-    if (dotu) {
-        pprint_str(pdu, rx, offsetp, ", extension");
-        pprint_int32(pdu, rx, offsetp, ", uid");
-        pprint_int32(pdu, rx, offsetp, ", gid");
-        pprint_int32(pdu, rx, offsetp, ", muid");
-    }
+    pprint_str(pdu, rx, offsetp, ", extension");
+    pprint_int32(pdu, rx, offsetp, ", uid");
+    pprint_int32(pdu, rx, offsetp, ", gid");
+    pprint_int32(pdu, rx, offsetp, ", muid");
     fprintf(llogfile, "}");
 }
 
@@ -343,9 +341,7 @@  void pprint_pdu(V9fsPDU *pdu)
         pprint_int32(pdu, 0, &offset, "afid");
         pprint_str(pdu, 0, &offset, ", uname");
         pprint_str(pdu, 0, &offset, ", aname");
-        if (dotu) {
-            pprint_int32(pdu, 0, &offset, ", n_uname");
-        }
+        pprint_int32(pdu, 0, &offset, ", n_uname");
         break;
     case P9_RAUTH:
         fprintf(llogfile, "RAUTH: (");
@@ -357,9 +353,7 @@  void pprint_pdu(V9fsPDU *pdu)
         pprint_int32(pdu, 0, &offset, ", afid");
         pprint_str(pdu, 0, &offset, ", uname");
         pprint_str(pdu, 0, &offset, ", aname");
-        if (dotu) {
-            pprint_int32(pdu, 0, &offset, ", n_uname");
-        }
+        pprint_int32(pdu, 0, &offset, ", n_uname");
         break;
     case P9_RATTACH:
         fprintf(llogfile, "RATTACH: (");
@@ -371,9 +365,7 @@  void pprint_pdu(V9fsPDU *pdu)
     case P9_RERROR:
         fprintf(llogfile, "RERROR: (");
         pprint_str(pdu, 1, &offset, "ename");
-        if (dotu) {
-            pprint_int32(pdu, 1, &offset, ", ecode");
-        }
+        pprint_int32(pdu, 1, &offset, ", ecode");
         break;
     case P9_TFLUSH:
         fprintf(llogfile, "TFLUSH: (");
@@ -408,9 +400,7 @@  void pprint_pdu(V9fsPDU *pdu)
         pprint_str(pdu, 0, &offset, ", name");
         pprint_int32(pdu, 0, &offset, ", perm");
         pprint_int8(pdu, 0, &offset, ", mode");
-        if (dotu) {
-            pprint_str(pdu, 0, &offset, ", extension");
-        }
+        pprint_str(pdu, 0, &offset, ", extension");
         break;
     case P9_RCREATE:
         fprintf(llogfile, "RCREATE: (");
Index: qemu/hw/virtio-9p.c
===================================================================
--- qemu.orig/hw/virtio-9p.c
+++ qemu/hw/virtio-9p.c
@@ -18,7 +18,6 @@ 
 #include "fsdev/qemu-fsdev.h"
 #include "virtio-9p-debug.h"
 
-int dotu = 1;
 int debug_9p_pdu;
 
 enum {
@@ -753,9 +752,7 @@  static void complete_pdu(V9fsState *s, V
 
         len = 7;
         len += pdu_marshal(pdu, len, "s", &str);
-        if (dotu) {
-            len += pdu_marshal(pdu, len, "d", err);
-        }
+        len += pdu_marshal(pdu, len, "d", err);
 
         id = P9_RERROR;
     }
@@ -785,22 +782,20 @@  static mode_t v9mode_to_mode(uint32_t mo
         ret |= S_IFDIR;
     }
 
-    if (dotu) {
-        if (mode & P9_STAT_MODE_SYMLINK) {
-            ret |= S_IFLNK;
-        }
-        if (mode & P9_STAT_MODE_SOCKET) {
-            ret |= S_IFSOCK;
-        }
-        if (mode & P9_STAT_MODE_NAMED_PIPE) {
-            ret |= S_IFIFO;
-        }
-        if (mode & P9_STAT_MODE_DEVICE) {
-            if (extension && extension->data[0] == 'c') {
-                ret |= S_IFCHR;
-            } else {
-                ret |= S_IFBLK;
-            }
+    if (mode & P9_STAT_MODE_SYMLINK) {
+        ret |= S_IFLNK;
+    }
+    if (mode & P9_STAT_MODE_SOCKET) {
+        ret |= S_IFSOCK;
+    }
+    if (mode & P9_STAT_MODE_NAMED_PIPE) {
+        ret |= S_IFIFO;
+    }
+    if (mode & P9_STAT_MODE_DEVICE) {
+        if (extension && extension->data[0] == 'c') {
+            ret |= S_IFCHR;
+        } else {
+            ret |= S_IFBLK;
         }
     }
 
@@ -863,34 +858,32 @@  static uint32_t stat_to_v9mode(const str
         mode |= P9_STAT_MODE_DIR;
     }
 
-    if (dotu) {
-        if (S_ISLNK(stbuf->st_mode)) {
-            mode |= P9_STAT_MODE_SYMLINK;
-        }
+    if (S_ISLNK(stbuf->st_mode)) {
+        mode |= P9_STAT_MODE_SYMLINK;
+    }
 
-        if (S_ISSOCK(stbuf->st_mode)) {
-            mode |= P9_STAT_MODE_SOCKET;
-        }
+    if (S_ISSOCK(stbuf->st_mode)) {
+        mode |= P9_STAT_MODE_SOCKET;
+    }
 
-        if (S_ISFIFO(stbuf->st_mode)) {
-            mode |= P9_STAT_MODE_NAMED_PIPE;
-        }
+    if (S_ISFIFO(stbuf->st_mode)) {
+        mode |= P9_STAT_MODE_NAMED_PIPE;
+    }
 
-        if (S_ISBLK(stbuf->st_mode) || S_ISCHR(stbuf->st_mode)) {
-            mode |= P9_STAT_MODE_DEVICE;
-        }
+    if (S_ISBLK(stbuf->st_mode) || S_ISCHR(stbuf->st_mode)) {
+        mode |= P9_STAT_MODE_DEVICE;
+    }
 
-        if (stbuf->st_mode & S_ISUID) {
-            mode |= P9_STAT_MODE_SETUID;
-        }
+    if (stbuf->st_mode & S_ISUID) {
+        mode |= P9_STAT_MODE_SETUID;
+    }
 
-        if (stbuf->st_mode & S_ISGID) {
-            mode |= P9_STAT_MODE_SETGID;
-        }
+    if (stbuf->st_mode & S_ISGID) {
+        mode |= P9_STAT_MODE_SETGID;
+    }
 
-        if (stbuf->st_mode & S_ISVTX) {
-            mode |= P9_STAT_MODE_SETVTX;
-        }
+    if (stbuf->st_mode & S_ISVTX) {
+        mode |= P9_STAT_MODE_SETVTX;
     }
 
     return mode;
@@ -915,29 +908,27 @@  static int stat_to_v9stat(V9fsState *s, 
     v9fs_string_null(&v9stat->gid);
     v9fs_string_null(&v9stat->muid);
 
-    if (dotu) {
-        v9stat->n_uid = stbuf->st_uid;
-        v9stat->n_gid = stbuf->st_gid;
-        v9stat->n_muid = 0;
-
-        v9fs_string_null(&v9stat->extension);
-
-        if (v9stat->mode & P9_STAT_MODE_SYMLINK) {
-            err = v9fs_do_readlink(s, name, &v9stat->extension);
-            if (err == -1) {
-                err = -errno;
-                return err;
-            }
-            v9stat->extension.data[err] = 0;
-            v9stat->extension.size = err;
-        } else if (v9stat->mode & P9_STAT_MODE_DEVICE) {
-            v9fs_string_sprintf(&v9stat->extension, "%c %u %u",
-                    S_ISCHR(stbuf->st_mode) ? 'c' : 'b',
-                    major(stbuf->st_rdev), minor(stbuf->st_rdev));
-        } else if (S_ISDIR(stbuf->st_mode) || S_ISREG(stbuf->st_mode)) {
-            v9fs_string_sprintf(&v9stat->extension, "%s %u",
-                    "HARDLINKCOUNT", stbuf->st_nlink);
+    v9stat->n_uid = stbuf->st_uid;
+    v9stat->n_gid = stbuf->st_gid;
+    v9stat->n_muid = 0;
+
+    v9fs_string_null(&v9stat->extension);
+
+    if (v9stat->mode & P9_STAT_MODE_SYMLINK) {
+        err = v9fs_do_readlink(s, name, &v9stat->extension);
+        if (err == -1) {
+            err = -errno;
+            return err;
         }
+        v9stat->extension.data[err] = 0;
+        v9stat->extension.size = err;
+    } else if (v9stat->mode & P9_STAT_MODE_DEVICE) {
+        v9fs_string_sprintf(&v9stat->extension, "%c %u %u",
+                S_ISCHR(stbuf->st_mode) ? 'c' : 'b',
+                major(stbuf->st_rdev), minor(stbuf->st_rdev));
+    } else if (S_ISDIR(stbuf->st_mode) || S_ISREG(stbuf->st_mode)) {
+        v9fs_string_sprintf(&v9stat->extension, "%s %u",
+                "HARDLINKCOUNT", stbuf->st_nlink);
     }
 
     str = strrchr(name->data, '/');