block: Make more BlockDriver definitions static

kevmw · kevmw · commit 9ea473fb7bd0 · 2023-09-08T17:03:09.000+02:00
Most block driver implementations don't have any reason for their
BlockDriver to be public. The only exceptions are bdrv_file, bdrv_raw
and bdrv_qcow2, which are actually used in other source files.

Make all other BlockDriver definitions static if they aren't yet.

Signed-off-by: Kevin Wolf &lt;kwolf@redhat.com&gt;
Message-ID: &lt;20230905130607.35134-3-kwolf@redhat.com&gt;
Reviewed-by: Philippe Mathieu-Daudé &lt;philmd@linaro.org&gt;
Signed-off-by: Kevin Wolf &lt;kwolf@redhat.com&gt;
diff --git a/block/copy-before-write.c b/block/copy-before-write.c
@@ -503,7 +503,7 @@ static void cbw_close(BlockDriverState *bs)
     s->bcs = NULL;
 }
 
-BlockDriver bdrv_cbw_filter = {
+static BlockDriver bdrv_cbw_filter = {
     .format_name = "copy-before-write",
     .instance_size = sizeof(BDRVCopyBeforeWriteState),
 
diff --git a/block/preallocate.c b/block/preallocate.c
@@ -535,7 +535,7 @@ static void preallocate_child_perm(BlockDriverState *bs, BdrvChild *c,
     }
 }
 
-BlockDriver bdrv_preallocate_filter = {
+static BlockDriver bdrv_preallocate_filter = {
     .format_name = "preallocate",
     .instance_size = sizeof(BDRVPreallocateState),
 
diff --git a/block/snapshot-access.c b/block/snapshot-access.c
@@ -108,7 +108,7 @@ static void snapshot_access_child_perm(BlockDriverState *bs, BdrvChild *c,
     *nshared = BLK_PERM_ALL;
 }
 
-BlockDriver bdrv_snapshot_access_drv = {
+static BlockDriver bdrv_snapshot_access_drv = {
     .format_name = "snapshot-access",
 
     .bdrv_open                  = snapshot_access_open,

Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ static void cbw_close(BlockDriverState *bs)`
`503`	`503`	`s->bcs = NULL;`
`504`	`504`	`}`
`505`	`505`
`506`		`-BlockDriver bdrv_cbw_filter = {`
	`506`	`+static BlockDriver bdrv_cbw_filter = {`
`507`	`507`	`.format_name = "copy-before-write",`
`508`	`508`	`.instance_size = sizeof(BDRVCopyBeforeWriteState),`
`509`	`509`
Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ static void preallocate_child_perm(BlockDriverState bs, BdrvChild c,`
`535`	`535`	`}`
`536`	`536`	`}`
`537`	`537`
`538`		`-BlockDriver bdrv_preallocate_filter = {`
	`538`	`+static BlockDriver bdrv_preallocate_filter = {`
`539`	`539`	`.format_name = "preallocate",`
`540`	`540`	`.instance_size = sizeof(BDRVPreallocateState),`
`541`	`541`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ static void snapshot_access_child_perm(BlockDriverState bs, BdrvChild c,`
`108`	`108`	`*nshared = BLK_PERM_ALL;`
`109`	`109`	`}`
`110`	`110`
`111`		`-BlockDriver bdrv_snapshot_access_drv = {`
	`111`	`+static BlockDriver bdrv_snapshot_access_drv = {`
`112`	`112`	`.format_name = "snapshot-access",`
`113`	`113`
`114`	`114`	`.bdrv_open = snapshot_access_open,`