Skip to content
Snippets Groups Projects
  1. Sep 04, 2020
  2. Sep 03, 2020
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-09-03' into staging · 67a7bfe5
      Peter Maydell authored
      
      * Cirrus-CI improvements and fixes (compile with -Werror & fix for 1h problem)
      * Two build system fixes to fix some failures the CI
      * One m68k QOMification patch
      * Some trivial qtest patches
      * Some small improvements for the Gitlab CI
      
      # gpg: Signature made Thu 03 Sep 2020 12:04:32 BST
      # gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
      # gpg:                issuer "thuth@redhat.com"
      # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
      # gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
      # gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
      # gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
      # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5
      
      * remotes/huth-gitlab/tags/pull-request-2020-09-03:
        gitlab-ci.yml: Set artifacts expiration time
        gitlab-ci.yml: Run check-qtest and check-unit at the end of the fuzzer job
        gitlab/travis: Rework the disabled features tests
        libqtest: Rename qmp_assert_error_class() to qmp_expect_error_and_unref()
        tests/qtest/ipmi-kcs: Fix assert side-effect
        tests/qtest/tpm: Declare input buffers const and static
        tests/qtest/ahci: Improve error handling (NEGATIVE_RETURNS)
        hw/m68k: QOMify the mcf5206 system integration module
        configure: Add system = 'linux' for meson when cross-compiling
        meson: fix keymaps without qemu-keymap
        cirrus.yml: Split FreeBSD job into two parts
        cirrus.yml: Update the macOS jobs to Catalina
        cirrus.yml: Compile macOS with -Werror
        cirrus.yml: Compile FreeBSD with -Werror
        configure: Fix atomic64 test for --enable-werror on macOS
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      67a7bfe5
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/legoater/tags/pull-aspeed-20200901' into staging · 3dd23a4f
      Peter Maydell authored
      
      Various fixes of Aspeed machines :
      
      * New Supermicro X11 BMC machine (Erik)
      * Fixed valid access size on AST2400 SCU
      * Improved robustness of the ftgmac100 model.
      * New flash models in m25p80 (Igor)
      * Fixed reset sequence of SDHCI/eMMC controllers
      * Improved support of the AST2600 SDMC  (Joel)
      * Couple of SMC cleanups
      
      # gpg: Signature made Tue 01 Sep 2020 13:39:20 BST
      # gpg:                using RSA key A0F66548F04895EBFE6B0B6051A343C7CFFBECA1
      # gpg: Good signature from "Cédric Le Goater <clg@kaod.org>" [undefined]
      # gpg: WARNING: This key is not certified with a trusted signature!
      # gpg:          There is no indication that the signature belongs to the owner.
      # Primary key fingerprint: A0F6 6548 F048 95EB FE6B  0B60 51A3 43C7 CFFB ECA1
      
      * remotes/legoater/tags/pull-aspeed-20200901:
        hw: add a number of SPI-flash's of m25p80 family
        arm: aspeed: add strap define `25HZ` of AST2500
        aspeed/smc: Open AHB window of the second chip of the AST2600 FMC controller
        aspeed/sdmc: Simplify calculation of RAM bits
        aspeed/sdmc: Allow writes to unprotected registers
        aspeed/sdmc: Perform memory training
        ftgmac100: Improve software reset
        ftgmac100: Fix integer overflow in ftgmac100_do_tx()
        ftgmac100: Check for invalid len and address before doing a DMA transfer
        ftgmac100: Change interrupt status when a DMA error occurs
        ftgmac100: Fix interrupt status "Packet moved to RX FIFO"
        ftgmac100: Fix interrupt status "Packet transmitted on ethernet"
        ftgmac100: Fix registers that can be read
        aspeed/sdhci: Fix reset sequence
        aspeed/smc: Fix max_slaves of the legacy SMC device
        aspeed/smc: Fix MemoryRegionOps definition
        hw/arm/aspeed: Add board model for Supermicro X11 BMC
        aspeed/scu: Fix valid access size on AST2400
        m25p80: Add support for n25q512ax3
        m25p80: Return the JEDEC ID twice for mx25l25635e
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      3dd23a4f
    • Thomas Huth's avatar
      gitlab-ci.yml: Set artifacts expiration time · 0a796d63
      Thomas Huth authored
      
      The default expiration time for artifacts seems to be very high (30 days?).
      Since we only need the artifacts to pass the binaries from one stage to
      the next one, we can decrease the expiration time to avoid to spam the
      file server too much. Two days should be enough in case someone still wants
      to have a look after the pipeline finished.
      
      Message-Id: <20200806161546.15325-1-thuth@redhat.com>
      Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
      Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
      0a796d63
    • Thomas Huth's avatar
      gitlab-ci.yml: Run check-qtest and check-unit at the end of the fuzzer job · 5ab04d5e
      Thomas Huth authored
      
      The fuzzer job finishes quite early, so we can run the unit tests and
      qtests with -fsanitize=address here without extending the total test time.
      
      Message-Id: <20200831153228.229185-1-thuth@redhat.com>
      Reviewed-by: default avatarAlexander Bulekov <alxndr@bu.edu>
      Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
      5ab04d5e
    • Thomas Huth's avatar
      gitlab/travis: Rework the disabled features tests · a7524adb
      Thomas Huth authored
      
      Let's focus on the gitlab-ci when testing the compilation with disabled
      features, thus add more switches there (and while we're at it, sort them
      also alphabetically). This should cover the test from the Travis CI now,
      too, so that we can remove the now-redundant job from the Travis CI.
      
      Message-Id: <20200806155306.13717-1-thuth@redhat.com>
      Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
      a7524adb
    • Markus Armbruster's avatar
      libqtest: Rename qmp_assert_error_class() to qmp_expect_error_and_unref() · 3bc1b8ee
      Markus Armbruster authored
      
      qmp_assert_error_class() does more than just assert: it also unrefs
      the @rsp argument.  Rename to qmp_expect_error_and_unref() to reduce
      confusion.
      
      Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
      Message-Id: <20200902115733.1229537-1-armbru@redhat.com>
      Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
      Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
      3bc1b8ee
    • Philippe Mathieu-Daudé's avatar
      tests/qtest/ipmi-kcs: Fix assert side-effect · 978382b4
      Philippe Mathieu-Daudé authored
      
      Fix assert side-effect reported by Coverity:
      
        /qemu/tests/qtest/ipmi-kcs-test.c: 84 in kcs_wait_obf()
        83         while (IPMI_KCS_CMDREG_GET_OBF() == 0) {
        >>>     CID 1432368:  Incorrect expression  (ASSERT_SIDE_EFFECT)
        >>>     Argument "--count" of g_assert() has a side effect.  The containing function might work differently in a non-debug build.
        84             g_assert(--count != 0);
      
      Reported-by: Coverity (CID 1432368)
      Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
      Message-Id: <20200902080801.160652-2-philmd@redhat.com>
      Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
      Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
      978382b4
    • Philippe Mathieu-Daudé's avatar
      tests/qtest/tpm: Declare input buffers const and static · ed943cc9
      Philippe Mathieu-Daudé authored
      
      The functions using these arrays expect a "const unsigned char *"
      argument, it is safe to declare these as 'static const'.
      
      Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
      Message-Id: <20200902080909.161034-1-philmd@redhat.com>
      Reviewed-by: default avatarDarren Kenny <darren.kenny@oracle.com>
      Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
      Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
      ed943cc9
    • Philippe Mathieu-Daudé's avatar
      tests/qtest/ahci: Improve error handling (NEGATIVE_RETURNS) · df1a312f
      Philippe Mathieu-Daudé authored
      
      Fix an error handling issue reported by Coverity:
      
        /qemu/tests/qtest/ahci-test.c: 1452 in prepare_iso()
        1444         int fd = mkstemp(cdrom_path);
        >>>     CID 1432375:  Error handling issues  (NEGATIVE_RETURNS)
        >>>     "fd" is passed to a parameter that cannot be negative.
        1452         ret = write(fd, patt, size);
      
      Reported-by: Coverity (CID 1432375)
      Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
      Message-Id: <20200902080552.159806-1-philmd@redhat.com>
      Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
      Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
      df1a312f
    • Thomas Huth's avatar
      hw/m68k: QOMify the mcf5206 system integration module · 0bc6746e
      Thomas Huth authored
      
      The mcf5206 system integration module should be a proper device.
      Let's finally QOMify it.
      
      Signed-off-by: default avatarThomas Huth <huth@tuxfamily.org>
      Message-Id: <20200819065201.4045-1-huth@tuxfamily.org>
      0bc6746e
    • Thomas Huth's avatar
      configure: Add system = 'linux' for meson when cross-compiling · 853b4baf
      Thomas Huth authored
      
      Meson needs the "system = xyz" line when cross-compiling. We are already
      adding a "system = 'windows'" for the MinGW cross-compilation case here,
      so let's add a "system = 'linux'" now for Linux hosts, too.
      
      Message-Id: <20200823111757.72002-2-thuth@redhat.com>
      Acked-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
      853b4baf
    • Gerd Hoffmann's avatar
      meson: fix keymaps without qemu-keymap · 09db9b9d
      Gerd Hoffmann authored
      
      In case the qemu-keymap tool generating them is neither installed on the
      system nor built from sources (due to xkbcommon not being available)
      qemu will not find the keymaps when started directly from the build
      tree,
      
      This happens because commit ddcf607f ("meson: drop keymaps symlink")
      removed the symlink to the source tree, and the special handling for
      install doesn't help in case we do not install qemu.
      
      Lets fix that by simply copying over the file from the source tree as
      fallback.
      
      Reported-by: default avatarThomas Huth <thuth@redhat.com>
      Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
      Message-Id: <20200827102617.14448-1-kraxel@redhat.com>
      [thuth: Rebased, changed "config_host['qemu_datadir']" to "qemu_datadir",
              added Gerd's UNLINK fix to configure script]
      Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
      09db9b9d
    • Thomas Huth's avatar
      cirrus.yml: Split FreeBSD job into two parts · 45f7b7b9
      Thomas Huth authored
      
      The FreeBSD jobs currently hit the 1h time limit in the Cirrus-CI.
      We have to split the build targets here to make sure that the job
      finishes in time again. According to the Cirrus-CI docs and some
      tests that I did, it also seems like the total amount of CPUs that
      can be used for FreeBSD jobs is limited to 8, so each job now only
      gets 4 CPUs. That increases the compilation time of each job a little
      bit, but it still seems to be better to run two jobs with 4 CPUs each
      in parallel than to run two jobs with 8 CPUs sequentially.
      
      Message-Id: <20200831154405.229706-1-thuth@redhat.com>
      Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
      Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
      45f7b7b9
    • Thomas Huth's avatar
      cirrus.yml: Update the macOS jobs to Catalina · 7498e6af
      Thomas Huth authored
      
      When looking at the CI jobs on cirrus-ci.com, it seems like the mojave-based
      images have been decomissioned a while ago already, since apparently all our
      jobs get automatically upgraded to catalina. So let's update our YML script
      accordingly to avoid confusion.
      
      Reviewed-by: default avatarEd Maste <emaste@freebsd.org>
      Message-Id: <20200728074405.13118-5-thuth@redhat.com>
      Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
      Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
      7498e6af
    • Thomas Huth's avatar
      cirrus.yml: Compile macOS with -Werror · d76efeda
      Thomas Huth authored
      
      Compiler warnings currently go unnoticed in our macOS builds, since -Werror
      is only enabled for Linux and MinGW builds by default. So let's enable them
      here now, too.
      Unfortunately, the sasl header is marked as deprecated in the macOS headers
      and thus generates a lot of deprecation warnings. Thus we have to also use
      -Wno-error=deprecated-declarations to be able to compile the code here.
      
      Message-Id: <20200728074405.13118-4-thuth@redhat.com>
      Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
      Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
      d76efeda
    • Thomas Huth's avatar
      cirrus.yml: Compile FreeBSD with -Werror · 91bedaae
      Thomas Huth authored
      
      Compiler warnings currently go unnoticed in our FreeBSD builds, since
      -Werror is only enabled for Linux and MinGW builds by default. So let's
      enable them here now, too.
      
      Reviewed-by: default avatarEd Maste <emaste@freebsd.org>
      Message-Id: <20200728074405.13118-3-thuth@redhat.com>
      Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
      Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
      91bedaae
    • Thomas Huth's avatar
      configure: Fix atomic64 test for --enable-werror on macOS · 5fe40765
      Thomas Huth authored
      When using --enable-werror for the macOS builders in the Cirrus-CI,
      the atomic64 test is currently failing, and config.log shows a bunch
      of error messages like this:
      
       config-temp/qemu-conf.c:6:7: error: implicit declaration of function
       '__atomic_load_8' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
        y = __atomic_load_8(&x, 0);
            ^
       config-temp/qemu-conf.c:6:7: error: this function declaration is not a
       prototype [-Werror,-Wstrict-prototypes]
      
      Seems like these __atomic_*_8 functions are available in one of the
      libraries there, so that the test links and passes there when not
      using --enable-werror. But there does not seem to be a valid prototype
      for them in any of the header files, so that the test fails when using
      --enable-werror.
      
      Fix it by using the "official" built-in functions instead (see e.g.
      https://gcc.gnu.org/onlinedocs/gcc/_005f_005fatomic-Builtins.html
      
      ).
      We are not using the *_8 variants in QEMU anyway.
      
      Suggested-by: default avatarChristian Schoenebeck <qemu_oss@crudebyte.com>
      Reviewed-by: default avatarChristian Schoenebeck <qemu_oss@crudebyte.com>
      Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
      Tested-by: default avatarAlex Bennée <alex.bennee@linaro.org>
      Message-Id: <20200728074405.13118-2-thuth@redhat.com>
      Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
      5fe40765
  3. Sep 02, 2020
Loading