From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56521) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W4ADB-00064L-0l for qemu-devel@nongnu.org; Fri, 17 Jan 2014 09:15:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W4AD1-0005uc-QM for qemu-devel@nongnu.org; Fri, 17 Jan 2014 09:15:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60373) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W4AD1-0005uR-ID for qemu-devel@nongnu.org; Fri, 17 Jan 2014 09:15:43 -0500 From: Kevin Wolf Date: Fri, 17 Jan 2014 15:14:52 +0100 Message-Id: <1389968119-24771-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1389968119-24771-1-git-send-email-kwolf@redhat.com> References: <1389968119-24771-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH v3 02/29] block: Inherit opt_transfer_length List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pl@kamp.de, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, xiawenc@linux.vnet.ibm.com When there is a format driver between the backend, it's not guaranteed that exposing the opt_transfer_length for the format driver results in the optimal requests (because of fragmentation etc.), but it can't make things worse, so let's just do it. Signed-off-by: Kevin Wolf Reviewed-by: Wenchao Xia Reviewed-by: Max Reitz --- block.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index 99e69da..20f85cb 100644 --- a/block.c +++ b/block.c @@ -485,7 +485,25 @@ static int bdrv_refresh_limits(BlockDriverState *bs) memset(&bs->bl, 0, sizeof(bs->bl)); - if (drv && drv->bdrv_refresh_limits) { + if (!drv) { + return 0; + } + + /* Take some limits from the children as a default */ + if (bs->file) { + bdrv_refresh_limits(bs->file); + bs->bl.opt_transfer_length = bs->file->bl.opt_transfer_length; + } + + if (bs->backing_hd) { + bdrv_refresh_limits(bs->backing_hd); + bs->bl.opt_transfer_length = + MAX(bs->bl.opt_transfer_length, + bs->backing_hd->bl.opt_transfer_length); + } + + /* Then let the driver override it */ + if (drv->bdrv_refresh_limits) { return drv->bdrv_refresh_limits(bs); } -- 1.8.1.4