Cleanups around returns
Subsystems (10)
v2 cover Cleanups around returns
v2:
* Don't touch tests/tcg/mips/user/ [Peter]
Markus Armbruster (3):
cleanup: Re-run return_directly.cocci
cleanup: Drop pointless return at end of function
cleanup: Drop pointless label at end of function
include/system/os-win32.h | 1 - target/ppc/kvm_ppc.h | 3 --- accel/tcg/cpu-exec.c | 1 - block/gluster.c | 4 ---- block/rbd.c | 1 - block/replication.c | 1 - block/throttle-groups.c | 1 - bsd-user/signal.c | 1 - dump/win_dump.c | 2 -- event-loop-base.c | 2 -- hw/acpi/acpi-cpu-hotplug-stub.c | 8 -------- hw/acpi/acpi-mem-hotplug-stub.c | 5 ----- hw/acpi/acpi-nvdimm-stub.c | 1 - hw/acpi/acpi-pci-hotplug-stub.c | 6 ------ hw/arm/exynos4210.c | 1 - hw/arm/smmu-common.c | 1 - hw/arm/xen-stubs.c | 1 - hw/audio/asc.c | 1 - hw/core/qdev-properties-system.c | 1 - hw/cxl/cxl-host.c | 2 -- hw/display/macfb.c | 1 - hw/display/tcx.c | 1 - hw/display/virtio-gpu-base.c | 1 - hw/dma/sifive_pdma.c | 1 - hw/gpio/aspeed_gpio.c | 5 ----- hw/gpio/bcm2838_gpio.c | 1 - hw/gpio/imx_gpio.c | 2 -- hw/gpio/pca9554.c | 5 +---- hw/gpio/pl061.c | 1 - hw/hyperv/vmbus.c | 1 - hw/i2c/pm_smbus.c | 1 - hw/i386/intel_iommu.c | 2 -- hw/i386/kvm/xen_xenstore.c | 4 +--- hw/i386/nitro_enclave.c | 1 - hw/i386/xen/xen-hvm.c | 2 -- hw/input/virtio-input-host.c | 1 - hw/intc/arm_gicv3_cpuif.c | 1 - hw/intc/aspeed_intc.c | 4 ---- hw/intc/mips_gic.c | 1 - hw/ipmi/ipmi_bmc_extern.c | 6 +----- hw/ipmi/ipmi_bmc_sim.c | 9 ++------- hw/ipmi/ipmi_bt.c | 8 +++----- hw/ipmi/ipmi_kcs.c | 4 +--- hw/loongarch/virt.c | 3 --- hw/m68k/next-cube.c | 1 - hw/m68k/q800.c | 2 -- hw/mem/cxl_type3.c | 4 ---- hw/mem/sparse-mem.c | 1 - hw/misc/i2c-echo.c | 2 -- hw/misc/ivshmem-flat.c | 2 -- hw/misc/mips_cpc.c | 2 -- hw/net/can/ctucan_core.c | 2 -- hw/net/can/xlnx-versal-canfd.c | 2 -- hw/net/imx_fec.c | 1 - hw/net/vmxnet3.c | 1 - hw/nvram/xlnx-versal-efuse-ctrl.c | 1 - hw/ppc/mac_newworld.c | 2 -- hw/ppc/pnv_occ.c | 1 - hw/ppc/spapr_hcall.c | 1 - hw/ppc/spapr_nested.c | 1 - hw/ppc/spapr_nvdimm.c | 2 -- hw/riscv/virt.c | 25 ++++++++++--------------- hw/s390x/s390-pci-bus.c | 1 - hw/s390x/s390-pci-vfio.c | 2 -- hw/scsi/esp.c | 5 +---- hw/scsi/megasas.c | 1 - hw/scsi/vhost-scsi.c | 1 - hw/ssi/ibex_spi_host.c | 1 - hw/ssi/pnv_spi.c | 2 -- hw/tpm/tpm_tis_i2c.c | 4 ---- hw/usb/dev-mtp.c | 2 -- hw/usb/dev-serial.c | 2 -- hw/usb/dev-smartcard-reader.c | 1 - hw/usb/dev-uas.c | 1 - hw/vfio/common.c | 7 ++----- hw/vfio/display.c | 1 - hw/vfio/pci.c | 1 - hw/vfio/platform.c | 1 - hw/virtio/vhost-user-fs.c | 1 - hw/virtio/vhost-user-scmi.c | 2 -- hw/virtio/vhost-user-vsock.c | 1 - hw/virtio/vhost-user.c | 2 -- hw/virtio/vhost-vdpa.c | 2 -- hw/virtio/vhost.c | 1 - hw/virtio/virtio-nsm.c | 1 - hw/virtio/virtio.c | 2 -- hw/watchdog/sbsa_gwdt.c | 1 - hw/watchdog/wdt_aspeed.c | 1 - linux-user/xtensa/signal.c | 1 - migration/multifd-nocomp.c | 1 - migration/qemu-file.c | 2 -- migration/ram.c | 2 -- net/colo-compare.c | 2 -- plugins/api.c | 4 +--- qemu-keymap.c | 1 - qga/commands-win32.c | 4 ---- system/dirtylimit.c | 2 -- target/arm/tcg/helper-a64.c | 2 -- target/i386/kvm/vmsr_energy.c | 1 - target/i386/tcg/translate.c | 1 - target/i386/whpx/whpx-all.c | 11 ----------- target/m68k/helper.c | 1 - target/mips/tcg/system/mips-semi.c | 1 - target/ppc/kvm.c | 1 - target/ppc/translate.c | 1 - target/riscv/debug.c | 6 ------ target/s390x/cpu_models.c | 1 - target/sh4/translate.c | 1 - tests/qtest/ahci-test.c | 1 - tests/qtest/cmsdk-apb-watchdog-test.c | 6 +----- tests/qtest/fuzz/generic_fuzz.c | 1 - tests/qtest/libqos/libqos-malloc.c | 1 - tests/qtest/libqtest.c | 1 - tests/qtest/pnv-host-i2c-test.c | 4 +--- tests/qtest/stm32l4x5_usart-test.c | 6 +----- tests/qtest/test-x86-cpuid-compat.c | 1 - tests/unit/socket-helpers.c | 1 - tests/unit/test-qgraph.c | 1 - tools/i386/qemu-vmsr-helper.c | 5 +---- ui/input-linux.c | 1 - ui/vnc.c | 2 -- util/main-loop.c | 1 - util/qht.c | 1 - 123 files changed, 27 insertions(+), 262 deletions(-)
Signature · 1 line
2.48.1
PATCH v2 1/3 cleanup: Re-run return_directly.cocci
Coccinelle's indentation of virt_create_plic() results in a long line. Avoid that by mimicking the old indentation manually.
Don't touch tests/tcg/mips/user/. I'm not sure these files are ours to make style cleanups on. They might be imported third-party code, which we should leave as is to not complicate future updates.
--- hw/gpio/pca9554.c | 5 +---- hw/i386/kvm/xen_xenstore.c | 4 +--- hw/riscv/virt.c | 25 ++++++++++--------------- hw/scsi/esp.c | 5 +---- hw/vfio/common.c | 7 ++----- plugins/api.c | 4 +--- tests/qtest/cmsdk-apb-watchdog-test.c | 6 +----- tests/qtest/pnv-host-i2c-test.c | 4 +--- tests/qtest/stm32l4x5_usart-test.c | 6 +----- tools/i386/qemu-vmsr-helper.c | 5 +---- 10 files changed, 20 insertions(+), 51 deletions(-)
hw/gpio/pca9554.c +1 -4
@@ -118,11 +118,8 @@ static void pca9554_write(PCA9554State *s, uint8_t reg, uint8_t data)static uint8_t pca9554_recv (I2CSlave *i2c) {PCA9554State *s =PCA9554 (i2c); -uint8_t ret; - ret =pca9554_read (s, s->pointer &0x3 ); - -return ret; +return pca9554_read (s, s->pointer &0x3 ); }static int pca9554_send (I2CSlave *i2c,uint8_t data)
hw/i386/kvm/xen_xenstore.c +1 -3
@@ -209,7 +209,6 @@ static int xen_xenstore_post_load(void *opaque, int ver) {XenXenstoreState *s = opaque;GByteArray *save; -int ret;/* * As qemu/dom0, rebind to the guest's port. The Windows drivers may
@@ -231,8 +230,7 @@ static int xen_xenstore_post_load(void *opaque, int ver) s->impl_state =NULL ; s->impl_state_size =0 ; - ret =xs_impl_deserialize (s->impl, save, xen_domid, fire_watch_cb, s); -return ret; +return xs_impl_deserialize (s->impl, save, xen_domid, fire_watch_cb, s); }static const VMStateDescription xen_xenstore_vmstate = {
hw/riscv/virt.c +10 -15
@@ -1276,27 +1276,22 @@ static FWCfgState *create_fw_cfg(const MachineState *ms)static DeviceState *virt_create_plic (const MemMapEntry *memmap,int socket,int base_hartid,int hart_count) { -DeviceState *ret; g_autofree char *plic_hart_config = NULL;/* Per-socket PLIC hart topology configuration string */ plic_hart_config =riscv_plic_hart_config_string (hart_count);/* Per-socket PLIC */ - ret =sifive_plic_create ( - memmap[VIRT_PLIC ].base + socket * memmap[VIRT_PLIC ].size, - plic_hart_config, hart_count, base_hartid, -VIRT_IRQCHIP_NUM_SOURCES , - ((1U <<VIRT_IRQCHIP_NUM_PRIO_BITS ) -1 ), -VIRT_PLIC_PRIORITY_BASE , -VIRT_PLIC_PENDING_BASE , -VIRT_PLIC_ENABLE_BASE , -VIRT_PLIC_ENABLE_STRIDE , -VIRT_PLIC_CONTEXT_BASE , -VIRT_PLIC_CONTEXT_STRIDE , - memmap[VIRT_PLIC ].size); - -return ret; +return sifive_plic_create ( + memmap[VIRT_PLIC ].base + socket * memmap[VIRT_PLIC ].size, + plic_hart_config, hart_count, base_hartid, +VIRT_IRQCHIP_NUM_SOURCES , + ((1U <<VIRT_IRQCHIP_NUM_PRIO_BITS ) -1 ), +VIRT_PLIC_PRIORITY_BASE ,VIRT_PLIC_PENDING_BASE , +VIRT_PLIC_ENABLE_BASE ,VIRT_PLIC_ENABLE_STRIDE , +VIRT_PLIC_CONTEXT_BASE , +VIRT_PLIC_CONTEXT_STRIDE , + memmap[VIRT_PLIC ].size); } static DeviceState *virt_create_aia(RISCVVirtAIAType aia_type, int aia_guests,
hw/scsi/esp.c +1 -4
@@ -242,10 +242,7 @@ static uint32_t esp_get_stc(ESPState *s)static uint8_t esp_pdma_read (ESPState *s) { -uint8_t val; - - val =esp_fifo_pop (s); -return val; +return esp_fifo_pop (s); }static void esp_pdma_write (ESPState *s,uint8_t val)
hw/vfio/common.c +2 -5
@@ -110,8 +110,6 @@ static bool vfio_multiple_devices_migration_is_supported(void)int vfio_block_multiple_devices_migration (VFIODevice *vbasedev,Error **errp) { -int ret; -if (vfio_multiple_devices_migration_is_supported ()) {return 0 ; }
@@ -129,9 +127,8 @@ int vfio_block_multiple_devices_migration(VFIODevice *vbasedev, Error **errp)error_setg (&multiple_devices_migration_blocker,"Multiple VFIO devices migration is supported only if all of " "them support P2P migration" ); - ret =migrate_add_blocker_normal (&multiple_devices_migration_blocker, errp); - -return ret; +return migrate_add_blocker_normal (&multiple_devices_migration_blocker, + errp); }void vfio_unblock_multiple_devices_migration (void )
plugins/api.c +1 -3
@@ -237,12 +237,10 @@ uint64_t qemu_plugin_tb_vaddr(const struct qemu_plugin_tb *tb)struct qemu_plugin_insn *qemu_plugin_tb_get_insn (const struct qemu_plugin_tb *tb,size_t idx) { -struct qemu_plugin_insn *insn;if (unlikely (idx >= tb->n)) {return NULL ; } - insn =g_ptr_array_index (tb->insns, idx); -return insn; +return g_ptr_array_index (tb->insns, idx); }/*
tests/qtest/cmsdk-apb-watchdog-test.c +1 -5
@@ -364,8 +364,6 @@ static void test_watchdog_inten_luminary(const void *ptr)int main (int argc,char **argv) { -int r; -g_test_init (&argc, &argv,NULL );g_test_set_nonfatal_assertions ();
@@ -393,7 +391,5 @@ int main(int argc, char **argv) test_watchdog_inten); } - r =g_test_run (); - -return r; +return g_test_run (); }
tests/qtest/pnv-host-i2c-test.c +1 -3
@@ -191,12 +191,10 @@ static uint8_t pnv_i2c_pca9554_read_pins(PnvI2cDev *dev) {uint8_t send_buf[1 ];uint8_t recv_buf[1 ]; -uint8_t inputs; send_buf[0 ] =PCA9554_INPUT ;pnv_i2c_send (dev, send_buf,1 );pnv_i2c_recv (dev, recv_buf,1 ); - inputs = recv_buf[0 ]; -return inputs; +return recv_buf[0 ]; }static void pnv_i2c_pca9554_flip_polarity (PnvI2cDev *dev)
tests/qtest/stm32l4x5_usart-test.c +1 -5
@@ -360,8 +360,6 @@ static void test_clock_enable(void)int main (int argc,char **argv) { -int ret; -g_test_init (&argc, &argv,NULL );g_test_set_nonfatal_assertions ();
@@ -372,8 +370,6 @@ int main(int argc, char **argv)qtest_add_func ("stm32l4x5/usart/send_str" , test_send_str);qtest_add_func ("stm32l4x5/usart/ack" , test_ack);qtest_add_func ("stm32l4x5/usart/clock_enable" , test_clock_enable); - ret =g_test_run (); - -return ret; +return g_test_run (); }
tools/i386/qemu-vmsr-helper.c +1 -4
@@ -71,7 +71,6 @@ static void compute_default_paths(void)static int is_intel_processor (void ) { -int result;int ebx, ecx, edx;/* Execute CPUID instruction with eax=0 (basic identification) */
@@ -87,9 +86,7 @@ static int is_intel_processor(void)* 0x49656e69 = "ineI" * 0x6c65746e = "ntel" */ - result = (ebx ==0x756e6547 ) && (edx ==0x49656e69 ) && (ecx ==0x6c65746e ); - -return result; +return (ebx ==0x756e6547 ) && (edx ==0x49656e69 ) && (ecx ==0x6c65746e ); }static int is_rapl_enabled (void )
Signature · 1 line
2.48.1
Re: [PATCH v2 1/3] cleanup: Re-run return_directly.cocci
Quoted 9 lines · Markus Armbruster
Coccinelle's indentation of
virt_create_plic()results in a long line. Avoid that by mimicking the old indentation manually.Don't touch tests/tcg/mips/user/. I'm not sure these files are ours to make style cleanups on. They might be imported third-party code, which we should leave as is to not complicate future updates.
Signed-off-by Markus Armbruster <[email protected]>Reviewed-by Richard Henderson <[email protected]>
Quoted 12 lines
--- hw/gpio/pca9554.c | 5 +---- hw/i386/kvm/xen_xenstore.c | 4 +--- hw/riscv/virt.c | 25 ++++++++++--------------- hw/scsi/esp.c | 5 +---- hw/vfio/common.c | 7 ++----- plugins/api.c | 4 +--- tests/qtest/cmsdk-apb-watchdog-test.c | 6 +----- tests/qtest/pnv-host-i2c-test.c | 4 +--- tests/qtest/stm32l4x5_usart-test.c | 6 +----- tools/i386/qemu-vmsr-helper.c | 5 +---- 10 files changed, 20 insertions(+), 51 deletions(-)
PATCH v2 2/3 cleanup: Drop pointless return at end of function
In reply to Markus ArmbrusterA few functions now end with a label. The next commit will clean them up.
--- include/system/os-win32.h | 1 - target/ppc/kvm_ppc.h | 3 --- accel/tcg/cpu-exec.c | 1 - block/gluster.c | 4 ---- block/rbd.c | 1 - block/replication.c | 1 - block/throttle-groups.c | 1 - bsd-user/signal.c | 1 - dump/win_dump.c | 2 -- event-loop-base.c | 2 -- hw/acpi/acpi-cpu-hotplug-stub.c | 8 -------- hw/acpi/acpi-mem-hotplug-stub.c | 5 ----- hw/acpi/acpi-nvdimm-stub.c | 1 - hw/acpi/acpi-pci-hotplug-stub.c | 6 ------ hw/arm/exynos4210.c | 1 - hw/arm/smmu-common.c | 1 - hw/arm/xen-stubs.c | 1 - hw/audio/asc.c | 1 - hw/core/qdev-properties-system.c | 1 - hw/cxl/cxl-host.c | 2 -- hw/display/macfb.c | 1 - hw/display/tcx.c | 1 - hw/display/virtio-gpu-base.c | 1 - hw/dma/sifive_pdma.c | 1 - hw/gpio/aspeed_gpio.c | 5 ----- hw/gpio/bcm2838_gpio.c | 1 - hw/gpio/imx_gpio.c | 2 -- hw/gpio/pl061.c | 1 - hw/hyperv/vmbus.c | 1 - hw/i2c/pm_smbus.c | 1 - hw/i386/intel_iommu.c | 2 -- hw/i386/nitro_enclave.c | 1 - hw/i386/xen/xen-hvm.c | 2 -- hw/input/virtio-input-host.c | 1 - hw/intc/arm_gicv3_cpuif.c | 1 - hw/intc/aspeed_intc.c | 4 ---- hw/intc/mips_gic.c | 1 - hw/ipmi/ipmi_bmc_extern.c | 2 -- hw/ipmi/ipmi_bmc_sim.c | 2 -- hw/ipmi/ipmi_bt.c | 1 - hw/ipmi/ipmi_kcs.c | 1 - hw/loongarch/virt.c | 3 --- hw/m68k/next-cube.c | 1 - hw/m68k/q800.c | 2 -- hw/mem/cxl_type3.c | 4 ---- hw/mem/sparse-mem.c | 1 - hw/misc/i2c-echo.c | 2 -- hw/misc/ivshmem-flat.c | 2 -- hw/misc/mips_cpc.c | 2 -- hw/net/can/ctucan_core.c | 2 -- hw/net/can/xlnx-versal-canfd.c | 2 -- hw/net/imx_fec.c | 1 - hw/net/vmxnet3.c | 1 - hw/nvram/xlnx-versal-efuse-ctrl.c | 1 - hw/ppc/mac_newworld.c | 2 -- hw/ppc/pnv_occ.c | 1 - hw/ppc/spapr_hcall.c | 1 - hw/ppc/spapr_nested.c | 1 - hw/ppc/spapr_nvdimm.c | 2 -- hw/s390x/s390-pci-bus.c | 1 - hw/s390x/s390-pci-vfio.c | 2 -- hw/scsi/megasas.c | 1 - hw/scsi/vhost-scsi.c | 1 - hw/ssi/ibex_spi_host.c | 1 - hw/ssi/pnv_spi.c | 2 -- hw/tpm/tpm_tis_i2c.c | 4 ---- hw/usb/dev-mtp.c | 2 -- hw/usb/dev-serial.c | 2 -- hw/usb/dev-smartcard-reader.c | 1 - hw/usb/dev-uas.c | 1 - hw/vfio/display.c | 1 - hw/vfio/pci.c | 1 - hw/vfio/platform.c | 1 - hw/virtio/vhost-user-fs.c | 1 - hw/virtio/vhost-user-scmi.c | 2 -- hw/virtio/vhost-user-vsock.c | 1 - hw/virtio/vhost-user.c | 2 -- hw/virtio/vhost-vdpa.c | 2 -- hw/virtio/vhost.c | 1 - hw/virtio/virtio-nsm.c | 1 - hw/virtio/virtio.c | 2 -- hw/watchdog/sbsa_gwdt.c | 1 - hw/watchdog/wdt_aspeed.c | 1 - linux-user/xtensa/signal.c | 1 - migration/multifd-nocomp.c | 1 - migration/qemu-file.c | 2 -- migration/ram.c | 2 -- net/colo-compare.c | 2 -- qemu-keymap.c | 1 - qga/commands-win32.c | 4 ---- system/dirtylimit.c | 2 -- target/arm/tcg/helper-a64.c | 2 -- target/i386/kvm/vmsr_energy.c | 1 - target/i386/tcg/translate.c | 1 - target/i386/whpx/whpx-all.c | 11 ----------- target/m68k/helper.c | 1 - target/mips/tcg/system/mips-semi.c | 1 - target/ppc/kvm.c | 1 - target/ppc/translate.c | 1 - target/riscv/debug.c | 6 ------ target/s390x/cpu_models.c | 1 - target/sh4/translate.c | 1 - tests/qtest/ahci-test.c | 1 - tests/qtest/fuzz/generic_fuzz.c | 1 - tests/qtest/libqos/libqos-malloc.c | 1 - tests/qtest/libqtest.c | 1 - tests/qtest/test-x86-cpuid-compat.c | 1 - tests/unit/socket-helpers.c | 1 - tests/unit/test-qgraph.c | 1 - ui/input-linux.c | 1 - ui/vnc.c | 2 -- util/main-loop.c | 1 - util/qht.c | 1 - 113 files changed, 197 deletions(-)
include/system/os-win32.h +0 -1
@@ -130,7 +130,6 @@ static inline int os_mlock(bool on_fault G_GNUC_UNUSED)static inline void os_setup_limits (void ) { -return ; }#define fsync _commit
target/ppc/kvm_ppc.h +0 -3
@@ -221,7 +221,6 @@ static inline int kvmppc_smt_threads(void)static inline void kvmppc_error_append_smt_possible_hint (Error *const *errp) { -return ; }static inline int kvmppc_set_smt_threads (int smt)
@@ -259,7 +258,6 @@ static inline target_ulong kvmppc_configure_v3_mmu(PowerPCCPU *cpu,static inline void kvmppc_set_reg_ppc_online (PowerPCCPU *cpu,unsigned int online) { -return ; }static inline void kvmppc_set_reg_tb_offset (PowerPCCPU *cpu,int64_t tb_offset)
@@ -456,7 +454,6 @@ static inline PowerPCCPUClass *kvm_ppc_get_host_cpu_class(void)static inline void kvmppc_check_papr_resize_hpt (Error **errp) { -return ; } static inline int kvmppc_resize_hpt_prepare(PowerPCCPU *cpu,
accel/tcg/cpu-exec.c +0 -1
@@ -665,7 +665,6 @@ static inline void tb_add_jump(TranslationBlock *tb, int n, out_unlock_next:qemu_spin_unlock (&tb_next->jmp_lock); -return ; }static inline bool cpu_handle_halt (CPUState *cpu)
block/gluster.c +0 -4
@@ -972,8 +972,6 @@ static void qemu_gluster_reopen_commit(BDRVReopenState *state)g_free (state->opaque); state->opaque =NULL ; - -return ; }
@@ -993,8 +991,6 @@ static void qemu_gluster_reopen_abort(BDRVReopenState *state)g_free (state->opaque); state->opaque =NULL ; - -return ; }#ifdef CONFIG_GLUSTERFS_ZEROFILL
block/rbd.c +0 -1
@@ -254,7 +254,6 @@ static void qemu_rbd_parse_filename(const char *filename, QDict *options, done:g_free (buf);qobject_unref (keypairs); -return ; } static int qemu_rbd_set_auth(rados_t cluster, BlockdevOptionsRbd *opts,
block/replication.c +0 -1
@@ -176,7 +176,6 @@ static void replication_child_perm(BlockDriverState *bs, BdrvChild *c, *nshared =BLK_PERM_CONSISTENT_READ |BLK_PERM_WRITE |BLK_PERM_WRITE_UNCHANGED ; -return ; } static int64_t coroutine_fn GRAPH_RDLOCK
block/throttle-groups.c +0 -1
@@ -908,7 +908,6 @@ unlock:qemu_mutex_unlock (&tg->lock);qapi_free_ThrottleLimits (argp);error_propagate (errp, local_err); -return ; } static void throttle_group_get_limits(Object *obj, Visitor *v,
bsd-user/signal.c +0 -1
@@ -441,7 +441,6 @@ void queue_signal(CPUArchState *env, int sig, int si_type, ts->sync_signal.pending = sig;/* Signal that a new signal is pending. */ qatomic_set (&ts->signal_pending,1 ); -return ; }static int fatal_signal (int sig)
dump/win_dump.c +0 -2
@@ -476,8 +476,6 @@ out_free:g_free (saved_ctx); out_cr3: first_x86_cpu->env.cr[3] = saved_cr3; - - return; }#else /* !TARGET_X86_64 */
event-loop-base.c +0 -2
@@ -73,8 +73,6 @@ static void event_loop_base_set_param(Object *obj, Visitor *v,if (bc->update_params) { bc->update_params (base, errp); } - -return ; }static void event_loop_base_complete (UserCreatable *uc,Error **errp)
hw/acpi/acpi-cpu-hotplug-stub.c +0 -8
@@ -10,47 +10,39 @@ void acpi_switch_to_modern_cphp(AcpiCpuHotplug *gpe_cpu, CPUHotplugState *cpuhp_state, uint16_t io_port) { -return ; }void legacy_acpi_cpu_hotplug_init (MemoryRegion *parent,Object *owner,AcpiCpuHotplug *gpe_cpu,uint16_t base) { -return ; }void cpu_hotplug_hw_init (MemoryRegion *as,Object *owner,CPUHotplugState *state,hwaddr base_addr) { -return ; }void acpi_cpu_ospm_status (CPUHotplugState *cpu_st,ACPIOSTInfoList ***list) { -return ; }void acpi_cpu_plug_cb (HotplugHandler *hotplug_dev,CPUHotplugState *cpu_st,DeviceState *dev,Error **errp) { -return ; }void legacy_acpi_cpu_plug_cb (HotplugHandler *hotplug_dev,AcpiCpuHotplug *g,DeviceState *dev,Error **errp) { -return ; }void acpi_cpu_unplug_cb (CPUHotplugState *cpu_st,DeviceState *dev,Error **errp) { -return ; }void acpi_cpu_unplug_request_cb (HotplugHandler *hotplug_dev,CPUHotplugState *cpu_st,DeviceState *dev,Error **errp) { -return ; }
hw/acpi/acpi-mem-hotplug-stub.c +0 -5
@@ -7,29 +7,24 @@ const VMStateDescription vmstate_memory_hotplug;void acpi_memory_hotplug_init (MemoryRegion *as,Object *owner,MemHotplugState *state,hwaddr io_base) { -return ; }void acpi_memory_ospm_status (MemHotplugState *mem_st,ACPIOSTInfoList ***list) { -return ; }void acpi_memory_plug_cb (HotplugHandler *hotplug_dev,MemHotplugState *mem_st,DeviceState *dev,Error **errp) { -return ; }void acpi_memory_unplug_cb (MemHotplugState *mem_st,DeviceState *dev,Error **errp) { -return ; }void acpi_memory_unplug_request_cb (HotplugHandler *hotplug_dev,MemHotplugState *mem_st,DeviceState *dev,Error **errp) { -return ; }
hw/acpi/acpi-nvdimm-stub.c +0 -1
@@ -4,5 +4,4 @@void nvdimm_acpi_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev) { -return ; }
hw/acpi/acpi-pci-hotplug-stub.c +0 -6
@@ -7,37 +7,31 @@ const VMStateDescription vmstate_acpi_pcihp_pci_status;void acpi_pcihp_init (Object *owner,AcpiPciHpState *s,PCIBus *root_bus,MemoryRegion *address_space_io,uint16_t io_base) { -return ; }void acpi_pcihp_device_plug_cb (HotplugHandler *hotplug_dev,AcpiPciHpState *s,DeviceState *dev,Error **errp) { -return ; }void acpi_pcihp_device_pre_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp) { -return ; }void acpi_pcihp_device_unplug_cb (HotplugHandler *hotplug_dev,AcpiPciHpState *s,DeviceState *dev,Error **errp) { -return ; }void acpi_pcihp_device_unplug_request_cb (HotplugHandler *hotplug_dev,AcpiPciHpState *s,DeviceState *dev,Error **errp) { -return ; }void acpi_pcihp_reset (AcpiPciHpState *s) { -return ; }bool acpi_pcihp_is_hotpluggbale_bus (AcpiPciHpState *s,BusState *bus)
hw/arm/exynos4210.c +0 -1
@@ -462,7 +462,6 @@ static uint64_t exynos4210_chipid_and_omr_read(void *opaque, hwaddr offset,static void exynos4210_chipid_and_omr_write (void *opaque,hwaddr offset,uint64_t value,unsigned size) { -return ; }static const MemoryRegionOps exynos4210_chipid_and_omr_ops = {
hw/arm/smmu-common.c +0 -1
@@ -712,7 +712,6 @@ static void combine_tlb(SMMUTLBEntry *tlbe, SMMUTLBEntry *tlbe_s2, tlbe->entry.iova = iova & ~tlbe->entry.addr_mask;/* parent_perm has s2 perm while perm keeps s1 perm. */ tlbe->parent_perm = tlbe_s2->entry.perm; -return ; }/**
hw/arm/xen-stubs.c +0 -1
@@ -14,7 +14,6 @@void arch_handle_ioreq (XenIOState *state,ioreq_t *req) {hw_error ("Invalid ioreq type 0x%x\n" , req->type); -return ; } void arch_xen_set_memory(XenIOState *state, MemoryRegionSection *section,
hw/audio/asc.c +0 -1
@@ -406,7 +406,6 @@ static void asc_fifo_write(void *opaque, hwaddr addr, uint64_t value, }else { fs->fifo[addr] = value; } -return ; }static const MemoryRegionOps asc_fifo_ops = {
hw/core/qdev-properties-system.c +0 -1
@@ -793,7 +793,6 @@ separator_error:error_setg (errp,"reserved region fields must be separated with ':'" ); out:g_free (str); -return ; }const PropertyInfo qdev_prop_reserved_region = {
hw/cxl/cxl-host.c +0 -2
@@ -67,8 +67,6 @@ static void cxl_fixed_memory_window_config(CXLState *cxl_state, cxl_state->fixed_windows =g_list_append (cxl_state->fixed_windows,g_steal_pointer (&fw)); - -return ; }void cxl_fmws_link_targets (CXLState *cxl_state,Error **errp)
hw/display/macfb.c +0 -1
@@ -383,7 +383,6 @@ static void macfb_sense_write(MacfbState *s, uint32_t val) s->regs[DAFB_MODE_SENSE >>2 ] = val;trace_macfb_sense_write (val); -return ; }static void macfb_update_mode (MacfbState *s)
hw/display/tcx.c +0 -1
@@ -729,7 +729,6 @@ static uint64_t tcx_dummy_readl(void *opaque, hwaddr addr,static void tcx_dummy_writel (void *opaque,hwaddr addr,uint64_t val,unsigned size) { -return ; }static const MemoryRegionOps tcx_dummy_ops = {
hw/display/virtio-gpu-base.c +0 -1
@@ -110,7 +110,6 @@ static void virtio_gpu_ui_info(void *opaque, uint32_t idx, QemuUIInfo *info)/* send event to guest */ virtio_gpu_notify_event (g,VIRTIO_GPU_EVENT_DISPLAY ); -return ; } static void
hw/dma/sifive_pdma.c +0 -1
@@ -152,7 +152,6 @@ done: error: s->chan[ch].state =DMA_CHAN_STATE_ERROR ; s->chan[ch].control |=CONTROL_ERR ; -return ; }static inline void sifive_pdma_update_irq (SiFivePDMAState *s,int ch)
hw/gpio/aspeed_gpio.c +0 -5
@@ -800,7 +800,6 @@ static void aspeed_gpio_write_index_mode(void *opaque, hwaddr offset,return ; }aspeed_gpio_update (s, set, set->data_value,UINT32_MAX ); -return ; } static void aspeed_gpio_write(void *opaque, hwaddr offset, uint64_t data,
@@ -928,7 +927,6 @@ static void aspeed_gpio_write(void *opaque, hwaddr offset, uint64_t data,return ; }aspeed_gpio_update (s, set, set->data_value,UINT32_MAX ); -return ; }static int get_set_idx (AspeedGPIOState *s,const char *group,int *group_idx)
@@ -1183,7 +1181,6 @@ static void aspeed_gpio_2700_write_control_reg(AspeedGPIOState *s, }aspeed_gpio_update (s, set, set->data_value,UINT32_MAX ); -return ; } static uint64_t aspeed_gpio_2700_read(void *opaque, hwaddr offset,
@@ -1308,8 +1305,6 @@ static void aspeed_gpio_2700_write(void *opaque, hwaddr offset, PRIx64"\n", __func__, offset);break ; } - -return ; }/* Setup functions */
hw/gpio/bcm2838_gpio.c +0 -1
@@ -293,7 +293,6 @@ static void bcm2838_gpio_write(void *opaque, hwaddr offset, uint64_t value,qemu_log_mask (LOG_GUEST_ERROR ,"%s: %s: bad offset %" HWADDR_PRIx"\n" ,TYPE_BCM2838_GPIO , __func__, offset); } -return ; }static void bcm2838_gpio_reset (DeviceState *dev)
hw/gpio/imx_gpio.c +0 -2
@@ -257,8 +257,6 @@ static void imx_gpio_write(void *opaque, hwaddr offset, uint64_t value, HWADDR_PRIx "\n", TYPE_IMX_GPIO, __func__, offset);break ; } - -return ; }static const MemoryRegionOps imx_gpio_ops = {
hw/gpio/pl061.c +0 -1
@@ -443,7 +443,6 @@ static void pl061_write(void *opaque, hwaddr offset,return ; }pl061_update (s); -return ; }static void pl061_enter_reset (Object *obj,ResetType type)
hw/hyperv/vmbus.c +0 -1
@@ -2073,7 +2073,6 @@ static void send_unload(VMBus *vmbus)qemu_mutex_unlock (&vmbus->rx_queue_lock);post_msg (vmbus, &msg,sizeof (msg)); -return ; }static bool complete_unload (VMBus *vmbus)
hw/i2c/pm_smbus.c +0 -1
@@ -205,7 +205,6 @@ out: error: s->smb_stat |=STS_DEV_ERR ; -return ; }static void smb_transaction_start (PMSMBus *s)
hw/i386/intel_iommu.c +0 -2
@@ -4515,8 +4515,6 @@ static void vtd_iommu_replay(IOMMUMemoryRegion *iommu_mr, IOMMUNotifier *n)trace_vtd_replay_ce_invalid (bus_n,PCI_SLOT (vtd_as->devfn),PCI_FUNC (vtd_as->devfn)); } - -return ; }static void vtd_cap_init (IntelIOMMUState *s)
hw/i386/nitro_enclave.c +0 -1
@@ -203,7 +203,6 @@ static void x86_load_eif(X86MachineState *x86ms, FWCfgState *fw_cfg,unlink (machine->kernel_filename);unlink (machine->initrd_filename); -return ; } static bool create_memfd_backend(MachineState *ms, const char *path,
hw/i386/xen/xen-hvm.c +0 -2
@@ -758,6 +758,4 @@ void arch_handle_ioreq(XenIOState *state, ioreq_t *req)default :hw_error ("Invalid ioreq type 0x%x\n" , req->type); } - -return ; }
hw/input/virtio-input-host.c +0 -1
@@ -178,7 +178,6 @@ static void virtio_input_host_realize(DeviceState *dev, Error **errp) err_close:close (vih->fd); vih->fd =-1 ; -return ; }static void virtio_input_host_unrealize (DeviceState *dev)
hw/intc/arm_gicv3_cpuif.c +0 -1
@@ -584,7 +584,6 @@ static void icv_ap_write(CPUARMState *env, const ARMCPRegInfo *ri, }gicv3_cpuif_virt_irq_fiq_update (cs); -return ; }static uint64_t icv_bpr_read (CPUARMState *env,const ARMCPRegInfo *ri)
hw/intc/aspeed_intc.c +0 -4
@@ -448,8 +448,6 @@ static void aspeed_intc_write(void *opaque, hwaddr offset, uint64_t data, s->regs[reg] = data;break ; } - -return ; } static uint64_t aspeed_intcio_read(void *opaque, hwaddr offset,
@@ -496,8 +494,6 @@ static void aspeed_intcio_write(void *opaque, hwaddr offset, uint64_t data, s->regs[reg] = data;break ; } - -return ; }
hw/intc/mips_gic.c +0 -1
@@ -255,7 +255,6 @@ static void gic_write_vp(MIPSGICState *gic, uint32_t vp_index, hwaddr addr,return ; bad_offset:qemu_log_mask (LOG_GUEST_ERROR ,"Wrong GIC offset at 0x%" PRIx64"\n" , addr); -return ; }static void gic_write (void *opaque,hwaddr addr,uint64_t data,unsigned size)
hw/ipmi/ipmi_bmc_extern.c +0 -2
@@ -142,7 +142,6 @@ static void continue_send(IPMIBmcExtern *ibe) qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 4000000000ULL); } } -return ; }static void extern_timeout (void *opaque)
@@ -231,7 +230,6 @@ static void ipmi_bmc_extern_handle_command(IPMIBmc *b,continue_send (ibe); out: -return ; }static void handle_hw_op (IPMIBmcExtern *ibe,unsigned char hw_op)
hw/ipmi/ipmi_bmc_sim.c +0 -2
@@ -470,7 +470,6 @@ void ipmi_bmc_gen_event(IPMIBmc *b, uint8_t *evt, bool log) ibs->msg_flags |=IPMI_BMC_MSG_FLAG_EVT_BUF_FULL ; k->set_atn (s,1 ,attn_irq_enabled (ibs)); out: -return ; }static void gen_event (IPMIBmcSim *ibs,unsigned int sens_num,uint8_t deassert,uint8_t evd1,uint8_t evd2,uint8_t evd3)
@@ -997,7 +996,6 @@ static void get_msg(IPMIBmcSim *ibs, } out: -return ; } static unsigned char
hw/ipmi/ipmi_bt.c +0 -1
@@ -146,7 +146,6 @@ static void ipmi_bt_handle_event(IPMIInterface *ii) sizeof(ib->inmsg), ib->waiting_rsp); } out: -return ; } static void ipmi_bt_handle_rsp(IPMIInterface *ii, uint8_t msg_id,
hw/ipmi/ipmi_kcs.c +0 -1
@@ -198,7 +198,6 @@ static void ipmi_kcs_handle_event(IPMIInterface *ii) ik->data_in_reg =-1 ;IPMI_KCS_SET_IBF (ik->status_reg,0 ); out_noibf: -return ; } static void ipmi_kcs_handle_rsp(IPMIInterface *ii, uint8_t msg_id,
hw/loongarch/virt.c +0 -3
@@ -962,7 +962,6 @@ static void virt_cpu_unplug(HotplugHandler *hotplug_dev, cpu_slot =virt_find_cpu_slot (MACHINE (lvms), cpu->phy_id); cpu_slot->cpu =NULL ; -return ; } static void virt_cpu_plug(HotplugHandler *hotplug_dev,
@@ -997,8 +996,6 @@ static void virt_cpu_plug(HotplugHandler *hotplug_dev,error_propagate (errp, err); } } - -return ; }static bool memhp_type_supported (DeviceState *dev)
hw/m68k/next-cube.c +0 -1
@@ -899,7 +899,6 @@ static void next_dummy_en_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) {/* Do nothing */ -return ; }static uint64_t next_dummy_en_read (void *opaque,hwaddr addr,unsigned size)
hw/m68k/q800.c +0 -2
@@ -210,7 +210,6 @@ static uint64_t machine_id_read(void *opaque, hwaddr addr, unsigned size)static void machine_id_write (void *opaque,hwaddr addr,uint64_t val,unsigned size) { -return ; }static const MemoryRegionOps machine_id_ops = {
@@ -231,7 +230,6 @@ static uint64_t ramio_read(void *opaque, hwaddr addr, unsigned size)static void ramio_write (void *opaque,hwaddr addr,uint64_t val,unsigned size) { -return ; }static const MemoryRegionOps ramio_ops = {
hw/mem/cxl_type3.c +0 -4
@@ -957,7 +957,6 @@ err_free_special_ops:if (ct3d->hostvmem) {address_space_destroy (&ct3d->hostvmem_as); } -return ; }static void ct3_exit (PCIDevice *pci_dev)
@@ -1511,8 +1510,6 @@ void qmp_cxl_inject_uncorrectable_errors(const char *path,stl_le_p (reg_state +R_CXL_RAS_UNC_ERR_STATUS , unc_err);pcie_aer_inject_error (PCI_DEVICE (obj), &err); - -return ; } void qmp_cxl_inject_correctable_error(const char *path, CxlCorErrorType type,
@@ -1788,7 +1785,6 @@ void qmp_cxl_inject_dram_event(const char *path, CxlEventLog log, uint8_t flags,if (cxl_event_insert (cxlds, enc_log, (CXLEventRecordRaw *)&dram)) {cxl_event_irq_assert (ct3d); } -return ; } void qmp_cxl_inject_memory_module_event(const char *path, CxlEventLog log,
hw/mem/sparse-mem.c +0 -1
@@ -82,7 +82,6 @@ static void sparse_mem_enter_reset(Object *obj, ResetType type) {SparseMemState *s =SPARSE_MEM (obj);g_hash_table_remove_all (s->mapped); -return ; }static const MemoryRegionOps sparse_mem_ops = {
hw/misc/i2c-echo.c +0 -2
@@ -143,8 +143,6 @@ static void i2c_echo_realize(DeviceState *dev, Error **errp) state->bus =I2C_BUS (bus); state->bh =qemu_bh_new (i2c_echo_bh, state); - -return ; }static void i2c_echo_class_init (ObjectClass *oc,void *data)
hw/misc/ivshmem-flat.c +0 -2
@@ -289,8 +289,6 @@ static void ivshmem_flat_iomem_write(void *opaque, hwaddr offset,trace_ivshmem_flat_read_write_mmr_invalid (offset);break ; } - -return ; }static const MemoryRegionOps ivshmem_flat_ops = {
hw/misc/mips_cpc.c +0 -2
@@ -92,8 +92,6 @@ static void cpc_write(void *opaque, hwaddr offset, uint64_t data, "%s: Bad offset 0x%x\n", __func__, (int)offset);break ; } - -return ; }static uint64_t cpc_read (void *opaque,hwaddr offset,unsigned size)
hw/net/can/ctucan_core.c +0 -2
@@ -400,8 +400,6 @@ void ctucan_mem_write(CtuCanCoreState *s, hwaddr addr, uint64_t val,ctucan_update_irq (s); } - -return ; }uint64_t ctucan_mem_read (CtuCanCoreState *s,hwaddr addr,unsigned size)
hw/net/can/xlnx-versal-canfd.c +0 -2
@@ -1298,8 +1298,6 @@ static void free_list(GSList *list) }g_slist_free (list); - -return ; }static GSList *prepare_tx_data (XlnxVersalCANFDState *s)
hw/net/imx_fec.c +0 -1
@@ -668,7 +668,6 @@ static void imx_default_write(IMXFECState *s, uint32_t index, uint32_t value) {qemu_log_mask (LOG_GUEST_ERROR ,"[%s]%s: Bad address at offset 0x%" PRIx32"\n" ,TYPE_IMX_FEC , __func__, index *4 ); -return ; }static void imx_fec_write (IMXFECState *s,uint32_t index,uint32_t value)
hw/net/vmxnet3.c +0 -1
@@ -932,7 +932,6 @@ static void vmxnet3_rx_update_descr(struct NetRxPkt *pkt, nocsum: rxcd->cnc =1 ; -return ; } static void
hw/nvram/xlnx-versal-efuse-ctrl.c +0 -1
@@ -494,7 +494,6 @@ static void efuse_rd_addr_postw(RegisterInfo *reg, uint64_t val64)ARRAY_FIELD_DP32 (s->regs,EFUSE_ISR ,RD_DONE ,1 );efuse_imr_update_irq (s); -return ; }static uint64_t efuse_cache_load_prew (RegisterInfo *reg,uint64_t val64)
hw/ppc/mac_newworld.c +0 -2
@@ -630,8 +630,6 @@ static void core99_instance_init(Object *obj)object_property_set_description (obj,"via" ,"Set VIA configuration. " "Valid values are cuda, pmu and pmu-adb" ); - -return ; }static const TypeInfo core99_machine_info = {
hw/ppc/pnv_occ.c +0 -1
@@ -150,7 +150,6 @@ static void pnv_occ_common_area_write(void *opaque, hwaddr addr, uint64_t val, unsigned width) {/* callback function defined to occ common area write */ -return ; }static const MemoryRegionOps pnv_occ_power8_xscom_ops = {
hw/ppc/spapr_hcall.c +0 -1
@@ -981,7 +981,6 @@ static void spapr_check_setup_free_hpt(SpaprMachineState *spapr,/* RADIX->HASH || NOTHING->HASH : Allocate HPT */ spapr_setup_hpt (spapr); } -return ; }#define FLAGS_MASK 0x01FULL
hw/ppc/spapr_nested.c +0 -1
@@ -1735,7 +1735,6 @@ static void exit_process_output_buffer(SpaprMachineState *spapr,getset_state (spapr, guest, vcpuid, &gsr);address_space_unmap (CPU (cpu)->as, gsb, len, true, len); -return ; } static
hw/ppc/spapr_nvdimm.c +0 -2
@@ -235,8 +235,6 @@ void spapr_dt_persistent_memory(SpaprMachineState *spapr, void *fdt)spapr_dt_nvdimm (spapr, fdt, offset, nvdimm); }g_slist_free (nvdimms); - -return ; } static target_ulong h_scm_read_metadata(PowerPCCPU *cpu,
hw/s390x/s390-pci-bus.c +0 -1
@@ -597,7 +597,6 @@ static void s390_pci_iommu_replay(IOMMUMemoryRegion *iommu,* zpci device" construct. But when we support migration of vfio-pci * devices in future, we need to revisit this. */ -return ; } static S390PCIIOMMU *s390_pci_get_iommu(S390pciState *s, PCIBus *bus,
hw/s390x/s390-pci-vfio.c +0 -2
@@ -367,6 +367,4 @@ void s390_pci_get_clp_info(S390PCIBusDevice *pbdev)s390_pci_read_group (pbdev, info);s390_pci_read_util (pbdev, info);s390_pci_read_pfip (pbdev, info); - -return ; }
hw/scsi/megasas.c +0 -1
@@ -2226,7 +2226,6 @@ static uint64_t megasas_queue_read(void *opaque, hwaddr addr,static void megasas_queue_write (void *opaque,hwaddr addr,uint64_t val,unsigned size) { -return ; }static const MemoryRegionOps megasas_queue_ops = {
hw/scsi/vhost-scsi.c +0 -1
@@ -314,7 +314,6 @@ static void vhost_scsi_realize(DeviceState *dev, Error **errp)if (vhostfd >=0 ) {close (vhostfd); } -return ; }static void vhost_scsi_unrealize (DeviceState *dev)
hw/ssi/ibex_spi_host.c +0 -1
@@ -154,7 +154,6 @@ static void ibex_spi_host_reset(DeviceState *dev)ibex_spi_txfifo_reset (s); s->init_status = true; -return ; }/*
hw/ssi/pnv_spi.c +0 -2
@@ -996,7 +996,6 @@ static void operation_sequencer(PnvSpi *s) }/* end of while */ /* Update sequencer index field in status.*/ s->status =SETFIELD (SPI_STS_SEQ_INDEX , s->status, seq_index); -return ; }/* end of operation_sequencer() */ /*
@@ -1142,7 +1141,6 @@ static void pnv_spi_xscom_write(void *opaque, hwaddr addr,qemu_log_mask (LOG_GUEST_ERROR ,"pnv_spi_regs: Invalid xscom " "write at 0x%" PRIx32"\n" , reg); } -return ; }static const MemoryRegionOps pnv_spi_xscom_ops = {
hw/tpm/tpm_tis_i2c.c +0 -4
@@ -211,8 +211,6 @@ static inline void tpm_tis_i2c_clear_data(TPMStateI2C *i2cst) i2cst->tis_addr =0xffffffff ; i2cst->reg_name =NULL ;memset (i2cst->data,0 ,sizeof (i2cst->data)); - -return ; }/* Send data to TPM */
@@ -281,8 +279,6 @@ static inline void tpm_tis_i2c_tpm_send(TPMStateI2C *i2cst)tpm_tis_i2c_clear_data (i2cst); } - -return ; }/* Callback from TPM to indicate that response is copied */
hw/usb/dev-mtp.c +0 -2
@@ -1234,8 +1234,6 @@ static void usb_mtp_object_delete(MTPState *s, uint32_t handle,default :g_assert_not_reached (); } - -return ; }static void usb_mtp_command (MTPState *s,MTPControl *c)
hw/usb/dev-serial.c +0 -2
@@ -472,8 +472,6 @@ static void usb_serial_token_in(USBSerialState *s, USBPacket *p) s->recv_ptr = (s->recv_ptr + len) %RECV_BUF ; packet_len -= len +2 ; } - -return ; }static void usb_serial_handle_data (USBDevice *dev,USBPacket *p)
hw/usb/dev-smartcard-reader.c +0 -1
@@ -1069,7 +1069,6 @@ static void ccid_handle_bulk_out(USBCCIDState *s, USBPacket *p) err: p->status =USB_RET_STALL ; s->bulk_out_pos =0 ; -return ; } static void ccid_bulk_in_copy_to_guest(USBCCIDState *s, USBPacket *p,
hw/usb/dev-uas.c +0 -1
@@ -914,7 +914,6 @@ static void usb_uas_handle_data(USBDevice *dev, USBPacket *p) err_stream:error_report ("%s: invalid stream %d" , __func__, p->stream); p->status =USB_RET_STALL ; -return ; }static void usb_uas_unrealize (USBDevice *dev)
hw/vfio/display.c +0 -1
@@ -104,7 +104,6 @@ static void vfio_display_edid_update(VFIOPCIDevice *vdev, bool enabled, err:trace_vfio_display_edid_write_error (); -return ; } static void vfio_display_edid_ui_info(void *opaque, uint32_t idx,
hw/vfio/pci.c +0 -1
@@ -2383,7 +2383,6 @@ static void vfio_add_ext_cap(VFIOPCIDevice *vdev) }g_free (config); -return ; }static bool vfio_add_capabilities (VFIOPCIDevice *vdev,Error **errp)
hw/vfio/platform.c +0 -1
@@ -418,7 +418,6 @@ fail_vfio:abort (); fail_irqfd:vfio_start_eventfd_injection (sbdev, irq); -return ; }/* VFIO skeleton */
hw/virtio/vhost-user-fs.c +0 -1
@@ -267,7 +267,6 @@ err_virtio:g_free (fs->req_vqs);virtio_cleanup (vdev);g_free (fs->vhost_dev.vqs); -return ; }static void vuf_device_unrealize (DeviceState *dev)
hw/virtio/vhost-user-scmi.c +0 -2
@@ -258,8 +258,6 @@ static void vu_scmi_device_realize(DeviceState *dev, Error **errp)qemu_chr_fe_set_handlers (&scmi->chardev,NULL ,NULL , vu_scmi_event,NULL , dev,NULL , true); - -return ; }static void vu_scmi_device_unrealize (DeviceState *dev)
hw/virtio/vhost-user-vsock.c +0 -1
@@ -128,7 +128,6 @@ err_vhost_dev: err_virtio:vhost_vsock_common_unrealize (vdev);vhost_user_cleanup (&vsock->vhost_user); -return ; }static void vuv_device_unrealize (DeviceState *dev)
hw/virtio/vhost-user.c +0 -2
@@ -654,8 +654,6 @@ static void scrub_shadow_regions(struct vhost_dev *dev, } *nr_rem_reg = rm_idx; *nr_add_reg = add_idx; - -return ; } static int send_remove_regions(struct vhost_dev *dev,
hw/virtio/vhost-vdpa.c +0 -2
@@ -288,8 +288,6 @@ static void vhost_vdpa_iommu_region_add(MemoryListener *listener,QLIST_INSERT_HEAD (&s->iommu_list, iommu, iommu_next);memory_region_iommu_replay (iommu->iommu_mr, &iommu->n); - -return ; } static void vhost_vdpa_iommu_region_del(MemoryListener *listener,
hw/virtio/vhost.c +0 -1
@@ -732,7 +732,6 @@ out:memory_region_unref (old_sections[n_old_sections].mr); }g_free (old_sections); -return ; }/* Adds the section data to the tmp_section structure.
hw/virtio/virtio-nsm.c +0 -1
@@ -1609,7 +1609,6 @@ static void handle_input(VirtIODevice *vdev, VirtQueue *vq)if (in_elem) {virtqueue_detach_element (vq, in_elem,0 ); } -return ; }static uint64_t get_features (VirtIODevice *vdev,uint64_t f,Error **errp)
hw/virtio/virtio.c +0 -2
@@ -3648,7 +3648,6 @@ static void virtio_queue_packed_restore_last_avail_idx(VirtIODevice *vdev, int n) {/* We don't have a reference like avail idx in shared memory */ -return ; } static void virtio_queue_split_restore_last_avail_idx(VirtIODevice *vdev,
@@ -3673,7 +3672,6 @@ void virtio_queue_restore_last_avail_idx(VirtIODevice *vdev, int n)static void virtio_queue_packed_update_used_idx (VirtIODevice *vdev,int n) {/* used idx was updated through set_last_avail_idx() */ -return ; }static void virtio_queue_split_update_used_idx (VirtIODevice *vdev,int n)
hw/watchdog/sbsa_gwdt.c +0 -1
@@ -174,7 +174,6 @@ static void sbsa_gwdt_write(void *opaque, hwaddr offset, uint64_t data,qemu_log_mask (LOG_GUEST_ERROR ,"bad address in control frame write :" " 0x%x\n" , (int )offset); } -return ; }static void wdt_sbsa_gwdt_reset (DeviceState *dev)
hw/watchdog/wdt_aspeed.c +0 -1
@@ -225,7 +225,6 @@ static void aspeed_wdt_write(void *opaque, hwaddr offset, uint64_t data,"%s: Out-of-bounds write at offset 0x%" HWADDR_PRIx"\n" , __func__, offset); } -return ; }static const VMStateDescription vmstate_aspeed_wdt = {
linux-user/xtensa/signal.c +0 -1
@@ -241,7 +241,6 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, give_sigsegv:force_sigsegv (sig); -return ; } static void restore_sigcontext(CPUXtensaState *env,
migration/multifd-nocomp.c +0 -1
@@ -82,7 +82,6 @@ static void multifd_nocomp_send_cleanup(MultiFDSendParams *p, Error **errp) {g_free (p->iov); p->iov =NULL ; -return ; }static void multifd_ram_prepare_header (MultiFDSendParams *p)
migration/qemu-file.c +0 -2
@@ -561,8 +561,6 @@ void qemu_put_buffer_at(QEMUFile *f, const uint8_t *buf, size_t buflen, }stat64_add (&mig_stats.qemu_file_transferred, buflen); - -return ; }
migration/ram.c +0 -2
@@ -3963,8 +3963,6 @@ static void parse_ramblock_mapped_ram(QEMUFile *f, RAMBlock *block,/* Skip pages array */ qemu_set_offset (f, block->pages_offset + length,SEEK_SET ); - -return ; }static int parse_ramblock (QEMUFile *f,RAMBlock *block,ram_addr_t length)
net/colo-compare.c +0 -2
@@ -1328,8 +1328,6 @@ static void colo_compare_complete(UserCreatable *uc, Error **errp) }QTAILQ_INSERT_TAIL (&net_compares, s, next);qemu_mutex_unlock (&colo_compare_mutex); - -return ; }static void colo_flush_packets (void *opaque,void *user_data)
qemu-keymap.c +0 -1
@@ -116,7 +116,6 @@ static void walk_map(struct xkb_keymap *map, xkb_keycode_t code, void *data)if (kshift != kaltgrshift && kaltgr != kaltgrshift) {print_sym (kaltgrshift, qcode," shift altgr" ); } -return ; }static void usage (FILE *out)
qga/commands-win32.c +0 -4
@@ -826,8 +826,6 @@ static void get_disk_properties(HANDLE vol_h, GuestDiskAddress *disk, } out_free:g_free (dev_desc); - -return ; } static void get_single_disk_info(int disk_number,
@@ -891,7 +889,6 @@ static void get_single_disk_info(int disk_number, err_close:CloseHandle (disk_h); -return ; }/* VSS provider works with volumes, thus there is no difference if
@@ -2117,7 +2114,6 @@ static void ga_get_win_version(RTL_OSVERSIONINFOEXW *info, Error **errp)rtl_get_version_t rtl_get_version = (rtl_get_version_t )fun;rtl_get_version (info); -return ; }static char *ga_get_win_name (const OSVERSIONINFOEXW *os_version,bool id)
system/dirtylimit.c +0 -2
@@ -337,8 +337,6 @@ static void dirtylimit_adjust_throttle(CPUState *cpu)if (!dirtylimit_done (quota, current)) {dirtylimit_set_throttle (cpu, quota, current); } - -return ; }void dirtylimit_process (void )
target/arm/tcg/helper-a64.c +0 -2
@@ -1147,7 +1147,6 @@ static void do_setp(CPUARMState *env, uint32_t syndrome, uint32_t mtedesc, env->ZF =1 ;/* our env->ZF encoding is inverted */ env->CF =0 ; env->VF =0 ; -return ; }void HELPER (setp )(CPUARMState *env,uint32_t syndrome,uint32_t mtedesc)
@@ -1547,7 +1546,6 @@ static void do_cpyp(CPUARMState *env, uint32_t syndrome, uint32_t wdesc, env->ZF =1 ;/* our env->ZF encoding is inverted */ env->CF =0 ; env->VF =0 ; -return ; } void HELPER(cpyp)(CPUARMState *env, uint32_t syndrome, uint32_t wdesc,
target/i386/kvm/vmsr_energy.c +0 -1
@@ -285,7 +285,6 @@ void vmsr_read_thread_stat(pid_t pid, }fclose (file); -return ; }/* Read QEMU stat task folder to retrieve all QEMU threads ID */
target/i386/tcg/translate.c +0 -1
@@ -3601,7 +3601,6 @@ static void gen_multi0F(DisasContext *s, X86DecodedInsn *decode)return ; illegal_op:gen_illegal_opcode (s); -return ; }#include "decode-new.c.inc"
target/i386/whpx/whpx-all.c +0 -11
@@ -549,8 +549,6 @@ static void whpx_set_registers(CPUState *cpu, int level)error_report ("WHPX: Failed to set virtual processor context, hr=%08lx" , hr); } - -return ; }static int whpx_get_tsc (CPUState *cpu)
@@ -771,8 +769,6 @@ static void whpx_get_registers(CPUState *cpu) }x86_update_hflags (env); - -return ; } static HRESULT CALLBACK whpx_emu_ioport_callback(
@@ -1570,8 +1566,6 @@ static void whpx_vcpu_pre_run(CPUState *cpu) " hr=%08lx", hr); } } - -return ; }static void whpx_vcpu_post_run (CPUState *cpu)
@@ -1595,8 +1589,6 @@ static void whpx_vcpu_post_run(CPUState *cpu) vcpu->interruptable = !vcpu->exit_ctx.VpContext.ExecutionState.InterruptShadow; - -return ; }static void whpx_vcpu_process_async_events (CPUState *cpu)
@@ -1634,8 +1626,6 @@ static void whpx_vcpu_process_async_events(CPUState *cpu)apic_handle_tpr_access_report (x86_cpu->apic_state, env->eip, env->tpr_access_type); } - -return ; }static int whpx_vcpu_run (CPUState *cpu)
@@ -2280,7 +2270,6 @@ void whpx_destroy_vcpu(CPUState *cpu) whp_dispatch.WHvDeleteVirtualProcessor (whpx->partition, cpu->cpu_index); whp_dispatch.WHvEmulatorDestroyEmulator (vcpu->emulator);g_free (cpu->accel); -return ; }void whpx_vcpu_kick (CPUState *cpu)
target/m68k/helper.c +0 -1
@@ -290,7 +290,6 @@ void HELPER(m68k_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val)/* Invalid control registers will generate an exception. */ raise_exception_ra (env,EXCP_ILLEGAL ,0 ); -return ; }uint32_t HELPER (m68k_movec_from )(CPUM68KState *env,uint32_t reg)
target/mips/tcg/system/mips-semi.c +0 -1
@@ -374,5 +374,4 @@ void mips_semihosting(CPUMIPSState *env)error_report ("Unknown UHI operation %d" , op);abort (); } -return ; }
target/ppc/kvm.c +0 -1
@@ -1332,7 +1332,6 @@ int kvmppc_set_interrupt(PowerPCCPU *cpu, int irq, int level)void kvm_arch_pre_run (CPUState *cs,struct kvm_run *run) { -return ; }MemTxAttrs kvm_arch_post_run (CPUState *cs,struct kvm_run *run)
target/ppc/translate.c +0 -1
@@ -3627,7 +3627,6 @@ static void pmu_count_insns(DisasContext *ctx)#else static void pmu_count_insns (DisasContext *ctx) { -return ; }#endif /* #if defined(TARGET_PPC64) */
target/riscv/debug.c +0 -6
@@ -551,8 +551,6 @@ static void type2_reg_write(CPURISCVState *env, target_ulong index,default :g_assert_not_reached (); } - -return ; }/* type 6 trigger */
@@ -667,8 +665,6 @@ static void type6_reg_write(CPURISCVState *env, target_ulong index,default :g_assert_not_reached (); } - -return ; }/* icount trigger type */
@@ -849,8 +845,6 @@ static void itrigger_reg_write(CPURISCVState *env, target_ulong index,default :g_assert_not_reached (); } - -return ; }static int itrigger_get_adjust_count (CPURISCVState *env)
target/s390x/cpu_models.c +0 -1
@@ -578,7 +578,6 @@ static void check_compat_model_failed(Error **errp,error_setg (errp,"%s. Maximum supported model in the current configuration: \'%s\'" , msg, max_model->def->name);error_append_hint (errp,"Consider a different accelerator, try \"-accel help\"\n" ); -return ; } static bool check_compatibility(const S390CPUModel *max_model,
target/sh4/translate.c +0 -1
@@ -1792,7 +1792,6 @@ static void _decode_opc(DisasContext * ctx)gen_helper_raise_fpu_disable (tcg_env); } ctx->base.is_jmp =DISAS_NORETURN ; -return ; }static void decode_opc (DisasContext * ctx)
tests/qtest/ahci-test.c +0 -1
@@ -1881,7 +1881,6 @@ static void test_io_interface(gconstpointer opaque) sector =offset_sector (opts->offset, opts->address_type, bufsize);test_io_rw_interface (opts->address_type, opts->io_type, bufsize, sector);g_free (opts); -return ; } static void create_ahci_io_test(enum IOMode type, enum AddrMode addr,
tests/qtest/fuzz/generic_fuzz.c +0 -1
@@ -572,7 +572,6 @@ static void op_add_dma_pattern(QTestState *s,pattern p = {a.index, a.stride, len -sizeof (a), data +sizeof (a)}; p.index = a.index % p.len;g_array_append_val (dma_patterns, p); -return ; } static void op_clear_dma_patterns(QTestState *s,
tests/qtest/libqos/libqos-malloc.c +0 -1
@@ -342,5 +342,4 @@ void migrate_allocator(QGuestAllocator *src,QTAILQ_INIT (src->free); node =mlist_new (src->start, src->end - src->start);QTAILQ_INSERT_HEAD (src->free, node,MLIST_ENTNAME ); -return ; }
tests/qtest/libqtest.c +0 -1
@@ -2022,7 +2022,6 @@ void qtest_client_inproc_recv(void *opaque, const char *str) qts->rx =g_string_new (NULL ); }g_string_append (qts->rx, str); -return ; } void qtest_qom_set_bool(QTestState *s, const char *path, const char *property,
tests/qtest/test-x86-cpuid-compat.c +0 -1
@@ -193,7 +193,6 @@ static void add_feature_test(const char *name, const char *cpu, args->bitnr = bitnr; args->expected_value = expected_value;qtest_add_data_func (name, args, test_feature_flag); -return ; }static void test_plus_minus_subprocess (void )
tests/unit/socket-helpers.c +0 -1
@@ -170,5 +170,4 @@ void socket_check_afunix_support(bool *has_afunix)if (*has_afunix) {close (fd); } -return ; }
tests/unit/test-qgraph.c +0 -1
@@ -44,7 +44,6 @@ static void *driverfunct(void *obj, QGuestAllocator *machine, void *arg)static void testfunct (void *obj,void *arg,QGuestAllocator *alloc) { -return ; }static void check_interface (const char *interface)
ui/input-linux.c +0 -1
@@ -412,7 +412,6 @@ err_read_event_bits: err_close:close (il->fd); -return ; }static void input_linux_instance_finalize (Object *obj)
ui/vnc.c +0 -2
@@ -146,8 +146,6 @@ static void vnc_init_basic_info(SocketAddress *addr,default :abort (); } - -return ; } static void vnc_init_basic_info_from_server_addr(QIOChannelSocket *ioc,
util/main-loop.c +0 -1
@@ -212,7 +212,6 @@ static void main_loop_init(EventLoopBase *base, Error **errp)main_loop_update_params (base, errp); mloop = m; -return ; }static bool main_loop_can_be_deleted (EventLoopBase *base)
util/qht.c +0 -1
@@ -367,7 +367,6 @@ void qht_map_lock_buckets__no_stale(struct qht *ht, struct qht_map **pmap)qht_map_lock_buckets (map);qht_unlock (ht); *pmap = map; -return ; }/*
Signature · 1 line
2.48.1
PATCH v2 3/3 cleanup: Drop pointless label at end of function
In reply to Markus Armbruster--- hw/ipmi/ipmi_bmc_extern.c | 4 +--- hw/ipmi/ipmi_bmc_sim.c | 7 ++----- hw/ipmi/ipmi_bt.c | 7 +++---- hw/ipmi/ipmi_kcs.c | 3 +-- 4 files changed, 7 insertions(+), 14 deletions(-)
hw/ipmi/ipmi_bmc_extern.c +1 -3
@@ -213,7 +213,7 @@ static void ipmi_bmc_extern_handle_command(IPMIBmc *b, rsp[2 ] = err; ibe->waiting_rsp = false; k->handle_rsp (s, msg_id, rsp,3 ); - goto out; +return ; }addchar (ibe, msg_id);
@@ -228,8 +228,6 @@ static void ipmi_bmc_extern_handle_command(IPMIBmc *b,/* Start the transmit */ continue_send (ibe); - - out: }static void handle_hw_op (IPMIBmcExtern *ibe,unsigned char hw_op)
hw/ipmi/ipmi_bmc_sim.c +2 -5
@@ -463,13 +463,12 @@ void ipmi_bmc_gen_event(IPMIBmc *b, uint8_t *evt, bool log) }if (ibs->msg_flags &IPMI_BMC_MSG_FLAG_EVT_BUF_FULL ) { - goto out; +return ; }memcpy (ibs->evtbuf, evt,16 ); ibs->msg_flags |=IPMI_BMC_MSG_FLAG_EVT_BUF_FULL ; k->set_atn (s,1 ,attn_irq_enabled (ibs)); - out: }static void gen_event (IPMIBmcSim *ibs,unsigned int sens_num,uint8_t deassert,uint8_t evd1,uint8_t evd2,uint8_t evd3)
@@ -979,7 +978,7 @@ static void get_msg(IPMIBmcSim *ibs,if (QTAILQ_EMPTY (&ibs->rcvbufs)) {rsp_buffer_set_error (rsp,0x80 );/* Queue empty */ - goto out; +return ; }rsp_buffer_push (rsp,0 );/* Channel 0 */ msg =QTAILQ_FIRST (&ibs->rcvbufs);
@@ -994,8 +993,6 @@ static void get_msg(IPMIBmcSim *ibs, ibs->msg_flags &= ~IPMI_BMC_MSG_FLAG_RCV_MSG_QUEUE ; k->set_atn (s,attn_set (ibs),attn_irq_enabled (ibs)); } - -out: } static unsigned char
hw/ipmi/ipmi_bt.c +3 -4
@@ -98,14 +98,14 @@ static void ipmi_bt_handle_event(IPMIInterface *ii)IPMIBT *ib = iic->get_backend_data (ii);if (ib->inlen <4 ) { - goto out; +return ; }/* Note that overruns are handled by handle_command */ if (ib->inmsg[0 ] != (ib->inlen -1 )) {/* Length mismatch, just ignore. */ IPMI_BT_SET_BBUSY (ib->control_reg,1 ); ib->inlen =0 ; - goto out; +return ; }if ((ib->inmsg[1 ] == (IPMI_NETFN_APP <<2 )) && (ib->inmsg[3 ] ==IPMI_CMD_GET_BT_INTF_CAP )) {
@@ -136,7 +136,7 @@ static void ipmi_bt_handle_event(IPMIInterface *ii)IPMI_BT_SET_B2H_IRQ (ib->mask_reg,1 );ipmi_bt_raise_irq (ib); } - goto out; +return ; } ib->waiting_seq = ib->inmsg[2 ]; ib->inmsg[2 ] = ib->inmsg[1 ];
@@ -145,7 +145,6 @@ static void ipmi_bt_handle_event(IPMIInterface *ii) bk->handle_command (ib->bmc, ib->inmsg +2 , ib->inlen -2 ,sizeof (ib->inmsg), ib->waiting_rsp); } - out: } static void ipmi_bt_handle_rsp(IPMIInterface *ii, uint8_t msg_id,
hw/ipmi/ipmi_kcs.c +1 -2
@@ -168,7 +168,7 @@ static void ipmi_kcs_handle_event(IPMIInterface *ii) ik->outpos =0 ; bk->handle_command (ik->bmc, ik->inmsg, ik->inlen,sizeof (ik->inmsg), ik->waiting_rsp); - goto out_noibf; +return ; }else if (ik->cmd_reg ==IPMI_KCS_WRITE_END_CMD ) { ik->cmd_reg =-1 ; ik->write_end =1 ;
@@ -197,7 +197,6 @@ static void ipmi_kcs_handle_event(IPMIInterface *ii) ik->cmd_reg =-1 ; ik->data_in_reg =-1 ;IPMI_KCS_SET_IBF (ik->status_reg,0 ); - out_noibf: } static void ipmi_kcs_handle_rsp(IPMIInterface *ii, uint8_t msg_id,
Signature · 1 line
2.48.1