qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] ae0ceb: hw/ide: Make IDEDMAOps handlers take


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] ae0ceb: hw/ide: Make IDEDMAOps handlers take a const IDEDM...
Date: Thu, 18 Jun 2020 07:30:33 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: ae0cebd71215188951902c5ccdd8685e431c286c
      
https://github.com/qemu/qemu/commit/ae0cebd71215188951902c5ccdd8685e431c286c
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/ide/ahci.c
    M hw/ide/core.c
    M hw/ide/macio.c
    M hw/ide/pci.c
    M include/hw/ide/internal.h

  Log Message:
  -----------
  hw/ide: Make IDEDMAOps handlers take a const IDEDMA pointer

Handlers don't need to modify the IDEDMA structure.
Make it const.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200512194917.15807-1-philmd@redhat.com>
Acked-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 5fb0a6b5e771b235275acc8af7da490de072917b
      
https://github.com/qemu/qemu/commit/5fb0a6b5e771b235275acc8af7da490de072917b
  Author: Pavel Dovgalyuk <pavel.dovgaluk@gmail.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M dma-helpers.c

  Log Message:
  -----------
  icount: make dma reads deterministic

Windows guest sometimes makes DMA requests with overlapping
target addresses. This leads to the following structure of iov for
the block driver:

addr size1
addr size2
addr size3

It means that three adjacent disk blocks should be read into the same
memory buffer. Windows does not expects anything from these bytes
(should it be data from the first block, or the last one, or some mix),
but uses them somehow. It leads to non-determinism of the guest execution,
because block driver does not preserve any order of reading.

This situation was discusses in the mailing list at least twice:
https://lists.gnu.org/archive/html/qemu-devel/2010-09/msg01996.html
https://lists.gnu.org/archive/html/qemu-devel/2020-02/msg05185.html

This patch makes such disk reads deterministic in icount mode.
It splits the whole request into several parts. Parts may overlap,
but SGs inside one part do not overlap.
Parts that are processed later overwrite the prior ones in case
of overlapping.

Examples for different SG part sequences:

1)
A1 1000
A2 1000
A1 1000
A3 1000
->
One request is split into two.
A1 1000
A2 1000
--
A1 1000
A3 1000

2)
A1 800
A2 1000
A1 1000
->
A1 800
A2 1000
--
A1 1000

Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Message-Id: <159117972206.12193.12939621311413561779.stgit@pasha-ThinkPad-X280>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 7aa1c247b466870b0704d3ccdc3755e5e7394dca
      
https://github.com/qemu/qemu/commit/7aa1c247b466870b0704d3ccdc3755e5e7394dca
  Author: Sergio Lopez <slp@redhat.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/virtio-blk.c
    M include/hw/virtio/virtio-blk.h

  Log Message:
  -----------
  virtio-blk: Refactor the code that processes queued requests

Move the code that processes queued requests from
virtio_blk_dma_restart_bh() to its own, non-static, function. This
will allow us to call it from the virtio_blk_data_plane_start() in a
future patch.

Signed-off-by: Sergio Lopez <slp@redhat.com>
Message-Id: <20200603093240.40489-2-slp@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 49b44549ace7890fffdf027fd3695218ee7f1121
      
https://github.com/qemu/qemu/commit/49b44549ace7890fffdf027fd3695218ee7f1121
  Author: Sergio Lopez <slp@redhat.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/dataplane/virtio-blk.c
    M hw/block/virtio-blk.c
    M include/hw/virtio/virtio-blk.h

  Log Message:
  -----------
  virtio-blk: On restart, process queued requests in the proper context

On restart, we were scheduling a BH to process queued requests, which
would run before starting up the data plane, leading to those requests
being assigned and started on coroutines on the main context.

This could cause requests to be wrongly processed in parallel from
different threads (the main thread and the iothread managing the data
plane), potentially leading to multiple issues.

For example, stopping and resuming a VM multiple times while the guest
is generating I/O on a virtio_blk device can trigger a crash with a
stack tracing looking like this one:

