diff options
| author | Fiona Ebner <f.ebner@proxmox.com> | 2025-07-02 14:31:28 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2025-07-14 17:11:01 +0200 |
| commit | 430e2be81e0970ee06c1c956f7698262b2ec514f (patch) | |
| tree | 78c8c4e405b9cf3af692b2d7ffd6f217bb8b7dd2 | |
| parent | cfac5a963e4bf287a194b5df80b7984bc8e41221 (diff) | |
| download | qemu-430e2be81e0970ee06c1c956f7698262b2ec514f.zip qemu-430e2be81e0970ee06c1c956f7698262b2ec514f.tar.gz qemu-430e2be81e0970ee06c1c956f7698262b2ec514f.tar.bz2 | |
block/qapi: make @node-name in @BlockDeviceInfo non-optional
Since commit 15489c769b ("block: auto-generated node-names"), if the
node name of a block driver state is not explicitly specified, it
will be auto-generated.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
Message-ID: <20250702123204.325470-3-f.ebner@proxmox.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/qapi.c | 4 | ||||
| -rw-r--r-- | qapi/block-core.json | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/block/qapi.c b/block/qapi.c index e08a1e9..12fbf8d 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -75,9 +75,7 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk, .no_flush = !!(bs->open_flags & BDRV_O_NO_FLUSH), }; - if (bs->node_name[0]) { - info->node_name = g_strdup(bs->node_name); - } + info->node_name = g_strdup(bs->node_name); children_list_tail = &info->children; QLIST_FOREACH(child, &bs->children, next) { diff --git a/qapi/block-core.json b/qapi/block-core.json index 3e720af..9d36927 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -573,7 +573,7 @@ # Since: 0.14 ## { 'struct': 'BlockDeviceInfo', - 'data': { 'file': 'str', '*node-name': 'str', 'ro': 'bool', 'drv': 'str', + 'data': { 'file': 'str', 'node-name': 'str', 'ro': 'bool', 'drv': 'str', '*backing_file': 'str', 'backing_file_depth': 'int', 'children': ['BlockdevChild'], 'active': 'bool', 'encrypted': 'bool', |