From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LMqkC-0000gE-T6 for qemu-devel@nongnu.org; Tue, 13 Jan 2009 16:24:16 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LMqkB-0000dt-3f for qemu-devel@nongnu.org; Tue, 13 Jan 2009 16:24:16 -0500 Received: from [199.232.76.173] (port=47232 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LMqkA-0000dY-Av for qemu-devel@nongnu.org; Tue, 13 Jan 2009 16:24:14 -0500 Received: from g5t0008.atlanta.hp.com ([15.192.0.45]:26447) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LMqk9-0000w2-Un for qemu-devel@nongnu.org; Tue, 13 Jan 2009 16:24:14 -0500 From: Alex Williamson Content-Type: text/plain Date: Tue, 13 Jan 2009 14:23:49 -0700 Message-Id: <1231881829.9095.191.camel@bling> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 1/5] 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 Cc: Mark McLoughlin , qemu-devel Rename get_config for simplicity Signed-off-by: Alex Williamson --- qemu/hw/virtio-net.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/qemu/hw/virtio-net.c b/qemu/hw/virtio-net.c index 1f9dc16..e9b3d46 100644 --- a/qemu/hw/virtio-net.c +++ b/qemu/hw/virtio-net.c @@ -42,7 +42,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; @@ -51,6 +51,19 @@ 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); + qemu_format_nic_info_str(n->vc, n->mac); + } +} + static uint32_t virtio_net_get_features(VirtIODevice *vdev) { uint32_t features = (1 << VIRTIO_NET_F_MAC); @@ -405,7 +418,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);