API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Oct 12th, 2016
154
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 11.85 KB | None | 0 0
raw download clone embed print report
  1. Fixes:
  2.  * WARNING: line over 80 characters
  3.  
  4. Signed-off-by: Emil Condrea <emilcondrea@gmail.com>
  5. ---
  6. hw/block/xen_disk.c          |  3 ++-
  7.  hw/char/xen_console.c        |  6 ++++--
  8.  hw/display/xenfb.c           | 30 ++++++++++++++++++++----------
  9.  hw/net/xen_nic.c             | 12 ++++++++----
  10.  hw/xen/xen_backend.c         | 15 ++++++++++-----
  11.  include/hw/xen/xen_backend.h |  8 +++++---
  12.  6 files changed, 49 insertions(+), 25 deletions(-)
  13.  
  14. diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c
  15. index 5aa350a..24edeb2 100644
  16. --- a/hw/block/xen_disk.c
  17. +++ b/hw/block/xen_disk.c
  18. @@ -1068,7 +1068,8 @@ static int blk_connect(struct XenDevice *xendev)
  19.          blk_set_enable_write_cache(blkdev->blk, !writethrough);
  20.      } else {
  21.          /* setup via qemu cmdline -> already setup for us */
  22. -        xen_be_printf(&blkdev->xendev, 2, "get configured bdrv (cmdline setup)\n");
  23. +        xen_be_printf(&blkdev->xendev, 2,
  24. +                     "get configured bdrv (cmdline setup)\n");
  25.          blkdev->blk = blk_by_legacy_dinfo(blkdev->dinfo);
  26.          if (blk_is_read_only(blkdev->blk) && !readonly) {
  27.              xen_be_printf(&blkdev->xendev, 0, "Unexpected read-only drive");
  28. diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c
  29. index 4e35c82..399bb5d 100644
  30. --- a/hw/char/xen_console.c
  31. +++ b/hw/char/xen_console.c
  32. @@ -156,7 +156,8 @@ static void xencons_send(struct XenConsole *con)
  33.      if (len < 1) {
  34.          if (!con->backlog) {
  35.              con->backlog = 1;
  36. -            xen_be_printf(&con->xendev, 1, "backlog piling up, nobody listening?\n");
  37. +            xen_be_printf(&con->xendev, 1,
  38. +                         "backlog piling up, nobody listening?\n");
  39.          }
  40.      } else {
  41.          buffer_advance(&con->buffer, len);
  42. @@ -247,7 +248,8 @@ static int con_initialise(struct XenDevice *xendev)
  43.          }
  44.      }
  45.  
  46. -    xen_be_printf(xendev, 1, "ring mfn %d, remote port %d, local port %d, limit %zd\n",
  47. +    xen_be_printf(xendev, 1,
  48. +                 "ring mfn %d, remote port %d, local port %d, limit %zd\n",
  49.           con->ring_ref,
  50.           con->xendev.remote_port,
  51.           con->xendev.local_port,
  52. diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c
  53. index a9a93f9..9bcf60b 100644
  54. --- a/hw/display/xenfb.c
  55. +++ b/hw/display/xenfb.c
  56. @@ -511,38 +511,45 @@ static int xenfb_configure_fb(struct XenFB *xenfb, size_t fb_len_lim,
  57.      int max_width, max_height;
  58.  
  59.      if (fb_len_lim > fb_len_max) {
  60. -        xen_be_printf(&xenfb->c.xendev, 0, "fb size limit %zu exceeds %zu, corrected\n",
  61. +        xen_be_printf(&xenfb->c.xendev, 0,
  62. +                     "fb size limit %zu exceeds %zu, corrected\n",
  63.                        fb_len_lim, fb_len_max);
  64.          fb_len_lim = fb_len_max;
  65.      }
  66.      if (fb_len_lim && fb_len > fb_len_lim) {
  67. -        xen_be_printf(&xenfb->c.xendev, 0, "frontend fb size %zu limited to %zu\n",
  68. +        xen_be_printf(&xenfb->c.xendev, 0,
  69. +                     "frontend fb size %zu limited to %zu\n",
  70.                        fb_len, fb_len_lim);
  71.          fb_len = fb_len_lim;
  72.      }
  73.      if (depth != 8 && depth != 16 && depth != 24 && depth != 32) {
  74. -        xen_be_printf(&xenfb->c.xendev, 0, "can't handle frontend fb depth %d\n",
  75. +        xen_be_printf(&xenfb->c.xendev, 0,
  76. +                     "can't handle frontend fb depth %d\n",
  77.                        depth);
  78.          return -1;
  79.      }
  80.      if (row_stride <= 0 || row_stride > fb_len) {
  81. -        xen_be_printf(&xenfb->c.xendev, 0, "invalid frontend stride %d\n", row_stride);
  82. +        xen_be_printf(&xenfb->c.xendev, 0, "invalid frontend stride %d\n",
  83. +                      row_stride);
  84.          return -1;
  85.      }
  86.      max_width = row_stride / (depth / 8);
  87.      if (width < 0 || width > max_width) {
  88. -        xen_be_printf(&xenfb->c.xendev, 0, "invalid frontend width %d limited to %d\n",
  89. +        xen_be_printf(&xenfb->c.xendev, 0,
  90. +                     "invalid frontend width %d limited to %d\n",
  91.                        width, max_width);
  92.          width = max_width;
  93.      }
  94.      if (offset < 0 || offset >= fb_len) {
  95. -        xen_be_printf(&xenfb->c.xendev, 0, "invalid frontend offset %d (max %zu)\n",
  96. +        xen_be_printf(&xenfb->c.xendev, 0,
  97. +                     "invalid frontend offset %d (max %zu)\n",
  98.                        offset, fb_len - 1);
  99.          return -1;
  100.      }
  101.      max_height = (fb_len - offset) / row_stride;
  102.      if (height < 0 || height > max_height) {
  103. -        xen_be_printf(&xenfb->c.xendev, 0, "invalid frontend height %d limited to %d\n",
  104. +        xen_be_printf(&xenfb->c.xendev, 0,
  105. +                     "invalid frontend height %d limited to %d\n",
  106.                        height, max_height);
  107.          height = max_height;
  108.      }
  109. @@ -554,7 +561,8 @@ static int xenfb_configure_fb(struct XenFB *xenfb, size_t fb_len_lim,
  110.      xenfb->offset = offset;
  111.      xenfb->up_fullscreen = 1;
  112.      xenfb->do_resize = 1;
  113. -    xen_be_printf(&xenfb->c.xendev, 1, "framebuffer %dx%dx%d offset %d stride %d\n",
  114. +    xen_be_printf(&xenfb->c.xendev, 1,
  115. +                 "framebuffer %dx%dx%d offset %d stride %d\n",
  116.                    width, height, depth, offset, row_stride);
  117.      return 0;
  118.  }
  119. @@ -722,7 +730,8 @@ static void xenfb_update(void *opaque)
  120.              break;
  121.          }
  122.          dpy_gfx_replace_surface(xenfb->c.con, surface);
  123. -        xen_be_printf(&xenfb->c.xendev, 1, "update: resizing: %dx%d @ %d bpp%s\n",
  124. +        xen_be_printf(&xenfb->c.xendev, 1,
  125. +                     "update: resizing: %dx%d @ %d bpp%s\n",
  126.                        xenfb->width, xenfb->height, xenfb->depth,
  127.                        is_buffer_shared(surface) ? " (shared)" : "");
  128.          xenfb->up_fullscreen = 1;
  129. @@ -733,7 +742,8 @@ static void xenfb_update(void *opaque)
  130.          xen_be_printf(&xenfb->c.xendev, 3, "update: fullscreen\n");
  131.          xenfb_guest_copy(xenfb, 0, 0, xenfb->width, xenfb->height);
  132.      } else if (xenfb->up_count) {
  133. -        xen_be_printf(&xenfb->c.xendev, 3, "update: %d rects\n", xenfb->up_count);
  134. +        xen_be_printf(&xenfb->c.xendev, 3, "update: %d rects\n",
  135. +                      xenfb->up_count);
  136.          for (i = 0; i < xenfb->up_count; i++)
  137.              xenfb_guest_copy(xenfb,
  138.                               xenfb->up_rects[i].x,
  139. diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c
  140. index f401cd2..30efe47 100644
  141. --- a/hw/net/xen_nic.c
  142. +++ b/hw/net/xen_nic.c
  143. @@ -140,7 +140,8 @@ static void net_tx_packets(struct XenNetDev *netdev)
  144.  #endif
  145.  
  146.              if (txreq.size < 14) {
  147. -                xen_be_printf(&netdev->xendev, 0, "bad packet size: %d\n", txreq.size);
  148. +                xen_be_printf(&netdev->xendev, 0, "bad packet size: %d\n",
  149. +                              txreq.size);
  150.                  net_tx_error(netdev, &txreq, rc);
  151.                  continue;
  152.              }
  153. @@ -213,7 +214,8 @@ static void net_rx_response(struct XenNetDev *netdev,
  154.          resp->status = (int16_t)st;
  155.      }
  156.  
  157. -    xen_be_printf(&netdev->xendev, 3, "rx response: idx %d, status %d, flags 0x%x\n",
  158. +    xen_be_printf(&netdev->xendev, 3,
  159. +                 "rx response: idx %d, status %d, flags 0x%x\n",
  160.                    i, resp->status, resp->flags);
  161.  
  162.      netdev->rx_ring.rsp_prod_pvt = ++i;
  163. @@ -256,7 +258,8 @@ static ssize_t net_rx_packet(NetClientState *nc, const uint8_t *buf, size_t size
  164.                                     netdev->xendev.dom,
  165.                                     rxreq.gref, PROT_WRITE);
  166.      if (page == NULL) {
  167. -        xen_be_printf(&netdev->xendev, 0, "error: rx gref dereference failed (%d)\n",
  168. +        xen_be_printf(&netdev->xendev, 0,
  169. +                     "error: rx gref dereference failed (%d)\n",
  170.                        rxreq.gref);
  171.          net_rx_response(netdev, &rxreq, NETIF_RSP_ERROR, 0, 0, 0);
  172.          return -1;
  173. @@ -330,7 +333,8 @@ static int net_connect(struct XenDevice *xendev)
  174.          rx_copy = 0;
  175.      }
  176.      if (rx_copy == 0) {
  177. -        xen_be_printf(&netdev->xendev, 0, "frontend doesn't support rx-copy.\n");
  178. +        xen_be_printf(&netdev->xendev, 0,
  179. +                     "frontend doesn't support rx-copy.\n");
  180.          return -1;
  181.      }
  182.  
  183. diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c
  184. index 545ee47..0aca6ae 100644
  185. --- a/hw/xen/xen_backend.c
  186. +++ b/hw/xen/xen_backend.c
  187. @@ -53,7 +53,8 @@ struct xs_dirs {
  188.  static QTAILQ_HEAD(xs_dirs_head, xs_dirs) xs_cleanup =
  189.      QTAILQ_HEAD_INITIALIZER(xs_cleanup);
  190.  
  191. -static QTAILQ_HEAD(XenDeviceHead, XenDevice) xendevs = QTAILQ_HEAD_INITIALIZER(xendevs);
  192. +static QTAILQ_HEAD(XenDeviceHead, XenDevice) xendevs =
  193. +    QTAILQ_HEAD_INITIALIZER(xendevs);
  194.  static int debug;
  195.  
  196.  /* ------------------------------------------------------------- */
  197. @@ -205,7 +206,8 @@ int xenstore_read_fe_int(struct XenDevice *xendev, const char *node, int *ival)
  198.      return xenstore_read_int(xendev->fe, node, ival);
  199.  }
  200.  
  201. -int xenstore_read_fe_uint64(struct XenDevice *xendev, const char *node, uint64_t *uval)
  202. +int xenstore_read_fe_uint64(struct XenDevice *xendev, const char *node,
  203. +                                                        uint64_t *uval)
  204.  {
  205.      return xenstore_read_uint64(xendev->fe, node, uval);
  206.  }
  207. @@ -385,7 +387,8 @@ static void xen_be_frontend_changed(struct XenDevice *xendev, const char *node)
  208.          g_free(xendev->protocol);
  209.          xendev->protocol = xenstore_read_fe_str(xendev, "protocol");
  210.          if (xendev->protocol) {
  211. -            xen_be_printf(xendev, 1, "frontend protocol: %s\n", xendev->protocol);
  212. +            xen_be_printf(xendev, 1, "frontend protocol: %s\n",
  213. +                                                xendev->protocol);
  214.          }
  215.      }
  216.  
  217. @@ -617,7 +620,8 @@ static int xenstore_scan(const char *type, int dom, struct XenDevOps *ops)
  218.      snprintf(token, sizeof(token), "be:%p:%d:%p", type, dom, ops);
  219.      snprintf(path, sizeof(path), "backend/%s/%d", type, dom);
  220.      if (!xs_watch(xenstore, path, token)) {
  221. -        xen_be_printf(NULL, 0, "xen be: watching backend path (%s) failed\n", path);
  222. +        xen_be_printf(NULL, 0, "xen be: watching backend path (%s) failed\n",
  223. +                      path);
  224.          return -1;
  225.      }
  226.  
  227. @@ -830,7 +834,8 @@ int xen_be_send_notify(struct XenDevice *xendev)
  228.   *  2 == noisy debug messages (logfile only).
  229.   *  3 == will flood your log (logfile only).
  230.   */
  231. -void xen_be_printf(struct XenDevice *xendev, int msg_level, const char *fmt, ...)
  232. +void xen_be_printf(struct XenDevice *xendev, int msg_level,
  233. +                                        const char *fmt, ...)
  234.  {
  235.      va_list args;
  236.  
  237. diff --git a/include/hw/xen/xen_backend.h b/include/hw/xen/xen_backend.h
  238. index 0df282a..0ccbc0f 100644
  239. --- a/include/hw/xen/xen_backend.h
  240. +++ b/include/hw/xen/xen_backend.h
  241. @@ -79,7 +79,8 @@ int xenstore_read_be_int(struct XenDevice *xendev, const char *node, int *ival);
  242.  char *xenstore_read_fe_str(struct XenDevice *xendev, const char *node);
  243.  int xenstore_read_fe_int(struct XenDevice *xendev, const char *node, int *ival);
  244.  int xenstore_read_uint64(const char *base, const char *node, uint64_t *uval);
  245. -int xenstore_read_fe_uint64(struct XenDevice *xendev, const char *node, uint64_t *uval);
  246. +int xenstore_read_fe_uint64(struct XenDevice *xendev, const char *node,
  247. +                                                        uint64_t *uval);
  248.  
  249.  const char *xenbus_strstate(enum xenbus_state state);
  250.  struct XenDevice *xen_be_find_xendev(const char *type, int dom, int dev);
  251. @@ -93,8 +94,9 @@ int xen_be_set_state(struct XenDevice *xendev, enum xenbus_state state);
  252.  int xen_be_bind_evtchn(struct XenDevice *xendev);
  253.  void xen_be_unbind_evtchn(struct XenDevice *xendev);
  254.  int xen_be_send_notify(struct XenDevice *xendev);
  255. -void xen_be_printf(struct XenDevice *xendev, int msg_level, const char *fmt, ...)
  256. -    GCC_FMT_ATTR(3, 4);
  257. +void xen_be_printf(struct XenDevice *xendev, int msg_level,
  258. +                const char *fmt, ...)  GCC_FMT_ATTR(3, 4);
  259. +
  260.  
  261.  /* actual backend drivers */
  262.  extern struct XenDevOps xen_console_ops;      /* xen_console.c     */
  263. --
  264. 1.9.1
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!