The following changes since commit 0280396a33c7210c4df5306afeab63411a41535a:

Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-gdbstub-150221-1' into staging (2021-02-15 10:13:13 +0000)

for you to fetch changes up to b248e61652e20c3353af4b0ccb90f17d76f4db21:

monitor/qmp: Stop processing requests when shutdown is requested (2021-02-15 15:10:14 +0100)

- qemu-storage-daemon: Enable object-add

- blockjob: Fix crash with IOthread when block commit after snapshot

- monitor: Shutdown fixes

- xen-block: fix reporting of discard feature

- qcow2: Remove half-initialised image file after failed image creation

- ahci: Fix DMA direction

- iotests fixes

Alexander Bulekov (1):

hw/ide/ahci: map cmd_fis as DMA_DIRECTION_TO_DEVICE

Kevin Wolf (3):

qemu-storage-daemon: Enable object-add

monitor: Fix assertion failure on shutdown

monitor/qmp: Stop processing requests when shutdown is requested

Max Reitz (1):

iotests: Consistent $IMGOPTS boundary matching

Maxim Levitsky (3):

crypto: luks: Fix tiny memory leak

block: add bdrv_co_delete_file_noerr

block: qcow2: remove the created file on initialization error

Michael Qiu (1):

blockjob: Fix crash with IOthread when block commit after snapshot

Roger Pau Monné (1):

xen-block: fix reporting of discard feature

Thomas Huth (1):

tests/qemu-iotests: Remove test 259 from the "auto" group

include/block/block.h | 1 +

block.c | 22 ++++++++++++++++++++++

block/crypto.c | 13 ++-----------

block/qcow2.c | 8 +++++---

blockjob.c | 8 ++++++--

hw/block/xen-block.c | 1 +

hw/ide/ahci.c | 12 ++++++------

monitor/monitor.c | 25 +++++++++++++++----------

monitor/qmp.c | 5 +++++

storage-daemon/qemu-storage-daemon.c | 2 ++

tests/qemu-iotests/259 | 2 +-

tests/qemu-iotests/common.rc | 4 +++-

12 files changed, 69 insertions(+), 34 deletions(-)

As we don't have a fully QAPIfied version of object-add yet and it still

has 'gen': false in the schema, it needs to be registered explicitly in

init_qmp_commands() to be available for users.

Fixes: 2af282ec51a27116d0402cab237b8970800f870c

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Message-Id: <20210204072137.19663-1-kwolf@redhat.com>

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

storage-daemon/qemu-storage-daemon.c | 2 ++

1 file changed, 2 insertions(+)

diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c

--- a/storage-daemon/qemu-storage-daemon.c

+++ b/storage-daemon/qemu-storage-daemon.c

@@ -XXX,XX +XXX,XX @@ static void init_qmp_commands(void)

qmp_init_marshal(&qmp_commands);

qmp_register_command(&qmp_commands, "query-qmp-schema",

qmp_query_qmp_schema, QCO_ALLOW_PRECONFIG);

+ qmp_register_command(&qmp_commands, "object-add", qmp_object_add,

+ QCO_NO_OPTIONS);

QTAILQ_INIT(&qmp_cap_negotiation_commands);

