Patchwork [2/2] qcow2: Remove static forward declaration

login
register
mail settings
Submitter Kevin Wolf
Date May 7, 2010, 10:43 a.m.
Message ID <1273229026-12691-3-git-send-email-kwolf@redhat.com>
Download mbox | patch
Permalink /patch/51911/
State New
Headers show

Comments

Kevin Wolf - May 7, 2010, 10:43 a.m.
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 <kwolf@redhat.com>
---
 block/qcow2.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

Patch

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);
     }