From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vkzl7-0002Vt-CK for qemu-devel@nongnu.org; Mon, 25 Nov 2013 12:15:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vkzky-0000Bw-Op for qemu-devel@nongnu.org; Mon, 25 Nov 2013 12:15:41 -0500 Received: from mail-qe0-x233.google.com ([2607:f8b0:400d:c02::233]:62243) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vkzky-0000Bs-Jv for qemu-devel@nongnu.org; Mon, 25 Nov 2013 12:15:32 -0500 Received: by mail-qe0-f51.google.com with SMTP id 1so2024604qee.38 for ; Mon, 25 Nov 2013 09:15:32 -0800 (PST) Sender: Paolo Bonzini Message-ID: <529385AF.5000309@redhat.com> Date: Mon, 25 Nov 2013 18:15:27 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1385097894-1380-1-git-send-email-famz@redhat.com> <1385097894-1380-5-git-send-email-famz@redhat.com> In-Reply-To: <1385097894-1380-5-git-send-email-famz@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 4/7] block: Add checks of blocker in block operations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: kwolf@redhat.com, hbrock@redhat.com, qemu-devel@nongnu.org, rjones@redhat.com, imain@redhat.com, stefanha@redhat.com Il 22/11/2013 06:24, Fam Zheng ha scritto: > Before operate on a BlockDriverState, respective types are checked > against bs->op_blockers and it will error out if there's a blocker. How did you choose them? I understand blocking change (and eject?), but not blocking set-io-throttle. In particular, this means that old in_use users, which did not block commands such as nbd-server-add, will now block it. Paolo > Signed-off-by: Fam Zheng > --- > blockdev-nbd.c | 4 ++++ > blockdev.c | 25 +++++++++++++++++++++++++ > 2 files changed, 29 insertions(+) > > diff --git a/blockdev-nbd.c b/blockdev-nbd.c > index 922cf56..c49feae 100644 > --- a/blockdev-nbd.c > +++ b/blockdev-nbd.c > @@ -92,6 +92,10 @@ void qmp_nbd_server_add(const char *device, bool has_writable, bool writable, > return; > } > > + if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_NBD_SERVER_ADD, errp)) { > + return; > + } > + > if (!has_writable) { > writable = false; > } > diff --git a/blockdev.c b/blockdev.c > index eb55b74..1921d27 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -1001,6 +1001,11 @@ SnapshotInfo *qmp_blockdev_snapshot_delete_internal_sync(const char *device, > return NULL; > } > > + if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_INTERNAL_SNAPSHOT_DELETE, > + errp)) { > + return NULL; > + } > + > ret = bdrv_snapshot_find_by_id_and_name(bs, id, name, &sn, &local_err); > if (error_is_set(&local_err)) { > error_propagate(errp, local_err); > @@ -1098,6 +1103,10 @@ static void internal_snapshot_prepare(BlkTransactionState *common, > return; > } > > + if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_INTERNAL_SNAPSHOT, errp)) { > + return; > + } > + > if (!bdrv_is_inserted(bs)) { > error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, device); > return; > @@ -1485,6 +1494,10 @@ void qmp_block_passwd(const char *device, const char *password, Error **errp) > return; > } > > + if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_PASSWD, errp)) { > + return; > + } > + > err = bdrv_set_key(bs, password); > if (err == -EINVAL) { > error_set(errp, QERR_DEVICE_NOT_ENCRYPTED, bdrv_get_device_name(bs)); > @@ -1536,6 +1549,10 @@ void qmp_change_blockdev(const char *device, const char *filename, > return; > } > > + if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_CHANGE, errp)) { > + return; > + } > + > if (format) { > drv = bdrv_find_whitelisted_format(format, bs->read_only); > if (!drv) { > @@ -1586,6 +1603,10 @@ void qmp_block_set_io_throttle(const char *device, int64_t bps, int64_t bps_rd, > return; > } > > + if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_SET_IO_THROTTLE, errp)) { > + return; > + } > + > memset(&cfg, 0, sizeof(cfg)); > cfg.buckets[THROTTLE_BPS_TOTAL].avg = bps; > cfg.buckets[THROTTLE_BPS_READ].avg = bps_rd; > @@ -1684,6 +1705,10 @@ void qmp_block_resize(const char *device, int64_t size, Error **errp) > return; > } > > + if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_RESIZE, errp)) { > + return; > + } > + > if (size < 0) { > error_set(errp, QERR_INVALID_PARAMETER_VALUE, "size", "a >0 size"); > return; >