From patchwork Thu Aug 29 14:00:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 270840 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B3A822C0089 for ; Fri, 30 Aug 2013 00:06:54 +1000 (EST) Received: from localhost ([::1]:43589 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VF2s8-0005uh-Q6 for incoming@patchwork.ozlabs.org; Thu, 29 Aug 2013 10:06:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VF2mr-0007W8-I1 for qemu-devel@nongnu.org; Thu, 29 Aug 2013 10:01:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VF2mi-0008E8-Sl for qemu-devel@nongnu.org; Thu, 29 Aug 2013 10:01:25 -0400 Received: from mail-ea0-x22b.google.com ([2a00:1450:4013:c01::22b]:55690) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VF2mi-0008E3-Mt for qemu-devel@nongnu.org; Thu, 29 Aug 2013 10:01:16 -0400 Received: by mail-ea0-f171.google.com with SMTP id n15so265123ead.30 for ; Thu, 29 Aug 2013 07:01:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=w3DKNLTz8w65X8tGPBM9GLhSrSwkgridsT15Fnd25Mo=; b=pu7ukj190i8E6dxHVHRZgQG1+WH+YcVBofFz232S2QyZ/Ss/p2RzzDCTKTSB9OsX4U dS6zgD+GmIKu+QTh3i9MnBr91tEc7jwXA2CyRLem1NJk7aSw3SYYx4pzuR/pzpmJnp/C 6K+OplFjZwo3FaNr/GZhqhI8/8qpTgLuwn6g0UfKGHxI9s3BtdjUx+a2b99p1EDCYnzG CKeo7Shhf8PGJlsnItyVO5e7NtpqEQzW4Nl3QJ1Z4AVqMNUPDkx0x0OUK9niFpeEXxWF +YjTs0FsRRp8dXMNMP3EguvXTJGRZhGQg+Nf0WvhDz47I2EUKwH1FrJugDyzm3iFpTDQ fxrQ== X-Received: by 10.15.83.2 with SMTP id b2mr4682755eez.28.1377784875846; Thu, 29 Aug 2013 07:01:15 -0700 (PDT) Received: from yakj.usersys.redhat.com (nat-pool-mxp-t.redhat.com. [209.132.186.18]) by mx.google.com with ESMTPSA id p5sm46359028eeg.5.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 29 Aug 2013 07:01:14 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 29 Aug 2013 16:00:20 +0200 Message-Id: <1377784821-29561-21-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1377784821-29561-1-git-send-email-pbonzini@redhat.com> References: <1377784821-29561-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::22b Cc: kwolf@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v4 20/21] block: add default get_block_status implementation for protocols X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Protocols return raw data, so you can assume the offsets to pass through unchanged. Reviewed-by: Eric Blake Signed-off-by: Paolo Bonzini --- block.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index cf52489..9299605 100644 --- a/block.c +++ b/block.c @@ -3020,7 +3020,11 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs, if (!bs->drv->bdrv_co_get_block_status) { *pnum = nb_sectors; - return BDRV_BLOCK_DATA; + ret = BDRV_BLOCK_DATA; + if (bs->drv->protocol_name) { + ret |= BDRV_BLOCK_OFFSET_VALID | (sector_num * BDRV_SECTOR_SIZE); + } + return ret; } ret = bs->drv->bdrv_co_get_block_status(bs, sector_num, nb_sectors, pnum);