[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] [PATCH 2/2] libxl: fix line wrapping issues introduced by automatic replacement



Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 tools/libxl/libxl.c    | 21 ++++++++++-----------
 tools/libxl/libxl_dm.c | 29 ++++++++++++-----------------
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 9f52cc2..2f2ce45 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -1374,8 +1374,8 @@ static void disk_eject_xswatch_callback(libxl__egc *egc, 
libxl__ev_xswatch *w,
     libxl_device_disk *disk = &ev->u.disk_eject.disk;
     
     backend = libxl__xs_read(gc, XBT_NULL,
-                             GCSPRINTF("%.*s/backend",
-                                            (int)strlen(wpath)-6, wpath));
+                             GCSPRINTF("%.*s/backend", (int)strlen(wpath)-6,
+                                       wpath));
 
     sscanf(backend,
             "/local/domain/%d/backend/%" TOSTRING(BACKEND_STRING_SIZE)
@@ -2747,8 +2747,8 @@ int libxl_vdev_to_device_disk(libxl_ctx *ctx, uint32_t 
domid,
         goto out;
     }
     path = libxl__xs_read(gc, XBT_NULL,
-                          GCSPRINTF("%s/device/vbd/%d/backend",
-                                         dompath, devid));
+                          GCSPRINTF("%s/device/vbd/%d/backend", dompath,
+                                    devid));
     if (!path)
         goto out;
 
@@ -3517,8 +3517,8 @@ int libxl_devid_to_device_nic(libxl_ctx *ctx, uint32_t 
domid,
         goto out;
 
     path = libxl__xs_read(gc, XBT_NULL,
-                          GCSPRINTF("%s/device/vif/%d/backend",
-                                         dompath, devid));
+                          GCSPRINTF("%s/device/vif/%d/backend", dompath,
+                                    devid));
     if (!path)
         goto out;
 
@@ -3543,8 +3543,8 @@ static int libxl__append_nic_list_of_type(libxl__gc *gc,
     libxl_device_nic *pnic = NULL, *pnic_end = NULL;
     int rc;
 
-    be_path = GCSPRINTF("%s/backend/%s/%d",
-                             libxl__xs_get_dompath(gc, 0), type, domid);
+    be_path = GCSPRINTF("%s/backend/%s/%d", libxl__xs_get_dompath(gc, 0),
+                        type, domid);
     dir = libxl__xs_directory(gc, XBT_NULL, be_path, &n);
     if (dir && n) {
         libxl_device_nic *tmp;
@@ -3911,10 +3911,9 @@ int libxl_device_channel_getinfo(libxl_ctx *ctx, 
uint32_t domid,
     channelinfo->devid = channel->devid;
 
     fe_path = GCSPRINTF("%s/device/console/%d", dompath,
-                             channelinfo->devid + 1);
+                        channelinfo->devid + 1);
     channelinfo->backend = xs_read(ctx->xsh, XBT_NULL,
-                                   GCSPRINTF("%s/backend",
-                                   fe_path), NULL);
+                                   GCSPRINTF("%s/backend", fe_path), NULL);
     if (!channelinfo->backend) {
         GC_FREE;
         return ERROR_FAIL;
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index dc32c73..7cac74c 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -442,8 +442,7 @@ static int libxl__build_device_model_args_old(libxl__gc *gc,
                 }
                 vncarg = vnc->listen;
             } else {
-                vncarg = GCSPRINTF("%s:%d", vnc->listen,
-                                        vnc->display);
+                vncarg = GCSPRINTF("%s:%d", vnc->listen, vnc->display);
             }
         } else
             vncarg = GCSPRINTF("127.0.0.1:%d", vnc->display);
@@ -517,8 +516,7 @@ static int libxl__build_device_model_args_old(libxl__gc *gc,
 
         if (b_info->video_memkb) {
             flexarray_vappend(dm_args, "-videoram",
-                    GCSPRINTF("%d",
-                                   libxl__sizekb_to_mb(b_info->video_memkb)),
+                    GCSPRINTF("%d", libxl__sizekb_to_mb(b_info->video_memkb)),
                     NULL);
         }
 
@@ -683,8 +681,7 @@ static char *dm_spice_options(libxl__gc *gc,
             return NULL;
         }
     }
-    opt = GCSPRINTF("port=%d,tls-port=%d",
-                         spice->port, spice->tls_port);
+    opt = GCSPRINTF("port=%d,tls-port=%d", spice->port, spice->tls_port);
     if (spice->host)
         opt = GCSPRINTF("%s,addr=%s", opt, spice->host);
     if (libxl_defbool_val(spice->disable_ticketing))
@@ -692,18 +689,17 @@ static char *dm_spice_options(libxl__gc *gc,
     else
         opt = GCSPRINTF("%s,password=%s", opt, spice->passwd);
     opt = GCSPRINTF("%s,agent-mouse=%s", opt,
-                         libxl_defbool_val(spice->agent_mouse) ? "on" : "off");
+                    libxl_defbool_val(spice->agent_mouse) ? "on" : "off");
 
     if (!libxl_defbool_val(spice->clipboard_sharing))
         opt = GCSPRINTF("%s,disable-copy-paste", opt);
 
     if (spice->image_compression)
         opt = GCSPRINTF("%s,image-compression=%s", opt,
-                             spice->image_compression);
+                        spice->image_compression);
 
     if (spice->streaming_video)
-        opt = GCSPRINTF("%s,streaming-video=%s", opt,
-                             spice->streaming_video);
+        opt = GCSPRINTF("%s,streaming-video=%s", opt, spice->streaming_video);
 
     return opt;
 }
@@ -1052,11 +1048,10 @@ static int libxl__build_device_model_args_new(libxl__gc 
*gc,
                 nr_set_cpus = libxl_bitmap_count_set(&b_info->avail_vcpus);
 
                 flexarray_append(dm_args, GCSPRINTF("%d,maxcpus=%d",
-                                                         nr_set_cpus,
-                                                         b_info->max_vcpus));
+                                                    nr_set_cpus,
+                                                    b_info->max_vcpus));
             } else
-                flexarray_append(dm_args, GCSPRINTF("%d",
-                                                         b_info->max_vcpus));
+                flexarray_append(dm_args, GCSPRINTF("%d", b_info->max_vcpus));
         }
         for (i = 0; i < num_nics; i++) {
             if (nics[i].nictype == LIBXL_NIC_TYPE_VIF_IOEMU) {
@@ -1068,8 +1063,8 @@ static int libxl__build_device_model_args_new(libxl__gc 
*gc,
                 flexarray_append(dm_args, "-device");
                 flexarray_append(dm_args,
                    GCSPRINTF("%s,id=nic%d,netdev=net%d,mac=%s",
-                                                nics[i].model, nics[i].devid,
-                                                nics[i].devid, smac));
+                             nics[i].model, nics[i].devid,
+                             nics[i].devid, smac));
                 flexarray_append(dm_args, "-netdev");
                 flexarray_append(dm_args, GCSPRINTF(
                                           "type=tap,id=net%d,ifname=%s,"
@@ -1640,7 +1635,7 @@ static void spawn_stub_launch_dm(libxl__egc *egc,
             char *name;
             case STUBDOM_CONSOLE_LOGGING:
                 name = GCSPRINTF("qemu-dm-%s",
-                                      libxl_domid_to_name(ctx, guest_domid));
+                                 libxl_domid_to_name(ctx, guest_domid));
                 ret = libxl_create_logfile(ctx, name, &filename);
                 if (ret) goto out;
                 console[i].output = GCSPRINTF("file:%s", filename);
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.