openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

curl: Remove broken parsing of options from url 

The block layer now supports a generic json syntax for passing option parameters
explicitly, making parsing of options from the url redundant.

Signed-off-by: Matthew Booth <mbooth@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Matthew Booth 2014-05-14 19:28:41 -04:00 committed by Kevin Wolf
parent 9aedd5a5d6
commit e3542c67af
1 changed files with 10 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
block/curl.c
View File

@ -61,12 +61,15 @@ static CURLMcode __curl_multi_socket_action(CURLM *multi_handle,
#define CURL_NUM_STATES 8 #define CURL_NUM_STATES 8
#define CURL_NUM_ACB 8 #define CURL_NUM_ACB 8
#define SECTOR_SIZE 512 #define SECTOR_SIZE 512
#define READ_AHEAD_SIZE (256 * 1024) #define READ_AHEAD_DEFAULT (256 * 1024)
#define FIND_RET_NONE 0 #define FIND_RET_NONE 0
#define FIND_RET_OK 1 #define FIND_RET_OK 1
#define FIND_RET_WAIT 2 #define FIND_RET_WAIT 2
#define CURL_BLOCK_OPT_URL "url"
#define CURL_BLOCK_OPT_READAHEAD "readahead"
struct BDRVCURLState; struct BDRVCURLState;
typedef struct CURLAIOCB { typedef struct CURLAIOCB {
@ -411,43 +414,7 @@ static void curl_clean_state(CURLState *s)
static void curl_parse_filename(const char *filename, QDict *options, static void curl_parse_filename(const char *filename, QDict *options,
Error **errp) Error **errp)
{ {
qdict_put(options, CURL_BLOCK_OPT_URL, qstring_from_str(filename));
#define RA_OPTSTR ":readahead="
char *file;
char *ra;
const char *ra_val;
int parse_state = 0;
file = g_strdup(filename);
/* Parse a trailing ":readahead=#:" param, if present. */
ra = file + strlen(file) - 1;
while (ra >= file) {
if (parse_state == 0) {
if (*ra == ':') {
parse_state++;
} else {
break;
}
} else if (parse_state == 1) {
if (*ra > '9' || *ra < '0') {
char *opt_start = ra - strlen(RA_OPTSTR) + 1;
if (opt_start > file &&
strncmp(opt_start, RA_OPTSTR, strlen(RA_OPTSTR)) == 0) {
ra_val = ra + 1;
ra -= strlen(RA_OPTSTR) - 1;
*ra = '\0';
qdict_put(options, "readahead", qstring_from_str(ra_val));
}
break;
}
}
ra--;
}
qdict_put(options, "url", qstring_from_str(file));
g_free(file);
} }
static QemuOptsList runtime_opts = { static QemuOptsList runtime_opts = {
@ -455,12 +422,12 @@ static QemuOptsList runtime_opts = {
.head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head), .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),
.desc = { .desc = {
{ {
.name = "url", .name = CURL_BLOCK_OPT_URL,
.type = QEMU_OPT_STRING, .type = QEMU_OPT_STRING,
.help = "URL to open", .help = "URL to open",
}, },
{ {
.name = "readahead", .name = CURL_BLOCK_OPT_READAHEAD,
.type = QEMU_OPT_SIZE, .type = QEMU_OPT_SIZE,
.help = "Readahead size", .help = "Readahead size",
}, },
@ -492,14 +459,15 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags,
goto out_noclean; goto out_noclean;
} }
s->readahead_size = qemu_opt_get_size(opts, "readahead", READ_AHEAD_SIZE); s->readahead_size = qemu_opt_get_size(opts, CURL_BLOCK_OPT_READAHEAD,
READ_AHEAD_DEFAULT);
if ((s->readahead_size & 0x1ff) != 0) { if ((s->readahead_size & 0x1ff) != 0) {
error_setg(errp, "HTTP_READAHEAD_SIZE %zd is not a multiple of 512", error_setg(errp, "HTTP_READAHEAD_SIZE %zd is not a multiple of 512",
s->readahead_size); s->readahead_size);
goto out_noclean; goto out_noclean;
} }
file = qemu_opt_get(opts, "url"); file = qemu_opt_get(opts, CURL_BLOCK_OPT_URL);
if (file == NULL) { if (file == NULL) {
error_setg(errp, "curl block driver requires an 'url' option"); error_setg(errp, "curl block driver requires an 'url' option");
goto out_noclean; goto out_noclean;