diff --git a/include/net/net.h b/include/net/net.h

index XXXXXXX..XXXXXXX 100644

--- a/include/net/net.h

+++ b/include/net/net.h

@@ -XXX,XX +XXX,XX @@ void *qemu_get_nic_opaque(NetClientState *nc);

void qemu_del_net_client(NetClientState *nc);

typedef void (*qemu_nic_foreach)(NICState *nic, void *opaque);

void qemu_foreach_nic(qemu_nic_foreach func, void *opaque);

+int qemu_can_receive_packet(NetClientState *nc);

int qemu_can_send_packet(NetClientState *nc);

ssize_t qemu_sendv_packet(NetClientState *nc, const struct iovec *iov,

int iovcnt);

ssize_t qemu_sendv_packet_async(NetClientState *nc, const struct iovec *iov,

int iovcnt, NetPacketSent *sent_cb);

ssize_t qemu_send_packet(NetClientState *nc, const uint8_t *buf, int size);

+ssize_t qemu_receive_packet(NetClientState *nc, const uint8_t *buf, int size);

+ssize_t qemu_receive_packet_iov(NetClientState *nc,

+ const struct iovec *iov,

+ int iovcnt);

ssize_t qemu_send_packet_raw(NetClientState *nc, const uint8_t *buf, int size);

ssize_t qemu_send_packet_async(NetClientState *nc, const uint8_t *buf,

int size, NetPacketSent *sent_cb);

diff --git a/include/net/queue.h b/include/net/queue.h

index XXXXXXX..XXXXXXX 100644

--- a/include/net/queue.h

+++ b/include/net/queue.h

@@ -XXX,XX +XXX,XX @@ void qemu_net_queue_append_iov(NetQueue *queue,

void qemu_del_net_queue(NetQueue *queue);

+ssize_t qemu_net_queue_receive(NetQueue *queue,

+ const uint8_t *data,

+ size_t size);

+

+ssize_t qemu_net_queue_receive_iov(NetQueue *queue,

+ const struct iovec *iov,

+ int iovcnt);

+

ssize_t qemu_net_queue_send(NetQueue *queue,

NetClientState *sender,

unsigned flags,

-static int init_dev_ring(PvrdmaRing *ring, struct pvrdma_ring **ring_state,

+static int init_dev_ring(PvrdmaRing *ring, PvrdmaRingState **ring_state,

const char *name, PCIDevice *pci_dev,

dma_addr_t dir_addr, uint32_t num_pages)

{

@@ -XXX,XX +XXX,XX @@ static int init_dev_ring(PvrdmaRing *ring, struct pvrdma_ring **ring_state,

/* RX ring is the second */

(*ring_state)++;

rc = pvrdma_ring_init(ring, name, pci_dev,

- (struct pvrdma_ring *)*ring_state,

+ (PvrdmaRingState *)*ring_state,

(num_pages - 1) * TARGET_PAGE_SIZE /

sizeof(struct pvrdma_cqne),

sizeof(struct pvrdma_cqne),

diff --git a/include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h b/include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h

deleted file mode 100644

index XXXXXXX..XXXXXXX

--- a/include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h

+++ /dev/null

@@ -XXX,XX +XXX,XX @@

-/*

- * Copyright (c) 2012-2016 VMware, Inc. All rights reserved.

- *

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of EITHER the GNU General Public License

- * version 2 as published by the Free Software Foundation or the BSD

- * 2-Clause License. This program is distributed in the hope that it

- * will be useful, but WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED

- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.

- * See the GNU General Public License version 2 for more details at

- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program available in the file COPYING in the main

- * directory of this source tree.

- *

- * The BSD 2-Clause License

- *

- * Redistribution and use in source and binary forms, with or

- * without modification, are permitted provided that the following

- * conditions are met:

- *

- * - Redistributions of source code must retain the above

- * copyright notice, this list of conditions and the following

- * disclaimer.

- *

- * - Redistributions in binary form must reproduce the above

- * copyright notice, this list of conditions and the following

- * disclaimer in the documentation and/or other materials

- * provided with the distribution.

- *

- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS

- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE

- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,

- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR

- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

- * OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-#ifndef __PVRDMA_RING_H__

-#define __PVRDMA_RING_H__

-

-#include "standard-headers/linux/types.h"

-

-#define PVRDMA_INVALID_IDX    -1    /* Invalid index. */

-

-struct pvrdma_ring {

-    int prod_tail;    /* Producer tail. */

-    int cons_head;    /* Consumer head. */

-};

-

-struct pvrdma_ring_state {

-    struct pvrdma_ring tx;    /* Tx ring. */

-    struct pvrdma_ring rx;    /* Rx ring. */

-};

-

-static inline int pvrdma_idx_valid(uint32_t idx, uint32_t max_elems)

-{

-    /* Generates fewer instructions than a less-than. */

-    return (idx & ~((max_elems << 1) - 1)) == 0;

-}

-

-static inline int32_t pvrdma_idx(int *var, uint32_t max_elems)

-{

-    const unsigned int idx = qatomic_read(var);

-

-    if (pvrdma_idx_valid(idx, max_elems))

-        return idx & (max_elems - 1);

-    return PVRDMA_INVALID_IDX;

-}

-

-static inline void pvrdma_idx_ring_inc(int *var, uint32_t max_elems)

-{

-    uint32_t idx = qatomic_read(var) + 1;    /* Increment. */

-

-    idx &= (max_elems << 1) - 1;        /* Modulo size, flip gen. */

-    qatomic_set(var, idx);

-}

-

-static inline int32_t pvrdma_idx_ring_has_space(const struct pvrdma_ring *r,

-                     uint32_t max_elems, uint32_t *out_tail)

-{

-    const uint32_t tail = qatomic_read(&r->prod_tail);

-    const uint32_t head = qatomic_read(&r->cons_head);

-

-    if (pvrdma_idx_valid(tail, max_elems) &&

-     pvrdma_idx_valid(head, max_elems)) {

-        *out_tail = tail & (max_elems - 1);

-        return tail != (head ^ max_elems);

-    }

-    return PVRDMA_INVALID_IDX;

-}

-

-static inline int32_t pvrdma_idx_ring_has_data(const struct pvrdma_ring *r,

-                     uint32_t max_elems, uint32_t *out_head)

-{

-    const uint32_t tail = qatomic_read(&r->prod_tail);

-    const uint32_t head = qatomic_read(&r->cons_head);

-

-    if (pvrdma_idx_valid(tail, max_elems) &&

-     pvrdma_idx_valid(head, max_elems)) {

-        *out_head = head & (max_elems - 1);

-        return tail != head;

-    }

-    return PVRDMA_INVALID_IDX;

-}

-

-#endif /* __PVRDMA_RING_H__ */

diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh

index XXXXXXX..XXXXXXX 100755

--- a/scripts/update-linux-headers.sh

+++ b/scripts/update-linux-headers.sh

@@ -XXX,XX +XXX,XX @@ sed -e '1h;2,$H;$!d;g' -e 's/[^};]*pvrdma[^(| ]*([^)]*);//g' \

"$linux/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h" > \

"$tmp_pvrdma_verbs";

-for i in "$linux/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h" \

- "$linux/drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h" \

+for i in "$linux/drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h" \

"$tmp_pvrdma_verbs"; do \

cp_portable "$i" \

"$output/include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/"