Commit 77c9e078 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch... 


Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.1-pull-request' into staging

Trivial branch pull request 20200610

Convert DPRINTF() to traces or qemu_logs
Use IEC binary prefix definitions
Use qemu_semihosting_log_out() in target/unicore32
Some code and doc cleanup

# gpg: Signature made Wed 10 Jun 2020 14:08:36 BST
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-branch-for-5.1-pull-request:
  semihosting: remove the pthread include which seems unused
  hw/openrisc/openrisc_sim: Add assertion to silence GCC warning
  target/unicore32: Prefer qemu_semihosting_log_out() over curses
  target/unicore32: Replace DPRINTF() by qemu_log_mask(GUEST_ERROR)
  target/unicore32: Remove unused headers
  target/i386/cpu: Use the IEC binary prefix definitions
  hw/i386/xen/xen-hvm: Use the IEC binary prefix definitions
  hw/hppa/dino: Use the IEC binary prefix definitions
  hw/arm/aspeed: Correct DRAM container region size
  qemu-img: Fix doc typo for 'bitmap' subcommand
  hw/misc/auxbus: Use qemu_log_mask(UNIMP) instead of debug printf
  hw/isa/apm: Convert debug printf()s to trace events
  hw/unicore32/puv3: Use qemu_log_mask(ERROR) instead of debug printf()
  .mailmap: Update Fred Konrad email address
  net: Do not include a newline in the id of -nic devices
  Fix parameter type in vhost migration log path

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>

# Conflicts:
#	.mailmap
parents 3666f684 fe18e6ee

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <arikalo@wavecomp.com> 
Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <aleksandar.rikalo@rt-rk.com>

Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>

Filip Bozuta <filip.bozuta@syrmia.com> <filip.bozuta@rt-rk.com.com>

Frederic Konrad <konrad@adacore.com> <fred.konrad@greensocs.com>

James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>

Leif Lindholm <leif@nuviainc.com> <leif.lindholm@linaro.org>

Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com>

default-configs/unicore32-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ 
# Boards:

#

CONFIG_PUV3=y

CONFIG_SEMIHOSTING=y

hw/arm/aspeed.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static void aspeed_machine_init(MachineState *machine) 
    bmc = g_new0(AspeedBoardState, 1);



    memory_region_init(&bmc->ram_container, NULL, "aspeed-ram-container",

                       UINT32_MAX);

                       4 * GiB);

    memory_region_add_subregion(&bmc->ram_container, 0, machine->ram);



    object_initialize_child(OBJECT(machine), "soc", &bmc->soc,

hw/dma/puv3_dma.c

+7 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#undef DEBUG_PUV3

#include "hw/unicore32/puv3.h"

#include "qemu/module.h"

#include "qemu/log.h"



#define PUV3_DMA_CH_NR          (6)

#define PUV3_DMA_CH_MASK        (0xff)
@@ -43,7 +44,9 @@ static uint64_t puv3_dma_read(void *opaque, hwaddr offset, 
        ret = s->reg_CFG[PUV3_DMA_CH(offset)];

        break;

    default:

        DPRINTF("Bad offset 0x%x\n", offset);

        qemu_log_mask(LOG_GUEST_ERROR,

                      "%s: Bad read offset 0x%"HWADDR_PRIx"\n",

                      __func__, offset);

    }

    DPRINTF("offset 0x%x, value 0x%x\n", offset, ret);
@@ -62,7 +65,9 @@ static void puv3_dma_write(void *opaque, hwaddr offset, 
        s->reg_CFG[PUV3_DMA_CH(offset)] = value;

        break;

    default:

        DPRINTF("Bad offset 0x%x\n", offset);

        qemu_log_mask(LOG_GUEST_ERROR,

                      "%s: Bad write offset 0x%"HWADDR_PRIx"\n",

                      __func__, offset);

    }

    DPRINTF("offset 0x%x, value 0x%x\n", offset, value);

}

hw/gpio/puv3_gpio.c

+11 −4
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#undef DEBUG_PUV3

#include "hw/unicore32/puv3.h"

#include "qemu/module.h"

#include "qemu/log.h"



#define TYPE_PUV3_GPIO "puv3_gpio"

#define PUV3_GPIO(obj) OBJECT_CHECK(PUV3GPIOState, (obj), TYPE_PUV3_GPIO)
@@ -47,7 +48,9 @@ static uint64_t puv3_gpio_read(void *opaque, hwaddr offset, 
        ret = s->reg_GPIR;

        break;

    default:

        DPRINTF("Bad offset 0x%x\n", offset);

        qemu_log_mask(LOG_GUEST_ERROR,

                      "%s: Bad read offset 0x%"HWADDR_PRIx"\n",

                      __func__, offset);

    }

    DPRINTF("offset 0x%x, value 0x%x\n", offset, ret);
@@ -68,14 +71,16 @@ static void puv3_gpio_write(void *opaque, hwaddr offset, 
        if (s->reg_GPDR & value) {

            s->reg_GPLR |= value;

        } else {

            DPRINTF("Write gpio input port error!");

            qemu_log_mask(LOG_GUEST_ERROR, "%s: Write gpio input port\n",

                          __func__);

        }

        break;

    case 0x0c:

        if (s->reg_GPDR & value) {

            s->reg_GPLR &= ~value;

        } else {

            DPRINTF("Write gpio input port error!");

            qemu_log_mask(LOG_GUEST_ERROR, "%s: Write gpio input port\n",

                          __func__);

        }

        break;

    case 0x10: /* GRER */
@@ -86,7 +91,9 @@ static void puv3_gpio_write(void *opaque, hwaddr offset, 
        s->reg_GPIR = value;

        break;

    default:

        DPRINTF("Bad offset 0x%x\n", offset);

        qemu_log_mask(LOG_GUEST_ERROR,

                      "%s: Bad write offset 0x%"HWADDR_PRIx"\n",

                      __func__, offset);

    }

}