Commit b1d7d2b9 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

parents ede77d29 06ea77bc

hw/pflash_cfi02.c

+1 −1
Original line number Diff line number Diff line
@@ -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:

tcg/tcg.h

+1 −1
Original line number Diff line number Diff line
@@ -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.

 */