misc: fix __COUNTER__ macro to be referenced properly
PATCH 1/1 misc: fix __COUNTER__ macro to be referenced properly
From: danbrodsky <[email protected]>
- __COUNTER__ doesn't work with ## concat
- replaced ## with glue() macro so __COUNTER__ is evaluated
--- include/qemu/lockable.h | 2 +- include/qemu/rcu.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/qemu/lockable.h +1 -1
@@ -170,7 +170,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(QemuLockable, qemu_lockable_auto_unlock)* } */ #define QEMU_LOCK_GUARD (x) \ - g_autoptr(QemuLockable) qemu_lockable_auto##__COUNTER__ = \ + g_autoptr(QemuLockable) glue(qemu_lockable_auto, __COUNTER__) = \ qemu_lockable_auto_lock(QEMU_MAKE_LOCKABLE((x)))#endif
include/qemu/rcu.h +1 -1
@@ -170,7 +170,7 @@ static inline void rcu_read_auto_unlock(RCUReadAuto *r) G_DEFINE_AUTOPTR_CLEANUP_FUNC(RCUReadAuto, rcu_read_auto_unlock)#define WITH_RCU_READ_LOCK_GUARD () \ - WITH_RCU_READ_LOCK_GUARD_(_rcu_read_auto##__COUNTER__) + WITH_RCU_READ_LOCK_GUARD_(glue(_rcu_read_auto, __COUNTER__))#define WITH_RCU_READ_LOCK_GUARD_ (var) \ for (g_autoptr(RCUReadAuto) var = rcu_read_auto_lock(); \
Signature · 1 line
2.25.1
PATCH 1/1 lockable: replaced locks with lock guard macros where appropriate
From: danbrodsky <[email protected]>
- ran regexp "qemu_mutex_lock\(.*\).*\n.*if" to find targets
- replaced result with QEMU_LOCK_GUARD if all unlocks at function end
- replaced result with WITH_QEMU_LOCK_GUARD if unlock not at end
--- block/iscsi.c | 23 +++++++------------ block/nfs.c | 53 ++++++++++++++++++++----------------------- cpus-common.c | 13 ++++------- hw/display/qxl.c | 44 +++++++++++++++++------------------ hw/vfio/platform.c | 4 +--- migration/migration.c | 3 +-- migration/multifd.c | 8 +++---- migration/ram.c | 3 +-- monitor/misc.c | 4 +--- ui/spice-display.c | 14 ++++++------ util/log.c | 4 ++-- util/qemu-timer.c | 17 +++++++------- util/rcu.c | 8 +++---- util/thread-pool.c | 3 +-- util/vfio-helpers.c | 4 ++-- 15 files changed, 90 insertions(+), 115 deletions(-)
block/iscsi.c +8 -15
@@ -1086,23 +1086,21 @@ static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, acb->task->expxferlen = acb->ioh->dxfer_len; data.size =0 ; -qemu_mutex_lock (&iscsilun->mutex); +QEMU_LOCK_GUARD (&iscsilun->mutex);if (acb->task->xfer_dir ==SCSI_XFER_WRITE ) {if (acb->ioh->iovec_count ==0 ) { data.data = acb->ioh->dxferp; data.size = acb->ioh->dxfer_len; }else {scsi_task_set_iov_out (acb->task, - (struct scsi_iovec *) acb->ioh->dxferp, - acb->ioh->iovec_count); + (struct scsi_iovec *)acb->ioh->dxferp, + acb->ioh->iovec_count); } }if (iscsi_scsi_command_async (iscsi, iscsilun->lun, acb->task, iscsi_aio_ioctl_cb, - (data.size >0 ) ? &data :NULL , - acb) !=0 ) { -qemu_mutex_unlock (&iscsilun->mutex); + (data.size >0 ) ? &data :NULL , acb) !=0 ) {scsi_free_scsi_task (acb->task);qemu_aio_unref (acb);return NULL ;
@@ -1111,18 +1109,16 @@ static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs,/* tell libiscsi to read straight into the buffer we got from ioctl */ if (acb->task->xfer_dir ==SCSI_XFER_READ ) {if (acb->ioh->iovec_count ==0 ) { -scsi_task_add_data_in_buffer (acb->task, - acb->ioh->dxfer_len, +scsi_task_add_data_in_buffer (acb->task, acb->ioh->dxfer_len, acb->ioh->dxferp); }else {scsi_task_set_iov_in (acb->task, - (struct scsi_iovec *) acb->ioh->dxferp, + (struct scsi_iovec *)acb->ioh->dxferp, acb->ioh->iovec_count); } }iscsi_set_events (iscsilun); -qemu_mutex_unlock (&iscsilun->mutex);return &acb->common; }
@@ -1395,20 +1391,17 @@ static void iscsi_nop_timed_event(void *opaque) {IscsiLun *iscsilun = opaque; -qemu_mutex_lock (&iscsilun->mutex); +QEMU_LOCK_GUARD (&iscsilun->mutex);if (iscsi_get_nops_in_flight (iscsilun->iscsi) >=MAX_NOP_FAILURES ) {error_report ("iSCSI: NOP timeout. Reconnecting..." ); iscsilun->request_timed_out = true; }else if (iscsi_nop_out_async (iscsilun->iscsi,NULL ,NULL ,0 ,NULL ) !=0 ) {error_report ("iSCSI: failed to sent NOP-Out. Disabling NOP messages." ); - goto out; +return ; }timer_mod (iscsilun->nop_timer,qemu_clock_get_ms (QEMU_CLOCK_REALTIME ) +NOP_INTERVAL );iscsi_set_events (iscsilun); - -out: -qemu_mutex_unlock (&iscsilun->mutex); }static void iscsi_readcapacity_sync (IscsiLun *iscsilun,Error **errp)
block/nfs.c +25 -28
81 lines not on this page · raw message
cpus-common.c +5 -8
@@ -22,6 +22,7 @@#include "exec/cpu-common.h" #include "hw/core/cpu.h" #include "sysemu/cpus.h" +#include "qemu/lockable.h" static QemuMutex qemu_cpu_list_lock;static QemuCond exclusive_cond;
@@ -71,7 +72,7 @@ static int cpu_get_free_index(void)void cpu_list_add (CPUState *cpu) { -qemu_mutex_lock (&qemu_cpu_list_lock); +QEMU_LOCK_GUARD (&qemu_cpu_list_lock);if (cpu->cpu_index ==UNASSIGNED_CPU_INDEX ) { cpu->cpu_index =cpu_get_free_index ();assert (cpu->cpu_index !=UNASSIGNED_CPU_INDEX );
@@ -79,12 +80,11 @@ void cpu_list_add(CPUState *cpu)assert (!cpu_index_auto_assigned); }QTAILQ_INSERT_TAIL_RCU (&cpus, cpu, node); -qemu_mutex_unlock (&qemu_cpu_list_lock); }void cpu_list_remove (CPUState *cpu) { -qemu_mutex_lock (&qemu_cpu_list_lock); +QEMU_LOCK_GUARD (&qemu_cpu_list_lock);if (!QTAILQ_IN_USE (cpu, node)) {/* there is nothing to undo since cpu_exec_init() hasn't been called */ qemu_mutex_unlock (&qemu_cpu_list_lock);
@@ -95,7 +95,6 @@ void cpu_list_remove(CPUState *cpu)QTAILQ_REMOVE_RCU (&cpus, cpu, node); cpu->cpu_index =UNASSIGNED_CPU_INDEX ; -qemu_mutex_unlock (&qemu_cpu_list_lock); }struct qemu_work_item {
@@ -237,7 +236,7 @@ void cpu_exec_start(CPUState *cpu)* see cpu->running == true, and it will kick the CPU. */ if (unlikely (atomic_read (&pending_cpus))) { -qemu_mutex_lock (&qemu_cpu_list_lock); +QEMU_LOCK_GUARD (&qemu_cpu_list_lock);if (!cpu->has_waiter) {/* Not counted in pending_cpus, let the exclusive item * run. Since we have the lock, just set cpu->running to true
@@ -252,7 +251,6 @@ void cpu_exec_start(CPUState *cpu)* waiter at cpu_exec_end. */ } -qemu_mutex_unlock (&qemu_cpu_list_lock); } }
@@ -280,7 +278,7 @@ void cpu_exec_end(CPUState *cpu)* next cpu_exec_start. */ if (unlikely (atomic_read (&pending_cpus))) { -qemu_mutex_lock (&qemu_cpu_list_lock); +QEMU_LOCK_GUARD (&qemu_cpu_list_lock);if (cpu->has_waiter) { cpu->has_waiter = false;atomic_set (&pending_cpus, pending_cpus -1 );
@@ -288,7 +286,6 @@ void cpu_exec_end(CPUState *cpu)qemu_cond_signal (&exclusive_cond); } } -qemu_mutex_unlock (&qemu_cpu_list_lock); } }
hw/display/qxl.c +21 -23
78 lines not on this page · raw message
hw/vfio/platform.c +1 -3
@@ -216,7 +216,7 @@ static void vfio_intp_interrupt(VFIOINTp *intp)VFIOPlatformDevice *vdev = intp->vdev;bool delay_handling = false; -qemu_mutex_lock (&vdev->intp_mutex); +QEMU_LOCK_GUARD (&vdev->intp_mutex);if (intp->state ==VFIO_IRQ_INACTIVE ) { QLIST_FOREACH(tmp, &vdev->intp_list, next) { if (tmp->state == VFIO_IRQ_ACTIVE ||
@@ -236,7 +236,6 @@ static void vfio_intp_interrupt(VFIOINTp *intp)QSIMPLEQ_INSERT_TAIL (&vdev->pending_intp_queue, intp, pqnext); ret =event_notifier_test_and_clear (intp->interrupt); -qemu_mutex_unlock (&vdev->intp_mutex);return ; }
@@ -266,7 +265,6 @@ static void vfio_intp_interrupt(VFIOINTp *intp)qemu_clock_get_ms (QEMU_CLOCK_VIRTUAL ) + vdev->mmap_timeout); } -qemu_mutex_unlock (&vdev->intp_mutex); }/**
migration/migration.c +1 -2
@@ -1652,11 +1652,10 @@ static void migrate_fd_cleanup_bh(void *opaque)void migrate_set_error (MigrationState *s,const Error *error) { -qemu_mutex_lock (&s->error_mutex); +QEMU_LOCK_GUARD (&s->error_mutex);if (!s->error) { s->error =error_copy (error); } -qemu_mutex_unlock (&s->error_mutex); }void migrate_fd_error (MigrationState *s,const Error *error)
migration/multifd.c +4 -4
@@ -894,11 +894,11 @@ void multifd_recv_sync_main(void)for (i =0 ; i <migrate_multifd_channels (); i++) {MultiFDRecvParams *p = &multifd_recv_state->params[i]; -qemu_mutex_lock (&p->mutex); -if (multifd_recv_state->packet_num < p->packet_num) { - multifd_recv_state->packet_num = p->packet_num; + WITH_QEMU_LOCK_GUARD(&p->mutex) { +if (multifd_recv_state->packet_num < p->packet_num) { + multifd_recv_state->packet_num = p->packet_num; + } } -qemu_mutex_unlock (&p->mutex);trace_multifd_recv_sync_main_signal (p->id);qemu_sem_post (&p->sem_sync); }
migration/ram.c +1 -2
@@ -1368,7 +1368,7 @@ static RAMBlock *unqueue_page(RAMState *rs, ram_addr_t *offset)return NULL ; } -qemu_mutex_lock (&rs->src_page_req_mutex); +QEMU_LOCK_GUARD (&rs->src_page_req_mutex);if (!QSIMPLEQ_EMPTY (&rs->src_page_requests)) {struct RAMSrcPageRequest *entry =QSIMPLEQ_FIRST (&rs->src_page_requests);
@@ -1385,7 +1385,6 @@ static RAMBlock *unqueue_page(RAMState *rs, ram_addr_t *offset)migration_consume_urgent_request (); } } -qemu_mutex_unlock (&rs->src_page_req_mutex);return block; }
monitor/misc.c +1 -3
@@ -1473,7 +1473,7 @@ AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id,MonFdsetFd *mon_fdset_fd;AddfdInfo *fdinfo; -qemu_mutex_lock (&mon_fdsets_lock); +QEMU_LOCK_GUARD (&mon_fdsets_lock);if (has_fdset_id) { QLIST_FOREACH(mon_fdset, &mon_fdsets, next) {/* Break if match found or match impossible due to ordering by ID */
@@ -1494,7 +1494,6 @@ AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id,if (fdset_id <0 ) {error_setg (errp,QERR_INVALID_PARAMETER_VALUE ,"fdset-id" ,"a non-negative value" ); -qemu_mutex_unlock (&mon_fdsets_lock);return NULL ; }/* Use specified fdset ID */
@@ -1545,7 +1544,6 @@ AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id, fdinfo->fdset_id = mon_fdset->id; fdinfo->fd = mon_fdset_fd->fd; -qemu_mutex_unlock (&mon_fdsets_lock);return fdinfo; }
ui/spice-display.c +7 -7
@@ -18,6 +18,7 @@#include "qemu/osdep.h" #include "ui/qemu-spice.h" #include "qemu/timer.h" +#include "qemu/lockable.h" #include "qemu/main-loop.h" #include "qemu/option.h" #include "qemu/queue.h"
@@ -483,12 +484,12 @@ void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd) {graphic_hw_update (ssd->dcl.con); -qemu_mutex_lock (&ssd->lock); -if (QTAILQ_EMPTY (&ssd->updates) && ssd->ds) { -qemu_spice_create_update (ssd); - ssd->notify++; + WITH_QEMU_LOCK_GUARD(&ssd->lock) { +if (QTAILQ_EMPTY (&ssd->updates) && ssd->ds) { +qemu_spice_create_update (ssd); + ssd->notify++; + } } -qemu_mutex_unlock (&ssd->lock);trace_qemu_spice_display_refresh (ssd->qxl.id, ssd->notify);if (ssd->notify) {
@@ -580,7 +581,7 @@ static int interface_get_cursor_command(QXLInstance *sin, QXLCommandExt *ext)SimpleSpiceDisplay *ssd =container_of (sin, SimpleSpiceDisplay, qxl);int ret; -qemu_mutex_lock (&ssd->lock); +QEMU_LOCK_GUARD (&ssd->lock);if (ssd->ptr_define) { *ext = ssd->ptr_define->ext; ssd->ptr_define =NULL ;
@@ -592,7 +593,6 @@ static int interface_get_cursor_command(QXLInstance *sin, QXLCommandExt *ext) }else { ret = false; } -qemu_mutex_unlock (&ssd->lock);return ret; }
util/log.c +2 -2
@@ -25,6 +25,7 @@#include "qemu/cutils.h" #include "trace/control.h" #include "qemu/thread.h" +#include "qemu/lockable.h" static char *logfilename;static QemuMutex qemu_logfile_mutex;
@@ -94,7 +95,7 @@ void qemu_set_log(int log_flags)if (qemu_loglevel && (!is_daemonized () || logfilename)) { need_to_open_file = true; } -qemu_mutex_lock (&qemu_logfile_mutex); +QEMU_LOCK_GUARD (&qemu_logfile_mutex);if (qemu_logfile && !need_to_open_file) { logfile = qemu_logfile;atomic_rcu_set (&qemu_logfile,NULL );
@@ -136,7 +137,6 @@ void qemu_set_log(int log_flags) }atomic_rcu_set (&qemu_logfile, logfile); } -qemu_mutex_unlock (&qemu_logfile_mutex); }void qemu_log_needs_buffers (void )
util/qemu-timer.c +8 -9
@@ -459,17 +459,16 @@ void timer_mod_anticipate_ns(QEMUTimer *ts, int64_t expire_time)QEMUTimerList *timer_list = ts->timer_list;bool rearm; -qemu_mutex_lock (&timer_list->active_timers_lock); -if (ts->expire_time ==-1 || ts->expire_time > expire_time) { -if (ts->expire_time !=-1 ) { -timer_del_locked (timer_list, ts); + WITH_QEMU_LOCK_GUARD(&timer_list->active_timers_lock) { +if (ts->expire_time ==-1 || ts->expire_time > expire_time) { +if (ts->expire_time !=-1 ) { +timer_del_locked (timer_list, ts); + } + rearm =timer_mod_ns_locked (timer_list, ts, expire_time); + }else { + rearm = false; } - rearm =timer_mod_ns_locked (timer_list, ts, expire_time); - }else { - rearm = false; } -qemu_mutex_unlock (&timer_list->active_timers_lock); -if (rearm) {timerlist_rearm (timer_list); }
util/rcu.c +3 -5
@@ -31,6 +31,7 @@#include "qemu/atomic.h" #include "qemu/thread.h" #include "qemu/main-loop.h" +#include "qemu/lockable.h" #if defined(CONFIG_MALLOC_TRIM )#include <malloc.h> #endif
@@ -141,14 +142,14 @@ static void wait_for_readers(void)void synchronize_rcu (void ) { -qemu_mutex_lock (&rcu_sync_lock); +QEMU_LOCK_GUARD (&rcu_sync_lock);/* Write RCU-protected pointers before reading p_rcu_reader->ctr. * Pairs with smp_mb_placeholder() in rcu_read_lock(). */ smp_mb_global (); -qemu_mutex_lock (&rcu_registry_lock); +QEMU_LOCK_GUARD (&rcu_registry_lock);if (!QLIST_EMPTY (®istry)) {/* In either case, the atomic_mb_set below blocks stores that free * old RCU-protected pointers.
@@ -169,9 +170,6 @@ void synchronize_rcu(void)wait_for_readers (); } - -qemu_mutex_unlock (&rcu_registry_lock); -qemu_mutex_unlock (&rcu_sync_lock); }
util/thread-pool.c +1 -2
@@ -210,7 +210,7 @@ static void thread_pool_cancel(BlockAIOCB *acb)trace_thread_pool_cancel (elem, elem->common.opaque); -qemu_mutex_lock (&pool->lock); +QEMU_LOCK_GUARD (&pool->lock); if (elem->state == THREAD_QUEUED &&/* No thread has yet started working on elem. we can try to "steal" * the item from the worker if we can get a signal from the
@@ -225,7 +225,6 @@ static void thread_pool_cancel(BlockAIOCB *acb) elem->ret = -ECANCELED ; } -qemu_mutex_unlock (&pool->lock); }static AioContext *thread_pool_get_aio_context (BlockAIOCB *acb)
util/vfio-helpers.c +2 -2
@@ -21,6 +21,7 @@#include "standard-headers/linux/pci_regs.h" #include "qemu/event_notifier.h" #include "qemu/vfio-helpers.h" +#include "qemu/lockable.h" #include "trace.h" #define QEMU_VFIO_DEBUG 0
@@ -667,14 +668,13 @@ int qemu_vfio_dma_reset_temporary(QEMUVFIOState *s) .size = QEMU_VFIO_IOVA_MAX - s->high_water_mark, };trace_qemu_vfio_dma_reset_temporary (s); -qemu_mutex_lock (&s->lock); +QEMU_LOCK_GUARD (&s->lock);if (ioctl (s->container,VFIO_IOMMU_UNMAP_DMA , &unmap)) {error_report ("VFIO_UNMAP_DMA failed: %s" ,strerror (errno));qemu_mutex_unlock (&s->lock);return -errno; } s->high_water_mark =QEMU_VFIO_IOVA_MAX ; -qemu_mutex_unlock (&s->lock);return 0 ; }
Signature · 1 line
2.25.1
Re: [PATCH] lockable: replaced locks with lock guard macros where appropriate
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the asan build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1 === TEST SCRIPT END ===
CC trace-root.o
CC accel/kvm/trace.o
CC accel/tcg/trace.o
/tmp/qemu-test/src/util/thread-pool.c:213:5: error: unused variable 'qemu_lockable_auto__COUNTER__' [-Werror,-Wunused-variable]
QEMU_LOCK_GUARD(&pool->lock);
^/tmp/qemu-test/src/include/qemu/lockable.h:173:29: note: expanded from macro 'QEMU_LOCK_GUARD'
---qemu_lockable_auto__COUNTER__
^
1 error generated.
make: *** [/tmp/qemu-test/src/rules.mak:69: util/thread-pool.o] Error 1
make: *** Waiting for unfinished jobs....
CC backends/trace.o/tmp/qemu-test/src/util/rcu.c:152:5: error: redefinition of 'qemu_lockable_auto__COUNTER__'
QEMU_LOCK_GUARD(&rcu_registry_lock);
^/tmp/qemu-test/src/include/qemu/lockable.h:173:29: note: expanded from macro 'QEMU_LOCK_GUARD'
---qemu_lockable_auto__COUNTER__
^
1 error generated.
make: *** [/tmp/qemu-test/src/rules.mak:69: util/rcu.o] Error 1 /tmp/qemu-test/src/util/vfio-helpers.c:671:5: error: unused variable 'qemu_lockable_auto__COUNTER__' [-Werror,-Wunused-variable]
QEMU_LOCK_GUARD(&s->lock);
^/tmp/qemu-test/src/include/qemu/lockable.h:173:29: note: expanded from macro 'QEMU_LOCK_GUARD'
---qemu_lockable_auto__COUNTER__
^
1 error generated.
make: *** [/tmp/qemu-test/src/rules.mak:69: util/vfio-helpers.o] Error 1 /tmp/qemu-test/src/util/log.c:98:5: error: unused variable 'qemu_lockable_auto__COUNTER__' [-Werror,-Wunused-variable]
QEMU_LOCK_GUARD(&qemu_logfile_mutex);
^/tmp/qemu-test/src/include/qemu/lockable.h:173:29: note: expanded from macro 'QEMU_LOCK_GUARD'
---qemu_lockable_auto__COUNTER__
^
1 error generated.
make: *** [/tmp/qemu-test/src/rules.mak:69: util/log.o] Error 1
Traceback (most recent call last):
File "./tests/docker/docker.py", line 664, in <module>
sys.exit(main())
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=45b667b7aa8a4261818bebb78971bc11', '-u', '1003', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=x86_64-softmmu', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew2/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-p_chzwm4/src/docker-src.2020-03-19-15.28.32.10188:/var/tmp/qemu:z,ro', 'qemu:fedora', '/var/tmp/qemu/run', 'test-debug']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=45b667b7aa8a4261818bebb78971bc11
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-p_chzwm4/src'
make: *** [docker-run-test-debug@fedora] Error 2
real 2m54.468s
user 0m7.639s
The full log is available at
http://patchew.org/logs/[email protected]/testing.asan/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Re: [PATCH] lockable: replaced locks with lock guard macros where appropriate
Quoted 17 lines · On 3/19/20 2:31 PM, [email protected] wrote:
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the asan build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1 === TEST SCRIPT END ===
Quoted 7 lines
CC trace-root.o CC accel/kvm/trace.o CC accel/tcg/trace.o /tmp/qemu-test/src/util/thread-pool.c:213:5: error: unused variable 'qemu_lockable_auto__COUNTER__' [-Werror,-Wunused-variable] QEMU_LOCK_GUARD(&pool->lock); ^
/tmp/qemu-test/src/include/qemu/lockable.h:173:29: note: expanded from macro 'QEMU_LOCK_GUARD'
Hmm. This one is a different failure than the other patchew warnings about variable redefinition; but is still evidence that it is missing your "[PATCH] misc: fix __COUNTER__ macro to be referenced properly". At any rate, the fact that we have a compiler warning about an unused variable (when in reality it IS used by the auto-cleanup attribute) is annoying; we may have to further tweak QEMU_LOCK_GUARD to add an __attribute__((unused)) to shut up this particular compiler false positive.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH] lockable: replaced locks with lock guard macros where appropriate
In reply to [email protected]Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-quick@centos7 build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===
CC hw/i2c/trace.o
In file included from /tmp/qemu-test/src/util/rcu.c:34:0:/tmp/qemu-test/src/util/rcu.c: In function 'synchronize_rcu':/tmp/qemu-test/src/include/qemu/lockable.h:173:29: error: redefinition of 'qemu_lockable_auto__COUNTER__'
g_autoptr(QemuLockable) qemu_lockable_auto##__COUNTER__ = \
^
/tmp/qemu-test/src/util/rcu.c:152:5: note: in expansion of macro 'QEMU_LOCK_GUARD'
---
/tmp/qemu-test/src/util/rcu.c:145:5: note: in expansion of macro 'QEMU_LOCK_GUARD'
QEMU_LOCK_GUARD(&rcu_sync_lock);
^make: *** [util/rcu.o] Error 1
make: *** Waiting for unfinished jobs....
CC hw/i386/trace.o
Traceback (most recent call last):
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=a933fe13ee2642d4bc80a6fa2e811043', '-u', '1003', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew2/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-uea2fvv2/src/docker-src.2020-03-19-15.37.40.16923:/var/tmp/qemu:z,ro', 'qemu:centos7', '/var/tmp/qemu/run', 'test-quick']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=a933fe13ee2642d4bc80a6fa2e811043
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-uea2fvv2/src'
make: *** [docker-run-test-quick@centos7] Error 2
real 1m40.963s
user 0m8.233s
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Re: [PATCH] lockable: replaced locks with lock guard macros where appropriate
Quoted 16 lines · On 3/19/20 2:39 PM, [email protected] wrote:
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-quick@centos7 build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===
Quoted 5 lines
CC
hw/i2c/trace.o
In file included from/tmp/qemu-test/src/util/rcu.c:34:0:/tmp/qemu-test/src/util/rcu.c: In function 'synchronize_rcu':/tmp/qemu-test/src/include/qemu/lockable.h:173:29: error: redefinition of 'qemu_lockable_auto__COUNTER__'g_autoptr(QemuLockable) qemu_lockable_auto##__COUNTER__ = \
Patchew was confused: you sent this message in-reply-to "[PATCH] misc: fix __COUNTER__ macro to be referenced properly" which addresses this complaint, but as you did not thread the messages 0/2, 1/2, 2/2, patchew applied this one out of sequence.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH] lockable: replaced locks with lock guard macros where appropriate
In reply to [email protected]Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-mingw@fedora build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#! /bin/bash
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
time make docker-test-mingw@fedora J=14 NETWORK=1
=== TEST SCRIPT END ===
CC trace-root.o
In file included from /tmp/qemu-test/src/util/rcu.c:34:/tmp/qemu-test/src/util/rcu.c: In function 'synchronize_rcu':/tmp/qemu-test/src/include/qemu/lockable.h:173:29: error: redefinition of 'qemu_lockable_auto__COUNTER__'
g_autoptr(QemuLockable) qemu_lockable_auto##__COUNTER__ = \
^~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/util/rcu.c:152:5: note: in expansion of macro 'QEMU_LOCK_GUARD'
---
/tmp/qemu-test/src/util/rcu.c:145:5: note: in expansion of macro 'QEMU_LOCK_GUARD'
QEMU_LOCK_GUARD(&rcu_sync_lock);
^~~~~~~~~~~~~~~make: *** [/tmp/qemu-test/src/rules.mak:69: util/rcu.o] Error 1
make: *** Waiting for unfinished jobs....
Traceback (most recent call last):
File "./tests/docker/docker.py", line 664, in <module>
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=4b63ffd2ab5f4987a0a55d2a52a064c7', '-u', '1001', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-5ena2idk/src/docker-src.2020-03-19-15.39.39.23586:/var/tmp/qemu:z,ro', 'qemu:fedora', '/var/tmp/qemu/run', 'test-mingw']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=4b63ffd2ab5f4987a0a55d2a52a064c7
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-5ena2idk/src'
make: *** [docker-run-test-mingw@fedora] Error 2
real 1m46.752s
user 0m8.628s
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Re: [PATCH] lockable: replaced locks with lock guard macros where appropriate
In reply to [email protected]Quoted 16 lines · On 3/19/20 11:19 AM, [email protected] wrote:
From: danbrodsky <[email protected]>
- ran regexp "qemu_mutex_lock\(.*\).*\n.*if" to find targets
- replaced result withQEMU_LOCK_GUARDif all unlocks at function end
- replaced result withWITH_QEMU_LOCK_GUARDif unlock not at endSigned-off-by danbrodsky <[email protected]>--- block/iscsi.c | 23 +++++++------------ block/nfs.c | 53 ++++++++++++++++++++----------------------- cpus-common.c | 13 ++++------- hw/display/qxl.c | 44 +++++++++++++++++------------------ hw/vfio/platform.c | 4 +--- migration/migration.c | 3 +-- migration/multifd.c | 8 +++---- migration/ram.c | 3 +--
Quoted 8 lines
monitor/misc.c | 4 +--- ui/spice-display.c | 14 ++++++------ util/log.c | 4 ++-- util/qemu-timer.c | 17 +++++++------- util/rcu.c | 8 +++---- util/thread-pool.c | 3 +-- util/vfio-helpers.c | 4 ++-- 15 files changed, 90 insertions(+), 115 deletions(-)
That's a rather big patch touching multiple areas of code at once; I'm not sure if it would be easier to review if you were to break it up into a series of smaller patches each touching a smaller group of related files. For example, I don't mind reviwing block/, but tend to shy away from migration/ code.
Quoted 11 lines
block/iscsi.c +1
-1@@ -1086,23 +1086,21 @@ static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, acb->task->expxferlen = acb->ioh->dxfer_len; data.size =0 ; -qemu_mutex_lock (&iscsilun->mutex); +QEMU_LOCK_GUARD (&iscsilun->mutex);
block/iscsi.c static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, · line 1097
Quoted 10 lines
block/iscsi.c +2
-2if (acb->task->xfer_dir ==SCSI_XFER_WRITE ) {if (acb->ioh->iovec_count ==0 ) { data.data = acb->ioh->dxferp; data.size = acb->ioh->dxfer_len; }else {scsi_task_set_iov_out (acb->task, - (struct scsi_iovec *) acb->ioh->dxferp, - acb->ioh->iovec_count); + (struct scsi_iovec *)acb->ioh->dxferp, + acb->ioh->iovec_count);
This looks like a spurious whitespace change. Why is it part of the patch?
block/iscsi.c static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, · line 1104
Quoted 10 lines
block/iscsi.c +1
-3} }if (iscsi_scsi_command_async (iscsi, iscsilun->lun, acb->task, iscsi_aio_ioctl_cb, - (data.size >0 ) ? &data :NULL , - acb) !=0 ) { -qemu_mutex_unlock (&iscsilun->mutex); + (data.size >0 ) ? &data :NULL , acb) !=0 ) {scsi_free_scsi_task (acb->task);
Unwrapping the line fit in 80 columns, but again, why are you mixing whitespace changes in rather than focusing on the cleanup of mutex actions? Did you create this patch mechanically with a tool like Coccinelle, as the source of your reflowing of lines? If so, what was the input to Coccinelle; if it was some other automated tool, can you include the formula so that someone else could reproduce your changes (whitespace and all)? If it was not automated, that's also okay, but then I would not expect as much whitespace churn.
block/iscsi.c static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, · line 1117
Quoted 13 lines
block/iscsi.c +2
-3@@ -1111,18 +1109,16 @@ static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs,/* tell libiscsi to read straight into the buffer we got from ioctl */ if (acb->task->xfer_dir ==SCSI_XFER_READ ) {if (acb->ioh->iovec_count ==0 ) { -scsi_task_add_data_in_buffer (acb->task, - acb->ioh->dxfer_len, +scsi_task_add_data_in_buffer (acb->task, acb->ioh->dxfer_len, acb->ioh->dxferp); }else {scsi_task_set_iov_in (acb->task, - (struct scsi_iovec *) acb->ioh->dxferp, + (struct scsi_iovec *)acb->ioh->dxferp, acb->ioh->iovec_count);
Again, spurious whitespace changes.
Quoted 19 lines
block/iscsi.c +1
-2} }iscsi_set_events (iscsilun); -qemu_mutex_unlock (&iscsilun->mutex);return &acb->common; }@@ -1395,20 +1391,17 @@ static void iscsi_nop_timed_event(void *opaque) {IscsiLun *iscsilun = opaque; -qemu_mutex_lock (&iscsilun->mutex); +QEMU_LOCK_GUARD (&iscsilun->mutex);if (iscsi_get_nops_in_flight (iscsilun->iscsi) >=MAX_NOP_FAILURES ) {error_report ("iSCSI: NOP timeout. Reconnecting..." ); iscsilun->request_timed_out = true; }else if (iscsi_nop_out_async (iscsilun->iscsi,NULL ,NULL ,0 ,NULL ) !=0 ) {error_report ("iSCSI: failed to sent NOP-Out. Disabling NOP messages." );
block/iscsi.c static void iscsi_nop_timed_event(void *opaque) · line 1405
Quoted 10 lines
block/iscsi.c +1
-4- goto out; +return ; }timer_mod (iscsilun->nop_timer,qemu_clock_get_ms (QEMU_CLOCK_REALTIME ) +NOP_INTERVAL );iscsi_set_events (iscsilun); - -out: -qemu_mutex_unlock (&iscsilun->mutex); }
But the cleanup itself is functionally correct in this file.
Quoted 19 lines
block/iscsi.c +0
-0static void iscsi_readcapacity_sync (IscsiLun *iscsilun,Error **errp)block/nfs.c +3
-6@@ -273,15 +273,14 @@ static int coroutine_fn nfs_co_preadv(BlockDriverState *bs, uint64_t offset,nfs_co_init_task (bs, &task); task.iov = iov; -qemu_mutex_lock (&client->mutex); -if (nfs_pread_async (client->context, client->fh, - offset, bytes, nfs_co_generic_cb, &task) !=0 ) { -qemu_mutex_unlock (&client->mutex); -return -ENOMEM ; - } + WITH_QEMU_LOCK_GUARD(&client->mutex) { +if (nfs_pread_async (client->context, client->fh, + offset, bytes, nfs_co_generic_cb, &task) !=0 ) {
block/nfs.c static int coroutine_fn nfs_co_preadv(BlockDriverState *bs, uint64_t offset, · line 286
Quoted 10 lines
block/nfs.c +4
-2+return -ENOMEM ; + } -nfs_set_events (client); -qemu_mutex_unlock (&client->mutex); +nfs_set_events (client); + }while (!task.complete) {qemu_coroutine_yield (); }
This one also looks correct.
block/nfs.c static int coroutine_fn nfs_co_preadv(BlockDriverState *bs, uint64_t offset, · line 293
Quoted 7 lines
block/nfs.c +1
-1@@ -290,7 +289,7 @@ static int coroutine_fn nfs_co_preadv(BlockDriverState *bs, uint64_t offset,return task.ret; } -/* zero pad short reads */ +/* zero pad short reads */ if (task.ret < iov->size) {
Another spurious whitespace change; in fact, the indentation on the comment is now wrong.
block/nfs.c static int coroutine_fn nfs_co_preadv(BlockDriverState *bs, uint64_t offset, · line 294
Quoted 1 line
block/nfs.c +1
-0+++ b/cpus-common.c
And that's as far as I feel comfortable reviewing.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Re: [PATCH] lockable: replaced locks with lock guard macros where appropriate
Quoted 27 lines · Eric Blake
Quoted 16 lines · On 3/19/20 11:19 AM, [email protected] wrote:
From: danbrodsky <[email protected]>
- ran regexp "qemu_mutex_lock\(.*\).*\n.*if" to find targets
- replaced result withQEMU_LOCK_GUARDif all unlocks at function end
- replaced result withWITH_QEMU_LOCK_GUARDif unlock not at endSigned-off-by danbrodsky <[email protected]>--- block/iscsi.c | 23 +++++++------------ block/nfs.c | 53 ++++++++++++++++++++----------------------- cpus-common.c | 13 ++++------- hw/display/qxl.c | 44 +++++++++++++++++------------------ hw/vfio/platform.c | 4 +--- migration/migration.c | 3 +-- migration/multifd.c | 8 +++---- migration/ram.c | 3 +--Quoted 8 lines
monitor/misc.c | 4 +--- ui/spice-display.c | 14 ++++++------ util/log.c | 4 ++-- util/qemu-timer.c | 17 +++++++------- util/rcu.c | 8 +++---- util/thread-pool.c | 3 +-- util/vfio-helpers.c | 4 ++-- 15 files changed, 90 insertions(+), 115 deletions(-)
Quoted 5 lines
That's a rather big patch touching multiple areas of code at once; I'm not sure if it would be easier to review if you were to break it up into a series of smaller patches each touching a smaller group of related files. For example, I don't mind reviwing
block/, but tend to shy away from migration/ code.
Is this necessary for a series of fairly basic changes? Most files are only modified on 1 or 2 lines.
Quoted 7 lines
block/iscsi.c static BlockAIOCB
Quoted 7 lines
block/iscsi.c +0
-0@@ -1086,23 +1086,21 @@ static BlockAIOCB
*iscsi_aio_ioctl(BlockDriverState *bs,
Quoted 12 lines
block/iscsi.c static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs,
Quoted 12 lines
block/iscsi.c +1
-2acb->task->expxferlen = acb->ioh->dxfer_len; data.size =0 ; -qemu_mutex_lock (&iscsilun->mutex); +QEMU_LOCK_GUARD (&iscsilun->mutex);if (acb->task->xfer_dir ==SCSI_XFER_WRITE ) {if (acb->ioh->iovec_count ==0 ) { data.data = acb->ioh->dxferp; data.size = acb->ioh->dxfer_len; }else { scsi_task_set_iov_out(acb->task, - (struct scsi_iovec *)
acb->ioh->dxferp,
Quoted 2 lines
block/iscsi.c static BlockAIOCB · line 1096
Quoted 2 lines
block/iscsi.c +1
-1- acb->ioh->iovec_count); + (struct scsi_iovec
*)acb->ioh->dxferp,
Quoted 3 lines
block/iscsi.c static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, · line 1097
Quoted 1 line
block/iscsi.c +1
-0+ acb->ioh->iovec_count);This looks like a spurious whitespace change. Why is it part of the
patch?
Quoted 1 line
Sorry, it looks like my editor was autoformatting some areas of the text. I'll remove
those changes in the next version.
Quoted 9 lines
block/iscsi.c static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs,
Quoted 9 lines
block/iscsi.c +1
-3} }if (iscsi_scsi_command_async (iscsi, iscsilun->lun, acb->task, iscsi_aio_ioctl_cb, - (data.size >0 ) ? &data :NULL , - acb) !=0 ) { -qemu_mutex_unlock (&iscsilun->mutex); + (data.size > 0) ? &data : NULL, acb)
!= 0) {
Quoted 11 lines
block/iscsi.c static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, · line 1104
Quoted 1 line
block/iscsi.c +0
-0scsi_free_scsi_task (acb->task);Unwrapping the line fit in 80 columns, but again, why are you mixing whitespace changes in rather than focusing on the cleanup of mutex actions? Did you create this patch mechanically with a tool like Coccinelle, as the source of your reflowing of lines? If so, what was the input to Coccinelle; if it was some other automated tool, can you include the formula so that someone else could reproduce your changes (whitespace and all)? If it was not automated, that's also okay, but then I would not expect as much whitespace churn.
Should I not be including changes that fix warnings in code check? I'll correct
the mistakes and submit a new version without all the whitespace churn.
Quoted 6 lines · On 3/19/20 11:19 AM, [email protected] wrote:
From: danbrodsky <[email protected]>
-
__COUNTER__doesn't work with ## concat
- replaced ## withglue()macro so__COUNTER__is evaluatedSigned-off-by danbrodsky <[email protected]>
Thanks - this appears to be your first contribution to qemu.
Typically, the S-o-b should match how you would spell your legal name, rather than being a single-word computer user name.
It looks like you threaded another message to this one:
Message-Id: <[email protected]>
Subject: [PATCH] lockable: replaced locks with lock guard macros where
appropriate
but without a 0/2 cover letter, or even a 1/2 or 2/2 indicator on the individual patches. This makes it more likely that the second patch may be overlooked by our CI tools.
Since this patch is fixing an issue that just went into the tree recently, it would be useful to add mention of that in the commit message:
In fact, using 'lockable:' rather than 'misc:' as your subject prefix makes it more obvious that you are fixing an issue in the same area as where it was introduced.
More patch submission hints at https://wiki.qemu.org/Contribute/SubmitAPatch
Quoted 10 lines
--- include/qemu/lockable.h | 2 +- include/qemu/rcu.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)include/qemu/lockable.h +0
-0
include/qemu/lockable.h G_DEFINE_AUTOPTR_CLEANUP_FUNC(QemuLockable, qemu_lockable_auto_unlock) · line 173
Quoted 5 lines
include/qemu/lockable.h +1
-1@@ -170,7 +170,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(QemuLockable, qemu_lockable_auto_unlock)* } */ #define QEMU_LOCK_GUARD (x) \ - g_autoptr(QemuLockable) qemu_lockable_auto##__COUNTER__ = \ + g_autoptr(QemuLockable) glue(qemu_lockable_auto, __COUNTER__) = \
That said, the patch itself is correct.
I'll leave it up to the maintainer for this file whether they can improve your commit message (although the hardest part of that would be knowing a full proper name to use in place of your username), or if you will need to send a v2.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Quoted 16 lines · On Thu, Mar 19, 2020 at 09:19:24AM -0700, [email protected] wrote:
From: danbrodsky <[email protected]>
-
__COUNTER__doesn't work with ## concat
- replaced ## withglue()macro so__COUNTER__is evaluatedSigned-off-by danbrodsky <[email protected]>--- include/qemu/lockable.h | 2 +- include/qemu/rcu.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)include/qemu/lockable.h +0
-0
include/qemu/lockable.h G_DEFINE_AUTOPTR_CLEANUP_FUNC(QemuLockable, qemu_lockable_auto_unlock) · line 176
Quoted 8 lines
include/qemu/lockable.h +1
-1@@ -170,7 +170,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(QemuLockable, qemu_lockable_auto_unlock)* } */ #define QEMU_LOCK_GUARD (x) \ - g_autoptr(QemuLockable) qemu_lockable_auto##__COUNTER__ = \ + g_autoptr(QemuLockable) glue(qemu_lockable_auto, __COUNTER__) = \ qemu_lockable_auto_lock(QEMU_MAKE_LOCKABLE((x)))#endif
Please fix WITH_QEMU_LOCK_GUARD() too. It's in the same header file and gcc -E shows that it also fails to expand __COUNTER__:
for (__attribute__((cleanup(glib_autoptr_cleanup_QemuLockable)))
QemuLockable_autoptr qemu_lockable_auto__COUNTER__ = ...
Thanks,
Stefan