Patchwork [v2,01/11] minor whitespace/indentation fixes

login
register
mail settings
Submitter =?utf-8?Q?Llu=C3=ADs?=
Date April 6, 2011, 6:33 p.m.
Message ID <20110406183348.22854.93569.stgit@ginnungagap.bsc.es>
Download mbox | patch
Permalink /patch/90055/
State New
Headers show

Comments

=?utf-8?Q?Llu=C3=ADs?= - April 6, 2011, 6:33 p.m.
Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
---
 configure       |   30 +++++++++++++-------------
 hmp-commands.hx |   28 ++++++++++++------------
 monitor.c       |   14 ++++++------
 vl.c            |   64 ++++++++++++++++++++++++++++---------------------------
 4 files changed, 68 insertions(+), 68 deletions(-)
Stefan Hajnoczi - April 23, 2011, 2:19 p.m.
On Wed, Apr 6, 2011 at 7:33 PM, Lluís <xscript@gmx.net> wrote:
> Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
> ---
>  configure       |   30 +++++++++++++-------------
>  hmp-commands.hx |   28 ++++++++++++------------
>  monitor.c       |   14 ++++++------
>  vl.c            |   64 ++++++++++++++++++++++++++++---------------------------
>  4 files changed, 68 insertions(+), 68 deletions(-)

Not tracing related.  Whitespace changes make it harder for
forks/downstream and clutter git-blame(1).  Please drop this patch.

Stefan
Markus Armbruster - April 26, 2011, 10 a.m.
Stefan Hajnoczi <stefanha@gmail.com> writes:

> On Wed, Apr 6, 2011 at 7:33 PM, Lluís <xscript@gmx.net> wrote:
>> Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
>> ---
>>  configure       |   30 +++++++++++++-------------
>>  hmp-commands.hx |   28 ++++++++++++------------
>>  monitor.c       |   14 ++++++------
>>  vl.c            |   64 ++++++++++++++++++++++++++++---------------------------
>>  4 files changed, 68 insertions(+), 68 deletions(-)
>
> Not tracing related.  Whitespace changes make it harder for
> forks/downstream and clutter git-blame(1).  Please drop this patch.

I'm not arguing for or against this patch, just want to point to
"git-blame -w".

Patch

diff --git a/configure b/configure
index faaed60..8754060 100755
--- a/configure
+++ b/configure
@@ -965,7 +965,7 @@  int main(void) { return 0; }
 EOF
 for flag in $gcc_flags; do
     if compile_prog "-Werror $QEMU_CFLAGS" "-Werror $flag" ; then
-	QEMU_CFLAGS="$QEMU_CFLAGS $flag"
+        QEMU_CFLAGS="$QEMU_CFLAGS $flag"
     fi
 done
 
@@ -1264,7 +1264,7 @@  EOF
          sdl_cflags="$sdl_cflags `aalib-config --cflags 2>/dev/null`"
       fi
       if compile_prog "$sdl_cflags" "$sdl_libs" ; then
-	:
+        :
       else
         sdl=no
       fi
@@ -1727,10 +1727,10 @@  EOF
       if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) \
          -a -d "$kerneldir/arch/x86/include" ; then
             kvm_cflags="$kvm_cflags -I$kerneldir/arch/x86/include"
-	elif test "$cpu" = "ppc" -a -d "$kerneldir/arch/powerpc/include" ; then
-	    kvm_cflags="$kvm_cflags -I$kerneldir/arch/powerpc/include"
-	elif test "$cpu" = "s390x" -a -d "$kerneldir/arch/s390/include" ; then
-	    kvm_cflags="$kvm_cflags -I$kerneldir/arch/s390/include"
+        elif test "$cpu" = "ppc" -a -d "$kerneldir/arch/powerpc/include" ; then
+            kvm_cflags="$kvm_cflags -I$kerneldir/arch/powerpc/include"
+        elif test "$cpu" = "s390x" -a -d "$kerneldir/arch/s390/include" ; then
+            kvm_cflags="$kvm_cflags -I$kerneldir/arch/s390/include"
         elif test -d "$kerneldir/arch/$cpu/include" ; then
             kvm_cflags="$kvm_cflags -I$kerneldir/arch/$cpu/include"
       fi
