Commit b9730c5b authored by Emil Condrea's avatar Emil Condrea Committed by Stefano Stabellini
Browse files

xen: Fix coding style warnings 



Fixes:
 * WARNING: line over 80 characters

Signed-off-by: default avatarEmil Condrea <emilcondrea@gmail.com>
Signed-off-by: default avatarStefano Stabellini <sstabellini@kernel.org>
Signed-off-by: default avatarQuan Xu <xuquan8@huawei.com>
Acked-by: default avatarAnthony PERARD <anthony.perard@citrix.com>
parent c22e91b1

hw/block/xen_disk.c

+2 −1
Original line number Diff line number Diff line
@@ -1068,7 +1068,8 @@ static int blk_connect(struct XenDevice *xendev) 
        blk_set_enable_write_cache(blkdev->blk, !writethrough);

    } else {

        /* 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);

        if (blk_is_read_only(blkdev->blk) && !readonly) {

            xen_be_printf(&blkdev->xendev, 0, "Unexpected read-only drive");

hw/char/xen_console.c

+2 −1
Original line number Diff line number Diff line
@@ -248,7 +248,8 @@ static int con_initialise(struct XenDevice *xendev) 
    qemu_chr_fe_set_handlers(&con->chr, xencons_can_receive,

                             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->xendev.remote_port,

		  con->xendev.local_port,

hw/display/xenfb.c

+4 −2
Original line number Diff line number Diff line
@@ -561,7 +561,8 @@ static int xenfb_configure_fb(struct XenFB *xenfb, size_t fb_len_lim, 
    xenfb->offset = offset;

    xenfb->up_fullscreen = 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);

    return 0;

}
@@ -729,7 +730,8 @@ static void xenfb_update(void *opaque) 
            break;

        }

        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,

                      is_buffer_shared(surface) ? " (shared)" : "");

        xenfb->up_fullscreen = 1;

hw/net/xen_nic.c

+8 −4
Original line number Diff line number Diff line
@@ -140,7 +140,8 @@ static void net_tx_packets(struct XenNetDev *netdev) 
#endif



            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);

                continue;

            }
@@ -213,7 +214,8 @@ static void net_rx_response(struct XenNetDev *netdev, 
        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);



    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,

                                   rxreq.gref, PROT_WRITE);

    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);

        net_rx_response(netdev, &rxreq, NETIF_RSP_ERROR, 0, 0, 0);

        return -1;
@@ -330,7 +333,8 @@ static int net_connect(struct XenDevice *xendev) 
        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;

    }

hw/xen/xen_backend.c

+10 −5
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ struct xs_dirs { 
static QTAILQ_HEAD(xs_dirs_head, xs_dirs) 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;



/* ------------------------------------------------------------- */
@@ -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);

}



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);

}
@@ -385,7 +387,8 @@ static void xen_be_frontend_changed(struct XenDevice *xendev, const char *node) 
        g_free(xendev->protocol);

        xendev->protocol = xenstore_read_fe_str(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(path, sizeof(path), "backend/%s/%d", type, dom);

    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;

    }
@@ -830,7 +834,8 @@ int xen_be_send_notify(struct XenDevice *xendev) 
 *  2 == noisy debug messages (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;