david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xen: Fix coding style errors

Browse Source 
Fixes the following errors:
 * ERROR: line over 90 characters
 * ERROR: code indent should never use tabs
 * ERROR: space prohibited after that open square bracket '['
 * ERROR: do not initialise statics to 0 or NULL
 * ERROR: "(foo*)" should be "(foo *)"

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:
Emil Condrea 2016-10-25 08:50:07 +03:00 committed by Stefano Stabellini
parent 5b2ecabaea
commit c22e91b1d8
4 changed files with 76 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/char/xen_console.c
View File

@ -158,16 +158,17 @@ static void xencons_send(struct XenConsole *con)
len = size; len = size;
} }
if (len < 1) { if (len < 1) {
if (!con->backlog) { if (!con->backlog) {
con->backlog = 1; con->backlog = 1;
xen_be_printf(&con->xendev, 1, "backlog piling up, nobody listening?\n"); xen_be_printf(&con->xendev, 1,
} "backlog piling up, nobody listening?\n");
}
} else { } else {
buffer_advance(&con->buffer, len); buffer_advance(&con->buffer, len);
if (con->backlog && len == size) { if (con->backlog && len == size) {
con->backlog = 0; con->backlog = 0;
xen_be_printf(&con->xendev, 1, "backlog is gone\n"); xen_be_printf(&con->xendev, 1, "backlog is gone\n");
} }
} }
} }
@ -191,7 +192,7 @@ static int con_init(struct XenDevice *xendev)
type = xenstore_read_str(con->console, "type"); type = xenstore_read_str(con->console, "type");
if (!type || strcmp(type, "ioemu") != 0) { if (!type || strcmp(type, "ioemu") != 0) {
xen_be_printf(xendev, 1, "not for me (type=%s)\n", type); xen_be_printf(xendev, 1, "not for me (type=%s)\n", type);
ret = -1; ret = -1;
goto out; goto out;
} }

91
hw/display/xenfb.c
View File

