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

curl: Use bdrv_open options instead of filename 

As a bonus, going through the QemuOpts QEMU_OPT_SIZE parser for the
readahead option gives us proper error reporting that the previous use
of atoi() lacked.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Kevin Wolf 2013-04-10 15:31:33 +02:00
parent 16c790926b
commit 8e6d58cd5b
1 changed files with 102 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

153
block/curl.c
View File

@ -335,12 +335,9 @@ static void curl_clean_state(CURLState *s)
s->in_use = 0; s->in_use = 0;
} }
static int curl_open(BlockDriverState *bs, const char *filename, static void curl_parse_filename(const char *filename, QDict *options,
QDict *options, int flags) Error **errp)
{ {
BDRVCURLState *s = bs->opaque;
CURLState *state = NULL;
double d;
#define RA_OPTSTR ":readahead=" #define RA_OPTSTR ":readahead="
char *file; char *file;
@ -348,19 +345,17 @@ static int curl_open(BlockDriverState *bs, const char *filename,
const char *ra_val; const char *ra_val;
int parse_state = 0; int parse_state = 0;
static int inited = 0;
file = g_strdup(filename); file = g_strdup(filename);
s->readahead_size = READ_AHEAD_SIZE;
/* Parse a trailing ":readahead=#:" param, if present. */ /* Parse a trailing ":readahead=#:" param, if present. */
ra = file + strlen(file) - 1; ra = file + strlen(file) - 1;
while (ra >= file) { while (ra >= file) {
if (parse_state == 0) { if (parse_state == 0) {
if (*ra == ':') if (*ra == ':') {
parse_state++; parse_state++;
else } else {
break; break;
}
} else if (parse_state == 1) { } else if (parse_state == 1) {
if (*ra > '9' || *ra < '0') { if (*ra > '9' || *ra < '0') {
char *opt_start = ra - strlen(RA_OPTSTR) + 1; char *opt_start = ra - strlen(RA_OPTSTR) + 1;
@ -369,29 +364,78 @@ static int curl_open(BlockDriverState *bs, const char *filename,
ra_val = ra + 1; ra_val = ra + 1;
ra -= strlen(RA_OPTSTR) - 1; ra -= strlen(RA_OPTSTR) - 1;
*ra = '\0'; *ra = '\0';
s->readahead_size = atoi(ra_val); qdict_put(options, "readahead", qstring_from_str(ra_val));
break;
} else {
break;
} }
break;
} }
} }
ra--; ra--;
} }
qdict_put(options, "url", qstring_from_str(file));
g_free(file);
}
static QemuOptsList runtime_opts = {
.name = "curl",
.head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),
.desc = {
{
.name = "url",
.type = QEMU_OPT_STRING,
.help = "URL to open",
},
{
.name = "readahead",
.type = QEMU_OPT_SIZE,
.help = "Readahead size",
},
{ /* end of list */ }
},
};
static int curl_open(BlockDriverState *bs, const char *dummy,
QDict *options, int flags)
{
BDRVCURLState *s = bs->opaque;
CURLState *state = NULL;
QemuOpts *opts;
Error *local_err = NULL;
const char *file;
double d;
static int inited = 0;
opts = qemu_opts_create_nofail(&runtime_opts);
qemu_opts_absorb_qdict(opts, options, &local_err);
if (error_is_set(&local_err)) {
qerror_report_err(local_err);
error_free(local_err);
goto out_noclean;
}
s->readahead_size = qemu_opt_get_size(opts, "readahead", READ_AHEAD_SIZE);
if ((s->readahead_size & 0x1ff) != 0) { if ((s->readahead_size & 0x1ff) != 0) {
fprintf(stderr, "HTTP_READAHEAD_SIZE %zd is not a multiple of 512\n", fprintf(stderr, "HTTP_READAHEAD_SIZE %zd is not a multiple of 512\n",
s->readahead_size); s->readahead_size);
goto out_noclean; goto out_noclean;
} }
file = qemu_opt_get(opts, "url");
if (file == NULL) {
qerror_report(ERROR_CLASS_GENERIC_ERROR, "curl block driver requires "
"an 'url' option");
goto out_noclean;
}
if (!inited) { if (!inited) {
curl_global_init(CURL_GLOBAL_ALL); curl_global_init(CURL_GLOBAL_ALL);
inited = 1; inited = 1;
} }
DPRINTF("CURL: Opening %s\n", file); DPRINTF("CURL: Opening %s\n", file);
s->url = file; s->url = g_strdup(file);
state = curl_init_state(s); state = curl_init_state(s);
if (!state) if (!state)
goto out_noclean; goto out_noclean;
@ -423,6 +467,7 @@ static int curl_open(BlockDriverState *bs, const char *filename,
curl_multi_setopt( s->multi, CURLMOPT_SOCKETFUNCTION, curl_sock_cb ); curl_multi_setopt( s->multi, CURLMOPT_SOCKETFUNCTION, curl_sock_cb );
curl_multi_do(s); curl_multi_do(s);
qemu_opts_del(opts);
return 0; return 0;
out: out:
@ -430,7 +475,8 @@ out:
curl_easy_cleanup(state->curl); curl_easy_cleanup(state->curl);
state->curl = NULL; state->curl = NULL;
out_noclean: out_noclean:
g_free(file); g_free(s->url);
qemu_opts_del(opts);
return -EINVAL; return -EINVAL;
} }
@ -568,63 +614,68 @@ static int64_t curl_getlength(BlockDriverState *bs)
} }
static BlockDriver bdrv_http = { static BlockDriver bdrv_http = {
.format_name = "http", .format_name = "http",
.protocol_name = "http", .protocol_name = "http",
.instance_size = sizeof(BDRVCURLState), .instance_size = sizeof(BDRVCURLState),
.bdrv_file_open = curl_open, .bdrv_parse_filename = curl_parse_filename,
.bdrv_close = curl_close, .bdrv_file_open = curl_open,
.bdrv_getlength = curl_getlength, .bdrv_close = curl_close,
.bdrv_getlength = curl_getlength,
.bdrv_aio_readv = curl_aio_readv, .bdrv_aio_readv = curl_aio_readv,
}; };
static BlockDriver bdrv_https = { static BlockDriver bdrv_https = {
.format_name = "https", .format_name = "https",
.protocol_name = "https", .protocol_name = "https",
.instance_size = sizeof(BDRVCURLState), .instance_size = sizeof(BDRVCURLState),
.bdrv_file_open = curl_open, .bdrv_parse_filename = curl_parse_filename,
.bdrv_close = curl_close, .bdrv_file_open = curl_open,
.bdrv_getlength = curl_getlength, .bdrv_close = curl_close,
.bdrv_getlength = curl_getlength,
.bdrv_aio_readv = curl_aio_readv, .bdrv_aio_readv = curl_aio_readv,
}; };
static BlockDriver bdrv_ftp = { static BlockDriver bdrv_ftp = {
.format_name = "ftp", .format_name = "ftp",
.protocol_name = "ftp", .protocol_name = "ftp",
.instance_size = sizeof(BDRVCURLState), .instance_size = sizeof(BDRVCURLState),
.bdrv_file_open = curl_open, .bdrv_parse_filename = curl_parse_filename,
.bdrv_close = curl_close, .bdrv_file_open = curl_open,
.bdrv_getlength = curl_getlength, .bdrv_close = curl_close,
.bdrv_getlength = curl_getlength,
.bdrv_aio_readv = curl_aio_readv, .bdrv_aio_readv = curl_aio_readv,
}; };
static BlockDriver bdrv_ftps = { static BlockDriver bdrv_ftps = {
.format_name = "ftps", .format_name = "ftps",
.protocol_name = "ftps", .protocol_name = "ftps",
.instance_size = sizeof(BDRVCURLState), .instance_size = sizeof(BDRVCURLState),
.bdrv_file_open = curl_open, .bdrv_parse_filename = curl_parse_filename,
.bdrv_close = curl_close, .bdrv_file_open = curl_open,
.bdrv_getlength = curl_getlength, .bdrv_close = curl_close,
.bdrv_getlength = curl_getlength,
.bdrv_aio_readv = curl_aio_readv, .bdrv_aio_readv = curl_aio_readv,
}; };
static BlockDriver bdrv_tftp = { static BlockDriver bdrv_tftp = {
.format_name = "tftp", .format_name = "tftp",
.protocol_name = "tftp", .protocol_name = "tftp",
.instance_size = sizeof(BDRVCURLState), .instance_size = sizeof(BDRVCURLState),
.bdrv_file_open = curl_open, .bdrv_parse_filename = curl_parse_filename,
.bdrv_close = curl_close, .bdrv_file_open = curl_open,
.bdrv_getlength = curl_getlength, .bdrv_close = curl_close,
.bdrv_getlength = curl_getlength,
.bdrv_aio_readv = curl_aio_readv, .bdrv_aio_readv = curl_aio_readv,
}; };
static void curl_block_init(void) static void curl_block_init(void)