On 30/10/20 16:37, Philippe Mathieu-Daudé wrote:
> We removed the global_locking field in commit 4174495408a,
> leaving dead code around the 'unlocked' variable. Remove it
> to fix the DEADCODE issue reported by Coverity (CID 1432876).
>
> Fixes: 4174495408a ("exec: Remove MemoryRegion::global_locking field")
> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> ---
> softmmu/physmem.c | 10 +---------
> 1 file changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/softmmu/physmem.c b/softmmu/physmem.c
> index a9adedb9f82..0b31be29282 100644
> --- a/softmmu/physmem.c
> +++ b/softmmu/physmem.c
> @@ -2723,22 +2723,14 @@ static int memory_access_size(MemoryRegion *mr,
> unsigned l, hwaddr addr)
>
> static bool prepare_mmio_access(MemoryRegion *mr)
> {
> - bool unlocked = !qemu_mutex_iothread_locked();
> bool release_lock = false;
>
> - if (unlocked) {
> + if (!qemu_mutex_iothread_locked()) {
> qemu_mutex_lock_iothread();
> - unlocked = false;
> release_lock = true;
> }
> if (mr->flush_coalesced_mmio) {
> - if (unlocked) {
> - qemu_mutex_lock_iothread();
> - }
> qemu_flush_coalesced_mmio_buffer();
> - if (unlocked) {
> - qemu_mutex_unlock_iothread();
> - }
> }
>
> return release_lock;
>
Queued, thanks.
Paolo
