Commit 9054d9f6 authored by Max Reitz's avatar Max Reitz Committed by Jeff Cody
Browse files

block/curl: Use BDRV_SECTOR_SIZE 



Currently, curl defines its own constant SECTOR_SIZE. There is no
advantage over using the global BDRV_SECTOR_SIZE, so drop it.

Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-id: 20161025025431.24714-2-mreitz@redhat.com
Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
parent 23dce387

block/curl.c

+5 −6
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ static CURLMcode __curl_multi_socket_action(CURLM *multi_handle, 


#define CURL_NUM_STATES 8

#define CURL_NUM_ACB    8

#define SECTOR_SIZE     512

#define READ_AHEAD_DEFAULT (256 * 1024)

#define CURL_TIMEOUT_DEFAULT 5

#define CURL_TIMEOUT_MAX 10000
@@ -737,12 +736,12 @@ static void curl_readv_bh_cb(void *p) 
    CURLAIOCB *acb = p;

    BDRVCURLState *s = acb->common.bs->opaque;



    size_t start = acb->sector_num * SECTOR_SIZE;

    size_t start = acb->sector_num * BDRV_SECTOR_SIZE;

    size_t end;



    // In case we have the requested data already (e.g. read-ahead),

    // we can just call the callback and be done.

    switch (curl_find_buf(s, start, acb->nb_sectors * SECTOR_SIZE, acb)) {

    switch (curl_find_buf(s, start, acb->nb_sectors * BDRV_SECTOR_SIZE, acb)) {

        case FIND_RET_OK:

            qemu_aio_unref(acb);

            // fall through
@@ -761,7 +760,7 @@ static void curl_readv_bh_cb(void *p) 
    }



    acb->start = 0;

    acb->end = (acb->nb_sectors * SECTOR_SIZE);

    acb->end = (acb->nb_sectors * BDRV_SECTOR_SIZE);



    state->buf_off = 0;

    g_free(state->orig_buf);
@@ -778,8 +777,8 @@ static void curl_readv_bh_cb(void *p) 
    state->acb[0] = acb;



    snprintf(state->range, 127, "%zd-%zd", start, end);

    DPRINTF("CURL (AIO): Reading %d at %zd (%s)\n",

            (acb->nb_sectors * SECTOR_SIZE), start, state->range);

    DPRINTF("CURL (AIO): Reading %llu at %zd (%s)\n",

            (acb->nb_sectors * BDRV_SECTOR_SIZE), start, state->range);

    curl_easy_setopt(state->curl, CURLOPT_RANGE, state->range);



    curl_multi_add_handle(s->multi, state->curl);