diff options
| author | David 'Digit' Turner <digit@android.com> | 2010-10-20 19:07:28 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2010-10-21 17:03:05 +0200 |
| commit | d9b6cb97a8a9e93f1bbe5351874b03f7faa81783 (patch) | |
| tree | ed29b83a936789ffcc40d1170f6ff5c0653831c6 /hw | |
| parent | 7d98eae200f294f51ada36d9b01591fc4726dd94 (diff) | |
| download | external_qemu-d9b6cb97a8a9e93f1bbe5351874b03f7faa81783.zip external_qemu-d9b6cb97a8a9e93f1bbe5351874b03f7faa81783.tar.gz external_qemu-d9b6cb97a8a9e93f1bbe5351874b03f7faa81783.tar.bz2 | |
Fix linux-x86_64 build.
Fix various 64-bitness issues in the source code to
make the --try-64 option work again on Linux. Note that
the generated binary is not faster than its 32-bit variant
when it comes to benchmarking the boot sequence.
Change-Id: Iad248e033757d4cd25524a438a5dbe1cf3aca6cf
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/goldfish_audio.c | 2 | ||||
| -rw-r--r-- | hw/goldfish_mmc.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/goldfish_audio.c b/hw/goldfish_audio.c index 75f65bb..37e4c09 100644 --- a/hw/goldfish_audio.c +++ b/hw/goldfish_audio.c @@ -439,7 +439,7 @@ static void goldfish_audio_write(void *opaque, target_phys_addr_t offset, uint32 case AUDIO_SET_READ_BUFFER: /* save pointer to the read buffer */ goldfish_audio_buff_set_address( s->in_buff, val ); - D( "%s: AUDIO_SET_READ_BUFFER %p", __FUNCTION__, (void*)val ); + D( "%s: AUDIO_SET_READ_BUFFER %08x", __FUNCTION__, val ); break; case AUDIO_START_READ: diff --git a/hw/goldfish_mmc.c b/hw/goldfish_mmc.c index 3824db9..3157bb3 100644 --- a/hw/goldfish_mmc.c +++ b/hw/goldfish_mmc.c @@ -251,7 +251,7 @@ static void goldfish_mmc_do_command(struct goldfish_mmc_state *s, uint32_t cmd, m = (uint32_t)(capacity / (512*1024)) - 1; // m must fit into 22 bits if (m & 0xFFC00000) { - fprintf(stderr, "SD card too big (%lld bytes). Maximum SDHC card size is 128 gigabytes.\n", capacity); + fprintf(stderr, "SD card too big (%lld bytes). Maximum SDHC card size is 128 gigabytes.\n", (long long)capacity); abort(); } @@ -277,7 +277,7 @@ static void goldfish_mmc_do_command(struct goldfish_mmc_state *s, uint32_t cmd, exponent = 0; capacity = sector_count * 512; if (capacity > 2147483648U) { - fprintf(stderr, "SD card too big (%lld bytes). Maximum SD card size is 2 gigabytes.\n", capacity); + fprintf(stderr, "SD card too big (%lld bytes). Maximum SD card size is 2 gigabytes.\n", (long long)capacity); abort(); } capacity >>= 10; // convert to Kbytes |