@@ -1750,8 +1750,8 @@  EOF
     if test "$kvm" = "yes" ; then
       if has awk && has grep; then
         kvmerr=`LANG=C $cc $QEMU_CFLAGS -o $TMPE $kvm_cflags $TMPC 2>&1 \
-	| grep "error: " \
-	| awk -F "error: " '{if (NR>1) printf(", "); printf("%s",$2);}'`
+        | grep "error: " \
+        | awk -F "error: " '{if (NR>1) printf(", "); printf("%s",$2);}'`
         if test "$kvmerr" != "" ; then
           echo -e "${kvmerr}\n\
 NOTE: To enable KVM support, update your kernel to 2.6.29+ or install \
@@ -1984,8 +1984,8 @@  cat > $TMPC << EOF
 int
 main(void)
 {
-	/* try to unlink nonexisting file */
-	return (unlinkat(AT_FDCWD, "nonexistent_file", 0));
+        /* try to unlink nonexisting file */
+        return (unlinkat(AT_FDCWD, "nonexistent_file", 0));
 }
 EOF
 if compile_prog "" "" ; then
@@ -2004,8 +2004,8 @@  cat > $TMPC << EOF
 int
 main(void)
 {
-	/* try to start inotify */
-	return inotify_init();
+        /* try to start inotify */
+        return inotify_init();
 }
 EOF
 if compile_prog "" "" ; then
@@ -2479,9 +2479,9 @@  fi
 # enable/disable
 if test -z "$zero_malloc" ; then
     if test "$z_version" = "50" ; then
-	zero_malloc="no"
+        zero_malloc="no"
     else
-	zero_malloc="yes"
+        zero_malloc="yes"
     fi
 fi
 
@@ -3390,7 +3390,7 @@  if test "$target_softmmu" = "yes" ; then
 fi
 
 if test "$target_user_only" = "yes" -a "$static" = "no" -a \
-	"$user_pie" = "yes" ; then
+        "$user_pie" = "yes" ; then
   cflags="-fpie $cflags"
   ldflags="-pie $ldflags"
 fi
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 834e6a8..c3be311 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -757,12 +757,12 @@  ETEXI
         .args_type  = "detach:-d,blk:-b,inc:-i,uri:s",
         .params     = "[-d] [-b] [-i] uri",
         .help       = "migrate to URI (using -d to not wait for completion)"
-		      "\n\t\t\t -b for migration without shared storage with"
-		      " full copy of disk\n\t\t\t -i for migration without "
-		      "shared storage with incremental copy of disk "
-		      "(base image shared between src and destination)",
-        .user_print = monitor_user_noop,	
-	.mhandler.cmd_new = do_migrate,
+                      "\n\t\t\t -b for migration without shared storage with"
+                      " full copy of disk\n\t\t\t -i for migration without "
+                      "shared storage with incremental copy of disk "
+                      "(base image shared between src and destination)",
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_migrate,
     },
 
 
@@ -770,8 +770,8 @@  STEXI
 @item migrate [-d] [-b] [-i] @var{uri}
 @findex migrate
 Migrate to @var{uri} (using -d to not wait for completion).
-	-b for migration with full copy of disk
-	-i for migration with incremental copy of disk (base image is shared)
+        -b for migration with full copy of disk
+        -i for migration with incremental copy of disk (base image is shared)
 ETEXI
 
     {
@@ -794,7 +794,7 @@  ETEXI
         .args_type  = "value:o",
         .params     = "value",
         .help       = "set maximum speed (in bytes) for migrations. "
-	"Defaults to MB if no size suffix is specified, ie. B/K/M/G/T",
+        "Defaults to MB if no size suffix is specified, ie. B/K/M/G/T",
         .user_print = monitor_user_noop,
         .mhandler.cmd_new = do_migrate_set_speed,
     },
@@ -911,14 +911,14 @@  ETEXI
     {
         .name       = "pcie_aer_inject_error",
         .args_type  = "advisory_non_fatal:-a,correctable:-c,"
-	              "id:s,error_status:s,"
-	              "header0:i?,header1:i?,header2:i?,header3:i?,"
-	              "prefix0:i?,prefix1:i?,prefix2:i?,prefix3:i?",
+                      "id:s,error_status:s,"
+                      "header0:i?,header1:i?,header2:i?,header3:i?,"
+                      "prefix0:i?,prefix1:i?,prefix2:i?,prefix3:i?",
         .params     = "[-a] [-c] id "
                       "<error_status> [<tlp header> [<tlp header prefix>]]",
         .help       = "inject pcie aer error\n\t\t\t"
-	              " -a for advisory non fatal error\n\t\t\t"
-	              " -c for correctable error\n\t\t\t"
+                      " -a for advisory non fatal error\n\t\t\t"
+                      " -c for correctable error\n\t\t\t"
                       "<id> = qdev device id\n\t\t\t"
                       "<error_status> = error string or 32bit\n\t\t\t"
                       "<tlb header> = 32bit x 4\n\t\t\t"
diff --git a/monitor.c b/monitor.c
index f1a08dc..2ba1362 100644
--- a/monitor.c
+++ b/monitor.c
@@ -630,7 +630,7 @@  static void do_trace_file(Monitor *mon, const QDict *qdict)
 
 static void user_monitor_complete(void *opaque, QObject *ret_data)
 {
-    MonitorCompletionData *data = (MonitorCompletionData *)opaque; 
+    MonitorCompletionData *data = (MonitorCompletionData *)opaque;
 
     if (ret_data) {
         data->user_print(data->mon, ret_data);
@@ -3955,11 +3955,11 @@  static int default_fmt_size = 4;
 static int is_valid_option(const char *c, const char *typestr)
 {
     char option[3];
-  
+
     option[0] = '-';
     option[1] = *c;
     option[2] = '\0';
-  
+
     typestr = strstr(typestr, option);
     return (typestr != NULL);
 }
@@ -4299,7 +4299,7 @@  static const mon_cmd_t *monitor_parse_command(Monitor *mon,
                     p++;
                     if(c != *p) {
                         if(!is_valid_option(p, typestr)) {
-                  
+
                             monitor_printf(mon, "%s: unsupported option -%c\n",
                                            cmdname, *p);
                             goto fail;
@@ -4718,7 +4718,7 @@  static int check_client_args_type(const QDict *client_args,
             if (qobject_type(client_arg) != QTYPE_QINT) {
                 qerror_report(QERR_INVALID_PARAMETER_TYPE, client_arg_name,
                               "int");
-                return -1; 
+                return -1;
             }
             break;
         case 'T':
@@ -4726,7 +4726,7 @@  static int check_client_args_type(const QDict *client_args,
                 qobject_type(client_arg) != QTYPE_QFLOAT) {
                 qerror_report(QERR_INVALID_PARAMETER_TYPE, client_arg_name,
                               "number");
-               return -1; 
+               return -1;
             }
             break;
         case 'b':
@@ -4734,7 +4734,7 @@  static int check_client_args_type(const QDict *client_args,
             if (qobject_type(client_arg) != QTYPE_QBOOL) {
                 qerror_report(QERR_INVALID_PARAMETER_TYPE, client_arg_name,
                               "bool");
-               return -1; 
+               return -1;
             }
             break;
         case 'O':
diff --git a/vl.c b/vl.c
index de232b7..8478cb8 100644
--- a/vl.c
+++ b/vl.c
@@ -1860,7 +1860,7 @@  static int virtcon_parse(const char *devname)
 }
 
 static int debugcon_parse(const char *devname)
-{   
+{
     QemuOpts *opts;
 
     if (!qemu_chr_open("debugcon", devname, NULL)) {
@@ -2041,7 +2041,7 @@  int main(int argc, char **argv, char **envp)
         if (optind >= argc)
             break;
         if (argv[optind][0] != '-') {
-	    hda_opts = drive_add(IF_DEFAULT, 0, argv[optind++], HD_OPTS);
+            hda_opts = drive_add(IF_DEFAULT, 0, argv[optind++], HD_OPTS);
         } else {
             const QEMUOption *popt;
 
@@ -2103,15 +2103,15 @@  int main(int argc, char **argv, char **envp)
                 break;
             case QEMU_OPTION_drive:
                 drive_def(optarg);
-	        break;
+                break;
             case QEMU_OPTION_set:
                 if (qemu_set_option(optarg) != 0)
                     exit(1);
-	        break;
+                break;
             case QEMU_OPTION_global:
                 if (qemu_global_option(optarg) != 0)
                     exit(1);
-	        break;
+                break;
             case QEMU_OPTION_mtdblock:
                 drive_add(IF_MTD, -1, optarg, MTD_OPTS);
                 break;
@@ -2158,7 +2158,7 @@  int main(int argc, char **argv, char **envp)
                         fprintf(stderr, "qemu: invalid physical CHS format\n");
                         exit(1);
                     }
-		    if (hda_opts != NULL) {
+                    if (hda_opts != NULL) {
                         char num[16];
                         snprintf(num, sizeof(num), "%d", cyls);
                         qemu_opt_set(hda_opts, "cyls", num);
@@ -2360,9 +2360,9 @@  int main(int argc, char **argv, char **envp)
             case QEMU_OPTION_S:
                 autostart = 0;
                 break;
-	    case QEMU_OPTION_k:
-		keyboard_layout = optarg;
-		break;
+            case QEMU_OPTION_k:
+                keyboard_layout = optarg;
+                break;
             case QEMU_OPTION_localtime:
                 rtc_utc = 0;
                 break;
@@ -2545,9 +2545,9 @@  int main(int argc, char **argv, char **envp)
             case QEMU_OPTION_debugcon:
                 add_device_config(DEV_DEBUGCON, optarg);
                 break;
-	    case QEMU_OPTION_loadvm:
-		loadvm = optarg;
-		break;
+            case QEMU_OPTION_loadvm:
+                loadvm = optarg;
+                break;
             case QEMU_OPTION_full_screen:
                 full_screen = 1;
                 break;
@@ -2622,7 +2622,7 @@  int main(int argc, char **argv, char **envp)
                     exit(1);
                 }
                 break;
-	    case QEMU_OPTION_vnc:
+            case QEMU_OPTION_vnc:
 #ifdef CONFIG_VNC
                 display_remote++;
                 vnc_display = optarg;
@@ -2659,11 +2659,11 @@  int main(int argc, char **argv, char **envp)
                     exit(1);
                 }
                 break;
-	    case QEMU_OPTION_option_rom:
-		if (nb_option_roms >= MAX_OPTION_ROMS) {
-		    fprintf(stderr, "Too many option ROMs\n");
-		    exit(1);
-		}
+            case QEMU_OPTION_option_rom:
+                if (nb_option_roms >= MAX_OPTION_ROMS) {
+                    fprintf(stderr, "Too many option ROMs\n");
+                    exit(1);
+                }
                 opts = qemu_opts_parse(qemu_find_opts("option-rom"), optarg, 1);
                 option_rom[nb_option_roms].name = qemu_opt_get(opts, "romfile");
                 option_rom[nb_option_roms].bootindex =
@@ -2672,25 +2672,25 @@  int main(int argc, char **argv, char **envp)
                     fprintf(stderr, "Option ROM file is not specified\n");
                     exit(1);
                 }
-		nb_option_roms++;
-		break;
+                nb_option_roms++;
+                break;
             case QEMU_OPTION_semihosting:
                 semihosting_enabled = 1;
                 break;
             case QEMU_OPTION_name:
                 qemu_name = qemu_strdup(optarg);
-		 {
-		     char *p = strchr(qemu_name, ',');
-		     if (p != NULL) {
-		        *p++ = 0;
-			if (strncmp(p, "process=", 8)) {
-			    fprintf(stderr, "Unknown subargument %s to -name\n", p);
-			    exit(1);
-			}
-			p += 8;
-			os_set_proc_name(p);
-		     }	
-		 }	
+                 {
+                     char *p = strchr(qemu_name, ',');
+                     if (p != NULL) {
+                        *p++ = 0;
+                        if (strncmp(p, "process=", 8)) {
+                            fprintf(stderr, "Unknown subargument %s to -name\n", p);
+                            exit(1);
+                        }
+                        p += 8;
+                        os_set_proc_name(p);
+                     }
+                 }
                 break;
             case QEMU_OPTION_prom_env:
                 if (nb_prom_envs >= MAX_PROM_ENVS) {