From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LUR0j-0002BX-AX for qemu-devel@nongnu.org; Tue, 03 Feb 2009 14:32:41 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LUR0i-0002B2-At for qemu-devel@nongnu.org; Tue, 03 Feb 2009 14:32:40 -0500 Received: from [199.232.76.173] (port=57498 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LUR0i-0002Aw-5V for qemu-devel@nongnu.org; Tue, 03 Feb 2009 14:32:40 -0500 Received: from g1t0029.austin.hp.com ([15.216.28.36]:33292) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LUR0h-0004DN-Nd for qemu-devel@nongnu.org; Tue, 03 Feb 2009 14:32:39 -0500 From: Alex Williamson Date: Tue, 03 Feb 2009 12:29:48 -0700 Message-ID: <20090203192948.19598.42228.stgit@kvm.aw> In-Reply-To: <20090203192932.19598.50925.stgit@kvm.aw> References: <20090203192932.19598.50925.stgit@kvm.aw> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v2 3/8] qemu:virtio-net: Define ETH_ALEN for use when manipulating MAC addresses Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws, qemu-devel@nongnu.org Cc: markmc@redhat.com, kvm@vger.kernel.org Makes it much easier to search too. Signed-off-by: Alex Williamson Acked-by: Mark McLoughlin --- hw/virtio-net.c | 14 +++++++------- hw/virtio-net.h | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 105daa9..073f23a 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -21,7 +21,7 @@ typedef struct VirtIONet { VirtIODevice vdev; - uint8_t mac[6]; + uint8_t mac[ETH_ALEN]; uint16_t status; VirtQueue *rx_vq; VirtQueue *tx_vq; @@ -46,7 +46,7 @@ static void virtio_net_get_config(VirtIODevice *vdev, uint8_t *config) struct virtio_net_config netcfg; netcfg.status = n->status; - memcpy(netcfg.mac, n->mac, 6); + memcpy(netcfg.mac, n->mac, ETH_ALEN); memcpy(config, &netcfg, sizeof(netcfg)); } @@ -57,8 +57,8 @@ static void virtio_net_set_config(VirtIODevice *vdev, const uint8_t *config) memcpy(&netcfg, config, sizeof(netcfg)); - if (memcmp(netcfg.mac, n->mac, 6)) { - memcpy(n->mac, netcfg.mac, 6); + if (memcmp(netcfg.mac, n->mac, ETH_ALEN)) { + memcpy(n->mac, netcfg.mac, ETH_ALEN); qemu_format_nic_info_str(n->vc, n->mac); } } @@ -304,7 +304,7 @@ static void virtio_net_save(QEMUFile *f, void *opaque) virtio_save(&n->vdev, f); - qemu_put_buffer(f, n->mac, 6); + qemu_put_buffer(f, n->mac, ETH_ALEN); qemu_put_be32(f, n->tx_timer_active); qemu_put_be32(f, n->mergeable_rx_bufs); qemu_put_be16(f, n->status); @@ -319,7 +319,7 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id) virtio_load(&n->vdev, f); - qemu_get_buffer(f, n->mac, 6); + qemu_get_buffer(f, n->mac, ETH_ALEN); n->tx_timer_active = qemu_get_be32(f); n->mergeable_rx_bufs = qemu_get_be32(f); @@ -356,7 +356,7 @@ void virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn) n->vdev.set_features = virtio_net_set_features; n->rx_vq = virtio_add_queue(&n->vdev, 256, virtio_net_handle_rx); n->tx_vq = virtio_add_queue(&n->vdev, 256, virtio_net_handle_tx); - memcpy(n->mac, nd->macaddr, 6); + memcpy(n->mac, nd->macaddr, ETH_ALEN); n->status = VIRTIO_NET_S_LINK_UP; n->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, virtio_net_receive, virtio_net_can_receive, n); diff --git a/hw/virtio-net.h b/hw/virtio-net.h index 148ec47..9dce663 100644 --- a/hw/virtio-net.h +++ b/hw/virtio-net.h @@ -18,6 +18,8 @@ #include "net.h" #include "pci.h" +#define ETH_ALEN 6 + /* from Linux's virtio_net.h */ /* The ID for virtio_net */