From patchwork Fri Jul 29 04:49:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Nakamura X-Patchwork-Id: 107332 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 70472B6F71 for ; Fri, 29 Jul 2011 14:52:34 +1000 (EST) Received: from localhost ([::1]:34220 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qmf3k-00068J-RN for incoming@patchwork.ozlabs.org; Fri, 29 Jul 2011 00:52:28 -0400 Received: from eggs.gnu.org ([140.186.70.92]:41462) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qmf21-0002Rq-CX for qemu-devel@nongnu.org; Fri, 29 Jul 2011 00:50:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qmf20-0000Sp-EL for qemu-devel@nongnu.org; Fri, 29 Jul 2011 00:50:41 -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 1Qmf20-0000NN-5g for qemu-devel@nongnu.org; Fri, 29 Jul 2011 00:50:40 -0400 Received: by mail-iy0-f173.google.com with SMTP id 39so4186308iyb.4 for ; Thu, 28 Jul 2011 21:50:39 -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=2O2+o1hzI/wvpkV2BNuhKF2/wDoyy493ZhorMRzRcvk=; b=Yr1b0GO6MMt2WS7igGFz90zoT4uqyrqIhlFQTnYdEFHlllvaUMDCXTCt8lYhDZE1Ez quFaMhD7xMQivR41Dme6KtqSP5TkwTd2ZUoX0lJgCVPqzIW5GWzn3xioEpBmzHC+7mBw /mnLsjitfhBJebBdkr/pennz6ljqbH5mcDrV4= Received: by 10.231.21.15 with SMTP id h15mr560980ibb.76.1311915039803; Thu, 28 Jul 2011 21:50:39 -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.38 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 28 Jul 2011 21:50:39 -0700 (PDT) From: Devin Nakamura To: qemu-devel@nongnu.org Date: Fri, 29 Jul 2011 00:49:49 -0400 Message-Id: <1311914994-20482-20-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 19/24] qcow2: add qcow2_copy_header() 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/qcow2.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index b75364d..3bb28d2 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1374,6 +1374,59 @@ static int qcow2_get_mapping(BlockDriverState *bs, uint64_t *guest_offset, return 0; } +static int qcow2_copy_header(BlockDriverState *bs) +{ + BlockDriverState *backup; + uint8_t buffer[512]; + int ret; + QCowHeader header; + BDRVQcowState *s = bs->opaque; + ret = qcow2_cache_flush(bs, s->l2_table_cache); + if (ret) { + return ret; + } + + /*TODO: change filename*/ + bdrv_create_file("headerbackup.temp", NULL); + bdrv_file_open(&backup, "headerbackup.temp", BDRV_O_RDWR); + bdrv_read(bs->file, 0, buffer, 1); /*TODO: check return code*/ + bdrv_write(backup, 0, buffer, 1); /*TODO: check return code*/ + bdrv_close(backup); + + header.magic = QCOW_MAGIC; + header.version = 2; + header.backing_file_offset = 0; + header.backing_file_size = 0; + header.size = bs->total_sectors << BDRV_SECTOR_BITS; + header.cluster_bits = s->cluster_bits; + header.crypt_method = QCOW_CRYPT_NONE; + header.l1_table_offset = s->l1_table_offset; + header.l1_size = s->l1_size; + header.refcount_table_offset = s->refcount_table_offset; + header.refcount_table_clusters = s->refcount_table_size; /*TODO: FIXME*/ + header.snapshots_offset = s->snapshots_offset; + header.nb_snapshots = s->nb_snapshots; + + cpu_to_be64s(&header.backing_file_offset); + cpu_to_be32s(&header.backing_file_size); + cpu_to_be32s(&header.cluster_bits); + cpu_to_be32s(&header.crypt_method); + cpu_to_be32s(&header.l1_size); + cpu_to_be64s(&header.l1_table_offset); + cpu_to_be32s(&header.magic); + cpu_to_be32s(&header.nb_snapshots); + cpu_to_be32s(&header.refcount_table_clusters); + cpu_to_be64s(&header.refcount_table_offset); + cpu_to_be64s(&header.size); + cpu_to_be64s(&header.snapshots_offset); + cpu_to_be32s(&header.version); + ret = bdrv_pwrite_sync(bs->file, 0, &header, sizeof(QCowHeader)); + if (ret) { + return ret; + } + return qcow2_drop_leaked_clusters(bs); +} + static QEMUOptionParameter qcow2_create_options[] = { { .name = BLOCK_OPT_SIZE, @@ -1446,6 +1499,7 @@ static BlockDriver bdrv_qcow2 = { .bdrv_get_mapping = qcow2_get_mapping, .bdrv_map = qcow2_map, + .bdrv_copy_header = qcow2_copy_header, }; static void bdrv_qcow2_init(void)