[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/15] qemu-option: Allow deleting opts during qemu_opts_foreach()
From: |
Kevin Wolf |
Subject: |
[PULL 10/15] qemu-option: Allow deleting opts during qemu_opts_foreach() |
Date: |
Fri, 15 Oct 2021 16:46:35 +0200 |
Use QTAILQ_FOREACH_SAFE() so that the current QemuOpts can be deleted
while iterating through the whole list.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20211008133442.141332-11-kwolf@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
util/qemu-option.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 61cb4a97bd..eedd08929b 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -1126,11 +1126,11 @@ int qemu_opts_foreach(QemuOptsList *list,
qemu_opts_loopfunc func,
void *opaque, Error **errp)
{
Location loc;
- QemuOpts *opts;
+ QemuOpts *opts, *next;
int rc = 0;
loc_push_none(&loc);
- QTAILQ_FOREACH(opts, &list->head, next) {
+ QTAILQ_FOREACH_SAFE(opts, &list->head, next, next) {
loc_restore(&opts->loc);
rc = func(opaque, opts, errp);
if (rc) {
--
2.31.1
- [PULL 00/15] qdev: Add JSON -device, Kevin Wolf, 2021/10/15
- [PULL 01/15] net: Introduce NetClientInfo.check_peer_type(), Kevin Wolf, 2021/10/15
- [PULL 02/15] net/vhost-user: Fix device compatibility check, Kevin Wolf, 2021/10/15
- [PULL 03/15] net/vhost-vdpa: Fix device compatibility check, Kevin Wolf, 2021/10/15
- [PULL 04/15] qom: Reduce use of error_propagate(), Kevin Wolf, 2021/10/15
- [PULL 05/15] iotests/245: Fix type for iothread property, Kevin Wolf, 2021/10/15
- [PULL 06/15] iotests/051: Fix typo, Kevin Wolf, 2021/10/15
- [PULL 07/15] qdev: Avoid using string visitor for properties, Kevin Wolf, 2021/10/15
- [PULL 08/15] qdev: Make DeviceState.id independent of QemuOpts, Kevin Wolf, 2021/10/15
- [PULL 10/15] qemu-option: Allow deleting opts during qemu_opts_foreach(),
Kevin Wolf <=
- [PULL 11/15] qdev: Add Error parameter to hide_device() callbacks, Kevin Wolf, 2021/10/15
- [PULL 14/15] qdev: Base object creation on QDict rather than QemuOpts, Kevin Wolf, 2021/10/15
- [PULL 12/15] virtio-net: Store failover primary opts pointer locally, Kevin Wolf, 2021/10/15
- [PULL 13/15] virtio-net: Avoid QemuOpts in failover_find_primary_device(), Kevin Wolf, 2021/10/15
- [PULL 09/15] softmmu/qdev-monitor: add error handling in qdev_set_id, Kevin Wolf, 2021/10/15
- [PULL 15/15] vl: Enable JSON syntax for -device, Kevin Wolf, 2021/10/15
- Re: [PULL 00/15] qdev: Add JSON -device, Richard Henderson, 2021/10/15