[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 1/3] block: make assertion more generic
From: |
Paolo Bonzini |
Subject: |
[PATCH v2 1/3] block: make assertion more generic |
Date: |
Thu, 1 Jun 2023 13:51:37 +0200 |
.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 --git a/block.c b/block.c
index dae629075c2c..a1452e747b62 100644
--- a/block.c
+++ b/block.c
@@ -1627,8 +1627,8 @@ bdrv_open_driver(BlockDriverState *bs, BlockDriver *drv,
const char *node_name,
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);
--
2.40.1