Skip to content
Snippets Groups Projects
  1. Apr 01, 2022
    • Peter Maydell's avatar
      Merge tag 'trivial-branch-for-7.0-pull-request' of... · 9b617b1b
      Peter Maydell authored
      Merge tag 'trivial-branch-for-7.0-pull-request' of https://gitlab.com/laurent_vivier/qemu into staging
      
      Trivial branch pull request 20220401
      
      Fix sh4 linux-user build on Alpine
      and some trivial updates
      
      # gpg: Signature made Thu 31 Mar 2022 23:18:21 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
      
      * tag 'trivial-branch-for-7.0-pull-request' of https://gitlab.com/laurent_vivier/qemu
      
      :
        tests/lcitool: Do not use a hard-coded /usr/bin/python3 as python interpreter
        vhost-vdpa: fix typo in a comment
        target/sh4: Remove old README.sh4 file
        linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      9b617b1b
  2. Mar 31, 2022
  3. Mar 29, 2022
    • Peter Maydell's avatar
      aea6e471
    • Peter Maydell's avatar
      Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging · aad3cc86
      Peter Maydell authored
      Build bugfixes.
      
      # gpg: Signature made Tue 29 Mar 2022 14:59:03 BST
      # gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
      # gpg:                issuer "pbonzini@redhat.com"
      # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
      # gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
      # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
      #      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83
      
      * tag 'for-upstream' of https://gitlab.com/bonzini/qemu
      
      :
        tests/tcg: really fix path to target configuration
        virtio: fix --enable-vhost-user build on non-Linux
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      aad3cc86
    • Peter Maydell's avatar
      Merge tag 'pull-block-2022-03-29' of https://gitlab.com/hreitz/qemu into staging · 68894b5f
      Peter Maydell authored
      Block patches for 7.0-rc2:
      - Disable GLOBAL_STATE_CODE() assertion for the 7.0 release: We got
        another bug report for this, and we do not have the time to
        investigate before 7.0, so disable the assertion for the release, to
        re-enable and continue investigation in the 7.1 cycle
      
      - stream job fix (regarding interaction with concurrent block jobs)
      
      - iotests fixes
      
      # gpg: Signature made Tue 29 Mar 2022 15:55:33 BST
      # gpg:                using RSA key CB62D7A0EE3829E45F004D34A1FA40D098019CDF
      # gpg:                issuer "hreitz@redhat.com"
      # gpg: Good signature from "Hanna Reitz <hreitz@redhat.com>" [marginal]
      # gpg: WARNING: This key is not certified with sufficiently trusted signatures!
      # gpg:          It is not certain that the signature belongs to the owner.
      # Primary key fingerprint: CB62 D7A0 EE38 29E4 5F00  4D34 A1FA 40D0 9801 9CDF
      
      * tag 'pull-block-2022-03-29' of https://gitlab.com/hreitz/qemu
      
      :
        iotests: Fix status checks
        block/stream: Drain subtree around graph change
        main-loop: Disable GLOBAL_STATE_CODE() assertions
        iotests: update test owner contact information
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      68894b5f
    • Laurent Vivier's avatar
      tests/qtest: failover: fix infinite loop · 6ae6a30c
      Laurent Vivier authored
      
      If the migration is over before we cancel it, we are
      waiting in a loop a state that never comes because the state
      is already "completed".
      
      To avoid an infinite loop, skip the test if the migration
      is "completed" before we were able to cancel it.
      
      Signed-off-by: default avatarLaurent Vivier <lvivier@redhat.com>
      Acked-by: default avatarThomas Huth <thuth@redhat.com>
      Message-id: 20220329124259.355995-1-lvivier@redhat.com
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      6ae6a30c
    • Hanna Reitz's avatar
      iotests: Fix status checks · d5699c0d
      Hanna Reitz authored
      
      An iotest's 'paused' condition is fickle; it will be reported as true
      whenever the job is drained, for example, or when it is in the process
      of completing.
      
      030 and 041 contain such checks, we should replace them by checking the
      job status instead.  (As was done for 129 in commit f9a6256b
      for the 'busy' condition.)
      
      Additionally, when we want to test that a job is paused on error, we
      might want to give it some time to actually switch to the paused state.
      Do that by waiting on the corresponding JOB_STATUS_CHANGE event.  (But
      only if they are not already paused; the loops these places are in fetch
      all VM events, so they may have already fetched that event from the
      queue.)
      
      Signed-off-by: default avatarHanna Reitz <hreitz@redhat.com>
      Message-Id: <20220324180221.24508-1-hreitz@redhat.com>
      Reviewed-by: default avatarEric Blake <eblake@redhat.com>
      d5699c0d
    • Hanna Reitz's avatar
      block/stream: Drain subtree around graph change · b1e1af39
      Hanna Reitz authored
      
      When the stream block job cuts out the nodes between top and base in
      stream_prepare(), it does not drain the subtree manually; it fetches the
      base node, and tries to insert it as the top node's backing node with
      bdrv_set_backing_hd().  bdrv_set_backing_hd() however will drain, and so
      the actual base node might change (because the base node is actually not
      part of the stream job) before the old base node passed to
      bdrv_set_backing_hd() is installed.
      
      This has two implications:
      
      First, the stream job does not keep a strong reference to the base node.
      Therefore, if it is deleted in bdrv_set_backing_hd()'s drain (e.g.
      because some other block job is drained to finish), we will get a
      use-after-free.  We should keep a strong reference to that node.
      
      Second, even with such a strong reference, the problem remains that the
      base node might change before bdrv_set_backing_hd() actually runs and as
      a result the wrong base node is installed.
      
      Both effects can be seen in 030's TestParallelOps.test_overlapping_5()
      case, which has five nodes, and simultaneously streams from the middle
      node to the top node, and commits the middle node down to the base node.
      As it is, this will sometimes crash, namely when we encounter the
      above-described use-after-free.
      
      Taking a strong reference to the base node, we no longer get a crash,
      but the resuling block graph is less than ideal: The expected result is
      obviously that all middle nodes are cut out and the base node is the
      immediate backing child of the top node.  However, if stream_prepare()
      takes a strong reference to its base node (the middle node), and then
      the commit job finishes in bdrv_set_backing_hd(), supposedly dropping
      that middle node, the stream job will just reinstall it again.
      
      Therefore, we need to keep the whole subtree drained in
      stream_prepare(), so that the graph modification it performs is
      effectively atomic, i.e. that the base node it fetches is still the base
      node when bdrv_set_backing_hd() sets it as the top node's backing node.
      
      Verify this by asserting in said 030's test case that the base node is
      always the top node's immediate backing child when both jobs are done.
      
      Signed-off-by: default avatarHanna Reitz <hreitz@redhat.com>
      Message-Id: <20220324140907.17192-1-hreitz@redhat.com>
      Reviewed-by: default avatarEric Blake <eblake@redhat.com>
      Acked-by: default avatarVladimir Sementsov-Ogievskiy <v.sementsov-og@mail.ru>
      b1e1af39
    • Hanna Reitz's avatar
      main-loop: Disable GLOBAL_STATE_CODE() assertions · b1c07349
      Hanna Reitz authored
      These assertions are very useful for developers to find bugs, and so
      they have indeed pointed us towards bugs already.  For users, it is not
      so useful to find these bugs.  We should probably not enable them in
      releases until we are sufficiently certain that they will not fire
      during normal operation, unless something is going seriously wrong.
      
      For example, we have received a bug report that you cannot add an NBD
      server on a BDS in an I/O thread with `-incoming defer`.  I am sure this
      is a real bug that needs investigation, but we do not really have that
      time right now, so close to release, and so I would rather disable the
      assertions to get time to investigate such reports.
      
      (I am just putting the link as "buglink" below, not "closes", because
      disabling the assertion will not fix the likely underlying bug.)
      
      Buglink: https://gitlab.com/qemu-project/qemu/-/issues/945
      
      
      Signed-off-by: default avatarHanna Reitz <hreitz@redhat.com>
      Message-Id: <20220329093545.52114-1-hreitz@redhat.com>
      Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Tested-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Reviewed-by: default avatarEmanuele Giuseppe Esposito <eesposit@redhat.com>
      b1c07349
    • John Snow's avatar
      iotests: update test owner contact information · 42a5009d
      John Snow authored
      
      Quite a few of these tests have stale contact information. This patch
      updates the stale ones that I happen to be aware of at the moment.
      
      Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
      Message-Id: <20220322174212.1169630-1-jsnow@redhat.com>
      Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
      Signed-off-by: default avatarHanna Reitz <hreitz@redhat.com>
      42a5009d
    • Peter Maydell's avatar
      Merge tag 'darwin-20220329' of https://github.com/philmd/qemu into staging · 44064550
      Peter Maydell authored
      Darwin patches
      
      - UI fixes
      
      # gpg: Signature made Mon 28 Mar 2022 23:42:21 BST
      # gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
      # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [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: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE
      
      * tag 'darwin-20220329' of https://github.com/philmd/qemu
      
      :
        ui/console: Check console before emitting GL event
        ui/cocoa: Respect left-command-key option
        main-loop: Disable block backend global state assertion on Cocoa
        gitattributes: Cover Objective-C source files
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      44064550
    • Paolo Bonzini's avatar
      tests/tcg: really fix path to target configuration · 36e38426
      Paolo Bonzini authored
      
      This was attempted in commit 533b0a1a ("tests/tcg: Fix target-specific
      Makefile variables path for user-mode", 2022-01-12) but it also used the
      wrong path; default.mak is used for config/devices, not config/targets.
      
      While at it, explain what the inclusion is about.
      
      Cc: Alex Bennée <alex.bennee@linaro.org>
      Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      36e38426
    • Paolo Bonzini's avatar
      virtio: fix --enable-vhost-user build on non-Linux · 14b61778
      Paolo Bonzini authored
      
      The vhost-shadow-virtqueue.c build requires include files from
      linux-headers/, so it cannot be built on non-Linux systems.
      Fortunately it is only needed by vhost-vdpa, so move it there.
      
      Acked-by: default avatarEugenio Pérez <eperezma@redhat.com>
      Acked-by: default avatarJason Wang <jasowang@redhat.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      14b61778
    • Peter Maydell's avatar
      Merge tag 'mips-20220329' of https://github.com/philmd/qemu into staging · bed1fa2f
      Peter Maydell authored
      MIPS patches queue
      
      - ABI fixes (Xuerui, Andreas)
      - Memory API alias fix (David)
      
      # gpg: Signature made Tue 29 Mar 2022 11:34:42 BST
      # gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
      # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [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: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE
      
      * tag 'mips-20220329' of https://github.com/philmd/qemu
      
      :
        qemu-binfmt-conf.sh: mips: allow nonzero EI_ABIVERSION, distinguish o32 and n32
        target/mips: Fix address space range declaration on n32
        memory: Make memory_region_readd_subregion() properly handle mapped aliases
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      bed1fa2f
  4. Mar 28, 2022
Loading