Skip to content

Commit

Permalink
aspeed: use error_report instead of LOG_GUEST_ERROR
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
legoater authored and pm215 committed Sep 22, 2016
1 parent 3755f9e commit b2fd454
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions hw/misc/aspeed_sdmc.c
Expand Up @@ -9,6 +9,7 @@

#include "qemu/osdep.h"
#include "qemu/log.h"
#include "qemu/error-report.h"
#include "hw/misc/aspeed_sdmc.h"
#include "hw/misc/aspeed_scu.h"
#include "hw/qdev-properties.h"
Expand Down Expand Up @@ -151,13 +152,13 @@ static int ast2400_rambits(void)
case 512:
return ASPEED_SDMC_DRAM_512MB;
default:
qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid RAM size: 0x"
RAM_ADDR_FMT "\n", __func__, ram_size);
break;
}

/* set a minimum default */
return ASPEED_SDMC_DRAM_64MB;
/* use a common default */
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)
Expand All @@ -172,13 +173,13 @@ static int ast2500_rambits(void)
case 1024:
return ASPEED_SDMC_AST2500_1024MB;
default:
qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid RAM size: 0x"
RAM_ADDR_FMT "\n", __func__, ram_size);
break;
}

/* set a minimum default */
return ASPEED_SDMC_AST2500_128MB;
/* use a common default */
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)
Expand Down

0 comments on commit b2fd454

Please sign in to comment.