@ -90,21 +90,22 @@ static int common_bind(struct common *c)
xen_pfn_t mfn; xen_pfn_t mfn;
if (xenstore_read_fe_uint64(&c->xendev, "page-ref", &val) == -1) if (xenstore_read_fe_uint64(&c->xendev, "page-ref", &val) == -1)
return -1; return -1;
mfn = (xen_pfn_t)val; mfn = (xen_pfn_t)val;
assert(val == mfn); assert(val == mfn);
if (xenstore_read_fe_int(&c->xendev, "event-channel", &c->xendev.remote_port) == -1) if (xenstore_read_fe_int(&c->xendev, "event-channel", &c->xendev.remote_port) == -1)
return -1; return -1;
c->page = xenforeignmemory_map(xen_fmem, c->xendev.dom, c->page = xenforeignmemory_map(xen_fmem, c->xendev.dom,
PROT_READ | PROT_WRITE, 1, &mfn, NULL); PROT_READ | PROT_WRITE, 1, &mfn, NULL);
if (c->page == NULL) if (c->page == NULL)
return -1; return -1;
xen_be_bind_evtchn(&c->xendev); xen_be_bind_evtchn(&c->xendev);
xen_be_printf(&c->xendev, 1, "ring mfn %"PRI_xen_pfn", remote-port %d, local-port %d\n", xen_be_printf(&c->xendev, 1,
mfn, c->xendev.remote_port, c->xendev.local_port); "ring mfn %"PRI_xen_pfn", remote-port %d, local-port %d\n",
mfn, c->xendev.remote_port, c->xendev.local_port);
return 0; return 0;
} }
@ -500,8 +501,8 @@ out:
} }
static int xenfb_configure_fb(struct XenFB *xenfb, size_t fb_len_lim, static int xenfb_configure_fb(struct XenFB *xenfb, size_t fb_len_lim,
int width, int height, int depth, int width, int height, int depth,
size_t fb_len, int offset, int row_stride) size_t fb_len, int offset, int row_stride)
{ {
size_t mfn_sz = sizeof(*((struct xenfb_page *)0)->pd); size_t mfn_sz = sizeof(*((struct xenfb_page *)0)->pd);
size_t pd_len = sizeof(((struct xenfb_page *)0)->pd) / mfn_sz; size_t pd_len = sizeof(((struct xenfb_page *)0)->pd) / mfn_sz;
@ -510,40 +511,47 @@ static int xenfb_configure_fb(struct XenFB *xenfb, size_t fb_len_lim,
int max_width, max_height; int max_width, max_height;
if (fb_len_lim > fb_len_max) { if (fb_len_lim > fb_len_max) {
xen_be_printf(&xenfb->c.xendev, 0, "fb size limit %zu exceeds %zu, corrected\n", xen_be_printf(&xenfb->c.xendev, 0,
fb_len_lim, fb_len_max); "fb size limit %zu exceeds %zu, corrected\n",
fb_len_lim = fb_len_max; fb_len_lim, fb_len_max);
fb_len_lim = fb_len_max;
} }
if (fb_len_lim && fb_len > fb_len_lim) { if (fb_len_lim && fb_len > fb_len_lim) {
xen_be_printf(&xenfb->c.xendev, 0, "frontend fb size %zu limited to %zu\n", xen_be_printf(&xenfb->c.xendev, 0,
fb_len, fb_len_lim); "frontend fb size %zu limited to %zu\n",
fb_len = fb_len_lim; fb_len, fb_len_lim);
fb_len = fb_len_lim;
} }
if (depth != 8 && depth != 16 && depth != 24 && depth != 32) { if (depth != 8 && depth != 16 && depth != 24 && depth != 32) {
xen_be_printf(&xenfb->c.xendev, 0, "can't handle frontend fb depth %d\n", xen_be_printf(&xenfb->c.xendev, 0,
depth); "can't handle frontend fb depth %d\n",
return -1; depth);
return -1;
} }
if (row_stride <= 0 || row_stride > fb_len) { if (row_stride <= 0 || row_stride > fb_len) {
xen_be_printf(&xenfb->c.xendev, 0, "invalid frontend stride %d\n", row_stride); xen_be_printf(&xenfb->c.xendev, 0, "invalid frontend stride %d\n",
return -1; row_stride);
return -1;
} }
max_width = row_stride / (depth / 8); max_width = row_stride / (depth / 8);
if (width < 0 || width > max_width) { if (width < 0 || width > max_width) {
xen_be_printf(&xenfb->c.xendev, 0, "invalid frontend width %d limited to %d\n", xen_be_printf(&xenfb->c.xendev, 0,
width, max_width); "invalid frontend width %d limited to %d\n",
width = max_width; width, max_width);
width = max_width;
} }
if (offset < 0 || offset >= fb_len) { if (offset < 0 || offset >= fb_len) {
xen_be_printf(&xenfb->c.xendev, 0, "invalid frontend offset %d (max %zu)\n", xen_be_printf(&xenfb->c.xendev, 0,
offset, fb_len - 1); "invalid frontend offset %d (max %zu)\n",
return -1; offset, fb_len - 1);
return -1;
} }
max_height = (fb_len - offset) / row_stride; max_height = (fb_len - offset) / row_stride;
if (height < 0 || height > max_height) { if (height < 0 || height > max_height) {
xen_be_printf(&xenfb->c.xendev, 0, "invalid frontend height %d limited to %d\n", xen_be_printf(&xenfb->c.xendev, 0,
height, max_height); "invalid frontend height %d limited to %d\n",
height = max_height; height, max_height);
height = max_height;
} }
xenfb->fb_len = fb_len; xenfb->fb_len = fb_len;
xenfb->row_stride = row_stride; xenfb->row_stride = row_stride;
@ -554,7 +562,7 @@ static int xenfb_configure_fb(struct XenFB *xenfb, size_t fb_len_lim,
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;
} }
@ -696,9 +704,9 @@ static void xenfb_update(void *opaque)
return; return;
if (!xenfb->feature_update) { if (!xenfb->feature_update) {
/* we don't get update notifications, thus use the /* we don't get update notifications, thus use the
* sledge hammer approach ... */ * sledge hammer approach ... */
xenfb->up_fullscreen = 1; xenfb->up_fullscreen = 1;
} }
/* resize if needed */ /* resize if needed */
@ -729,18 +737,19 @@ static void xenfb_update(void *opaque)
/* run queued updates */ /* run queued updates */
if (xenfb->up_fullscreen) { if (xenfb->up_fullscreen) {
xen_be_printf(&xenfb->c.xendev, 3, "update: fullscreen\n"); xen_be_printf(&xenfb->c.xendev, 3, "update: fullscreen\n");
xenfb_guest_copy(xenfb, 0, 0, xenfb->width, xenfb->height); xenfb_guest_copy(xenfb, 0, 0, xenfb->width, xenfb->height);
} else if (xenfb->up_count) { } else if (xenfb->up_count) {
xen_be_printf(&xenfb->c.xendev, 3, "update: %d rects\n", xenfb->up_count); xen_be_printf(&xenfb->c.xendev, 3, "update: %d rects\n",
for (i = 0; i < xenfb->up_count; i++) xenfb->up_count);
xenfb_guest_copy(xenfb, for (i = 0; i < xenfb->up_count; i++)
xenfb->up_rects[i].x, xenfb_guest_copy(xenfb,
xenfb->up_rects[i].y, xenfb->up_rects[i].x,
xenfb->up_rects[i].w, xenfb->up_rects[i].y,
xenfb->up_rects[i].h); xenfb->up_rects[i].w,
xenfb->up_rects[i].h);
} else { } else {
xen_be_printf(&xenfb->c.xendev, 3, "update: nothing\n"); xen_be_printf(&xenfb->c.xendev, 3, "update: nothing\n");
} }
xenfb->up_count = 0; xenfb->up_count = 0;
xenfb->up_fullscreen = 0; xenfb->up_fullscreen = 0;

8
hw/net/xen_nic.c
View File

@ -151,7 +151,8 @@ static void net_tx_packets(struct XenNetDev *netdev)
continue; continue;
} }
xen_be_printf(&netdev->xendev, 3, "tx packet ref %d, off %d, len %d, flags 0x%x%s%s%s%s\n", xen_be_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.gref, txreq.offset, txreq.size, txreq.flags,
(txreq.flags & NETTXF_csum_blank) ? " csum_blank" : "", (txreq.flags & NETTXF_csum_blank) ? " csum_blank" : "",
(txreq.flags & NETTXF_data_validated) ? " data_validated" : "", (txreq.flags & NETTXF_data_validated) ? " data_validated" : "",
@ -162,8 +163,9 @@ static void net_tx_packets(struct XenNetDev *netdev)
netdev->xendev.dom, netdev->xendev.dom,
txreq.gref, PROT_READ); txreq.gref, PROT_READ);
if (page == NULL) { if (page == NULL) {
xen_be_printf(&netdev->xendev, 0, "error: tx gref dereference failed (%d)\n", xen_be_printf(&netdev->xendev, 0,
txreq.gref); "error: tx gref dereference failed (%d)\n",
txreq.gref);
net_tx_error(netdev, &txreq, rc); net_tx_error(netdev, &txreq, rc);
continue; continue;
} }

