mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 15:23:53 -06:00
xen: Rename xen_be_printf to xen_pv_printf
Prepare xen_be_printf to be used by both backend and frontends: * xen_be_printf -> xen_pv_printf Signed-off-by: Emil Condrea <emilcondrea@gmail.com> Signed-off-by: Stefano Stabellini <sstabellini@kernel.org> Signed-off-by: Quan Xu <xuquan8@huawei.com> Acked-by: Anthony PERARD <anthony.perard@citrix.com>
This commit is contained in:
parent
ecf7981891
commit
96c77dba6f
10 changed files with 117 additions and 117 deletions
|
@ -128,31 +128,31 @@ static void net_tx_packets(struct XenNetDev *netdev)
|
|||
/* should not happen in theory, we don't announce the *
|
||||
* feature-{sg,gso,whatelse} flags in xenstore (yet?) */
|
||||
if (txreq.flags & NETTXF_extra_info) {
|
||||
xen_be_printf(&netdev->xendev, 0, "FIXME: extra info flag\n");
|
||||
xen_pv_printf(&netdev->xendev, 0, "FIXME: extra info flag\n");
|
||||
net_tx_error(netdev, &txreq, rc);
|
||||
continue;
|
||||
}
|
||||
if (txreq.flags & NETTXF_more_data) {
|
||||
xen_be_printf(&netdev->xendev, 0, "FIXME: more data flag\n");
|
||||
xen_pv_printf(&netdev->xendev, 0, "FIXME: more data flag\n");
|
||||
net_tx_error(netdev, &txreq, rc);
|
||||
continue;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (txreq.size < 14) {
|
||||
xen_be_printf(&netdev->xendev, 0, "bad packet size: %d\n",
|
||||
xen_pv_printf(&netdev->xendev, 0, "bad packet size: %d\n",
|
||||
txreq.size);
|
||||
net_tx_error(netdev, &txreq, rc);
|
||||
continue;
|
||||
}
|
||||
|
||||
if ((txreq.offset + txreq.size) > XC_PAGE_SIZE) {
|
||||
xen_be_printf(&netdev->xendev, 0, "error: page crossing\n");
|
||||
xen_pv_printf(&netdev->xendev, 0, "error: page crossing\n");
|
||||
net_tx_error(netdev, &txreq, rc);
|
||||
continue;
|
||||
}
|
||||
|
||||
xen_be_printf(&netdev->xendev, 3,
|
||||
xen_pv_printf(&netdev->xendev, 3,
|
||||
"tx packet ref %d, off %d, len %d, flags 0x%x%s%s%s%s\n",
|
||||
txreq.gref, txreq.offset, txreq.size, txreq.flags,
|
||||
(txreq.flags & NETTXF_csum_blank) ? " csum_blank" : "",
|
||||
|
@ -164,7 +164,7 @@ static void net_tx_packets(struct XenNetDev *netdev)
|
|||
netdev->xendev.dom,
|
||||
txreq.gref, PROT_READ);
|
||||
if (page == NULL) {
|
||||
xen_be_printf(&netdev->xendev, 0,
|
||||
xen_pv_printf(&netdev->xendev, 0,
|
||||
"error: tx gref dereference failed (%d)\n",
|
||||
txreq.gref);
|
||||
net_tx_error(netdev, &txreq, rc);
|
||||
|
@ -214,7 +214,7 @@ static void net_rx_response(struct XenNetDev *netdev,
|
|||
resp->status = (int16_t)st;
|
||||
}
|
||||
|
||||
xen_be_printf(&netdev->xendev, 3,
|
||||
xen_pv_printf(&netdev->xendev, 3,
|
||||
"rx response: idx %d, status %d, flags 0x%x\n",
|
||||
i, resp->status, resp->flags);
|
||||
|
||||
|
@ -246,7 +246,7 @@ static ssize_t net_rx_packet(NetClientState *nc, const uint8_t *buf, size_t size
|
|||
return 0;
|
||||
}
|
||||
if (size > XC_PAGE_SIZE - NET_IP_ALIGN) {
|
||||
xen_be_printf(&netdev->xendev, 0, "packet too big (%lu > %ld)",
|
||||
xen_pv_printf(&netdev->xendev, 0, "packet too big (%lu > %ld)",
|
||||
(unsigned long)size, XC_PAGE_SIZE - NET_IP_ALIGN);
|
||||
return -1;
|
||||
}
|
||||
|
@ -258,7 +258,7 @@ static ssize_t net_rx_packet(NetClientState *nc, const uint8_t *buf, size_t size
|
|||
netdev->xendev.dom,
|
||||
rxreq.gref, PROT_WRITE);
|
||||
if (page == NULL) {
|
||||
xen_be_printf(&netdev->xendev, 0,
|
||||
xen_pv_printf(&netdev->xendev, 0,
|
||||
"error: rx gref dereference failed (%d)\n",
|
||||
rxreq.gref);
|
||||
net_rx_response(netdev, &rxreq, NETIF_RSP_ERROR, 0, 0, 0);
|
||||
|
@ -333,7 +333,7 @@ static int net_connect(struct XenDevice *xendev)
|
|||
rx_copy = 0;
|
||||
}
|
||||
if (rx_copy == 0) {
|
||||
xen_be_printf(&netdev->xendev, 0,
|
||||
xen_pv_printf(&netdev->xendev, 0,
|
||||
"frontend doesn't support rx-copy.\n");
|
||||
return -1;
|
||||
}
|
||||
|
@ -359,7 +359,7 @@ static int net_connect(struct XenDevice *xendev)
|
|||
|
||||
xen_be_bind_evtchn(&netdev->xendev);
|
||||
|
||||
xen_be_printf(&netdev->xendev, 1, "ok: tx-ring-ref %d, rx-ring-ref %d, "
|
||||
xen_pv_printf(&netdev->xendev, 1, "ok: tx-ring-ref %d, rx-ring-ref %d, "
|
||||
"remote port %d, local port %d\n",
|
||||
netdev->tx_ring_ref, netdev->rx_ring_ref,
|
||||
netdev->xendev.remote_port, netdev->xendev.local_port);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue