mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aspeed: use error_report instead of LOG_GUEST_ERROR

Browse Source 
Also change the default value used in case of an error. The minimum
size is a bit severe, so let's just use an average RAM size.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-id: 1473438177-26079-13-git-send-email-clg@kaod.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Cédric Le Goater 2016-09-22 18:13:06 +01:00 committed by Peter Maydell
parent 3755f9e316
commit b2fd45458d
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/misc/aspeed_sdmc.c
View File

@ -9,6 +9,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "qemu/error-report.h"
#include "hw/misc/aspeed_sdmc.h" #include "hw/misc/aspeed_sdmc.h"
#include "hw/misc/aspeed_scu.h" #include "hw/misc/aspeed_scu.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
@ -151,13 +152,13 @@ static int ast2400_rambits(void)
case 512: case 512:
return ASPEED_SDMC_DRAM_512MB; return ASPEED_SDMC_DRAM_512MB;
default: default:
qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid RAM size: 0x"
RAM_ADDR_FMT "\n", __func__, ram_size);
break; break;
} }
/* set a minimum default */ /* use a common default */
return ASPEED_SDMC_DRAM_64MB; error_report("warning: Invalid RAM size 0x" RAM_ADDR_FMT
". Using default 256M", ram_size);
return ASPEED_SDMC_DRAM_256MB;
} }
static int ast2500_rambits(void) static int ast2500_rambits(void)
@ -172,13 +173,13 @@ static int ast2500_rambits(void)
case 1024: case 1024:
return ASPEED_SDMC_AST2500_1024MB; return ASPEED_SDMC_AST2500_1024MB;
default: default:
qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid RAM size: 0x"
RAM_ADDR_FMT "\n", __func__, ram_size);
break; break;
} }
/* set a minimum default */ /* use a common default */
return ASPEED_SDMC_AST2500_128MB; error_report("warning: Invalid RAM size 0x" RAM_ADDR_FMT
". Using default 512M", ram_size);
return ASPEED_SDMC_AST2500_512MB;
} }
static void aspeed_sdmc_reset(DeviceState *dev) static void aspeed_sdmc_reset(DeviceState *dev)