diff --git a/hw/display/vga.c b/hw/display/vga.c index c0f7b343bbab586c8593d29c7a765f1e6ca3662c..d1d296c74ea636ae857cc8d247c62b70277929fc 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -1997,7 +1997,7 @@ static void vga_mem_write(void *opaque, hwaddr addr, { VGACommonState *s = opaque; - return vga_mem_writeb(s, addr, data); + vga_mem_writeb(s, addr, data); } const MemoryRegionOps vga_mem_ops = { diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index 270ce05b58283a46a58e7a7748f9e903e88c80bb..a04c822832b0b413c13cb451593b17645c98cbc6 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -704,7 +704,8 @@ static void gic_cpu_write(GICState *s, int cpu, int offset, uint32_t value) s->bpr[cpu] = (value & 0x7); break; case 0x10: /* End Of Interrupt */ - return gic_complete_irq(s, cpu, value & 0x3ff); + gic_complete_irq(s, cpu, value & 0x3ff); + return; case 0x1c: /* Aliased Binary Point */ if (s->revision >= 2) { s->abpr[cpu] = (value & 0x7); diff --git a/hw/intc/etraxfs_pic.c b/hw/intc/etraxfs_pic.c index 636262b49fd63d3d8e266fae4674d5af598c0646..bd588681ef5e10e2a9c2dd743f25f805119734fd 100644 --- a/hw/intc/etraxfs_pic.c +++ b/hw/intc/etraxfs_pic.c @@ -131,11 +131,13 @@ static void nmi_handler(void *opaque, int irq, int level) } static void irq_handler(void *opaque, int irq, int level) -{ +{ struct etrax_pic *fs = (void *)opaque; - if (irq >= 30) - return nmi_handler(opaque, irq, level); + if (irq >= 30) { + nmi_handler(opaque, irq, level); + return; + } irq -= 1; fs->regs[R_R_VECT] &= ~(1 << irq); diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 78a37be42b38da405870661f6a561923b19e2064..4caf5364dac580f97f5de2096cdb8d66f0e3427e 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -472,7 +472,7 @@ void fw_cfg_add_string(FWCfgState *s, uint16_t key, const char *value) { size_t sz = strlen(value) + 1; - return fw_cfg_add_bytes(s, key, g_memdup(value, sz), sz); + fw_cfg_add_bytes(s, key, g_memdup(value, sz), sz); } void fw_cfg_add_i16(FWCfgState *s, uint16_t key, uint16_t value) diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c index b087bbddb8b368b29113bc58dd08a61f8773efa3..dd4aae8b3a7ead6d11614f1fcc754b40b7e3ba61 100644 --- a/hw/timer/a9gtimer.c +++ b/hw/timer/a9gtimer.c @@ -121,7 +121,7 @@ static void a9_gtimer_update_no_sync(void *opaque) { A9GTimerState *s = A9_GTIMER(opaque); - return a9_gtimer_update(s, false); + a9_gtimer_update(s, false); } static uint64_t a9_gtimer_read(void *opaque, hwaddr addr, unsigned size) diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c index 9084ca439e9da72edf31c5a4c3c4be9f0bb3a479..815c8eace19ab7e0289ef1c0fc360f87e7d28eff 100644 --- a/hw/tpm/tpm_tis.c +++ b/hw/tpm/tpm_tis.c @@ -868,7 +868,7 @@ static void tpm_tis_mmio_write_intern(void *opaque, hwaddr addr, static void tpm_tis_mmio_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { - return tpm_tis_mmio_write_intern(opaque, addr, val, size, false); + tpm_tis_mmio_write_intern(opaque, addr, val, size, false); } static const MemoryRegionOps tpm_tis_memory_ops = { diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c index 40809f610e81e6d8b1af4a57bb97672796b163df..61cc87894e477fe73e6f8a432d02e4a34f93104d 100644 --- a/hw/usb/hcd-musb.c +++ b/hw/usb/hcd-musb.c @@ -554,8 +554,10 @@ static void musb_schedule_cb(USBPort *port, USBPacket *packey) timeout = ep->timeout[dir]; else if (ep->interrupt[dir]) timeout = 8; - else - return musb_cb_tick(ep); + else { + musb_cb_tick(ep); + return; + } if (!ep->intv_timer[dir]) ep->intv_timer[dir] = timer_new_ns(QEMU_CLOCK_VIRTUAL, musb_cb_tick, ep); @@ -772,9 +774,11 @@ static void musb_rx_packet_complete(USBPacket *packey, void *opaque) /* NAK timeouts are only generated in Bulk transfers and * Data-errors in Isochronous. */ - if (ep->interrupt[1]) - return musb_packet(s, ep, epnum, USB_TOKEN_IN, - packey->iov.size, musb_rx_packet_complete, 1); + if (ep->interrupt[1]) { + musb_packet(s, ep, epnum, USB_TOKEN_IN, + packey->iov.size, musb_rx_packet_complete, 1); + return; + } ep->csr[1] |= MGC_M_RXCSR_DATAERROR; if (!epnum) @@ -864,8 +868,7 @@ static void musb_tx_rdy(MUSBState *s, int epnum) * but it doesn't make sense for us to do that. */ } - return musb_packet(s, ep, epnum, pid, - total, musb_tx_packet_complete, 0); + musb_packet(s, ep, epnum, pid, total, musb_tx_packet_complete, 0); } static void musb_rx_req(MUSBState *s, int epnum) @@ -929,8 +932,7 @@ static void musb_rx_req(MUSBState *s, int epnum) } #endif - return musb_packet(s, ep, epnum, USB_TOKEN_IN, - total, musb_rx_packet_complete, 1); + musb_packet(s, ep, epnum, USB_TOKEN_IN, total, musb_rx_packet_complete, 1); } static uint8_t musb_read_fifo(MUSBEndPoint *ep) diff --git a/include/qom/cpu.h b/include/qom/cpu.h index d6279c01f5305deba71249c5253010cadb036a31..9dafb4817e0f2e16422f5e86c6a370f0d252eb9b 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -593,7 +593,7 @@ static inline void cpu_unaligned_access(CPUState *cpu, vaddr addr, { CPUClass *cc = CPU_GET_CLASS(cpu); - return cc->do_unaligned_access(cpu, addr, is_write, is_user, retaddr); + cc->do_unaligned_access(cpu, addr, is_write, is_user, retaddr); } #endif diff --git a/monitor.c b/monitor.c index 42116a942ee7ce39c8f1059e00df35a4ed3397a4..f7e473981a14dccdd6def21e508ad542e4bada54 100644 --- a/monitor.c +++ b/monitor.c @@ -4691,11 +4691,13 @@ static void monitor_find_completion_by_table(Monitor *mon, if (cmd->sub_table) { /* do the job again */ - return monitor_find_completion_by_table(mon, cmd->sub_table, - &args[1], nb_args - 1); + monitor_find_completion_by_table(mon, cmd->sub_table, + &args[1], nb_args - 1); + return; } if (cmd->command_completion) { - return cmd->command_completion(mon->rs, nb_args, args[nb_args - 1]); + cmd->command_completion(mon->rs, nb_args, args[nb_args - 1]); + return; } ptype = next_arg_type(cmd->args_type);