[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/14] hw/arm/nseries: don't print to stdout or stde
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 01/14] hw/arm/nseries: don't print to stdout or stderr |
Date: |
Fri, 5 Apr 2013 18:13:06 +0100 |
Remove various bits of printing to stdout or stderr from the
nseries code, replacing it with a qemu log message where there's
an appropriate log category, and just dropping the output for
some of the more debug-like printing.
In particular, this will get rid of the 'mipid_reset' message
you currently get from 'make check'.
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Message-id: address@hidden
---
hw/arm/nseries.c | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index 6747c1c..b28e7d3 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -129,8 +129,6 @@ static void n800_mmc_cs_cb(void *opaque, int line, int
level)
/* TODO: this seems to actually be connected to the menelaus, to
* which also both MMC slots connect. */
omap_mmc_enable((struct omap_mmc_s *) opaque, !level);
-
- printf("%s: MMC slot %i active\n", __FUNCTION__, level + 1);
}
static void n8x0_gpio_setup(struct n800_s *s)
@@ -428,9 +426,6 @@ struct mipid_s {
static void mipid_reset(struct mipid_s *s)
{
- if (!s->sleep)
- fprintf(stderr, "%s: Display off\n", __FUNCTION__);
-
s->pm = 0;
s->cmd = 0;
@@ -578,11 +573,9 @@ static uint32_t mipid_txrx(void *opaque, uint32_t cmd, int
len)
case 0x28: /* DISPOFF */
s->onoff = 0;
- fprintf(stderr, "%s: Display off\n", __FUNCTION__);
break;
case 0x29: /* DISPON */
s->onoff = 1;
- fprintf(stderr, "%s: Display on\n", __FUNCTION__);
break;
case 0x2a: /* CASET */
@@ -669,7 +662,8 @@ static uint32_t mipid_txrx(void *opaque, uint32_t cmd, int
len)
default:
bad_cmd:
- fprintf(stderr, "%s: unknown command %02x\n", __FUNCTION__, s->cmd);
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s: unknown command %02x\n", __func__, s->cmd);
break;
}
@@ -1347,7 +1341,6 @@ static void n8x0_init(QEMUMachineInitArgs *args,
if (option_rom[0].name &&
(args->boot_device[0] == 'n' || !args->kernel_filename)) {
- int rom_size;
uint8_t nolo_tags[0x10000];
/* No, wait, better start at the ROM. */
s->mpu->cpu->env.regs[15] = OMAP2_Q2_BASE + 0x400000;
@@ -1361,10 +1354,9 @@ static void n8x0_init(QEMUMachineInitArgs *args,
*
* The code above is for loading the `zImage' file from Nokia
* images. */
- rom_size = load_image_targphys(option_rom[0].name,
- OMAP2_Q2_BASE + 0x400000,
- sdram_size - 0x400000);
- printf("%i bytes of image loaded\n", rom_size);
+ load_image_targphys(option_rom[0].name,
+ OMAP2_Q2_BASE + 0x400000,
+ sdram_size - 0x400000);
n800_setup_nolo_tags(nolo_tags);
cpu_physical_memory_write(OMAP2_SRAM_BASE, nolo_tags, 0x10000);
--
1.7.9.5
- [Qemu-devel] [PULL 00/14] arm-devs queue, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 04/14] vmstate.h: introduce VMSTATE_BUFFER_POINTER_UNSAFE macro, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 14/14] hw/nand.c: Fix nand erase operation, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 03/14] hw/arm_mptimer: Save the timer state, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 12/14] pl330: Don't inhibit ES bits on INTEN, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 11/14] pflash_cfi01: Implement migration support, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 05/14] hw/sd.c: fix migration of dynamically allocated buffer "buf", Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 01/14] hw/arm/nseries: don't print to stdout or stderr,
Peter Maydell <=
- [Qemu-devel] [PATCH 13/14] cadence_uart: Flush queued characters on reset, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 09/14] hw/arm_gic_common: Use vmstate struct rather than save/load functions, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 08/14] arm_gic: Fix sizes of state fields in preparation for vmstate support, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 10/14] pflash_cfi01: Drop unused 'bypass' field, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 07/14] vmstate: Add support for two dimensional arrays, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 02/14] pl050: Don't send always-constant is_mouse field, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 06/14] hw/onenand.c: fix migration of dynamically allocated buffer "otp", Peter Maydell, 2013/04/05
- Re: [Qemu-devel] [PULL 00/14] arm-devs queue, Blue Swirl, 2013/04/06