Fix whitespace in migration code.

Replace tabs with spaces.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5527 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/migration-tcp.c b/migration-tcp.c
index fe6288f..a2272a7 100644 (file)
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -45,8 +45,8 @@ int debug_me = 0;
 static void tcp_cleanup(FdMigrationState *s)
 {
     if (s->detach == 2) {
-       monitor_resume();
-       s->detach = 0;
+        monitor_resume();
+        s->detach = 0;
     }
 
     qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL);
@@ -54,11 +54,11 @@ static void tcp_cleanup(FdMigrationState *s)
     if (s->file) {
         debug_me = 1;
         dprintf("closing file\n");
-       qemu_fclose(s->file);
+        qemu_fclose(s->file);
     }
 
     if (s->fd != -1)
-       close(s->fd);
+        close(s->fd);
 
     s->fd = -1;
 }
@@ -101,8 +101,8 @@ static int fd_close(void *opaque)
     FdMigrationState *s = opaque;
     dprintf("fd_close\n");
     if (s->fd != -1) {
-       close(s->fd);
-       s->fd = -1;
+        close(s->fd);
+        s->fd = -1;
     }
     return 0;
 }
@@ -114,7 +114,7 @@ static void fd_wait_for_unfreeze(void *opaque)
 
     dprintf("wait for unfreeze\n");
     if (s->state != MIG_STATE_ACTIVE)
-       return;
+        return;
 
     do {
         fd_set wfds;
@@ -132,7 +132,7 @@ static void fd_put_ready(void *opaque)
 
     if (s->state != MIG_STATE_ACTIVE) {
         dprintf("put_ready returning because of non-active state\n");
-       return;
+        return;
     }
 
     dprintf("iterate\n");
@@ -142,8 +142,8 @@ static void fd_put_ready(void *opaque)
 
         bdrv_flush_all();
         qemu_savevm_state_complete(s->file);
-       s->state = MIG_STATE_COMPLETED;
-       tcp_cleanup(s);
+        s->state = MIG_STATE_COMPLETED;
+        tcp_cleanup(s);
     }
 }
 
@@ -162,7 +162,7 @@ static void tcp_connect_migrate(FdMigrationState *s)
     ret = qemu_savevm_state_begin(s->file);
     if (ret < 0) {
         dprintf("failed, %d\n", ret);
-       tcp_error(s);
+        tcp_error(s);
         return;
     }
 
@@ -181,7 +181,7 @@ static void tcp_wait_for_connect(void *opaque)
     } while (ret == -1 && socket_error() == EINTR);
 
     if (ret < 0) {
-       tcp_error(s);
+        tcp_error(s);
         return;
     }
 
@@ -191,7 +191,7 @@ static void tcp_wait_for_connect(void *opaque)
         tcp_connect_migrate(s);
     else {
         dprintf("error connecting %d\n", val);
-       tcp_error(s);
+        tcp_error(s);
     }
 }
 
@@ -212,7 +212,7 @@ static void tcp_cancel(MigrationState *mig_state)
     FdMigrationState *s = to_fms(mig_state);
 
     if (s->state != MIG_STATE_ACTIVE)
-       return;
+        return;
 
     dprintf("cancelling migration\n");
 
@@ -228,15 +228,15 @@ static void tcp_release(MigrationState *mig_state)
     dprintf("releasing state\n");
    
     if (s->state == MIG_STATE_ACTIVE) {
-       s->state = MIG_STATE_CANCELLED;
-       tcp_cleanup(s);
+        s->state = MIG_STATE_CANCELLED;
+        tcp_cleanup(s);
     }
     free(s);
 }
 
 MigrationState *tcp_start_outgoing_migration(const char *host_port,
-                                            int64_t bandwidth_limit,
-                                            int async)
+                                             int64_t bandwidth_limit,
+                                             int async)
 {
     struct sockaddr_in addr;
     FdMigrationState *s;
@@ -259,7 +259,7 @@ MigrationState *tcp_start_outgoing_migration(const char *host_port,
     s->fd = socket(PF_INET, SOCK_STREAM, 0);
     if (s->fd == -1) {
         qemu_free(s);
-       return NULL;
+        return NULL;
     }
 
     socket_set_nonblock(s->fd);
@@ -267,7 +267,7 @@ MigrationState *tcp_start_outgoing_migration(const char *host_port,
     if (s->detach == 1) {
         dprintf("detaching from monitor\n");
         monitor_suspend();
-       s->detach = 2;
+        s->detach = 2;
     }
 
     do {

diff --git a/migration.c b/migration.c
index 684cbae..9e6c437 100644 (file)
--- a/migration.c
+++ b/migration.c
@@ -36,17 +36,17 @@ void do_migrate(int detach, const char *uri)
     const char *p;
 
     if (strstart(uri, "tcp:", &p))
-       s = tcp_start_outgoing_migration(p, max_throttle, detach);
+        s = tcp_start_outgoing_migration(p, max_throttle, detach);
     else
         term_printf("unknown migration protocol: %s\n", uri);
 
     if (s == NULL)
-       term_printf("migration failed\n");
+        term_printf("migration failed\n");
     else {
-       if (current_migration)
-           current_migration->release(current_migration);
+        if (current_migration)
+            current_migration->release(current_migration);
 
-       current_migration = s;
+        current_migration = s;
     }
 }
 
@@ -55,7 +55,7 @@ void do_migrate_cancel(void)
     MigrationState *s = current_migration;
 
     if (s)
-       s->cancel(s);
+        s->cancel(s);
 }
 
 void do_migrate_set_speed(const char *value)
@@ -66,13 +66,13 @@ void do_migrate_set_speed(const char *value)
     d = strtod(value, &ptr);
     switch (*ptr) {
     case 'G': case 'g':
-       d *= 1024;
+        d *= 1024;
     case 'M': case 'm':
-       d *= 1024;
+        d *= 1024;
     case 'K': case 'k':
-       d *= 1024;
+        d *= 1024;
     default:
-       break;
+        break;
     }
 
     max_throttle = (uint32_t)d;
@@ -83,21 +83,21 @@ void do_info_migrate(void)
     MigrationState *s = current_migration;
     
     if (s) {
-       term_printf("Migration status: ");
-       switch (s->get_status(s)) {
-       case MIG_STATE_ACTIVE:
-           term_printf("active\n");
-           break;
-       case MIG_STATE_COMPLETED:
-           term_printf("completed\n");
-           break;
-       case MIG_STATE_ERROR:
-           term_printf("failed\n");
-           break;
-       case MIG_STATE_CANCELLED:
-           term_printf("cancelled\n");
-           break;
-       }
+        term_printf("Migration status: ");
+        switch (s->get_status(s)) {
+        case MIG_STATE_ACTIVE:
+            term_printf("active\n");
+            break;
+        case MIG_STATE_COMPLETED:
+            term_printf("completed\n");
+            break;
+        case MIG_STATE_ERROR:
+            term_printf("failed\n");
+            break;
+        case MIG_STATE_CANCELLED:
+            term_printf("cancelled\n");
+            break;
+        }
     }
 }