<------>
 Thread 2 (Thread 0x7ff736765700 (LWP 1062503)):
 #0  0x00005567a13b99d6 in iov_memset
     (iov=0x6563617073206f4e, iov_cnt=1717922848, offset=516096, fillc=0, 
bytes=7018105756081554803)
     at util/iov.c:69
 #1  0x00005567a13bab73 in qemu_iovec_memset
     (qiov=0x7ff73ec99748, offset=516096, fillc=0, bytes=7018105756081554803) 
at util/iov.c:530
 #2  0x00005567a12f411c in qemu_laio_process_completion (laiocb=0x7ff6512ee6c0) 
at block/linux-aio.c:86
 #3  0x00005567a12f42ff in qemu_laio_process_completions (s=0x7ff7182e8420) at 
block/linux-aio.c:217
 #4  0x00005567a12f480d in ioq_submit (s=0x7ff7182e8420) at 
block/linux-aio.c:323
 #5  0x00005567a12f43d9 in qemu_laio_process_completions_and_submit 
(s=0x7ff7182e8420)
     at block/linux-aio.c:236
 #6  0x00005567a12f44c2 in qemu_laio_poll_cb (opaque=0x7ff7182e8430) at 
block/linux-aio.c:267
 #7  0x00005567a13aed83 in run_poll_handlers_once (ctx=0x5567a2b58c70, 
timeout=0x7ff7367645f8)
     at util/aio-posix.c:520
 #8  0x00005567a13aee9f in run_poll_handlers (ctx=0x5567a2b58c70, max_ns=16000, 
timeout=0x7ff7367645f8)
     at util/aio-posix.c:562
 #9  0x00005567a13aefde in try_poll_mode (ctx=0x5567a2b58c70, 
timeout=0x7ff7367645f8)
     at util/aio-posix.c:597
 #10 0x00005567a13af115 in aio_poll (ctx=0x5567a2b58c70, blocking=true) at 
util/aio-posix.c:639
 #11 0x00005567a109acca in iothread_run (opaque=0x5567a2b29760) at iothread.c:75
 #12 0x00005567a13b2790 in qemu_thread_start (args=0x5567a2b694c0) at 
util/qemu-thread-posix.c:519
 #13 0x00007ff73eedf2de in start_thread () at /lib64/libpthread.so.0
 #14 0x00007ff73ec10e83 in clone () at /lib64/libc.so.6

 Thread 1 (Thread 0x7ff743986f00 (LWP 1062500)):
 #0  0x00005567a13b99d6 in iov_memset
     (iov=0x6563617073206f4e, iov_cnt=1717922848, offset=516096, fillc=0, 
bytes=7018105756081554803)
     at util/iov.c:69
 #1  0x00005567a13bab73 in qemu_iovec_memset
     (qiov=0x7ff73ec99748, offset=516096, fillc=0, bytes=7018105756081554803) 
at util/iov.c:530
 #2  0x00005567a12f411c in qemu_laio_process_completion (laiocb=0x7ff6512ee6c0) 
at block/linux-aio.c:86
 #3  0x00005567a12f42ff in qemu_laio_process_completions (s=0x7ff7182e8420) at 
block/linux-aio.c:217
 #4  0x00005567a12f480d in ioq_submit (s=0x7ff7182e8420) at 
block/linux-aio.c:323
 #5  0x00005567a12f4a2f in laio_do_submit (fd=19, laiocb=0x7ff5f4ff9ae0, 
