From patchwork Fri Jul 29 04:49:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Nakamura X-Patchwork-Id: 107328 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 8BF5AB6F71 for ; Fri, 29 Jul 2011 14:50:42 +1000 (EST) Received: from localhost ([::1]:60114 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qmf1z-0001ZW-L4 for incoming@patchwork.ozlabs.org; Fri, 29 Jul 2011 00:50:39 -0400 Received: from eggs.gnu.org ([140.186.70.92]:41258) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qmf1c-0001Py-Rl for qemu-devel@nongnu.org; Fri, 29 Jul 2011 00:50:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qmf1b-0000Oc-AE for qemu-devel@nongnu.org; Fri, 29 Jul 2011 00:50:16 -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 1Qmf1b-0000NN-70 for qemu-devel@nongnu.org; Fri, 29 Jul 2011 00:50:15 -0400 Received: by mail-iy0-f173.google.com with SMTP id 39so4186308iyb.4 for ; Thu, 28 Jul 2011 21:50:14 -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=4DEenEE5j+dZMGpVfyOYVLwYcfUhgJ9/52GaKn+6h5Y=; b=psr/SljrS+yj28I4zG4/b9XolPpDZ5T8DukqTE6RcBaNBuQzaYWJ6JgK9k0cIRB0Yb ji4hYvVlBEZbjuJk3Q9+AvKm2+Ey3Q36H916YmcIJZjqGKO8jBU5TdCMJd4hISqwYJBS BDbHDvPasM4LUOcteyYKC9hPufnvwEduszcoA= Received: by 10.42.165.67 with SMTP id j3mr633944icy.368.1311915014521; Thu, 28 Jul 2011 21:50:14 -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.13 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 28 Jul 2011 21:50:13 -0700 (PDT) From: Devin Nakamura To: qemu-devel@nongnu.org Date: Fri, 29 Jul 2011 00:49:31 -0400 Message-Id: <1311914994-20482-2-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 01/24] block: add block conversion api 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 add functions to block driver interface to support inplace image conversion Signed-off-by: Devin Nakamura --- block.h | 2 + block_int.h | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 0 deletions(-) diff --git a/block.h b/block.h index 59cc410..a1c4cc8 100644 --- a/block.h +++ b/block.h @@ -251,6 +251,8 @@ int64_t bdrv_get_dirty_count(BlockDriverState *bs); void bdrv_set_in_use(BlockDriverState *bs, int in_use); int bdrv_in_use(BlockDriverState *bs); +typedef struct BlockConversionOptions BlockConversionOptions; + typedef enum { BLKDBG_L1_UPDATE, diff --git a/block_int.h b/block_int.h index efb6803..84bf89e 100644 --- a/block_int.h +++ b/block_int.h @@ -41,6 +41,9 @@ #define BLOCK_OPT_PREALLOC "preallocation" #define BLOCK_OPT_SUBFMT "subformat" +#define BLOCK_CRYPT_NONE 0 +#define BLOCK_CRYPT_AES 1 + typedef struct AIOPool { void (*cancel)(BlockDriverAIOCB *acb); int aiocb_size; @@ -139,6 +142,85 @@ struct BlockDriver { */ int (*bdrv_has_zero_init)(BlockDriverState *bs); + /* In-place image conversion */ + + /** + * Opens an image conversion target. + * + * @param bs Basic Initialization done by + * bdrv_open_conversion_target() Still need to set format + * specific data. + * @param usr_options Creation options. + * @param drv_options Conversion Options + * @return Returns non-zero on failure. + */ + int (*bdrv_open_conversion_target)(BlockDriverState *bs, + BlockConversionOptions *drv_options, QEMUOptionParameter *usr_options); + + /** + * Gets a mapping in the image file. + * + * The function starts searching for a mapping at + * starting_guest_offset = guest_offset + contiguous_bytes + * + * @param bs[in] The image in which to find mapping. + * @param guest_offset[in,out] On function entry used to calculate + * starting search address. + * On function exit contains the starting + * guest offset of the mapping. + * @param host_offset[out] The starting image file offset for the + * mapping. + * @param contiguous_bytes[in,out] On function entry used to calculate + * starting search address. + * On function exit contains the number of + * bytes for which this mapping is valid. + * A value of 0 means there are no more + * mappings in the image. + * @return Returns non-zero on error. + */ + int (*bdrv_get_mapping)(BlockDriverState *bs, uint64_t *guest_offset, + uint64_t *host_offset, uint64_t *contiguous_bytes); + + /** + * Sets a mapping in the image file. + * + * @param bs Usualy opened with bdrv_open_conversion_target + * @param guest_offset The starting guest offset of the mapping + * (in bytes). Function fails and returns -EINVAL if + * not cluster aligned. + * @param host_offset The starting image offset of the mapping + * (in bytes). Function fails and returns -EINVAL if + * not cluster aligned. + * @param contiguous_bytes The number of bytes for which this mapping exists + * Function fails and returns -EINVAL if not cluster + * aligned + * @return Returns non-zero on error + */ + int (*bdrv_map)(BlockDriverState *bs, uint64_t guest_offset, + uint64_t host_offset, uint64_t contiguous_bytes); + + /** + * Copies out the header of a conversion target + * + * Saves the current header for the image in a temporary file and overwrites + * it with the header for the new format (at the moment the header is + * assumed to be 1 sector) + * + * @param bs Usualy opened with bdrv_open_conversion_target(). + * @return Returns non-zero on failure + */ + int (*bdrv_copy_header) (BlockDriverState *bs); + + /** + * Asks the block driver what options should be used to create a conversion + * target. + * + * @param options[out] Block conversion options + */ + int (*bdrv_get_conversion_options)(BlockDriverState *bs, + BlockConversionOptions *options); + + QLIST_ENTRY(BlockDriver) list; }; @@ -263,4 +345,10 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf) DEFINE_PROP_UINT32("discard_granularity", _state, \ _conf.discard_granularity, 0) +struct BlockConversionOptions { + int encryption_type; + uint64_t image_size; + uint64_t cluster_size; + uint64_t allocation_size; +}; #endif /* BLOCK_INT_H */