Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: qemu/qemu
base: 1664d74c5073
Choose a base ref
...
head repository: qemu/qemu
compare: eeaaf96f553d
Choose a head ref
  • 11 commits
  • 14 files changed
  • 9 contributors

Commits on Dec 4, 2023

  1. target/arm: Disable SME if SVE is disabled

    There is no architectural requirement that SME implies SVE, but
    our implementation currently assumes it. (FEAT_SME_FA64 does
    imply SVE.) So if you try to run a CPU with eg "-cpu max,sve=off"
    you quickly run into an assert when the guest tries to write to
    SMCR_EL1:
    
    #6  0x00007ffff4b38e96 in __GI___assert_fail
        (assertion=0x5555566e69cb "sm", file=0x5555566e5b24 "../../target/arm/helper.c", line=6865, function=0x5555566e82f0 <__PRETTY_FUNCTION__.31> "sve_vqm1_for_el_sm") at ./assert/assert.c:101
    #7  0x0000555555ee33aa in sve_vqm1_for_el_sm (env=0x555557d291f0, el=2, sm=false) at ../../target/arm/helper.c:6865
    #8  0x0000555555ee3407 in sve_vqm1_for_el (env=0x555557d291f0, el=2) at ../../target/arm/helper.c:6871
    #9  0x0000555555ee3724 in smcr_write (env=0x555557d291f0, ri=0x555557da23b0, value=2147483663) at ../../target/arm/helper.c:6995
    #10 0x0000555555fd1dba in helper_set_cp_reg64 (env=0x555557d291f0, rip=0x555557da23b0, value=2147483663) at ../../target/arm/tcg/op_helper.c:839
    #11 0x00007fff60056781 in code_gen_buffer ()
    
    Avoid this unsupported and slightly odd combination by
    disabling SME when SVE is not present.
    
    Cc: qemu-stable@nongnu.org
    Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2005
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
    Message-id: 20231127173318.674758-1-peter.maydell@linaro.org
    pm215 committed Dec 4, 2023
    Copy the full SHA
    f7767ca View commit details
    Browse the repository at this point in the history
  2. tests/qemu-iotests/149: Use more inclusive language in this test

    Let's use 'unsupported_configs' and 'tested_configs' here
    instead of non-inclusive words.
    
    Message-ID: <20231122084000.809696-1-thuth@redhat.com>
    Reviewed-by: "Daniel P. Berrangé" <berrange@redhat.com>
    Signed-off-by: Thomas Huth <thuth@redhat.com>
    huth committed Dec 4, 2023
    Copy the full SHA
    5689d4b View commit details
    Browse the repository at this point in the history
  3. sh4: Coding style: Remove tabs

    Replaces TABS with spaces to ensure have a consistent coding
    style with an indentation of 4 spaces in the SH4 subsystem.
    
    Resolves: https://gitlab.com/qemu-project/qemu/-/issues/376
    Signed-off-by: Yihuan Pan <xun794@gmail.com>
    Reviewed-by: Thomas Huth <thuth@redhat.com>
    Message-ID: <20231124044554.513752-1-xun794@gmail.com>
    Signed-off-by: Thomas Huth <thuth@redhat.com>
    Xunop authored and huth committed Dec 4, 2023
    Copy the full SHA
    5533936 View commit details
    Browse the repository at this point in the history
  4. tests/qtest: check the return value

    These variables "ret" are never referenced in the code, thus
    add check logic for the "ret"
    
    Signed-off-by: Zhu Jun <zhujun2@cmss.chinamobile.com>
    Reviewed-by: Thomas Huth <thuth@redhat.com>
    Message-ID: <20231121080802.4500-1-zhujun2@cmss.chinamobile.com>
    Signed-off-by: Thomas Huth <thuth@redhat.com>
    Zhu Jun authored and huth committed Dec 4, 2023
    Copy the full SHA
    4d98618 View commit details
    Browse the repository at this point in the history
  5. system/memory: use ldn_he_p/stn_he_p

    Using direct pointer dereferencing can allow for unaligned accesses,
    which was seen during execution with sanitizers enabled.
    
    Cc: qemu-stable@nongnu.org
    Reviewed-by: Chris Rauer <crauer@google.com>
    Reviewed-by: Peter Foley <pefoley@google.com>
    Signed-off-by: Patrick Venture <venture@google.com>
    Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
    Reviewed-by: David Hildenbrand <david@redhat.com>
    Message-ID: <20231116163633.276671-1-venture@google.com>
    Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
    pstrinkle authored and philmd committed Dec 4, 2023
    Copy the full SHA
    2b8fe81 View commit details
    Browse the repository at this point in the history
  6. target/riscv/kvm: fix shadowing in kvm_riscv_(get|put)_regs_csr

    KVM_RISCV_GET_CSR() and KVM_RISCV_SET_CSR() use an 'int ret' variable
    that is used to do an early 'return' if ret > 0. Both are being called
    in functions that are also declaring a 'ret' integer, initialized with
    '0', and this integer is used as return of the function.
    
    The result is that the compiler is less than pleased and is pointing
    shadowing errors:
    
    ../target/riscv/kvm/kvm-cpu.c: In function 'kvm_riscv_get_regs_csr':
    ../target/riscv/kvm/kvm-cpu.c:90:13: error: declaration of 'ret' shadows a previous local [-Werror=shadow=compatible-local]
       90 |         int ret = kvm_get_one_reg(cs, RISCV_CSR_REG(env, csr), &reg); \
          |             ^~~
    ../target/riscv/kvm/kvm-cpu.c:539:5: note: in expansion of macro 'KVM_RISCV_GET_CSR'
      539 |     KVM_RISCV_GET_CSR(cs, env, sstatus, env->mstatus);
          |     ^~~~~~~~~~~~~~~~~
    ../target/riscv/kvm/kvm-cpu.c:536:9: note: shadowed declaration is here
      536 |     int ret = 0;
          |         ^~~
    
    ../target/riscv/kvm/kvm-cpu.c: In function 'kvm_riscv_put_regs_csr':
    ../target/riscv/kvm/kvm-cpu.c:98:13: error: declaration of 'ret' shadows a previous local [-Werror=shadow=compatible-local]
       98 |         int ret = kvm_set_one_reg(cs, RISCV_CSR_REG(env, csr), &reg); \
          |             ^~~
    ../target/riscv/kvm/kvm-cpu.c:556:5: note: in expansion of macro 'KVM_RISCV_SET_CSR'
      556 |     KVM_RISCV_SET_CSR(cs, env, sstatus, env->mstatus);
          |     ^~~~~~~~~~~~~~~~~
    ../target/riscv/kvm/kvm-cpu.c:553:9: note: shadowed declaration is here
      553 |     int ret = 0;
          |         ^~~
    
    The macros are doing early returns for non-zero returns and the local
    'ret' variable for both functions is used just to do 'return 0', so
    remove them from kvm_riscv_get_regs_csr() and kvm_riscv_put_regs_csr()
    and do a straight 'return 0' in the end.
    
    For good measure let's also rename the 'ret' variables in
    KVM_RISCV_GET_CSR() and KVM_RISCV_SET_CSR() to '_ret' to make them more
    resilient to these kind of errors.
    
    Fixes: 937f0b4 ("target/riscv: Implement kvm_arch_get_registers")
    Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
    Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
    Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
    Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
    Message-ID: <20231123101338.1040134-1-dbarboza@ventanamicro.com>
    Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
    danielhb authored and philmd committed Dec 4, 2023
    Copy the full SHA
    560b8e1 View commit details
    Browse the repository at this point in the history
  7. tests/avocado: Update yamon-bin-02.22.zip URL

    http://www.imgtec.com/tools/mips-tools/downloads/ redirects
    to https://mips.com/downloads/yamon-version-02-22/ then points
    to an invalid path to a s3 bucket. Use the correct path. The
    site will eventually be fixed.
    
    Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
    Reviewed-by: Thomas Huth <thuth@redhat.com>
    Message-Id: <20231201205630.10837-1-philmd@linaro.org>
    philmd committed Dec 4, 2023
    Copy the full SHA
    d369ad5 View commit details
    Browse the repository at this point in the history
  8. tests/avocado: mark ReplayKernelNormal.test_mips64el_malta as flaky

    I missed this when going through the recent failure logs. I can run
    the test 30 times without failure locally but it seems to hang pretty
    reliably on GitLab's CI infra-structure.
    
    Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
    Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
    Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
    Message-ID: <20231201201027.2689404-1-alex.bennee@linaro.org>
    Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
    stsquad authored and philmd committed Dec 4, 2023
    Copy the full SHA
    2e8ed6a View commit details
    Browse the repository at this point in the history
  9. Merge tag 'pull-request-2023-12-04' of https://gitlab.com/thuth/qemu

    …into staging
    
    * Fix wording in iotest 149
    * Fix whitespace issues in sh4 code (ignore checkpatch.pl warnings here)
    * Make sure to check return values in qtests
    
    # -----BEGIN PGP SIGNATURE-----
    #
    # iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmVt4PwRHHRodXRoQHJl
    # ZGhhdC5jb20ACgkQLtnXdP5wLbWhYxAAm6ww++qfCh5uLrKjXrv/ZS+b+8UVMT+p
    # wOBNBz0RDpDahAwesxLABAg9b+fabLTx9OpOyQRgmM/ofCoW/Oi7xzCEwv9JPJX0
    # Kr7x5AMCTc2hPydxsMenWYZXLZXcc0HSkB+4yN5FTeOl8YPoRetegsGbiirGpod1
    # QyD/oLMZzBxqteF/m0a4gxEuwi3qgRVIOkdk8zeSBMAl6EUazsKR8sTrdCrkupHl
    # ddMKjRH4Gr2sXoZ8L/mr4T5FodVxAF1pcZnVyPYDlVgNK/V0IWDcbmFFNr0rXxCM
    # CZz7gIOZkpm/MXpVE9UEg++ZOQ16gDUNpvQRyNPgIn0vbiuF5kcXmUpstJWHDico
    # O98wgH6im3iC7xyaMTOq3pjSb9RNP4cmIw77EKJyS93RDAgiCX0ozN3zEkxsvZYu
    # hQadBd3TSUP6jxz2SWQ6irCwkElfozCc1cPfUyW0rFXjLqWei0UirWDdyN5dL8vk
    # pkupZG5p3jiiZs1hm+TQ4W1CPVZFTAW+LcI7V/Na3EBKQvrjYDlHMQdx0NaJh5e3
    # xn84bvTnuYfT/I63z9zqIbMwPQ5t+lJaR9ohkn9Q4tTEnHuMV9svON5rsRc3YE6p
    # XrR02G9zu4kVAKs51DFNWC9SLgviW+LB2DCe+e2CrqwPjiz+MeOVGEEre7/nnj/q
    # clP7u3MyX5A=
    # =rU6S
    # -----END PGP SIGNATURE-----
    # gpg: Signature made Mon 04 Dec 2023 09:23:56 EST
    # 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
    
    * tag 'pull-request-2023-12-04' of https://gitlab.com/thuth/qemu:
      tests/qtest: check the return value
      sh4: Coding style: Remove tabs
      tests/qemu-iotests/149: Use more inclusive language in this test
    
    Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
    Stefan Hajnoczi committed Dec 4, 2023
    Copy the full SHA
    169c4e7 View commit details
    Browse the repository at this point in the history
  10. Merge tag 'pull-target-arm-20231204-1' of https://git.linaro.org/peop…

    …le/pmaydell/qemu-arm into staging
    
    target-arm queue:
     * Turn off SME if SVE is turned off (this combination doesn't
       currently work and QEMU will assert if you try it)
    
    # -----BEGIN PGP SIGNATURE-----
    #
    # iQJNBAABCAA3FiEE4aXFk81BneKOgxXPPCUl7RQ2DN4FAmVt3wQZHHBldGVyLm1h
    # eWRlbGxAbGluYXJvLm9yZwAKCRA8JSXtFDYM3vrmD/9zu48IxCdHFSshMRmXz6kI
    # tMvTrsMSOGXfuQqCbvLn3CUP/La50Yt/T1C2TKzVII1W8zpw8wEEvraCBjexzUzK
    # Jcjw0dPSIllQOHBkoUGsgqA0+UkhfIwH0po10rxm1L+ZP3DfISVdyDV9oxCNfEO0
    # pGXI1eAN9GIQtJtUj3kZE+RUoamJfoSjlm5XVeX3T+utEU7yf1461L1/qaylYOrW
    # wao72ffbuf41jRJwnVmMFoIPrwueYtEeuKl/EgYU4YPxkSQEo34u6d9fz2Irt6/Y
    # utO2SffhhmlxQaFhgPX3hvAsfapMt/p2Jy6oUpThOjN75adCq+g1CYj7lzEfIX16
    # kb2CY8zQ8NboJtgnkiQAA062myURnk/kmulv0OF6Hh0jHSuLzuMMLcCfBJgq4H6s
    # mnBCJfetwRgwqcSl1JTfrMm4wYOLmSrmOcM5JjYwY2YYjnFXI+XB1MdKm0h8cROG
    # nFu5TZtNnxgzqBgoh1140AYN851Y1dshczZIHb1/YuNpBIl+ZUO4v5sRT3KBSzb+
    # G21570neBv8QcfDSgrLesrjNBDREfkaWEu9BM85461uTjbCLG8RUpn+Jd4VtpkNe
    # YVzomhuM9CI5CmYdrTMJ74gnZUtAT9Q3FTcfGL8G4KiSIe85BTw+gEy4PhLXD6FT
    # 68fP1M+s8/hsuXCJYbvmAA==
    # =K/u0
    # -----END PGP SIGNATURE-----
    # gpg: Signature made Mon 04 Dec 2023 09:15:32 EST
    # gpg:                using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
    # gpg:                issuer "peter.maydell@linaro.org"
    # gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [full]
    # gpg:                 aka "Peter Maydell <pmaydell@gmail.com>" [full]
    # gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [full]
    # gpg:                 aka "Peter Maydell <peter@archaic.org.uk>" [unknown]
    # Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE
    
    * tag 'pull-target-arm-20231204-1' of https://git.linaro.org/people/pmaydell/qemu-arm:
      target/arm: Disable SME if SVE is disabled
    
    Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
    Stefan Hajnoczi committed Dec 4, 2023
    Copy the full SHA
    db5e49e View commit details
    Browse the repository at this point in the history
  11. Merge tag 'misc-fixes-20231204' of https://github.com/philmd/qemu int…

    …o staging
    
    Misc fixes for 8.2
    
    - memory: Avoid unaligned accesses (Patrick)
    - target/riscv: Fix variable shadowing (Daniel)
    - tests/avocado: Update URL, skip flaky test (Alex, Phil)
    
    # -----BEGIN PGP SIGNATURE-----
    #
    # iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmVt7w4ACgkQ4+MsLN6t
    # wN7AzA/+N1ec1I2IC0LYT8ThBCyV/92o+1FH5KaIxiVN5Ty3cACnGAac8IJ1K2tC
    # 5WG8Dxg4rq+bM16lUq9ME7k82Y3PoxLoRQa8fuClFKdHMXU2sgY4OwTx2606cO4B
    # 0H4gR+i3XgrgIDo8qRezWX0JSd1Srrz9QPlcq6kJfDtRq7DU0329aOobkyzuUJPb
    # DJD9YPu9y0KokBCBuVlt5ypNSM9xJGRtznFt1sFfNyPgNOnie3s+fYpPn26UigcY
    # 8OY/PMS5hapDw/s/gFKWQb/nCTSRnJKZ5dODOjHXK8HvTbYHedw8C4apXyjSXwBI
    # fBerNEKJHwD/1QkFhbNCIwsidH72BWeHljrelbZlsUfXU1VcCqNiXV8d2R9ak3xt
    # lrW7UcytC1+PqhmIVEXAOA4cwJcq6Hs9IcZ9G9aMvcmlhY3Fv0UKMoRYgsGTULeP
    # ySQF3FDSc6dldsfBdwqHGHlwL12EYmpN2sIhEc5aQ9y5Mmuj2FBOYHUbPpyoVLpw
    # e45n9Epc43GUVCMj3lZNjWKd+87nGjwKOM3rpBlcaSG3JRkLUe8o5APxeYzePZfO
    # 2IOWcGnrUixsvWbNY+6JF98n5hQK7Va3h/e1YbS1K2OZ013LT1SNiZ1LOrl9KiXf
    # agY6HMukKbCpJAqpXnMbgWdxCb7GdtjVaWKIVEgejeZTVdH4f8Y=
    # =r21r
    # -----END PGP SIGNATURE-----
    # gpg: Signature made Mon 04 Dec 2023 10:23:58 EST
    # gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
    # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full]
    # Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE
    
    * tag 'misc-fixes-20231204' of https://github.com/philmd/qemu:
      tests/avocado: mark ReplayKernelNormal.test_mips64el_malta as flaky
      tests/avocado: Update yamon-bin-02.22.zip URL
      target/riscv/kvm: fix shadowing in kvm_riscv_(get|put)_regs_csr
      system/memory: use ldn_he_p/stn_he_p
    
    Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
    Stefan Hajnoczi committed Dec 4, 2023
    Copy the full SHA
    eeaaf96 View commit details
    Browse the repository at this point in the history