| Message ID | 20240929160045.2133423-3-lulu@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | virtio_net: Add the check for vdpa's mac address | expand |
On Mon, Sep 30, 2024 at 12:01 AM Cindy Lu <lulu@redhat.com> wrote: > > When using a VDPA device, the following situations are > also acceptable: the hardware MAC address is not 0, > and the MAC address in the QEMU command line is 0. > > Signed-off-by: Cindy Lu <lulu@redhat.com> > --- > hw/net/virtio-net.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c > index 7aa7308244..5c610d8078 100644 > --- a/hw/net/virtio-net.c > +++ b/hw/net/virtio-net.c > @@ -3607,6 +3607,18 @@ static bool virtio_net_check_vdpa_mac(NetClientState *nc, VirtIONet *n, > if ((memcmp(&hwcfg.mac, cmdline_mac, sizeof(MACAddr)) == 0)) { > return true; > } > + /* > + * 2.The hardware MAC address is not 0, > + * and the MAC address in the QEMU command line is 0. > + * In this situation, the hardware MAC address will overwrite > + * the QEMU command line address. Please explain how such overwrite works. For example, "Function X and Y will let the hardware mac address overwrite the cli mac" Thanks > + */ > + if (memcmp(cmdline_mac, &zero, sizeof(MACAddr)) == 0) { > + /* overwrite the mac address with hardware address*/ > + memcpy(&n->mac[0], &hwcfg.mac, sizeof(n->mac)); > + memcpy(&n->nic_conf.macaddr, &hwcfg.mac, sizeof(n->mac)); > + return true; > + } > } > > error_setg(errp, > -- > 2.45.0 >
On Wed, 9 Oct 2024 at 16:30, Jason Wang <jasowang@redhat.com> wrote: > > On Mon, Sep 30, 2024 at 12:01 AM Cindy Lu <lulu@redhat.com> wrote: > > > > When using a VDPA device, the following situations are > > also acceptable: the hardware MAC address is not 0, > > and the MAC address in the QEMU command line is 0. > > > > Signed-off-by: Cindy Lu <lulu@redhat.com> > > --- > > hw/net/virtio-net.c | 12 ++++++++++++ > > 1 file changed, 12 insertions(+) > > > > diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c > > index 7aa7308244..5c610d8078 100644 > > --- a/hw/net/virtio-net.c > > +++ b/hw/net/virtio-net.c > > @@ -3607,6 +3607,18 @@ static bool virtio_net_check_vdpa_mac(NetClientState *nc, VirtIONet *n, > > if ((memcmp(&hwcfg.mac, cmdline_mac, sizeof(MACAddr)) == 0)) { > > return true; > > } > > + /* > > + * 2.The hardware MAC address is not 0, > > + * and the MAC address in the QEMU command line is 0. > > + * In this situation, the hardware MAC address will overwrite > > + * the QEMU command line address. > > Please explain how such overwrite works. For example, "Function X and > Y will let the hardware mac address overwrite the cli mac" > sure, will add these thanks cindy > Thanks > > > + */ > > + if (memcmp(cmdline_mac, &zero, sizeof(MACAddr)) == 0) { > > + /* overwrite the mac address with hardware address*/ > > + memcpy(&n->mac[0], &hwcfg.mac, sizeof(n->mac)); > > + memcpy(&n->nic_conf.macaddr, &hwcfg.mac, sizeof(n->mac)); > > + return true; > > + } > > } > > > > error_setg(errp, > > -- > > 2.45.0 > > >
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 7aa7308244..5c610d8078 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3607,6 +3607,18 @@ static bool virtio_net_check_vdpa_mac(NetClientState *nc, VirtIONet *n, if ((memcmp(&hwcfg.mac, cmdline_mac, sizeof(MACAddr)) == 0)) { return true; } + /* + * 2.The hardware MAC address is not 0, + * and the MAC address in the QEMU command line is 0. + * In this situation, the hardware MAC address will overwrite + * the QEMU command line address. + */ + if (memcmp(cmdline_mac, &zero, sizeof(MACAddr)) == 0) { + /* overwrite the mac address with hardware address*/ + memcpy(&n->mac[0], &hwcfg.mac, sizeof(n->mac)); + memcpy(&n->nic_conf.macaddr, &hwcfg.mac, sizeof(n->mac)); + return true; + } } error_setg(errp,
When using a VDPA device, the following situations are also acceptable: the hardware MAC address is not 0, and the MAC address in the QEMU command line is 0. Signed-off-by: Cindy Lu <lulu@redhat.com> --- hw/net/virtio-net.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)