mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove superfluous timer_del() calls

Browse Source 
This commit is the result of running the timer-del-timer-free.cocci
script on the whole source tree.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Corey Minyard <cminyard@mvista.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20201215154107.3255-4-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2020-12-15 15:41:06 +00:00
parent 01b3e68bb1
commit 729cc68373
42 changed files with 0 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/iscsi.c
View File

@ -1524,12 +1524,10 @@ static void iscsi_detach_aio_context(BlockDriverState *bs)
iscsilun->events = 0; iscsilun->events = 0;
if (iscsilun->nop_timer) { if (iscsilun->nop_timer) {
timer_del(iscsilun->nop_timer);
timer_free(iscsilun->nop_timer); timer_free(iscsilun->nop_timer);
iscsilun->nop_timer = NULL; iscsilun->nop_timer = NULL;
} }
if (iscsilun->event_timer) { if (iscsilun->event_timer) {
timer_del(iscsilun->event_timer);
timer_free(iscsilun->event_timer); timer_free(iscsilun->event_timer);
iscsilun->event_timer = NULL; iscsilun->event_timer = NULL;
} }

1
block/nbd.c
View File

@ -194,7 +194,6 @@ static void nbd_recv_coroutines_wake_all(BDRVNBDState *s)
static void reconnect_delay_timer_del(BDRVNBDState *s) static void reconnect_delay_timer_del(BDRVNBDState *s)
{ {
if (s->reconnect_delay_timer) { if (s->reconnect_delay_timer) {
timer_del(s->reconnect_delay_timer);
timer_free(s->reconnect_delay_timer); timer_free(s->reconnect_delay_timer);
s->reconnect_delay_timer = NULL; s->reconnect_delay_timer = NULL;
} }

1
block/qcow2.c
View File

@ -852,7 +852,6 @@ static void cache_clean_timer_del(BlockDriverState *bs)
{ {
BDRVQcow2State *s = bs->opaque; BDRVQcow2State *s = bs->opaque;
if (s->cache_clean_timer) { if (s->cache_clean_timer) {
timer_del(s->cache_clean_timer);
timer_free(s->cache_clean_timer); timer_free(s->cache_clean_timer);
s->cache_clean_timer = NULL; s->cache_clean_timer = NULL;
} }

2
hw/block/nvme.c
View File

@ -1052,7 +1052,6 @@ static uint16_t nvme_io_cmd(NvmeCtrl *n, NvmeRequest *req)
static void nvme_free_sq(NvmeSQueue *sq, NvmeCtrl *n) static void nvme_free_sq(NvmeSQueue *sq, NvmeCtrl *n)
{ {
n->sq[sq->sqid] = NULL; n->sq[sq->sqid] = NULL;
timer_del(sq->timer);
timer_free(sq->timer); timer_free(sq->timer);
g_free(sq->io_req); g_free(sq->io_req);
if (sq->sqid) { if (sq->sqid) {
@ -1334,7 +1333,6 @@ static uint16_t nvme_get_log(NvmeCtrl *n, NvmeRequest *req)
static void nvme_free_cq(NvmeCQueue *cq, NvmeCtrl *n) static void nvme_free_cq(NvmeCQueue *cq, NvmeCtrl *n)
{ {
n->cq[cq->cqid] = NULL; n->cq[cq->cqid] = NULL;
timer_del(cq->timer);
timer_free(cq->timer); timer_free(cq->timer);
msix_vector_unuse(&n->parent_obj, cq->vector); msix_vector_unuse(&n->parent_obj, cq->vector);
if (cq->cqid) { if (cq->cqid) {

2
hw/char/serial.c
View File

@ -941,10 +941,8 @@ static void serial_unrealize(DeviceState *dev)
qemu_chr_fe_deinit(&s->chr, false); qemu_chr_fe_deinit(&s->chr, false);
timer_del(s->modem_status_poll);
timer_free(s->modem_status_poll); timer_free(s->modem_status_poll);
timer_del(s->fifo_timeout_timer);
timer_free(s->fifo_timeout_timer); timer_free(s->fifo_timeout_timer);
fifo8_destroy(&s->recv_fifo); fifo8_destroy(&s->recv_fifo);

2
hw/char/virtio-serial-bus.c
View File

@ -741,7 +741,6 @@ static void virtio_serial_post_load_timer_cb(void *opaque)
} }
} }
g_free(s->post_load->connected); g_free(s->post_load->connected);
timer_del(s->post_load->timer);
timer_free(s->post_load->timer); timer_free(s->post_load->timer);
g_free(s->post_load); g_free(s->post_load);
s->post_load = NULL; s->post_load = NULL;
@ -1138,7 +1137,6 @@ static void virtio_serial_device_unrealize(DeviceState *dev)
g_free(vser->ports_map); g_free(vser->ports_map);
if (vser->post_load) { if (vser->post_load) {
g_free(vser->post_load->connected); g_free(vser->post_load->connected);
timer_del(vser->post_load->timer);
timer_free(vser->post_load->timer); timer_free(vser->post_load->timer);
g_free(vser->post_load); g_free(vser->post_load);
} }

1
hw/ide/core.c
View File

@ -2716,7 +2716,6 @@ void ide_init2(IDEBus *bus, qemu_irq irq)
void ide_exit(IDEState *s) void ide_exit(IDEState *s)
{ {
timer_del(s->sector_write_timer);
timer_free(s->sector_write_timer); timer_free(s->sector_write_timer);
qemu_vfree(s->smart_selftest_data); qemu_vfree(s->smart_selftest_data);
qemu_vfree(s->io_buffer); qemu_vfree(s->io_buffer);

1
hw/input/hid.c
View File

@ -88,7 +88,6 @@ static void hid_idle_timer(void *opaque)
static void hid_del_idle_timer(HIDState *hs) static void hid_del_idle_timer(HIDState *hs)
{ {
if (hs->idle_timer) { if (hs->idle_timer) {
timer_del(hs->idle_timer);
timer_free(hs->idle_timer); timer_free(hs->idle_timer);
hs->idle_timer = NULL; hs->idle_timer = NULL;
} }

1
hw/intc/apic.c
View File

@ -888,7 +888,6 @@ static void apic_unrealize(DeviceState *dev)
{ {
APICCommonState *s = APIC(dev); APICCommonState *s = APIC(dev);
timer_del(s->timer);
timer_free(s->timer); timer_free(s->timer);
local_apics[s->id] = NULL; local_apics[s->id] = NULL;
} }

1
hw/intc/ioapic.c
View File

@ -474,7 +474,6 @@ static void ioapic_unrealize(DeviceState *dev)
{ {
IOAPICCommonState *s = IOAPIC_COMMON(dev); IOAPICCommonState *s = IOAPIC_COMMON(dev);
timer_del(s->delayed_ioapic_service_timer);
timer_free(s->delayed_ioapic_service_timer); timer_free(s->delayed_ioapic_service_timer);
} }

1
hw/ipmi/ipmi_bmc_extern.c
View File

@ -511,7 +511,6 @@ static void ipmi_bmc_extern_finalize(Object *obj)
{ {
IPMIBmcExtern *ibe = IPMI_BMC_EXTERN(obj); IPMIBmcExtern *ibe = IPMI_BMC_EXTERN(obj);
timer_del(ibe->extern_timer);
timer_free(ibe->extern_timer); timer_free(ibe->extern_timer);
} }

3
hw/net/e1000.c
View File

@ -1647,11 +1647,8 @@ pci_e1000_uninit(PCIDevice *dev)
{ {
E1000State *d = E1000(dev); E1000State *d = E1000(dev);
timer_del(d->autoneg_timer);
timer_free(d->autoneg_timer); timer_free(d->autoneg_timer);
timer_del(d->mit_timer);
timer_free(d->mit_timer); timer_free(d->mit_timer);
timer_del(d->flush_queue_timer);
timer_free(d->flush_queue_timer); timer_free(d->flush_queue_timer);
qemu_del_nic(d->nic); qemu_del_nic(d->nic);
} }

8
hw/net/e1000e_core.c
View File

@ -434,23 +434,16 @@ e1000e_intrmgr_pci_unint(E1000ECore *core)
{ {
int i; int i;
timer_del(core->radv.timer);
timer_free(core->radv.timer); timer_free(core->radv.timer);
timer_del(core->rdtr.timer);
timer_free(core->rdtr.timer); timer_free(core->rdtr.timer);
timer_del(core->raid.timer);
timer_free(core->raid.timer); timer_free(core->raid.timer);
timer_del(core->tadv.timer);
timer_free(core->tadv.timer); timer_free(core->tadv.timer);
timer_del(core->tidv.timer);
timer_free(core->tidv.timer); timer_free(core->tidv.timer);
timer_del(core->itr.timer);
timer_free(core->itr.timer); timer_free(core->itr.timer);
for (i = 0; i < E1000E_MSIX_VEC_NUM; i++) { for (i = 0; i < E1000E_MSIX_VEC_NUM; i++) {
timer_del(core->eitr[i].timer);
timer_free(core->eitr[i].timer); timer_free(core->eitr[i].timer);
} }
} }
@ -3355,7 +3348,6 @@ e1000e_core_pci_uninit(E1000ECore *core)
{ {
int i; int i;
timer_del(core->autoneg_timer);
timer_free(core->autoneg_timer); timer_free(core->autoneg_timer);
e1000e_intrmgr_pci_unint(core); e1000e_intrmgr_pci_unint(core);

1
hw/net/pcnet-pci.c
View File

@ -183,7 +183,6 @@ static void pci_pcnet_uninit(PCIDevice *dev)
PCIPCNetState *d = PCI_PCNET(dev); PCIPCNetState *d = PCI_PCNET(dev);
qemu_free_irq(d->state.irq); qemu_free_irq(d->state.irq);
timer_del(d->state.poll_timer);
timer_free(d->state.poll_timer); timer_free(d->state.poll_timer);
qemu_del_nic(d->state.nic); qemu_del_nic(d->state.nic);
} }

1
hw/net/rtl8139.c
View File

@ -3338,7 +3338,6 @@ static void pci_rtl8139_uninit(PCIDevice *dev)
g_free(s->cplus_txbuffer); g_free(s->cplus_txbuffer);
s->cplus_txbuffer = NULL; s->cplus_txbuffer = NULL;
timer_del(s->timer);
timer_free(s->timer); timer_free(s->timer);
qemu_del_nic(s->nic); qemu_del_nic(s->nic);
} }

1
hw/net/spapr_llan.c
View File

@ -363,7 +363,6 @@ static void spapr_vlan_instance_finalize(Object *obj)
} }
if (dev->rxp_timer) { if (dev->rxp_timer) {
timer_del(dev->rxp_timer);
timer_free(dev->rxp_timer); timer_free(dev->rxp_timer);
} }
} }

2
hw/net/virtio-net.c
View File

@ -1862,7 +1862,6 @@ static void virtio_net_rsc_cleanup(VirtIONet *n)
g_free(seg); g_free(seg);
} }
timer_del(chain->drain_timer);
timer_free(chain->drain_timer); timer_free(chain->drain_timer);
QTAILQ_REMOVE(&n->rsc_chains, chain, next); QTAILQ_REMOVE(&n->rsc_chains, chain, next);
g_free(chain); g_free(chain);
@ -2645,7 +2644,6 @@ static void virtio_net_del_queue(VirtIONet *n, int index)
virtio_del_queue(vdev, index * 2); virtio_del_queue(vdev, index * 2);
if (q->tx_timer) { if (q->tx_timer) {
timer_del(q->tx_timer);
timer_free(q->tx_timer); timer_free(q->tx_timer);
q->tx_timer = NULL; q->tx_timer = NULL;
} else { } else {

1
hw/s390x/s390-pci-inst.c
View File

@ -955,7 +955,6 @@ void pci_dereg_ioat(S390PCIIOMMU *iommu)
void fmb_timer_free(S390PCIBusDevice *pbdev) void fmb_timer_free(S390PCIBusDevice *pbdev)
{ {
if (pbdev->fmb_timer) { if (pbdev->fmb_timer) {
timer_del(pbdev->fmb_timer);
timer_free(pbdev->fmb_timer); timer_free(pbdev->fmb_timer);
pbdev->fmb_timer = NULL; pbdev->fmb_timer = NULL;
} }

1
hw/sd/sd.c
View File

@ -2133,7 +2133,6 @@ static void sd_instance_finalize(Object *obj)
{ {
SDState *sd = SD_CARD(obj); SDState *sd = SD_CARD(obj);
timer_del(sd->ocr_power_timer);
timer_free(sd->ocr_power_timer); timer_free(sd->ocr_power_timer);
} }

2
hw/sd/sdhci.c
View File

@ -1330,9 +1330,7 @@ void sdhci_initfn(SDHCIState *s)
void sdhci_uninitfn(SDHCIState *s) void sdhci_uninitfn(SDHCIState *s)
{ {
timer_del(s->insert_timer);
timer_free(s->insert_timer); timer_free(s->insert_timer);
timer_del(s->transfer_timer);
timer_free(s->transfer_timer); timer_free(s->transfer_timer);
g_free(s->fifo_buffer); g_free(s->fifo_buffer);

1
hw/usb/dev-hub.c
View File

@ -576,7 +576,6 @@ static void usb_hub_unrealize(USBDevice *dev)
&s->ports[i].port); &s->ports[i].port);
} }
timer_del(s->port_timer);
timer_free(s->port_timer); timer_free(s->port_timer);
} }

1
hw/usb/hcd-ehci.c
View File

@ -2534,7 +2534,6 @@ void usb_ehci_unrealize(EHCIState *s, DeviceState *dev)
trace_usb_ehci_unrealize(); trace_usb_ehci_unrealize();
if (s->frame_timer) { if (s->frame_timer) {
timer_del(s->frame_timer);
timer_free(s->frame_timer); timer_free(s->frame_timer);
s->frame_timer = NULL; s->frame_timer = NULL;
} }

1
hw/usb/hcd-ohci-pci.c
View File

@ -97,7 +97,6 @@ static void usb_ohci_exit(PCIDevice *dev)
usb_bus_release(&s->bus); usb_bus_release(&s->bus);
} }
timer_del(s->eof_timer);
timer_free(s->eof_timer); timer_free(s->eof_timer);
} }

