Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding breaktrace & disabling timer migration"
[kvmfornfv.git]
/
qemu
/
hw
/
net
/
xen_nic.c
diff --git
a/qemu/hw/net/xen_nic.c
b/qemu/hw/net/xen_nic.c
index
d7cbfc1
..
7281730
100644
(file)
--- a/
qemu/hw/net/xen_nic.c
+++ b/
qemu/hw/net/xen_nic.c
@@
-19,19
+19,9
@@
* GNU GPL, version 2 or (at your option) any later version.
*/
* GNU GPL, version 2 or (at your option) any later version.
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <signal.h>
-#include <inttypes.h>
-#include <fcntl.h>
-#include <errno.h>
+#include "qemu/osdep.h"
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
#include <sys/mman.h>
#include <sys/wait.h>
#include <sys/mman.h>
#include <sys/wait.h>
@@
-169,7
+159,7
@@
static void net_tx_packets(struct XenNetDev *netdev)
(txreq.flags & NETTXF_more_data) ? " more_data" : "",
(txreq.flags & NETTXF_extra_info) ? " extra_info" : "");
(txreq.flags & NETTXF_more_data) ? " more_data" : "",
(txreq.flags & NETTXF_extra_info) ? " extra_info" : "");
- page = x
c_
gnttab_map_grant_ref(netdev->xendev.gnttabdev,
+ page = x
en
gnttab_map_grant_ref(netdev->xendev.gnttabdev,
netdev->xendev.dom,
txreq.gref, PROT_READ);
if (page == NULL) {
netdev->xendev.dom,
txreq.gref, PROT_READ);
if (page == NULL) {
@@
-191,7
+181,7
@@
static void net_tx_packets(struct XenNetDev *netdev)
qemu_send_packet(qemu_get_queue(netdev->nic),
page + txreq.offset, txreq.size);
}
qemu_send_packet(qemu_get_queue(netdev->nic),
page + txreq.offset, txreq.size);
}
- x
c_gnttab_m
unmap(netdev->xendev.gnttabdev, page, 1);
+ x
engnttab_
unmap(netdev->xendev.gnttabdev, page, 1);
net_tx_response(netdev, &txreq, NETIF_RSP_OKAY);
}
if (!netdev->tx_work) {
net_tx_response(netdev, &txreq, NETIF_RSP_OKAY);
}
if (!netdev->tx_work) {
@@
-261,7
+251,7
@@
static ssize_t net_rx_packet(NetClientState *nc, const uint8_t *buf, size_t size
memcpy(&rxreq, RING_GET_REQUEST(&netdev->rx_ring, rc), sizeof(rxreq));
netdev->rx_ring.req_cons = ++rc;
memcpy(&rxreq, RING_GET_REQUEST(&netdev->rx_ring, rc), sizeof(rxreq));
netdev->rx_ring.req_cons = ++rc;
- page = x
c_
gnttab_map_grant_ref(netdev->xendev.gnttabdev,
+ page = x
en
gnttab_map_grant_ref(netdev->xendev.gnttabdev,
netdev->xendev.dom,
rxreq.gref, PROT_WRITE);
if (page == NULL) {
netdev->xendev.dom,
rxreq.gref, PROT_WRITE);
if (page == NULL) {
@@
-271,7
+261,7
@@
static ssize_t net_rx_packet(NetClientState *nc, const uint8_t *buf, size_t size
return -1;
}
memcpy(page + NET_IP_ALIGN, buf, size);
return -1;
}
memcpy(page + NET_IP_ALIGN, buf, size);
- x
c_gnttab_m
unmap(netdev->xendev.gnttabdev, page, 1);
+ x
engnttab_
unmap(netdev->xendev.gnttabdev, page, 1);
net_rx_response(netdev, &rxreq, NETIF_RSP_OKAY, NET_IP_ALIGN, size, 0);
return size;
net_rx_response(netdev, &rxreq, NETIF_RSP_OKAY, NET_IP_ALIGN, size, 0);
return size;
@@
-343,19
+333,19
@@
static int net_connect(struct XenDevice *xendev)
return -1;
}
return -1;
}
- netdev->txs = x
c_
gnttab_map_grant_ref(netdev->xendev.gnttabdev,
+ netdev->txs = x
en
gnttab_map_grant_ref(netdev->xendev.gnttabdev,
netdev->xendev.dom,
netdev->tx_ring_ref,
PROT_READ | PROT_WRITE);
if (!netdev->txs) {
return -1;
}
netdev->xendev.dom,
netdev->tx_ring_ref,
PROT_READ | PROT_WRITE);
if (!netdev->txs) {
return -1;
}
- netdev->rxs = x
c_
gnttab_map_grant_ref(netdev->xendev.gnttabdev,
+ netdev->rxs = x
en
gnttab_map_grant_ref(netdev->xendev.gnttabdev,
netdev->xendev.dom,
netdev->rx_ring_ref,
PROT_READ | PROT_WRITE);
if (!netdev->rxs) {
netdev->xendev.dom,
netdev->rx_ring_ref,
PROT_READ | PROT_WRITE);
if (!netdev->rxs) {
- x
c_gnttab_m
unmap(netdev->xendev.gnttabdev, netdev->txs, 1);
+ x
engnttab_
unmap(netdev->xendev.gnttabdev, netdev->txs, 1);
netdev->txs = NULL;
return -1;
}
netdev->txs = NULL;
return -1;
}
@@
-380,11
+370,11
@@
static void net_disconnect(struct XenDevice *xendev)
xen_be_unbind_evtchn(&netdev->xendev);
if (netdev->txs) {
xen_be_unbind_evtchn(&netdev->xendev);
if (netdev->txs) {
- x
c_gnttab_m
unmap(netdev->xendev.gnttabdev, netdev->txs, 1);
+ x
engnttab_
unmap(netdev->xendev.gnttabdev, netdev->txs, 1);
netdev->txs = NULL;
}
if (netdev->rxs) {
netdev->txs = NULL;
}
if (netdev->rxs) {
- x
c_gnttab_m
unmap(netdev->xendev.gnttabdev, netdev->rxs, 1);
+ x
engnttab_
unmap(netdev->xendev.gnttabdev, netdev->rxs, 1);
netdev->rxs = NULL;
}
}
netdev->rxs = NULL;
}
}