On Tue, 13 Apr 2021 at 17:18, Paolo Bonzini <[email protected]> wrote: > > The following changes since commit c1e90def01bdb8fcbdbebd9d1eaa8e4827ece620: > > Merge remote-tracking branch > 'remotes/pmaydell/tags/pull-target-arm-20210412' into staging (2021-04-12 > 12:12:09 +0100) > > are available in the Git repository at: > > https://gitlab.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 1a0b186eaf3d1ce63dc7bf608d618b9ca62b6241: > > qapi/qom.json: Do not use CONFIG_VIRTIO_CRYPTO in common code (2021-04-13 > 18:04:23 +0200) > > ---------------------------------------------------------------- > * Fix C++ compilation of qemu/osdep.h. > * Fix -object cryptodev-vhost-user > > ---------------------------------------------------------------- > Paolo Bonzini (2): > osdep: include glib-compat.h before other QEMU headers > osdep: protect qemu/osdep.h with extern "C" > > Thomas Huth (1): > qapi/qom.json: Do not use CONFIG_VIRTIO_CRYPTO in common code
Given Dan's review, I think that the osdep patches need another revision. So my plan is to cherry-pick the CONFIG_VIRTIO_CRYPTO patch here and tag rc3 with just that. If we need an rc4 (which on our current track record is not unlikely) we can put in some version of the osdep patches; if not, this isn't a regression since 5.2 so I'm happy releasing 6.0 with it still present. thanks -- PMM
