xen: Fix coding style warnings
Fixes: * WARNING: line over 80 characters 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
c22e91b1d8
commit
b9730c5b4e
|
@ -1068,7 +1068,8 @@ static int blk_connect(struct XenDevice *xendev)
|
||||||
blk_set_enable_write_cache(blkdev->blk, !writethrough);
|
blk_set_enable_write_cache(blkdev->blk, !writethrough);
|
||||||
} else {
|
} else {
|
||||||
/* setup via qemu cmdline -> already setup for us */
|
/* setup via qemu cmdline -> already setup for us */
|
||||||
xen_be_printf(&blkdev->xendev, 2, "get configured bdrv (cmdline setup)\n");
|
xen_be_printf(&blkdev->xendev, 2,
|
||||||
|
"get configured bdrv (cmdline setup)\n");
|
||||||
blkdev->blk = blk_by_legacy_dinfo(blkdev->dinfo);
|
blkdev->blk = blk_by_legacy_dinfo(blkdev->dinfo);
|
||||||
if (blk_is_read_only(blkdev->blk) && !readonly) {
|
if (blk_is_read_only(blkdev->blk) && !readonly) {
|
||||||
xen_be_printf(&blkdev->xendev, 0, "Unexpected read-only drive");
|
xen_be_printf(&blkdev->xendev, 0, "Unexpected read-only drive");
|
||||||
|
|
|
@ -248,7 +248,8 @@ static int con_initialise(struct XenDevice *xendev)
|
||||||
qemu_chr_fe_set_handlers(&con->chr, xencons_can_receive,
|
qemu_chr_fe_set_handlers(&con->chr, xencons_can_receive,
|
||||||
xencons_receive, NULL, con, NULL, true);
|
xencons_receive, NULL, con, NULL, true);
|
||||||
|
|
||||||
xen_be_printf(xendev, 1, "ring mfn %d, remote port %d, local port %d, limit %zd\n",
|
xen_be_printf(xendev, 1,
|
||||||
|
"ring mfn %d, remote port %d, local port %d, limit %zd\n",
|
||||||
con->ring_ref,
|
con->ring_ref,
|
||||||
con->xendev.remote_port,
|
con->xendev.remote_port,
|
||||||
con->xendev.local_port,
|
con->xendev.local_port,
|
||||||
|
|
|
@ -561,7 +561,8 @@ static int xenfb_configure_fb(struct XenFB *xenfb, size_t fb_len_lim,
|
||||||
xenfb->offset = offset;
|
xenfb->offset = offset;
|
||||||
xenfb->up_fullscreen = 1;
|
xenfb->up_fullscreen = 1;
|
||||||
xenfb->do_resize = 1;
|
xenfb->do_resize = 1;
|
||||||
xen_be_printf(&xenfb->c.xendev, 1, "framebuffer %dx%dx%d offset %d stride %d\n",
|
xen_be_printf(&xenfb->c.xendev, 1,
|
||||||
|
"framebuffer %dx%dx%d offset %d stride %d\n",
|
||||||
width, height, depth, offset, row_stride);
|
width, height, depth, offset, row_stride);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -729,7 +730,8 @@ static void xenfb_update(void *opaque)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
dpy_gfx_replace_surface(xenfb->c.con, surface);
|
dpy_gfx_replace_surface(xenfb->c.con, surface);
|
||||||
xen_be_printf(&xenfb->c.xendev, 1, "update: resizing: %dx%d @ %d bpp%s\n",
|
xen_be_printf(&xenfb->c.xendev, 1,
|
||||||
|
"update: resizing: %dx%d @ %d bpp%s\n",
|
||||||
xenfb->width, xenfb->height, xenfb->depth,
|
xenfb->width, xenfb->height, xenfb->depth,
|
||||||
is_buffer_shared(surface) ? " (shared)" : "");
|
is_buffer_shared(surface) ? " (shared)" : "");
|
||||||
xenfb->up_fullscreen = 1;
|
xenfb->up_fullscreen = 1;
|
||||||
|
|
|
@ -140,7 +140,8 @@ static void net_tx_packets(struct XenNetDev *netdev)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (txreq.size < 14) {
|
if (txreq.size < 14) {
|
||||||
xen_be_printf(&netdev->xendev, 0, "bad packet size: %d\n", txreq.size);
|
xen_be_printf(&netdev->xendev, 0, "bad packet size: %d\n",
|
||||||
|
txreq.size);
|
||||||
net_tx_error(netdev, &txreq, rc);
|
net_tx_error(netdev, &txreq, rc);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -213,7 +214,8 @@ static void net_rx_response(struct XenNetDev *netdev,
|
||||||
resp->status = (int16_t)st;
|
resp->status = (int16_t)st;
|
||||||
}
|
}
|
||||||
|
|
||||||
xen_be_printf(&netdev->xendev, 3, "rx response: idx %d, status %d, flags 0x%x\n",
|
xen_be_printf(&netdev->xendev, 3,
|
||||||
|
"rx response: idx %d, status %d, flags 0x%x\n",
|
||||||
i, resp->status, resp->flags);
|
i, resp->status, resp->flags);
|
||||||
|
|
||||||
netdev->rx_ring.rsp_prod_pvt = ++i;
|
netdev->rx_ring.rsp_prod_pvt = ++i;
|
||||||
|
@ -256,7 +258,8 @@ static ssize_t net_rx_packet(NetClientState *nc, const uint8_t *buf, size_t size
|
||||||
netdev->xendev.dom,
|
netdev->xendev.dom,
|
||||||
rxreq.gref, PROT_WRITE);
|
rxreq.gref, PROT_WRITE);
|
||||||
if (page == NULL) {
|
if (page == NULL) {
|
||||||
xen_be_printf(&netdev->xendev, 0, "error: rx gref dereference failed (%d)\n",
|
xen_be_printf(&netdev->xendev, 0,
|
||||||
|
"error: rx gref dereference failed (%d)\n",
|
||||||
rxreq.gref);
|
rxreq.gref);
|
||||||
net_rx_response(netdev, &rxreq, NETIF_RSP_ERROR, 0, 0, 0);
|
net_rx_response(netdev, &rxreq, NETIF_RSP_ERROR, 0, 0, 0);
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -330,7 +333,8 @@ static int net_connect(struct XenDevice *xendev)
|
||||||
rx_copy = 0;
|
rx_copy = 0;
|
||||||
}
|
}
|
||||||
if (rx_copy == 0) {
|
if (rx_copy == 0) {
|
||||||
xen_be_printf(&netdev->xendev, 0, "frontend doesn't support rx-copy.\n");
|
xen_be_printf(&netdev->xendev, 0,
|
||||||
|
"frontend doesn't support rx-copy.\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,8 @@ struct xs_dirs {
|
||||||
static QTAILQ_HEAD(xs_dirs_head, xs_dirs) xs_cleanup =
|
static QTAILQ_HEAD(xs_dirs_head, xs_dirs) xs_cleanup =
|
||||||
QTAILQ_HEAD_INITIALIZER(xs_cleanup);
|
QTAILQ_HEAD_INITIALIZER(xs_cleanup);
|
||||||
|
|
||||||
static QTAILQ_HEAD(XenDeviceHead, XenDevice) xendevs = QTAILQ_HEAD_INITIALIZER(xendevs);
|
static QTAILQ_HEAD(XenDeviceHead, XenDevice) xendevs =
|
||||||
|
QTAILQ_HEAD_INITIALIZER(xendevs);
|
||||||
static int debug;
|
static int debug;
|
||||||
|
|
||||||
/* ------------------------------------------------------------- */
|
/* ------------------------------------------------------------- */
|
||||||
|
@ -205,7 +206,8 @@ int xenstore_read_fe_int(struct XenDevice *xendev, const char *node, int *ival)
|
||||||
return xenstore_read_int(xendev->fe, node, ival);
|
return xenstore_read_int(xendev->fe, node, ival);
|
||||||
}
|
}
|
||||||
|
|
||||||
int xenstore_read_fe_uint64(struct XenDevice *xendev, const char *node, uint64_t *uval)
|
int xenstore_read_fe_uint64(struct XenDevice *xendev, const char *node,
|
||||||
|
uint64_t *uval)
|
||||||
{
|
{
|
||||||
return xenstore_read_uint64(xendev->fe, node, uval);
|
return xenstore_read_uint64(xendev->fe, node, uval);
|
||||||
}
|
}
|
||||||
|
@ -385,7 +387,8 @@ static void xen_be_frontend_changed(struct XenDevice *xendev, const char *node)
|
||||||
g_free(xendev->protocol);
|
g_free(xendev->protocol);
|
||||||
xendev->protocol = xenstore_read_fe_str(xendev, "protocol");
|
xendev->protocol = xenstore_read_fe_str(xendev, "protocol");
|
||||||
if (xendev->protocol) {
|
if (xendev->protocol) {
|
||||||
xen_be_printf(xendev, 1, "frontend protocol: %s\n", xendev->protocol);
|
xen_be_printf(xendev, 1, "frontend protocol: %s\n",
|
||||||
|
xendev->protocol);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -617,7 +620,8 @@ static int xenstore_scan(const char *type, int dom, struct XenDevOps *ops)
|
||||||
snprintf(token, sizeof(token), "be:%p:%d:%p", type, dom, ops);
|
snprintf(token, sizeof(token), "be:%p:%d:%p", type, dom, ops);
|
||||||
snprintf(path, sizeof(path), "backend/%s/%d", type, dom);
|
snprintf(path, sizeof(path), "backend/%s/%d", type, dom);
|
||||||
if (!xs_watch(xenstore, path, token)) {
|
if (!xs_watch(xenstore, path, token)) {
|
||||||
xen_be_printf(NULL, 0, "xen be: watching backend path (%s) failed\n", path);
|
xen_be_printf(NULL, 0, "xen be: watching backend path (%s) failed\n",
|
||||||
|
path);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -830,7 +834,8 @@ int xen_be_send_notify(struct XenDevice *xendev)
|
||||||
* 2 == noisy debug messages (logfile only).
|
* 2 == noisy debug messages (logfile only).
|
||||||
* 3 == will flood your log (logfile only).
|
* 3 == will flood your log (logfile only).
|
||||||
*/
|
*/
|
||||||
void xen_be_printf(struct XenDevice *xendev, int msg_level, const char *fmt, ...)
|
void xen_be_printf(struct XenDevice *xendev, int msg_level,
|
||||||
|
const char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list args;
|
va_list args;
|
||||||
|
|
||||||
|
|
|
@ -79,7 +79,8 @@ int xenstore_read_be_int(struct XenDevice *xendev, const char *node, int *ival);
|
||||||
char *xenstore_read_fe_str(struct XenDevice *xendev, const char *node);
|
char *xenstore_read_fe_str(struct XenDevice *xendev, const char *node);
|
||||||
int xenstore_read_fe_int(struct XenDevice *xendev, const char *node, int *ival);
|
int xenstore_read_fe_int(struct XenDevice *xendev, const char *node, int *ival);
|
||||||
int xenstore_read_uint64(const char *base, const char *node, uint64_t *uval);
|
int xenstore_read_uint64(const char *base, const char *node, uint64_t *uval);
|
||||||
int xenstore_read_fe_uint64(struct XenDevice *xendev, const char *node, uint64_t *uval);
|
int xenstore_read_fe_uint64(struct XenDevice *xendev, const char *node,
|
||||||
|
uint64_t *uval);
|
||||||
|
|
||||||
const char *xenbus_strstate(enum xenbus_state state);
|
const char *xenbus_strstate(enum xenbus_state state);
|
||||||
struct XenDevice *xen_be_find_xendev(const char *type, int dom, int dev);
|
struct XenDevice *xen_be_find_xendev(const char *type, int dom, int dev);
|
||||||
|
@ -93,8 +94,9 @@ int xen_be_set_state(struct XenDevice *xendev, enum xenbus_state state);
|
||||||
int xen_be_bind_evtchn(struct XenDevice *xendev);
|
int xen_be_bind_evtchn(struct XenDevice *xendev);
|
||||||
void xen_be_unbind_evtchn(struct XenDevice *xendev);
|
void xen_be_unbind_evtchn(struct XenDevice *xendev);
|
||||||
int xen_be_send_notify(struct XenDevice *xendev);
|
int xen_be_send_notify(struct XenDevice *xendev);
|
||||||
void xen_be_printf(struct XenDevice *xendev, int msg_level, const char *fmt, ...)
|
void xen_be_printf(struct XenDevice *xendev, int msg_level,
|
||||||
GCC_FMT_ATTR(3, 4);
|
const char *fmt, ...) GCC_FMT_ATTR(3, 4);
|
||||||
|
|
||||||
|
|
||||||
/* actual backend drivers */
|
/* actual backend drivers */
|
||||||
extern struct XenDevOps xen_console_ops; /* xen_console.c */
|
extern struct XenDevOps xen_console_ops; /* xen_console.c */
|
||||||
|
|
Loading…
Reference in a new issue