david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sheepdog: refactor do_sd_create()

Browse Source 
We can actually use BDRVSheepdogState *s to pass most of the parameters.

Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Liu Yuan <namei.unix@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Liu Yuan 2013-11-07 22:56:37 +08:00 committed by Kevin Wolf
parent 4d5977eaec
commit c31d482f29
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
block/sheepdog.c
View File

@ -1464,9 +1464,7 @@ out:
return ret; return ret;
} }
static int do_sd_create(BDRVSheepdogState *s, char *filename, int64_t vdi_size, static int do_sd_create(BDRVSheepdogState *s, uint32_t *vdi_id, int snapshot)
uint32_t base_vid, uint32_t *vdi_id, int snapshot,
uint8_t copy_policy)
{ {
SheepdogVdiReq hdr; SheepdogVdiReq hdr;
SheepdogVdiRsp *rsp = (SheepdogVdiRsp *)&hdr; SheepdogVdiRsp *rsp = (SheepdogVdiRsp *)&hdr;
@ -1483,11 +1481,11 @@ static int do_sd_create(BDRVSheepdogState *s, char *filename, int64_t vdi_size,
* does not fit in buf? For now, just truncate and avoid buffer overrun. * does not fit in buf? For now, just truncate and avoid buffer overrun.
*/ */
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
pstrcpy(buf, sizeof(buf), filename); pstrcpy(buf, sizeof(buf), s->name);
memset(&hdr, 0, sizeof(hdr)); memset(&hdr, 0, sizeof(hdr));
hdr.opcode = SD_OP_NEW_VDI; hdr.opcode = SD_OP_NEW_VDI;
hdr.vdi_id = base_vid; hdr.vdi_id = s->inode.vdi_id;
wlen = SD_MAX_VDI_LEN; wlen = SD_MAX_VDI_LEN;
@ -1495,8 +1493,8 @@ static int do_sd_create(BDRVSheepdogState *s, char *filename, int64_t vdi_size,
hdr.snapid = snapshot; hdr.snapid = snapshot;
hdr.data_length = wlen; hdr.data_length = wlen;
hdr.vdi_size = vdi_size; hdr.vdi_size = s->inode.vdi_size;
hdr.copy_policy = copy_policy; hdr.copy_policy = s->inode.copy_policy;
ret = do_req(fd, (SheepdogReq *)&hdr, buf, &wlen, &rlen); ret = do_req(fd, (SheepdogReq *)&hdr, buf, &wlen, &rlen);
@ -1507,7 +1505,7 @@ static int do_sd_create(BDRVSheepdogState *s, char *filename, int64_t vdi_size,
} }
if (rsp->result != SD_RES_SUCCESS) { if (rsp->result != SD_RES_SUCCESS) {
error_report("%s, %s", sd_strerror(rsp->result), filename); error_report("%s, %s", sd_strerror(rsp->result), s->inode.name);
return -EIO; return -EIO;
} }
@ -1568,23 +1566,21 @@ static int sd_create(const char *filename, QEMUOptionParameter *options,
Error **errp) Error **errp)
{ {
int ret = 0; int ret = 0;
uint32_t vid = 0, base_vid = 0; uint32_t vid = 0;
int64_t vdi_size = 0;
char *backing_file = NULL; char *backing_file = NULL;
BDRVSheepdogState *s; BDRVSheepdogState *s;
char vdi[SD_MAX_VDI_LEN], tag[SD_MAX_VDI_TAG_LEN]; char tag[SD_MAX_VDI_TAG_LEN];
uint32_t snapid; uint32_t snapid;
bool prealloc = false; bool prealloc = false;
Error *local_err = NULL; Error *local_err = NULL;
s = g_malloc0(sizeof(BDRVSheepdogState)); s = g_malloc0(sizeof(BDRVSheepdogState));
memset(vdi, 0, sizeof(vdi));
memset(tag, 0, sizeof(tag)); memset(tag, 0, sizeof(tag));
if (strstr(filename, "://")) { if (strstr(filename, "://")) {
ret = sd_parse_uri(s, filename, vdi, &snapid, tag); ret = sd_parse_uri(s, filename, s->name, &snapid, tag);
} else { } else {
ret = parse_vdiname(s, filename, vdi, &snapid, tag); ret = parse_vdiname(s, filename, s->name, &snapid, tag);
} }
if (ret < 0) { if (ret < 0) {
goto out; goto out;
@ -1592,7 +1588,7 @@ static int sd_create(const char *filename, QEMUOptionParameter *options,
while (options && options->name) { while (options && options->name) {
if (!strcmp(options->name, BLOCK_OPT_SIZE)) { if (!strcmp(options->name, BLOCK_OPT_SIZE)) {
vdi_size = options->value.n; s->inode.vdi_size = options->value.n;
} else if (!strcmp(options->name, BLOCK_OPT_BACKING_FILE)) { } else if (!strcmp(options->name, BLOCK_OPT_BACKING_FILE)) {
backing_file = options->value.s; backing_file = options->value.s;
} else if (!strcmp(options->name, BLOCK_OPT_PREALLOC)) { } else if (!strcmp(options->name, BLOCK_OPT_PREALLOC)) {
@ -1610,7 +1606,7 @@ static int sd_create(const char *filename, QEMUOptionParameter *options,
options++; options++;
} }
if (vdi_size > SD_MAX_VDI_SIZE) { if (s->inode.vdi_size > SD_MAX_VDI_SIZE) {
error_report("too big image size"); error_report("too big image size");
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
@ -1645,12 +1641,11 @@ static int sd_create(const char *filename, QEMUOptionParameter *options,
goto out; goto out;
} }
base_vid = s->inode.vdi_id;
bdrv_unref(bs); bdrv_unref(bs);
} }
/* TODO: allow users to specify copy number */ /* TODO: allow users to specify copy number */
ret = do_sd_create(s, vdi, vdi_size, base_vid, &vid, 0, 0); ret = do_sd_create(s, &vid, 0);
if (!prealloc || ret) { if (!prealloc || ret) {
goto out; goto out;
} }
@ -1833,8 +1828,7 @@ static int sd_create_branch(BDRVSheepdogState *s)
* false bail out. * false bail out.
*/ */
deleted = sd_delete(s); deleted = sd_delete(s);
ret = do_sd_create(s, s->name, s->inode.vdi_size, s->inode.vdi_id, &vid, ret = do_sd_create(s, &vid, !deleted);
!deleted, s->inode.copy_policy);
if (ret) { if (ret) {
goto out; goto out;
} }
@ -2097,8 +2091,7 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
goto cleanup; goto cleanup;
} }
ret = do_sd_create(s, s->name, s->inode.vdi_size, s->inode.vdi_id, &new_vid, ret = do_sd_create(s, &new_vid, 1);
1, s->inode.copy_policy);
if (ret < 0) { if (ret < 0) {
error_report("failed to create inode for snapshot. %s", error_report("failed to create inode for snapshot. %s",
strerror(errno)); strerror(errno));