From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57210) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYgL4-0000da-Mu for qemu-devel@nongnu.org; Thu, 19 Mar 2015 15:42:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYgKz-0001zn-Ii for qemu-devel@nongnu.org; Thu, 19 Mar 2015 15:42:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47625) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYgKz-0001zi-C6 for qemu-devel@nongnu.org; Thu, 19 Mar 2015 15:42:37 -0400 Message-ID: <550B26AB.4050806@redhat.com> Date: Thu, 19 Mar 2015 15:42:35 -0400 From: Max Reitz MIME-Version: 1.0 References: <9d3f0e0ee6fcfc6300e165f79b46a4af0ffdc37d.1426779661.git.berto@igalia.com> In-Reply-To: <9d3f0e0ee6fcfc6300e165f79b46a4af0ffdc37d.1426779661.git.berto@igalia.com> Content-Type: text/plain; charset=iso-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 3/3] block: allow BLOCK_IMAGE_CORRUPTED to have a node name List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alberto Garcia , qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi On 2015-03-19 at 11:43, Alberto Garcia wrote: > Since this event can occur in nodes that don't have a device name > associated, use the node name as fallback in those cases. > > Signed-off-by: Alberto Garcia > --- > block/qcow2.c | 5 +++-- > docs/qmp/qmp-events.txt | 2 +- > qapi/block-core.json | 2 +- > 3 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/block/qcow2.c b/block/qcow2.c > index 168006b..d808c70 100644 > --- a/block/qcow2.c > +++ b/block/qcow2.c > @@ -2832,8 +2832,9 @@ void qcow2_signal_corruption(BlockDriverState *bs, bool fatal, int64_t offset, > "corruption events will be suppressed\n", message); > } > > - qapi_event_send_block_image_corrupted(bdrv_get_device_name(bs), message, > - offset >= 0, offset, size >= 0, size, > + qapi_event_send_block_image_corrupted(bdrv_get_device_or_node_name(bs), > + message, offset >= 0, offset, > + size >= 0, size, > fatal, &error_abort); > g_free(message); > > diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt > index d759d19..75f3e68 100644 > --- a/docs/qmp/qmp-events.txt > +++ b/docs/qmp/qmp-events.txt > @@ -35,7 +35,7 @@ Emitted when a disk image is being marked corrupt. > > Data: > > -- "device": Device name (json-string) > +- "device": Device name, or node name if not present (json-string) > - "msg": Informative message (e.g., reason for the corruption) (json-string) > - "offset": If the corruption resulted from an image access, this is the access > offset into the image (json-int) > diff --git a/qapi/block-core.json b/qapi/block-core.json > index 42c8850..3b51c68 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -1751,7 +1751,7 @@ > # > # Emitted when a corruption has been detected in a disk image > # > -# @device: device name > +# @device: device name, or node name if not present > # > # @msg: informative message for human consumption, such as the kind of > # corruption being detected. It should not be parsed by machine as it is Basically the same as my reply to patch 2, but here it's a formal question as well: Normally, if a field in QMP is designed @device, it contains a device name. We do have combined device/node name fields, though (as of John's incremental backup series, at least), but those are named @node (which I proposed for patch 2, too). But renaming the field here will lead to breaking backwards compatibility. I think just adding a @node-name field and keeping @device as it is should be good enough here. Max