diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-05-31 08:23:11 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-05-31 08:23:11 -0500 |
| commit | b1d7d2b93a1d6b2d2848b616cc35acdf521c923c (patch) | |
| tree | dd3336b7a65191b019894855dc34b1e929207267 | |
| parent | ede77d297fb79263af866d302dd307af7ceb04fd (diff) | |
| parent | 06ea77bc505b2e41cc42c8c4b39d08ec638a82e8 (diff) | |
| download | focaccia-qemu-b1d7d2b93a1d6b2d2848b616cc35acdf521c923c.tar.gz focaccia-qemu-b1d7d2b93a1d6b2d2848b616cc35acdf521c923c.zip | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
| -rw-r--r-- | hw/pflash_cfi02.c | 2 | ||||
| -rw-r--r-- | tcg/tcg.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c index 8fdafe6a62..725cd1e78c 100644 --- a/hw/pflash_cfi02.c +++ b/hw/pflash_cfi02.c @@ -188,7 +188,7 @@ static uint32_t pflash_read (pflash_t *pfl, target_phys_addr_t offset, default: goto flash_read; } - DPRINTF("%s: ID " TARGET_FMT_pld " %x\n", __func__, boff, ret); + DPRINTF("%s: ID " TARGET_FMT_plx " %x\n", __func__, boff, ret); break; case 0xA0: case 0x10: diff --git a/tcg/tcg.h b/tcg/tcg.h index 2b985ac024..746378a161 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -129,7 +129,7 @@ typedef tcg_target_ulong TCGArg; We use plain int by default to avoid this runtime overhead. Users of tcg_gen_* don't need to know about any of this, and should treat TCGv as an opaque type. - In additon we do typechecking for different types of variables. TCGv_i32 + In addition we do typechecking for different types of variables. TCGv_i32 and TCGv_i64 are 32/64-bit variables respectively. TCGv and TCGv_ptr are aliases for target_ulong and host pointer sized values respectively. */ |