1
hw/usb/hcd-uhci.c
View File

@ -1283,7 +1283,6 @@ static void usb_uhci_exit(PCIDevice *dev)
trace_usb_uhci_exit(); trace_usb_uhci_exit();
if (s->frame_timer) { if (s->frame_timer) {
timer_del(s->frame_timer);
timer_free(s->frame_timer); timer_free(s->frame_timer);
s->frame_timer = NULL; s->frame_timer = NULL;
} }

1
hw/usb/hcd-xhci.c
View File

@ -3395,7 +3395,6 @@ static void usb_xhci_unrealize(DeviceState *dev)
} }
if (xhci->mfwrap_timer) { if (xhci->mfwrap_timer) {
timer_del(xhci->mfwrap_timer);
timer_free(xhci->mfwrap_timer); timer_free(xhci->mfwrap_timer);
xhci->mfwrap_timer = NULL; xhci->mfwrap_timer = NULL;
} }

1
hw/usb/redirect.c
View File

@ -1481,7 +1481,6 @@ static void usbredir_unrealize(USBDevice *udev)
qemu_bh_delete(dev->chardev_close_bh); qemu_bh_delete(dev->chardev_close_bh);
qemu_bh_delete(dev->device_reject_bh); qemu_bh_delete(dev->device_reject_bh);
timer_del(dev->attach_timer);
timer_free(dev->attach_timer); timer_free(dev->attach_timer);
usbredir_cleanup_device_queues(dev); usbredir_cleanup_device_queues(dev);

