From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1OANV6-0007wc-II for qemu-devel@nongnu.org; Fri, 07 May 2010 09:21:56 -0400 Received: from [140.186.70.92] (port=46810 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OANV0-0005km-4c for qemu-devel@nongnu.org; Fri, 07 May 2010 09:21:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OAL2Z-0005Xx-VJ for qemu-devel@nongnu.org; Fri, 07 May 2010 06:44:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12566) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OAL2Z-0005Xf-Lx for qemu-devel@nongnu.org; Fri, 07 May 2010 06:44:19 -0400 From: Kevin Wolf Date: Fri, 7 May 2010 12:43:46 +0200 Message-Id: <1273229026-12691-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1273229026-12691-1-git-send-email-kwolf@redhat.com> References: <1273229026-12691-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] qcow2: Remove static forward declaration List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, blauwirbel@gmail.com OpenBSDs gcc is said to generate warnings for this declaration, so don't reference bdrv_qcow2 directly, but look it up using bdrv_find_format. Signed-off-by: Kevin Wolf --- block/qcow2.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 15a6a2c..0ce7150 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -52,8 +52,6 @@ typedef struct { #define QCOW_EXT_MAGIC_END 0 #define QCOW_EXT_MAGIC_BACKING_FORMAT 0xE2792ACA -static BlockDriver bdrv_qcow2; - static int qcow_probe(const uint8_t *buf, int buf_size, const char *filename) { const QCowHeader *cow_header = (const void *)buf; @@ -1018,8 +1016,9 @@ exit: /* Preallocate metadata */ if (ret == 0 && prealloc) { BlockDriverState *bs; + BlockDriver *drv = bdrv_find_format("qcow2"); bs = bdrv_new(""); - bdrv_open(bs, filename, BDRV_O_CACHE_WB | BDRV_O_RDWR, &bdrv_qcow2); + bdrv_open(bs, filename, BDRV_O_CACHE_WB | BDRV_O_RDWR, drv); preallocate(bs); bdrv_close(bs); } -- 1.6.6.1