Commit 851aa0a5 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-01-22' into staging 



- Use more CONFIG Makefile switches for qtests
- Get rid of global_qtests in some more qtests
- typedef cleanups
- Fixes for compiling with Clang
- Force C standard to gnu99
- Don't use -nographic in qtests

# gpg: Signature made Tue 22 Jan 2019 06:18:41 GMT
# gpg:                using RSA key 2ED9D774FE702DB5
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>"
# gpg:                 aka "Thomas Huth <thuth@redhat.com>"
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>"
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>"
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2019-01-22: (26 commits)
  tests: remove rule for nonexisting qdev-monitor-test
  tests/hexloader-test: Don't pass -nographic to the QEMU under test
  configure: Force the C standard to gnu99
  seccomp: Work-around GCC 4.x bug in gnu99 mode
  block: Work-around a bug in libiscsi 1.9.0 when used in gnu99 mode
  linux-user: Fix compilation with clang 3.4
  virtio-net: Fix VirtIONet typedef redefinition
  ppc: Fix duplicated typedefs to be able to compile with Clang in gnu99 mode
  ppc: Move spapr-related prototypes from xics.h into a seperate header file
  ui/console: Remove PixelFormat from qemu/typedefs.h
  ui/console: Remove MouseTransformInfo from qemu/typedefs.h
  ui/console: Remove DisplayState/DisplaySurface from "qemu/typedefs.h"
  ui/console: Remove QemuDmaBuf from "qemu/typedefs.h"
  audio: Remove AudioState from "qemu/typedefs.h"
  hw/i386: Remove PCMachineClass from "qemu/typedefs.h"
  hw/char/serial: Remove SerialState from "qemu/typedefs.h"
  hw/bt: Remove HCIInfo from "qemu/typedefs.h"
  hw/i2c/smbus: Remove SMBusDevice from "qemu/typedefs.h"
  hw/ide/ahci: Remove AllwinnerAHCIState from "qemu/typedefs.h"
  hw/pcmcia: Remove PCMCIACardState from "qemu/typedefs.h"
  ...

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

audio/audio_int.h

+2 −2
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ struct SWVoiceCap { 
    QLIST_ENTRY (SWVoiceCap) entries;

};



struct AudioState {

typedef struct AudioState {

    struct audio_driver *drv;

    void *drv_opaque;
@@ -203,7 +203,7 @@ struct AudioState { 
    int nb_hw_voices_out;

    int nb_hw_voices_in;

    int vm_running;

};

} AudioState;



extern const struct mixeng_volume nominal_volume;

block/iscsi.c

+2 −0
Original line number Diff line number Diff line
@@ -49,7 +49,9 @@ 
/* Conflict between scsi/utils.h and libiscsi! :( */

#define SCSI_XFER_NONE ISCSI_XFER_NONE

#include <iscsi/iscsi.h>

#define inline __attribute__((gnu_inline))  /* required for libiscsi v1.9.0 */

#include <iscsi/scsi-lowlevel.h>

#undef inline

#undef SCSI_XFER_NONE

QEMU_BUILD_BUG_ON((int)SCSI_XFER_NONE != (int)ISCSI_XFER_NONE);

configure

+4 −1
Original line number Diff line number Diff line
@@ -107,6 +107,9 @@ update_cxxflags() { 
            -Wstrict-prototypes|-Wmissing-prototypes|-Wnested-externs|\

            -Wold-style-declaration|-Wold-style-definition|-Wredundant-decls)

                ;;

            -std=gnu99)

                QEMU_CXXFLAGS=${QEMU_CXXFLAGS:+$QEMU_CXXFLAGS }"-std=gnu++98"

                ;;

            *)

                QEMU_CXXFLAGS=${QEMU_CXXFLAGS:+$QEMU_CXXFLAGS }$arg

                ;;
@@ -584,7 +587,7 @@ ARFLAGS="${ARFLAGS-rv}" 
# left shift of signed integers is well defined and has the expected

# 2s-complement style results. (Both clang and gcc agree that it

# provides these semantics.)

QEMU_CFLAGS="-fno-strict-aliasing -fno-common -fwrapv $QEMU_CFLAGS"

QEMU_CFLAGS="-fno-strict-aliasing -fno-common -fwrapv -std=gnu99 $QEMU_CFLAGS"

QEMU_CFLAGS="-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"

QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"

QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"

hw/intc/xics_kvm.c

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

#include "hw/ppc/spapr.h"

#include "hw/ppc/xics.h"

#include "hw/ppc/xics_spapr.h"

#include "kvm_ppc.h"

#include "qemu/config-file.h"

#include "qemu/error-report.h"

hw/intc/xics_spapr.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "qemu/timer.h"

#include "hw/ppc/spapr.h"

#include "hw/ppc/xics.h"

#include "hw/ppc/xics_spapr.h"

#include "hw/ppc/fdt.h"

#include "qapi/visitor.h"