Skip to content
Snippets Groups Projects
  1. Oct 30, 2020
    • Eric Blake's avatar
      qapi: Add QAPI_LIST_PREPEND() macro · 9812e712
      Eric Blake authored
      
      block.c has a useful macro QAPI_LIST_ADD() for inserting at the front
      of any QAPI-generated list; move it from block.c to qapi/util.h so
      more places can use it, including one earlier place in block.c, and
      rename it to something more obvious (since we also have a lot of
      places that append, rather than prepend, to a list).
      
      There are many more places in the codebase that can benefit from using
      the macro, but converting them will be left to later patches.
      
      In theory, all QAPI list types are child classes of GenericList; but
      in practice, that relationship is not explicitly spelled out in the C
      type declarations (rather, it is something that happens implicitly due
      to C compatible layouts), and the macro does not actually depend on
      the GenericList type.  We considered moving GenericList from visitor.h
      into util.h to group related code; however, such a move would be
      awkward if we do not also move GenericAlternate.  Unfortunately,
      moving GenericAlternate would introduce its own problems of
      declaration circularity (qapi-builtin-types.h needs a complete
      definition of QEnumLookup from util.h, but GenericAlternate needs a
      complete definition of QType from qapi-builtin-types.h).
      
      Suggested-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
      Signed-off-by: default avatarEric Blake <eblake@redhat.com>
      Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
      Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
      Message-Id: <20201027050556.269064-3-eblake@redhat.com>
      [eblake: s/ADD/PREPEND/ per suggestion by Markus]
      9812e712
    • Eric Blake's avatar
      block: Simplify QAPI_LIST_ADD · 159f8442
      Eric Blake authored
      
      There is no need to rely on the verbosity of the gcc/clang compiler
      extension of g_new(typeof(X), 1) when we can instead use the standard
      g_malloc(sizeof(X)).  In general, we like g_new over g_malloc for
      returning type X rather than void* to let the compiler catch more
      potential typing mistakes, but in this particular macro, our other use
      of typeof on the same line already ensures we are getting correct
      results.
      
      Suggested-by: default avatarMarkus Armbruster <armbru@redhat.com>
      Signed-off-by: default avatarEric Blake <eblake@redhat.com>
      Message-Id: <20201027050556.269064-2-eblake@redhat.com>
      Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
      Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
      159f8442
    • Hanna Reitz's avatar
      iotests/291: Stop NBD server · cb7223ac
      Hanna Reitz authored
      
      nbd_server_start_unix_socket() includes an implicit nbd_server_stop(),
      but we still need an explicit one at the end of the test (where there
      follows no next nbd_server_start_unix_socket()), or qemu-nbd will linger
      until the test exits.
      
      This will become important when enabling this test to run on FUSE
      exports, because then the export (which is the image used by qemu-nbd)
      will go away before qemu-nbd exits, which will lead to qemu-nbd
      complaining that it cannot flush the bitmaps in the image.
      
      Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
      Message-Id: <20201027164416.144115-3-mreitz@redhat.com>
      Reviewed-by: default avatarEric Blake <eblake@redhat.com>
      Signed-off-by: default avatarEric Blake <eblake@redhat.com>
      cb7223ac
    • Hanna Reitz's avatar
      iotests/291: Filter irrelevant parts of img-info · b4af1df0
      Hanna Reitz authored
      
      We need to let _img_info emit the format-specific information so we get
      the list of bitmaps we want, but we do not need anything but the
      bitmaps.  So filter out everything that is irrelevant to us.  (Ideally,
      this would be a generalized function in common.filters that takes a list
      of things to keep, but that would require implementing an anti-bitmap
      filter, which would be hard, and which we do not need here.  So that is
      why this function is just a local hack.)
      
      This lets 291 pass with qcow2 options like refcount_bits or data_file
      again.
      
      Fixes: 14f16bf9
             ("qemu-img: Support bitmap --merge into backing image")
      Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
      Message-Id: <20201027164416.144115-2-mreitz@redhat.com>
      Reviewed-by: default avatarEric Blake <eblake@redhat.com>
      Signed-off-by: default avatarEric Blake <eblake@redhat.com>
      b4af1df0
    • Peter Maydell's avatar
      Merge remote-tracking branch... · 9a2ea4f4
      Peter Maydell authored
      Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.2-pull-request' into staging
      
      Pull request trivial branch 20201027
      
      # gpg: Signature made Tue 27 Oct 2020 16:29:47 GMT
      # 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/trivial-branch-for-5.2-pull-request:
        CHANGELOG: remove disused file
        qdev: Fix two typos
        scripts/qmp: delete 'qmp' script
        cryptodev: Fix Lesser GPL version number
        io: Fix Lesser GPL version number
        cpus: Drop declaration of cpu_remove()
        Makefile: Add *.[ch].inc files to cscope/ctags/TAGS
        elf2dmp: Fix memory leak on main() error paths
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      9a2ea4f4
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging · c99fa56b
      Peter Maydell authored
      
      Block layer patches:
      
      - qcow2: Skip copy-on-write when allocating a zero cluster
      - qemu-img: add support for rate limit in qemu-img convert/commit
      - Fix deadlock when deleting a block node during drain_all
      
      # gpg: Signature made Tue 27 Oct 2020 15:14:07 GMT
      # gpg:                using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6
      # gpg:                issuer "kwolf@redhat.com"
      # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
      # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6
      
      * remotes/kevin/tags/for-upstream:
        block: End quiescent sections when a BDS is deleted
        qcow2: Skip copy-on-write when allocating a zero cluster
        qcow2: Report BDRV_BLOCK_ZERO more accurately in bdrv_co_block_status()
        qemu-img: add support for rate limit in qemu-img convert
        qemu-img: add support for rate limit in qemu-img commit
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      c99fa56b
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/jsnow-gitlab/tags/ide-pull-request' into staging · d03e884e
      Peter Maydell authored
      
      IDE Pull request
      
      # gpg: Signature made Tue 27 Oct 2020 14:41:59 GMT
      # gpg:                using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
      # gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full]
      # Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
      #      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E
      
      * remotes/jsnow-gitlab/tags/ide-pull-request:
        ide: clear SRST after SRST finishes
        ide: perform SRST as early as possible
        ide: run diagnostic after SRST
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      d03e884e
  2. Oct 29, 2020
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-5.2-20201028' into staging · a19d4bc4
      Peter Maydell authored
      
      ppc patch queue 2020-10-28
      
      Here's the next pull request for ppc and spapr related patches, which
      should be the last things for soft freeze.  Includes:
      
       * Numerous error handling cleanups from Greg Kurz
       * Cleanups to cpu realization and hotplug handling from Greg Kurz
       * A handful of other small fixes and cleanups
      
      This does include a change to pc_dimm_plug() that isn't in my normal
      areas of concern.  That's there as a a prerequisite for ppc specific
      changes, and has an ack from Igor.
      
      # gpg: Signature made Tue 27 Oct 2020 14:13:21 GMT
      # gpg:                using RSA key 75F46586AE61A66CC44E87DC6C38CACA20D9B392
      # gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>" [full]
      # gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>" [full]
      # gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>" [full]
      # gpg:                 aka "David Gibson (kernel.org) <dwg@kernel.org>" [unknown]
      # Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392
      
      * remotes/dgibson/tags/ppc-for-5.2-20201028:
        ppc/: fix some comment spelling errors
        spapr: Improve spapr_reallocate_hpt() error reporting
        target/ppc: Fix kvmppc_load_htab_chunk() error reporting
        spapr: Use error_append_hint() in spapr_reallocate_hpt()
        spapr: Simplify error handling in spapr_memory_plug()
        spapr: Pass &error_abort when getting some PC DIMM properties
        spapr: Use appropriate getter for PC_DIMM_SLOT_PROP
        spapr: Use appropriate getter for PC_DIMM_ADDR_PROP
        pc-dimm: Drop @errp argument of pc_dimm_plug()
        spapr: Simplify spapr_cpu_core_realize() and spapr_cpu_core_unrealize()
        spapr: Make spapr_cpu_core_unrealize() idempotent
        spapr: Drop spapr_delete_vcpu() unused argument
        spapr: Unrealize vCPUs with qdev_unrealize()
        spapr: Fix leak of CPU machine specific data
        spapr: Move spapr_create_nvdimm_dr_connectors() to core machine code
        hw/net: move allocation to the heap due to very large stack frame
        ppc/spapr: re-assert IRQs during event-scan if there are pending
        spapr: Clarify why DR connectors aren't user creatable
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      a19d4bc4
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20201027-1' into staging · 802427bc
      Peter Maydell authored
      
      target-arm queue:
       * raspi: add model of cprman clock manager
       * sbsa-ref: add an SBSA generic watchdog device
       * arm/trace: Fix hex printing
       * raspi: Add models of Pi 3 model A+, Pi Zero and Pi A+
       * hw/arm/smmuv3: Set the restoration priority of the vSMMUv3 explicitly
       * Nuvoton NPCM7xx: Add USB, RNG, GPIO and watchdog support
       * hw/arm: fix min_cpus for xlnx-versal-virt platform
       * hw/arm/highbank: Silence warnings about missing fallthrough statements
       * linux-user: Support Aarch64 BTI
       * Armv7M systick: fix corner case bugs by rewriting to use ptimer
      
      # gpg: Signature made Tue 27 Oct 2020 11:27:10 GMT
      # gpg:                using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
      # gpg:                issuer "peter.maydell@linaro.org"
      # gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [ultimate]
      # gpg:                 aka "Peter Maydell <pmaydell@gmail.com>" [ultimate]
      # gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [ultimate]
      # Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE
      
      * remotes/pmaydell/tags/pull-target-arm-20201027-1: (48 commits)
        hw/timer/armv7m_systick: Rewrite to use ptimers
        hw/core/ptimer: Support ptimer being disabled by timer callback
        hw/arm/sbsa-ref: add SBSA watchdog device
        hw/watchdog: Implement SBSA watchdog device
        hw/arm/bcm2835_peripherals: connect the UART clock
        hw/char/pl011: add a clock input
        hw/misc/bcm2835_cprman: add sane reset values to the registers
        hw/misc/bcm2835_cprman: add the DSI0HSCK multiplexer
        hw/misc/bcm2835_cprman: implement clock mux behaviour
        hw/misc/bcm2835_cprman: add a clock mux skeleton implementation
        hw/misc/bcm2835_cprman: implement PLL channels behaviour
        hw/misc/bcm2835_cprman: add a PLL channel skeleton implementation
        hw/misc/bcm2835_cprman: implement PLLs behaviour
        hw/misc/bcm2835_cprman: add a PLL skeleton implementation
        hw/arm/raspi: add a skeleton implementation of the CPRMAN
        hw/arm/raspi: fix CPRMAN base address
        hw/core/clock: trace clock values in Hz instead of ns
        hw/core/clock: provide the VMSTATE_ARRAY_CLOCK macro
        arm/trace: Fix hex printing
        hw/arm/raspi: Add the Raspberry Pi 3 model A+
        ...
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      802427bc
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/armbru/tags/pull-qmp-2020-10-27' into staging · c0444009
      Peter Maydell authored
      
      QMP patches patches for 2020-10-27
      
      # gpg: Signature made Tue 27 Oct 2020 10:13:00 GMT
      # gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
      # gpg:                issuer "armbru@redhat.com"
      # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
      # gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
      # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653
      
      * remotes/armbru/tags/pull-qmp-2020-10-27:
        scripts/qmp: delete 'qmp' script
        qmp-shell: Sort by key when pretty-printing
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      c0444009
  3. Oct 28, 2020
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-and-misc-271020-1' into staging · a5e7fb4d
      Peter Maydell authored
      
      Testing and gitdm updates
      
        - add some more individual contributors
        - include SDL2 in centos images
        - skip checkpatch check when no commits found
        - use random port for gdb reverse debugging
        - make gitlab use it's own mirrors to clone
        - fix detection of make -nqp
      
      # gpg: Signature made Tue 27 Oct 2020 09:55:55 GMT
      # gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
      # gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
      # Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44
      
      * remotes/stsquad/tags/pull-testing-and-misc-271020-1:
        makefile: handle -n / -k / -q correctly
        gitlab-ci: Clone from GitLab itself
        tests/acceptance: pick a random gdb port for reverse debugging
        scripts: fix error from checkpatch.pl when no commits are found
        gitlab: skip checkpatch.pl checks if no commit delta on branch
        tests/docker/dockerfiles/centos: Use SDL2 instead of SDL1
        contrib/gitdm: Add more individual contributors
        Adding ani's email as an individual contributor
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      a5e7fb4d
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/philmd-gitlab/tags/renesas-20201027' into staging · bbc48d2b
      Peter Maydell authored
      Renesas patches (SH4 and RX)
      
      - Fix few warnings (Thomas Huth)
      - Fix typos (Lichang Zhao, Chetan Pant)
      
      CI jobs results:
      . https://cirrus-ci.com/build/6368903343374336
      . https://gitlab.com/philmd/qemu/-/pipelines/207919103
      . https://travis-ci.org/github/philmd/qemu/builds/739133105
      
      
      
      # gpg: Signature made Mon 26 Oct 2020 23:27:39 GMT
      # 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
      
      * remotes/philmd-gitlab/tags/renesas-20201027:
        target/rx: Fix Lesser GPL version number
        target/rx: Fix some comment spelling errors
        target/sh4: fix some comment spelling errors
        target/sh4: Update coding style to make checkpatch.pl happy
        hw/timer/sh_timer: Remove superfluous "break" statements
        hw/timer/sh_timer: Silence warnings about missing fallthrough statements
        hw/timer/sh_timer: Coding style clean-up
        elf: Add EM_RX definition
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      bbc48d2b
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.2-pull-request' into staging · 5c27a855
      Peter Maydell authored
      
      Update syscall numbers to 5.9-rc7
      Fixes for prctl(), accept4() and xtensa
      
      # gpg: Signature made Mon 26 Oct 2020 22:02:56 GMT
      # 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-5.2-pull-request:
        target/xtensa: enable all coprocessors for linux-user
        linux-user: correct errno returned from accept4() syscall
        linux-user: remove _sysctl
        linux-user: update syscall.tbl to Linux 5.9-rc7
        linux-user: update mips/syscall-args-o32.c.inc to Linux 5.9-rc7
        linux-user: update syscall_nr.h to Linux 5.9-rc7
        linux-user: Support f_flags in statfs64 when available.
        Fix stack smashing when handling PR_GET_PDEATHSIG
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      5c27a855
    • Alex Williamson's avatar
      Revert series: virtiofsd: Announce submounts to the guest · 33dc9914
      Alex Williamson authored
      
      This reverts the following commits due to their basis on a bogus
      linux kernel header update:
      
      c93a656f ("tests/acceptance: Add virtiofs_submounts.py")
      45ced7ca ("tests/acceptance/boot_linux: Accept SSH pubkey")
      08dce386 ("virtiofsd: Announce sub-mount points")
      eba8b096 ("virtiofsd: Store every lo_inode's parent_dev")
      ede24b6b ("virtiofsd: Add fuse_reply_attr_with_flags()")
      e2577435 ("virtiofsd: Add attr_flags to fuse_entry_param")
      2f10415a ("virtiofsd: Announce FUSE_ATTR_FLAGS")
      97d741cc ("linux/fuse.h: Pull in from Linux")
      
      Cc: Max Reitz <mreitz@redhat.com>
      Cc: Stefan Hajnoczi <stefanha@redhat.com>
      Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
      Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
      Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
      Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
      Message-id: 160385090886.20017.13382256442750027666.stgit@gimli.home
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      33dc9914
  4. Oct 27, 2020
Loading