[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 12/26] raw_bsd: register bdrv_raw
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL v2 12/26] raw_bsd: register bdrv_raw |
Date: |
Mon, 2 Sep 2013 10:49:38 +0200 |
From: Laszlo Ersek <address@hidden>
On 08/05/13 15:03, Paolo Bonzini wrote:
>
> [...]
>
> 5) Formats are registered with bdrv_register (takes a BlockDriver*). You
> also need to pass the caller of bdrv_register to block_init.
Fill in the BlockDriver structure with the raw_*() functions that have
been added to "block/raw_bsd.c", in the order the fields are defined in
"include/block/block_int.h".
I needed more explanation / naming examples for registering the driver
than what Paolo gave me, so I copied / adapted from "block/qcow2.c". The
parts I took as basis for modification are blamed on
commit 5efa9d5a8b18841c9c62208a494d7f519238979a
Author: Anthony Liguori <address@hidden>
Date: Sat May 9 17:03:42 2009 -0500
Convert block infrastructure to use new module init functionality
commit 20d97356c9df6d68fbd37d6334fdb7063f24eab6
Author: Blue Swirl <address@hidden>
Date: Fri Apr 23 20:19:47 2010 +0000
Fix OpenBSD build
Signed-off-by: Laszlo Ersek <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/raw_bsd.c | 38 +++++++++++++++++++++++++++++++++-----
1 file changed, 33 insertions(+), 5 deletions(-)
diff --git a/block/raw_bsd.c b/block/raw_bsd.c
index b70245d..2dc1921 100644
--- a/block/raw_bsd.c
+++ b/block/raw_bsd.c
@@ -2,6 +2,7 @@
*
* Copyright (C) 2010, 2013, Red Hat, Inc.
* Copyright (C) 2010, Blue Swirl <address@hidden>
+ * Copyright (C) 2009, Anthony Liguori <address@hidden>
*
* Author:
* Laszlo Ersek <address@hidden>
@@ -124,11 +125,6 @@ static TYPE raw_create(void)
return bdrv_create_file();
}
-static const char *raw_format_name(void)
-{
- return "raw";
-}
-
static int raw_open(BlockDriverState *bs)
{
bs->sg = bs->file->sg;
@@ -146,3 +142,35 @@ static int raw_probe(void)
*/
return 1;
}
+
+static BlockDriver bdrv_raw = {
+ .format_name = "raw",
+ .bdrv_probe = &raw_probe,
+ .bdrv_reopen_prepare = &raw_reopen_prepare,
+ .bdrv_open = &raw_open,
+ .bdrv_close = &raw_close,
+ .bdrv_create = &raw_create,
+ .bdrv_co_readv = &raw_co_readv,
+ .bdrv_co_writev = &raw_co_writev,
+ .bdrv_co_write_zeroes = &raw_co_write_zeroes,
+ .bdrv_co_discard = &raw_co_discard,
+ .bdrv_co_is_allocated = &raw_co_is_allocated,
+ .bdrv_truncate = &raw_truncate,
+ .bdrv_getlength = &raw_getlength,
+ .bdrv_get_info = &raw_get_info,
+ .bdrv_is_inserted = &raw_is_inserted,
+ .bdrv_media_changed = &raw_media_changed,
+ .bdrv_eject = &raw_eject,
+ .bdrv_lock_medium = &raw_lock_medium,
+ .bdrv_ioctl = &raw_ioctl,
+ .bdrv_aio_ioctl = &raw_aio_ioctl,
+ .create_options = &raw_create_options[0],
+ .bdrv_has_zero_init = &raw_has_zero_init
+};
+
+static void bdrv_raw_init(void)
+{
+ bdrv_register(&bdrv_raw);
+}
+
+block_init(bdrv_raw_init);
--
1.8.1.4
- [Qemu-devel] [PULL v2 02/26] block: Remove redundant assertion, (continued)
- [Qemu-devel] [PULL v2 02/26] block: Remove redundant assertion, Kevin Wolf, 2013/09/02
- [Qemu-devel] [PULL v2 06/26] block/qcow2.h: Avoid "1LL << 63" (shifts into sign bit), Kevin Wolf, 2013/09/02
- [Qemu-devel] [PULL v2 04/26] Revert "block: Disable driver-specific options for 1.6", Kevin Wolf, 2013/09/02
- [Qemu-devel] [PULL v2 05/26] qemu-iotests: Update reference output for 051, Kevin Wolf, 2013/09/02
- [Qemu-devel] [PULL v2 07/26] add skeleton for BSD licensed "raw" BlockDriver, Kevin Wolf, 2013/09/02
- [Qemu-devel] [PULL v2 09/26] raw_bsd: add raw_create(), Kevin Wolf, 2013/09/02
- [Qemu-devel] [PULL v2 08/26] raw_bsd: emit debug events in bdrv_co_readv() and bdrv_co_writev(), Kevin Wolf, 2013/09/02
- [Qemu-devel] [PULL v2 10/26] raw_bsd: introduce "special members", Kevin Wolf, 2013/09/02
- [Qemu-devel] [PULL v2 11/26] raw_bsd: add raw_create_options, Kevin Wolf, 2013/09/02
- [Qemu-devel] [PULL v2 13/26] switch raw block driver from "raw.o" to "raw_bsd.o", Kevin Wolf, 2013/09/02
- [Qemu-devel] [PULL v2 12/26] raw_bsd: register bdrv_raw,
Kevin Wolf <=
- [Qemu-devel] [PULL v2 14/26] block: Remove old raw driver, Kevin Wolf, 2013/09/02
- [Qemu-devel] [PULL v2 18/26] qemu-iotests: Snapshotting zero clusters, Kevin Wolf, 2013/09/02
- [Qemu-devel] [PULL v2 16/26] option: Add assigned flag to QEMUOptionParameter, Kevin Wolf, 2013/09/02
- [Qemu-devel] [PULL v2 15/26] gluster: Abort on AIO completion failure, Kevin Wolf, 2013/09/02
- [Qemu-devel] [PULL v2 17/26] qcow2-refcount: Snapshot update for zero clusters, Kevin Wolf, 2013/09/02
- [Qemu-devel] [PULL v2 20/26] qcow2: Metadata overlap checks, Kevin Wolf, 2013/09/02
- [Qemu-devel] [PULL v2 19/26] qcow2: Add corrupt bit, Kevin Wolf, 2013/09/02
- [Qemu-devel] [PULL v2 21/26] qcow2: Employ metadata overlap checks, Kevin Wolf, 2013/09/02
- [Qemu-devel] [PULL v2 22/26] qcow2-refcount: Move OFLAG_COPIED checks, Kevin Wolf, 2013/09/02