From patchwork Fri Jul 29 04:49:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Nakamura X-Patchwork-Id: 107344 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 9C88BB6EE8 for ; Fri, 29 Jul 2011 15:34:57 +1000 (EST) Received: from localhost ([::1]:37643 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qmf34-0004dT-Ls for incoming@patchwork.ozlabs.org; Fri, 29 Jul 2011 00:51:46 -0400 Received: from eggs.gnu.org ([140.186.70.92]:41368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qmf1q-0001y0-NU for qemu-devel@nongnu.org; Fri, 29 Jul 2011 00:50:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qmf1p-0000Qv-H9 for qemu-devel@nongnu.org; Fri, 29 Jul 2011 00:50:30 -0400 Received: from mail-iy0-f173.google.com ([209.85.210.173]:46817) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qmf1p-0000NN-CT for qemu-devel@nongnu.org; Fri, 29 Jul 2011 00:50:29 -0400 Received: by mail-iy0-f173.google.com with SMTP id 39so4186308iyb.4 for ; Thu, 28 Jul 2011 21:50:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=25ZVu3yaswjI6kBc0XnorvAvZqoVUqDHYtqZMbuz7R4=; b=n0TgNVkl77uy74Vb/SlLGPidaZOAE8D1dHEII8x+xoLwTPyAQmtcjHNors6exme5MJ NC+cEci8E6qVke61zYBZSeSH7oGrrLRtmVN+NXLVmglx01TyQzrJWISf0P5UBSjgE7sr wfDgN7xEAbA1t8FvHFJjogRrTCTQADEU5Tpj0= Received: by 10.42.161.198 with SMTP id u6mr620747icx.441.1311915028937; Thu, 28 Jul 2011 21:50:28 -0700 (PDT) Received: from localhost.localdomain (d72-39-252-38.home1.cgocable.net [72.39.252.38]) by mx.google.com with ESMTPS id v16sm1109424ibf.25.2011.07.28.21.50.27 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 28 Jul 2011 21:50:27 -0700 (PDT) From: Devin Nakamura To: qemu-devel@nongnu.org Date: Fri, 29 Jul 2011 00:49:41 -0400 Message-Id: <1311914994-20482-12-git-send-email-devin122@gmail.com> X-Mailer: git-send-email 1.7.6.rc1 In-Reply-To: <1311914994-20482-1-git-send-email-devin122@gmail.com> References: <1311914994-20482-1-git-send-email-devin122@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.173 Cc: kwolf@redhat.com, Devin Nakamura Subject: [Qemu-devel] [RFC 11/24] qed: add open_conversion_target() 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: Devin Nakamura --- block/qed.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 69 insertions(+), 17 deletions(-) diff --git a/block/qed.c b/block/qed.c index daf82fd..b05224a 100644 --- a/block/qed.c +++ b/block/qed.c @@ -1451,6 +1451,57 @@ static int bdrv_qed_check(BlockDriverState *bs, BdrvCheckResult *result) return qed_check(s, result, false); } +static int bdrv_qed_open_conversion_target(BlockDriverState *bs, + BlockConversionOptions *drv_options, + QEMUOptionParameter *usr_options) +{ + BDRVQEDState *s = bs->opaque; + s->bs = bs; + if (drv_options->encryption_type != BLOCK_CRYPT_NONE) { + return -1; //TODO: FIXME + } + if (drv_options->cluster_size != drv_options->allocation_size) { + return -1; //TODO: FIXME + } + s->header.magic = QED_MAGIC; + s->header.table_size = QED_DEFAULT_TABLE_SIZE; + if(qed_is_cluster_size_valid(drv_options->cluster_size)) { + s->header.cluster_size = drv_options->cluster_size; + } else { + return -EINVAL; + } + if(qed_is_image_size_valid(drv_options->image_size, s->header.cluster_size, + s->header.table_size)) { + /*TODO: check if qed_is_image_size_valid + * checks image_size % cluster_size =0 */ + s->header.image_size = drv_options->image_size; + } else { + return -EINVAL; + } + s->file_size = bs->file->total_sectors << BDRV_SECTOR_BITS; + s->l1_table = qed_alloc_table(s); + s->header.l1_table_offset = qed_alloc_clusters(s, s->header.table_size); + QSIMPLEQ_INIT(&s->allocating_write_reqs); + + + if (!qed_check_table_offset(s, s->header.l1_table_offset)) { + return -EINVAL; + } + + s->table_nelems = (s->header.cluster_size * s->header.table_size) / + sizeof(uint64_t); + s->l2_shift = ffs(s->header.cluster_size) - 1; + s->l2_mask = s->table_nelems - 1; + s->l1_shift = s->l2_shift + ffs(s->table_nelems) - 1; + + qed_init_l2_cache(&s->l2_cache); + + s->need_check_timer = qemu_new_timer_ns(vm_clock, + qed_need_check_timer_cb, s); + qed_write_l1_table_sync(s, 0, s->table_nelems); + return 0; +} + static int bdrv_qed_get_mapping(BlockDriverState *bs, uint64_t *guest_offset, uint64_t *host_offset, uint64_t *contiguous_bytes) @@ -1559,23 +1610,24 @@ static BlockDriver bdrv_qed = { .instance_size = sizeof(BDRVQEDState), .create_options = qed_create_options, - .bdrv_probe = bdrv_qed_probe, - .bdrv_open = bdrv_qed_open, - .bdrv_close = bdrv_qed_close, - .bdrv_create = bdrv_qed_create, - .bdrv_flush = bdrv_qed_flush, - .bdrv_is_allocated = bdrv_qed_is_allocated, - .bdrv_make_empty = bdrv_qed_make_empty, - .bdrv_aio_readv = bdrv_qed_aio_readv, - .bdrv_aio_writev = bdrv_qed_aio_writev, - .bdrv_aio_flush = bdrv_qed_aio_flush, - .bdrv_truncate = bdrv_qed_truncate, - .bdrv_getlength = bdrv_qed_getlength, - .bdrv_get_info = bdrv_qed_get_info, - .bdrv_change_backing_file = bdrv_qed_change_backing_file, - .bdrv_check = bdrv_qed_check, - .bdrv_get_mapping = bdrv_qed_get_mapping, - .bdrv_map = bdrv_qed_map, + .bdrv_probe = bdrv_qed_probe, + .bdrv_open = bdrv_qed_open, + .bdrv_close = bdrv_qed_close, + .bdrv_create = bdrv_qed_create, + .bdrv_flush = bdrv_qed_flush, + .bdrv_is_allocated = bdrv_qed_is_allocated, + .bdrv_make_empty = bdrv_qed_make_empty, + .bdrv_aio_readv = bdrv_qed_aio_readv, + .bdrv_aio_writev = bdrv_qed_aio_writev, + .bdrv_aio_flush = bdrv_qed_aio_flush, + .bdrv_truncate = bdrv_qed_truncate, + .bdrv_getlength = bdrv_qed_getlength, + .bdrv_get_info = bdrv_qed_get_info, + .bdrv_change_backing_file = bdrv_qed_change_backing_file, + .bdrv_check = bdrv_qed_check, + .bdrv_open_conversion_target = bdrv_qed_open_conversion_target, + .bdrv_get_mapping = bdrv_qed_get_mapping, + .bdrv_map = bdrv_qed_map, }; static void bdrv_qed_init(void)