qemu-devel
[Top][All Lists]
Advanced

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

[PATCH] print memory in MB units in initrd-too-large errmsg


From: Jim Cromie
Subject: [PATCH] print memory in MB units in initrd-too-large errmsg
Date: Fri, 4 Aug 2023 13:01:01 -0600

Change 2 error messages to display sizes in MB, not bytes.

qemu: initrd is too large, cannot support this. (max: 2047 MB, need 5833 MB)

Also, distinguish 2 sites by adding "it" and "this" respectively.
This tells a careful reader that the error above is from the 2nd size
check.

With MB displayed, I have to ask: is it coincidence that max == 2048-1 ?

Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
---
 hw/i386/x86.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index a88a126123..0677fe2fd1 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -878,9 +878,9 @@ void x86_load_linux(X86MachineState *x86ms,
                 initrd_size = g_mapped_file_get_length(mapped_file);
                 initrd_max = x86ms->below_4g_mem_size - acpi_data_size - 1;
                 if (initrd_size >= initrd_max) {
-                    fprintf(stderr, "qemu: initrd is too large, cannot 
support."
-                            "(max: %"PRIu32", need %"PRId64")\n",
-                            initrd_max, (uint64_t)initrd_size);
+                    fprintf(stderr, "qemu: initrd is too large, cannot support 
it. "
+                            "(max: %"PRIu32" MB, need %"PRId64" MB)\n",
+                            initrd_max>>20, (uint64_t)initrd_size>>20);
                     exit(1);
                 }
 
@@ -1023,9 +1023,9 @@ void x86_load_linux(X86MachineState *x86ms,
         initrd_data = g_mapped_file_get_contents(mapped_file);
         initrd_size = g_mapped_file_get_length(mapped_file);
         if (initrd_size >= initrd_max) {
-            fprintf(stderr, "qemu: initrd is too large, cannot support."
-                    "(max: %"PRIu32", need %"PRId64")\n",
-                    initrd_max, (uint64_t)initrd_size);
+            fprintf(stderr, "qemu: initrd is too large, cannot support this. "
+                    "(max: %"PRIu32" MB, need %"PRId64" MB)\n",
+                    initrd_max>>20, (uint64_t)initrd_size>>20);
             exit(1);
         }
 
-- 
2.41.0




reply via email to

[Prev in Thread] Current Thread [Next in Thread]