20
hw/xen/xen_backend.c
View File

@ -54,7 +54,7 @@ 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 = 0; static int debug;
/* ------------------------------------------------------------- */ /* ------------------------------------------------------------- */
@ -215,13 +215,13 @@ int xenstore_read_fe_uint64(struct XenDevice *xendev, const char *node, uint64_t
const char *xenbus_strstate(enum xenbus_state state) const char *xenbus_strstate(enum xenbus_state state)
{ {
static const char *const name[] = { static const char *const name[] = {
[ XenbusStateUnknown ] = "Unknown", [XenbusStateUnknown] = "Unknown",
[ XenbusStateInitialising ] = "Initialising", [XenbusStateInitialising] = "Initialising",
[ XenbusStateInitWait ] = "InitWait", [XenbusStateInitWait] = "InitWait",
[ XenbusStateInitialised ] = "Initialised", [XenbusStateInitialised] = "Initialised",
[ XenbusStateConnected ] = "Connected", [XenbusStateConnected] = "Connected",
[ XenbusStateClosing ] = "Closing", [XenbusStateClosing] = "Closing",
[ XenbusStateClosed ] = "Closed", [XenbusStateClosed] = "Closed",
}; };
return (state < ARRAY_SIZE(name)) ? name[state] : "INVALID"; return (state < ARRAY_SIZE(name)) ? name[state] : "INVALID";
} }
@ -702,10 +702,10 @@ static void xenstore_update(void *unused)
if (sscanf(vec[XS_WATCH_TOKEN], "be:%" PRIxPTR ":%d:%" PRIxPTR, if (sscanf(vec[XS_WATCH_TOKEN], "be:%" PRIxPTR ":%d:%" PRIxPTR,
&type, &dom, &ops) == 3) { &type, &dom, &ops) == 3) {
xenstore_update_be(vec[XS_WATCH_PATH], (void*)type, dom, (void*)ops); xenstore_update_be(vec[XS_WATCH_PATH], (void *)type, dom, (void*)ops);
} }
if (sscanf(vec[XS_WATCH_TOKEN], "fe:%" PRIxPTR, &ptr) == 1) { if (sscanf(vec[XS_WATCH_TOKEN], "fe:%" PRIxPTR, &ptr) == 1) {
xenstore_update_fe(vec[XS_WATCH_PATH], (void*)ptr); xenstore_update_fe(vec[XS_WATCH_PATH], (void *)ptr);
} }
cleanup: cleanup: