bulk: Remove pointless QOM casts
Subsystems (2)
cover bulk: Remove pointless QOM casts
As per Markus suggestion in [*], use Coccinelle to remove pointless QOM cast macro uses. Since we have more than 1000 QOM types, add a script to generate the semantic patch.
[*] https://lore.kernel.org/qemu-devel/[email protected]/
Philippe Mathieu-Daudé (2):
scripts: Add qom-cast-macro-clean-cocci-gen.py
bulk: Remove pointless QOM casts
MAINTAINERS | 1 + block/nbd.c | 4 +- chardev/char-pty.c | 2 +- hw/arm/musicpal.c | 2 +- hw/arm/xlnx-versal.c | 2 +- hw/display/vhost-user-gpu.c | 4 +- hw/intc/loongarch_extioi.c | 6 +-- hw/m68k/q800.c | 2 +- hw/pci-host/bonito.c | 2 +- hw/ppc/pnv_lpc.c | 2 +- hw/ppc/pnv_occ.c | 2 +- hw/ppc/pnv_sbe.c | 2 +- hw/riscv/virt.c | 10 ++--- hw/rx/rx62n.c | 2 +- hw/scsi/esp-pci.c | 18 ++++----- hw/sparc/sun4m.c | 4 +- hw/virtio/virtio-mem-pci.c | 6 +-- hw/virtio/virtio-pmem-pci.c | 6 +-- migration/fd.c | 4 +- migration/multifd.c | 2 +- migration/yank_functions.c | 4 +- nbd/client-connection.c | 2 +- nbd/server.c | 2 +- softmmu/qdev-monitor.c | 2 +- ui/vnc-ws.c | 6 +-- scripts/qom-cast-macro-clean-cocci-gen.py | 49 +++++++++++++++++++++++ 26 files changed, 99 insertions(+), 49 deletions(-) create mode 100644 scripts/qom-cast-macro-clean-cocci-gen.py
Signature · 1 line
2.38.1
PATCH 1/2 scripts: Add qom-cast-macro-clean-cocci-gen.py
Add a script to generate Coccinelle semantic patch removing all pointless QOM cast macro uses.
--- MAINTAINERS | 1 + scripts/qom-cast-macro-clean-cocci-gen.py | 49 +++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 scripts/qom-cast-macro-clean-cocci-gen.py
MAINTAINERS +1 -0
@@ -3044,6 +3044,7 @@ F: include/qom/ F: qapi/qom.json F: qapi/qdev.json F: scripts/coccinelle/qom-parent-type.cocci +F: scripts/qom-cast-macro-clean-cocci-gen.py F: softmmu/qdev-monitor.c F: stubs/qdev.c F: qom/
scripts/qom-cast-macro-clean-cocci-gen.py new file +49 -0
49 lines not on this page · raw message
Signature · 1 line
2.38.1
PATCH 2/2 bulk: Remove pointless QOM casts
In reply to Philippe Mathieu-DaudéMechanical change running Coccinelle spatch with content generated from the qom-cast-macro-clean-cocci-gen.py added in the previous commit.
--- block/nbd.c | 4 ++-- chardev/char-pty.c | 2 +- hw/arm/musicpal.c | 2 +- hw/arm/xlnx-versal.c | 2 +- hw/display/vhost-user-gpu.c | 4 ++-- hw/intc/loongarch_extioi.c | 6 +++--- hw/m68k/q800.c | 2 +- hw/pci-host/bonito.c | 2 +- hw/ppc/pnv_lpc.c | 2 +- hw/ppc/pnv_occ.c | 2 +- hw/ppc/pnv_sbe.c | 2 +- hw/riscv/virt.c | 10 +++++----- hw/rx/rx62n.c | 2 +- hw/scsi/esp-pci.c | 18 +++++++++--------- hw/sparc/sun4m.c | 4 ++-- hw/virtio/virtio-mem-pci.c | 6 +++--- hw/virtio/virtio-pmem-pci.c | 6 +++--- migration/fd.c | 4 ++-- migration/multifd.c | 2 +- migration/yank_functions.c | 4 ++-- nbd/client-connection.c | 2 +- nbd/server.c | 2 +- softmmu/qdev-monitor.c | 2 +- ui/vnc-ws.c | 6 +++--- 24 files changed, 49 insertions(+), 49 deletions(-)
block/nbd.c +2 -2
@@ -397,7 +397,7 @@ static void coroutine_fn GRAPH_RDLOCK nbd_reconnect_attempt(BDRVNBDState *s)/* Finalize previous connection if any */ if (s->ioc) { -qio_channel_detach_aio_context (QIO_CHANNEL (s->ioc)); +qio_channel_detach_aio_context (s->ioc);yank_unregister_function (BLOCKDEV_YANK_INSTANCE (s->bs->node_name), nbd_yank, s->bs);object_unref (OBJECT (s->ioc));
@@ -1455,7 +1455,7 @@ static void nbd_yank(void *opaque)BDRVNBDState *s = (BDRVNBDState *)bs->opaque;QEMU_LOCK_GUARD (&s->requests_lock); -qio_channel_shutdown (QIO_CHANNEL (s->ioc),QIO_CHANNEL_SHUTDOWN_BOTH ,NULL ); +qio_channel_shutdown (s->ioc,QIO_CHANNEL_SHUTDOWN_BOTH ,NULL ); s->state =NBD_CLIENT_QUIT ; }
chardev/char-pty.c +1 -1
@@ -334,7 +334,7 @@ static void char_pty_open(Chardev *chr, s =PTY_CHARDEV (chr); s->ioc =QIO_CHANNEL (qio_channel_file_new_fd (master_fd)); name =g_strdup_printf ("chardev-pty-%s" , chr->label); -qio_channel_set_name (QIO_CHANNEL (s->ioc), name); +qio_channel_set_name (s->ioc, name);g_free (name); s->timer_src =NULL ; *be_opened = false;
hw/arm/musicpal.c +1 -1
@@ -1250,7 +1250,7 @@ static void musicpal_init(MachineState *machine) uart_orgate =DEVICE (object_new (TYPE_OR_IRQ ));object_property_set_int (OBJECT (uart_orgate),"num-lines" ,2 , &error_fatal);qdev_realize_and_unref (uart_orgate,NULL , &error_fatal); -qdev_connect_gpio_out (DEVICE (uart_orgate),0 , +qdev_connect_gpio_out (uart_orgate,0 ,qdev_get_gpio_in (pic,MP_UART_SHARED_IRQ )); serial_mm_init(address_space_mem, MP_UART1_BASE, 2,
hw/arm/xlnx-versal.c +1 -1
@@ -327,7 +327,7 @@ static void versal_create_rtc(Versal *s, qemu_irq *pic)object_initialize_child (OBJECT (s),"rtc" , &s->pmc.rtc,TYPE_XLNX_ZYNQMP_RTC ); sbd =SYS_BUS_DEVICE (&s->pmc.rtc); -sysbus_realize (SYS_BUS_DEVICE (sbd), &error_fatal); +sysbus_realize (sbd, &error_fatal); mr =sysbus_mmio_get_region (sbd,0 );memory_region_add_subregion (&s->mr_ps,MM_PMC_RTC , mr);
hw/display/vhost-user-gpu.c +2 -2
@@ -364,11 +364,11 @@ vhost_user_gpu_gl_flushed(VirtIOGPUBase *b)VhostUserGPU *g =VHOST_USER_GPU (b);if (g->backend_blocked) { -vhost_user_gpu_unblock (VHOST_USER_GPU (g)); +vhost_user_gpu_unblock (g); g->backend_blocked = false; } -vhost_user_gpu_update_blocked (VHOST_USER_GPU (g), false); +vhost_user_gpu_update_blocked (g, false); } static bool
hw/intc/loongarch_extioi.c +3 -3
@@ -276,7 +276,7 @@ static void loongarch_extioi_instance_init(Object *obj)int i, cpu, pin;for (i =0 ; i <EXTIOI_IRQS ; i++) { -sysbus_init_irq (SYS_BUS_DEVICE (dev), &s->irq[i]); +sysbus_init_irq (dev, &s->irq[i]); }qdev_init_gpio_in (DEVICE (obj), extioi_setirq,EXTIOI_IRQS );
@@ -284,14 +284,14 @@ static void loongarch_extioi_instance_init(Object *obj)for (cpu =0 ; cpu <EXTIOI_CPUS ; cpu++) {memory_region_init_io (&s->extioi_iocsr_mem[cpu],OBJECT (s), &extioi_ops, s,"extioi_iocsr" ,0x900 ); -sysbus_init_mmio (SYS_BUS_DEVICE (dev), &s->extioi_iocsr_mem[cpu]); +sysbus_init_mmio (dev, &s->extioi_iocsr_mem[cpu]);for (pin =0 ; pin <LS3A_INTC_IP ; pin++) {qdev_init_gpio_out (DEVICE (obj), &s->parent_irq[cpu][pin],1 ); } }memory_region_init_io (&s->extioi_system_mem,OBJECT (s), &extioi_ops, s,"extioi_system_mem" ,0x900 ); -sysbus_init_mmio (SYS_BUS_DEVICE (dev), &s->extioi_system_mem); +sysbus_init_mmio (dev, &s->extioi_system_mem); }static void loongarch_extioi_class_init (ObjectClass *klass,void *data)
hw/m68k/q800.c +1 -1
@@ -525,7 +525,7 @@ static void q800_init(MachineState *machine)qdev_realize_and_unref (escc_orgate,NULL , &error_fatal);sysbus_connect_irq (sysbus,0 ,qdev_get_gpio_in (escc_orgate,0 ));sysbus_connect_irq (sysbus,1 ,qdev_get_gpio_in (escc_orgate,1 )); -qdev_connect_gpio_out (DEVICE (escc_orgate),0 , +qdev_connect_gpio_out (escc_orgate,0 ,qdev_get_gpio_in (glue,GLUE_IRQ_IN_ESCC ));sysbus_mmio_map (sysbus,0 ,SCC_BASE );
hw/pci-host/bonito.c +1 -1
@@ -656,7 +656,7 @@ static void bonito_pci_realize(PCIDevice *dev, Error **errp)PCIBonitoState *s =PCI_BONITO (dev);SysBusDevice *sysbus =SYS_BUS_DEVICE (s->pcihost);PCIHostState *phb =PCI_HOST_BRIDGE (s->pcihost); -BonitoState *bs =BONITO_PCI_HOST_BRIDGE (s->pcihost); +BonitoState *bs = s->pcihost;MemoryRegion *pcimem_alias =g_new (MemoryRegion,1 );/*
hw/ppc/pnv_lpc.c +1 -1
@@ -744,7 +744,7 @@ static void pnv_lpc_realize(DeviceState *dev, Error **errp)memory_region_add_subregion (&lpc->opb_mr,LPC_HC_REGS_OPB_ADDR , &lpc->lpc_hc_regs); -qdev_init_gpio_out (DEVICE (dev), &lpc->psi_irq,1 ); +qdev_init_gpio_out (dev, &lpc->psi_irq,1 ); }static void pnv_lpc_class_init (ObjectClass *klass,void *data)
hw/ppc/pnv_occ.c +1 -1
@@ -278,7 +278,7 @@ static void pnv_occ_realize(DeviceState *dev, Error **errp) occ,"occ-common-area" , PNV_OCC_SENSOR_DATA_BLOCK_SIZE); -qdev_init_gpio_out (DEVICE (dev), &occ->psi_irq,1 ); +qdev_init_gpio_out (dev, &occ->psi_irq,1 ); }static void pnv_occ_class_init (ObjectClass *klass,void *data)
hw/ppc/pnv_sbe.c +1 -1
@@ -381,7 +381,7 @@ static void pnv_sbe_realize(DeviceState *dev, Error **errp) psc->xscom_mbox_ops, sbe,"xscom-sbe-mbox" , psc->xscom_mbox_size); -qdev_init_gpio_out (DEVICE (dev), &sbe->psi_irq,1 ); +qdev_init_gpio_out (dev, &sbe->psi_irq,1 ); sbe->timer =timer_new_us (QEMU_CLOCK_VIRTUAL , sbe_timer, sbe); }
hw/riscv/virt.c +5 -5
@@ -1488,7 +1488,7 @@ static void virt_machine_init(MachineState *machine)for (i =0 ; i <VIRTIO_COUNT ; i++) {sysbus_create_simple ("virtio-mmio" , memmap[VIRT_VIRTIO ].base + i * memmap[VIRT_VIRTIO ].size, -qdev_get_gpio_in (DEVICE (virtio_irqchip),VIRTIO_IRQ + i)); +qdev_get_gpio_in (virtio_irqchip,VIRTIO_IRQ + i)); } gpex_pcie_init(system_memory,
@@ -1499,16 +1499,16 @@ static void virt_machine_init(MachineState *machine) virt_high_pcie_memmap.base, virt_high_pcie_memmap.size, memmap[VIRT_PCIE_PIO ].base, - DEVICE(pcie_irqchip)); + pcie_irqchip); -create_platform_bus (s,DEVICE (mmio_irqchip)); +create_platform_bus (s, mmio_irqchip);serial_mm_init (system_memory, memmap[VIRT_UART0 ].base, -0 ,qdev_get_gpio_in (DEVICE (mmio_irqchip),UART0_IRQ ),399193 , +0 ,qdev_get_gpio_in (mmio_irqchip,UART0_IRQ ),399193 ,serial_hd (0 ),DEVICE_LITTLE_ENDIAN );sysbus_create_simple ("goldfish_rtc" , memmap[VIRT_RTC ].base, -qdev_get_gpio_in (DEVICE (mmio_irqchip),RTC_IRQ )); +qdev_get_gpio_in (mmio_irqchip,RTC_IRQ ));virt_flash_create (s);
hw/rx/rx62n.c +1 -1
@@ -154,7 +154,7 @@ static void register_icu(RX62NState *s)sysbus_connect_irq (icu,0 ,qdev_get_gpio_in (DEVICE (&s->cpu),RX_CPU_IRQ ));sysbus_connect_irq (icu,1 ,qdev_get_gpio_in (DEVICE (&s->cpu),RX_CPU_FIR ));sysbus_connect_irq (icu,2 , s->irq[SWI ]); -sysbus_mmio_map (SYS_BUS_DEVICE (icu),0 ,RX62N_ICU_BASE ); +sysbus_mmio_map (icu,0 ,RX62N_ICU_BASE ); }static void register_tmr (RX62NState *s,int unit)
hw/scsi/esp-pci.c +9 -9
@@ -79,7 +79,7 @@ struct PCIESPState {static void esp_pci_handle_idle (PCIESPState *pci,uint32_t val) { -ESPState *s =ESP (&pci->esp); +ESPState *s = &pci->esp;trace_esp_pci_dma_idle (val);esp_dma_enable (s,0 ,0 );
@@ -93,7 +93,7 @@ static void esp_pci_handle_blast(PCIESPState *pci, uint32_t val)static void esp_pci_handle_abort (PCIESPState *pci,uint32_t val) { -ESPState *s =ESP (&pci->esp); +ESPState *s = &pci->esp;trace_esp_pci_dma_abort (val);if (s->current_req) {
@@ -103,7 +103,7 @@ static void esp_pci_handle_abort(PCIESPState *pci, uint32_t val)static void esp_pci_handle_start (PCIESPState *pci,uint32_t val) { -ESPState *s =ESP (&pci->esp); +ESPState *s = &pci->esp;trace_esp_pci_dma_start (val);
@@ -161,7 +161,7 @@ static void esp_pci_dma_write(PCIESPState *pci, uint32_t saddr, uint32_t val)static uint32_t esp_pci_dma_read (PCIESPState *pci,uint32_t saddr) { -ESPState *s =ESP (&pci->esp); +ESPState *s = &pci->esp;uint32_t val; val = pci->dma_regs[saddr];
@@ -183,7 +183,7 @@ static void esp_pci_io_write(void *opaque, hwaddr addr, uint64_t val, unsigned int size) {PCIESPState *pci = opaque; -ESPState *s =ESP (&pci->esp); +ESPState *s = &pci->esp;if (size <4 || addr &3 ) {/* need to upgrade request: we only support 4-bytes accesses */
@@ -228,7 +228,7 @@ static uint64_t esp_pci_io_read(void *opaque, hwaddr addr, unsigned int size) {PCIESPState *pci = opaque; -ESPState *s =ESP (&pci->esp); +ESPState *s = &pci->esp;uint32_t ret;if (addr <0x40 ) {
@@ -315,7 +315,7 @@ static const MemoryRegionOps esp_pci_io_ops = {static void esp_pci_hard_reset (DeviceState *dev) {PCIESPState *pci =PCI_ESP (dev); -ESPState *s =ESP (&pci->esp); +ESPState *s = &pci->esp;esp_hard_reset (s); pci->dma_regs[DMA_CMD] &= ~(DMA_CMD_DIR | DMA_CMD_INTE_D | DMA_CMD_INTE_P
@@ -366,7 +366,7 @@ static void esp_pci_scsi_realize(PCIDevice *dev, Error **errp) {PCIESPState *pci =PCI_ESP (dev);DeviceState *d =DEVICE (dev); -ESPState *s =ESP (&pci->esp); +ESPState *s = &pci->esp;uint8_t *pci_conf;if (!qdev_realize (DEVICE (s),NULL , errp)) {
@@ -394,7 +394,7 @@ static void esp_pci_scsi_realize(PCIDevice *dev, Error **errp)static void esp_pci_scsi_exit (PCIDevice *d) {PCIESPState *pci =PCI_ESP (d); -ESPState *s =ESP (&pci->esp); +ESPState *s = &pci->esp;qemu_free_irq (s->irq); }
hw/sparc/sun4m.c +2 -2
@@ -982,7 +982,7 @@ static void sun4m_hw_init(MachineState *machine)qdev_realize_and_unref (ms_kb_orgate,NULL , &error_fatal);sysbus_connect_irq (s,0 ,qdev_get_gpio_in (ms_kb_orgate,0 ));sysbus_connect_irq (s,1 ,qdev_get_gpio_in (ms_kb_orgate,1 )); -qdev_connect_gpio_out (DEVICE (ms_kb_orgate),0 , slavio_irq[14 ]); +qdev_connect_gpio_out (ms_kb_orgate,0 , slavio_irq[14 ]); dev =qdev_new (TYPE_ESCC );qdev_prop_set_uint32 (dev,"disabled" ,0 );
@@ -1004,7 +1004,7 @@ static void sun4m_hw_init(MachineState *machine)qdev_realize_and_unref (serial_orgate,NULL , &error_fatal);sysbus_connect_irq (s,0 ,qdev_get_gpio_in (serial_orgate,0 ));sysbus_connect_irq (s,1 ,qdev_get_gpio_in (serial_orgate,1 )); -qdev_connect_gpio_out (DEVICE (serial_orgate),0 , slavio_irq[15 ]); +qdev_connect_gpio_out (serial_orgate,0 , slavio_irq[15 ]);if (hwdef->apc_base) {apc_init (hwdef->apc_base,qemu_allocate_irq (cpu_halt_signal,NULL ,0 ));
hw/virtio/virtio-mem-pci.c +3 -3
@@ -42,7 +42,7 @@ static MemoryRegion *virtio_mem_pci_get_memory_region(MemoryDeviceState *md, Error **errp) {VirtIOMEMPCI *pci_mem =VIRTIO_MEM_PCI (md); -VirtIOMEM *vmem =VIRTIO_MEM (&pci_mem->vdev); +VirtIOMEM *vmem = &pci_mem->vdev;VirtIOMEMClass *vmc =VIRTIO_MEM_GET_CLASS (vmem);return vmc->get_memory_region (vmem, errp);
@@ -60,7 +60,7 @@ static void virtio_mem_pci_fill_device_info(const MemoryDeviceState *md, {VirtioMEMDeviceInfo *vi =g_new0 (VirtioMEMDeviceInfo,1 );VirtIOMEMPCI *pci_mem =VIRTIO_MEM_PCI (md); -VirtIOMEM *vmem =VIRTIO_MEM (&pci_mem->vdev); +VirtIOMEM *vmem = &pci_mem->vdev;VirtIOMEMClass *vpc =VIRTIO_MEM_GET_CLASS (vmem);DeviceState *dev =DEVICE (md);
@@ -123,7 +123,7 @@ static void virtio_mem_pci_instance_init(Object *obj) TYPE_VIRTIO_MEM); dev->size_change_notifier.notify = virtio_mem_pci_size_change_notify; - vmem =VIRTIO_MEM (&dev->vdev); + vmem = &dev->vdev; vmc =VIRTIO_MEM_GET_CLASS (vmem);/* * We never remove the notifier again, as we expect both devices to
hw/virtio/virtio-pmem-pci.c +3 -3
@@ -42,7 +42,7 @@ static MemoryRegion *virtio_pmem_pci_get_memory_region(MemoryDeviceState *md, Error **errp) {VirtIOPMEMPCI *pci_pmem =VIRTIO_PMEM_PCI (md); -VirtIOPMEM *pmem =VIRTIO_PMEM (&pci_pmem->vdev); +VirtIOPMEM *pmem = &pci_pmem->vdev;VirtIOPMEMClass *vpc =VIRTIO_PMEM_GET_CLASS (pmem);return vpc->get_memory_region (pmem, errp);
@@ -52,7 +52,7 @@ static uint64_t virtio_pmem_pci_get_plugged_size(const MemoryDeviceState *md, Error **errp) {VirtIOPMEMPCI *pci_pmem =VIRTIO_PMEM_PCI (md); -VirtIOPMEM *pmem =VIRTIO_PMEM (&pci_pmem->vdev); +VirtIOPMEM *pmem = &pci_pmem->vdev;VirtIOPMEMClass *vpc =VIRTIO_PMEM_GET_CLASS (pmem);MemoryRegion *mr = vpc->get_memory_region (pmem, errp);
@@ -65,7 +65,7 @@ static void virtio_pmem_pci_fill_device_info(const MemoryDeviceState *md, {VirtioPMEMDeviceInfo *vi =g_new0 (VirtioPMEMDeviceInfo,1 );VirtIOPMEMPCI *pci_pmem =VIRTIO_PMEM_PCI (md); -VirtIOPMEM *pmem =VIRTIO_PMEM (&pci_pmem->vdev); +VirtIOPMEM *pmem = &pci_pmem->vdev;VirtIOPMEMClass *vpc =VIRTIO_PMEM_GET_CLASS (pmem);DeviceState *dev =DEVICE (md);
migration/fd.c +2 -2
@@ -38,7 +38,7 @@ void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **return ; } -qio_channel_set_name (QIO_CHANNEL (ioc),"migration-fd-outgoing" ); +qio_channel_set_name (ioc,"migration-fd-outgoing" );migration_channel_connect (s, ioc,NULL ,NULL );object_unref (OBJECT (ioc)); }
@@ -68,7 +68,7 @@ void fd_start_incoming_migration(const char *fdname, Error **errp)return ; } -qio_channel_set_name (QIO_CHANNEL (ioc),"migration-fd-incoming" ); +qio_channel_set_name (ioc,"migration-fd-incoming" ); qio_channel_add_watch_full(ioc, G_IO_IN, fd_accept_incoming_migration, NULL, NULL,
migration/multifd.c +1 -1
@@ -894,7 +894,7 @@ static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque)trace_multifd_new_send_channel_async (p->id);if (!qio_task_propagate_error (task, &local_err)) { - p->c =QIO_CHANNEL (sioc); + p->c = sioc;qio_channel_set_delay (p->c, false); p->running = true;if (multifd_channel_connect (p, sioc, local_err)) {
migration/yank_functions.c +2 -2
@@ -35,7 +35,7 @@ void migration_ioc_register_yank(QIOChannel *ioc)if (migration_ioc_yank_supported (ioc)) {yank_register_function (MIGRATION_YANK_INSTANCE , migration_yank_iochannel, -QIO_CHANNEL (ioc)); + ioc); } }
@@ -44,7 +44,7 @@ void migration_ioc_unregister_yank(QIOChannel *ioc)if (migration_ioc_yank_supported (ioc)) {yank_unregister_function (MIGRATION_YANK_INSTANCE , migration_yank_iochannel, -QIO_CHANNEL (ioc)); + ioc); } }
nbd/client-connection.c +1 -1
@@ -156,7 +156,7 @@ static int nbd_connect(QIOChannelSocket *sioc, SocketAddress *addr,* channel. */ if (outioc && *outioc) { -qio_channel_close (QIO_CHANNEL (*outioc),NULL ); +qio_channel_close (*outioc,NULL );object_unref (OBJECT (*outioc)); *outioc =NULL ; }else {
nbd/server.c +1 -1
@@ -1189,7 +1189,7 @@ static int nbd_negotiate_options(NBDClient *client, Error **errp) } ret =0 ;object_unref (OBJECT (client->ioc)); - client->ioc =QIO_CHANNEL (tioc); + client->ioc = tioc;break ;case NBD_OPT_EXPORT_NAME :
softmmu/qdev-monitor.c +1 -1
@@ -711,7 +711,7 @@ DeviceState *qdev_device_add_from_qdict(const QDict *opts, goto err_del_dev; } -if (!qdev_realize (DEVICE (dev), bus, errp)) { +if (!qdev_realize (dev, bus, errp)) { goto err_del_dev; }return dev;
ui/vnc-ws.c +3 -3
@@ -40,9 +40,9 @@ static void vncws_tls_handshake_done(QIOTask *task,if (vs->ioc_tag) {g_source_remove (vs->ioc_tag); } - vs->ioc_tag =qio_channel_add_watch ( -QIO_CHANNEL (vs->ioc),G_IO_IN |G_IO_HUP |G_IO_ERR , - vncws_handshake_io, vs,NULL ); + vs->ioc_tag =qio_channel_add_watch (vs->ioc, +G_IO_IN |G_IO_HUP |G_IO_ERR , + vncws_handshake_io, vs,NULL ); } }
Signature · 1 line
2.38.1
Quoted 9 lines · Philippe Mathieu-Daudé
As per Markus suggestion in [*], use Coccinelle to remove pointless QOM cast macro uses. Since we have more than 1000 QOM types, add a script to generate the semantic patch.
[*]https://lore.kernel.org/qemu-devel/[email protected]/
Philippe Mathieu-Daudé (2):
scripts: Addqom-cast-macro-clean-cocci-gen.py
bulk: Remove pointless QOM casts
Cool!
r~