* [Qemu-devel] [6219] add missing MAC address to info_str for some NICs (Mark McLoughlin)
@ 2009-01-07 17:47 Anthony Liguori
2009-01-07 19:00 ` Stefan Weil
0 siblings, 1 reply; 4+ messages in thread
From: Anthony Liguori @ 2009-01-07 17:47 UTC (permalink / raw)
To: qemu-devel
Revision: 6219
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6219
Author: aliguori
Date: 2009-01-07 17:47:15 +0000 (Wed, 07 Jan 2009)
Log Message:
-----------
add missing MAC address to info_str for some NICs (Mark McLoughlin)
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Modified Paths:
--------------
trunk/hw/mcf_fec.c
trunk/hw/smc91c111.c
trunk/hw/stellaris_enet.c
trunk/hw/virtio-net.c
Modified: trunk/hw/mcf_fec.c
===================================================================
--- trunk/hw/mcf_fec.c 2009-01-07 17:46:21 UTC (rev 6218)
+++ trunk/hw/mcf_fec.c 2009-01-07 17:47:15 UTC (rev 6219)
@@ -455,4 +455,5 @@
s->vc = qemu_new_vlan_client(nd->vlan, nd->model,
mcf_fec_receive, mcf_fec_can_receive, s);
memcpy(s->macaddr, nd->macaddr, 6);
+ qemu_format_nic_info_str(n->vc, s->macaddr);
}
Modified: trunk/hw/smc91c111.c
===================================================================
--- trunk/hw/smc91c111.c 2009-01-07 17:46:21 UTC (rev 6218)
+++ trunk/hw/smc91c111.c 2009-01-07 17:47:15 UTC (rev 6219)
@@ -706,5 +706,6 @@
s->vc = qemu_new_vlan_client(nd->vlan, nd->model,
smc91c111_receive, smc91c111_can_receive, s);
+ qemu_format_nic_info_str(s->vc, s->macaddr);
/* ??? Save/restore. */
}
Modified: trunk/hw/stellaris_enet.c
===================================================================
--- trunk/hw/stellaris_enet.c 2009-01-07 17:46:21 UTC (rev 6218)
+++ trunk/hw/stellaris_enet.c 2009-01-07 17:47:15 UTC (rev 6219)
@@ -396,9 +396,11 @@
s->irq = irq;
memcpy(s->macaddr, nd->macaddr, 6);
- if (nd->vlan)
+ if (nd->vlan) {
s->vc = qemu_new_vlan_client(nd->vlan, nd->model,
stellaris_enet_receive, stellaris_enet_can_receive, s);
+ qemu_format_nic_info_str(s->vc, s->macaddr);
+ }
stellaris_enet_reset(s);
register_savevm("stellaris_enet", -1, 1,
Modified: trunk/hw/virtio-net.c
===================================================================
--- trunk/hw/virtio-net.c 2009-01-07 17:46:21 UTC (rev 6218)
+++ trunk/hw/virtio-net.c 2009-01-07 17:47:15 UTC (rev 6219)
@@ -318,6 +318,8 @@
n->vc = qemu_new_vlan_client(nd->vlan, nd->model,
virtio_net_receive, virtio_net_can_receive, n);
+ qemu_format_nic_info_str(n->vc, n->mac);
+
n->tx_timer = qemu_new_timer(vm_clock, virtio_net_tx_timer, n);
n->tx_timer_active = 0;
n->mergeable_rx_bufs = 0;
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [6219] add missing MAC address to info_str for some NICs (Mark McLoughlin)
2009-01-07 17:47 [Qemu-devel] [6219] add missing MAC address to info_str for some NICs (Mark McLoughlin) Anthony Liguori
@ 2009-01-07 19:00 ` Stefan Weil
2009-01-07 20:00 ` Anthony Liguori
0 siblings, 1 reply; 4+ messages in thread
From: Stefan Weil @ 2009-01-07 19:00 UTC (permalink / raw)
To: qemu-devel
Anthony Liguori schrieb:
> Revision: 6219
> http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6219
> Author: aliguori
> Date: 2009-01-07 17:47:15 +0000 (Wed, 07 Jan 2009)
>
> Log Message:
> -----------
> add missing MAC address to info_str for some NICs (Mark McLoughlin)
>
> Signed-off-by: Mark McLoughlin <markmc@redhat.com>
> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
>
> Modified Paths:
> --------------
> trunk/hw/mcf_fec.c
> trunk/hw/smc91c111.c
> trunk/hw/stellaris_enet.c
> trunk/hw/virtio-net.c
>
> Modified: trunk/hw/mcf_fec.c
> ===================================================================
> --- trunk/hw/mcf_fec.c 2009-01-07 17:46:21 UTC (rev 6218)
> +++ trunk/hw/mcf_fec.c 2009-01-07 17:47:15 UTC (rev 6219)
> @@ -455,4 +455,5 @@
> s->vc = qemu_new_vlan_client(nd->vlan, nd->model,
> mcf_fec_receive, mcf_fec_can_receive, s);
> memcpy(s->macaddr, nd->macaddr, 6);
> + qemu_format_nic_info_str(n->vc, s->macaddr);
> }
>
>
s->vc looks better than n->vc :-)
Regards
Stefan Weil
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [6219] add missing MAC address to info_str for some NICs (Mark McLoughlin)
2009-01-07 19:00 ` Stefan Weil
@ 2009-01-07 20:00 ` Anthony Liguori
2009-01-08 9:45 ` Mark McLoughlin
0 siblings, 1 reply; 4+ messages in thread
From: Anthony Liguori @ 2009-01-07 20:00 UTC (permalink / raw)
To: qemu-devel
Stefan Weil wrote:
> Anthony Liguori schrieb:
>
>> Revision: 6219
>> http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6219
>> Author: aliguori
>> Date: 2009-01-07 17:47:15 +0000 (Wed, 07 Jan 2009)
>>
>> Log Message:
>> -----------
>> add missing MAC address to info_str for some NICs (Mark McLoughlin)
>>
>> Signed-off-by: Mark McLoughlin <markmc@redhat.com>
>> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
>>
>> Modified Paths:
>> --------------
>> trunk/hw/mcf_fec.c
>> trunk/hw/smc91c111.c
>> trunk/hw/stellaris_enet.c
>> trunk/hw/virtio-net.c
>>
>> Modified: trunk/hw/mcf_fec.c
>> ===================================================================
>> --- trunk/hw/mcf_fec.c 2009-01-07 17:46:21 UTC (rev 6218)
>> +++ trunk/hw/mcf_fec.c 2009-01-07 17:47:15 UTC (rev 6219)
>> @@ -455,4 +455,5 @@
>> s->vc = qemu_new_vlan_client(nd->vlan, nd->model,
>> mcf_fec_receive, mcf_fec_can_receive, s);
>> memcpy(s->macaddr, nd->macaddr, 6);
>> + qemu_format_nic_info_str(n->vc, s->macaddr);
>> }
>>
>>
>>
>
> s->vc looks better than n->vc :-)
>
Good catch.
Regards,
Anthony Liguori
> Regards
> Stefan Weil
>
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [6219] add missing MAC address to info_str for some NICs (Mark McLoughlin)
2009-01-07 20:00 ` Anthony Liguori
@ 2009-01-08 9:45 ` Mark McLoughlin
0 siblings, 0 replies; 4+ messages in thread
From: Mark McLoughlin @ 2009-01-08 9:45 UTC (permalink / raw)
To: qemu-devel
On Wed, 2009-01-07 at 14:00 -0600, Anthony Liguori wrote:
> Stefan Weil wrote:
> > Anthony Liguori schrieb:
> >
> >> Revision: 6219
> >> http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6219
> >> Author: aliguori
> >> Date: 2009-01-07 17:47:15 +0000 (Wed, 07 Jan 2009)
> >>
> >> Log Message:
> >> -----------
> >> add missing MAC address to info_str for some NICs (Mark McLoughlin)
> >>
> >> Signed-off-by: Mark McLoughlin <markmc@redhat.com>
> >> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
> >>
> >> Modified Paths:
> >> --------------
> >> trunk/hw/mcf_fec.c
> >> trunk/hw/smc91c111.c
> >> trunk/hw/stellaris_enet.c
> >> trunk/hw/virtio-net.c
> >>
> >> Modified: trunk/hw/mcf_fec.c
> >> ===================================================================
> >> --- trunk/hw/mcf_fec.c 2009-01-07 17:46:21 UTC (rev 6218)
> >> +++ trunk/hw/mcf_fec.c 2009-01-07 17:47:15 UTC (rev 6219)
> >> @@ -455,4 +455,5 @@
> >> s->vc = qemu_new_vlan_client(nd->vlan, nd->model,
> >> mcf_fec_receive, mcf_fec_can_receive, s);
> >> memcpy(s->macaddr, nd->macaddr, 6);
> >> + qemu_format_nic_info_str(n->vc, s->macaddr);
> >> }
> >>
> >>
> >>
> >
> > s->vc looks better than n->vc :-)
> >
>
> Good catch.
Indeed, thanks.
Strange build problems, I think:
1) I had a build of m68k-softmmu/mcf_fec.o dated 2008-11-13 and I'm
not sure it was being rebuilt
2) I deleted that and "make -j4" looked like it finished just fine,
but if you look back up the log, the build of mcf_fec.o did indeed
fail
Haven't investigated any further; but clearly I need to keep a very
close watch on qemu builds :-)
Cheers,
Mark.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-01-08 9:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-07 17:47 [Qemu-devel] [6219] add missing MAC address to info_str for some NICs (Mark McLoughlin) Anthony Liguori
2009-01-07 19:00 ` Stefan Weil
2009-01-07 20:00 ` Anthony Liguori
2009-01-08 9:45 ` Mark McLoughlin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).