Explorar el Código

mips: do not use ram_size global

Use the machine properties or loader parameters instead.

Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Paolo Bonzini hace 4 años
padre
commit
74d6bf8525
Se han modificado 2 ficheros con 3 adiciones y 3 borrados
  1. 2 2
      hw/mips/fuloong2e.c
  2. 1 1
      hw/mips/malta.c

+ 2 - 2
hw/mips/fuloong2e.c

@@ -134,14 +134,14 @@ static int64_t load_kernel(CPUMIPSState *env)
         initrd_size = get_image_size(loaderparams.initrd_filename);
         initrd_size = get_image_size(loaderparams.initrd_filename);
         if (initrd_size > 0) {
         if (initrd_size > 0) {
             initrd_offset = ROUND_UP(kernel_high, INITRD_PAGE_SIZE);
             initrd_offset = ROUND_UP(kernel_high, INITRD_PAGE_SIZE);
-            if (initrd_offset + initrd_size > ram_size) {
+            if (initrd_offset + initrd_size > loaderparams.ram_size) {
                 error_report("memory too small for initial ram disk '%s'",
                 error_report("memory too small for initial ram disk '%s'",
                              loaderparams.initrd_filename);
                              loaderparams.initrd_filename);
                 exit(1);
                 exit(1);
             }
             }
             initrd_size = load_image_targphys(loaderparams.initrd_filename,
             initrd_size = load_image_targphys(loaderparams.initrd_filename,
                                               initrd_offset,
                                               initrd_offset,
-                                              ram_size - initrd_offset);
+                                              loaderparams.ram_size - initrd_offset);
         }
         }
         if (initrd_size == (target_ulong) -1) {
         if (initrd_size == (target_ulong) -1) {
             error_report("could not load initial ram disk '%s'",
             error_report("could not load initial ram disk '%s'",

+ 1 - 1
hw/mips/malta.c

@@ -1087,7 +1087,7 @@ static int64_t load_kernel(void)
             }
             }
             initrd_size = load_image_targphys(loaderparams.initrd_filename,
             initrd_size = load_image_targphys(loaderparams.initrd_filename,
                                               initrd_offset,
                                               initrd_offset,
-                                              ram_size - initrd_offset);
+                                              loaderparams.ram_size - initrd_offset);
         }
         }
         if (initrd_size == (target_ulong) -1) {
         if (initrd_size == (target_ulong) -1) {
             error_report("could not load initial ram disk '%s'",
             error_report("could not load initial ram disk '%s'",