curl: The macro that you have to uncomment to get debugging is DEBUG_CURL.

[qemu.git] / arch_init.c

diff --git a/arch_init.c b/arch_init.c
index 23044c1d12261233c9a7feeea7fab1c3ce8cc371..c974f3fea920b62c4b82963e16b2381ce4381e4b 100644 (file)
--- a/arch_init.c
+++ b/arch_init.c
@@ -104,6 +104,8 @@ int graphic_depth = 32;
 #define QEMU_ARCH QEMU_ARCH_XTENSA
 #elif defined(TARGET_UNICORE32)
 #define QEMU_ARCH QEMU_ARCH_UNICORE32
 #define QEMU_ARCH QEMU_ARCH_XTENSA
 #elif defined(TARGET_UNICORE32)
 #define QEMU_ARCH QEMU_ARCH_UNICORE32

+#elif defined(TARGET_TRICORE)
+#define QEMU_ARCH QEMU_ARCH_TRICORE

 #endif
 
 const uint32_t arch_type = QEMU_ARCH;
 #endif
 
 const uint32_t arch_type = QEMU_ARCH;


@@ -1040,17 +1042,15 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
 {
     ram_addr_t addr;
     int flags, ret = 0;
 {
     ram_addr_t addr;
     int flags, ret = 0;

-    int error;

     static uint64_t seq_iter;
 
     seq_iter++;
 
     if (version_id != 4) {
         ret = -EINVAL;
     static uint64_t seq_iter;
 
     seq_iter++;
 
     if (version_id != 4) {
         ret = -EINVAL;

-        goto done;

     }
 
     }
 

-    do {
+    while (!ret) {

         addr = qemu_get_be64(f);
 
         flags = addr & ~TARGET_PAGE_MASK;
         addr = qemu_get_be64(f);
 
         flags = addr & ~TARGET_PAGE_MASK;


@@ -1074,11 +1074,10 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
                 QTAILQ_FOREACH(block, &ram_list.blocks, next) {
                     if (!strncmp(id, block->idstr, sizeof(id))) {
                         if (block->length != length) {
                 QTAILQ_FOREACH(block, &ram_list.blocks, next) {
                     if (!strncmp(id, block->idstr, sizeof(id))) {
                         if (block->length != length) {

-                            error_report("Length mismatch: %s: " RAM_ADDR_FMT
-                                         " in != " RAM_ADDR_FMT, id, length,
+                            error_report("Length mismatch: %s: 0x" RAM_ADDR_FMT
+                                         " in != 0x" RAM_ADDR_FMT, id, length,

                                          block->length);
                             ret =  -EINVAL;
                                          block->length);
                             ret =  -EINVAL;

-                            goto done;

                         }
                         break;
                     }
                         }
                         break;
                     }


@@ -1088,21 +1087,22 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
                     error_report("Unknown ramblock \"%s\", cannot "
                                  "accept migration", id);
                     ret = -EINVAL;
                     error_report("Unknown ramblock \"%s\", cannot "
                                  "accept migration", id);
                     ret = -EINVAL;

-                    goto done;
+                }
+                if (ret) {
+                    break;

                 }
 
                 total_ram_bytes -= length;
             }
                 }
 
                 total_ram_bytes -= length;
             }

-        }
-
-        if (flags & RAM_SAVE_FLAG_COMPRESS) {
+        } else if (flags & RAM_SAVE_FLAG_COMPRESS) {

             void *host;
             uint8_t ch;
 
             host = host_from_stream_offset(f, addr, flags);
             if (!host) {
             void *host;
             uint8_t ch;
 
             host = host_from_stream_offset(f, addr, flags);
             if (!host) {

+                error_report("Illegal RAM offset " RAM_ADDR_FMT, addr);

                 ret = -EINVAL;
                 ret = -EINVAL;

-                goto done;
+                break;

             }
 
             ch = qemu_get_byte(f);
             }
 
             ch = qemu_get_byte(f);


@@ -1112,33 +1112,39 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
 
             host = host_from_stream_offset(f, addr, flags);
             if (!host) {
 
             host = host_from_stream_offset(f, addr, flags);
             if (!host) {

+                error_report("Illegal RAM offset " RAM_ADDR_FMT, addr);

                 ret = -EINVAL;
                 ret = -EINVAL;

-                goto done;
+                break;

             }
 
             qemu_get_buffer(f, host, TARGET_PAGE_SIZE);
         } else if (flags & RAM_SAVE_FLAG_XBZRLE) {
             void *host = host_from_stream_offset(f, addr, flags);
             if (!host) {
             }
 
             qemu_get_buffer(f, host, TARGET_PAGE_SIZE);
         } else if (flags & RAM_SAVE_FLAG_XBZRLE) {
             void *host = host_from_stream_offset(f, addr, flags);
             if (!host) {

+                error_report("Illegal RAM offset " RAM_ADDR_FMT, addr);

                 ret = -EINVAL;
                 ret = -EINVAL;

-                goto done;
+                break;

             }
 
             if (load_xbzrle(f, addr, host) < 0) {
             }
 
             if (load_xbzrle(f, addr, host) < 0) {

+                error_report("Failed to decompress XBZRLE page at "
+                             RAM_ADDR_FMT, addr);

                 ret = -EINVAL;
                 ret = -EINVAL;

-                goto done;
+                break;

             }
         } else if (flags & RAM_SAVE_FLAG_HOOK) {
             ram_control_load_hook(f, flags);
             }
         } else if (flags & RAM_SAVE_FLAG_HOOK) {
             ram_control_load_hook(f, flags);

+        } else if (flags & RAM_SAVE_FLAG_EOS) {
+            /* normal exit */
+            break;
+        } else {
+            error_report("Unknown migration flags: %#x", flags);
+            ret = -EINVAL;
+            break;

         }
         }

-        error = qemu_file_get_error(f);
-        if (error) {
-            ret = error;
-            goto done;
-        }
-    } while (!(flags & RAM_SAVE_FLAG_EOS));
+        ret = qemu_file_get_error(f);
+    }

 
 

-done:

     DPRINTF("Completed load of VM with exit code %d seq iteration "
             "%" PRIu64 "\n", ret, seq_iter);
     return ret;
     DPRINTF("Completed load of VM with exit code %d seq iteration "
             "%" PRIu64 "\n", ret, seq_iter);
     return ret;