Skip to content
Snippets Groups Projects
  1. Jul 04, 2019
  2. Jul 03, 2019
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190703-pull-request' into staging · f0577c61
      Peter Maydell authored
      
      vga: virtio fixes, bitbang i2c asan fix, install ati vgabios.
      
      # gpg: Signature made Wed 03 Jul 2019 09:53:44 BST
      # gpg:                using RSA key 4CB6D8EED3E87138
      # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
      # gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
      # gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
      # Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138
      
      * remotes/kraxel/tags/vga-20190703-pull-request:
        Add ati vgabios to INSTALL_BLOBS.
        hw/i2c/bitbang_i2c: Use in-place rather than malloc'd bitbang_i2c_interface struct
        virtio-gpu: check if the resource already exists in virtio_gpu_load()
        virtio-gpu: fix unmap in error path
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      f0577c61
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-jul-02-2019' into staging · c204e342
      Peter Maydell authored
      
      MIPS queue for July 2nd, 2019
      
      # gpg: Signature made Tue 02 Jul 2019 17:09:29 BST
      # gpg:                using RSA key D4972A8967F75A65
      # gpg: Good signature from "Aleksandar Markovic <amarkovic@wavecomp.com>" [unknown]
      # 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: 8526 FBF1 5DA3 811F 4A01  DD75 D497 2A89 67F7 5A65
      
      * remotes/amarkovic/tags/mips-queue-jul-02-2019:
        target/mips: Correct helper for MSA FCLASS.<W|D> instructions
        target/mips: Unroll loops for MSA float max/min instructions
        target/mips: Correct comments in msa_helper.c
        target/mips: Correct comments in translate.c
        tcg/tests: target/mips: Correct MSA test compilation and execution order
        tcg/tests: target/mips: Amend MSA integer multiply tests
        tcg/tests: target/mips: Amend MSA fixed point multiply tests
        hw/mips: Express dependencies of the r4k platform with Kconfig
        hw/mips: Express dependencies of the Jazz machine with Kconfig
        hw/mips: Express dependencies of the MIPSsim machine with Kconfig
        hw/mips: Explicit the semi-hosting feature is always required
        tests/machine-none: Test recent MIPS cpus
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      c204e342
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-4.1-pull-request' into staging · 2b40d231
      Peter Maydell authored
      
      Add statx
      Fix netlink with IFLA_BR_MULTI_BOOLOPT
      Fix mips (EXCP_FPE, struct flock)
      
      # gpg: Signature made Tue 02 Jul 2019 16:05:18 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/linux-user-for-4.1-pull-request:
        linux-user: move QEMU_IFLA_BR_MULTI_BOOLOPT to the good function
        linux-user: Handle EXCP_FPE properly for MIPS
        linux-user: Introduce TARGET_HAVE_ARCH_STRUCT_FLOCK
        linux-user: Fix target_flock structure for MIPS O64 ABI
        linux-user: Add support for strace for statx() syscall
        linux-user: Add support for translation of statx() syscall
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      2b40d231
    • Markus Armbruster's avatar
      Makefile: Reuse all's recursion machinery for clean and install · 1338a4b7
      Markus Armbruster authored
      
      Targets "clean" and "install" run make recursively in a for loop.
      This ignores -j and -k.  Target "all" depends on SUBDIR/all to recurse
      into each SUBDIR.  Behaves nicely with -j and -k.  Put that to use for
      "clean" and "install": depend on SUBDIR/clean or SUBDIR/install,
      respectively, and delete the loop.
      
      Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
      Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
      Message-Id: <20190528082308.22032-5-armbru@redhat.com>
      Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
      1338a4b7
    • Markus Armbruster's avatar
      Makefile: Rename targets for make recursion · 3b8593ee
      Markus Armbruster authored
      
      We make a few sub-directories recursively, in particular
      $(TARGET_DIRS).
      
      For goal "all", we do it the nice way: "all" has a prerequisite
      subdir-T for each T in $(TARGET_DIRS), and T's recipe runs make
      recursively.  Behaves nicely with -j and -k.
      
      For other goals such as "clean" and "install", the recipe runs make
      recursively in a for loop.  Ignores -j and -k.
      
      The next commit will fix that for "clean" and "install".  This commit
      prepares the ground by renaming the targets we use for "all" to
      include the goal for the sub-make.  This will permit reusing them for
      goals other than "all".
      
      Targets subdir-T for T in $(TARGET_DIRS) run "make all" in T.  Rename
      to T/all, and declare phony.
      
      Targets romsubdir-R for R in $(ROMS) run "make" in pc-bios/R.  Default
      goal is "all" for all R.  Rename to pc-bios/R/all, and declare phony.
      
      The remainder are renamed just for consistency.
      
      Target subdir-dtc runs "make libbft/libfdt.a" in dtc.  Rename to
      dtc/all, and declare phony.
      
      Target subdir-capstone runs make $(BUILD_DIR)/capstone/$(LIBCAPSTONE)
      in $(SRC_PATH)/capstone.  Rename to capstone/all, and declare phony.
      
      Target subdir-slirp runs "make" in $(SRC_PATH)/slirp.  Default goal is
      all, which builds $(BUILD_DIR)/libslirp.a.  Rename to slirp/all, and
      declare phony.
      
      Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
      Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
      Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
      Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
      Message-Id: <20190528082308.22032-4-armbru@redhat.com>
      [Add compatibility gunk to keep make working across the rename]
      3b8593ee
    • Gerd Hoffmann's avatar
      console: fix cell overflow · 5b8541c6
      Gerd Hoffmann authored
      
      Linux terminal behavior (coming from vt100 I think) is somewhat strange
      when it comes to line wraps:  When a character is printed to the last
      char cell of a line the cursor does NOT jump to the next line but stays
      where it is.  The line feed happens when the next character is printed.
      
      So the valid range for the cursor position is not 0 .. width-1 but
      0 .. width, where x == width represents the state where the line is
      full but the cursor didn't jump to the next line yet.
      
      The code for the 'clear from start of line' control sequence (ESC[1K)
      fails to handle this corner case correctly and may call
      console_clear_xy() with x == width.  That will incorrectly clear the
      first char cell of the next line, or in case the cursor happens to be on
      the last line overflow the cell buffer by one character (three bytes).
      
      Add a check to the loop to fix that.
      
      Didn't spot any other places with the same problem.  But it's easy to
      miss that corner case, so also allocate one extra cell as precaution, so
      in case we have simliar issues lurking elsewhere it at least wouldn't be
      a buffer overflow.
      
      v2: squashed in additional checks suggested by Christophe de Dinechin.
      
      Reported-by: default avatarAlexander Oleinik <alxndr@bu.edu>
      Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
      Reviewed-by: default avatarChristophe de Dinechin <dinechin@redhat.com>
      Message-id: 20190701075301.14165-1-kraxel@redhat.com
      5b8541c6
    • Gerd Hoffmann's avatar
      Add ati vgabios to INSTALL_BLOBS. · 0a87fd69
      Gerd Hoffmann authored
      
      Fixes: 0cca7e7b
      Reported-by: default avatarBruce Rogers <BROGERS@suse.com>
      Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
      Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
      Message-id: 20190703045212.31039-1-kraxel@redhat.com
      0a87fd69
Loading