From patchwork Mon Aug 2 21:15:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: e1000: Fix hotplug Date: Mon, 02 Aug 2010 11:15:17 -0000 From: Alex Williamson X-Patchwork-Id: 60670 Message-Id: <20100802211121.5497.36512.stgit@localhost6.localdomain6> To: qemu-devel@nongnu.org, anthony@codemonkey.ws Cc: alex.williamson@redhat.com, glommer@redhat.com When we removed the call to e1000_reset() back in cset c1699988, we left some register state uninitialized. When we hotplug the device, we don't go through a reset cycle, which means a hot added e1000 is useless until the VM reboots. Duplicate the bits we need from e1000_reset(). Signed-off-by: Alex Williamson --- 0.13 candidate? hw/e1000.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index 80b78bc..eb323d2 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -1129,6 +1129,10 @@ static int pci_e1000_init(PCIDevice *pci_dev) checksum = (uint16_t) EEPROM_SUM - checksum; d->eeprom_data[EEPROM_CHECKSUM_REG] = checksum; + memmove(d->phy_reg, phy_reg_init, sizeof phy_reg_init); + memmove(d->mac_reg, mac_reg_init, sizeof mac_reg_init); + d->rxbuf_min_shift = 1; + d->nic = qemu_new_nic(&net_e1000_info, &d->conf, d->dev.qdev.info->name, d->dev.qdev.id, d);