diff options
author | Jeff Cody <jcody@redhat.com> | 2014-02-17 11:11:11 -0500 |
---|---|---|
committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-02-28 18:59:06 +0100 |
commit | 1b37b3442f78a77844fdaf7f53e5f04e4ce8f1d6 (patch) | |
tree | ee68902a6ad8c47b795bb16757d93f5506091c6a | |
parent | 9a05feabd537615b7f3d9d899686e513e71fdc12 (diff) | |
download | qemu-1b37b3442f78a77844fdaf7f53e5f04e4ce8f1d6.zip qemu-1b37b3442f78a77844fdaf7f53e5f04e4ce8f1d6.tar.gz qemu-1b37b3442f78a77844fdaf7f53e5f04e4ce8f1d6.tar.bz2 |
block: gluster - code movements, state storage changes
In preparation for supporting reopen on gluster, move flag
parsing out to a function. Also, add a NULL check in the
gconf cleanup.
Signed-off-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r-- | block/gluster.c | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/block/gluster.c b/block/gluster.c index 14d390b..d09824d 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -45,11 +45,13 @@ typedef struct GlusterConf { static void qemu_gluster_gconf_free(GlusterConf *gconf) { - g_free(gconf->server); - g_free(gconf->volname); - g_free(gconf->image); - g_free(gconf->transport); - g_free(gconf); + if (gconf) { + g_free(gconf->server); + g_free(gconf->volname); + g_free(gconf->image); + g_free(gconf->transport); + g_free(gconf); + } } static int parse_volume_options(GlusterConf *gconf, char *path) @@ -272,11 +274,28 @@ static QemuOptsList runtime_opts = { }, }; +static void qemu_gluster_parse_flags(int bdrv_flags, int *open_flags) +{ + assert(open_flags != NULL); + + *open_flags |= O_BINARY; + + if (bdrv_flags & BDRV_O_RDWR) { + *open_flags |= O_RDWR; + } else { + *open_flags |= O_RDONLY; + } + + if ((bdrv_flags & BDRV_O_NOCACHE)) { + *open_flags |= O_DIRECT; + } +} + static int qemu_gluster_open(BlockDriverState *bs, QDict *options, int bdrv_flags, Error **errp) { BDRVGlusterState *s = bs->opaque; - int open_flags = O_BINARY; + int open_flags = 0; int ret = 0; GlusterConf *gconf = g_malloc0(sizeof(GlusterConf)); QemuOpts *opts; @@ -299,15 +318,7 @@ static int qemu_gluster_open(BlockDriverState *bs, QDict *options, goto out; } - if (bdrv_flags & BDRV_O_RDWR) { - open_flags |= O_RDWR; - } else { - open_flags |= O_RDONLY; - } - - if ((bdrv_flags & BDRV_O_NOCACHE)) { - open_flags |= O_DIRECT; - } + qemu_gluster_parse_flags(bdrv_flags, &open_flags); s->fd = glfs_open(s->glfs, gconf->image, open_flags); if (!s->fd) { |