From patchwork Thu Jan 26 17:22:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 137995 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DE5C1B6EFE for ; Fri, 27 Jan 2012 04:24:38 +1100 (EST) Received: from localhost ([::1]:49199 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqT3q-0006oB-Ti for incoming@patchwork.ozlabs.org; Thu, 26 Jan 2012 12:24:34 -0500 Received: from eggs.gnu.org ([140.186.70.92]:52547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqT2n-0004Li-Sk for qemu-devel@nongnu.org; Thu, 26 Jan 2012 12:23:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RqT2h-0003Of-S7 for qemu-devel@nongnu.org; Thu, 26 Jan 2012 12:23:29 -0500 Received: from mail-gx0-f173.google.com ([209.85.161.173]:59379) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqT2h-0003Mz-JL for qemu-devel@nongnu.org; Thu, 26 Jan 2012 12:23:23 -0500 Received: by mail-gx0-f173.google.com with SMTP id h1so470472ggn.4 for ; Thu, 26 Jan 2012 09:23:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=yGVqoaFhgQ5U84P3RB4wi4NGpRfin+JU28KQQyludJs=; b=srRVe9ezBnBwOeO/r+FQEH6UFBQM49P2hVsmJ5FZrt8k3b24bzITfduw9etXMGAP9C sxfw+ymw5L0MDr0/IQPoCU48SOylwqQ/pky8SDt/a3tRJxxjSZnwPMRgSBYBKUPx/Mfd 40EnLv9AX1Gg4b/+E15d2Fbaz1DaySSWf9hZg= Received: by 10.50.6.137 with SMTP id b9mr3099524iga.16.1327598603290; Thu, 26 Jan 2012 09:23:23 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-182-16.ip50.fastwebnet.it. [93.34.182.16]) by mx.google.com with ESMTPS id ak10sm2142476igc.6.2012.01.26.09.23.21 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jan 2012 09:23:22 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 26 Jan 2012 18:22:40 +0100 Message-Id: <1327598569-5199-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1327598569-5199-1-git-send-email-pbonzini@redhat.com> References: <1327598569-5199-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.161.173 Cc: kwolf@redhat.com Subject: [Qemu-devel] [PATCH v2 09/18] block: add host_block_size 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 Signed-off-by: Paolo Bonzini --- block.c | 4 +++- block_int.h | 3 +++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/block.c b/block.c index 2e1ebeb..af41fb3 100644 --- a/block.c +++ b/block.c @@ -591,6 +591,7 @@ static int bdrv_open_common(BlockDriverState *bs, const char *filename, bs->sg = 0; bs->growable = 0; bs->guest_block_size = 512; + bs->host_block_size = 512; assert(bs->copy_on_read == 0); /* bdrv_new() and bdrv_close() make it so */ if ((flags & BDRV_O_RDWR) && (flags & BDRV_O_COPY_ON_READ)) { @@ -616,6 +617,7 @@ static int bdrv_open_common(BlockDriverState *bs, const char *filename, ret = bdrv_file_open(&bs->file, filename, bs->open_flags); if (ret >= 0) { bs->open_flags = bs->file->open_flags; + bs->host_block_size = bs->file->host_block_size; ret = drv->bdrv_open(bs, bs->open_flags); } } @@ -3611,7 +3613,7 @@ void bdrv_set_guest_block_size(BlockDriverState *bs, int align) void *qemu_blockalign(BlockDriverState *bs, size_t size) { - return qemu_memalign((bs && bs->guest_block_size) ? bs->guest_block_size : 512, size); + return qemu_memalign(bs ? bs->host_block_size : 512, size); } void bdrv_set_dirty_tracking(BlockDriverState *bs, int enable) diff --git a/block_int.h b/block_int.h index dfde061..06e5d35 100644 --- a/block_int.h +++ b/block_int.h @@ -276,6 +276,9 @@ struct BlockDriverState { /* the memory alignment used by the guest for the buffers handled by this driver */ int guest_block_size; + /* the memory alignment required by the device for the buffers handled by this driver */ + int host_block_size; + /* NOTE: the following infos are only hints for real hardware drivers. They are not used by the block driver */ int cyls, heads, secs, translation;