[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 04/15] hw/i386/pc: replace use of strtol with qemu_strtol in x
From: |
Sergio Lopez |
Subject: |
[PATCH v8 04/15] hw/i386/pc: replace use of strtol with qemu_strtol in x86_load_linux() |
Date: |
Thu, 10 Oct 2019 16:31:14 +0200 |
Follow checkpatch.pl recommendation and replace the use of strtol with
qemu_strtol in x86_load_linux().
Signed-off-by: Sergio Lopez <address@hidden>
---
hw/i386/pc.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 77e86bfc3d..e6bcc3ff42 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -68,6 +68,7 @@
#include "qemu/config-file.h"
#include "qemu/error-report.h"
#include "qemu/option.h"
+#include "qemu/cutils.h"
#include "hw/acpi/acpi.h"
#include "hw/acpi/cpu_hotplug.h"
#include "hw/boards.h"
@@ -1201,7 +1202,8 @@ static void x86_load_linux(PCMachineState *pcms,
/* handle vga= parameter */
vmode = strstr(kernel_cmdline, "vga=");
if (vmode) {
- unsigned int video_mode;
+ long video_mode;
+ int ret;
/* skip "vga=" */
vmode += 4;
if (!strncmp(vmode, "normal", 6)) {
@@ -1211,7 +1213,12 @@ static void x86_load_linux(PCMachineState *pcms,
} else if (!strncmp(vmode, "ask", 3)) {
video_mode = 0xfffd;
} else {
- video_mode = strtol(vmode, NULL, 0);
+ ret = qemu_strtol(vmode, NULL, 0, &video_mode);
+ if (ret != 0) {
+ fprintf(stderr, "qemu: can't parse 'vga' parameter: %s\n",
+ strerror(-ret));
+ exit(1);
+ }
}
stw_p(header + 0x1fa, video_mode);
}
--
2.21.0
[PATCH v8 05/15] hw/i386/pc: avoid an assignment in if condition in x86_load_linux(), Sergio Lopez, 2019/10/10
[PATCH v8 06/15] hw/i386/pc: remove commented out code from x86_load_linux(), Sergio Lopez, 2019/10/10
[PATCH v8 06/15] hw/i386/pc: remove commented out code from x86_load_linux(), Sergio Lopez, 2019/10/10
[PATCH v8 07/15] hw/i386/pc: move shared x86 functions to x86.c and export them, Sergio Lopez, 2019/10/10