diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/cs4231.c | 1 | ||||
| -rw-r--r-- | hw/eccmemctl.c | 1 | ||||
| -rw-r--r-- | hw/escc.c | 1 | ||||
| -rw-r--r-- | hw/esp.c | 2 | ||||
| -rw-r--r-- | hw/fdc.c | 2 | ||||
| -rw-r--r-- | hw/fw_cfg.c | 1 | ||||
| -rw-r--r-- | hw/iommu.c | 2 | ||||
| -rw-r--r-- | hw/loader.c | 1 | ||||
| -rw-r--r-- | hw/pcnet.c | 1 | ||||
| -rw-r--r-- | hw/sbi.c | 2 | ||||
| -rw-r--r-- | hw/slavio_intctl.c | 2 | ||||
| -rw-r--r-- | hw/slavio_misc.c | 2 | ||||
| -rw-r--r-- | hw/slavio_timer.c | 2 | ||||
| -rw-r--r-- | hw/sparc32_dma.c | 1 | ||||
| -rw-r--r-- | hw/sun4c_intctl.c | 2 | ||||
| -rw-r--r-- | hw/tcx.c | 1 |
16 files changed, 0 insertions, 24 deletions
diff --git a/hw/cs4231.c b/hw/cs4231.c index e161f19e27..f7ce0af3f9 100644 --- a/hw/cs4231.c +++ b/hw/cs4231.c @@ -162,7 +162,6 @@ static int cs4231_init1(SysBusDevice *dev) sysbus_init_mmio(dev, CS_SIZE, io); sysbus_init_irq(dev, &s->irq); - cs_reset(&s->busdev.qdev); return 0; } diff --git a/hw/eccmemctl.c b/hw/eccmemctl.c index 2110dc65e7..498c61a89c 100644 --- a/hw/eccmemctl.c +++ b/hw/eccmemctl.c @@ -313,7 +313,6 @@ static int ecc_init1(SysBusDevice *dev) ecc_diag_mem_write, s); sysbus_init_mmio(dev, ECC_DIAG_SIZE, ecc_io_memory); } - ecc_reset(&s->busdev.qdev); return 0; } @@ -921,7 +921,6 @@ static int escc_init1(SysBusDevice *dev) if (s->chn[1].type == kbd) { qemu_add_kbd_event_handler(sunkbd_event, &s->chn[1]); } - escc_reset(&s->busdev.qdev); return 0; } @@ -665,8 +665,6 @@ static int esp_init1(SysBusDevice *dev) esp_io_memory = cpu_register_io_memory(esp_mem_read, esp_mem_write, s); sysbus_init_mmio(dev, ESP_REGS << s->it_shift, esp_io_memory); - esp_reset(&s->busdev.qdev); - qdev_init_gpio_in(&dev->qdev, parent_esp_reset, 1); scsi_bus_new(&s->bus, &dev->qdev, 0, ESP_MAX_DEVS, esp_command_complete); @@ -1956,7 +1956,6 @@ static int isabus_fdc_init1(ISADevice *dev) fdctrl->dma_chann = dma_chann; ret = fdctrl_init_common(fdctrl); - fdctrl_external_reset_isa(&isa->busdev.qdev); return ret; } @@ -1975,7 +1974,6 @@ static int sysbus_fdc_init1(SysBusDevice *dev) fdctrl->dma_chann = -1; ret = fdctrl_init_common(fdctrl); - fdctrl_external_reset_sysbus(&sys->busdev.qdev); return ret; } diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c index 37fe3b3580..a6d811b092 100644 --- a/hw/fw_cfg.c +++ b/hw/fw_cfg.c @@ -275,7 +275,6 @@ void *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, vmstate_register(-1, &vmstate_fw_cfg, s); qemu_register_reset(fw_cfg_reset, s); - fw_cfg_reset(s); return s; } diff --git a/hw/iommu.c b/hw/iommu.c index e1022f6ec5..4151022de3 100644 --- a/hw/iommu.c +++ b/hw/iommu.c @@ -363,8 +363,6 @@ static int iommu_init1(SysBusDevice *dev) io = cpu_register_io_memory(iommu_mem_read, iommu_mem_write, s); sysbus_init_mmio(dev, IOMMU_NREGS * sizeof(uint32_t), io); - iommu_reset(&s->busdev.qdev); - return 0; } diff --git a/hw/loader.c b/hw/loader.c index a08585b040..9153b38456 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -682,7 +682,6 @@ int rom_load_all(void) rom->isrom = 1; } qemu_register_reset(rom_reset, NULL); - rom_reset(NULL); return 0; } diff --git a/hw/pcnet.c b/hw/pcnet.c index a1f9d82e67..a2c868927f 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1902,7 +1902,6 @@ int pcnet_common_init(DeviceState *dev, PCNetState *s, pcnet_can_receive, pcnet_receive, NULL, NULL, cleanup, s); qemu_format_nic_info_str(s->vc, s->conf.macaddr.a); - pcnet_h_reset(s); return 0; } @@ -128,8 +128,6 @@ static int sbi_init1(SysBusDevice *dev) sbi_io_memory = cpu_register_io_memory(sbi_mem_read, sbi_mem_write, s); sysbus_init_mmio(dev, SBI_SIZE, sbi_io_memory); - sbi_reset(&s->busdev.qdev); - return 0; } diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c index 9680392c6b..9aff892f25 100644 --- a/hw/slavio_intctl.c +++ b/hw/slavio_intctl.c @@ -447,8 +447,6 @@ static int slavio_intctl_init1(SysBusDevice *dev) s->slaves[i].master = s; } - slavio_intctl_reset(&s->busdev.qdev); - return 0; } diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c index f5216b38f3..5ae628df8e 100644 --- a/hw/slavio_misc.c +++ b/hw/slavio_misc.c @@ -476,8 +476,6 @@ static int slavio_misc_init1(SysBusDevice *dev) qdev_init_gpio_in(&dev->qdev, slavio_set_power_fail, 1); - slavio_misc_reset(&s->busdev.qdev); - return 0; } diff --git a/hw/slavio_timer.c b/hw/slavio_timer.c index b2f8aab042..cd2cf5772b 100644 --- a/hw/slavio_timer.c +++ b/hw/slavio_timer.c @@ -411,8 +411,6 @@ static int slavio_timer_init1(SysBusDevice *dev) sysbus_init_irq(dev, &s->cputimer[i].irq); } - slavio_timer_reset(&s->busdev.qdev); - return 0; } diff --git a/hw/sparc32_dma.c b/hw/sparc32_dma.c index ff2faf9638..faf6dbc1cf 100644 --- a/hw/sparc32_dma.c +++ b/hw/sparc32_dma.c @@ -245,7 +245,6 @@ static int sparc32_dma_init1(SysBusDevice *dev) qdev_init_gpio_in(&dev->qdev, dma_set_irq, 1); qdev_init_gpio_out(&dev->qdev, &s->dev_reset, 1); - dma_reset(&s->busdev.qdev); return 0; } diff --git a/hw/sun4c_intctl.c b/hw/sun4c_intctl.c index dca471fbb3..7d7542dc9f 100644 --- a/hw/sun4c_intctl.c +++ b/hw/sun4c_intctl.c @@ -204,8 +204,6 @@ static int sun4c_intctl_init1(SysBusDevice *dev) sysbus_init_irq(dev, &s->cpu_irqs[i]); } - sun4c_intctl_reset(&s->busdev.qdev); - return 0; } @@ -559,7 +559,6 @@ static int tcx_init1(SysBusDevice *dev) tcx_screen_dump, NULL, s); } - tcx_reset(&s->busdev.qdev); qemu_console_resize(s->ds, s->width, s->height); return 0; } |