1
hw/vfio/display.c
View File

@ -186,7 +186,6 @@ static void vfio_display_edid_exit(VFIODisplay *dpy)
g_free(dpy->edid_regs); g_free(dpy->edid_regs);
g_free(dpy->edid_blob); g_free(dpy->edid_blob);
timer_del(dpy->edid_link_timer);
timer_free(dpy->edid_link_timer); timer_free(dpy->edid_link_timer);
} }

1
hw/virtio/vhost-vsock-common.c
View File

@ -151,7 +151,6 @@ static void vhost_vsock_common_post_load_timer_cleanup(VHostVSockCommon *vvc)
return; return;
} }
timer_del(vvc->post_load_timer);
timer_free(vvc->post_load_timer); timer_free(vvc->post_load_timer);
vvc->post_load_timer = NULL; vvc->post_load_timer = NULL;
} }

1
hw/virtio/virtio-balloon.c
View File

@ -204,7 +204,6 @@ static bool balloon_stats_enabled(const VirtIOBalloon *s)
static void balloon_stats_destroy_timer(VirtIOBalloon *s) static void balloon_stats_destroy_timer(VirtIOBalloon *s)
{ {
if (balloon_stats_enabled(s)) { if (balloon_stats_enabled(s)) {
timer_del(s->stats_timer);
timer_free(s->stats_timer); timer_free(s->stats_timer);
s->stats_timer = NULL; s->stats_timer = NULL;
s->stats_poll_interval = 0; s->stats_poll_interval = 0;

1
hw/virtio/virtio-rng.c
View File

@ -233,7 +233,6 @@ static void virtio_rng_device_unrealize(DeviceState *dev)
VirtIORNG *vrng = VIRTIO_RNG(dev); VirtIORNG *vrng = VIRTIO_RNG(dev);
qemu_del_vm_change_state_handler(vrng->vmstate); qemu_del_vm_change_state_handler(vrng->vmstate);
timer_del(vrng->rate_limit_timer);
timer_free(vrng->rate_limit_timer); timer_free(vrng->rate_limit_timer);
virtio_del_queue(vdev, 0); virtio_del_queue(vdev, 0);
virtio_cleanup(vdev); virtio_cleanup(vdev);

1
hw/watchdog/wdt_diag288.c
View File

@ -110,7 +110,6 @@ static void wdt_diag288_unrealize(DeviceState *dev)
{ {
DIAG288State *diag288 = DIAG288(dev); DIAG288State *diag288 = DIAG288(dev);
timer_del(diag288->timer);
timer_free(diag288->timer); timer_free(diag288->timer);
} }

1
hw/watchdog/wdt_i6300esb.c
View File

@ -454,7 +454,6 @@ static void i6300esb_exit(PCIDevice *dev)
{ {
I6300State *d = WATCHDOG_I6300ESB_DEVICE(dev); I6300State *d = WATCHDOG_I6300ESB_DEVICE(dev);
timer_del(d->timer);
timer_free(d->timer); timer_free(d->timer);
} }

1
migration/colo.c
View File

@ -636,7 +636,6 @@ out:
* error. * error.
*/ */
colo_compare_unregister_notifier(&packets_compare_notifier); colo_compare_unregister_notifier(&packets_compare_notifier);
timer_del(s->colo_delay_timer);
timer_free(s->colo_delay_timer); timer_free(s->colo_delay_timer);
qemu_event_destroy(&s->colo_checkpoint_event); qemu_event_destroy(&s->colo_checkpoint_event);

1
monitor/hmp-cmds.c
View File

@ -1586,7 +1586,6 @@ static void hmp_migrate_status_cb(void *opaque)
error_report("%s", info->error_desc); error_report("%s", info->error_desc);
} }
monitor_resume(status->mon); monitor_resume(status->mon);
timer_del(status->timer);
timer_free(status->timer); timer_free(status->timer);
g_free(status); g_free(status);
} }