qmp_register_command(&qmp_cap_negotiation_commands, "qmp_capabilities",

2.29.2

From: Max Reitz <mreitz@redhat.com>

To disallow certain refcount_bits values, some _unsupported_imgopts

invocations look like "refcount_bits=1[^0-9]", i.e. they match an

integer boundary with [^0-9]. This expression does not match the end of

the string, though, so it breaks down when refcount_bits is the last

option (which it tends to be after the rewrite of the check script in

Python).

Those invocations could use \b or \> instead, but those are not

portable. They could use something like \([^0-9]\|$\), but that would

be cumbersome. To make it simple and keep the existing invocations

working, just let _unsupported_imgopts match the regex against $IMGOPTS

plus a trailing space.

Signed-off-by: Max Reitz <mreitz@redhat.com>

Message-Id: <20210210095128.22732-1-mreitz@redhat.com>

tests/qemu-iotests/common.rc | 4 +++-

1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc

--- a/tests/qemu-iotests/common.rc

+++ b/tests/qemu-iotests/common.rc

@@ -XXX,XX +XXX,XX @@ _unsupported_imgopts()

{

for bad_opt

do

- if echo "$IMGOPTS" | grep -q 2>/dev/null "$bad_opt"

+ # Add a space so tests can match for whitespace that marks the

+ # end of an option (\b or \> are not portable)

+ if echo "$IMGOPTS " | grep -q 2>/dev/null "$bad_opt"

then

_notrun "not suitable for image option: $bad_opt"

fi

2.29.2

From: Michael Qiu <qiudayu@huayun.com>

Currently, if guest has workloads, IO thread will acquire aio_context

lock before do io_submit, it leads to segmentfault when do block commit

after snapshot. Just like below:

blockjob.c | 8 ++++++--

1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/blockjob.c b/blockjob.c

--- a/blockjob.c

+++ b/blockjob.c

@@ -XXX,XX +XXX,XX @@ int block_job_add_bdrv(BlockJob *job, const char *name, BlockDriverState *bs,

uint64_t perm, uint64_t shared_perm, Error **errp)

{

BdrvChild *c;

+ bool need_context_ops;

bdrv_ref(bs);

- if (job->job.aio_context != qemu_get_aio_context()) {

+ need_context_ops = bdrv_get_aio_context(bs) != job->job.aio_context;

+ if (need_context_ops && job->job.aio_context != qemu_get_aio_context()) {

aio_context_release(job->job.aio_context);

c = bdrv_root_attach_child(bs, name, &child_job, 0,

job->job.aio_context, perm, shared_perm, job,

errp);

- if (job->job.aio_context != qemu_get_aio_context()) {

+ if (need_context_ops && job->job.aio_context != qemu_get_aio_context()) {

aio_context_acquire(job->job.aio_context);

}

if (c == NULL) {

2.29.2

From: Alexander Bulekov <alxndr@bu.edu>

cmd_fis is mapped as DMA_DIRECTION_FROM_DEVICE, however, it is read

from, and not written to anywhere. Fix the DMA_DIRECTION and mark

cmd_fis as read-only in the code.

Signed-off-by: Alexander Bulekov <alxndr@bu.edu>

Message-Id: <20210119164051.89268-1-alxndr@bu.edu>

hw/ide/ahci.c | 12 ++++++------

1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c

--- a/hw/ide/ahci.c

+++ b/hw/ide/ahci.c

@@ -XXX,XX +XXX,XX @@ static void ahci_reset_port(AHCIState *s, int port)

/* Buffer pretty output based on a raw FIS structure. */

-static char *ahci_pretty_buffer_fis(uint8_t *fis, int cmd_len)

+static char *ahci_pretty_buffer_fis(const uint8_t *fis, int cmd_len)

int i;

GString *s = g_string_new("FIS:");

@@ -XXX,XX +XXX,XX @@ static void execute_ncq_command(NCQTransferState *ncq_tfs)

}

-static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis,

+static void process_ncq_command(AHCIState *s, int port, const uint8_t *cmd_fis,

uint8_t slot)

{

AHCIDevice *ad = &s->dev[port];

- NCQFrame *ncq_fis = (NCQFrame*)cmd_fis;

+ const NCQFrame *ncq_fis = (NCQFrame *)cmd_fis;

uint8_t tag = ncq_fis->tag >> 3;

NCQTransferState *ncq_tfs = &ad->ncq_tfs[tag];

size_t size;

@@ -XXX,XX +XXX,XX @@ static AHCICmdHdr *get_cmd_header(AHCIState *s, uint8_t port, uint8_t slot)

}

static void handle_reg_h2d_fis(AHCIState *s, int port,

- uint8_t slot, uint8_t *cmd_fis)

+ uint8_t slot, const uint8_t *cmd_fis)

{

IDEState *ide_state = &s->dev[port].port.ifs[0];

AHCICmdHdr *cmd = get_cmd_header(s, port, slot);

@@ -XXX,XX +XXX,XX @@ static int handle_cmd(AHCIState *s, int port, uint8_t slot)

tbl_addr = le64_to_cpu(cmd->tbl_addr);

cmd_len = 0x80;

cmd_fis = dma_memory_map(s->as, tbl_addr, &cmd_len,

- DMA_DIRECTION_FROM_DEVICE);

+ DMA_DIRECTION_TO_DEVICE);

if (!cmd_fis) {

trace_handle_cmd_badfis(s, port);

return -1;

@@ -XXX,XX +XXX,XX @@ static int handle_cmd(AHCIState *s, int port, uint8_t slot)

- dma_memory_unmap(s->as, cmd_fis, cmd_len, DMA_DIRECTION_FROM_DEVICE,

+ dma_memory_unmap(s->as, cmd_fis, cmd_len, DMA_DIRECTION_TO_DEVICE,

cmd_len);

if (s->dev[port].port.ifs[0].status & (BUSY_STAT|DRQ_STAT)) {

2.29.2

From: Roger Pau Monne <roger.pau@citrix.com>

Linux blkfront expects both "discard-granularity" and

"discard-alignment" present on xenbus in order to properly enable the

feature, not exposing "discard-alignment" left some Linux blkfront

versions with a broken discard setup. This has also been addressed in

Linux with:

https://lore.kernel.org/lkml/20210118151528.81668-1-roger.pau@citrix.com/T/#u

Fix QEMU to report a "discard-alignment" of 0, in order for it to work

with older Linux frontends.

Reported-by: Arthur Borsboom <arthurborsboom@gmail.com>

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>

Message-Id: <20210118153330.82324-1-roger.pau@citrix.com>

Reviewed-by: Paul Durrant <paul@xen.org>

hw/block/xen-block.c | 1 +

1 file changed, 1 insertion(+)

diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c

--- a/hw/block/xen-block.c

+++ b/hw/block/xen-block.c

@@ -XXX,XX +XXX,XX @@ static void xen_block_realize(XenDevice *xendev, Error **errp)

xen_device_backend_printf(xendev, "feature-discard", "%u", 1);

xen_device_backend_printf(xendev, "discard-granularity", "%u",

conf->discard_granularity);

+ xen_device_backend_printf(xendev, "discard-alignment", "%u", 0);

xen_device_backend_printf(xendev, "feature-flush-cache", "%u", 1);