Commit 3b268766 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Block layer patches:

- enhance handling of size-related BlockConf properties
- nvme: small fixes, refactoring and cleanups
- virtio-blk: On restart, process queued requests in the proper context
- icount: make dma reads deterministic
- iotests: Some fixes for rarely run cases
- .gitignore: Ignore storage-daemon files
- Minor code cleanups

# gpg: Signature made Wed 17 Jun 2020 15:47:19 BST
# gpg:                using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6
# gpg:                issuer "kwolf@redhat.com"
# 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: (43 commits)
  iotests: Add copyright line in qcow2.py
  iotests/{190,291}: compat=0.10 is unsupported
  iotests/229: data_file is unsupported
  iotests/292: data_file is unsupported
  iotests/041: Skip test_small_target for qed
  iotests.py: Add skip_for_formats() decorator
  block: lift blocksize property limit to 2 MiB
  qdev-properties: add getter for size32 and blocksize
  block: make BlockConf size props 32bit and accept size suffixes
  qdev-properties: make blocksize accept size suffixes
  qdev-properties: add size32 property type
  qdev-properties: blocksize: use same limits in code and description
  block: consolidate blocksize properties consistency checks
  virtio-blk: store opt_io_size with correct size
  .gitignore: Ignore storage-daemon files
  hw/block/nvme: verify msix_init_exclusive_bar() return value
  hw/block/nvme: add msix_qsize parameter
  hw/block/nvme: Verify msix_vector_use() returned value
  hw/block/nvme: factor out controller identify setup
  hw/block/nvme: do cmb/pmr init as part of pci init
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3f429a34 3419ec71

.gitignore

+9 −8
Original line number Diff line number Diff line
@@ -34,18 +34,18 @@ 
/qapi/qapi-builtin-types.[ch]

/qapi/qapi-builtin-visit.[ch]

/qapi/qapi-commands-*.[ch]

/qapi/qapi-commands.[ch]

/qapi/qapi-emit-events.[ch]

**/qapi/qapi-commands.[ch]

**/qapi/qapi-emit-events.[ch]

/qapi/qapi-events-*.[ch]

/qapi/qapi-events.[ch]

/qapi/qapi-init-commands.[ch]

/qapi/qapi-introspect.[ch]

**/qapi/qapi-events.[ch]

**/qapi/qapi-init-commands.[ch]

**/qapi/qapi-introspect.[ch]

/qapi/qapi-types-*.[ch]

/qapi/qapi-types.[ch]

**/qapi/qapi-types.[ch]

/qapi/qapi-visit-*.[ch]

!/qapi/qapi-visit-core.c

/qapi/qapi-visit.[ch]

/qapi/qapi-doc.texi

**/qapi/qapi-visit.[ch]

**/qapi/qapi-doc.texi

/qemu-edid

/qemu-img

/qemu-nbd
@@ -59,6 +59,7 @@ 
/qemu-keymap

/qemu-monitor.texi

/qemu-monitor-info.texi

/qemu-storage-daemon

/qemu-version.h

/qemu-version.h.tmp

/module_block.h

Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ chardev-obj-y = chardev/ 


authz-obj-y = authz/



block-obj-y = block/ block/monitor/ nbd/ scsi/

block-obj-y = block/ nbd/ scsi/

block-obj-y += block.o blockjob.o job.o

block-obj-y += qemu-io-cmds.o

block-obj-$(CONFIG_REPLICATION) += replication.o

block/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ block-obj-y += aio_task.o 
block-obj-y += backup-top.o

block-obj-y += filter-compress.o

common-obj-y += monitor/

block-obj-y += monitor/



block-obj-y += stream.o

block/qcow2-bitmap.c

+5 −4
Original line number Diff line number Diff line
@@ -1757,19 +1757,20 @@ bool qcow2_supports_persistent_dirty_bitmap(BlockDriverState *bs) 
}



/*

 * Compute the space required for bitmaps in @bs.

 * Compute the space required to copy bitmaps from @in_bs.

 *

 * The computation is based as if copying to a new image with the

 * given @cluster_size, which may differ from the cluster size in @bs.

 * given @cluster_size, which may differ from the cluster size in

 * @in_bs; in fact, @in_bs might be something other than qcow2.

 */

uint64_t qcow2_get_persistent_dirty_bitmap_size(BlockDriverState *bs,

uint64_t qcow2_get_persistent_dirty_bitmap_size(BlockDriverState *in_bs,

                                                uint32_t cluster_size)

{

    uint64_t bitmaps_size = 0;

    BdrvDirtyBitmap *bm;

    size_t bitmap_dir_size = 0;



    FOR_EACH_DIRTY_BITMAP(bs, bm) {

    FOR_EACH_DIRTY_BITMAP(in_bs, bm) {

        if (bdrv_dirty_bitmap_get_persistence(bm)) {

            const char *name = bdrv_dirty_bitmap_name(bm);

            uint32_t granularity = bdrv_dirty_bitmap_granularity(bm);

dma-helpers.c

+22 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#include "trace-root.h"

#include "qemu/thread.h"

#include "qemu/main-loop.h"

#include "sysemu/cpus.h"

#include "qemu/range.h"



/* #define DEBUG_IOMMU */
@@ -142,6 +144,26 @@ static void dma_blk_cb(void *opaque, int ret) 
        cur_addr = dbs->sg->sg[dbs->sg_cur_index].base + dbs->sg_cur_byte;

        cur_len = dbs->sg->sg[dbs->sg_cur_index].len - dbs->sg_cur_byte;

        mem = dma_memory_map(dbs->sg->as, cur_addr, &cur_len, dbs->dir);

        /*

         * Make reads deterministic in icount mode. Windows sometimes issues

         * disk read requests with overlapping SGs. It leads

         * to non-determinism, because resulting buffer contents may be mixed

         * from several sectors. This code splits all SGs into several

         * groups. SGs in every group do not overlap.

         */

        if (mem && use_icount && dbs->dir == DMA_DIRECTION_FROM_DEVICE) {

            int i;

            for (i = 0 ; i < dbs->iov.niov ; ++i) {

                if (ranges_overlap((intptr_t)dbs->iov.iov[i].iov_base,

                                   dbs->iov.iov[i].iov_len, (intptr_t)mem,

                                   cur_len)) {

                    dma_memory_unmap(dbs->sg->as, mem, cur_len,

                                     dbs->dir, cur_len);

                    mem = NULL;

                    break;

                }

            }

        }

        if (!mem)

            break;

        qemu_iovec_add(&dbs->iov, mem, cur_len);