Re: [Qemu-devel] null mac address

[Blue Swirl]

On Fri, Feb 25, 2011 at 4:55 AM, Wen Congyang <address@hidden> wrote:
> At 02/24/2011 10:40 PM, William Dauchy Write:
>> Hi,
>>
>> I got some troubles hot plugging network pci devices. An attach works
>> as expected but the mac address is still set to "00:00:00:00:00:00" on
>> the guest machine. I have to reboot the guest to get the correct mac
>> address.
>> I first tried through libvirt with:
>> # virsh attach-interface dom0 network default --mac 52:54:00:f6:84:ba
>>
>> and then through qemu monitor to make sure that it wasn't a libvirt issue:
>> device_add rtl8139
>> or
>> device_add rtl8139,mac=01:02:03:04:05:06
>>
>> Always the same result on the guest. A device info on qemu give the
>> correct result, that is to say, with a correct mac address.
>> I went through rtl8139.c and saw that the mac address is set in 
>> `rtl8139_reset`.
>> This function was called in `pci_rtl8139_init` but removed since
>> c169998802505c244b8bcad562633f29de7d74a4 commit, because it doesn't
>> make sense to call it when the virtual machine is shutdown.
>> I'm now wondering where I am supposed to call this reset function when
>> live attaching a pci device. I think it could fix the mac address
>> issue.
>> I will be very pleased to receive some tips to create a patch for this issue.
>
> Please try the following patch.
>
> Thanks
> Wen Congyang
>
> From efa0632f563a69dc299daaf4b235c1a0521d6e02 Mon Sep 17 00:00:00 2001
> From: Wen Congyang <address@hidden>
> Date: Fri, 25 Feb 2011 09:56:27 +0800
> Subject: [PATCH] move eeprom init from reset function to init function
>
> ---
>  hw/pcnet-pci.c |   12 ++++++++++++
>  hw/pcnet.c     |   13 -------------
>  hw/rtl8139.c   |   24 ++++++++++++------------
>  3 files changed, 24 insertions(+), 25 deletions(-)
>
> diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c
> index 339a401..d7c4fc3 100644
> --- a/hw/pcnet-pci.c
> +++ b/hw/pcnet-pci.c
> @@ -270,6 +270,8 @@ static int pci_pcnet_init(PCIDevice *pci_dev)
>     PCIPCNetState *d = DO_UPCAST(PCIPCNetState, pci_dev, pci_dev);
>     PCNetState *s = &d->state;
>     uint8_t *pci_conf;
> +    int i;
> +    uint16_t checksum;
>
>  #if 0
>     printf("sizeof(RMD)=%d, sizeof(TMD)=%d\n",
> @@ -292,6 +294,16 @@ static int pci_pcnet_init(PCIDevice *pci_dev)
>     pci_conf[PCI_MIN_GNT] = 0x06;
>     pci_conf[PCI_MAX_LAT] = 0xff;
>
> +    /* Initialize the PROM */
> +
> +    memcpy(s->prom, s->conf.macaddr.a, 6);
> +    s->prom[12] = s->prom[13] = 0x00;
> +    s->prom[14] = s->prom[15] = 0x57;
> +
> +    for (i = 0,checksum = 0; i < 16; i++)

Please add braces to fix the CODING_STYLE problem while moving.

> +        checksum += s->prom[i];
> +    *(uint16_t *)&s->prom[12] = cpu_to_le16(checksum);

This is not the right place, since lance.c uses the common part of
pcnet.c. Please put the lines instead to pcnet_common_init().

> +    // PCI vendor and device ID should be mirrored here

Also here it would be nice to convert C99 comments to C89 while moving.