From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdedZ-0005nu-3F for qemu-devel@nongnu.org; Tue, 05 Nov 2013 06:17:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VdedT-0005Nq-4s for qemu-devel@nongnu.org; Tue, 05 Nov 2013 06:17:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55609) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdedS-0005Ni-Sv for qemu-devel@nongnu.org; Tue, 05 Nov 2013 06:17:27 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rA5BHPoq002929 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 5 Nov 2013 06:17:25 -0500 From: Amos Kong Date: Tue, 5 Nov 2013 19:17:18 +0800 Message-Id: <1383650238-16015-1-git-send-email-akong@redhat.com> Subject: [Qemu-devel] [PATCH] e1000/rtl8139: update HMP NIC when every bit is written List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jasowang@redhat.com, stefanha@redhat.com, mst@redhat.com We currently just update the HMP NIC info when the last bit of macaddr is written. This assumes that guest driver will write all the macaddr from bit 0 to bit 5 when it changes the macaddr, this is the current behavior of linux driver (e1000/rtl8139cp), but we can't do this assumption. The macaddr that is used for rx-filter will be updated when every bit is changed. This patch updates the e1000/rtl8139 nic to update HMP NIC info when every bit is changed. It will be same as virtio-net. Signed-off-by: Amos Kong --- hw/net/e1000.c | 2 +- hw/net/rtl8139.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index ec8ecd7..2d60639 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -1110,7 +1110,7 @@ mac_writereg(E1000State *s, int index, uint32_t val) s->mac_reg[index] = val; - if (index == RA + 1) { + if (index == RA || 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 5329f44..7f2b4db 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2741,10 +2741,7 @@ static void rtl8139_io_writeb(void *opaque, uint8_t addr, uint32_t val) switch (addr) { - case MAC0 ... MAC0+4: - s->phys[addr - MAC0] = val; - break; - case MAC0+5: + case MAC0 ... MAC0+5: s->phys[addr - MAC0] = val; qemu_format_nic_info_str(qemu_get_queue(s->nic), s->phys); break; -- 1.8.3.1