Page MenuHomeFreeBSD
Files F152069275

D22552.id64868.diff
No OneTemporary
Actions

D22552.id64868.diff
View Options

Index: usr.sbin/bhyve/net_backends.c
===================================================================
--- usr.sbin/bhyve/net_backends.c
+++ usr.sbin/bhyve/net_backends.c
@@ -192,7 +192,7 @@
#endif
if (cb == NULL) {
- WPRINTF(("TAP backend requires non-NULL callback\n"));
+ WPRINTF(("TAP backend requires non-NULL callback\n\r"));
return (-1);
}
@@ -201,7 +201,7 @@
be->fd = open(tbuf, O_RDWR);
if (be->fd == -1) {
- WPRINTF(("open of tap device %s failed\n", tbuf));
+ WPRINTF(("open of tap device %s failed\n\r", tbuf));
goto error;
}
@@ -210,7 +210,7 @@
* notifications with the event loop
*/
if (ioctl(be->fd, FIONBIO, &opt) < 0) {
- WPRINTF(("tap device O_NONBLOCK failed\n"));
+ WPRINTF(("tap device O_NONBLOCK failed\n\r"));
goto error;
}
@@ -222,7 +222,7 @@
priv->mevp = mevent_add_disabled(be->fd, EVF_READ, cb, param);
if (priv->mevp == NULL) {
- WPRINTF(("Could not register event\n"));
+ WPRINTF(("Could not register event\n\r"));
goto error;
}
@@ -363,7 +363,7 @@
req.nr_arg1 = vnet_hdr_len;
err = ioctl(be->fd, NIOCREGIF, &req);
if (err) {
- WPRINTF(("Unable to set vnet header length %d\n",
+ WPRINTF(("Unable to set vnet header length %d\n\r",
vnet_hdr_len));
return (err);
}
@@ -420,7 +420,7 @@
priv->nmd = nm_open(priv->ifname, NULL, NETMAP_NO_TX_POLL, NULL);
if (priv->nmd == NULL) {
- WPRINTF(("Unable to nm_open(): interface '%s', errno (%s)\n",
+ WPRINTF(("Unable to nm_open(): interface '%s', errno (%s)\n\r",
devname, strerror(errno)));
free(priv);
return (-1);
@@ -435,7 +435,7 @@
priv->mevp = mevent_add_disabled(be->fd, EVF_READ, cb, param);
if (priv->mevp == NULL) {
- WPRINTF(("Could not register event\n"));
+ WPRINTF(("Could not register event\n\r"));
return (-1);
}
@@ -472,7 +472,7 @@
ring = priv->tx;
head = ring->head;
if (head == ring->tail) {
- WPRINTF(("No space, drop %zu bytes\n", count_iov(iov, iovcnt)));
+ WPRINTF(("No space, drop %zu bytes\n\r", count_iov(iov, iovcnt)));
goto txsync;
}
nm_buf = NETMAP_BUF(ring, ring->slot[head].buf_idx);
@@ -513,7 +513,7 @@
* We ran out of netmap slots while
* splitting the iovec fragments.
*/
- WPRINTF(("No space, drop %zu bytes\n",
+ WPRINTF(("No space, drop %zu bytes\n\r",
count_iov(iov, iovcnt)));
goto txsync;
}
@@ -585,7 +585,7 @@
iovcnt--;
if (iovcnt == 0) {
/* No space to receive. */
- WPRINTF(("Short iov, drop %zd bytes\n",
+ WPRINTF(("Short iov, drop %zd bytes\n\r",
totlen));
return (-ENOSPC);
}
Index: usr.sbin/bhyve/pci_virtio_block.c
===================================================================
--- usr.sbin/bhyve/pci_virtio_block.c
+++ usr.sbin/bhyve/pci_virtio_block.c
@@ -168,7 +168,7 @@
{
struct pci_vtblk_softc *sc = vsc;
- DPRINTF(("vtblk: device reset requested !\n"));
+ DPRINTF(("vtblk: device reset requested !\n\r"));
vi_reset_dev(&sc->vbsc_vs);
}
@@ -303,7 +303,7 @@
int i, sectsz, sts, sto;
if (opts == NULL) {
- printf("virtio-block: backing device required\n");
+ WPRINTF(("virtio-block: backing device required\n\r"));
return (1);
}
Index: usr.sbin/bhyve/pci_virtio_console.c
===================================================================
--- usr.sbin/bhyve/pci_virtio_console.c
+++ usr.sbin/bhyve/pci_virtio_console.c
@@ -187,7 +187,7 @@
sc = vsc;
- DPRINTF(("vtcon: device reset requested!\n"));
+ DPRINTF(("vtcon: device reset requested!\n\r"));
vi_reset_dev(&sc->vsc_vs);
}
@@ -498,7 +498,7 @@
case VTCON_PORT_READY:
if (ctrl->id >= sc->vsc_nports) {
- WPRINTF(("VTCON_PORT_READY event for unknown port %d\n",
+ WPRINTF(("VTCON_PORT_READY event for unknown port %d\n\r",
ctrl->id));
return;
}
Index: usr.sbin/bhyve/pci_virtio_net.c
===================================================================
--- usr.sbin/bhyve/pci_virtio_net.c
+++ usr.sbin/bhyve/pci_virtio_net.c
@@ -143,7 +143,7 @@
{
struct pci_vtnet_softc *sc = vsc;
- DPRINTF(("vtnet: device reset requested !\n"));
+ DPRINTF(("vtnet: device reset requested !\n\r"));
/* Acquire the RX lock to block RX processing. */
pthread_mutex_lock(&sc->rx_mtx);
Index: usr.sbin/bhyve/pci_virtio_rnd.c
===================================================================
--- usr.sbin/bhyve/pci_virtio_rnd.c
+++ usr.sbin/bhyve/pci_virtio_rnd.c
@@ -102,7 +102,7 @@
sc = vsc;
- DPRINTF(("vtrnd: device reset requested !\n"));
+ DPRINTF(("vtrnd: device reset requested !\n\r"));
vi_reset_dev(&sc->vrsc_vs);
}
@@ -170,7 +170,7 @@
*/
len = read(fd, &v, sizeof(v));
if (len <= 0) {
- WPRINTF(("vtrnd: /dev/random not ready, read(): %d", len));
+ WPRINTF(("vtrnd: /dev/random not ready, read(): %d\n\r", len));
close(fd);
return (1);
}
Index: usr.sbin/bhyve/pci_virtio_scsi.c
===================================================================
--- usr.sbin/bhyve/pci_virtio_scsi.c
+++ usr.sbin/bhyve/pci_virtio_scsi.c
@@ -287,7 +287,7 @@
vq_endchains(q->vsq_vq, 0);
pthread_mutex_unlock(&q->vsq_qmtx);
- DPRINTF(("virtio-scsi: request <idx=%d> completed\n",
+ DPRINTF(("virtio-scsi: request <idx=%d> completed\n\r",
req->vsr_idx));
free(req);
}
@@ -303,7 +303,7 @@
sc = vsc;
- DPRINTF(("vtscsi: device reset requested\n"));
+ DPRINTF(("vtscsi: device reset requested\n\r"));
vi_reset_dev(&sc->vss_vs);
/* initialize config structure */
@@ -432,13 +432,13 @@
struct sbuf *sb = sbuf_new_auto();
ctl_io_sbuf(io, sb);
sbuf_finish(sb);
- DPRINTF(("pci_virtio_scsi: %s", sbuf_data(sb)));
+ DPRINTF(("pci_virtio_scsi: %s\n\r", sbuf_data(sb)));
sbuf_delete(sb);
}
err = ioctl(sc->vss_ctl_fd, CTL_IO, io);
if (err != 0)
- WPRINTF(("CTL_IO: err=%d (%s)\n", errno, strerror(errno)));
+ WPRINTF(("CTL_IO: err=%d (%s)\n\r", errno, strerror(errno)));
tmf->response = io->taskio.task_status;
ctl_scsi_free_io(io);
@@ -525,13 +525,13 @@
struct sbuf *sb = sbuf_new_auto();
ctl_io_sbuf(io, sb);
sbuf_finish(sb);
- DPRINTF(("pci_virtio_scsi: %s", sbuf_data(sb)));
+ DPRINTF(("pci_virtio_scsi: %s\n\r", sbuf_data(sb)));
sbuf_delete(sb);
}
err = ioctl(sc->vss_ctl_fd, CTL_IO, io);
if (err != 0) {
- WPRINTF(("CTL_IO: err=%d (%s)\n", errno, strerror(errno)));
+ WPRINTF(("CTL_IO: err=%d (%s)\n\r", errno, strerror(errno)));
cmd_wr->response = VIRTIO_SCSI_S_FAILURE;
} else {
cmd_wr->sense_len = MIN(io->scsiio.sense_len,
@@ -627,7 +627,7 @@
pthread_cond_signal(&q->vsq_cv);
pthread_mutex_unlock(&q->vsq_mtx);
- DPRINTF(("virtio-scsi: request <idx=%d> enqueued\n", idx));
+ DPRINTF(("virtio-scsi: request <idx=%d> enqueued\n\r", idx));
}
}
@@ -683,7 +683,7 @@
} else if (strcmp(optname, "iid") == 0 && opt != NULL) {
sc->vss_iid = strtoul(opt, NULL, 10);
} else {
- fprintf(stderr, "Invalid option %s\n", optname);
+ fprintf(stderr, "Invalid option %s\n\r", optname);
free(sc);
return (1);
}
@@ -692,7 +692,7 @@
sc->vss_ctl_fd = open(devname, O_RDWR);
if (sc->vss_ctl_fd < 0) {
- WPRINTF(("cannot open %s: %s\n", devname, strerror(errno)));
+ WPRINTF(("cannot open %s: %s\n\r", devname, strerror(errno)));
free(sc);
return (1);
}

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 13, 12:28 PM (18 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31410140
Default Alt Text
D22552.id64868.diff (7 KB)

Event Timeline