bulk: Remove pointless QOM casts

Mechanical change running Coccinelle spatch with content
generated from the qom-cast-macro-clean-cocci-gen.py added
in the previous commit.

Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230601093452.38972-3-philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2023-06-01 11:34:52 +02:00 committed by Thomas Huth
parent e3e2c0c82b
commit 7d5b0d6864
24 changed files with 49 additions and 49 deletions

View File

@ -397,7 +397,7 @@ static void coroutine_fn GRAPH_RDLOCK nbd_reconnect_attempt(BDRVNBDState *s)
/* Finalize previous connection if any */ /* Finalize previous connection if any */
if (s->ioc) { 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), yank_unregister_function(BLOCKDEV_YANK_INSTANCE(s->bs->node_name),
nbd_yank, s->bs); nbd_yank, s->bs);
object_unref(OBJECT(s->ioc)); object_unref(OBJECT(s->ioc));
@ -1455,7 +1455,7 @@ static void nbd_yank(void *opaque)
BDRVNBDState *s = (BDRVNBDState *)bs->opaque; BDRVNBDState *s = (BDRVNBDState *)bs->opaque;
QEMU_LOCK_GUARD(&s->requests_lock); 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; s->state = NBD_CLIENT_QUIT;
} }

View File

@ -334,7 +334,7 @@ static void char_pty_open(Chardev *chr,
s = PTY_CHARDEV(chr); s = PTY_CHARDEV(chr);
s->ioc = QIO_CHANNEL(qio_channel_file_new_fd(master_fd)); s->ioc = QIO_CHANNEL(qio_channel_file_new_fd(master_fd));
name = g_strdup_printf("chardev-pty-%s", chr->label); 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); g_free(name);
s->timer_src = NULL; s->timer_src = NULL;
*be_opened = false; *be_opened = false;

View File

@ -1250,7 +1250,7 @@ static void musicpal_init(MachineState *machine)
uart_orgate = DEVICE(object_new(TYPE_OR_IRQ)); uart_orgate = DEVICE(object_new(TYPE_OR_IRQ));
object_property_set_int(OBJECT(uart_orgate), "num-lines", 2, &error_fatal); object_property_set_int(OBJECT(uart_orgate), "num-lines", 2, &error_fatal);
qdev_realize_and_unref(uart_orgate, NULL, &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)); qdev_get_gpio_in(pic, MP_UART_SHARED_IRQ));
serial_mm_init(address_space_mem, MP_UART1_BASE, 2, serial_mm_init(address_space_mem, MP_UART1_BASE, 2,

View File

@ -327,7 +327,7 @@ static void versal_create_rtc(Versal *s, qemu_irq *pic)
object_initialize_child(OBJECT(s), "rtc", &s->pmc.rtc, object_initialize_child(OBJECT(s), "rtc", &s->pmc.rtc,
TYPE_XLNX_ZYNQMP_RTC); TYPE_XLNX_ZYNQMP_RTC);
sbd = SYS_BUS_DEVICE(&s->pmc.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); mr = sysbus_mmio_get_region(sbd, 0);
memory_region_add_subregion(&s->mr_ps, MM_PMC_RTC, mr); memory_region_add_subregion(&s->mr_ps, MM_PMC_RTC, mr);

View File

@ -364,11 +364,11 @@ vhost_user_gpu_gl_flushed(VirtIOGPUBase *b)
VhostUserGPU *g = VHOST_USER_GPU(b); VhostUserGPU *g = VHOST_USER_GPU(b);
if (g->backend_blocked) { if (g->backend_blocked) {
vhost_user_gpu_unblock(VHOST_USER_GPU(g)); vhost_user_gpu_unblock(g);
g->backend_blocked = false; g->backend_blocked = false;
} }
vhost_user_gpu_update_blocked(VHOST_USER_GPU(g), false); vhost_user_gpu_update_blocked(g, false);
} }
static bool static bool

View File

@ -276,7 +276,7 @@ static void loongarch_extioi_instance_init(Object *obj)
int i, cpu, pin; int i, cpu, pin;
for (i = 0; i < EXTIOI_IRQS; i++) { 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); 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++) { for (cpu = 0; cpu < EXTIOI_CPUS; cpu++) {
memory_region_init_io(&s->extioi_iocsr_mem[cpu], OBJECT(s), &extioi_ops, memory_region_init_io(&s->extioi_iocsr_mem[cpu], OBJECT(s), &extioi_ops,
s, "extioi_iocsr", 0x900); 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++) { for (pin = 0; pin < LS3A_INTC_IP; pin++) {
qdev_init_gpio_out(DEVICE(obj), &s->parent_irq[cpu][pin], 1); qdev_init_gpio_out(DEVICE(obj), &s->parent_irq[cpu][pin], 1);
} }
} }
memory_region_init_io(&s->extioi_system_mem, OBJECT(s), &extioi_ops, memory_region_init_io(&s->extioi_system_mem, OBJECT(s), &extioi_ops,
s, "extioi_system_mem", 0x900); 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) static void loongarch_extioi_class_init(ObjectClass *klass, void *data)

