Commit c9ba36ff authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging 



Block layer patches:

- block: Remove bdrv_read() and bdrv_write()
- qemu-img: Allow rebase with no input base
- blockjob: Fix coroutine thread after AioContext change
- MAINTAINERS updates for pflash, curl and gluster

# gpg: Signature made Fri 10 May 2019 16:39:54 BST
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  iotests: Add test for rebase without input base
  qemu-img: Use zero writes after source backing EOF
  qemu-img: Allow rebase with no input base
  qcow2: Remove BDRVQcow2State.cluster_sectors
  block: Remove bdrv_read() and bdrv_write()
  vvfat: Replace bdrv_{read,write}() with bdrv_{pread,pwrite}()
  vdi: Replace bdrv_{read,write}() with bdrv_{pread,pwrite}()
  qcow2: Replace bdrv_write() with bdrv_pwrite()
  qemu-img: Use IEC binary prefixes for size constants
  test-block-iothread: Job coroutine thread after AioContext switch
  blockjob: Fix coroutine thread after AioContext change
  qemu-iotests: Fix cleanup for 192
  MAINTAINERS: Add an entry for the Parallel NOR Flash devices
  MAINTAINERS: Downgrade status of block sections without "M:" to "Odd Fixes"
  block: remove bs from lists before closing

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents efb4f3b6 11f6fc50

MAINTAINERS

+10 −2
Original line number Diff line number Diff line
@@ -1391,6 +1391,13 @@ F: include/hw/net/ 
F: tests/virtio-net-test.c

T: git https://github.com/jasowang/qemu.git net



Parallel NOR Flash devices

M: Philippe Mathieu-Daudé <philmd@redhat.com>

T: git https://gitlab.com/philmd/qemu.git pflash-next

S: Maintained

F: hw/block/pflash_cfi*.c

F: include/hw/block/flash.h



SCSI

M: Paolo Bonzini <pbonzini@redhat.com>

R: Fam Zheng <fam@euphon.net>
@@ -2404,12 +2411,13 @@ F: block/ssh.c 


CURL

L: qemu-block@nongnu.org

S: Supported

S: Odd Fixes

F: block/curl.c



GLUSTER

L: qemu-block@nongnu.org

S: Supported

L: integration@gluster.org

S: Odd Fixes

F: block/gluster.c



Null Block Driver

block.c

+2 −2
Original line number Diff line number Diff line
@@ -4082,14 +4082,14 @@ static void bdrv_delete(BlockDriverState *bs) 
    assert(bdrv_op_blocker_is_empty(bs));

    assert(!bs->refcnt);



    bdrv_close(bs);



    /* remove from list, if necessary */

    if (bs->node_name[0] != '\0') {

        QTAILQ_REMOVE(&graph_bdrv_states, bs, node_list);

    }

    QTAILQ_REMOVE(&all_bdrv_states, bs, bs_list);



    bdrv_close(bs);



    g_free(bs);

}

block/io.c

+7 −36
Original line number Diff line number Diff line
@@ -837,42 +837,6 @@ static int bdrv_prwv_co(BdrvChild *child, int64_t offset, 
    return rwco.ret;

}



/*

 * Process a synchronous request using coroutines

 */

static int bdrv_rw_co(BdrvChild *child, int64_t sector_num, uint8_t *buf,

                      int nb_sectors, bool is_write, BdrvRequestFlags flags)

{

    QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf,

                                            nb_sectors * BDRV_SECTOR_SIZE);



    if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) {

        return -EINVAL;

    }



    return bdrv_prwv_co(child, sector_num << BDRV_SECTOR_BITS,

                        &qiov, is_write, flags);

}



/* return < 0 if error. See bdrv_write() for the return codes */

int bdrv_read(BdrvChild *child, int64_t sector_num,

              uint8_t *buf, int nb_sectors)

{

    return bdrv_rw_co(child, sector_num, buf, nb_sectors, false, 0);

}



/* Return < 0 if error. Important errors are:

  -EIO         generic I/O error (may happen for all errors)

  -ENOMEDIUM   No media inserted.

  -EINVAL      Invalid sector number or nb_sectors

  -EACCES      Trying to write a read-only device

*/

int bdrv_write(BdrvChild *child, int64_t sector_num,

               const uint8_t *buf, int nb_sectors)

{

    return bdrv_rw_co(child, sector_num, (uint8_t *)buf, nb_sectors, true, 0);

}



int bdrv_pwrite_zeroes(BdrvChild *child, int64_t offset,

                       int bytes, BdrvRequestFlags flags)

{
@@ -935,6 +899,7 @@ int bdrv_preadv(BdrvChild *child, int64_t offset, QEMUIOVector *qiov) 
    return qiov->size;

}



/* See bdrv_pwrite() for the return codes */

int bdrv_pread(BdrvChild *child, int64_t offset, void *buf, int bytes)

{

    QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
@@ -958,6 +923,12 @@ int bdrv_pwritev(BdrvChild *child, int64_t offset, QEMUIOVector *qiov) 
    return qiov->size;

}



/* Return no. of bytes on success or < 0 on error. Important errors are:

  -EIO         generic I/O error (may happen for all errors)

  -ENOMEDIUM   No media inserted.

  -EINVAL      Invalid offset or number of bytes

  -EACCES      Trying to write a read-only device

*/

int bdrv_pwrite(BdrvChild *child, int64_t offset, const void *buf, int bytes)

{

    QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);

block/qcow2-refcount.c

+2 −2
Original line number Diff line number Diff line
@@ -2429,8 +2429,8 @@ write_refblocks: 
        on_disk_refblock = (void *)((char *) *refcount_table +

                                    refblock_index * s->cluster_size);



        ret = bdrv_write(bs->file, refblock_offset / BDRV_SECTOR_SIZE,

                         on_disk_refblock, s->cluster_sectors);

        ret = bdrv_pwrite(bs->file, refblock_offset, on_disk_refblock,

                          s->cluster_size);

        if (ret < 0) {

            fprintf(stderr, "ERROR writing refblock: %s\n", strerror(-ret));

            goto fail;

block/qcow2.c

+0 −1
Original line number Diff line number Diff line
@@ -1259,7 +1259,6 @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options, 


    s->cluster_bits = header.cluster_bits;

    s->cluster_size = 1 << s->cluster_bits;

    s->cluster_sectors = 1 << (s->cluster_bits - BDRV_SECTOR_BITS);



    /* Initialise version 3 header fields */

    if (header.version == 2) {