fw_cfg patches for 2019-01-04
Two fixes from Li Qiang: - Improve error message when can't load splash file - Fix boot bootsplash and reboot-timeout error checking -----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJcL4hAAAoJEOPjLCzercDesE8QAKF8jol1khrsaQpw0/a5pRFp ryZFGKrrTyVxO+1YkUb2HqkGEbAG5E5GO2QeuBSXzleHturRNWgrO/ZQ4ECdlBMZ vt7INAp4bmXrqqG95xOBTZC2JDQx9ux6XfMKIg8l04p0elppFK2t017q9osDVzek TYzfjwNCaszvxHSmL1w6N38Wi9JombzaZz2BkOE9iygjiLIPPd8AerO9t5Z7LoUb SR8dA2QM3s6vsHfMCQvkO7KjUVRNXM4pCSlziuOJTYl+hFIWUIBAFN5MA5axarox 7EydAycEJeD9fsTwglftz8wi5setUA1qV/ZuREVtjRKb512C+qV5Ka3YJKtqhO4a MUwdZZh34dnlVAMEM2cdbV5yPXQZJJF6i1zTljQbciP4QfShS5SHZCq7ICHh7+Hh aVljCdXJ5dHdYXL5c0LkxiLfrjNNxpLMVvjFelOdXIZMOfuK7VXFxLG0USkMmWw/ OgBPu2WcssbUxGPBmFKvJo/uE3LNeWsDRd/+JtfZhIWPf2SVInQGkX5P+otbMm24 SN55hiF6ZTg8rl+8Hic04oN6pflRxMMIP+j2g3lnuymfvS7NYlRsaRsur6m9L3C7 rUpQd6bXzKt3cETs4FoVvdccLTaK/j7RIyMq1ExlbHVQARToPFen7cxpCLwxMqSZ vp0ZZZVDze/xv5JMkQyO =nhRc -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/philmd/tags/fw_cfg-20190104-pull-request' into staging fw_cfg patches for 2019-01-04 Two fixes from Li Qiang: - Improve error message when can't load splash file - Fix boot bootsplash and reboot-timeout error checking # gpg: Signature made Fri 04 Jan 2019 16:22:24 GMT # gpg: using RSA key E3E32C2CDEADC0DE # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" # Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE * remotes/philmd/tags/fw_cfg-20190104-pull-request: fw_cfg: Make qemu_extra_params_fw locally fw_cfg: Fix -boot reboot-timeout error checking fw_cfg: Fix -boot bootsplash error checking fw_cfg: Improve error message when can't load splash file Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
e59dbbac03
@ -68,15 +68,14 @@ static char *read_splashfile(char *filename, gsize *file_sizep,
|
||||
int *file_typep)
|
||||
{
|
||||
GError *err = NULL;
|
||||
gboolean res;
|
||||
gchar *content;
|
||||
int file_type;
|
||||
unsigned int filehead;
|
||||
int bmp_bpp;
|
||||
|
||||
res = g_file_get_contents(filename, &content, file_sizep, &err);
|
||||
if (res == FALSE) {
|
||||
error_report("failed to read splash file '%s'", filename);
|
||||
if (!g_file_get_contents(filename, &content, file_sizep, &err)) {
|
||||
error_report("failed to read splash file '%s': %s",
|
||||
filename, err->message);
|
||||
g_error_free(err);
|
||||
return NULL;
|
||||
}
|
||||
@ -118,47 +117,39 @@ error:
|
||||
|
||||
static void fw_cfg_bootsplash(FWCfgState *s)
|
||||
{
|
||||
int boot_splash_time = -1;
|
||||
const char *boot_splash_filename = NULL;
|
||||
char *p;
|
||||
const char *boot_splash_time = NULL;
|
||||
uint8_t qemu_extra_params_fw[2];
|
||||
char *filename, *file_data;
|
||||
gsize file_size;
|
||||
int file_type;
|
||||
const char *temp;
|
||||
|
||||
/* get user configuration */
|
||||
QemuOptsList *plist = qemu_find_opts("boot-opts");
|
||||
QemuOpts *opts = QTAILQ_FIRST(&plist->head);
|
||||
if (opts != NULL) {
|
||||
temp = qemu_opt_get(opts, "splash");
|
||||
if (temp != NULL) {
|
||||
boot_splash_filename = temp;
|
||||
}
|
||||
temp = qemu_opt_get(opts, "splash-time");
|
||||
if (temp != NULL) {
|
||||
p = (char *)temp;
|
||||
boot_splash_time = strtol(p, &p, 10);
|
||||
}
|
||||
}
|
||||
boot_splash_filename = qemu_opt_get(opts, "splash");
|
||||
boot_splash_time = qemu_opt_get(opts, "splash-time");
|
||||
|
||||
/* insert splash time if user configurated */
|
||||
if (boot_splash_time >= 0) {
|
||||
if (boot_splash_time) {
|
||||
int64_t bst_val = qemu_opt_get_number(opts, "splash-time", -1);
|
||||
/* validate the input */
|
||||
if (boot_splash_time > 0xffff) {
|
||||
error_report("splash time is big than 65535, force it to 65535.");
|
||||
boot_splash_time = 0xffff;
|
||||
if (bst_val < 0 || bst_val > 0xffff) {
|
||||
error_report("splash-time is invalid,"
|
||||
"it should be a value between 0 and 65535");
|
||||
exit(1);
|
||||
}
|
||||
/* use little endian format */
|
||||
qemu_extra_params_fw[0] = (uint8_t)(boot_splash_time & 0xff);
|
||||
qemu_extra_params_fw[1] = (uint8_t)((boot_splash_time >> 8) & 0xff);
|
||||
qemu_extra_params_fw[0] = (uint8_t)(bst_val & 0xff);
|
||||
qemu_extra_params_fw[1] = (uint8_t)((bst_val >> 8) & 0xff);
|
||||
fw_cfg_add_file(s, "etc/boot-menu-wait", qemu_extra_params_fw, 2);
|
||||
}
|
||||
|
||||
/* insert splash file if user configurated */
|
||||
if (boot_splash_filename != NULL) {
|
||||
if (boot_splash_filename) {
|
||||
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, boot_splash_filename);
|
||||
if (filename == NULL) {
|
||||
error_report("failed to find file '%s'.", boot_splash_filename);
|
||||
error_report("failed to find file '%s'", boot_splash_filename);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -186,26 +177,25 @@ static void fw_cfg_bootsplash(FWCfgState *s)
|
||||
|
||||
static void fw_cfg_reboot(FWCfgState *s)
|
||||
{
|
||||
int reboot_timeout = -1;
|
||||
char *p;
|
||||
const char *temp;
|
||||
const char *reboot_timeout = NULL;
|
||||
int64_t rt_val = -1;
|
||||
|
||||
/* get user configuration */
|
||||
QemuOptsList *plist = qemu_find_opts("boot-opts");
|
||||
QemuOpts *opts = QTAILQ_FIRST(&plist->head);
|
||||
if (opts != NULL) {
|
||||
temp = qemu_opt_get(opts, "reboot-timeout");
|
||||
if (temp != NULL) {
|
||||
p = (char *)temp;
|
||||
reboot_timeout = strtol(p, &p, 10);
|
||||
reboot_timeout = qemu_opt_get(opts, "reboot-timeout");
|
||||
|
||||
if (reboot_timeout) {
|
||||
rt_val = qemu_opt_get_number(opts, "reboot-timeout", -1);
|
||||
/* validate the input */
|
||||
if (rt_val < 0 || rt_val > 0xffff) {
|
||||
error_report("reboot timeout is invalid,"
|
||||
"it should be a value between 0 and 65535");
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
/* validate the input */
|
||||
if (reboot_timeout > 0xffff) {
|
||||
error_report("reboot timeout is larger than 65535, force it to 65535.");
|
||||
reboot_timeout = 0xffff;
|
||||
}
|
||||
fw_cfg_add_file(s, "etc/boot-fail-wait", g_memdup(&reboot_timeout, 4), 4);
|
||||
|
||||
fw_cfg_add_file(s, "etc/boot-fail-wait", g_memdup(&rt_val, 4), 4);
|
||||
}
|
||||
|
||||
static void fw_cfg_write(FWCfgState *s, uint8_t value)
|
||||
|
||||
@ -116,7 +116,6 @@ extern uint8_t *boot_splash_filedata;
|
||||
extern size_t boot_splash_filedata_size;
|
||||
extern bool enable_mlock;
|
||||
extern bool enable_cpu_pm;
|
||||
extern uint8_t qemu_extra_params_fw[2];
|
||||
extern QEMUClockType rtc_clock;
|
||||
extern const char *mem_path;
|
||||
extern int mem_prealloc;
|
||||
|
||||
5
vl.c
5
vl.c
@ -191,7 +191,6 @@ int boot_menu;
|
||||
bool boot_strict;
|
||||
uint8_t *boot_splash_filedata;
|
||||
size_t boot_splash_filedata_size;
|
||||
uint8_t qemu_extra_params_fw[2];
|
||||
bool wakeup_suspend_enabled;
|
||||
|
||||
int icount_align_option;
|
||||
@ -338,10 +337,10 @@ static QemuOptsList qemu_boot_opts = {
|
||||
.type = QEMU_OPT_STRING,
|
||||
}, {
|
||||
.name = "splash-time",
|
||||
.type = QEMU_OPT_STRING,
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
}, {
|
||||
.name = "reboot-timeout",
|
||||
.type = QEMU_OPT_STRING,
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
}, {
|
||||
.name = "strict",
|
||||
.type = QEMU_OPT_BOOL,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user