Introduce 9p commandline arguments sanity checks
PATCH v2 1/1 Introduce 9p commandline arguments sanity checks
This patch checks the validity of 9p related commandline arguments and throws error if the arguments are not appropriate.
Signed-off-by Harsh Prateek Bora <[email protected]>
---
v2:
- added check in get_fsdev_fsentry() and indenatation fixes
fsdev/qemu-fsdev.c | 48 +++++++++++++++++++++++++++++++----------------- hw/virtio-9p.c | 4 ++-- 2 files changed, 33 insertions(+), 19 deletions(-)
fsdev/qemu-fsdev.c +31 -17
@@ -29,35 +29,47 @@ int qemu_fsdev_add(QemuOpts *opts) {struct FsTypeListEntry *fsle;int i; +const char *fsdev_id =qemu_opts_id (opts); +const char *fstype =qemu_opt_get (opts,"fstype" ); +const char *path =qemu_opt_get (opts,"path" ); +const char *sec_model =qemu_opt_get (opts,"security_model" ); -if (qemu_opts_id (opts) ==NULL ) { +if (!fsdev_id) {fprintf (stderr,"fsdev: No id specified\n" );return -1 ; } -for (i =0 ; i <ARRAY_SIZE (FsTypes); i++) { -if (strcmp (FsTypes[i].name,qemu_opt_get (opts,"fstype" )) ==0 ) { -break ; +if (fstype) { +for (i =0 ; i <ARRAY_SIZE (FsTypes); i++) { +if (strcmp (FsTypes[i].name, fstype) ==0 ) { +break ; + } } - } -if (i ==ARRAY_SIZE (FsTypes)) { -fprintf (stderr,"fsdev: fstype %s not found\n" , -qemu_opt_get (opts,"fstype" )); +if (i ==ARRAY_SIZE (FsTypes)) { +fprintf (stderr,"fsdev: fstype %s not found\n" , fstype); +return -1 ; + } + }else { +fprintf (stderr,"fsdev: No fstype specified\n" );return -1 ; } -if (qemu_opt_get (opts,"security_model" ) ==NULL ) { +if (!sec_model) {fprintf (stderr,"fsdev: No security_model specified.\n" );return -1 ; } +if (!path) { +fprintf (stderr,"fsdev: No path specified.\n" ); +return -1 ; + } + fsle =qemu_malloc (sizeof (*fsle)); - fsle->fse.fsdev_id =qemu_strdup (qemu_opts_id (opts)); - fsle->fse.path =qemu_strdup (qemu_opt_get (opts,"path" )); - fsle->fse.security_model =qemu_strdup (qemu_opt_get (opts, -"security_model" )); + fsle->fse.fsdev_id =qemu_strdup (fsdev_id); + fsle->fse.path =qemu_strdup (path); + fsle->fse.security_model =qemu_strdup (sec_model); fsle->fse.ops = FsTypes[i].ops;QTAILQ_INSERT_TAIL (&fstype_entries, fsle, next);
@@ -67,11 +79,13 @@ int qemu_fsdev_add(QemuOpts *opts)FsTypeEntry *get_fsdev_fsentry (char *id) { -struct FsTypeListEntry *fsle; +if (id) { +struct FsTypeListEntry *fsle; - QTAILQ_FOREACH(fsle, &fstype_entries, next) { -if (strcmp (fsle->fse.fsdev_id, id) ==0 ) { -return &fsle->fse; + QTAILQ_FOREACH(fsle, &fstype_entries, next) { +if (strcmp (fsle->fse.fsdev_id, id) ==0 ) { +return &fsle->fse; + } } }return NULL ;
hw/virtio-9p.c +2 -2
@@ -3696,8 +3696,8 @@ VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf)if (!fse) {/* We don't have a fsdev identified by fsdev_id */ -fprintf (stderr,"Virtio-9p device couldn't find fsdev " -"with the id %s\n" , conf->fsdev_id); +fprintf (stderr,"Virtio-9p device couldn't find fsdev with the " +"id = %s\n" , conf->fsdev_id ? conf->fsdev_id :"NULL" );exit (1 ); }
Signature · 1 line
1.7.1.1