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

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



Various trivial fixes

# gpg: Signature made Wed 21 Aug 2019 12:19:11 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-pull-request:
  hw/display: Compile various display devices as common object
  hw/display/sm501: Remove unused include
  spapr_events: Rewrite a fall through comment
  vl: Rewrite a fall through comment
  target/ppc: Rewrite a fall through comment
  hw/ipmi: Rewrite a fall through comment
  hw/dma/omap_dma: Move switch 'fall through' comment to correct place
  json: Move switch 'fall through' comment to correct place
  hw/net/e1000: Fix erroneous comment
  .gitignore: ignore some vhost-user* related files
  configure: fix sdl detection using sdl2-config
  configure: remove obsoleted $sparc_cpu variable
  misc: fix naming scheme of compatiblity arrays
  test: Use g_strndup instead of plain strndup

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 33f18cf7 8a9224a2

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ 
/scsi/qemu-pr-helper

/vhost-user-scsi

/vhost-user-blk

/vhost-user-gpu

/vhost-user-input

/fsdev/virtfs-proxy-helper

*.tmp

*.[1-9]
@@ -131,6 +133,7 @@ 
/docs/interop/qemu-qmp-ref.info*

/docs/interop/qemu-qmp-ref.txt

/docs/version.texi

/contrib/vhost-user-gpu/50-qemu-gpu.json

*.tps

.stgit-*

.git-submodule-status

configure

+4 −8
Original line number Diff line number Diff line
@@ -3022,15 +3022,15 @@ fi 
##########################################

# SDL probe



# Look for sdl configuration program (pkg-config or sdl-config).  Try

# sdl-config even without cross prefix, and favour pkg-config over sdl-config.

# Look for sdl configuration program (pkg-config or sdl2-config).  Try

# sdl2-config even without cross prefix, and favour pkg-config over sdl2-config.



sdl_probe ()

{

  if $pkg_config sdl2 --exists; then

    sdlconfig="$pkg_config sdl2"

    sdlversion=$($sdlconfig --modversion 2>/dev/null)

  elif has ${sdl_config}; then

  elif has "$sdl2_config"; then

    sdlconfig="$sdl2_config"

    sdlversion=$($sdlconfig --version)

  else
@@ -3041,7 +3041,7 @@ sdl_probe () 
    # no need to do the rest

    return

  fi

  if test -n "$cross_prefix" && test "$(basename "$sdlconfig")" = sdl-config; then

  if test -n "$cross_prefix" && test "$(basename "$sdlconfig")" = sdl2-config; then

    echo warning: using "\"$sdlconfig\"" to detect cross-compiled sdl >&2

  fi
@@ -6384,9 +6384,6 @@ if test "$vnc" = "yes" ; then 
    echo "VNC JPEG support  $vnc_jpeg"

    echo "VNC PNG support   $vnc_png"

fi

if test -n "$sparc_cpu"; then

    echo "Target Sparc Arch $sparc_cpu"

fi

echo "xen support       $xen"

if test "$xen" = "yes" ; then

  echo "xen ctrl version  $xen_ctrl_version"
@@ -8034,7 +8031,6 @@ preserve_env PKG_CONFIG 
preserve_env PKG_CONFIG_LIBDIR

preserve_env PKG_CONFIG_PATH

preserve_env PYTHON

preserve_env SDL_CONFIG

preserve_env SDL2_CONFIG

preserve_env SMBD

preserve_env STRIP

docs/devel/migration.rst

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ For example: 


   a) Add a new property using ``DEFINE_PROP_BOOL`` - e.g. support-foo and

      default it to true.

   b) Add an entry to the ``HW_COMPAT_`` for the previous version that sets

   b) Add an entry to the ``hw_compat_`` for the previous version that sets

      the property to false.

   c) Add a static bool  support_foo function that tests the property.

   d) Add a subsection with a .needed set to the support_foo function

hw/display/Makefile.objs

+9 −9
Original line number Diff line number Diff line
@@ -31,13 +31,13 @@ obj-$(CONFIG_MILKYMIST_TMU2) += milkymist-tmu2.o 
milkymist-tmu2.o-cflags := $(X11_CFLAGS) $(OPENGL_CFLAGS)

milkymist-tmu2.o-libs := $(X11_LIBS) $(OPENGL_LIBS)



obj-$(CONFIG_OMAP) += omap_dss.o

common-obj-$(CONFIG_OMAP) += omap_dss.o

obj-$(CONFIG_OMAP) += omap_lcdc.o

obj-$(CONFIG_PXA2XX) += pxa2xx_lcd.o

obj-$(CONFIG_RASPI) += bcm2835_fb.o

obj-$(CONFIG_SM501) += sm501.o

obj-$(CONFIG_TCX) += tcx.o

obj-$(CONFIG_CG3) += cg3.o

common-obj-$(CONFIG_PXA2XX) += pxa2xx_lcd.o

common-obj-$(CONFIG_RASPI) += bcm2835_fb.o

common-obj-$(CONFIG_SM501) += sm501.o

common-obj-$(CONFIG_TCX) += tcx.o

common-obj-$(CONFIG_CG3) += cg3.o



obj-$(CONFIG_VGA) += vga.o
@@ -53,7 +53,7 @@ virtio-gpu.o-cflags := $(VIRGL_CFLAGS) 
virtio-gpu.o-libs += $(VIRGL_LIBS)

virtio-gpu-3d.o-cflags := $(VIRGL_CFLAGS)

virtio-gpu-3d.o-libs += $(VIRGL_LIBS)

obj-$(CONFIG_DPCD) += dpcd.o

obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dp.o

common-obj-$(CONFIG_DPCD) += dpcd.o

common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dp.o



obj-$(CONFIG_ATI_VGA) += ati.o ati_2d.o ati_dbg.o
 
common-obj-$(CONFIG_ATI_VGA) += ati.o ati_2d.o ati_dbg.o

hw/display/sm501.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include "qapi/error.h"

#include "qemu/log.h"

#include "qemu/module.h"

#include "cpu.h"

#include "hw/char/serial.h"

#include "ui/console.h"

#include "hw/sysbus.h"