1
net/announce.c
View File

@ -41,7 +41,6 @@ void qemu_announce_timer_del(AnnounceTimer *timer, bool free_named)
{ {
bool free_timer = false; bool free_timer = false;
if (timer->tm) { if (timer->tm) {
timer_del(timer->tm);
timer_free(timer->tm); timer_free(timer->tm);
timer->tm = NULL; timer->tm = NULL;
} }

1
net/colo-compare.c
View File

@ -951,7 +951,6 @@ static void colo_compare_timer_init(CompareState *s)
static void colo_compare_timer_del(CompareState *s) static void colo_compare_timer_del(CompareState *s)
{ {
if (s->packet_check_timer) { if (s->packet_check_timer) {
timer_del(s->packet_check_timer);
timer_free(s->packet_check_timer); timer_free(s->packet_check_timer);
s->packet_check_timer = NULL; s->packet_check_timer = NULL;
} }

1
net/slirp.c
View File

@ -184,7 +184,6 @@ static void *net_slirp_timer_new(SlirpTimerCb cb,
static void net_slirp_timer_free(void *timer, void *opaque) static void net_slirp_timer_free(void *timer, void *opaque)
{ {
timer_del(timer);
timer_free(timer); timer_free(timer);
} }

1
replay/replay-debugging.c
View File

@ -78,7 +78,6 @@ static void replay_delete_break(void)
assert(replay_mutex_locked()); assert(replay_mutex_locked());
if (replay_break_timer) { if (replay_break_timer) {
timer_del(replay_break_timer);
timer_free(replay_break_timer); timer_free(replay_break_timer);
replay_break_timer = NULL; replay_break_timer = NULL;
} }

2
target/s390x/cpu.c
View File

@ -313,9 +313,7 @@ static void s390_cpu_finalize(Object *obj)
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
S390CPU *cpu = S390_CPU(obj); S390CPU *cpu = S390_CPU(obj);
timer_del(cpu->env.tod_timer);
timer_free(cpu->env.tod_timer); timer_free(cpu->env.tod_timer);
timer_del(cpu->env.cpu_timer);
timer_free(cpu->env.cpu_timer); timer_free(cpu->env.cpu_timer);
qemu_unregister_reset(s390_cpu_machine_reset_cb, cpu); qemu_unregister_reset(s390_cpu_machine_reset_cb, cpu);

1
ui/console.c
View File

@ -253,7 +253,6 @@ static void gui_setup_refresh(DisplayState *ds)
timer_mod(ds->gui_timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME)); timer_mod(ds->gui_timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME));
} }
if (!need_timer && ds->gui_timer != NULL) { if (!need_timer && ds->gui_timer != NULL) {
timer_del(ds->gui_timer);
timer_free(ds->gui_timer); timer_free(ds->gui_timer);
ds->gui_timer = NULL; ds->gui_timer = NULL;
} }

1
ui/spice-core.c
View File

@ -76,7 +76,6 @@ static void timer_cancel(SpiceTimer *timer)
static void timer_remove(SpiceTimer *timer) static void timer_remove(SpiceTimer *timer)
{ {
timer_del(timer->timer);
timer_free(timer->timer); timer_free(timer->timer);
g_free(timer); g_free(timer);
} }

1
util/throttle.c
View File

@ -247,7 +247,6 @@ static void throttle_timer_destroy(QEMUTimer **timer)
{ {
assert(*timer != NULL); assert(*timer != NULL);
timer_del(*timer);
timer_free(*timer); timer_free(*timer);
*timer = NULL; *timer = NULL;
} }