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

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



QEMU trivial patches collected between June and October 2018
(Thank you to Thomas Huth)

v2: fix 32bit build with updated patch (v3) from Philippe Mathieu-Daudé
    built in a 32bit debian sid chroot

# gpg: Signature made Tue 30 Oct 2018 11:23:01 GMT
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/qemu-trivial-for-3.1-pull-request:
  milkymist-minimac2: Use qemu_log_mask(GUEST_ERROR) instead of error_report
  ppc: move at24c to its own CONFIG_ symbol
  hw/intc/gicv3: Remove useless parenthesis around DIV_ROUND_UP macro
  hw/pci-host: Remove useless parenthesis around DIV_ROUND_UP macro
  tests/bios-tables-test: Remove an useless cast
  xen: Use the PCI_DEVICE macro
  qobject: Catch another straggler for use of qdict_put_str()
  configure: Support pkg-config for zlib
  tests: Fix typos in comments and help message (found by codespell)
  cpu.h: fix a typo in comment
  linux-user: fix comment s/atomic_write/atomic_set/
  qemu-iotests: make 218 executable
  scripts/qemu.py: remove trailing quotes on docstring
  scripts/decodetree.py: remove unused imports
  docs/devel/testing.rst: add missing newlines after code block
  qemu-iotests: fix filename containing checks
  tests/tcg/README: fix location for lm32 tests
  memory.h: fix typos in comments
  vga_int: remove unused function protype
  configs/alpha: Remove unused CONFIG_PARALLEL_ISA switch

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3f328549 7b2b797c

configure

+23 −17
Original line number Diff line number Diff line
@@ -2151,23 +2151,6 @@ EOF 
  fi

fi



#########################################

# zlib check



if test "$zlib" != "no" ; then

    cat > $TMPC << EOF

#include <zlib.h>

int main(void) { zlibVersion(); return 0; }

EOF

    if compile_prog "" "-lz" ; then

        :

    else

        error_exit "zlib check failed" \

            "Make sure to have the zlib libs and headers installed."

    fi

fi

LIBS="$LIBS -lz"



##########################################

# lzo check
@@ -3479,6 +3462,29 @@ if ! compile_prog "$glib_cflags -Werror" "$glib_libs" ; then 
    fi

fi



#########################################

# zlib check



if test "$zlib" != "no" ; then

    if $pkg_config --exists zlib; then

        zlib_cflags=$($pkg_config --cflags zlib)

        zlib_libs=$($pkg_config --libs zlib)

        QEMU_CFLAGS="$zlib_cflags $QEMU_CFLAGS"

        LIBS="$zlib_libs $LIBS"

    else

        cat > $TMPC << EOF

#include <zlib.h>

int main(void) { zlibVersion(); return 0; }

EOF

        if compile_prog "" "-lz" ; then

            LIBS="$LIBS -lz"

        else

            error_exit "zlib check failed" \

                "Make sure to have the zlib libs and headers installed."

        fi

    fi

fi



##########################################

# SHA command probe for modules

if test "$modules" = yes; then

default-configs/alpha-softmmu.mak

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ CONFIG_I82374=y 
CONFIG_I8254=y

CONFIG_I8257=y

CONFIG_PARALLEL=y

CONFIG_PARALLEL_ISA=y

CONFIG_FDC=y

CONFIG_PCKBD=y

CONFIG_VGA_CIRRUS=y

default-configs/ppc-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ CONFIG_SM501=y 
CONFIG_DDC=y

CONFIG_IDE_SII3112=y

CONFIG_I2C=y

CONFIG_AT24C=y

CONFIG_BITBANG_I2C=y

CONFIG_M41T80=y

CONFIG_VGA_CIRRUS=y

docs/devel/testing.rst

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ variable (which affects memory reclamation and catches invalid pointers better) 
and gtester options. If necessary, you can run



.. code::



  make check-unit V=1



and copy the actual command line which executes the unit test, then run
@@ -116,6 +117,7 @@ and using gdb on the test is still simple to do: find out the actual command 
from the output of



.. code::



  make check-qtest V=1



which you can run manually.

hw/net/milkymist-minimac2.c

+10 −5
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "hw/sysbus.h"

#include "trace.h"

#include "net/net.h"

#include "qemu/log.h"

#include "qemu/error-report.h"



#include <zlib.h>
@@ -214,7 +215,8 @@ static size_t assemble_frame(uint8_t *buf, size_t size, 
    uint32_t crc;



    if (size < payload_size + 12) {

        error_report("milkymist_minimac2: received too big ethernet frame");

        qemu_log_mask(LOG_GUEST_ERROR, "milkymist_minimac2: frame too big "

                      "(%zd bytes)\n", payload_size);

        return 0;

    }
@@ -347,8 +349,9 @@ minimac2_read(void *opaque, hwaddr addr, unsigned size) 
        break;



    default:

        error_report("milkymist_minimac2: read access to unknown register 0x"

                TARGET_FMT_plx, addr << 2);

        qemu_log_mask(LOG_GUEST_ERROR,

                      "milkymist_minimac2_rd%d: 0x%" HWADDR_PRIx "\n",

                      size, addr << 2);

        break;

    }
@@ -413,8 +416,10 @@ minimac2_write(void *opaque, hwaddr addr, uint64_t value, 
        break;



    default:

        error_report("milkymist_minimac2: write access to unknown register 0x"

                TARGET_FMT_plx, addr << 2);

        qemu_log_mask(LOG_GUEST_ERROR,

                      "milkymist_minimac2_wr%d: 0x%" HWADDR_PRIx

                      " = 0x%" PRIx64 "\n",

                      size, addr << 2, value);

        break;

    }

}