ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[virtio-9p] Remove all instances of unnecessary dotu variable. 

Signed-off-by: Arun R Bharadwaj <arun@linux.vnet.ibm.com>
Signed-off-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
This commit is contained in:
Arun R Bharadwaj 2010-07-28 13:55:05 +05:30 committed by Aneesh Kumar K.V
parent 9ed3ef26e6
commit cf03eb2c18
3 changed files with 61 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/virtio-9p-debug.c
View File

@ -169,12 +169,10 @@ static void pprint_stat(V9fsPDU *pdu, int rx, size_t *offsetp, const char *name)
pprint_str(pdu, rx, offsetp, ", uid"); pprint_str(pdu, rx, offsetp, ", uid");
pprint_str(pdu, rx, offsetp, ", gid"); pprint_str(pdu, rx, offsetp, ", gid");
pprint_str(pdu, rx, offsetp, ", muid"); pprint_str(pdu, rx, offsetp, ", muid");
if (dotu) { pprint_str(pdu, rx, offsetp, ", extension");
pprint_str(pdu, rx, offsetp, ", extension"); pprint_int32(pdu, rx, offsetp, ", uid");
pprint_int32(pdu, rx, offsetp, ", uid"); pprint_int32(pdu, rx, offsetp, ", gid");
pprint_int32(pdu, rx, offsetp, ", gid"); pprint_int32(pdu, rx, offsetp, ", muid");
pprint_int32(pdu, rx, offsetp, ", muid");
}
fprintf(llogfile, "}"); fprintf(llogfile, "}");
} }
@ -401,9 +399,7 @@ void pprint_pdu(V9fsPDU *pdu)
pprint_int32(pdu, 0, &offset, "afid"); pprint_int32(pdu, 0, &offset, "afid");
pprint_str(pdu, 0, &offset, ", uname"); pprint_str(pdu, 0, &offset, ", uname");
pprint_str(pdu, 0, &offset, ", aname"); pprint_str(pdu, 0, &offset, ", aname");
if (dotu) { pprint_int32(pdu, 0, &offset, ", n_uname");
pprint_int32(pdu, 0, &offset, ", n_uname");
}
break; break;
case P9_RAUTH: case P9_RAUTH:
fprintf(llogfile, "RAUTH: ("); fprintf(llogfile, "RAUTH: (");
@ -415,9 +411,7 @@ void pprint_pdu(V9fsPDU *pdu)
pprint_int32(pdu, 0, &offset, ", afid"); pprint_int32(pdu, 0, &offset, ", afid");
pprint_str(pdu, 0, &offset, ", uname"); pprint_str(pdu, 0, &offset, ", uname");
pprint_str(pdu, 0, &offset, ", aname"); pprint_str(pdu, 0, &offset, ", aname");
if (dotu) { pprint_int32(pdu, 0, &offset, ", n_uname");
pprint_int32(pdu, 0, &offset, ", n_uname");
}
break; break;
case P9_RATTACH: case P9_RATTACH:
fprintf(llogfile, "RATTACH: ("); fprintf(llogfile, "RATTACH: (");
@ -429,9 +423,7 @@ void pprint_pdu(V9fsPDU *pdu)
case P9_RERROR: case P9_RERROR:
fprintf(llogfile, "RERROR: ("); fprintf(llogfile, "RERROR: (");
pprint_str(pdu, 1, &offset, "ename"); pprint_str(pdu, 1, &offset, "ename");
if (dotu) { pprint_int32(pdu, 1, &offset, ", ecode");
pprint_int32(pdu, 1, &offset, ", ecode");
}
break; break;
case P9_TFLUSH: case P9_TFLUSH:
fprintf(llogfile, "TFLUSH: ("); fprintf(llogfile, "TFLUSH: (");
@ -466,9 +458,7 @@ void pprint_pdu(V9fsPDU *pdu)
pprint_str(pdu, 0, &offset, ", name"); pprint_str(pdu, 0, &offset, ", name");
pprint_int32(pdu, 0, &offset, ", perm"); pprint_int32(pdu, 0, &offset, ", perm");
pprint_int8(pdu, 0, &offset, ", mode"); pprint_int8(pdu, 0, &offset, ", mode");
if (dotu) { pprint_str(pdu, 0, &offset, ", extension");
pprint_str(pdu, 0, &offset, ", extension");
}
break; break;
case P9_RCREATE: case P9_RCREATE:
fprintf(llogfile, "RCREATE: ("); fprintf(llogfile, "RCREATE: (");

1
hw/virtio-9p-debug.h
View File

@ -1,7 +1,6 @@
#ifndef _QEMU_VIRTIO_9P_DEBUG_H #ifndef _QEMU_VIRTIO_9P_DEBUG_H
#define _QEMU_VIRTIO_9P_DEBUG_H #define _QEMU_VIRTIO_9P_DEBUG_H
extern int dotu;
void pprint_pdu(V9fsPDU *pdu); void pprint_pdu(V9fsPDU *pdu);
#endif #endif

