sparc32 (mostly): remove unneeded calls to device reset

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

diff --git a/hw/cs4231.c b/hw/cs4231.c
index e161f19e27479e353b491ee156d60b5c50569fe4..f7ce0af3f92be4c4c583bdccde9123cbe17d95e8 100644 (file)
--- 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 2110dc65e748b85f385628988fbbfc465585a1c6..498c61a89c7b0d1d842a82aeaab7513b39609bad 100644 (file)
--- 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;
 }

diff --git a/hw/escc.c b/hw/escc.c
index 2dfe27b038c79dbe0c0659ea47fd9b3ac814bd62..0b20aeabb8ab727a3f4b963c772b0ed1f2dfa2e1 100644 (file)
--- a/hw/escc.c
+++ b/hw/escc.c
@@ -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;
 }

diff --git a/hw/esp.c b/hw/esp.c
index 0e8d8ae19cbbc0392a4a9060be5d92323b113665..41b8eb8e7bfc922b205fabc603eedba70acc4b53 100644 (file)
--- a/hw/esp.c
+++ b/hw/esp.c
@@ -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);

diff --git a/hw/fdc.c b/hw/fdc.c
index dbf93e8c195756f3705d237b504db3df97d68447..06f3a2cb991f0cd3988ee2cb40476289951e1175 100644 (file)
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -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 37fe3b35809834360980751a38dbab2e667db177..a6d811b092dc03265353f82f2d99704d4fc4d6d0 100644 (file)
--- 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 e1022f6ec5146d4f74697d746e0a39618105c6f7..4151022de35349ce6fa7c59da75949cf16f04050 100644 (file)
--- 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 a08585b040fd00147a8d83fa430b63e73bd5949b..9153b3845668de7b90a216562fec02d480278107 100644 (file)
--- 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 a1f9d82e670798f8b18cef0f8c6ce030e8afce24..a2c868927fe0919630db60a2c819687aeaab266f 100644 (file)
--- 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;
 }
 

diff --git a/hw/sbi.c b/hw/sbi.c
index 69c86e1b5ddc26cd604fbd7e808516673882704b..c4adc09fa9fae26ccc4904b9b977e03d60d77de5 100644 (file)
--- a/hw/sbi.c
+++ b/hw/sbi.c
@@ -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 9680392c6b597a6988f95b2212205a1efa138445..9aff892f25b3946fae74c7050cadd271f58a5edd 100644 (file)
--- 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 f5216b38f399f4901e2b6e341ca81a683c2953dd..5ae628df8ed7435520a5874a6b57a482cb739ff1 100644 (file)
--- 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 b2f8aab042e7ab2c34373a33bbca8c88d4e1509b..cd2cf5772b8016b7f6969fb6e1196e1fb4355027 100644 (file)
--- 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 ff2faf9638e94f1ddcaa9d40b0b3092f3178dc9a..faf6dbc1cf2578dea8a34f84e1391a6bd1bef26a 100644 (file)
--- 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 dca471fbb3aad46defe67024536bf41927208677..7d7542dc9f8f580a38a351199dd488029e49c74d 100644 (file)
--- 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;
 }
 

diff --git a/hw/tcx.c b/hw/tcx.c
index 708bb8063722d9a25ed8b66997f5fd144c83d622..7598e8c2f1f7c7e62311ccb323b3ddcbd515c508 100644 (file)
--- a/hw/tcx.c
+++ b/hw/tcx.c
@@ -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;
 }

diff --git a/target-sparc/helper.c b/target-sparc/helper.c
index 920432cb195ef8e53b30916ab9aa471ed8776884..b8e7a5e12b7bd2230f76b390414bf40a0a5b948a 100644 (file)
--- a/target-sparc/helper.c
+++ b/target-sparc/helper.c
@@ -762,7 +762,9 @@ CPUSPARCState *cpu_sparc_init(const char *cpu_model)
         cpu_sparc_close(env);
         return NULL;
     }
+#if defined(CONFIG_USER_ONLY)
     cpu_reset(env);
+#endif
     qemu_init_vcpu(env);
 
     return env;