OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/9pfs: Rename fstype to fsdriver to make it consistent across VirtFS code 

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
This commit is contained in:
Aneesh Kumar K.V 2011-10-13 12:28:04 +05:30
parent c98f1d4a8b
commit fbcbf101aa
5 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fsdev/qemu-fsdev.c
View File

@ -18,20 +18,20 @@
#include "qemu-common.h"
#include "qemu-config.h"
static QTAILQ_HEAD(FsTypeEntry_head, FsTypeListEntry) fstype_entries =
QTAILQ_HEAD_INITIALIZER(fstype_entries);
static QTAILQ_HEAD(FsDriverEntry_head, FsDriverListEntry) fsdriver_entries =
QTAILQ_HEAD_INITIALIZER(fsdriver_entries);
static FsTypeTable FsTypes[] = {
static FsDriverTable FsDrivers[] = {
{ .name = "local", .ops = &local_ops},
{ .name = "handle", .ops = &handle_ops},
};
int qemu_fsdev_add(QemuOpts *opts)
{
struct FsTypeListEntry *fsle;
struct FsDriverListEntry *fsle;
int i;
const char *fsdev_id = qemu_opts_id(opts);
const char *fstype = qemu_opt_get(opts, "fstype");
const char *fsdriver = qemu_opt_get(opts, "fsdriver");
const char *path = qemu_opt_get(opts, "path");
const char *sec_model = qemu_opt_get(opts, "security_model");
const char *writeout = qemu_opt_get(opts, "writeout");
@ -42,19 +42,19 @@ int qemu_fsdev_add(QemuOpts *opts)
return -1;
}
if (fstype) {
for (i = 0; i < ARRAY_SIZE(FsTypes); i++) {
if (strcmp(FsTypes[i].name, fstype) == 0) {
if (fsdriver) {
for (i = 0; i < ARRAY_SIZE(FsDrivers); i++) {
if (strcmp(FsDrivers[i].name, fsdriver) == 0) {
break;
}
}
if (i == ARRAY_SIZE(FsTypes)) {
fprintf(stderr, "fsdev: fstype %s not found\n", fstype);
if (i == ARRAY_SIZE(FsDrivers)) {
fprintf(stderr, "fsdev: fsdriver %s not found\n", fsdriver);
return -1;
}
} else {
fprintf(stderr, "fsdev: No fstype specified\n");
fprintf(stderr, "fsdev: No fsdriver specified\n");
return -1;
}
@ -73,23 +73,23 @@ int qemu_fsdev_add(QemuOpts *opts)
fsle->fse.fsdev_id = g_strdup(fsdev_id);
fsle->fse.path = g_strdup(path);
fsle->fse.security_model = g_strdup(sec_model);
fsle->fse.ops = FsTypes[i].ops;
fsle->fse.ops = FsDrivers[i].ops;
fsle->fse.export_flags = 0;
if (writeout) {
if (!strcmp(writeout, "immediate")) {
fsle->fse.export_flags = V9FS_IMMEDIATE_WRITEOUT;
}
}
QTAILQ_INSERT_TAIL(&fstype_entries, fsle, next);
QTAILQ_INSERT_TAIL(&fsdriver_entries, fsle, next);
return 0;
}
FsTypeEntry *get_fsdev_fsentry(char *id)
FsDriverEntry *get_fsdev_fsentry(char *id)
{
if (id) {
struct FsTypeListEntry *fsle;
struct FsDriverListEntry *fsle;
QTAILQ_FOREACH(fsle, &fstype_entries, next) {
QTAILQ_FOREACH(fsle, &fsdriver_entries, next) {
if (strcmp(fsle->fse.fsdev_id, id) == 0) {
return &fsle->fse;
}

18
fsdev/qemu-fsdev.h
View File

@ -29,29 +29,29 @@
* -----------------
* etc
*/
typedef struct FsTypeTable {
typedef struct FsDriverTable {
const char *name;
FileOperations *ops;
} FsTypeTable;
} FsDriverTable;
/*
* Structure to store the various fsdev's passed through command line.
*/
typedef struct FsTypeEntry {
typedef struct FsDriverEntry {
char *fsdev_id;
char *path;
char *security_model;
int export_flags;
FileOperations *ops;
} FsTypeEntry;
} FsDriverEntry;
typedef struct FsTypeListEntry {
FsTypeEntry fse;
QTAILQ_ENTRY(FsTypeListEntry) next;
} FsTypeListEntry;
typedef struct FsDriverListEntry {
FsDriverEntry fse;
QTAILQ_ENTRY(FsDriverListEntry) next;
} FsDriverListEntry;
int qemu_fsdev_add(QemuOpts *opts);
FsTypeEntry *get_fsdev_fsentry(char *id);
FsDriverEntry *get_fsdev_fsentry(char *id);
extern FileOperations local_ops;
extern FileOperations handle_ops;
#endif

2
hw/9pfs/virtio-9p-device.c
View File

@ -49,7 +49,7 @@ VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf)
V9fsState *s;
int i, len;
struct stat stat;
FsTypeEntry *fse;
FsDriverEntry *fse;
V9fsPath path;
s = (V9fsState *)virtio_common_init("virtio-9p",

8
qemu-config.c
View File

@ -165,11 +165,11 @@ static QemuOptsList qemu_chardev_opts = {
QemuOptsList qemu_fsdev_opts = {
.name = "fsdev",
.implied_opt_name = "fstype",
.implied_opt_name = "fsdriver",
.head = QTAILQ_HEAD_INITIALIZER(qemu_fsdev_opts.head),
.desc = {
{
.name = "fstype",
.name = "fsdriver",
.type = QEMU_OPT_STRING,
}, {
.name = "path",
@ -187,11 +187,11 @@ QemuOptsList qemu_fsdev_opts = {
QemuOptsList qemu_virtfs_opts = {
.name = "virtfs",
.implied_opt_name = "fstype",
.implied_opt_name = "fsdriver",
.head = QTAILQ_HEAD_INITIALIZER(qemu_virtfs_opts.head),
.desc = {
{
.name = "fstype",
.name = "fsdriver",
.type = QEMU_OPT_STRING,
}, {
.name = "path",

6
vl.c
View File

@ -2798,11 +2798,11 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
if (qemu_opt_get(opts, "fstype") == NULL ||
if (qemu_opt_get(opts, "fsdriver") == NULL ||
qemu_opt_get(opts, "mount_tag") == NULL ||
qemu_opt_get(opts, "path") == NULL ||
qemu_opt_get(opts, "security_model") == NULL) {
fprintf(stderr, "Usage: -virtfs fstype,path=/share_path/,"
fprintf(stderr, "Usage: -virtfs fsdriver,path=/share_path/,"
"security_model=[mapped|passthrough|none],"
"mount_tag=tag.\n");
exit(1);
@ -2826,7 +2826,7 @@ int main(int argc, char **argv, char **envp)
exit(1);
#endif
}
qemu_opt_set(fsdev, "fstype", qemu_opt_get(opts, "fstype"));
qemu_opt_set(fsdev, "fsdriver", qemu_opt_get(opts, "fsdriver"));
qemu_opt_set(fsdev, "path", qemu_opt_get(opts, "path"));
qemu_opt_set(fsdev, "security_model",
qemu_opt_get(opts, "security_model"));