offset=472363008, type=2)
     at block/linux-aio.c:375
 #6  0x00005567a12f4af2 in laio_co_submit
     (bs=0x5567a2b8c460, s=0x7ff7182e8420, fd=19, offset=472363008, 
qiov=0x7ff5f4ff9ca0, type=2)
     at block/linux-aio.c:394
 #7  0x00005567a12f1803 in raw_co_prw
     (bs=0x5567a2b8c460, offset=472363008, bytes=20480, qiov=0x7ff5f4ff9ca0, 
type=2)
     at block/file-posix.c:1892
 #8  0x00005567a12f1941 in raw_co_pwritev
     (bs=0x5567a2b8c460, offset=472363008, bytes=20480, qiov=0x7ff5f4ff9ca0, 
flags=0)
     at block/file-posix.c:1925
 #9  0x00005567a12fe3e1 in bdrv_driver_pwritev
     (bs=0x5567a2b8c460, offset=472363008, bytes=20480, qiov=0x7ff5f4ff9ca0, 
qiov_offset=0, flags=0)
     at block/io.c:1183
 #10 0x00005567a1300340 in bdrv_aligned_pwritev
     (child=0x5567a2b5b070, req=0x7ff5f4ff9db0, offset=472363008, bytes=20480, 
align=512, qiov=0x7ff72c0425b8, qiov_offset=0, flags=0) at block/io.c:1980
 #11 0x00005567a1300b29 in bdrv_co_pwritev_part
     (child=0x5567a2b5b070, offset=472363008, bytes=20480, qiov=0x7ff72c0425b8, 
qiov_offset=0, flags=0)
     at block/io.c:2137
 #12 0x00005567a12baba1 in qcow2_co_pwritev_task
     (bs=0x5567a2b92740, file_cluster_offset=472317952, offset=487305216, 
bytes=20480, qiov=0x7ff72c0425b8, qiov_offset=0, l2meta=0x0) at 
block/qcow2.c:2444
 #13 0x00005567a12bacdb in qcow2_co_pwritev_task_entry (task=0x5567a2b48540) at 
block/qcow2.c:2475
 #14 0x00005567a13167d8 in aio_task_co (opaque=0x5567a2b48540) at 
block/aio_task.c:45
 #15 0x00005567a13cf00c in coroutine_trampoline (i0=738245600, i1=32759) at 
util/coroutine-ucontext.c:115
 #16 0x00007ff73eb622e0 in __start_context () at /lib64/libc.so.6
 #17 0x00007ff6626f1350 in  ()
 #18 0x0000000000000000 in  ()
<------>

This is also known to cause crashes with this message (assertion
failed):

 aio_co_schedule: Co-routine was already scheduled in 'aio_co_schedule'

RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1812765
Signed-off-by: Sergio Lopez <slp@redhat.com>
Message-Id: <20200603093240.40489-3-slp@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: e37adbebd19634836369e9572d9aaa0f088332fd
      
https://github.com/qemu/qemu/commit/e37adbebd19634836369e9572d9aaa0f088332fd
  Author: Eric Blake <eblake@redhat.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M Makefile.objs
    M block/Makefile.objs

  Log Message:
  -----------
  block: Refactor subdirectory recursion during make

Rather than listing block/monitor from the top-level Makefile.objs, we
should instead list monitor from block/Makefile.objs.

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Fixes: bb4e58c613
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200608173339.3244211-1-eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: f17d68477030b24a13ecb55d371f57f19199210d
      
https://github.com/qemu/qemu/commit/f17d68477030b24a13ecb55d371f57f19199210d
  Author: Eric Blake <eblake@redhat.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M block/qcow2-bitmap.c

  Log Message:
  -----------
  qcow2: Tweak comments on qcow2_get_persistent_dirty_bitmap_size

For now, we don't have persistent bitmaps in any other formats, but
that might not be true in the future.  Make it obvious that our
incoming parameter is not necessarily a qcow2 image, and therefore is
limited to just the bdrv_dirty_bitmap_* API calls (rather than probing
into qcow2 internals).

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200608190821.3293867-1-eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: f7e8c23f398c82eeba8ac02650f50e9c1747e033
      
https://github.com/qemu/qemu/commit/f7e8c23f398c82eeba8ac02650f50e9c1747e033
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: fix pci doorbell size calculation

The size of the BAR is 0x1000 (main registers) + 8 bytes for each
queue. Currently, the size of the BAR is calculated like so:

    n->reg_size = pow2ceil(0x1004 + 2 * (n->num_queues + 1) * 4);

Since the 'num_queues' parameter already accounts for the admin queue,
this should in any case not need to be incremented by one. Also, the
size should be initialized to (0x1000).

    n->reg_size = pow2ceil(0x1000 + 2 * n->num_queues * 4);