View File

@ -525,7 +525,7 @@ static void q800_init(MachineState *machine)
qdev_realize_and_unref(escc_orgate, NULL, &error_fatal); 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, 0, qdev_get_gpio_in(escc_orgate, 0));
sysbus_connect_irq(sysbus, 1, qdev_get_gpio_in(escc_orgate, 1)); 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)); qdev_get_gpio_in(glue, GLUE_IRQ_IN_ESCC));
sysbus_mmio_map(sysbus, 0, SCC_BASE); sysbus_mmio_map(sysbus, 0, SCC_BASE);

View File

@ -656,7 +656,7 @@ static void bonito_pci_realize(PCIDevice *dev, Error **errp)
PCIBonitoState *s = PCI_BONITO(dev); PCIBonitoState *s = PCI_BONITO(dev);
SysBusDevice *sysbus = SYS_BUS_DEVICE(s->pcihost); SysBusDevice *sysbus = SYS_BUS_DEVICE(s->pcihost);
PCIHostState *phb = PCI_HOST_BRIDGE(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); MemoryRegion *pcimem_alias = g_new(MemoryRegion, 1);
/* /*

View File

@ -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, memory_region_add_subregion(&lpc->opb_mr, LPC_HC_REGS_OPB_ADDR,
&lpc->lpc_hc_regs); &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) static void pnv_lpc_class_init(ObjectClass *klass, void *data)

View File

@ -278,7 +278,7 @@ static void pnv_occ_realize(DeviceState *dev, Error **errp)
occ, "occ-common-area", occ, "occ-common-area",
PNV_OCC_SENSOR_DATA_BLOCK_SIZE); 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) static void pnv_occ_class_init(ObjectClass *klass, void *data)

View File

@ -381,7 +381,7 @@ static void pnv_sbe_realize(DeviceState *dev, Error **errp)
psc->xscom_mbox_ops, sbe, "xscom-sbe-mbox", psc->xscom_mbox_ops, sbe, "xscom-sbe-mbox",
psc->xscom_mbox_size); 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); sbe->timer = timer_new_us(QEMU_CLOCK_VIRTUAL, sbe_timer, sbe);
} }

View File

@ -1488,7 +1488,7 @@ static void virt_machine_init(MachineState *machine)
for (i = 0; i < VIRTIO_COUNT; i++) { for (i = 0; i < VIRTIO_COUNT; i++) {
sysbus_create_simple("virtio-mmio", sysbus_create_simple("virtio-mmio",
memmap[VIRT_VIRTIO].base + i * memmap[VIRT_VIRTIO].size, 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, 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.base,
virt_high_pcie_memmap.size, virt_high_pcie_memmap.size,
memmap[VIRT_PCIE_PIO].base, 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, 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); serial_hd(0), DEVICE_LITTLE_ENDIAN);
sysbus_create_simple("goldfish_rtc", memmap[VIRT_RTC].base, 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); virt_flash_create(s);

View File

@ -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, 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, 1, qdev_get_gpio_in(DEVICE(&s->cpu), RX_CPU_FIR));
sysbus_connect_irq(icu, 2, s->irq[SWI]); 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) static void register_tmr(RX62NState *s, int unit)

View File

@ -79,7 +79,7 @@ struct PCIESPState {
static void esp_pci_handle_idle(PCIESPState *pci, uint32_t val) 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); trace_esp_pci_dma_idle(val);
esp_dma_enable(s, 0, 0); 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) 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); trace_esp_pci_dma_abort(val);
if (s->current_req) { 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) 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); 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) static uint32_t esp_pci_dma_read(PCIESPState *pci, uint32_t saddr)
{ {
ESPState *s = ESP(&pci->esp); ESPState *s = &pci->esp;
uint32_t val; uint32_t val;
val = pci->dma_regs[saddr]; 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) uint64_t val, unsigned int size)
{ {
PCIESPState *pci = opaque; PCIESPState *pci = opaque;
ESPState *s = ESP(&pci->esp); ESPState *s = &pci->esp;
if (size < 4 || addr & 3) { if (size < 4 || addr & 3) {
/* need to upgrade request: we only support 4-bytes accesses */ /* 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) unsigned int size)
{ {
PCIESPState *pci = opaque; PCIESPState *pci = opaque;
ESPState *s = ESP(&pci->esp); ESPState *s = &pci->esp;
uint32_t ret; uint32_t ret;
if (addr < 0x40) { if (addr < 0x40) {
@ -315,7 +315,7 @@ static const MemoryRegionOps esp_pci_io_ops = {
static void esp_pci_hard_reset(DeviceState *dev) static void esp_pci_hard_reset(DeviceState *dev)
{ {
PCIESPState *pci = PCI_ESP(dev); PCIESPState *pci = PCI_ESP(dev);
ESPState *s = ESP(&pci->esp); ESPState *s = &pci->esp;
esp_hard_reset(s); esp_hard_reset(s);
pci->dma_regs[DMA_CMD] &= ~(DMA_CMD_DIR | DMA_CMD_INTE_D | DMA_CMD_INTE_P 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); PCIESPState *pci = PCI_ESP(dev);
DeviceState *d = DEVICE(dev); DeviceState *d = DEVICE(dev);
ESPState *s = ESP(&pci->esp); ESPState *s = &pci->esp;
uint8_t *pci_conf; uint8_t *pci_conf;
if (!qdev_realize(DEVICE(s), NULL, errp)) { 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) static void esp_pci_scsi_exit(PCIDevice *d)
{ {
PCIESPState *pci = PCI_ESP(d); PCIESPState *pci = PCI_ESP(d);
ESPState *s = ESP(&pci->esp); ESPState *s = &pci->esp;
qemu_free_irq(s->irq); qemu_free_irq(s->irq);
} }

View File

@ -982,7 +982,7 @@ static void sun4m_hw_init(MachineState *machine)
qdev_realize_and_unref(ms_kb_orgate, NULL, &error_fatal); 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, 0, qdev_get_gpio_in(ms_kb_orgate, 0));
sysbus_connect_irq(s, 1, qdev_get_gpio_in(ms_kb_orgate, 1)); 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); dev = qdev_new(TYPE_ESCC);
qdev_prop_set_uint32(dev, "disabled", 0); 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); 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, 0, qdev_get_gpio_in(serial_orgate, 0));
sysbus_connect_irq(s, 1, qdev_get_gpio_in(serial_orgate, 1)); 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) { if (hwdef->apc_base) {
apc_init(hwdef->apc_base, qemu_allocate_irq(cpu_halt_signal, NULL, 0)); apc_init(hwdef->apc_base, qemu_allocate_irq(cpu_halt_signal, NULL, 0));

View File

@ -42,7 +42,7 @@ static MemoryRegion *virtio_mem_pci_get_memory_region(MemoryDeviceState *md,
Error **errp) Error **errp)
{ {
VirtIOMEMPCI *pci_mem = VIRTIO_MEM_PCI(md); 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); VirtIOMEMClass *vmc = VIRTIO_MEM_GET_CLASS(vmem);
return vmc->get_memory_region(vmem, errp); 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); VirtioMEMDeviceInfo *vi = g_new0(VirtioMEMDeviceInfo, 1);
VirtIOMEMPCI *pci_mem = VIRTIO_MEM_PCI(md); 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); VirtIOMEMClass *vpc = VIRTIO_MEM_GET_CLASS(vmem);
DeviceState *dev = DEVICE(md); DeviceState *dev = DEVICE(md);
@ -123,7 +123,7 @@ static void virtio_mem_pci_instance_init(Object *obj)
TYPE_VIRTIO_MEM); TYPE_VIRTIO_MEM);
dev->size_change_notifier.notify = virtio_mem_pci_size_change_notify; 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); vmc = VIRTIO_MEM_GET_CLASS(vmem);
/* /*
* We never remove the notifier again, as we expect both devices to * We never remove the notifier again, as we expect both devices to

View File

@ -42,7 +42,7 @@ static MemoryRegion *virtio_pmem_pci_get_memory_region(MemoryDeviceState *md,
Error **errp) Error **errp)
{ {
VirtIOPMEMPCI *pci_pmem = VIRTIO_PMEM_PCI(md); 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); VirtIOPMEMClass *vpc = VIRTIO_PMEM_GET_CLASS(pmem);
return vpc->get_memory_region(pmem, errp); 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) Error **errp)
{ {
VirtIOPMEMPCI *pci_pmem = VIRTIO_PMEM_PCI(md); 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); VirtIOPMEMClass *vpc = VIRTIO_PMEM_GET_CLASS(pmem);
MemoryRegion *mr = vpc->get_memory_region(pmem, errp); 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); VirtioPMEMDeviceInfo *vi = g_new0(VirtioPMEMDeviceInfo, 1);
VirtIOPMEMPCI *pci_pmem = VIRTIO_PMEM_PCI(md); 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); VirtIOPMEMClass *vpc = VIRTIO_PMEM_GET_CLASS(pmem);
DeviceState *dev = DEVICE(md); DeviceState *dev = DEVICE(md);

View File

@ -38,7 +38,7 @@ void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **
return; 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); migration_channel_connect(s, ioc, NULL, NULL);
object_unref(OBJECT(ioc)); object_unref(OBJECT(ioc));
} }
@ -68,7 +68,7 @@ void fd_start_incoming_migration(const char *fdname, Error **errp)
return; 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, qio_channel_add_watch_full(ioc, G_IO_IN,
fd_accept_incoming_migration, fd_accept_incoming_migration,
NULL, NULL, NULL, NULL,

View File

@ -894,7 +894,7 @@ static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque)
trace_multifd_new_send_channel_async(p->id); trace_multifd_new_send_channel_async(p->id);
if (!qio_task_propagate_error(task, &local_err)) { if (!qio_task_propagate_error(task, &local_err)) {
p->c = QIO_CHANNEL(sioc); p->c = sioc;
qio_channel_set_delay(p->c, false); qio_channel_set_delay(p->c, false);
p->running = true; p->running = true;
if (multifd_channel_connect(p, sioc, local_err)) { if (multifd_channel_connect(p, sioc, local_err)) {

View File

@ -35,7 +35,7 @@ void migration_ioc_register_yank(QIOChannel *ioc)
if (migration_ioc_yank_supported(ioc)) { if (migration_ioc_yank_supported(ioc)) {
yank_register_function(MIGRATION_YANK_INSTANCE, yank_register_function(MIGRATION_YANK_INSTANCE,
migration_yank_iochannel, migration_yank_iochannel,
QIO_CHANNEL(ioc)); ioc);
} }
} }
@ -44,7 +44,7 @@ void migration_ioc_unregister_yank(QIOChannel *ioc)
if (migration_ioc_yank_supported(ioc)) { if (migration_ioc_yank_supported(ioc)) {
yank_unregister_function(MIGRATION_YANK_INSTANCE, yank_unregister_function(MIGRATION_YANK_INSTANCE,
migration_yank_iochannel, migration_yank_iochannel,
QIO_CHANNEL(ioc)); ioc);
} }
} }

View File

@ -156,7 +156,7 @@ static int nbd_connect(QIOChannelSocket *sioc, SocketAddress *addr,
* channel. * channel.
*/ */
if (outioc && *outioc) { if (outioc && *outioc) {
qio_channel_close(QIO_CHANNEL(*outioc), NULL); qio_channel_close(*outioc, NULL);
object_unref(OBJECT(*outioc)); object_unref(OBJECT(*outioc));
*outioc = NULL; *outioc = NULL;
} else { } else {

View File

@ -1189,7 +1189,7 @@ static int nbd_negotiate_options(NBDClient *client, Error **errp)
} }
ret = 0; ret = 0;
object_unref(OBJECT(client->ioc)); object_unref(OBJECT(client->ioc));
client->ioc = QIO_CHANNEL(tioc); client->ioc = tioc;
break; break;
case NBD_OPT_EXPORT_NAME: case NBD_OPT_EXPORT_NAME:

View File

@ -711,7 +711,7 @@ DeviceState *qdev_device_add_from_qdict(const QDict *opts,
goto err_del_dev; goto err_del_dev;
} }
if (!qdev_realize(DEVICE(dev), bus, errp)) { if (!qdev_realize(dev, bus, errp)) {
goto err_del_dev; goto err_del_dev;
} }
return dev; return dev;

View File

@ -40,9 +40,9 @@ static void vncws_tls_handshake_done(QIOTask *task,
if (vs->ioc_tag) { if (vs->ioc_tag) {
g_source_remove(vs->ioc_tag); g_source_remove(vs->ioc_tag);
} }
vs->ioc_tag = qio_channel_add_watch( vs->ioc_tag = qio_channel_add_watch(vs->ioc,
QIO_CHANNEL(vs->ioc), G_IO_IN | G_IO_HUP | G_IO_ERR, G_IO_IN | G_IO_HUP | G_IO_ERR,
vncws_handshake_io, vs, NULL); vncws_handshake_io, vs, NULL);
} }
} }