diff options
| author | Fiona Ebner <f.ebner@proxmox.com> | 2025-05-23 09:02:11 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2025-06-04 18:16:34 +0200 |
| commit | eef2dd03f948a512499775043bdc0c5c88d8a2dd (patch) | |
| tree | f20dba8d18ec6c22237bde68aec5980edb621403 | |
| parent | 2e887187454e57d04522099d4f04d17137d6e05c (diff) | |
| download | qemu-eef2dd03f948a512499775043bdc0c5c88d8a2dd.zip qemu-eef2dd03f948a512499775043bdc0c5c88d8a2dd.tar.gz qemu-eef2dd03f948a512499775043bdc0c5c88d8a2dd.tar.bz2 | |
hw/core/qdev-properties-system: Add missing return in set_drive_helper()
Currently, changing the 'drive' property of e.g. a scsi-hd object will
result in an assertion failure if the aio context of the block node
it's replaced with doesn't match the current aio context:
> bdrv_replace_child_noperm: Assertion `bdrv_get_aio_context(old_bs) ==
> bdrv_get_aio_context(new_bs)' failed.
The problematic scenario is already detected, but a 'return' statement
was missing.
Cc: qemu-stable@nongnu.org
Fixes: d1a58c176a ("qdev: allow setting drive property for realized device")
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
Message-ID: <20250523070211.280498-1-f.ebner@proxmox.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | hw/core/qdev-properties-system.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c index 8e11e63..24e145d 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -145,6 +145,7 @@ static void set_drive_helper(Object *obj, Visitor *v, const char *name, if (ctx != bdrv_get_aio_context(bs)) { error_setg(errp, "Different aio context is not supported for new " "node"); + return; } blk_replace_bs(blk, bs, errp); |