Commit f90f5b9a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-04-30' into staging 



trivial patches for 2015-04-30

# gpg: Signature made Thu Apr 30 14:07:50 2015 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"

* remotes/mjt/tags/pull-trivial-patches-2015-04-30: (42 commits)
  openrisc: cpu: Remove unused cpu_get_pc
  microblaze: fix memory leak
  tcg: Delete unused cpu_pc_from_tb()
  kvm: Silence warning from valgrind
  vhost-user: remove superfluous '\n' around error_report()
  target-mips: fix memory leak
  qmp-commands: Fix typo
  linux-user/elfload: use QTAILQ_FOREACH instead of open-coding it
  coroutine: remove unnecessary parentheses in qemu_co_queue_empty
  qemu-char: remove unused list node from FDCharDriver
  input: remove unused mouse_handlers list
  cpus: use first_cpu macro instead of QTAILQ_FIRST(&cpus)
  microblaze: cpu: delete unused cpu_interrupts_enabled
  microblaze: cpu: Renumber EXCP_* constants to close gap
  microblaze: cpu: Delete EXCP_NMI
  microblaze: cpu: Remove unused CC_OP enum
  microblaze: cpu: Remote unused cpu_get_pc
  microblaze: mmu: Delete flip_um fn prototype
  defconfigs: Piggyback microblazeel on microblaze
  libcacard: do not use full paths for include files in the same dir
  ...

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

backends/hostmem-file.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 
        return;

    }

    if (!fb->mem_path) {

        error_setg(errp, "mem_path property not set");

        error_setg(errp, "mem-path property not set");

        return;

    }

#ifndef CONFIG_LINUX

configure

+2 −2
Original line number Diff line number Diff line
@@ -5193,8 +5193,6 @@ case "$target_name" in 
    TARGET_BASE_ARCH=mips

    echo "TARGET_ABI_MIPSN64=y" >> $config_target_mak

  ;;

  tricore)

  ;;

  moxie)

  ;;

  or32)
@@ -5245,6 +5243,8 @@ case "$target_name" in 
  s390x)

    gdb_xml_files="s390x-core64.xml s390-acr.xml s390-fpr.xml"

  ;;

  tricore)

  ;;

  unicore32)

  ;;

  xtensa|xtensaeb)

cpus.c

+1 −1
Original line number Diff line number Diff line
@@ -1016,7 +1016,7 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) 
    qemu_cond_signal(&qemu_cpu_cond);



    /* wait for initial kick-off after machine start */

    while (QTAILQ_FIRST(&cpus)->stopped) {

    while (first_cpu->stopped) {

        qemu_cond_wait(tcg_halt_cond, &qemu_global_mutex);



        /* process any pending work */

default-configs/microblazeel-softmmu.mak

+1 −9
Original line number Diff line number Diff line 
# Default configuration for microblazeel-softmmu



CONFIG_PTIMER=y

CONFIG_PFLASH_CFI01=y

CONFIG_SERIAL=y

CONFIG_XILINX=y

CONFIG_XILINX_AXI=y

CONFIG_XILINX_SPI=y

CONFIG_XILINX_ETHLITE=y

CONFIG_SSI=y

CONFIG_SSI_M25P80=y
 
include microblaze-softmmu.mak

dma-helpers.c

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include "sysemu/block-backend.h"

#include "sysemu/dma.h"

#include "trace.h"

#include "qemu/range.h"

#include "qemu/thread.h"

#include "qemu/main-loop.h"