From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NsAEL-0005QS-4A for qemu-devel@nongnu.org; Thu, 18 Mar 2010 03:33:21 -0400 Received: from [199.232.76.173] (port=58308 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NsAEI-0005Q5-5b for qemu-devel@nongnu.org; Thu, 18 Mar 2010 03:33:18 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NsAEG-00056H-QF for qemu-devel@nongnu.org; Thu, 18 Mar 2010 03:33:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1030) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NsAEG-00056D-D9 for qemu-devel@nongnu.org; Thu, 18 Mar 2010 03:33:16 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2I7XF9n021544 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 18 Mar 2010 03:33:15 -0400 Date: Thu, 18 Mar 2010 09:29:50 +0200 From: "Michael S. Tsirkin" Message-ID: <20100318072950.GF16973@redhat.com> References: <3514a89848cd2a07ac988d819210c245ddea1094.1268765204.git.quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <3514a89848cd2a07ac988d819210c245ddea1094.1268765204.git.quintela@redhat.com> Subject: [Qemu-devel] Re: [PATCH 4/9] virtio: Teach virtio-net about DO_UPCAST List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org On Tue, Mar 16, 2010 at 07:51:20PM +0100, Juan Quintela wrote: > Signed-off-by: Juan Quintela Sent a replacement patch for this. > --- > hw/virtio-net.c | 21 ++++++++------------- > 1 files changed, 8 insertions(+), 13 deletions(-) > > diff --git a/hw/virtio-net.c b/hw/virtio-net.c > index 5c0093e..c0537c8 100644 > --- a/hw/virtio-net.c > +++ b/hw/virtio-net.c > @@ -61,14 +61,9 @@ typedef struct VirtIONet > * - we could suppress RX interrupt if we were so inclined. > */ > > -static VirtIONet *to_virtio_net(VirtIODevice *vdev) > -{ > - return (VirtIONet *)vdev; > -} > - > static void virtio_net_get_config(VirtIODevice *vdev, uint8_t *config) > { > - VirtIONet *n = to_virtio_net(vdev); > + VirtIONet *n = DO_UPCAST(VirtIONet, vdev, vdev); > struct virtio_net_config netcfg; > > netcfg.status = n->status; > @@ -78,7 +73,7 @@ static void virtio_net_get_config(VirtIODevice *vdev, uint8_t *config) > > static void virtio_net_set_config(VirtIODevice *vdev, const uint8_t *config) > { > - VirtIONet *n = to_virtio_net(vdev); > + VirtIONet *n = DO_UPCAST(VirtIONet, vdev, vdev); > struct virtio_net_config netcfg; > > memcpy(&netcfg, config, sizeof(netcfg)); > @@ -105,7 +100,7 @@ static void virtio_net_set_link_status(VLANClientState *nc) > > static void virtio_net_reset(VirtIODevice *vdev) > { > - VirtIONet *n = to_virtio_net(vdev); > + VirtIONet *n = DO_UPCAST(VirtIONet, vdev, vdev); > > /* Reset back to compatibility mode */ > n->promisc = 1; > @@ -149,7 +144,7 @@ static int peer_has_ufo(VirtIONet *n) > > static uint32_t virtio_net_get_features(VirtIODevice *vdev, uint32_t features) > { > - VirtIONet *n = to_virtio_net(vdev); > + VirtIONet *n = DO_UPCAST(VirtIONet, vdev, vdev); > > features |= (1 << VIRTIO_NET_F_MAC); > > @@ -192,7 +187,7 @@ static uint32_t virtio_net_bad_features(VirtIODevice *vdev) > > static void virtio_net_set_features(VirtIODevice *vdev, uint32_t features) > { > - VirtIONet *n = to_virtio_net(vdev); > + VirtIONet *n = DO_UPCAST(VirtIONet, vdev, vdev); > > n->mergeable_rx_bufs = !!(features & (1 << VIRTIO_NET_F_MRG_RXBUF)); > > @@ -315,7 +310,7 @@ static int virtio_net_handle_vlan_table(VirtIONet *n, uint8_t cmd, > > static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) > { > - VirtIONet *n = to_virtio_net(vdev); > + VirtIONet *n = DO_UPCAST(VirtIONet, vdev, vdev); > struct virtio_net_ctrl_hdr ctrl; > virtio_net_ctrl_ack status = VIRTIO_NET_ERR; > VirtQueueElement elem; > @@ -353,7 +348,7 @@ static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) > > static void virtio_net_handle_rx(VirtIODevice *vdev, VirtQueue *vq) > { > - VirtIONet *n = to_virtio_net(vdev); > + VirtIONet *n = DO_UPCAST(VirtIONet, vdev, vdev); > > qemu_flush_queued_packets(&n->nic->nc); > > @@ -665,7 +660,7 @@ static void virtio_net_flush_tx(VirtIONet *n, VirtQueue *vq) > > static void virtio_net_handle_tx(VirtIODevice *vdev, VirtQueue *vq) > { > - VirtIONet *n = to_virtio_net(vdev); > + VirtIONet *n = DO_UPCAST(VirtIONet, vdev, vdev); > > if (n->tx_timer_active) { > virtio_queue_set_notification(vq, 1); > -- > 1.6.6.1 > >