Commit 7e68494b authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'agraf/ppc-for-upstream-1.3' into staging 



* agraf/ppc-for-upstream-1.3:
  fbdev: fix pixman compile on old pixman
  vl.c: Fix broken -usb option
  pseries: Fix bug in PCI MSI allocation
  kvm: fix incorrect length in a loop over kvm dirty pages map
  PPC: Fix missing TRACE exception
  hw/ide/macio: Fix segfault caused by NULL DMAContext*

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents f3d44eb5 6e72719e

hw/ide/macio.c

+4 −2
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ static void pmac_ide_atapi_transfer_cb(void *opaque, int ret) 


    s->io_buffer_size = io->len;



    qemu_sglist_init(&s->sg, io->len / MACIO_PAGE_SIZE + 1, NULL);

    qemu_sglist_init(&s->sg, io->len / MACIO_PAGE_SIZE + 1,

                     &dma_context_memory);

    qemu_sglist_add(&s->sg, io->addr, io->len);

    io->addr += io->len;

    io->len = 0;
@@ -132,7 +133,8 @@ static void pmac_ide_transfer_cb(void *opaque, int ret) 
    s->io_buffer_index = 0;

    s->io_buffer_size = io->len;



    qemu_sglist_init(&s->sg, io->len / MACIO_PAGE_SIZE + 1, NULL);

    qemu_sglist_init(&s->sg, io->len / MACIO_PAGE_SIZE + 1,

                     &dma_context_memory);

    qemu_sglist_add(&s->sg, io->addr, io->len);

    io->addr += io->len;

    io->len = 0;

hw/spapr_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ static void rtas_ibm_change_msi(sPAPREnvironment *spapr, 


    /* There is no cached config, allocate MSIs */

    if (!phb->msi_table[ndev].nvec) {

        irq = spapr_allocate_irq_block(req_num, true);

        irq = spapr_allocate_irq_block(req_num, false);

        if (irq < 0) {

            fprintf(stderr, "Cannot allocate MSIs for device#%d", ndev);

            rtas_st(rets, 0, -1); /* Hardware error */

kvm-all.c

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ static int kvm_get_dirty_pages_log_range(MemoryRegionSection *section, 
    unsigned int i, j;

    unsigned long page_number, c;

    hwaddr addr, addr1;

    unsigned int len = ((section->size / TARGET_PAGE_SIZE) + HOST_LONG_BITS - 1) / HOST_LONG_BITS;

    unsigned int len = ((section->size / getpagesize()) + HOST_LONG_BITS - 1) / HOST_LONG_BITS;

    unsigned long hpratio = getpagesize() / TARGET_PAGE_SIZE;



    /*

qemu-pixman.c

+2 −0
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ int qemu_pixman_get_type(int rshift, int gshift, int bshift) 
        if (rshift == 0) {

            type = PIXMAN_TYPE_ABGR;

        } else {

#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0, 21, 8)

            type = PIXMAN_TYPE_BGRA;

#endif

        }

    }

    return type;

target-ppc/translate.c

+2 −1
Original line number Diff line number Diff line
@@ -3473,7 +3473,8 @@ static inline void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest) 
        if (unlikely(ctx->singlestep_enabled)) {

            if ((ctx->singlestep_enabled &

                (CPU_BRANCH_STEP | CPU_SINGLE_STEP)) &&

                ctx->exception == POWERPC_EXCP_BRANCH) {

                (ctx->exception == POWERPC_EXCP_BRANCH ||

                 ctx->exception == POWERPC_EXCP_TRACE)) {

                target_ulong tmp = ctx->nip;

                ctx->nip = dest;

                gen_exception(ctx, POWERPC_EXCP_TRACE);