From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LKcLA-0002Hr-FJ for qemu-devel@nongnu.org; Wed, 07 Jan 2009 12:37:12 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LKcL8-0002G2-7t for qemu-devel@nongnu.org; Wed, 07 Jan 2009 12:37:11 -0500 Received: from [199.232.76.173] (port=33240 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LKcL7-0002Fr-Ei for qemu-devel@nongnu.org; Wed, 07 Jan 2009 12:37:09 -0500 Received: from g4t0014.houston.hp.com ([15.201.24.17]:6228) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LKcL6-0004Ux-Vs for qemu-devel@nongnu.org; Wed, 07 Jan 2009 12:37:09 -0500 From: Alex Williamson Content-Type: text/plain Date: Wed, 07 Jan 2009 10:37:36 -0700 Message-Id: <1231349856.7109.80.camel@lappy> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 1/5][RFC] virtio-net: Allow setting the MAC address via set_config Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm , qemu-devel Cc: Mark McLoughlin virtio-net: Allow setting the MAC address via set_config Rename get_config for simplicity Signed-off-by: Alex Williamson --- hw/virtio-net.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 2c41b3e..bfb7510 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -38,7 +38,7 @@ static VirtIONet *to_virtio_net(VirtIODevice *vdev) return (VirtIONet *)vdev; } -static void virtio_net_update_config(VirtIODevice *vdev, uint8_t *config) +static void virtio_net_get_config(VirtIODevice *vdev, uint8_t *config) { VirtIONet *n = to_virtio_net(vdev); struct virtio_net_config netcfg; @@ -48,6 +48,22 @@ static void virtio_net_update_config(VirtIODevice *vdev, uint8_t *config) memcpy(config, &netcfg, sizeof(netcfg)); } +static void virtio_net_set_config(VirtIODevice *vdev, const uint8_t *config) +{ + VirtIONet *n = to_virtio_net(vdev); + struct virtio_net_config netcfg; + + memcpy(&netcfg, config, sizeof(netcfg)); + + if (memcmp(netcfg.mac, n->mac, 6)) { + memcpy(n->mac, netcfg.mac, 6); + snprintf(n->vc->info_str, sizeof(n->vc->info_str), + "virtio macaddr=%02x:%02x:%02x:%02x:%02x:%02x", + n->mac[0], n->mac[1], n->mac[2], + n->mac[3], n->mac[4], n->mac[5]); + } +} + static void virtio_net_set_link_status(VLANClientState *vc) { VirtIONet *n = vc->opaque; @@ -326,7 +342,8 @@ PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn) if (!n) return NULL; - n->vdev.get_config = virtio_net_update_config; + n->vdev.get_config = virtio_net_get_config; + n->vdev.set_config = virtio_net_set_config; n->vdev.get_features = virtio_net_get_features; n->vdev.set_features = virtio_net_set_features; n->rx_vq = virtio_add_queue(&n->vdev, 256, virtio_net_handle_rx);