[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/41] virtio: Teach virtio-net about DO_UPCAST
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 04/41] virtio: Teach virtio-net about DO_UPCAST |
Date: |
Wed, 2 Dec 2009 13:04:02 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
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 2f147e5..f518d78 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 *vc)
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)
{
- VirtIONet *n = to_virtio_net(vdev);
+ VirtIONet *n = DO_UPCAST(VirtIONet, vdev, vdev);
uint32_t features = (1 << VIRTIO_NET_F_MAC) |
(1 << VIRTIO_NET_F_MRG_RXBUF) |
(1 << VIRTIO_NET_F_STATUS) |
@@ -197,7 +192,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));
@@ -320,7 +315,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;
@@ -358,7 +353,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->vc);
@@ -662,7 +657,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.5.2
- [Qemu-devel] [PATCH 00/41] virtio: port to vmstate, Juan Quintela, 2009/12/02
- [Qemu-devel] [PATCH 01/41] virtio: Teach virtio-balloon about DO_UPCAST, Juan Quintela, 2009/12/02
- [Qemu-devel] [PATCH 02/41] virtio: Teach virtio-blk about DO_UPCAST, Juan Quintela, 2009/12/02
- [Qemu-devel] [PATCH 03/41] virtio: Teach virtio-console about DO_UPCAST, Juan Quintela, 2009/12/02
- [Qemu-devel] [PATCH 04/41] virtio: Teach virtio-net about DO_UPCAST,
Juan Quintela <=
- [Qemu-devel] [PATCH 05/41] virtio-console: Remove useless casts, Juan Quintela, 2009/12/02
- [Qemu-devel] [PATCH 07/41] virtio-pci: Remove duplicate test, Juan Quintela, 2009/12/02
- [Qemu-devel] [PATCH 06/41] virtio: Use DO_UPCAST instead of a cast, Juan Quintela, 2009/12/02
- [Qemu-devel] Re: [PATCH 06/41] virtio: Use DO_UPCAST instead of a cast, Michael S. Tsirkin, 2009/12/02
- [Qemu-devel] Re: [PATCH 06/41] virtio: Use DO_UPCAST instead of a cast, Juan Quintela, 2009/12/02
- [Qemu-devel] Re: [PATCH 06/41] virtio: Use DO_UPCAST instead of a cast, Michael S. Tsirkin, 2009/12/02
- [Qemu-devel] Re: [PATCH 06/41] virtio: Use DO_UPCAST instead of a cast, Juan Quintela, 2009/12/02
- [Qemu-devel] Re: [PATCH 06/41] virtio: Use DO_UPCAST instead of a cast, Michael S. Tsirkin, 2009/12/02
- [Qemu-devel] Re: [PATCH 06/41] virtio: Use DO_UPCAST instead of a cast, Juan Quintela, 2009/12/02
- [Qemu-devel] Re: [PATCH 06/41] virtio: Use DO_UPCAST instead of a cast, Michael S. Tsirkin, 2009/12/03