This, with the default value of num_queues (64), we will set aside room
for 1 admin queue and 63 I/O queues (4 bytes per doorbell, 2 doorbells
per queue).

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200609190333.59390-2-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 6f4ee2e9aacf01d8f4bfa5b54caff9aa46b2ff04
      
https://github.com/qemu/qemu/commit/6f4ee2e9aacf01d8f4bfa5b54caff9aa46b2ff04
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c
    M hw/block/trace-events

  Log Message:
  -----------
  hw/block/nvme: rename trace events to pci_nvme

Change the prefix of all nvme device related trace events to 'pci_nvme'
to not clash with trace events from the nvme block driver.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200609190333.59390-3-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 4920786ee69595137cfae1834798e73f15b402d8
      
https://github.com/qemu/qemu/commit/4920786ee69595137cfae1834798e73f15b402d8
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: remove superfluous breaks

These break statements was left over when commit 3036a626e9ef ("nvme:
add Get/Set Feature Timestamp support") was merged.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200609190333.59390-4-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 1065abfbf1f82cb2f4c8666fde9fae1084222cf9
      
https://github.com/qemu/qemu/commit/1065abfbf1f82cb2f4c8666fde9fae1084222cf9
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c
    M hw/block/nvme.h

  Log Message:
  -----------
  hw/block/nvme: move device parameters to separate struct

Move device configuration parameters to separate struct to make it
explicit what is configurable and what is set internally.

Signed-off-by: Klaus Jensen <klaus.jensen@cnexlabs.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20200609190333.59390-5-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 3e829fd438033cdf8646ec22bcc869555b100212
      
https://github.com/qemu/qemu/commit/3e829fd438033cdf8646ec22bcc869555b100212
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c
    M include/block/nvme.h

  Log Message:
  -----------
  hw/block/nvme: use constants in identify

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200609190333.59390-6-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: b4529c5c3af69189b65b22906a35b09a7fe17960
      
https://github.com/qemu/qemu/commit/b4529c5c3af69189b65b22906a35b09a7fe17960
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: refactor nvme_addr_read

Pull the controller memory buffer check to its own function. The check
will be used on its own in later patches.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200609190333.59390-7-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: ca247d35098d396db25233d5f554bd3098949d60
      
https://github.com/qemu/qemu/commit/ca247d35098d396db25233d5f554bd3098949d60
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c
    M hw/block/nvme.h

  Log Message:
  -----------
  hw/block/nvme: fix pin-based interrupt behavior

First, since the device only supports MSI-X or pin-based interrupt, if
MSI-X is not enabled, it should not accept interrupt vectors different
from 0 when creating completion queues.

Secondly, the irq_status NvmeCtrl member is meant to be compared to the
INTMS register, so it should only be 32 bits wide. And it is really only
useful when used with multi-message MSI.

Third, since we do not force a 1-to-1 correspondence between cqid and
interrupt vector, the irq_status register should not have bits set
according to cqid, but according to the associated interrupt vector.

Fix these issues, but keep irq_status available so we can easily support
multi-message MSI down the line.

Fixes: 5e9aa92eb1a5 ("hw/block: Fix pin-based interrupt behaviour of NVMe")
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200609190333.59390-8-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: dce22c864612659793342bb99bd3d7a91f31afd6
      
https://github.com/qemu/qemu/commit/dce22c864612659793342bb99bd3d7a91f31afd6
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c
    M hw/block/nvme.h

  Log Message:
  -----------
  hw/block/nvme: add max_ioqpairs device parameter

The num_queues device paramater has a slightly confusing meaning because
it accounts for the admin queue pair which is not really optional.
Secondly, it is really a maximum value of queues allowed.

Add a new max_ioqpairs parameter that only accounts for I/O queue pairs,
but keep num_queues for compatibility.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200609190333.59390-9-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: e1731e816ad201273ed284fbb9cd51db131fd196
      
https://github.com/qemu/qemu/commit/e1731e816ad201273ed284fbb9cd51db131fd196
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c
    M hw/block/nvme.h

  Log Message:
  -----------
  hw/block/nvme: remove redundant cmbloc/cmbsz members

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200609190333.59390-10-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 54000c66f050ab2aec180e0822c09523057448e7
      
https://github.com/qemu/qemu/commit/54000c66f050ab2aec180e0822c09523057448e7
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: factor out property/constraint checks

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200609190333.59390-11-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: a17f50188bfe0a59e96745a823d309ae2de39f10
      
https://github.com/qemu/qemu/commit/a17f50188bfe0a59e96745a823d309ae2de39f10
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: factor out device state setup

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200609190333.59390-12-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 90f4511543748de94bb34c250deab865f4018128
      
https://github.com/qemu/qemu/commit/90f4511543748de94bb34c250deab865f4018128
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: factor out block backend setup

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200609190333.59390-13-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 3adee1c2d3c443e49fffe995b424932dda577a3a
      
https://github.com/qemu/qemu/commit/3adee1c2d3c443e49fffe995b424932dda577a3a
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c
    M hw/block/nvme.h

  Log Message:
  -----------
  hw/block/nvme: add namespace helpers

Introduce some small helpers to make the next patches easier on the eye.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200609190333.59390-14-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: d634d74229c413dfdf7383bc943b8dcf0e22e9a1
      
https://github.com/qemu/qemu/commit/d634d74229c413dfdf7383bc943b8dcf0e22e9a1
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: factor out namespace setup

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Maxim Levitsky  <mlevitsk@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200609190333.59390-15-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: c3f5526d221c63a3278aefcba1415fa966fad615
      
https://github.com/qemu/qemu/commit/c3f5526d221c63a3278aefcba1415fa966fad615
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: factor out pci setup

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200609190333.59390-16-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 51ec094d4017eb61d8d92b8eb64343b013d9f90f
      
https://github.com/qemu/qemu/commit/51ec094d4017eb61d8d92b8eb64343b013d9f90f
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: factor out cmb setup

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200609190333.59390-17-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 37712e00b1f0ef157a71c0ad211bb4bf47efc9b8
      
https://github.com/qemu/qemu/commit/37712e00b1f0ef157a71c0ad211bb4bf47efc9b8
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: factor out pmr setup

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200609190333.59390-18-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 0c35ad46b6ffec663f94e0ef47b8df856e180f98
      
https://github.com/qemu/qemu/commit/0c35ad46b6ffec663f94e0ef47b8df856e180f98
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: do cmb/pmr init as part of pci init

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200609190333.59390-19-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 945cb8f4c20e01241ede4ab33593d18812a3c1e4
      
https://github.com/qemu/qemu/commit/945cb8f4c20e01241ede4ab33593d18812a3c1e4
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: factor out controller identify setup

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200609190333.59390-20-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: fbf2e5375e33d43c9e1386eed448e1a3c0996e88
      
https://github.com/qemu/qemu/commit/fbf2e5375e33d43c9e1386eed448e1a3c0996e88
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: Verify msix_vector_use() returned value

msix_vector_use() returns -EINVAL on error. Assert it won't.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200609190333.59390-21-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 6a25a4b42e24df515e0e9a6b65683e500c66de73
      
https://github.com/qemu/qemu/commit/6a25a4b42e24df515e0e9a6b65683e500c66de73
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c
    M hw/block/nvme.h

  Log Message:
  -----------
  hw/block/nvme: add msix_qsize parameter

Decouple the requested maximum number of ioqpairs (param max_ioqpairs)
from the number of MSI-X interrupt vectors by introducing a new
msix_qsize parameter and initialize MSI-X with that. This allows
emulating a device that has fewer vectors than I/O queue pairs and also
allows more than 2048 queue pairs. To keep the device behaving as
previously, use a msix_qsize default of 65 (default max_ioqpairs + 1).

This decoupling was actually suggested by Maxim some time ago in a
slightly different context, so adding a Suggested-by.

Suggested-by: Maxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Message-Id: <20200609190333.59390-22-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 1c0c2163aa087c34efc7f84a8bc7e6640e3f6b75
      
https://github.com/qemu/qemu/commit/1c0c2163aa087c34efc7f84a8bc7e6640e3f6b75
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: verify msix_init_exclusive_bar() return value

Pass an Error to msix_init_exclusive_bar() and check it.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Message-Id: <20200609190333.59390-23-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: d54f36ea8c26af32584511533f8884ac7a50bf4a
      
https://github.com/qemu/qemu/commit/d54f36ea8c26af32584511533f8884ac7a50bf4a
  Author: Roman Bolshakov <r.bolshakov@yadro.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  .gitignore: Ignore storage-daemon files

The files are generated.

Fixes: 2af282ec51a ("qemu-storage-daemon: Add --monitor option")
Cc: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
Message-Id: <20200612105830.17082-1-r.bolshakov@yadro.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 6abee2608563599f783bf1305a8322ee7b447815
      
https://github.com/qemu/qemu/commit/6abee2608563599f783bf1305a8322ee7b447815
  Author: Roman Kagan <rvkagan@yandex-team.ru>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/virtio-blk.c

  Log Message:
  -----------
  virtio-blk: store opt_io_size with correct size

The width of opt_io_size in virtio_blk_config is 32bit.  However, it's
written with virtio_stw_p; this may result in value truncation, and on
big-endian systems with legacy virtio in completely bogus readings in
the guest.

Use the appropriate accessor to store it.

Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20200528225516.1676602-2-rvkagan@yandex-team.ru>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: c56ee92fcba8cc922b1b2188ac20614d20223db2
      
https://github.com/qemu/qemu/commit/c56ee92fcba8cc922b1b2188ac20614d20223db2
  Author: Roman Kagan <rvkagan@yandex-team.ru>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/block.c
    M hw/block/fdc.c
    M hw/block/nvme.c
    M hw/block/swim.c
    M hw/block/virtio-blk.c
    M hw/block/xen-block.c
    M hw/ide/qdev.c
    M hw/scsi/scsi-disk.c
    M hw/usb/dev-storage.c
    M include/hw/block/block.h
    M tests/qemu-iotests/172.out

  Log Message:
  -----------
  block: consolidate blocksize properties consistency checks

Several block device properties related to blocksize configuration must
be in certain relationship WRT each other: physical block must be no
smaller than logical block; min_io_size, opt_io_size, and
discard_granularity must be a multiple of a logical block.

To ensure these requirements are met, add corresponding consistency
checks to blkconf_blocksizes, adjusting its signature to communicate
possible error to the caller.  Also remove the now redundant consistency
checks from the specific devices.

Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paul Durrant <paul@xen.org>
Message-Id: <20200528225516.1676602-3-rvkagan@yandex-team.ru>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: a345c5523607a0a4549990cce1be096b63df9668
      
https://github.com/qemu/qemu/commit/a345c5523607a0a4549990cce1be096b63df9668
  Author: Roman Kagan <rvkagan@yandex-team.ru>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/core/qdev-properties.c

  Log Message:
  -----------
  qdev-properties: blocksize: use same limits in code and description

Make it easier (more visible) to maintain the limits on the blocksize
properties in sync with the respective description, by using macros both
in the code and in the description.

Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200528225516.1676602-4-rvkagan@yandex-team.ru>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 914e74cda9a54ac860000aa18882dc40d3c8180b
      
https://github.com/qemu/qemu/commit/914e74cda9a54ac860000aa18882dc40d3c8180b
  Author: Roman Kagan <rvkagan@yandex-team.ru>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/core/qdev-properties.c
    M include/hw/qdev-properties.h

  Log Message:
  -----------
  qdev-properties: add size32 property type

Introduce size32 property type which handles size suffixes (k, m, g)
just like size property, but is uint32_t rather than uint64_t.  It's
going to be useful for properties that are byte sizes but are inherently
32bit, like BlkConf.opt_io_size or .discard_granularity (they are
switched to this new property type in a followup commit).

The getter for size32 is left out for a separate patch as its benefit is
less obvious, and it affects test output; for now the regular uint32
getter is used.

Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru>
Message-Id: <20200528225516.1676602-5-rvkagan@yandex-team.ru>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 645b55d1c2bf35ce6344f1f472fa30e327cafce0
      
https://github.com/qemu/qemu/commit/645b55d1c2bf35ce6344f1f472fa30e327cafce0
  Author: Roman Kagan <rvkagan@yandex-team.ru>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/core/qdev-properties.c

  Log Message:
  -----------
  qdev-properties: make blocksize accept size suffixes

It appears convenient to be able to specify physical_block_size and
logical_block_size using common size suffixes.

Teach the blocksize property setter to interpret them.  Also express the
upper and lower limits in the respective units.

Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200528225516.1676602-6-rvkagan@yandex-team.ru>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 4f44bbc5bba0858d34b1aa356397847696276546
      
https://github.com/qemu/qemu/commit/4f44bbc5bba0858d34b1aa356397847696276546
  Author: Roman Kagan <rvkagan@yandex-team.ru>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/block/block.c
    M hw/core/qdev-properties.c
    M include/hw/block/block.h
    M include/hw/qdev-properties.h

  Log Message:
  -----------
  block: make BlockConf size props 32bit and accept size suffixes

Convert all size-related properties in BlockConf to 32bit.  This will
accommodate bigger block sizes (in a followup patch).  This also allows
to make them all accept size suffixes, either via DEFINE_PROP_BLOCKSIZE
or via DEFINE_PROP_SIZE32.

Also, since min_io_size is exposed to the guest by scsi and virtio-blk
devices as an uint16_t in units of logical blocks, introduce an
additional check in blkconf_blocksizes to prevent its silent truncation.

Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru>
Message-Id: <20200528225516.1676602-7-rvkagan@yandex-team.ru>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 031ffd9a612618e86eb1d783b285d658e95f117d
      
https://github.com/qemu/qemu/commit/031ffd9a612618e86eb1d783b285d658e95f117d
  Author: Roman Kagan <rvkagan@yandex-team.ru>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/core/qdev-properties.c
    M tests/qemu-iotests/172.out

  Log Message:
  -----------
  qdev-properties: add getter for size32 and blocksize

Add getter for size32, and use it for blocksize, too.

In its human-readable branch, it reports approximate size in
human-readable units next to the exact byte value, like the getter for
64bit size does.

Adjust the expected test output accordingly.

Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200528225516.1676602-8-rvkagan@yandex-team.ru>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 6510ba1c0ebd1503097ac831956505adf5ec29d2
      
https://github.com/qemu/qemu/commit/6510ba1c0ebd1503097ac831956505adf5ec29d2
  Author: Roman Kagan <rvkagan@yandex-team.ru>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M hw/core/qdev-properties.c

  Log Message:
  -----------
  block: lift blocksize property limit to 2 MiB

Logical and physical block sizes in QEMU are limited to 32 KiB.

This appears unnecessarily tight, and we've seen bigger block sizes
handy at times.

Lift the limitation up to 2 MiB which appears to be good enough for
everybody, and matches the qcow2 cluster size limit.

Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200528225516.1676602-9-rvkagan@yandex-team.ru>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: ff3caf5af0fd204133668f26fde39b27f86c5d76
      
https://github.com/qemu/qemu/commit/ff3caf5af0fd204133668f26fde39b27f86c5d76
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/118
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  iotests.py: Add skip_for_formats() decorator

Sometimes, we want to skip some test methods for certain formats.  This
decorator allows that.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200617104822.27525-2-mreitz@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: c7070942c78741a7040655f94ed011c09aa832cf
      
https://github.com/qemu/qemu/commit/c7070942c78741a7040655f94ed011c09aa832cf
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/041

  Log Message:
  -----------
  iotests/041: Skip test_small_target for qed

qed does not support shrinking images, so the test_small_target method
should be skipped to keep 041 passing.

Fixes: 16cea4ee1c8e5a69a058e76f426b2e17974d8d7d
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200617104822.27525-3-mreitz@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: e6de31bcad4079d055036b75b0a4715de6140f15
      
https://github.com/qemu/qemu/commit/e6de31bcad4079d055036b75b0a4715de6140f15
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/292

  Log Message:
  -----------
  iotests/292: data_file is unsupported

Fixes: e4d7019e1a81c61de6a925c3ac5bb6e62ea21b29
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200617104822.27525-4-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 73b2b7b5cab2d06cf810d7f8c7c4cc918db30e04
      
https://github.com/qemu/qemu/commit/73b2b7b5cab2d06cf810d7f8c7c4cc918db30e04
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/229

  Log Message:
  -----------
  iotests/229: data_file is unsupported

Fixes: d89ac3cf305b28c024a76805a84d75c0ee1e786f
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200617104822.27525-5-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 2e3becf9d7ca8d07e3587aacd5431e0b5945896e
      
https://github.com/qemu/qemu/commit/2e3becf9d7ca8d07e3587aacd5431e0b5945896e
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/190
    M tests/qemu-iotests/291

  Log Message:
  -----------
  iotests/{190,291}: compat=0.10 is unsupported

Fixes: 5d72c68b49769c927e90b78af6d90f6a384b26ac
Fixes: cf2d1203dcfc2bf964453d83a2302231ce77f2dc
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200617104822.27525-6-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 3419ec713f04c323b030e0763459435335b25476
      
https://github.com/qemu/qemu/commit/3419ec713f04c323b030e0763459435335b25476
  Author: Eric Blake <eblake@redhat.com>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/qcow2.py
    M tests/qemu-iotests/qcow2_format.py

  Log Message:
  -----------
  iotests: Add copyright line in qcow2.py

The file qcow2.py was originally contributed in 2012 by Kevin Wolf,
but was not given traditional boilerplate headers at the time.  The
missing license was just rectified (commit 16306a7b39) using the
project-default GPLv2+, but as Vladimir is not at Red Hat, he did not
add a Copyright line.  All earlier contributions have come from CC'd
authors, where all but Stefan used a Red Hat address at the time of
the contribution, and that copyright carries over to the split to
qcow2_format.py (d5262c7124).

CC: Kevin Wolf <kwolf@redhat.com>
CC: Stefan Hajnoczi <stefanha@redhat.com>
CC: Eduardo Habkost <ehabkost@redhat.com>
CC: Max Reitz <mreitz@redhat.com>
CC: Philippe Mathieu-Daudé <philmd@redhat.com>
CC: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200609205944.3549240-1-eblake@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 3b268766ecb7b630938e9bfb89b106a9dd8d94ae
      
https://github.com/qemu/qemu/commit/3b268766ecb7b630938e9bfb89b106a9dd8d94ae
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-06-18 (Thu, 18 Jun 2020)

  Changed paths:
    M .gitignore
    M Makefile.objs
    M block/Makefile.objs
    M block/qcow2-bitmap.c
    M dma-helpers.c
    M hw/block/block.c
    M hw/block/dataplane/virtio-blk.c
    M hw/block/fdc.c
    M hw/block/nvme.c
    M hw/block/nvme.h
    M hw/block/swim.c
    M hw/block/trace-events
    M hw/block/virtio-blk.c
    M hw/block/xen-block.c
    M hw/core/qdev-properties.c
    M hw/ide/ahci.c
    M hw/ide/core.c
    M hw/ide/macio.c
    M hw/ide/pci.c
    M hw/ide/qdev.c
    M hw/scsi/scsi-disk.c
    M hw/usb/dev-storage.c
    M include/block/nvme.h
    M include/hw/block/block.h
    M include/hw/ide/internal.h
    M include/hw/qdev-properties.h
    M include/hw/virtio/virtio-blk.h
    M tests/qemu-iotests/041
    M tests/qemu-iotests/118
    M tests/qemu-iotests/172.out
    M tests/qemu-iotests/190
    M tests/qemu-iotests/229
    M tests/qemu-iotests/291
    M tests/qemu-iotests/292
    M tests/qemu-iotests/iotests.py
    M tests/qemu-iotests/qcow2.py
    M tests/qemu-iotests/qcow2_format.py

  Log Message:
  -----------
  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: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/3f429a340082...3b268766ecb7



reply via email to

[Prev in Thread] Current Thread [Next in Thread]