115
hw/virtio-9p.c
View File

@ -18,7 +18,6 @@
#include "fsdev/qemu-fsdev.h" #include "fsdev/qemu-fsdev.h"
#include "virtio-9p-debug.h" #include "virtio-9p-debug.h"
int dotu = 1;
int debug_9p_pdu; int debug_9p_pdu;
enum { enum {
@ -853,9 +852,7 @@ static void complete_pdu(V9fsState *s, V9fsPDU *pdu, ssize_t len)
len = 7; len = 7;
len += pdu_marshal(pdu, len, "s", &str); 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; id = P9_RERROR;
} }
@ -885,22 +882,20 @@ static mode_t v9mode_to_mode(uint32_t mode, V9fsString *extension)
ret |= S_IFDIR; ret |= S_IFDIR;
} }
if (dotu) { if (mode & P9_STAT_MODE_SYMLINK) {
if (mode & P9_STAT_MODE_SYMLINK) { ret |= S_IFLNK;
ret |= S_IFLNK; }
} if (mode & P9_STAT_MODE_SOCKET) {
if (mode & P9_STAT_MODE_SOCKET) { ret |= S_IFSOCK;
ret |= S_IFSOCK; }
} if (mode & P9_STAT_MODE_NAMED_PIPE) {
if (mode & P9_STAT_MODE_NAMED_PIPE) { ret |= S_IFIFO;
ret |= S_IFIFO; }
} if (mode & P9_STAT_MODE_DEVICE) {
if (mode & P9_STAT_MODE_DEVICE) { if (extension && extension->data[0] == 'c') {
if (extension && extension->data[0] == 'c') { ret |= S_IFCHR;
ret |= S_IFCHR; } else {
} else { ret |= S_IFBLK;
ret |= S_IFBLK;
}
} }
} }
@ -963,34 +958,32 @@ static uint32_t stat_to_v9mode(const struct stat *stbuf)
mode |= P9_STAT_MODE_DIR; mode |= P9_STAT_MODE_DIR;
} }
if (dotu) { if (S_ISLNK(stbuf->st_mode)) {
if (S_ISLNK(stbuf->st_mode)) { mode |= P9_STAT_MODE_SYMLINK;
mode |= P9_STAT_MODE_SYMLINK; }
}
if (S_ISSOCK(stbuf->st_mode)) { if (S_ISSOCK(stbuf->st_mode)) {
mode |= P9_STAT_MODE_SOCKET; mode |= P9_STAT_MODE_SOCKET;
} }
if (S_ISFIFO(stbuf->st_mode)) { if (S_ISFIFO(stbuf->st_mode)) {
mode |= P9_STAT_MODE_NAMED_PIPE; mode |= P9_STAT_MODE_NAMED_PIPE;
} }
if (S_ISBLK(stbuf->st_mode) || S_ISCHR(stbuf->st_mode)) { if (S_ISBLK(stbuf->st_mode) || S_ISCHR(stbuf->st_mode)) {
mode |= P9_STAT_MODE_DEVICE; mode |= P9_STAT_MODE_DEVICE;
} }
if (stbuf->st_mode & S_ISUID) { if (stbuf->st_mode & S_ISUID) {
mode |= P9_STAT_MODE_SETUID; mode |= P9_STAT_MODE_SETUID;
} }
if (stbuf->st_mode & S_ISGID) { if (stbuf->st_mode & S_ISGID) {
mode |= P9_STAT_MODE_SETGID; mode |= P9_STAT_MODE_SETGID;
} }
if (stbuf->st_mode & S_ISVTX) { if (stbuf->st_mode & S_ISVTX) {
mode |= P9_STAT_MODE_SETVTX; mode |= P9_STAT_MODE_SETVTX;
}
} }
return mode; return mode;
@ -1015,29 +1008,27 @@ static int stat_to_v9stat(V9fsState *s, V9fsString *name,
v9fs_string_null(&v9stat->gid); v9fs_string_null(&v9stat->gid);
v9fs_string_null(&v9stat->muid); v9fs_string_null(&v9stat->muid);
if (dotu) { v9stat->n_uid = stbuf->st_uid;
v9stat->n_uid = stbuf->st_uid; v9stat->n_gid = stbuf->st_gid;
v9stat->n_gid = stbuf->st_gid; v9stat->n_muid = 0;
v9stat->n_muid = 0;
v9fs_string_null(&v9stat->extension); v9fs_string_null(&v9stat->extension);
if (v9stat->mode & P9_STAT_MODE_SYMLINK) { if (v9stat->mode & P9_STAT_MODE_SYMLINK) {
err = v9fs_do_readlink(s, name, &v9stat->extension); err = v9fs_do_readlink(s, name, &v9stat->extension);
if (err == -1) { if (err == -1) {
err = -errno; err = -errno;
return err; 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->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, '/'); str = strrchr(name->data, '/');