diff mbox series

[1/3] block: apply assertion more widely

Message ID 20221212131700.250209-2-pbonzini@redhat.com
State New
Headers show
Series block: remove separate bdrv_file_open callback | expand

Commit Message

Paolo Bonzini Dec. 12, 2022, 1:16 p.m. UTC 
.bdrv_needs_filename is only set for drivers that also set bdrv_file_open,
i.e. protocol drivers.

So we can make the assertion always, it will always pass for those drivers
that use bdrv_open.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 block.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/block.c b/block.c
index 676bbe0529b0..0a625a489a6e 100644
--- a/block.c
+++ b/block.c
@@ -1617,8 +1617,8 @@  static int bdrv_open_driver(BlockDriverState *bs, BlockDriver *drv,
     bs->drv = drv;
     bs->opaque = g_malloc0(drv->instance_size);
 
+    assert(!drv->bdrv_needs_filename || bs->filename[0]);
     if (drv->bdrv_file_open) {
-        assert(!drv->bdrv_needs_filename || bs->filename[0]);
         ret = drv->bdrv_file_open(bs, options, open_flags, &local_err);
     } else if (drv->bdrv_open) {
         ret = drv->bdrv_open(bs, options, open_flags, &local_err);