From patchwork Tue Jul 5 15:24:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: clord@redhat.com X-Patchwork-Id: 9214629 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B30E36048B for ; Tue, 5 Jul 2016 15:47:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A478226490 for ; Tue, 5 Jul 2016 15:47:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 99121264FB; Tue, 5 Jul 2016 15:47:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id ECDB426490 for ; Tue, 5 Jul 2016 15:47:50 +0000 (UTC) Received: from localhost ([::1]:55923 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSZh-0004u9-Op for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Jul 2016 11:47:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDT-00061n-S1 for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKSDR-0008UD-56 for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46425) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDL-0008Pg-Sx; Tue, 05 Jul 2016 11:24:44 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8618B6266B; Tue, 5 Jul 2016 15:24:43 +0000 (UTC) Received: from dhcp-17-138.bos.redhat.com (dhcp-17-5.bos.redhat.com [10.18.17.5]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u65FOWu9006841; Tue, 5 Jul 2016 11:24:42 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2016 11:24:13 -0400 Message-Id: <1467732272-23368-14-git-send-email-clord@redhat.com> In-Reply-To: <1467732272-23368-1-git-send-email-clord@redhat.com> References: <1467732272-23368-1-git-send-email-clord@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 05 Jul 2016 15:24:43 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 13/32] blockdev: Move vdi probe to its own file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, Colin Lord , qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Isolates vdi probe as part of the modularization process. Signed-off-by: Colin Lord Reviewed-by: Max Reitz --- block/Makefile.objs | 2 +- block/probe/vdi.c | 26 +++++++++++++++++ block/vdi.c | 69 ++-------------------------------------------- include/block/driver/vdi.h | 49 ++++++++++++++++++++++++++++++++ include/block/probe.h | 1 + 5 files changed, 79 insertions(+), 68 deletions(-) create mode 100644 block/probe/vdi.c create mode 100644 include/block/driver/vdi.h diff --git a/block/Makefile.objs b/block/Makefile.objs index 693cc97..4a5bd88 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -26,7 +26,7 @@ block-obj-y += write-threshold.o block-obj-y += crypto.o block-obj-y += probe/bochs.o probe/cloop.o probe/luks.o probe/dmg.o block-obj-y += probe/parallels.o probe/qcow.o probe/qcow2.o probe/qed.o -block-obj-y += probe/raw.o +block-obj-y += probe/raw.o probe/vdi.o common-obj-y += stream.o common-obj-y += commit.o diff --git a/block/probe/vdi.c b/block/probe/vdi.c new file mode 100644 index 0000000..9adf5e5 --- /dev/null +++ b/block/probe/vdi.c @@ -0,0 +1,26 @@ +#include "qemu/osdep.h" +#include "block/block_int.h" +#include "block/probe.h" +#include "block/driver/vdi.h" + +int vdi_probe(const uint8_t *buf, int buf_size, const char *filename) +{ + const VdiHeader *header = (const VdiHeader *)buf; + int ret = 0; + + logout("\n"); + + if (buf_size < sizeof(*header)) { + /* Header too small, no VDI. */ + } else if (le32_to_cpu(header->signature) == VDI_SIGNATURE) { + ret = 100; + } + + if (ret == 0) { + logout("no vdi image\n"); + } else { + logout("%s", header->text); + } + + return ret; +} diff --git a/block/vdi.c b/block/vdi.c index 7d9ab9c..e99ae92 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -52,6 +52,8 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "block/block_int.h" +#include "block/probe.h" +#include "block/driver/vdi.h" #include "sysemu/block-backend.h" #include "qemu/module.h" #include "qemu/bswap.h" @@ -59,14 +61,6 @@ #include "qemu/coroutine.h" #include "qemu/cutils.h" -#if defined(CONFIG_UUID) -#include -#else -/* TODO: move uuid emulation to some central place in QEMU. */ -#include "sysemu/sysemu.h" /* UUID_FMT */ -typedef unsigned char uuid_t[16]; -#endif - /* Code configuration options. */ /* Enable debug messages. */ @@ -92,16 +86,6 @@ typedef unsigned char uuid_t[16]; #define SECTOR_SIZE 512 #define DEFAULT_CLUSTER_SIZE (1 * MiB) -#if defined(CONFIG_VDI_DEBUG) -#define logout(fmt, ...) \ - fprintf(stderr, "vdi\t%-24s" fmt, __func__, ##__VA_ARGS__) -#else -#define logout(fmt, ...) ((void)0) -#endif - -/* Image signature. */ -#define VDI_SIGNATURE 0xbeda107f - /* Image version. */ #define VDI_VERSION_1_1 0x00010001 @@ -163,33 +147,6 @@ static inline void uuid_unparse(const uuid_t uu, char *out) #endif typedef struct { - char text[0x40]; - uint32_t signature; - uint32_t version; - uint32_t header_size; - uint32_t image_type; - uint32_t image_flags; - char description[256]; - uint32_t offset_bmap; - uint32_t offset_data; - uint32_t cylinders; /* disk geometry, unused here */ - uint32_t heads; /* disk geometry, unused here */ - uint32_t sectors; /* disk geometry, unused here */ - uint32_t sector_size; - uint32_t unused1; - uint64_t disk_size; - uint32_t block_size; - uint32_t block_extra; /* unused here */ - uint32_t blocks_in_image; - uint32_t blocks_allocated; - uuid_t uuid_image; - uuid_t uuid_last_snap; - uuid_t uuid_link; - uuid_t uuid_parent; - uint64_t unused2[7]; -} QEMU_PACKED VdiHeader; - -typedef struct { /* The block map entries are little endian (even in memory). */ uint32_t *bmap; /* Size of block (bytes). */ @@ -371,28 +328,6 @@ static int vdi_make_empty(BlockDriverState *bs) return 0; } -static int vdi_probe(const uint8_t *buf, int buf_size, const char *filename) -{ - const VdiHeader *header = (const VdiHeader *)buf; - int ret = 0; - - logout("\n"); - - if (buf_size < sizeof(*header)) { - /* Header too small, no VDI. */ - } else if (le32_to_cpu(header->signature) == VDI_SIGNATURE) { - ret = 100; - } - - if (ret == 0) { - logout("no vdi image\n"); - } else { - logout("%s", header->text); - } - - return ret; -} - static int vdi_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { diff --git a/include/block/driver/vdi.h b/include/block/driver/vdi.h new file mode 100644 index 0000000..4020c94 --- /dev/null +++ b/include/block/driver/vdi.h @@ -0,0 +1,49 @@ +#ifndef VDI_H +#define VDI_H + +#if defined(CONFIG_UUID) +#include +#else +/* TODO: move uuid emulation to some central place in QEMU. */ +#include "sysemu/sysemu.h" /* UUID_FMT */ +typedef unsigned char uuid_t[16]; +#endif + +#if defined(CONFIG_VDI_DEBUG) +#define logout(fmt, ...) \ + fprintf(stderr, "vdi\t%-24s" fmt, __func__, ##__VA_ARGS__) +#else +#define logout(fmt, ...) ((void)0) +#endif + +/* Image signature. */ +#define VDI_SIGNATURE 0xbeda107f + +typedef struct { + char text[0x40]; + uint32_t signature; + uint32_t version; + uint32_t header_size; + uint32_t image_type; + uint32_t image_flags; + char description[256]; + uint32_t offset_bmap; + uint32_t offset_data; + uint32_t cylinders; /* disk geometry, unused here */ + uint32_t heads; /* disk geometry, unused here */ + uint32_t sectors; /* disk geometry, unused here */ + uint32_t sector_size; + uint32_t unused1; + uint64_t disk_size; + uint32_t block_size; + uint32_t block_extra; /* unused here */ + uint32_t blocks_in_image; + uint32_t blocks_allocated; + uuid_t uuid_image; + uuid_t uuid_last_snap; + uuid_t uuid_link; + uuid_t uuid_parent; + uint64_t unused2[7]; +} QEMU_PACKED VdiHeader; + +#endif diff --git a/include/block/probe.h b/include/block/probe.h index 053f961..f85c178 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -11,5 +11,6 @@ int qcow_probe(const uint8_t *buf, int buf_size, const char *filename); int qcow2_probe(const uint8_t *buf, int buf_size, const char *filename); int bdrv_qed_probe(const uint8_t *buf, int buf_size, const char *filename); int raw_probe(const uint8_t *buf, int buf_size, const char *filename); +int vdi_probe(const uint8_t *buf, int buf_size, const char *filename); #endif