Revert r5274 which breaks savevm/loadvm

[qemu] / hw / e1000.c

diff --git a/hw/e1000.c b/hw/e1000.c
index d81d9be..a8dcd1a 100644 (file)
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -524,8 +524,7 @@ e1000_can_receive(void *opaque)
 {
     E1000State *s = opaque;
 
-    return (!(s->mac_reg[RCTL] & E1000_RCTL_EN) ||
-            s->mac_reg[RDH] != s->mac_reg[RDT]);
+    return (s->mac_reg[RCTL] & E1000_RCTL_EN);
 }
 
 static void
@@ -950,7 +949,7 @@ pci_e1000_init(PCIBus *bus, NICInfo *nd, int devfn)
     E1000State *d;
     uint8_t *pci_conf;
     uint16_t checksum = 0;
-    char *info_str = "e1000";
+    static const char info_str[] = "e1000";
     int i;
 
     d = (E1000State *)pci_register_device(bus, "e1000",