diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2013-11-18 21:41:44 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2013-11-21 16:28:27 +0200 |
| commit | 90d131fb6504ed12a37dc8433375cc683c30e9da (patch) | |
| tree | c4bc5f4a1ec5f4aa07fbff3ea783b93aa397edbb /hw | |
| parent | fd8f5e37557596e14a859d8edf3dc24523bd4400 (diff) | |
| download | qemu-90d131fb6504ed12a37dc8433375cc683c30e9da.zip qemu-90d131fb6504ed12a37dc8433375cc683c30e9da.tar.gz qemu-90d131fb6504ed12a37dc8433375cc683c30e9da.tar.bz2 | |
Revert "e1000/rtl8139: update HMP NIC when every bit is written"
This reverts commit cd5be5829c1ce87aa6b3a7806524fac07ac9a757.
Digging into hardware specs shows this does not
actually make QEMU behave more like hardware:
There are valid arguments backed by the spec to indicate why the version
of e1000 prior to cd5be582 was more correct: the high byte actually
includes a valid bit, this is why all guests write it last.
For rtl8139 there's actually a separate undocumented valid bit, but we
don't implement it yet.
To summarize all the drivers we know about behave in one way
that allows us to make an assumption about write order and avoid
spurious, incorrect mac address updates to the monitor.
Let's stick to the tried heuristic for 1.7 and
possibly revisit for 1.8.
Reported-by: Vlad Yasevich <vyasevic@redhat.com>
Reviewed-by: Vlad Yasevich <vyasevic@redhat.com>
Cc: Amos Kong <akong@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/net/e1000.c | 2 | ||||
| -rw-r--r-- | hw/net/rtl8139.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/hw/net/e1000.c b/hw/net/e1000.c index ae63591..8387443 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -1106,7 +1106,7 @@ mac_writereg(E1000State *s, int index, uint32_t val) s->mac_reg[index] = val; - if (index == RA || index == RA + 1) { + if (index == RA + 1) { macaddr[0] = cpu_to_le32(s->mac_reg[RA]); macaddr[1] = cpu_to_le32(s->mac_reg[RA + 1]); qemu_format_nic_info_str(qemu_get_queue(s->nic), (uint8_t *)macaddr); diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 7f2b4db..5329f44 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2741,7 +2741,10 @@ static void rtl8139_io_writeb(void *opaque, uint8_t addr, uint32_t val) switch (addr) { - case MAC0 ... MAC0+5: + case MAC0 ... MAC0+4: + s->phys[addr - MAC0] = val; + break; + case MAC0+5: s->phys[addr - MAC0] = val; qemu_format_nic_info_str(qemu_get_queue(s->nic), s->phys); break; |