From nobody Sun May 19 13:14:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1671036468; cv=none; d=zohomail.com; s=zohoarc; b=XTOkuiRFlKpvejNmQGICQ4Q06Vaq+hx3CKMZvABZvhct3LV6oXu9toyrI6U4kjvASZXB29MgRL/GTs+RTk6Qdd0Df+qEUVwqN4FtzdmWsCwh0DIectX/Sy0XOxDWUCw+rwvK+4y7lut64kSpj4o+Vj0K7RSNvszYcFadHovM1to= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671036468; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RcwKmqhPfMUgGDy+68cWPSeAomjy56GG4doj5HAhfP8=; b=M/io7/wKJQvNdSKgYgM7sCKMopQNDVxxo0EMDGjjH+es4VutP032zgvdcOdBMto4sxcjjd6q+DAdCvPV12XWuejnoLWCtXi9vqt8jnAj/wBkR36u+BZ3X4DXyLZVjQCXcG5pQspxeIQ9rOOFz8Eh0roggfX6kzj0vcwZoZsy3rI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 167103646898830.73187039392451; Wed, 14 Dec 2022 08:47:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Uu4-0004y7-2w; Wed, 14 Dec 2022 11:46:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Utz-0004wD-SZ for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Utx-0002P5-L9 for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:39 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-454-VDOX0hltNvePFQVBa5ZkJA-1; Wed, 14 Dec 2022 11:46:33 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 208DA85C6E2; Wed, 14 Dec 2022 16:46:33 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5C2D914171BE; Wed, 14 Dec 2022 16:46:32 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3370A21E6901; Wed, 14 Dec 2022 17:46:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671036397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RcwKmqhPfMUgGDy+68cWPSeAomjy56GG4doj5HAhfP8=; b=fyNSGSTmlCmO1sa/Vf1pkGD8GRAPi9phhJ4G7OPwcW4MffyLejbmPflGzpRqzwT8HeX9Tm /pLEjkJ9K13jsjDDsO1WxUVs8lqfpn04JYZeD7ch8jxiVilHSAGdLKck6GkvLJFQeq4SUT F/ThnEq+HeWPE2IF+20a7uqlk4HjeJs= X-MC-Unique: VDOX0hltNvePFQVBa5ZkJA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Laurent Vivier Subject: [PULL 01/14] Drop more useless casts from void * to pointer Date: Wed, 14 Dec 2022 17:46:16 +0100 Message-Id: <20221214164629.919880-2-armbru@redhat.com> In-Reply-To: <20221214164629.919880-1-armbru@redhat.com> References: <20221214164629.919880-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671036470843100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Laurent Vivier Message-Id: <20221123133811.1398562-1-armbru@redhat.com> --- bsd-user/elfload.c | 2 +- contrib/plugins/cache.c | 8 ++++---- contrib/vhost-user-blk/vhost-user-blk.c | 2 +- hw/core/qdev-clock.c | 2 +- hw/hyperv/vmbus.c | 2 +- hw/net/cadence_gem.c | 2 +- hw/net/virtio-net.c | 2 +- hw/nvme/ctrl.c | 4 ++-- hw/rdma/vmw/pvrdma_cmd.c | 9 +++------ hw/rdma/vmw/pvrdma_qp_ops.c | 6 +++--- hw/virtio/virtio-iommu.c | 3 +-- linux-user/syscall.c | 2 +- target/i386/hax/hax-all.c | 2 +- tests/tcg/aarch64/system/semiheap.c | 4 ++-- util/vfio-helpers.c | 2 +- 15 files changed, 24 insertions(+), 28 deletions(-) diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index f8edb22f2a..fbcdc94b96 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -156,7 +156,7 @@ static abi_ulong copy_elf_strings(int argc, char **argv= , void **page, --p; --tmp; --len; if (--offset < 0) { offset =3D p % TARGET_PAGE_SIZE; - pag =3D (char *)page[p / TARGET_PAGE_SIZE]; + pag =3D page[p / TARGET_PAGE_SIZE]; if (!pag) { pag =3D g_try_malloc0(TARGET_PAGE_SIZE); page[p / TARGET_PAGE_SIZE] =3D pag; diff --git a/contrib/plugins/cache.c b/contrib/plugins/cache.c index ac1510aaa1..2e25184a7f 100644 --- a/contrib/plugins/cache.c +++ b/contrib/plugins/cache.c @@ -405,7 +405,7 @@ static void vcpu_mem_access(unsigned int vcpu_index, qe= mu_plugin_meminfo_t info, g_mutex_lock(&l1_dcache_locks[cache_idx]); hit_in_l1 =3D access_cache(l1_dcaches[cache_idx], effective_addr); if (!hit_in_l1) { - insn =3D (InsnData *) userdata; + insn =3D userdata; __atomic_fetch_add(&insn->l1_dmisses, 1, __ATOMIC_SEQ_CST); l1_dcaches[cache_idx]->misses++; } @@ -419,7 +419,7 @@ static void vcpu_mem_access(unsigned int vcpu_index, qe= mu_plugin_meminfo_t info, =20 g_mutex_lock(&l2_ucache_locks[cache_idx]); if (!access_cache(l2_ucaches[cache_idx], effective_addr)) { - insn =3D (InsnData *) userdata; + insn =3D userdata; __atomic_fetch_add(&insn->l2_misses, 1, __ATOMIC_SEQ_CST); l2_ucaches[cache_idx]->misses++; } @@ -440,7 +440,7 @@ static void vcpu_insn_exec(unsigned int vcpu_index, voi= d *userdata) g_mutex_lock(&l1_icache_locks[cache_idx]); hit_in_l1 =3D access_cache(l1_icaches[cache_idx], insn_addr); if (!hit_in_l1) { - insn =3D (InsnData *) userdata; + insn =3D userdata; __atomic_fetch_add(&insn->l1_imisses, 1, __ATOMIC_SEQ_CST); l1_icaches[cache_idx]->misses++; } @@ -454,7 +454,7 @@ static void vcpu_insn_exec(unsigned int vcpu_index, voi= d *userdata) =20 g_mutex_lock(&l2_ucache_locks[cache_idx]); if (!access_cache(l2_ucaches[cache_idx], insn_addr)) { - insn =3D (InsnData *) userdata; + insn =3D userdata; __atomic_fetch_add(&insn->l2_misses, 1, __ATOMIC_SEQ_CST); l2_ucaches[cache_idx]->misses++; } diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-b= lk/vhost-user-blk.c index d6932a2645..aa99877fcd 100644 --- a/contrib/vhost-user-blk/vhost-user-blk.c +++ b/contrib/vhost-user-blk/vhost-user-blk.c @@ -193,7 +193,7 @@ vub_discard_write_zeroes(VubReq *req, struct iovec *iov= , uint32_t iovcnt, =20 #if defined(__linux__) && defined(BLKDISCARD) && defined(BLKZEROOUT) VubDev *vdev_blk =3D req->vdev_blk; - desc =3D (struct virtio_blk_discard_write_zeroes *)buf; + desc =3D buf; uint64_t range[2] =3D { le64toh(desc->sector) << 9, le32toh(desc->num_sectors) << 9 }; if (type =3D=3D VIRTIO_BLK_T_DISCARD) { diff --git a/hw/core/qdev-clock.c b/hw/core/qdev-clock.c index 117f4c6ea4..82799577f3 100644 --- a/hw/core/qdev-clock.c +++ b/hw/core/qdev-clock.c @@ -134,7 +134,7 @@ void qdev_init_clocks(DeviceState *dev, const ClockPort= InitArray clocks) Clock **clkp; /* offset cannot be inside the DeviceState part */ assert(elem->offset > sizeof(DeviceState)); - clkp =3D (Clock **)(((void *) dev) + elem->offset); + clkp =3D ((void *)dev) + elem->offset; if (elem->is_output) { *clkp =3D qdev_init_clock_out(dev, elem->name); } else { diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index 30bc04e1c4..f956381cc9 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -2104,7 +2104,7 @@ static void process_message(VMBus *vmbus) goto out; } msgdata =3D hv_msg->payload; - msg =3D (struct vmbus_message_header *)msgdata; + msg =3D msgdata; =20 trace_vmbus_process_incoming_message(msg->message_type); =20 diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index 24b3a0ff66..42ea2411a2 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -1429,7 +1429,7 @@ static uint64_t gem_read(void *opaque, hwaddr offset,= unsigned size) { CadenceGEMState *s; uint32_t retval; - s =3D (CadenceGEMState *)opaque; + s =3D opaque; =20 offset >>=3D 2; retval =3D s->regs[offset]; diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index aba12759d5..fea6f43429 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -2472,7 +2472,7 @@ static size_t virtio_net_rsc_receive6(void *opq, NetC= lientState *nc, VirtioNetRscChain *chain; VirtioNetRscUnit unit; =20 - chain =3D (VirtioNetRscChain *)opq; + chain =3D opq; hdr_len =3D ((VirtIONet *)(chain->n))->guest_hdr_len; =20 if (size < (hdr_len + sizeof(struct eth_header) + sizeof(struct ip6_he= ader) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index e54276dc1d..4a0c51a947 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -4028,14 +4028,14 @@ static uint16_t nvme_zone_mgmt_recv(NvmeCtrl *n, Nv= meRequest *req) nr_zones++; } } - header =3D (NvmeZoneReportHeader *)buf; + header =3D buf; header->nr_zones =3D cpu_to_le64(nr_zones); =20 buf_p =3D buf + sizeof(NvmeZoneReportHeader); for (; zone_idx < ns->num_zones && max_zones > 0; zone_idx++) { zone =3D &ns->zone_array[zone_idx]; if (nvme_zone_matches_filter(zrasf, zone)) { - z =3D (NvmeZoneDescr *)buf_p; + z =3D buf_p; buf_p +=3D sizeof(NvmeZoneDescr); =20 z->zt =3D zone->d.zt; diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c index da7ddfa548..f5b6c3d728 100644 --- a/hw/rdma/vmw/pvrdma_cmd.c +++ b/hw/rdma/vmw/pvrdma_cmd.c @@ -269,8 +269,7 @@ static int create_cq_ring(PCIDevice *pci_dev , PvrdmaRi= ng **ring, r =3D g_malloc(sizeof(*r)); *ring =3D r; =20 - r->ring_state =3D (PvrdmaRingState *) - rdma_pci_dma_map(pci_dev, tbl[0], TARGET_PAGE_SIZE); + r->ring_state =3D rdma_pci_dma_map(pci_dev, tbl[0], TARGET_PAGE_SIZE); =20 if (!r->ring_state) { rdma_error_report("Failed to map to CQ ring state"); @@ -405,8 +404,7 @@ static int create_qp_rings(PCIDevice *pci_dev, uint64_t= pdir_dma, *rings =3D sr; =20 /* Create send ring */ - sr->ring_state =3D (PvrdmaRingState *) - rdma_pci_dma_map(pci_dev, tbl[0], TARGET_PAGE_SIZE); + sr->ring_state =3D rdma_pci_dma_map(pci_dev, tbl[0], TARGET_PAGE_SIZE); if (!sr->ring_state) { rdma_error_report("Failed to map to QP ring state"); goto out_free_sr_mem; @@ -646,8 +644,7 @@ static int create_srq_ring(PCIDevice *pci_dev, PvrdmaRi= ng **ring, r =3D g_malloc(sizeof(*r)); *ring =3D r; =20 - r->ring_state =3D (PvrdmaRingState *) - rdma_pci_dma_map(pci_dev, tbl[0], TARGET_PAGE_SIZE); + r->ring_state =3D rdma_pci_dma_map(pci_dev, tbl[0], TARGET_PAGE_SIZE); if (!r->ring_state) { rdma_error_report("Failed to map tp SRQ ring state"); goto out_free_ring_mem; diff --git a/hw/rdma/vmw/pvrdma_qp_ops.c b/hw/rdma/vmw/pvrdma_qp_ops.c index bd7cbf2bdf..c30c8344f6 100644 --- a/hw/rdma/vmw/pvrdma_qp_ops.c +++ b/hw/rdma/vmw/pvrdma_qp_ops.c @@ -149,7 +149,7 @@ void pvrdma_qp_send(PVRDMADev *dev, uint32_t qp_handle) =20 ring =3D (PvrdmaRing *)qp->opaque; =20 - wqe =3D (struct PvrdmaSqWqe *)pvrdma_ring_next_elem_read(ring); + wqe =3D pvrdma_ring_next_elem_read(ring); while (wqe) { CompHandlerCtx *comp_ctx; =20 @@ -212,7 +212,7 @@ void pvrdma_qp_recv(PVRDMADev *dev, uint32_t qp_handle) =20 ring =3D &((PvrdmaRing *)qp->opaque)[1]; =20 - wqe =3D (struct PvrdmaRqWqe *)pvrdma_ring_next_elem_read(ring); + wqe =3D pvrdma_ring_next_elem_read(ring); while (wqe) { CompHandlerCtx *comp_ctx; =20 @@ -254,7 +254,7 @@ void pvrdma_srq_recv(PVRDMADev *dev, uint32_t srq_handl= e) =20 ring =3D (PvrdmaRing *)srq->opaque; =20 - wqe =3D (struct PvrdmaRqWqe *)pvrdma_ring_next_elem_read(ring); + wqe =3D pvrdma_ring_next_elem_read(ring); while (wqe) { CompHandlerCtx *comp_ctx; =20 diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index 62e07ec2e4..23c470977e 100644 --- a/hw/virtio/virtio-iommu.c +++ b/hw/virtio/virtio-iommu.c @@ -775,8 +775,7 @@ static void virtio_iommu_handle_command(VirtIODevice *v= dev, VirtQueue *vq) output_size =3D s->config.probe_size + sizeof(tail); buf =3D g_malloc0(output_size); =20 - ptail =3D (struct virtio_iommu_req_tail *) - (buf + s->config.probe_size); + ptail =3D buf + s->config.probe_size; ptail->status =3D virtio_iommu_handle_probe(s, iov, iov_cnt, b= uf); break; } diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 24b25759be..1f8c10f8ef 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -5471,7 +5471,7 @@ static abi_long do_ioctl_rt(const IOCTLEntry *ie, uin= t8_t *buf_temp, for (i =3D 0; i < se->nb_fields; i++) { if (dst_offsets[i] =3D=3D offsetof(struct rtentry, rt_dev)) { assert(*field_types =3D=3D TYPE_PTRVOID); - target_rt_dev_ptr =3D (abi_ulong *)(argptr + src_offsets[i]); + target_rt_dev_ptr =3D argptr + src_offsets[i]; host_rt_dev_ptr =3D (unsigned long *)(buf_temp + dst_offsets[i= ]); if (*target_rt_dev_ptr !=3D 0) { *host_rt_dev_ptr =3D (unsigned long)lock_user_string( diff --git a/target/i386/hax/hax-all.c b/target/i386/hax/hax-all.c index b185ee8de4..b7fb5385b2 100644 --- a/target/i386/hax/hax-all.c +++ b/target/i386/hax/hax-all.c @@ -388,7 +388,7 @@ static int hax_handle_io(CPUArchState *env, uint32_t df= , uint16_t port, MemTxAttrs attrs =3D { 0 }; =20 if (!df) { - ptr =3D (uint8_t *) buffer; + ptr =3D buffer; } else { ptr =3D buffer + size * count - size; } diff --git a/tests/tcg/aarch64/system/semiheap.c b/tests/tcg/aarch64/system= /semiheap.c index a254bd8982..693a1b037d 100644 --- a/tests/tcg/aarch64/system/semiheap.c +++ b/tests/tcg/aarch64/system/semiheap.c @@ -73,11 +73,11 @@ int main(int argc, char *argv[argc]) ml_printf("stack: %p <- %p\n", info.stack_limit, info.stack_base); =20 /* finally can we read/write the heap */ - ptr_to_heap =3D (uint32_t *) info.heap_base; + ptr_to_heap =3D info.heap_base; for (i =3D 0; i < 512; i++) { *ptr_to_heap++ =3D i; } - ptr_to_heap =3D (uint32_t *) info.heap_base; + ptr_to_heap =3D info.heap_base; for (i =3D 0; i < 512; i++) { uint32_t tmp =3D *ptr_to_heap; if (tmp !=3D i) { diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index 0d1520caac..7a84b1d806 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -271,7 +271,7 @@ static void collect_usable_iova_ranges(QEMUVFIOState *s= , void *buf) if (!cap->next) { return; } - cap =3D (struct vfio_info_cap_header *)(buf + cap->next); + cap =3D buf + cap->next; } =20 cap_iova_range =3D (struct vfio_iommu_type1_info_cap_iova_range *)cap; --=20 2.37.3 From nobody Sun May 19 13:14:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1671036791; cv=none; d=zohomail.com; s=zohoarc; b=DLhYt9RBjrZ2ZyYu+6I2rLoMWiC5KmRwzWsbMEJsvu+3N1pP8oXnJKyTxs3rUjjMLZnUh7BCyOG88sraUat9Vkg9AMTxZ8D68GEsysU8lBimC+UaEs+nLju+GrK0WpbUnB9aVzSIPITdw9RU2k6nbixCPl0ggGY8/K7jF/SPBwM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671036791; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kQj7BkmYcCbvrf2uWCEScKjnb20uk0u7q7wYwqLoAvs=; b=OCfiYIRaqHUSI+mHq9ui9bb/jtUlZkMku7aJccTYr+faOY/BEv5DMe8JyWE0aijnJXbdA5xczBuGMEkWy1F40TW0M3fb5dE/c053osW1FIAxQpzlmAUtJmRNXqG63qxw2Y1hXIdHVL9tEEUrV2kQoe72YZffsoIfh72DCwhb59k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 167103679171616.19422894489935; Wed, 14 Dec 2022 08:53:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Uu8-00051G-Ji; Wed, 14 Dec 2022 11:46:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uty-0004vg-Uv for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Utx-0002Ok-4j for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:38 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-638-XId02TR7OZuajX7X81QhCA-1; Wed, 14 Dec 2022 11:46:32 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A18A129ABA13; Wed, 14 Dec 2022 16:46:32 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5B80B2166B26; Wed, 14 Dec 2022 16:46:32 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3634D21E6921; Wed, 14 Dec 2022 17:46:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671036396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kQj7BkmYcCbvrf2uWCEScKjnb20uk0u7q7wYwqLoAvs=; b=OP/sLOQ9PyH77OWI+mLpAAxCiCnejaoUlOw+tU+YfGdQMntVukC9OmWujL7oFbzF17Iw0x lvyRs4+fqeboSdBRqPWqdRzSIATmMEFDi/XarHKODe6rP/T00LRxMUa1iboA8CfNGQxePo 6Shn/suSbx/HqFHQw0F3PhI1EELWLfc= X-MC-Unique: XId02TR7OZuajX7X81QhCA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 02/14] error: Drop some obviously superfluous error_propagate() Date: Wed, 14 Dec 2022 17:46:17 +0100 Message-Id: <20221214164629.919880-3-armbru@redhat.com> In-Reply-To: <20221214164629.919880-1-armbru@redhat.com> References: <20221214164629.919880-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671036793619100003 When error_propagate(errp, local_err) is the only reader of @local_err, we can just as well change its writers to write @errp directly, and drop the error_propagate() along with @local_err. Signed-off-by: Markus Armbruster Message-Id: <20221121085054.683122-2-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/virt.c | 14 +++++--------- hw/hyperv/vmbus.c | 8 +++----- qga/commands-win32.c | 8 +++----- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index b871350856..02d627a5ab 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2771,24 +2771,20 @@ static void virt_dimm_unplug_request(HotplugHandler= *hotplug_dev, DeviceState *dev, Error **errp) { VirtMachineState *vms =3D VIRT_MACHINE(hotplug_dev); - Error *local_err =3D NULL; =20 if (!vms->acpi_dev) { - error_setg(&local_err, + error_setg(errp, "memory hotplug is not enabled: missing acpi-ged device= "); - goto out; + return; } =20 if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) { - error_setg(&local_err, - "nvdimm device hot unplug is not supported yet."); - goto out; + error_setg(errp, "nvdimm device hot unplug is not supported yet."); + return; } =20 hotplug_handler_unplug_request(HOTPLUG_HANDLER(vms->acpi_dev), dev, - &local_err); -out: - error_propagate(errp, local_err); + errp); } =20 static void virt_dimm_unplug(HotplugHandler *hotplug_dev, diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index f956381cc9..8ee08aea46 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -2404,7 +2404,6 @@ static const TypeInfo vmbus_dev_type_info =3D { static void vmbus_realize(BusState *bus, Error **errp) { int ret =3D 0; - Error *local_err =3D NULL; VMBus *vmbus =3D VMBUS(bus); =20 qemu_mutex_init(&vmbus->rx_queue_lock); @@ -2415,13 +2414,13 @@ static void vmbus_realize(BusState *bus, Error **er= rp) ret =3D hyperv_set_msg_handler(VMBUS_MESSAGE_CONNECTION_ID, vmbus_recv_message, vmbus); if (ret !=3D 0) { - error_setg(&local_err, "hyperv set message handler failed: %d", re= t); + error_setg(errp, "hyperv set message handler failed: %d", ret); goto error_out; } =20 ret =3D event_notifier_init(&vmbus->notifier, 0); if (ret !=3D 0) { - error_setg(&local_err, "event notifier failed to init with %d", re= t); + error_setg(errp, "event notifier failed to init with %d", ret); goto remove_msg_handler; } =20 @@ -2429,7 +2428,7 @@ static void vmbus_realize(BusState *bus, Error **errp) ret =3D hyperv_set_event_flag_handler(VMBUS_EVENT_CONNECTION_ID, &vmbus->notifier); if (ret !=3D 0) { - error_setg(&local_err, "hyperv set event handler failed with %d", = ret); + error_setg(errp, "hyperv set event handler failed with %d", ret); goto clear_event_notifier; } =20 @@ -2441,7 +2440,6 @@ remove_msg_handler: hyperv_set_msg_handler(VMBUS_MESSAGE_CONNECTION_ID, NULL, NULL); error_out: qemu_mutex_destroy(&vmbus->rx_queue_lock); - error_propagate(errp, local_err); } =20 static void vmbus_unrealize(BusState *bus) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index ec9f55b453..962db8e543 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -275,13 +275,12 @@ static void acquire_privilege(const char *name, Error= **errp) { HANDLE token =3D NULL; TOKEN_PRIVILEGES priv; - Error *local_err =3D NULL; =20 if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &token)) { if (!LookupPrivilegeValue(NULL, name, &priv.Privileges[0].Luid)) { - error_setg(&local_err, QERR_QGA_COMMAND_FAILED, + error_setg(errp, QERR_QGA_COMMAND_FAILED, "no luid for requested privilege"); goto out; } @@ -290,13 +289,13 @@ static void acquire_privilege(const char *name, Error= **errp) priv.Privileges[0].Attributes =3D SE_PRIVILEGE_ENABLED; =20 if (!AdjustTokenPrivileges(token, FALSE, &priv, 0, NULL, 0)) { - error_setg(&local_err, QERR_QGA_COMMAND_FAILED, + error_setg(errp, QERR_QGA_COMMAND_FAILED, "unable to acquire requested privilege"); goto out; } =20 } else { - error_setg(&local_err, QERR_QGA_COMMAND_FAILED, + error_setg(errp, QERR_QGA_COMMAND_FAILED, "failed to open privilege token"); } =20 @@ -304,7 +303,6 @@ out: if (token) { CloseHandle(token); } - error_propagate(errp, local_err); } =20 static void execute_async(DWORD WINAPI (*func)(LPVOID), LPVOID opaque, --=20 2.37.3 From nobody Sun May 19 13:14:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1671036548; cv=none; d=zohomail.com; s=zohoarc; b=nEY4spxn3Dx1nb/J7BJsSkzts6///forTiX7ON5N3DwxynHAgPZsPiLPy+aTZ6RSEpc0iO8BkSATH1HneaiAPHRVw+52Q356PgZM6kE9jzjla2nRQQWnf3rWIU56EKX1h00I9DBwrXrjyjFKQHQE76VvY3YdevZg3Vf0z1Uj884= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671036548; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZjQettXu9x2DlkZGFL9oZvcJrEMmh0ugIEH1vvJx+LU=; b=m/7ULFtWcZtprbJWqUPWlkd/Tc1cSFvLkZ01jjIYDLpH2rfqJ9iFvFZdqJmMvXlZZdJ82Z03RymHbbvCM4M2HEI6aKug7GctRVjQbSadl1UKOZ1Q9kL0XzXJW+voOYtaFICxASSMrYc9AG5ohkAOksmeiJ+nkdWJ4zcCiIXv1Kc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671036548954816.0181911074274; Wed, 14 Dec 2022 08:49:08 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Uu8-00051g-NJ; Wed, 14 Dec 2022 11:46:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Utz-0004vp-42 for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Utx-0002Oj-9w for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:38 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-313-l_ErAzSyOJ21qcpuZI6KGw-1; Wed, 14 Dec 2022 11:46:32 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 851FC8030A0; Wed, 14 Dec 2022 16:46:32 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5C33514171C0; Wed, 14 Dec 2022 16:46:32 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 38B8721E6930; Wed, 14 Dec 2022 17:46:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671036396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZjQettXu9x2DlkZGFL9oZvcJrEMmh0ugIEH1vvJx+LU=; b=aByKnQLO4N14+WLg+w0ooD/l2pE2EmiT+5rgmry+SIaeRfhTxUFr/WNDtD8oiC1+u2dTGu 4WmQsaCrEPAcMSENe3EfrMb95jjB96Eim4LqjXov8QBT/sWR4QD1Wq2yphvNrHKSahO/Vq xhsot5DXVmbs8KIjZ2MwiY3sc9ZZDfs= X-MC-Unique: l_ErAzSyOJ21qcpuZI6KGw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Subject: [PULL 03/14] error: Drop a few superfluous ERRP_GUARD() Date: Wed, 14 Dec 2022 17:46:18 +0100 Message-Id: <20221214164629.919880-4-armbru@redhat.com> In-Reply-To: <20221214164629.919880-1-armbru@redhat.com> References: <20221214164629.919880-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671036550043100001 Content-Type: text/plain; charset="utf-8" include/qapi/error.h on ERRP_GUARD(): * It must be used when the function dereferences @errp or passes * @errp to error_prepend(), error_vprepend(), or error_append_hint(). * It is safe to use even when it's not needed, but please avoid * cluttering the source with useless code. Clean up some of this clutter. Signed-off-by: Markus Armbruster Message-Id: <20221121085054.683122-3-armbru@redhat.com> --- block/copy-before-write.c | 1 - dump/dump.c | 2 -- hw/core/qdev.c | 2 -- hw/pci/msi.c | 1 - hw/remote/vfio-user-obj.c | 1 - ui/util.c | 1 - 6 files changed, 8 deletions(-) diff --git a/block/copy-before-write.c b/block/copy-before-write.c index 4abaa7339e..6f0157244f 100644 --- a/block/copy-before-write.c +++ b/block/copy-before-write.c @@ -522,7 +522,6 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *sou= rce, BlockCopyState **bcs, Error **errp) { - ERRP_GUARD(); BDRVCopyBeforeWriteState *state; BlockDriverState *top; QDict *opts; diff --git a/dump/dump.c b/dump/dump.c index df117c847f..c9afc30ce2 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -357,7 +357,6 @@ static void write_elf32_notes(WriteCoreDumpFunction f, = DumpState *s, =20 static void write_elf_phdr_note(DumpState *s, Error **errp) { - ERRP_GUARD(); Elf32_Phdr phdr32; Elf64_Phdr phdr64; void *phdr; @@ -773,7 +772,6 @@ static void dump_iterate(DumpState *s, Error **errp) static void dump_end(DumpState *s, Error **errp) { int rc; - ERRP_GUARD(); =20 if (s->elf_section_data_size) { s->elf_section_data =3D g_malloc0(s->elf_section_data_size); diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 0145501904..67be2feaf3 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -493,8 +493,6 @@ void qdev_del_unplug_blocker(DeviceState *dev, Error *r= eason) =20 bool qdev_unplug_blocked(DeviceState *dev, Error **errp) { - ERRP_GUARD(); - if (dev->unplug_blockers) { error_propagate(errp, error_copy(dev->unplug_blockers->data)); return true; diff --git a/hw/pci/msi.c b/hw/pci/msi.c index 058d1d1ef1..1cadf150bc 100644 --- a/hw/pci/msi.c +++ b/hw/pci/msi.c @@ -317,7 +317,6 @@ bool msi_is_masked(const PCIDevice *dev, unsigned int v= ector) =20 void msi_set_mask(PCIDevice *dev, int vector, bool mask, Error **errp) { - ERRP_GUARD(); uint16_t flags =3D pci_get_word(dev->config + msi_flags_off(dev)); bool msi64bit =3D flags & PCI_MSI_FLAGS_64BIT; uint32_t irq_state, vector_mask, pending; diff --git a/hw/remote/vfio-user-obj.c b/hw/remote/vfio-user-obj.c index 4e36bb8bcf..6d0310cec9 100644 --- a/hw/remote/vfio-user-obj.c +++ b/hw/remote/vfio-user-obj.c @@ -719,7 +719,6 @@ static void vfu_object_machine_done(Notifier *notifier,= void *data) */ static void vfu_object_init_ctx(VfuObject *o, Error **errp) { - ERRP_GUARD(); DeviceState *dev =3D NULL; vfu_pci_type_t pci_type =3D VFU_PCI_TYPE_CONVENTIONAL; int ret; diff --git a/ui/util.c b/ui/util.c index 7e8fc1ea53..907d60e032 100644 --- a/ui/util.c +++ b/ui/util.c @@ -51,7 +51,6 @@ bool qemu_console_fill_device_address(QemuConsole *con, size_t size, Error **errp) { - ERRP_GUARD(); DeviceState *dev =3D DEVICE(object_property_get_link(OBJECT(con), "device", &error_abort)); --=20 2.37.3 From nobody Sun May 19 13:14:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1671036792; cv=none; d=zohomail.com; s=zohoarc; b=DUTOLXoXMHX8oJNeNuvtSC/sJ4tToeH37TkjcBMGgD4/TZ8+T4nx6gDPSTnT3UiYAXmhIdji7vllYB1MYiZp4G8KxT7dZnyg7ZwO2hlT3ygL8Hh6q+jfomimS8Sv1a3bx+zv/0QXR7dvJNq+FpR1pBqbBtoI4cR/1Ah+yDCgSlw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671036792; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cjk96eN4dFxrWGHqHY0ovQk3hxz2opcrecQGd4yU5zk=; b=FPqjTzyncpyZOrfMI2zLoHb0rwuqQjqRWkuQ6IIQD353GaX89vy71lP8Hzl2yvRyUgQQZWeEoFkVnWQ8cSM2sWRTn7sGAa/qmIXNwoGaE6/eVIGXZSAYS4wtZ3lFFjshiWCFsxKn9LO90+TWf4VnKOGdTZVdCLG6N8UpVtNhThE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671036792349413.3164517859957; Wed, 14 Dec 2022 08:53:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Uu8-00050M-26; Wed, 14 Dec 2022 11:46:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uty-0004ve-K5 for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Utw-0002Or-W5 for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:38 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-392-iMPGyRt9MDeIkBwflWJ1JQ-1; Wed, 14 Dec 2022 11:46:32 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 865881C0DE80; Wed, 14 Dec 2022 16:46:32 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5B38D40C2064; Wed, 14 Dec 2022 16:46:32 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3B42521E6936; Wed, 14 Dec 2022 17:46:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671036396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cjk96eN4dFxrWGHqHY0ovQk3hxz2opcrecQGd4yU5zk=; b=KFxEmbFa64gOCrB15Wiyk++hveoALHqX3PnV3meTruZCulzIOsMdLk8p0u+CBUV0yxwXah Wcxd0nMYhpUG/WXprRpb+DnVb0IU+lMh2eistJmqOsBxXocaTBj6NKEjWQHajxDgsRo2uR ClflAN16DopJxL2XyllWTRv2MIlpDCs= X-MC-Unique: iMPGyRt9MDeIkBwflWJ1JQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 04/14] error: Move ERRP_GUARD() to the beginning of the function Date: Wed, 14 Dec 2022 17:46:19 +0100 Message-Id: <20221214164629.919880-5-armbru@redhat.com> In-Reply-To: <20221214164629.919880-1-armbru@redhat.com> References: <20221214164629.919880-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671036793629100004 include/qapi/error.h advises to put ERRP_GUARD() right at the beginning of the function, because only then can it guard the whole function. Clean up the few spots disregarding the advice. Signed-off-by: Markus Armbruster Message-Id: <20221121085054.683122-4-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/armsse.c | 3 +-- hw/core/machine.c | 3 +-- hw/virtio/vhost-vdpa.c | 2 +- iothread.c | 2 +- monitor/qmp-cmds.c | 4 ++-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c index aecdeb9815..0202bad787 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -900,6 +900,7 @@ static qemu_irq armsse_get_common_irq_in(ARMSSE *s, int= irqno) =20 static void armsse_realize(DeviceState *dev, Error **errp) { + ERRP_GUARD(); ARMSSE *s =3D ARM_SSE(dev); ARMSSEClass *asc =3D ARM_SSE_GET_CLASS(dev); const ARMSSEInfo *info =3D asc->info; @@ -914,8 +915,6 @@ static void armsse_realize(DeviceState *dev, Error **er= rp) DeviceState *dev_splitter; uint32_t addr_width_max; =20 - ERRP_GUARD(); - if (!s->board_memory) { error_setg(errp, "memory property was not set"); return; diff --git a/hw/core/machine.c b/hw/core/machine.c index 8d34caa31d..2352861240 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -554,12 +554,11 @@ static void machine_get_mem(Object *obj, Visitor *v, = const char *name, static void machine_set_mem(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { + ERRP_GUARD(); MachineState *ms =3D MACHINE(obj); MachineClass *mc =3D MACHINE_GET_CLASS(obj); MemorySizeConfiguration *mem; =20 - ERRP_GUARD(); - if (!visit_type_MemorySizeConfiguration(v, name, &mem, errp)) { return; } diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 7468e44b87..bc1c79b325 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -963,6 +963,7 @@ static bool vhost_vdpa_svq_map_rings(struct vhost_dev *= dev, struct vhost_vring_addr *addr, Error **errp) { + ERRP_GUARD(); DMAMap device_region, driver_region; struct vhost_vring_addr svq_addr; struct vhost_vdpa *v =3D dev->opaque; @@ -971,7 +972,6 @@ static bool vhost_vdpa_svq_map_rings(struct vhost_dev *= dev, size_t avail_offset; bool ok; =20 - ERRP_GUARD(); vhost_svq_get_vring_addr(svq, &svq_addr); =20 driver_region =3D (DMAMap) { diff --git a/iothread.c b/iothread.c index 529194a566..3862a64471 100644 --- a/iothread.c +++ b/iothread.c @@ -155,8 +155,8 @@ static void iothread_init_gcontext(IOThread *iothread) =20 static void iothread_set_aio_context_params(EventLoopBase *base, Error **e= rrp) { - IOThread *iothread =3D IOTHREAD(base); ERRP_GUARD(); + IOThread *iothread =3D IOTHREAD(base); =20 if (!iothread->ctx) { return; diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 81c8fdadf8..686d562cad 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -474,9 +474,9 @@ static bool invoke_stats_cb(StatsCallbacks *entry, StatsFilter *filter, StatsRequest *request, Error **errp) { + ERRP_GUARD(); strList *targets =3D NULL; strList *names =3D NULL; - ERRP_GUARD(); =20 if (request) { if (request->provider !=3D entry->provider) { @@ -541,9 +541,9 @@ StatsSchemaList *qmp_query_stats_schemas(bool has_provi= der, StatsProvider provider, Error **errp) { + ERRP_GUARD(); StatsSchemaList *stats_results =3D NULL; StatsCallbacks *entry; - ERRP_GUARD(); =20 QTAILQ_FOREACH(entry, &stats_callbacks, next) { if (!has_provider || provider =3D=3D entry->provider) { --=20 2.37.3 From nobody Sun May 19 13:14:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1671036583; cv=none; d=zohomail.com; s=zohoarc; b=DrlbjhVfaHb7lZogoMhte50d7Hif+4NNqXFVXDXY5nx+GXw4n12KRNwuZb0RD7hiF+2CeuC4ZyjkI0Kr/gqyj097sDGeoCcKF6tG6I3/sGMaUeT58fIecMSc9b6Z6SLM72ygI3BOdrJG7TQ9OFLDuKzlC+KUwGYynqFlmie89nI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671036583; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0updPPD8NQPAaUQbHqF/8edlYMcvyiyoNMStpNGe+Pc=; b=bx7q+lJ9oiLsaBzhsrUw2D/XRsVUK0a4Kj3qhiupR7gcp2MWO7QaqL0sDmxpjMIYG3YUesrpxAa9cP2xWVpAPqo9LUDjvZ2vd30ZG6vCqlyC7uRyJUQGzdgF5wfzpUzCfMA/DagmHeiYK/M4gozaSRvmgLy5sxvUgksUQClowFw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671036583613302.5843989917835; Wed, 14 Dec 2022 08:49:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Uu5-0004yo-7W; Wed, 14 Dec 2022 11:46:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uu2-0004x6-0j for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uu0-0002Q8-G6 for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:41 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-400-HcpMAQBuOcagpvXbP35Qew-1; Wed, 14 Dec 2022 11:46:36 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 16C7387A381; Wed, 14 Dec 2022 16:46:36 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E7AA8C15BA0; Wed, 14 Dec 2022 16:46:35 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3D94121E688F; Wed, 14 Dec 2022 17:46:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671036399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0updPPD8NQPAaUQbHqF/8edlYMcvyiyoNMStpNGe+Pc=; b=aTs1OD0ui18IcVF9uGfmu8mlJHvqh3SA/IYcmzv2/1zzzoyErIlMptvrvxhQNg3ThiLCOD 9veEzn4WevUeKAOWVLFZXbRWxeuD6q66AFpVjy0u2o2Hvdo6oshlee3CJrlQS4LuZQMRNd ERet27Xgmv5Y3UYr8NM/Xp0sgUix5Xw= X-MC-Unique: HcpMAQBuOcagpvXbP35Qew-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, "Dr . David Alan Gilbert" Subject: [PULL 05/14] monitor: Simplify monitor_fd_param()'s error handling Date: Wed, 14 Dec 2022 17:46:20 +0100 Message-Id: <20221214164629.919880-6-armbru@redhat.com> In-Reply-To: <20221214164629.919880-1-armbru@redhat.com> References: <20221214164629.919880-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671036584252100001 Content-Type: text/plain; charset="utf-8" Cc: Dr. David Alan Gilbert Signed-off-by: Markus Armbruster Message-Id: <20221121085054.683122-5-armbru@redhat.com> --- monitor/misc.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/monitor/misc.c b/monitor/misc.c index 205487e2b9..83d7f4ffde 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -1086,6 +1086,7 @@ int monitor_get_fd(Monitor *mon, const char *fdname, = Error **errp) } =20 fd =3D monfd->fd; + assert(fd >=3D 0); =20 /* caller takes ownership of fd */ QLIST_REMOVE(monfd, next); @@ -1403,23 +1404,16 @@ void monitor_fdset_dup_fd_remove(int dup_fd) int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp) { int fd; - Error *local_err =3D NULL; =20 if (!qemu_isdigit(fdname[0]) && mon) { - fd =3D monitor_get_fd(mon, fdname, &local_err); + fd =3D monitor_get_fd(mon, fdname, errp); } else { fd =3D qemu_parse_fd(fdname); - if (fd =3D=3D -1) { - error_setg(&local_err, "Invalid file descriptor number '%s'", + if (fd < 0) { + error_setg(errp, "Invalid file descriptor number '%s'", fdname); } } - if (local_err) { - error_propagate(errp, local_err); - assert(fd =3D=3D -1); - } else { - assert(fd !=3D -1); - } =20 return fd; } --=20 2.37.3 From nobody Sun May 19 13:14:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1671036507; cv=none; d=zohomail.com; s=zohoarc; b=VsuEemK9zuAfaafiASgFSJJliWDfIZ0OxwZ7Xzq5OezAbdCXHM6YLR9DK/qvLrf9l4EbxXvo9JhO5u3ur255I7z1rUQFVsUaycu1cYlkmaeoTZFLtDeGkjGTSta47jVkwLzLn3WkCfgMfo2DFVftOlNzpD3ZnqvMB+I3vy5dC3g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671036507; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wdH16TsdXRbK4YU7eo/QTRkdyonpnoPKqNI8a3Y/UmM=; b=YzYnFp3cfCeSPZpTHd1TqV9dvn80GDkbt9SLBkWbjZH++fCa2DFc4W9BAsxVH3u/QvzDbBRDEbtUz5ZhZkthDfGZgoC4WsBkNYbrHaDitSoMdnq1iM6KfeW3aJXQoHZvZX/2CJFmuTf60yjb6R4BJysr3kC06bY1dxvE2S6oBcs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671036507948900.1555683160758; Wed, 14 Dec 2022 08:48:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Uu7-00050I-BP; Wed, 14 Dec 2022 11:46:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uu2-0004x5-0f for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uu0-0002QH-GU for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:41 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-668-27BM-bpcMY6K93GjuuG3vg-1; Wed, 14 Dec 2022 11:46:36 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EB0AA1991C40; Wed, 14 Dec 2022 16:46:35 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C5E8B2026D68; Wed, 14 Dec 2022 16:46:35 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3FD5721E6481; Wed, 14 Dec 2022 17:46:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671036399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wdH16TsdXRbK4YU7eo/QTRkdyonpnoPKqNI8a3Y/UmM=; b=N+mIO34vsJDZKTQyS1gVbRYQUQE7TRQvauJnRJJewrqd9W9qmO37JXERBOA8k8ksukCUwO AB6YriSfolovcIOdl0DEkNpA2RvJcO0pqVcyc83i9D/2TUurDIyKNHplb2lK95Aycs+iKn KUVt8SJlYNHUxF8g8ipSmvt/o7BdhyA= X-MC-Unique: 27BM-bpcMY6K93GjuuG3vg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, "Dr . David Alan Gilbert" Subject: [PULL 06/14] monitor: Use ERRP_GUARD() in monitor_init() Date: Wed, 14 Dec 2022 17:46:21 +0100 Message-Id: <20221214164629.919880-7-armbru@redhat.com> In-Reply-To: <20221214164629.919880-1-armbru@redhat.com> References: <20221214164629.919880-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671036510093100003 Content-Type: text/plain; charset="utf-8" Cc: Dr. David Alan Gilbert Signed-off-by: Markus Armbruster Message-Id: <20221121085054.683122-6-armbru@redhat.com> --- monitor/monitor.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/monitor/monitor.c b/monitor/monitor.c index 86949024f6..7ed7bd5342 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -711,8 +711,8 @@ void monitor_init_globals_core(void) =20 int monitor_init(MonitorOptions *opts, bool allow_hmp, Error **errp) { + ERRP_GUARD(); Chardev *chr; - Error *local_err =3D NULL; =20 chr =3D qemu_chr_find(opts->chardev); if (chr =3D=3D NULL) { @@ -726,7 +726,7 @@ int monitor_init(MonitorOptions *opts, bool allow_hmp, = Error **errp) =20 switch (opts->mode) { case MONITOR_MODE_CONTROL: - monitor_init_qmp(chr, opts->pretty, &local_err); + monitor_init_qmp(chr, opts->pretty, errp); break; case MONITOR_MODE_READLINE: if (!allow_hmp) { @@ -737,17 +737,13 @@ int monitor_init(MonitorOptions *opts, bool allow_hmp= , Error **errp) error_setg(errp, "'pretty' is not compatible with HMP monitors= "); return -1; } - monitor_init_hmp(chr, true, &local_err); + monitor_init_hmp(chr, true, errp); break; default: g_assert_not_reached(); } =20 - if (local_err) { - error_propagate(errp, local_err); - return -1; - } - return 0; + return *errp ? -1 : 0; } =20 int monitor_init_opts(QemuOpts *opts, Error **errp) --=20 2.37.3 From nobody Sun May 19 13:14:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1671036470; cv=none; d=zohomail.com; s=zohoarc; b=a1JYu55jfXGWmyMf6+7sBZVpSsgwxNo6CdBDec2IQLTtdW0L8abZqBRFzqjliFqHcOhhn4Z1SF76CdSoG9y+Qmh6w5/o0O5CaaTLkX03nVDmWQDViaM3pZ3rgcQHJoFzaDGMMkAMKlQVWxh4wfWUovN8spTrYQKjnPUKVFMaMSw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671036470; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2gYgBaHNx3tQZl1M3hxj/5HcZJFZVOxUIGoWyr9Kfbg=; b=Qpc2jcVC2z4Eq099+3fNyFRQGrLTJTcw54v5Ea+u7A4mFOtPtKvycivRfsd4PWlnHDEFrJz/eSYKC9XgphxD9EjCWf/DfeICXKalqqEUeaO262p2dsoarLSoLV9YFZYeXYfuurWhXpiQ2vpN0xPpIG+5imwyQkHRkwLPd6aHG70= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671036470920958.1628702613604; Wed, 14 Dec 2022 08:47:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Uu6-0004yu-0B; Wed, 14 Dec 2022 11:46:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uu0-0004wL-2w for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uty-0002PK-8x for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:39 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-55-wi_zSELrPEKNnSOogm8lqg-1; Wed, 14 Dec 2022 11:46:36 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 12FE83C10EC6; Wed, 14 Dec 2022 16:46:36 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C5C29492C14; Wed, 14 Dec 2022 16:46:35 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4228221E6491; Wed, 14 Dec 2022 17:46:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671036397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2gYgBaHNx3tQZl1M3hxj/5HcZJFZVOxUIGoWyr9Kfbg=; b=QnNoIajyJxHjNG3/+0ZDQxmWLj7cQH1efqG8LY/1jdHn2cIZCqkp8MHwc6xGk3Vq8gmZW4 vCmlI0X1EHPItxnxxy+YC0z8gyzgB2lO0hjIyV8gmdzLIfJpsz5jBQfesXIijy79kuCo5T /wNWzYBPOQtfkIB5Cq90RXYnWR3xkVY= X-MC-Unique: wi_zSELrPEKNnSOogm8lqg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Hanna Reitz Subject: [PULL 07/14] qemu-config: Make config_parse_qdict() return bool Date: Wed, 14 Dec 2022 17:46:22 +0100 Message-Id: <20221214164629.919880-8-armbru@redhat.com> In-Reply-To: <20221214164629.919880-1-armbru@redhat.com> References: <20221214164629.919880-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671036471591100012 Content-Type: text/plain; charset="utf-8" This simplifies error checking. Cc: Hanna Reitz Signed-off-by: Markus Armbruster Message-Id: <20221121085054.683122-7-armbru@redhat.com> --- include/qemu/config-file.h | 2 +- block/blkdebug.c | 4 +--- util/qemu-config.c | 39 ++++++++++++++++++-------------------- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/include/qemu/config-file.h b/include/qemu/config-file.h index 321e7c7c03..b82a778123 100644 --- a/include/qemu/config-file.h +++ b/include/qemu/config-file.h @@ -22,7 +22,7 @@ int qemu_read_config_file(const char *filename, QEMUConfi= gCB *f, Error **errp); =20 /* Parse QDict options as a replacement for a config file (allowing multip= le enumerated (0..(n-1)) configuration "sections") */ -void qemu_config_parse_qdict(QDict *options, QemuOptsList **lists, +bool qemu_config_parse_qdict(QDict *options, QemuOptsList **lists, Error **errp); =20 #endif /* QEMU_CONFIG_FILE_H */ diff --git a/block/blkdebug.c b/block/blkdebug.c index 4265ca125e..ca65b043f0 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -297,9 +297,7 @@ static int read_config(BDRVBlkdebugState *s, const char= *filename, } } =20 - qemu_config_parse_qdict(options, config_groups, &local_err); - if (local_err) { - error_propagate(errp, local_err); + if (!qemu_config_parse_qdict(options, config_groups, errp)) { ret =3D -EINVAL; goto fail; } diff --git a/util/qemu-config.c b/util/qemu-config.c index 433488aa56..e983607b46 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -423,12 +423,12 @@ int qemu_read_config_file(const char *filename, QEMUC= onfigCB *cb, Error **errp) return ret; } =20 -static void config_parse_qdict_section(QDict *options, QemuOptsList *opts, +static bool config_parse_qdict_section(QDict *options, QemuOptsList *opts, Error **errp) { QemuOpts *subopts; - QDict *subqdict; - QList *list =3D NULL; + g_autoptr(QDict) subqdict =3D NULL; + g_autoptr(QList) list =3D NULL; size_t orig_size, enum_size; char *prefix; =20 @@ -437,23 +437,23 @@ static void config_parse_qdict_section(QDict *options= , QemuOptsList *opts, g_free(prefix); orig_size =3D qdict_size(subqdict); if (!orig_size) { - goto out; + return true; } =20 subopts =3D qemu_opts_create(opts, NULL, 0, errp); if (!subopts) { - goto out; + return false; } =20 if (!qemu_opts_absorb_qdict(subopts, subqdict, errp)) { - goto out; + return false; } =20 enum_size =3D qdict_size(subqdict); if (enum_size < orig_size && enum_size) { error_setg(errp, "Unknown option '%s' for [%s]", qdict_first(subqdict)->key, opts->name); - goto out; + return false; } =20 if (enum_size) { @@ -468,7 +468,7 @@ static void config_parse_qdict_section(QDict *options, = QemuOptsList *opts, if (qdict_size(subqdict)) { error_setg(errp, "Unused option '%s' for [%s]", qdict_first(subqdict)->key, opts->name); - goto out; + return false; } =20 QLIST_FOREACH_ENTRY(list, list_entry) { @@ -478,46 +478,43 @@ static void config_parse_qdict_section(QDict *options= , QemuOptsList *opts, if (!section) { error_setg(errp, "[%s] section (index %u) does not consist= of " "keys", opts->name, i); - goto out; + return false; } =20 opt_name =3D g_strdup_printf("%s.%u", opts->name, i++); subopts =3D qemu_opts_create(opts, opt_name, 1, errp); g_free(opt_name); if (!subopts) { - goto out; + return false; } =20 if (!qemu_opts_absorb_qdict(subopts, section, errp)) { qemu_opts_del(subopts); - goto out; + return false; } =20 if (qdict_size(section)) { error_setg(errp, "[%s] section doesn't support the option = '%s'", opts->name, qdict_first(section)->key); qemu_opts_del(subopts); - goto out; + return false; } } } =20 -out: - qobject_unref(subqdict); - qobject_unref(list); + return true; } =20 -void qemu_config_parse_qdict(QDict *options, QemuOptsList **lists, +bool qemu_config_parse_qdict(QDict *options, QemuOptsList **lists, Error **errp) { int i; - Error *local_err =3D NULL; =20 for (i =3D 0; lists[i]; i++) { - config_parse_qdict_section(options, lists[i], &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; + if (!config_parse_qdict_section(options, lists[i], errp)) { + return false; } } + + return true; } --=20 2.37.3 From nobody Sun May 19 13:14:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1671036621; cv=none; d=zohomail.com; s=zohoarc; b=iivkeOOpQIpW/6MaCgKulv9PJ3Qw4lNbGd6X+mH+Z4/l1OM+cLcULwJuISfc2cKl1MsV+W4wAb7ljfHl5TBcunVBeeh7AP1AbuSE6nAQ+PB8023oxxjbmGhn5jPzzL0YWkRZeAd1qyF5n5OxA8+l6eHU4eie+cRe0qQRwogx+Os= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671036621; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fl4RedEE2oCibOSODXHJMgRBUFAW9UqThY0ijyCTmpA=; b=JrJQS5/cYaatPgsXw2XtH1CN/IeiVGaedWRgCi+2oUXoaggGygp8F6sNtymLm9OjeVyyo+jsEm1L1Ez+nBNgBQ3JhLwsPq8pUO9whh34Jg4COgKXJcn1KbUmZa8FA7agsk4k6JMWOn5GrLWgX/aK7KKE5rLQXeckl0o2DqzSc84= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671036621136669.7992018401502; Wed, 14 Dec 2022 08:50:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Uu5-0004yq-E9; Wed, 14 Dec 2022 11:46:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uu1-0004x3-4r for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Utz-0002Pl-JF for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:40 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-55-mdby3INhNHas6sMKvbFmpA-1; Wed, 14 Dec 2022 11:46:36 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 221551991C44; Wed, 14 Dec 2022 16:46:36 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0067340C945A; Wed, 14 Dec 2022 16:46:35 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4439421E6493; Wed, 14 Dec 2022 17:46:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671036398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fl4RedEE2oCibOSODXHJMgRBUFAW9UqThY0ijyCTmpA=; b=dxh4fIIiPxClZi5jV5MLnvfS+LZn6/jh+qeJb12Bdc/MkAue/IZTgl5gfV6BnBiKVPYt5s ENiPOkgm8r7KEb/zaIh2akfxrpOobAw4dIkQQP5CFQoQlDSBJ95h3DAnkHmsrJwjTwmsBH Lv0TachjCjSf2RseLKplemsTCzf6NHs= X-MC-Unique: mdby3INhNHas6sMKvbFmpA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Subject: [PULL 08/14] qemu-config: Use ERRP_GUARD() where obviously appropriate Date: Wed, 14 Dec 2022 17:46:23 +0100 Message-Id: <20221214164629.919880-9-armbru@redhat.com> In-Reply-To: <20221214164629.919880-1-armbru@redhat.com> References: <20221214164629.919880-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671036622655100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Message-Id: <20221121085054.683122-8-armbru@redhat.com> --- util/qemu-config.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/util/qemu-config.c b/util/qemu-config.c index e983607b46..8c907fa83b 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -318,9 +318,9 @@ void qemu_add_opts(QemuOptsList *list) static int qemu_config_foreach(FILE *fp, QEMUConfigCB *cb, void *opaque, const char *fname, Error **errp) { + ERRP_GUARD(); char line[1024], prev_group[64], group[64], arg[64], value[1024]; Location loc; - Error *local_err =3D NULL; QDict *qdict =3D NULL; int res =3D -EINVAL, lno =3D 0; int count =3D 0; @@ -348,10 +348,9 @@ static int qemu_config_foreach(FILE *fp, QEMUConfigCB = *cb, void *opaque, } if (qdict !=3D prev) { if (prev) { - cb(prev_group, prev, opaque, &local_err); + cb(prev_group, prev, opaque, errp); qobject_unref(prev); - if (local_err) { - error_propagate(errp, local_err); + if (*errp) { goto out; } } --=20 2.37.3 From nobody Sun May 19 13:14:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1671036930; cv=none; d=zohomail.com; s=zohoarc; b=T5KAm02JYDOiUp9BGIBBUfkaWVpL85pSck8W0jww5Z20/nqrgUK8gnaMFABXCLFl3ragBkBRNULwEeFxOGrhERBdMSHxP//CKgtGGSttTnLqUXEUkrvgSlkbQbYetLw5HmogWSmsBXpTYGBuVgs+JMz2ujsteKIJltQkbwy/iUo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671036930; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FgY0YIvQFC6hYsUKlhX+ifJRSESasaH0pwuVrBirGuY=; b=gKlBct/TokGL1q/B7xQMKPCEPNyY4wrm8ImP3l8Fwl1HfXjrkYqMWo4wXVg1baq51ezJ1Scz4M9akXkTgm+798wV0AiR6bdX5UhgtlXxqOjWPEl0uxT3qfp1mBCgZ6k11A/IXRncVFnw/I4VfzeM5+dajMj6gTAC66cRyWwvrZk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671036930747944.6849510876467; Wed, 14 Dec 2022 08:55:30 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Uu6-0004zl-OS; Wed, 14 Dec 2022 11:46:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uu0-0004wU-9F for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uty-0002PP-NV for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:40 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-30-wjAtrISyNvOoAAO8KUk9cA-1; Wed, 14 Dec 2022 11:46:36 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EA4761C0DE85; Wed, 14 Dec 2022 16:46:35 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C5CDD14171BE; Wed, 14 Dec 2022 16:46:35 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4626F21E6496; Wed, 14 Dec 2022 17:46:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671036398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FgY0YIvQFC6hYsUKlhX+ifJRSESasaH0pwuVrBirGuY=; b=esyIpoQdJpdm943nXRDu8HGpIdBiNXRsq19DI7t3YSX0Bdl+7O8te8LFxM1Eej04EyhQMo 8/T83x4G03Kt3d6IY6B5lDv+27YXe+s4yY1ZhYxuxfJxclOpeKfh+JepzdNtpUM59cluxm mZyBegFPvcGREF/eZDvClelReANfSjc= X-MC-Unique: wjAtrISyNvOoAAO8KUk9cA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Subject: [PULL 09/14] sockets: Use ERRP_GUARD() where obviously appropriate Date: Wed, 14 Dec 2022 17:46:24 +0100 Message-Id: <20221214164629.919880-10-armbru@redhat.com> In-Reply-To: <20221214164629.919880-1-armbru@redhat.com> References: <20221214164629.919880-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671036932493100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Message-Id: <20221121085054.683122-9-armbru@redhat.com> --- util/qemu-sockets.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index d185245023..6538859b87 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -210,7 +210,8 @@ static int inet_listen_saddr(InetSocketAddress *saddr, int num, Error **errp) { - struct addrinfo ai,*res,*e; + ERRP_GUARD(); + struct addrinfo ai, *res, *e; char port[33]; char uaddr[INET6_ADDRSTRLEN+1]; char uport[33]; @@ -218,7 +219,6 @@ static int inet_listen_saddr(InetSocketAddress *saddr, int slisten =3D -1; int saved_errno =3D 0; bool socket_created =3D false; - Error *err =3D NULL; =20 if (saddr->keep_alive) { error_setg(errp, "keep-alive option is not supported for passive " @@ -231,11 +231,9 @@ static int inet_listen_saddr(InetSocketAddress *saddr, if (saddr->has_numeric && saddr->numeric) { ai.ai_flags |=3D AI_NUMERICHOST | AI_NUMERICSERV; } - ai.ai_family =3D inet_ai_family_from_address(saddr, &err); ai.ai_socktype =3D SOCK_STREAM; - - if (err) { - error_propagate(errp, err); + ai.ai_family =3D inet_ai_family_from_address(saddr, errp); + if (*errp) { return -1; } =20 @@ -392,9 +390,9 @@ static int inet_connect_addr(const InetSocketAddress *s= addr, static struct addrinfo *inet_parse_connect_saddr(InetSocketAddress *saddr, Error **errp) { + ERRP_GUARD(); struct addrinfo ai, *res; int rc; - Error *err =3D NULL; static int useV4Mapped =3D 1; =20 memset(&ai, 0, sizeof(ai)); @@ -403,11 +401,9 @@ static struct addrinfo *inet_parse_connect_saddr(InetS= ocketAddress *saddr, if (qatomic_read(&useV4Mapped)) { ai.ai_flags |=3D AI_V4MAPPED; } - ai.ai_family =3D inet_ai_family_from_address(saddr, &err); ai.ai_socktype =3D SOCK_STREAM; - - if (err) { - error_propagate(errp, err); + ai.ai_family =3D inet_ai_family_from_address(saddr, errp); + if (*errp) { return NULL; } =20 @@ -499,20 +495,18 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr, InetSocketAddress *sladdr, Error **errp) { + ERRP_GUARD(); struct addrinfo ai, *peer =3D NULL, *local =3D NULL; const char *addr; const char *port; int sock =3D -1, rc; - Error *err =3D NULL; =20 /* lookup peer addr */ memset(&ai,0, sizeof(ai)); ai.ai_flags =3D AI_CANONNAME | AI_V4MAPPED | AI_ADDRCONFIG; - ai.ai_family =3D inet_ai_family_from_address(sraddr, &err); ai.ai_socktype =3D SOCK_DGRAM; - - if (err) { - error_propagate(errp, err); + ai.ai_family =3D inet_ai_family_from_address(sraddr, errp); + if (*errp) { goto err; } =20 --=20 2.37.3 From nobody Sun May 19 13:14:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1671036670; cv=none; d=zohomail.com; s=zohoarc; b=Q3T6kqisBZQoNpBboN6dj4DAdHdy0COv8zJb83FqLpGDnnDJ1r4hyZDGkX9jp1MAdZMJ1900x2vhTx0zIjaLdJB9FTeg28NWg3r/Mcy8MCce8fmwnyfK9iVCIYPb+zzd5nXLYK16BYolrbSArYLi0F42PhrkPUCRKRdarfBx6nA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671036670; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yyCSZtvTOMTN9aPaKROzPXb1f3pMvw9zZLUTgW2vGSY=; b=FKLFlZVN7i7wZMKuvmePxuKe1jtkmyIeX8sy7HhAVIGiW2AEDfTAheDpF1bNUsStsfsfbu8MWMJoKl04aiZ4svvaYUAfWJ3YNKU7/M645QcQQa+35ImPdE+s42JvtcWagIvdiOiKcs4mAnMPICXAzV7EsJa1NqhZTsw5QNPOPQ4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671036670649753.3375617591075; Wed, 14 Dec 2022 08:51:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Uu5-0004yt-Q2; Wed, 14 Dec 2022 11:46:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uu0-0004wt-QI for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uty-0002PX-Sz for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:40 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-400--LNLA8ecNhmj80c9kUoSzA-1; Wed, 14 Dec 2022 11:46:36 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0D0213815D27; Wed, 14 Dec 2022 16:46:36 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C12CA49BB6A; Wed, 14 Dec 2022 16:46:35 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 487E921E6498; Wed, 14 Dec 2022 17:46:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671036398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yyCSZtvTOMTN9aPaKROzPXb1f3pMvw9zZLUTgW2vGSY=; b=J4ApShaHqGD9cnckqhP/DomB/f6ZpVSvct79pHHW/i/hvZYmTgGpu6i9fSQQbtDCt8DLzg dGfu71tnse5UdvHhWH7sGPwjlxc+HXvakqlUizLW67IYCEE2Pm5/1Cor1ei2f3v5afBKrs P4PiTjcHMgtQ4MAUKozvSA0QsTLmhMc= X-MC-Unique: -LNLA8ecNhmj80c9kUoSzA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 10/14] qapi: Use returned bool to check for failure (again) Date: Wed, 14 Dec 2022 17:46:25 +0100 Message-Id: <20221214164629.919880-11-armbru@redhat.com> In-Reply-To: <20221214164629.919880-1-armbru@redhat.com> References: <20221214164629.919880-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671036670949100001 Commit 012d4c96e2 changed the visitor functions taking Error ** to return bool instead of void, and the commits following it used the new return value to simplify error checking. Since then a few more uses in need of the same treatment crept in. Do that. All pretty mechanical except for * balloon_stats_get_all() This is basically the same transformation commit 012d4c96e2 applied to the virtual walk example in include/qapi/visitor.h. * set_max_queue_size() Additionally replace "goto end of function" by return. Signed-off-by: Markus Armbruster Message-Id: <20221121085054.683122-10-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- accel/kvm/kvm-all.c | 5 +---- hw/core/qdev-properties-system.c | 5 +---- hw/i386/pc.c | 5 +---- hw/virtio/virtio-balloon.c | 20 +++++++++----------- hw/virtio/virtio-mem.c | 10 ++-------- net/colo-compare.c | 13 ++++--------- target/i386/kvm/kvm.c | 5 +---- util/thread-context.c | 10 ++-------- 8 files changed, 21 insertions(+), 52 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index f99b0becd8..e86c33e0e6 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -3586,7 +3586,6 @@ static void kvm_set_dirty_ring_size(Object *obj, Visi= tor *v, Error **errp) { KVMState *s =3D KVM_STATE(obj); - Error *error =3D NULL; uint32_t value; =20 if (s->fd !=3D -1) { @@ -3594,9 +3593,7 @@ static void kvm_set_dirty_ring_size(Object *obj, Visi= tor *v, return; } =20 - visit_type_uint32(v, name, &value, &error); - if (error) { - error_propagate(errp, error); + if (!visit_type_uint32(v, name, &value, errp)) { return; } if (value & (value - 1)) { diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index a91f60567a..97a968f477 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -679,14 +679,11 @@ static void set_reserved_region(Object *obj, Visitor = *v, const char *name, { Property *prop =3D opaque; ReservedRegion *rr =3D object_field_prop_ptr(obj, prop); - Error *local_err =3D NULL; const char *endptr; char *str; int ret; =20 - visit_type_str(v, name, &str, &local_err); - if (local_err) { - error_propagate(errp, local_err); + if (!visit_type_str(v, name, &str, errp)) { return; } =20 diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 546b703cb4..fa69b6f43e 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1782,12 +1782,9 @@ static void pc_machine_set_max_fw_size(Object *obj, = Visitor *v, Error **errp) { PCMachineState *pcms =3D PC_MACHINE(obj); - Error *error =3D NULL; uint64_t value; =20 - visit_type_size(v, name, &value, &error); - if (error) { - error_propagate(errp, error); + if (!visit_type_size(v, name, &value, errp)) { return; } =20 diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 73ac5eb675..746f07c4d2 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -241,36 +241,34 @@ static void balloon_stats_poll_cb(void *opaque) static void balloon_stats_get_all(Object *obj, Visitor *v, const char *nam= e, void *opaque, Error **errp) { - Error *err =3D NULL; VirtIOBalloon *s =3D VIRTIO_BALLOON(obj); + bool ok =3D false; int i; =20 - if (!visit_start_struct(v, name, NULL, 0, &err)) { - goto out; + if (!visit_start_struct(v, name, NULL, 0, errp)) { + return; } - if (!visit_type_int(v, "last-update", &s->stats_last_update, &err)) { + if (!visit_type_int(v, "last-update", &s->stats_last_update, errp)) { goto out_end; } =20 - if (!visit_start_struct(v, "stats", NULL, 0, &err)) { + if (!visit_start_struct(v, "stats", NULL, 0, errp)) { goto out_end; } for (i =3D 0; i < VIRTIO_BALLOON_S_NR; i++) { - if (!visit_type_uint64(v, balloon_stat_names[i], &s->stats[i], &er= r)) { + if (!visit_type_uint64(v, balloon_stat_names[i], &s->stats[i], err= p)) { goto out_nested; } } - visit_check_struct(v, &err); + ok =3D visit_check_struct(v, errp); out_nested: visit_end_struct(v, NULL); =20 - if (!err) { - visit_check_struct(v, &err); + if (ok) { + visit_check_struct(v, errp); } out_end: visit_end_struct(v, NULL); -out: - error_propagate(errp, err); } =20 static void balloon_stats_get_poll_interval(Object *obj, Visitor *v, diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index ed170def48..d96bde1fab 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -1094,12 +1094,9 @@ static void virtio_mem_set_requested_size(Object *ob= j, Visitor *v, Error **errp) { VirtIOMEM *vmem =3D VIRTIO_MEM(obj); - Error *err =3D NULL; uint64_t value; =20 - visit_type_size(v, name, &value, &err); - if (err) { - error_propagate(errp, err); + if (!visit_type_size(v, name, &value, errp)) { return; } =20 @@ -1159,7 +1156,6 @@ static void virtio_mem_set_block_size(Object *obj, Vi= sitor *v, const char *name, void *opaque, Error **errp) { VirtIOMEM *vmem =3D VIRTIO_MEM(obj); - Error *err =3D NULL; uint64_t value; =20 if (DEVICE(obj)->realized) { @@ -1167,9 +1163,7 @@ static void virtio_mem_set_block_size(Object *obj, Vi= sitor *v, const char *name, return; } =20 - visit_type_size(v, name, &value, &err); - if (err) { - error_propagate(errp, err); + if (!visit_type_size(v, name, &value, errp)) { return; } =20 diff --git a/net/colo-compare.c b/net/colo-compare.c index 787c740f14..7f9e6f89ce 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -1135,22 +1135,17 @@ static void set_max_queue_size(Object *obj, Visitor= *v, const char *name, void *opaque, Error **errp) { - Error *local_err =3D NULL; uint64_t value; =20 - visit_type_uint64(v, name, &value, &local_err); - if (local_err) { - goto out; + if (!visit_type_uint64(v, name, &value, errp)) { + return; } if (!value) { - error_setg(&local_err, "Property '%s.%s' requires a positive value= ", + error_setg(errp, "Property '%s.%s' requires a positive value", object_get_typename(obj), name); - goto out; + return; } max_queue_size =3D value; - -out: - error_propagate(errp, local_err); } =20 static void compare_pri_rs_finalize(SocketReadState *pri_rs) diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index a213209379..0ab4e0734a 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -5689,7 +5689,6 @@ static void kvm_arch_set_notify_window(Object *obj, V= isitor *v, Error **errp) { KVMState *s =3D KVM_STATE(obj); - Error *error =3D NULL; uint32_t value; =20 if (s->fd !=3D -1) { @@ -5697,9 +5696,7 @@ static void kvm_arch_set_notify_window(Object *obj, V= isitor *v, return; } =20 - visit_type_uint32(v, name, &value, &error); - if (error) { - error_propagate(errp, error); + if (!visit_type_uint32(v, name, &value, errp)) { return; } =20 diff --git a/util/thread-context.c b/util/thread-context.c index 4138245332..2bc7883b9e 100644 --- a/util/thread-context.c +++ b/util/thread-context.c @@ -90,16 +90,13 @@ static void thread_context_set_cpu_affinity(Object *obj= , Visitor *v, uint16List *l, *host_cpus =3D NULL; unsigned long *bitmap =3D NULL; int nbits =3D 0, ret; - Error *err =3D NULL; =20 if (tc->init_cpu_bitmap) { error_setg(errp, "Mixing CPU and node affinity not supported"); return; } =20 - visit_type_uint16List(v, name, &host_cpus, &err); - if (err) { - error_propagate(errp, err); + if (!visit_type_uint16List(v, name, &host_cpus, errp)) { return; } =20 @@ -178,7 +175,6 @@ static void thread_context_set_node_affinity(Object *ob= j, Visitor *v, uint16List *l, *host_nodes =3D NULL; unsigned long *bitmap =3D NULL; struct bitmask *tmp_cpus; - Error *err =3D NULL; int ret, i; =20 if (tc->init_cpu_bitmap) { @@ -186,9 +182,7 @@ static void thread_context_set_node_affinity(Object *ob= j, Visitor *v, return; } =20 - visit_type_uint16List(v, name, &host_nodes, &err); - if (err) { - error_propagate(errp, err); + if (!visit_type_uint16List(v, name, &host_nodes, errp)) { return; } =20 --=20 2.37.3 From nobody Sun May 19 13:14:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1671036815; cv=none; d=zohomail.com; s=zohoarc; b=dpNQ1Y89Mh5Gp6BP0bbQRJFv/c/9UyJQRVvbgflZKy2L/5dO1WNdxcgU5q9JQLkyscmtiTbm/CeBdINTR7Gt3VezAVMWNfyAiiShKOdaENSqjfARnoZRALhke4n+MwxjetGrQXhXXw3A0i5aVji9oN2L6Eoxwys8P9Wf7x23K78= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671036815; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jIjKly9HTaYK4LPBw9TxmivSJPuy5iTdDYqxZASAesY=; b=FBO2APdNKeHKB8tBukZ+jqpqqRpgIeKXPOk8B8Q3+afM04BrgriuUIUE6lrdt2hpFAaZQvrg9bbyOnVdNz8M8oFl5gguqvkxZ7XJGKNffKnCWeVk66U2qweyvVTXOjeVEg7ok52CgPoJZy2TUBBwTLPf7nitBrY4Lbn1XZyT0fI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671036815305315.63962959623393; Wed, 14 Dec 2022 08:53:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Uu6-0004yx-3a; Wed, 14 Dec 2022 11:46:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uu2-0004x7-2A for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uu0-0002QA-GL for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:41 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-613-Ew7TdsIZMRqSwQcOFAkxxg-1; Wed, 14 Dec 2022 11:46:36 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E32253C10EC2; Wed, 14 Dec 2022 16:46:35 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C11A92166B26; Wed, 14 Dec 2022 16:46:35 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4AB6E21E649B; Wed, 14 Dec 2022 17:46:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671036399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jIjKly9HTaYK4LPBw9TxmivSJPuy5iTdDYqxZASAesY=; b=G655P94tVGNEy/GoEFn95kD3DOXV0eF8mHAA/OvFPXvo7xmogyIEBk/Fg9k7rBGqOJjeLW pTJeT1Cnr6OzgCato+t3/BegI/bSbBxPLvTv2E9xkhlwWnn1b3FTcSd2wgl6YlOgT9SxgM fqFzPD7QJCgfZwBOU/r9UwrHtV7aZYA= X-MC-Unique: Ew7TdsIZMRqSwQcOFAkxxg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 11/14] io: Tidy up fat-fingered parameter name Date: Wed, 14 Dec 2022 17:46:26 +0100 Message-Id: <20221214164629.919880-12-armbru@redhat.com> In-Reply-To: <20221214164629.919880-1-armbru@redhat.com> References: <20221214164629.919880-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671036815902100001 Signed-off-by: Markus Armbruster Message-Id: <20221121085054.683122-11-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/io/channel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/io/channel.h b/include/io/channel.h index c680ee7480..f1b7e05f81 100644 --- a/include/io/channel.h +++ b/include/io/channel.h @@ -350,7 +350,7 @@ int qio_channel_readv_all(QIOChannel *ioc, int qio_channel_writev_all(QIOChannel *ioc, const struct iovec *iov, size_t niov, - Error **erp); + Error **errp); =20 /** * qio_channel_readv: --=20 2.37.3 From nobody Sun May 19 13:14:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1671036471; cv=none; d=zohomail.com; s=zohoarc; b=N+RvhNONUS+O1v++PjJpfEVBFk7cA3vk/5z13IW40I/vjnW4FXX4pw+XuS6SwB/jKWsZGy5Myh5OuSTRqYYaBCrzQRTB1/8oqEIldlmQ+6/+hYCtjOQAA+UAbIkGfZvwQcujLiVTPN5zKvGpAVaqxczm1bA7zxA+QOf8VjxhFF0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671036471; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=43ATOFYZ7fwpBfo8bPcfmzd49srNEpjUQYNvHiCcKdQ=; b=kxNTA0mnO836dvuqkas2TbnSKWVWDF3sA64pbuqFawxKTI9xy4R6EKZ12yo+xJpGlown//SmY16MWpN3A1ZExkInS/bzmSi8weBxC1PN+f50Jap5J7XrX/CSj2bHnKiO0cIi3FYhoi5ZwJwAYq/4+QPJS2YzrFx+t3czNAw4qVU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671036470989728.3816612047012; Wed, 14 Dec 2022 08:47:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Uu9-00052g-7B; Wed, 14 Dec 2022 11:46:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uu4-0004yN-JF for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uu1-0002Qk-93 for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:44 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-28-BO5lIm1WNgi9dsuqP-JLFw-1; Wed, 14 Dec 2022 11:46:36 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 525CF3C10EC1; Wed, 14 Dec 2022 16:46:36 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C5FBD7AE5; Wed, 14 Dec 2022 16:46:35 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4D2A121E649C; Wed, 14 Dec 2022 17:46:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671036400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=43ATOFYZ7fwpBfo8bPcfmzd49srNEpjUQYNvHiCcKdQ=; b=azgTlvqiyzKz0lmRr61mikJtmhOZ7DTcu890EPzPzhB6QMQuE7QbzEoxswb6yROUWHEKl2 gOT5ESnxx1y2MWqvFt18tFzOs0JGu8ki0TWdmLgKvHAAY0gPIvTCRo2u+IDyqxY4EH+tAv hBdRCEGdyuQkEJ23FDxj4o9rKcf/3CM= X-MC-Unique: BO5lIm1WNgi9dsuqP-JLFw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Dr . David Alan Gilbert" Subject: [PULL 12/14] cleanup: Tweak and re-run return_directly.cocci Date: Wed, 14 Dec 2022 17:46:27 +0100 Message-Id: <20221214164629.919880-13-armbru@redhat.com> In-Reply-To: <20221214164629.919880-1-armbru@redhat.com> References: <20221214164629.919880-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671036471731100015 Tweak the semantic patch to drop redundant parenthesis around the return expression. Coccinelle drops a comment in hw/rdma/vmw/pvrdma_cmd.c; restored manually. Coccinelle messes up vmdk_co_create(), not sure why. Change dropped, will be done manually in the next commit. Line breaks in target/avr/cpu.h and hw/rdma/vmw/pvrdma_cmd.c tidied up manually. Whitespace in tools/virtiofsd/fuse_lowlevel.c tidied up manually. checkpatch.pl complains "return of an errno should typically be -ve" two times for hw/9pfs/9p-synth.c. Preexisting, the patch merely makes it visible to checkpatch.pl. Signed-off-by: Markus Armbruster Message-Id: <20221122134917.1217307-2-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Dr. David Alan Gilbert --- scripts/coccinelle/return_directly.cocci | 5 +-- include/hw/pci/pci.h | 7 +-- target/avr/cpu.h | 4 +- hw/9pfs/9p-synth.c | 14 ++---- hw/char/sifive_uart.c | 4 +- hw/ppc/ppc4xx_sdram.c | 5 +-- hw/rdma/vmw/pvrdma_cmd.c | 57 +++++++++--------------- hw/virtio/vhost-user.c | 6 +-- migration/dirtyrate.c | 10 +---- migration/tls.c | 6 +-- replay/replay-time.c | 5 +-- semihosting/console.c | 4 +- softmmu/memory.c | 11 +---- softmmu/physmem.c | 9 +--- target/loongarch/cpu.c | 4 +- target/mips/tcg/dsp_helper.c | 15 ++----- target/riscv/debug.c | 6 +-- target/riscv/vector_helper.c | 28 +++--------- tests/bench/benchmark-crypto-akcipher.c | 6 +-- tests/qtest/erst-test.c | 5 +-- tests/qtest/hexloader-test.c | 6 +-- tests/qtest/pvpanic-pci-test.c | 6 +-- tests/qtest/pvpanic-test.c | 6 +-- tests/qtest/test-filter-mirror.c | 6 +-- tests/qtest/virtio-ccw-test.c | 6 +-- tests/tcg/multiarch/sha512.c | 9 +--- tools/virtiofsd/fuse_lowlevel.c | 24 +++------- 27 files changed, 70 insertions(+), 204 deletions(-) diff --git a/scripts/coccinelle/return_directly.cocci b/scripts/coccinelle/= return_directly.cocci index 4cf50e75ea..6cb1b3c99a 100644 --- a/scripts/coccinelle/return_directly.cocci +++ b/scripts/coccinelle/return_directly.cocci @@ -11,9 +11,8 @@ identifier F; - T VAR; ... when !=3D VAR =20 -- VAR =3D -+ return - E; +- VAR =3D (E); - return VAR; ++ return E; ... when !=3D VAR } diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 6ccaaf5154..06e2d5f889 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -921,11 +921,8 @@ PCI_DMA_DEFINE_LDST(q_be, q_be, 64); static inline void *pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t *plen, DMADirection dir) { - void *buf; - - buf =3D dma_memory_map(pci_get_address_space(dev), addr, plen, dir, - MEMTXATTRS_UNSPECIFIED); - return buf; + return dma_memory_map(pci_get_address_space(dev), addr, plen, dir, + MEMTXATTRS_UNSPECIFIED); } =20 static inline void pci_dma_unmap(PCIDevice *dev, void *buffer, dma_addr_t = len, diff --git a/target/avr/cpu.h b/target/avr/cpu.h index 96419c0c2b..f19dd72926 100644 --- a/target/avr/cpu.h +++ b/target/avr/cpu.h @@ -215,8 +215,7 @@ static inline int cpu_interrupts_enabled(CPUAVRState *e= nv) =20 static inline uint8_t cpu_get_sreg(CPUAVRState *env) { - uint8_t sreg; - sreg =3D (env->sregC) << 0 + return (env->sregC) << 0 | (env->sregZ) << 1 | (env->sregN) << 2 | (env->sregV) << 3 @@ -224,7 +223,6 @@ static inline uint8_t cpu_get_sreg(CPUAVRState *env) | (env->sregH) << 5 | (env->sregT) << 6 | (env->sregI) << 7; - return sreg; } =20 static inline void cpu_set_sreg(CPUAVRState *env, uint8_t sreg) diff --git a/hw/9pfs/9p-synth.c b/hw/9pfs/9p-synth.c index 1c5813e4dd..38d787f494 100644 --- a/hw/9pfs/9p-synth.c +++ b/hw/9pfs/9p-synth.c @@ -72,7 +72,6 @@ static V9fsSynthNode *v9fs_add_dir_node(V9fsSynthNode *pa= rent, int mode, int qemu_v9fs_synth_mkdir(V9fsSynthNode *parent, int mode, const char *name, V9fsSynthNode **result) { - int ret; V9fsSynthNode *node, *tmp; =20 if (!synth_fs) { @@ -87,8 +86,7 @@ int qemu_v9fs_synth_mkdir(V9fsSynthNode *parent, int mode, QEMU_LOCK_GUARD(&synth_mutex); QLIST_FOREACH(tmp, &parent->child, sibling) { if (!strcmp(tmp->name, name)) { - ret =3D EEXIST; - return ret; + return EEXIST; } } /* Add the name */ @@ -98,15 +96,13 @@ int qemu_v9fs_synth_mkdir(V9fsSynthNode *parent, int mo= de, v9fs_add_dir_node(node, node->attr->mode, ".", node->attr, node->attr->inode); *result =3D node; - ret =3D 0; - return ret; + return 0; } =20 int qemu_v9fs_synth_add_file(V9fsSynthNode *parent, int mode, const char *name, v9fs_synth_read read, v9fs_synth_write write, void *arg) { - int ret; V9fsSynthNode *node, *tmp; =20 if (!synth_fs) { @@ -122,8 +118,7 @@ int qemu_v9fs_synth_add_file(V9fsSynthNode *parent, int= mode, QEMU_LOCK_GUARD(&synth_mutex); QLIST_FOREACH(tmp, &parent->child, sibling) { if (!strcmp(tmp->name, name)) { - ret =3D EEXIST; - return ret; + return EEXIST; } } /* Add file type and remove write bits */ @@ -138,8 +133,7 @@ int qemu_v9fs_synth_add_file(V9fsSynthNode *parent, int= mode, node->private =3D arg; pstrcpy(node->name, sizeof(node->name), name); QLIST_INSERT_HEAD_RCU(&parent->child, node, sibling); - ret =3D 0; - return ret; + return 0; } =20 static void synth_fill_statbuf(V9fsSynthNode *node, struct stat *stbuf) diff --git a/hw/char/sifive_uart.c b/hw/char/sifive_uart.c index 1c75f792b3..f2684e57bc 100644 --- a/hw/char/sifive_uart.c +++ b/hw/char/sifive_uart.c @@ -274,7 +274,6 @@ SiFiveUARTState *sifive_uart_create(MemoryRegion *addre= ss_space, hwaddr base, { DeviceState *dev; SysBusDevice *s; - SiFiveUARTState *r; =20 dev =3D qdev_new("riscv.sifive.uart"); s =3D SYS_BUS_DEVICE(dev); @@ -284,6 +283,5 @@ SiFiveUARTState *sifive_uart_create(MemoryRegion *addre= ss_space, hwaddr base, sysbus_mmio_get_region(s, 0)); sysbus_connect_irq(s, 0, irq); =20 - r =3D SIFIVE_UART(dev); - return r; + return SIFIVE_UART(dev); } diff --git a/hw/ppc/ppc4xx_sdram.c b/hw/ppc/ppc4xx_sdram.c index 8d7137faf3..54bf9a2b44 100644 --- a/hw/ppc/ppc4xx_sdram.c +++ b/hw/ppc/ppc4xx_sdram.c @@ -520,13 +520,10 @@ static inline hwaddr sdram_ddr2_base(uint32_t bcr) =20 static hwaddr sdram_ddr2_size(uint32_t bcr) { - hwaddr size; int sh; =20 sh =3D 1024 - ((bcr >> 6) & 0x3ff); - size =3D 8 * MiB * sh; - - return size; + return 8 * MiB * sh; } =20 static uint32_t sdram_ddr2_dcr_read(void *opaque, int dcrn) diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c index f5b6c3d728..1eca6328c9 100644 --- a/hw/rdma/vmw/pvrdma_cmd.c +++ b/hw/rdma/vmw/pvrdma_cmd.c @@ -182,13 +182,10 @@ static int create_pd(PVRDMADev *dev, union pvrdma_cmd= _req *req, { struct pvrdma_cmd_create_pd *cmd =3D &req->create_pd; struct pvrdma_cmd_create_pd_resp *resp =3D &rsp->create_pd_resp; - int rc; =20 memset(resp, 0, sizeof(*resp)); - rc =3D rdma_rm_alloc_pd(&dev->rdma_dev_res, &dev->backend_dev, - &resp->pd_handle, cmd->ctx_handle); - - return rc; + return rdma_rm_alloc_pd(&dev->rdma_dev_res, &dev->backend_dev, + &resp->pd_handle, cmd->ctx_handle); } =20 static int destroy_pd(PVRDMADev *dev, union pvrdma_cmd_req *req, @@ -504,20 +501,17 @@ static int modify_qp(PVRDMADev *dev, union pvrdma_cmd= _req *req, union pvrdma_cmd_resp *rsp) { struct pvrdma_cmd_modify_qp *cmd =3D &req->modify_qp; - int rc; =20 /* No need to verify sgid_index since it is u8 */ =20 - rc =3D rdma_rm_modify_qp(&dev->rdma_dev_res, &dev->backend_dev, - cmd->qp_handle, cmd->attr_mask, - cmd->attrs.ah_attr.grh.sgid_index, - (union ibv_gid *)&cmd->attrs.ah_attr.grh.dgid, - cmd->attrs.dest_qp_num, - (enum ibv_qp_state)cmd->attrs.qp_state, - cmd->attrs.qkey, cmd->attrs.rq_psn, - cmd->attrs.sq_psn); - - return rc; + return rdma_rm_modify_qp(&dev->rdma_dev_res, &dev->backend_dev, + cmd->qp_handle, cmd->attr_mask, + cmd->attrs.ah_attr.grh.sgid_index, + (union ibv_gid *)&cmd->attrs.ah_attr.grh.dgid, + cmd->attrs.dest_qp_num, + (enum ibv_qp_state)cmd->attrs.qp_state, + cmd->attrs.qkey, cmd->attrs.rq_psn, + cmd->attrs.sq_psn); } =20 static int query_qp(PVRDMADev *dev, union pvrdma_cmd_req *req, @@ -526,15 +520,14 @@ static int query_qp(PVRDMADev *dev, union pvrdma_cmd_= req *req, struct pvrdma_cmd_query_qp *cmd =3D &req->query_qp; struct pvrdma_cmd_query_qp_resp *resp =3D &rsp->query_qp_resp; struct ibv_qp_init_attr init_attr; - int rc; =20 memset(resp, 0, sizeof(*resp)); =20 - rc =3D rdma_rm_query_qp(&dev->rdma_dev_res, &dev->backend_dev, cmd->qp= _handle, - (struct ibv_qp_attr *)&resp->attrs, cmd->attr_ma= sk, - &init_attr); - - return rc; + return rdma_rm_query_qp(&dev->rdma_dev_res, &dev->backend_dev, + cmd->qp_handle, + (struct ibv_qp_attr *)&resp->attrs, + cmd->attr_mask, + &init_attr); } =20 static int destroy_qp(PVRDMADev *dev, union pvrdma_cmd_req *req, @@ -560,34 +553,27 @@ static int create_bind(PVRDMADev *dev, union pvrdma_c= md_req *req, union pvrdma_cmd_resp *rsp) { struct pvrdma_cmd_create_bind *cmd =3D &req->create_bind; - int rc; union ibv_gid *gid =3D (union ibv_gid *)&cmd->new_gid; =20 if (cmd->index >=3D MAX_PORT_GIDS) { return -EINVAL; } =20 - rc =3D rdma_rm_add_gid(&dev->rdma_dev_res, &dev->backend_dev, - dev->backend_eth_device_name, gid, cmd->index); - - return rc; + return rdma_rm_add_gid(&dev->rdma_dev_res, &dev->backend_dev, + dev->backend_eth_device_name, gid, cmd->index); } =20 static int destroy_bind(PVRDMADev *dev, union pvrdma_cmd_req *req, union pvrdma_cmd_resp *rsp) { - int rc; - struct pvrdma_cmd_destroy_bind *cmd =3D &req->destroy_bind; =20 if (cmd->index >=3D MAX_PORT_GIDS) { return -EINVAL; } =20 - rc =3D rdma_rm_del_gid(&dev->rdma_dev_res, &dev->backend_dev, - dev->backend_eth_device_name, cmd->index); - - return rc; + return rdma_rm_del_gid(&dev->rdma_dev_res, &dev->backend_dev, + dev->backend_eth_device_name, cmd->index); } =20 static int create_uc(PVRDMADev *dev, union pvrdma_cmd_req *req, @@ -595,12 +581,9 @@ static int create_uc(PVRDMADev *dev, union pvrdma_cmd_= req *req, { struct pvrdma_cmd_create_uc *cmd =3D &req->create_uc; struct pvrdma_cmd_create_uc_resp *resp =3D &rsp->create_uc_resp; - int rc; =20 memset(resp, 0, sizeof(*resp)); - rc =3D rdma_rm_alloc_uc(&dev->rdma_dev_res, cmd->pfn, &resp->ctx_handl= e); - - return rc; + return rdma_rm_alloc_uc(&dev->rdma_dev_res, cmd->pfn, &resp->ctx_handl= e); } =20 static int destroy_uc(PVRDMADev *dev, union pvrdma_cmd_req *req, diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 8f635844af..b8aaa99ab5 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -2533,11 +2533,7 @@ vhost_user_crypto_close_session(struct vhost_dev *de= v, uint64_t session_id) static bool vhost_user_mem_section_filter(struct vhost_dev *dev, MemoryRegionSection *section) { - bool result; - - result =3D memory_region_get_fd(section->mr) >=3D 0; - - return result; + return memory_region_get_fd(section->mr) >=3D 0; } =20 static int vhost_user_get_inflight_fd(struct vhost_dev *dev, diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index d6f1e01a70..4bfb97fc68 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -111,7 +111,6 @@ static void global_dirty_log_sync(unsigned int flag, bo= ol one_shot) static DirtyPageRecord *vcpu_dirty_stat_alloc(VcpuStat *stat) { CPUState *cpu; - DirtyPageRecord *records; int nvcpu =3D 0; =20 CPU_FOREACH(cpu) { @@ -121,9 +120,7 @@ static DirtyPageRecord *vcpu_dirty_stat_alloc(VcpuStat = *stat) stat->nvcpu =3D nvcpu; stat->rates =3D g_new0(DirtyRateVcpu, nvcpu); =20 - records =3D g_new0(DirtyPageRecord, nvcpu); - - return records; + return g_new0(DirtyPageRecord, nvcpu); } =20 static void vcpu_dirty_stat_collect(VcpuStat *stat, @@ -473,7 +470,6 @@ find_block_matched(RAMBlock *block, int count, struct RamblockDirtyInfo *infos) { int i; - struct RamblockDirtyInfo *matched; =20 for (i =3D 0; i < count; i++) { if (!strcmp(infos[i].idstr, qemu_ram_get_idstr(block))) { @@ -492,9 +488,7 @@ find_block_matched(RAMBlock *block, int count, return NULL; } =20 - matched =3D &infos[i]; - - return matched; + return &infos[i]; } =20 static bool compare_page_hash_info(struct RamblockDirtyInfo *info, diff --git a/migration/tls.c b/migration/tls.c index 73e8c9d3c2..4d2166a209 100644 --- a/migration/tls.c +++ b/migration/tls.c @@ -126,7 +126,6 @@ QIOChannelTLS *migration_tls_client_create(MigrationSta= te *s, Error **errp) { QCryptoTLSCreds *creds; - QIOChannelTLS *tioc; =20 creds =3D migration_tls_get_creds( s, QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT, errp); @@ -138,10 +137,7 @@ QIOChannelTLS *migration_tls_client_create(MigrationSt= ate *s, hostname =3D s->parameters.tls_hostname; } =20 - tioc =3D qio_channel_tls_new_client( - ioc, creds, hostname, errp); - - return tioc; + return qio_channel_tls_new_client(ioc, creds, hostname, errp); } =20 void migration_tls_channel_connect(MigrationState *s, diff --git a/replay/replay-time.c b/replay/replay-time.c index 00ebcb7a49..ee0ebfcf09 100644 --- a/replay/replay-time.c +++ b/replay/replay-time.c @@ -48,7 +48,6 @@ void replay_read_next_clock(ReplayClockKind kind) /*! Reads next clock event from the input. */ int64_t replay_read_clock(ReplayClockKind kind, int64_t raw_icount) { - int64_t ret; g_assert(replay_file && replay_mutex_locked()); =20 replay_advance_current_icount(raw_icount); @@ -56,7 +55,5 @@ int64_t replay_read_clock(ReplayClockKind kind, int64_t r= aw_icount) if (replay_next_event_is(EVENT_CLOCK + kind)) { replay_read_next_clock(kind); } - ret =3D replay_state.cached_clock[kind]; - - return ret; + return replay_state.cached_clock[kind]; } diff --git a/semihosting/console.c b/semihosting/console.c index 0f976fe8cb..5d61e8207e 100644 --- a/semihosting/console.c +++ b/semihosting/console.c @@ -43,10 +43,8 @@ static SemihostingConsole console; static int console_can_read(void *opaque) { SemihostingConsole *c =3D opaque; - int ret; g_assert(qemu_mutex_iothread_locked()); - ret =3D (int) fifo8_num_free(&c->fifo); - return ret; + return (int)fifo8_num_free(&c->fifo); } =20 static void console_wake_up(gpointer data, gpointer user_data) diff --git a/softmmu/memory.c b/softmmu/memory.c index bc0be3f62c..e05332d07f 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -2372,20 +2372,15 @@ void memory_region_reset_dirty(MemoryRegion *mr, hw= addr addr, =20 int memory_region_get_fd(MemoryRegion *mr) { - int fd; - RCU_READ_LOCK_GUARD(); while (mr->alias) { mr =3D mr->alias; } - fd =3D mr->ram_block->fd; - - return fd; + return mr->ram_block->fd; } =20 void *memory_region_get_ram_ptr(MemoryRegion *mr) { - void *ptr; uint64_t offset =3D 0; =20 RCU_READ_LOCK_GUARD(); @@ -2394,9 +2389,7 @@ void *memory_region_get_ram_ptr(MemoryRegion *mr) mr =3D mr->alias; } assert(mr->ram_block); - ptr =3D qemu_map_ram_ptr(mr->ram_block, offset); - - return ptr; + return qemu_map_ram_ptr(mr->ram_block, offset); } =20 MemoryRegion *memory_region_from_host(void *ptr, ram_addr_t *offset) diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 1b606a3002..edec095c7a 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -3236,7 +3236,6 @@ void *address_space_map(AddressSpace *as, hwaddr len =3D *plen; hwaddr l, xlat; MemoryRegion *mr; - void *ptr; FlatView *fv; =20 if (len =3D=3D 0) { @@ -3275,9 +3274,7 @@ void *address_space_map(AddressSpace *as, *plen =3D flatview_extend_translation(fv, addr, len, mr, xlat, l, is_write, attrs); fuzz_dma_read_cb(addr, *plen, mr); - ptr =3D qemu_ram_ptr_length(mr->ram_block, xlat, plen, true); - - return ptr; + return qemu_ram_ptr_length(mr->ram_block, xlat, plen, true); } =20 /* Unmaps a memory region previously mapped by address_space_map(). @@ -3545,15 +3542,13 @@ bool cpu_physical_memory_is_io(hwaddr phys_addr) { MemoryRegion*mr; hwaddr l =3D 1; - bool res; =20 RCU_READ_LOCK_GUARD(); mr =3D address_space_translate(&address_space_memory, phys_addr, &phys_addr, &l, false, MEMTXATTRS_UNSPECIFIED); =20 - res =3D !(memory_region_is_ram(mr) || memory_region_is_romd(mr)); - return res; + return !(memory_region_is_ram(mr) || memory_region_is_romd(mr)); } =20 int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque) diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c index 46b04cbdad..e7b0e12be6 100644 --- a/target/loongarch/cpu.c +++ b/target/loongarch/cpu.c @@ -128,13 +128,11 @@ static inline bool cpu_loongarch_hw_interrupts_pendin= g(CPULoongArchState *env) { uint32_t pending; uint32_t status; - bool r; =20 pending =3D FIELD_EX64(env->CSR_ESTAT, CSR_ESTAT, IS); status =3D FIELD_EX64(env->CSR_ECFG, CSR_ECFG, LIE); =20 - r =3D (pending & status) !=3D 0; - return r; + return (pending & status) !=3D 0; } =20 static void loongarch_cpu_do_interrupt(CPUState *cs) diff --git a/target/mips/tcg/dsp_helper.c b/target/mips/tcg/dsp_helper.c index 09b6e5fb15..7a4362c8ef 100644 --- a/target/mips/tcg/dsp_helper.c +++ b/target/mips/tcg/dsp_helper.c @@ -3281,15 +3281,12 @@ target_ulong helper_dextr_l(target_ulong ac, target= _ulong shift, CPUMIPSState *env) { uint64_t temp[3]; - target_ulong ret; =20 shift =3D shift & 0x3F; =20 mipsdsp_rndrashift_acc(temp, ac, shift, env); =20 - ret =3D (temp[1] << 63) | (temp[0] >> 1); - - return ret; + return (temp[1] << 63) | (temp[0] >> 1); } =20 target_ulong helper_dextr_r_l(target_ulong ac, target_ulong shift, @@ -3297,7 +3294,6 @@ target_ulong helper_dextr_r_l(target_ulong ac, target= _ulong shift, { uint64_t temp[3]; uint32_t temp128; - target_ulong ret; =20 shift =3D shift & 0x3F; mipsdsp_rndrashift_acc(temp, ac, shift, env); @@ -3317,9 +3313,7 @@ target_ulong helper_dextr_r_l(target_ulong ac, target= _ulong shift, set_DSPControl_overflow_flag(1, 23, env); } =20 - ret =3D (temp[1] << 63) | (temp[0] >> 1); - - return ret; + return (temp[1] << 63) | (temp[0] >> 1); } =20 target_ulong helper_dextr_rs_l(target_ulong ac, target_ulong shift, @@ -3327,7 +3321,6 @@ target_ulong helper_dextr_rs_l(target_ulong ac, targe= t_ulong shift, { uint64_t temp[3]; uint32_t temp128; - target_ulong ret; =20 shift =3D shift & 0x3F; mipsdsp_rndrashift_acc(temp, ac, shift, env); @@ -3354,9 +3347,7 @@ target_ulong helper_dextr_rs_l(target_ulong ac, targe= t_ulong shift, set_DSPControl_overflow_flag(1, 23, env); } =20 - ret =3D (temp[1] << 63) | (temp[0] >> 1); - - return ret; + return (temp[1] << 63) | (temp[0] >> 1); } #endif =20 diff --git a/target/riscv/debug.c b/target/riscv/debug.c index 26ea764407..e44848d0d7 100644 --- a/target/riscv/debug.c +++ b/target/riscv/debug.c @@ -243,15 +243,13 @@ static void do_trigger_action(CPURISCVState *env, tar= get_ulong trigger_index) =20 static uint32_t type2_breakpoint_size(CPURISCVState *env, target_ulong ctr= l) { - uint32_t size, sizelo, sizehi =3D 0; + uint32_t sizelo, sizehi =3D 0; =20 if (riscv_cpu_mxl(env) =3D=3D MXL_RV64) { sizehi =3D extract32(ctrl, 21, 2); } sizelo =3D extract32(ctrl, 16, 2); - size =3D (sizehi << 2) | sizelo; - - return size; + return (sizehi << 2) | sizelo; } =20 static inline bool type2_breakpoint_enabled(target_ulong ctrl) diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c index 0020b9a95d..00de879787 100644 --- a/target/riscv/vector_helper.c +++ b/target/riscv/vector_helper.c @@ -2791,31 +2791,25 @@ static inline uint16_t vssrl16(CPURISCVState *env, int vxrm, uint16_t a, uint16_t b) { uint8_t round, shift =3D b & 0xf; - uint16_t res; =20 round =3D get_round(vxrm, a, shift); - res =3D (a >> shift) + round; - return res; + return (a >> shift) + round; } static inline uint32_t vssrl32(CPURISCVState *env, int vxrm, uint32_t a, uint32_t b) { uint8_t round, shift =3D b & 0x1f; - uint32_t res; =20 round =3D get_round(vxrm, a, shift); - res =3D (a >> shift) + round; - return res; + return (a >> shift) + round; } static inline uint64_t vssrl64(CPURISCVState *env, int vxrm, uint64_t a, uint64_t b) { uint8_t round, shift =3D b & 0x3f; - uint64_t res; =20 round =3D get_round(vxrm, a, shift); - res =3D (a >> shift) + round; - return res; + return (a >> shift) + round; } RVVCALL(OPIVV2_RM, vssrl_vv_b, OP_UUU_B, H1, H1, H1, vssrl8) RVVCALL(OPIVV2_RM, vssrl_vv_h, OP_UUU_H, H2, H2, H2, vssrl16) @@ -2839,41 +2833,33 @@ static inline int8_t vssra8(CPURISCVState *env, int vxrm, int8_t a, int8_t b) { uint8_t round, shift =3D b & 0x7; - int8_t res; =20 round =3D get_round(vxrm, a, shift); - res =3D (a >> shift) + round; - return res; + return (a >> shift) + round; } static inline int16_t vssra16(CPURISCVState *env, int vxrm, int16_t a, int16_t b) { uint8_t round, shift =3D b & 0xf; - int16_t res; =20 round =3D get_round(vxrm, a, shift); - res =3D (a >> shift) + round; - return res; + return (a >> shift) + round; } static inline int32_t vssra32(CPURISCVState *env, int vxrm, int32_t a, int32_t b) { uint8_t round, shift =3D b & 0x1f; - int32_t res; =20 round =3D get_round(vxrm, a, shift); - res =3D (a >> shift) + round; - return res; + return (a >> shift) + round; } static inline int64_t vssra64(CPURISCVState *env, int vxrm, int64_t a, int64_t b) { uint8_t round, shift =3D b & 0x3f; - int64_t res; =20 round =3D get_round(vxrm, a, shift); - res =3D (a >> shift) + round; - return res; + return (a >> shift) + round; } =20 RVVCALL(OPIVV2_RM, vssra_vv_b, OP_SSS_B, H1, H1, H1, vssra8) diff --git a/tests/bench/benchmark-crypto-akcipher.c b/tests/bench/benchmar= k-crypto-akcipher.c index 15e69557ed..5e68cb0a1c 100644 --- a/tests/bench/benchmark-crypto-akcipher.c +++ b/tests/bench/benchmark-crypto-akcipher.c @@ -24,14 +24,12 @@ static QCryptoAkCipher *create_rsa_akcipher(const uint8= _t *priv_key, QCryptoHashAlgorithm hash) { QCryptoAkCipherOptions opt; - QCryptoAkCipher *rsa; =20 opt.alg =3D QCRYPTO_AKCIPHER_ALG_RSA; opt.u.rsa.padding_alg =3D padding; opt.u.rsa.hash_alg =3D hash; - rsa =3D qcrypto_akcipher_new(&opt, QCRYPTO_AKCIPHER_KEY_TYPE_PRIVATE, - priv_key, keylen, &error_abort); - return rsa; + return qcrypto_akcipher_new(&opt, QCRYPTO_AKCIPHER_KEY_TYPE_PRIVATE, + priv_key, keylen, &error_abort); } =20 static void test_rsa_speed(const uint8_t *priv_key, size_t keylen, diff --git a/tests/qtest/erst-test.c b/tests/qtest/erst-test.c index 4e768a126f..974e8bcfe5 100644 --- a/tests/qtest/erst-test.c +++ b/tests/qtest/erst-test.c @@ -154,10 +154,7 @@ static void test_acpi_erst_basic(void) =20 int main(int argc, char **argv) { - int ret; - g_test_init(&argc, &argv, NULL); qtest_add_func("/acpi-erst/basic", test_acpi_erst_basic); - ret =3D g_test_run(); - return ret; + return g_test_run(); } diff --git a/tests/qtest/hexloader-test.c b/tests/qtest/hexloader-test.c index 8b7aa2d72d..3023548041 100644 --- a/tests/qtest/hexloader-test.c +++ b/tests/qtest/hexloader-test.c @@ -34,12 +34,8 @@ static void hex_loader_test(void) =20 int main(int argc, char **argv) { - int ret; - g_test_init(&argc, &argv, NULL); =20 qtest_add_func("/tmp/hex_loader", hex_loader_test); - ret =3D g_test_run(); - - return ret; + return g_test_run(); } diff --git a/tests/qtest/pvpanic-pci-test.c b/tests/qtest/pvpanic-pci-test.c index c82c365c26..2c05b376ba 100644 --- a/tests/qtest/pvpanic-pci-test.c +++ b/tests/qtest/pvpanic-pci-test.c @@ -86,13 +86,9 @@ static void test_panic(void) =20 int main(int argc, char **argv) { - int ret; - g_test_init(&argc, &argv, NULL); qtest_add_func("/pvpanic-pci/panic", test_panic); qtest_add_func("/pvpanic-pci/panic-nopause", test_panic_nopause); =20 - ret =3D g_test_run(); - - return ret; + return g_test_run(); } diff --git a/tests/qtest/pvpanic-test.c b/tests/qtest/pvpanic-test.c index bc7b7dfc39..78f1cf8186 100644 --- a/tests/qtest/pvpanic-test.c +++ b/tests/qtest/pvpanic-test.c @@ -59,13 +59,9 @@ static void test_panic(void) =20 int main(int argc, char **argv) { - int ret; - g_test_init(&argc, &argv, NULL); qtest_add_func("/pvpanic/panic", test_panic); qtest_add_func("/pvpanic/panic-nopause", test_panic_nopause); =20 - ret =3D g_test_run(); - - return ret; + return g_test_run(); } diff --git a/tests/qtest/test-filter-mirror.c b/tests/qtest/test-filter-mir= ror.c index c8b0a92b53..248fc88699 100644 --- a/tests/qtest/test-filter-mirror.c +++ b/tests/qtest/test-filter-mirror.c @@ -76,12 +76,8 @@ static void test_mirror(void) =20 int main(int argc, char **argv) { - int ret; - g_test_init(&argc, &argv, NULL); =20 qtest_add_func("/netfilter/mirror", test_mirror); - ret =3D g_test_run(); - - return ret; + return g_test_run(); } diff --git a/tests/qtest/virtio-ccw-test.c b/tests/qtest/virtio-ccw-test.c index d05236407b..2de77bb6fe 100644 --- a/tests/qtest/virtio-ccw-test.c +++ b/tests/qtest/virtio-ccw-test.c @@ -95,8 +95,6 @@ static void virtio_scsi_hotplug(void) =20 int main(int argc, char **argv) { - int ret; - g_test_init(&argc, &argv, NULL); qtest_add_func("/virtio/balloon/nop", virtio_balloon_nop); qtest_add_func("/virtio/console/nop", virtconsole_nop); @@ -109,7 +107,5 @@ int main(int argc, char **argv) qtest_add_func("/virtio/scsi/nop", virtio_scsi_nop); qtest_add_func("/virtio/scsi/hotplug", virtio_scsi_hotplug); =20 - ret =3D g_test_run(); - - return ret; + return g_test_run(); } diff --git a/tests/tcg/multiarch/sha512.c b/tests/tcg/multiarch/sha512.c index e1729828b9..9e701bcf20 100644 --- a/tests/tcg/multiarch/sha512.c +++ b/tests/tcg/multiarch/sha512.c @@ -855,8 +855,6 @@ plan_tests(unsigned int tests) static int exit_status_(void) { - int r; - /* If there's no plan, just return the number of failures */ if(no_plan || !have_plan) { return failures; @@ -865,15 +863,12 @@ exit_status_(void) /* Ran too many tests? Return the number of tests that were run that shouldn't have been */ if(e_tests < test_count) { - r =3D test_count - e_tests; - return r; + return test_count - e_tests; } =20 /* Return the number of tests that failed + the number of tests that weren't run */ - r =3D failures + e_tests - test_count; - - return r; + return failures + e_tests - test_count; } =20 int diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowleve= l.c index 2f08471627..194a1b813b 100644 --- a/tools/virtiofsd/fuse_lowlevel.c +++ b/tools/virtiofsd/fuse_lowlevel.c @@ -216,7 +216,6 @@ static int send_reply(fuse_req_t req, int error, const = void *arg, =20 int fuse_reply_iov(fuse_req_t req, const struct iovec *iov, int count) { - int res; g_autofree struct iovec *padded_iov =3D NULL; =20 padded_iov =3D g_try_new(struct iovec, count + 1); @@ -227,9 +226,7 @@ int fuse_reply_iov(fuse_req_t req, const struct iovec *= iov, int count) memcpy(padded_iov + 1, iov, count * sizeof(struct iovec)); count++; =20 - res =3D send_reply_iov(req, 0, padded_iov, count); - - return res; + return send_reply_iov(req, 0, padded_iov, count); } =20 =20 @@ -589,7 +586,6 @@ int fuse_reply_ioctl_retry(fuse_req_t req, const struct= iovec *in_iov, g_autofree struct fuse_ioctl_iovec *out_fiov =3D NULL; struct iovec iov[4]; size_t count =3D 1; - int res; =20 memset(&arg, 0, sizeof(arg)); arg.flags |=3D FUSE_IOCTL_RETRY; @@ -601,15 +597,13 @@ int fuse_reply_ioctl_retry(fuse_req_t req, const stru= ct iovec *in_iov, =20 /* Can't handle non-compat 64bit ioctls on 32bit */ if (sizeof(void *) =3D=3D 4 && req->ioctl_64bit) { - res =3D fuse_reply_err(req, EINVAL); - return res; + return fuse_reply_err(req, EINVAL); } =20 if (in_count) { in_fiov =3D fuse_ioctl_iovec_copy(in_iov, in_count); if (!in_fiov) { - res =3D fuse_reply_err(req, ENOMEM); - return res; + return fuse_reply_err(req, ENOMEM); } =20 iov[count].iov_base =3D (void *)in_fiov; @@ -619,8 +613,7 @@ int fuse_reply_ioctl_retry(fuse_req_t req, const struct= iovec *in_iov, if (out_count) { out_fiov =3D fuse_ioctl_iovec_copy(out_iov, out_count); if (!out_fiov) { - res =3D fuse_reply_err(req, ENOMEM); - return res; + return fuse_reply_err(req, ENOMEM); } =20 iov[count].iov_base =3D (void *)out_fiov; @@ -628,9 +621,7 @@ int fuse_reply_ioctl_retry(fuse_req_t req, const struct= iovec *in_iov, count++; } =20 - res =3D send_reply_iov(req, 0, iov, count); - - return res; + return send_reply_iov(req, 0, iov, count); } =20 int fuse_reply_ioctl(fuse_req_t req, int result, const void *buf, size_t s= ize) @@ -659,7 +650,6 @@ int fuse_reply_ioctl_iov(fuse_req_t req, int result, co= nst struct iovec *iov, { g_autofree struct iovec *padded_iov =3D NULL; struct fuse_ioctl_out arg; - int res; =20 padded_iov =3D g_try_new(struct iovec, count + 2); if (padded_iov =3D=3D NULL) { @@ -673,9 +663,7 @@ int fuse_reply_ioctl_iov(fuse_req_t req, int result, co= nst struct iovec *iov, =20 memcpy(&padded_iov[2], iov, count * sizeof(struct iovec)); =20 - res =3D send_reply_iov(req, 0, padded_iov, count + 2); - - return res; + return send_reply_iov(req, 0, padded_iov, count + 2); } =20 int fuse_reply_poll(fuse_req_t req, unsigned revents) --=20 2.37.3 From nobody Sun May 19 13:14:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1671036607; cv=none; d=zohomail.com; s=zohoarc; b=bJslZEkeaWVUUQFq30vpIjdfO23yWSA17vKt4ZyvOWjo9bgJrI0EMxTEtpaR/kNq/wkAmoXIYd8ymf6uj6Fl1OFJtmmfu7yNTutCY22KYkKvKnnA3ToD05o/OOoYtOsPsxu2y9LfOn/cfUp9pLKHl0hEu88PAqZWfZEhcagbpLg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671036607; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cpODgtRkmdX4Pi0K6GmMxW9omE8TLUyjHK4HKMS/Z+w=; b=CIM6Fo5aFdrYorOYzX36217pg/FWZhgeg3+HD5jD3/W9KRb3md3TErPZT/kv3NILh/CHP69IcXToht3+pw9ezDPOquT+rqZ6ojWTWsu4C7ZjwYy3luLXc2v43rEJpnUlzH4B2FfNITcbofIl4suNTs+cDdA5KF/p0wTKNERpKs0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671036607871916.1536178491366; Wed, 14 Dec 2022 08:50:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Uu7-00050K-US; Wed, 14 Dec 2022 11:46:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uu2-0004x8-Kd for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uu0-0002QW-SN for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:42 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-622-NecI-gQmPdCe_AVtClWtQw-1; Wed, 14 Dec 2022 11:46:37 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8D89585A588; Wed, 14 Dec 2022 16:46:36 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 682BBC15BA0; Wed, 14 Dec 2022 16:46:36 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4F81F21E649E; Wed, 14 Dec 2022 17:46:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671036400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cpODgtRkmdX4Pi0K6GmMxW9omE8TLUyjHK4HKMS/Z+w=; b=dLWzU+oHIbMlAzNi1D/p7ergZ8aRtk3Dl4w43WRho/G0VrhB7NtYTdQ1HoOcUhEovOGhnS G7ejpQVd17wme82wxjaeBRWcIlVIOI1IhiLXAduXgBjkt4YRqaBd6XNpwGB3PKAMUJwSHR Kr+xH4Ga2OQWEuAkTR9zSxWBXJMeSHk= X-MC-Unique: NecI-gQmPdCe_AVtClWtQw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Fam Zheng , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 13/14] block/vmdk: Simplify vmdk_co_create() to return directly Date: Wed, 14 Dec 2022 17:46:28 +0100 Message-Id: <20221214164629.919880-14-armbru@redhat.com> In-Reply-To: <20221214164629.919880-1-armbru@redhat.com> References: <20221214164629.919880-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671036608649100001 Cc: Fam Zheng Cc: Kevin Wolf Cc: Hanna Reitz Cc: qemu-block@nongnu.org Signed-off-by: Markus Armbruster Message-Id: <20221122134917.1217307-3-armbru@redhat.com> Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block/vmdk.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 26376352b9..bac3d8db50 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -2821,7 +2821,6 @@ static BlockBackend *vmdk_co_create_cb(int64_t size, = int idx, static int coroutine_fn vmdk_co_create(BlockdevCreateOptions *create_optio= ns, Error **errp) { - int ret; BlockdevCreateOptionsVmdk *opts; =20 opts =3D &create_options->u.vmdk; @@ -2829,24 +2828,19 @@ static int coroutine_fn vmdk_co_create(BlockdevCrea= teOptions *create_options, /* Validate options */ if (!QEMU_IS_ALIGNED(opts->size, BDRV_SECTOR_SIZE)) { error_setg(errp, "Image size must be a multiple of 512 bytes"); - ret =3D -EINVAL; - goto out; + return -EINVAL; } =20 - ret =3D vmdk_co_do_create(opts->size, - opts->subformat, - opts->adapter_type, - opts->backing_file, - opts->hwversion, - opts->toolsversion, - false, - opts->zeroed_grain, - vmdk_co_create_cb, - opts, errp); - return ret; - -out: - return ret; + return vmdk_co_do_create(opts->size, + opts->subformat, + opts->adapter_type, + opts->backing_file, + opts->hwversion, + opts->toolsversion, + false, + opts->zeroed_grain, + vmdk_co_create_cb, + opts, errp); } =20 static void vmdk_close(BlockDriverState *bs) --=20 2.37.3 From nobody Sun May 19 13:14:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1671036957; cv=none; d=zohomail.com; s=zohoarc; b=d1zdSeJwBDsocW6txt9VmYzFuLQRwzGFtZqsPBlvN9NraRjNmRbX4k9t/SUG8vh336bZeZCQ9KCKpkKAuEdxsv1pW6bPjLpS4Ps6qRPPeQAdPpnBnf4UyuQjN76adEoIEExY1+Mup+yWWebnvmz3GBiX72Mr2dI6pZnSnN2bTg8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671036957; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=836rfTJGiFfcCKCYSMF3V7zZHHnzd7zKA9mrFDEEVZU=; b=mRMp2fkYK5x7ORQpG2e7YEJDleOfiismSxXjrZlv6s8K54dguO2aOH4Ue/AXSIIqlyn6X9PjyGX5jJHR9fg6B5rcHcVpaXRoRoZK050glIjBkcB564tMkUjpb2oLHjpCjoUvb0Wy7NO6XR6VI/eD+2MIApX/5mD0wIQ13pl/v8Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671036957846929.2644913649542; Wed, 14 Dec 2022 08:55:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Uu6-0004zH-Df; Wed, 14 Dec 2022 11:46:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uu3-0004xA-4V for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p5Uu1-0002Qu-Dv for qemu-devel@nongnu.org; Wed, 14 Dec 2022 11:46:42 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-118-hFNoAiV_NaeemMvEvz8v-g-1; Wed, 14 Dec 2022 11:46:37 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DFCF285C6E0; Wed, 14 Dec 2022 16:46:36 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BCF332166B26; Wed, 14 Dec 2022 16:46:36 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 51B9D21E649F; Wed, 14 Dec 2022 17:46:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671036400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=836rfTJGiFfcCKCYSMF3V7zZHHnzd7zKA9mrFDEEVZU=; b=AZWn3Lw+vFIOKk0GhkSHRjGSUSk8RrDI/Fq1APpLwgRz1ZhkGRr1QHALdgYLqKZBkuKdCo XRoOumoW8VNbYMbAejvcKEdRSaaoSSOz+BUt679Q5BqAj2vQj6nszCrLlBLSTqBrOS/7va /CgMZ10U8omo7zJXO53b2/rNgvxpzMA= X-MC-Unique: hFNoAiV_NaeemMvEvz8v-g-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 14/14] ppc4xx_sdram: Simplify sdram_ddr_size() to return Date: Wed, 14 Dec 2022 17:46:29 +0100 Message-Id: <20221214164629.919880-15-armbru@redhat.com> In-Reply-To: <20221214164629.919880-1-armbru@redhat.com> References: <20221214164629.919880-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671036959156100001 Suggested-by: BALATON Zoltan Signed-off-by: Markus Armbruster Message-Id: <87a64i87zp.fsf@pond.sub.org> Reviewed-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/ppc4xx_sdram.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/hw/ppc/ppc4xx_sdram.c b/hw/ppc/ppc4xx_sdram.c index 54bf9a2b44..a24c80b1d2 100644 --- a/hw/ppc/ppc4xx_sdram.c +++ b/hw/ppc/ppc4xx_sdram.c @@ -192,17 +192,13 @@ static inline hwaddr sdram_ddr_base(uint32_t bcr) =20 static hwaddr sdram_ddr_size(uint32_t bcr) { - hwaddr size; - int sh; + int sh =3D (bcr >> 17) & 0x7; =20 - sh =3D (bcr >> 17) & 0x7; if (sh =3D=3D 7) { - size =3D -1; - } else { - size =3D (4 * MiB) << sh; + return -1; } =20 - return size; + return (4 * MiB) << sh; } =20 static uint32_t sdram_ddr_dcr_read(void *opaque, int dcrn) --=20 2.37.3