[Qemu-commits] [qemu/qemu] 088fe5: osdep: include glib-compat.h before other QEMU hea...

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 088fe505131907c490420be3445044a6435eda42
      
https://github.com/qemu/qemu/commit/088fe505131907c490420be3445044a6435eda42
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-04-13 (Tue, 13 Apr 2021)

  Changed paths:
    M include/qemu/osdep.h

  Log Message:
  -----------
  osdep: include glib-compat.h before other QEMU headers

glib-compat.h is sort of like a system header, and it needs to include
system headers (glib.h) that may dislike being included under
'extern "C"'.  Move it right after all system headers and before
all other QEMU headers.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 12763913a3e44d9968a9ab0da01a0880fc7d61df
      
https://github.com/qemu/qemu/commit/12763913a3e44d9968a9ab0da01a0880fc7d61df
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-04-13 (Tue, 13 Apr 2021)

  Changed paths:
    M disas/nanomips.cpp
    M include/qemu/compiler.h
    M include/qemu/osdep.h

  Log Message:
  -----------
  osdep: protect qemu/osdep.h with extern "C"

System headers may include templates if compiled with a C++ compiler,
which cause the compiler to complain if qemu/osdep.h is included
within a C++ source file's 'extern "C"' block.  Add
an 'extern "C"' block directly to qemu/osdep.h, so that
system headers can be kept out of it.

There is a stray declaration early in qemu/osdep.h, which needs
to be special cased.  Add a definition in qemu/compiler.h to
make it look nice.

config-host.h, CONFIG_TARGET, exec/poison.h and qemu/compiler.h
are included outside the 'extern "C"' block; that is not
an issue because they consist entirely of preprocessor directives.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 1a0b186eaf3d1ce63dc7bf608d618b9ca62b6241
      
https://github.com/qemu/qemu/commit/1a0b186eaf3d1ce63dc7bf608d618b9ca62b6241
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2021-04-13 (Tue, 13 Apr 2021)

  Changed paths:
    M qapi/qom.json

  Log Message:
  -----------
  qapi/qom.json: Do not use CONFIG_VIRTIO_CRYPTO in common code

The ObjectType enum and ObjectOptions are included from qapi-types-qom.h
into common code. We should not use target-specific config switches like
CONFIG_VIRTIO_CRYPTO here, since this is not defined in common code and
thus the enum will look differently between common and target specific
code. For this case, it's hopefully enough to check for CONFIG_VHOST_CRYPTO
only (which is a host specific config switch, i.e. it's the same on all
targets).

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210412160710.639800-1-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: ad87669c8ee054b35bdc5a1ddb85c9e9e28cc3ed
      
https://github.com/qemu/qemu/commit/ad87669c8ee054b35bdc5a1ddb85c9e9e28cc3ed
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-04-14 (Wed, 14 Apr 2021)

  Changed paths:
    M disas/nanomips.cpp
    M include/qemu/compiler.h
    M include/qemu/osdep.h
    M qapi/qom.json

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into 
staging

* Fix C++ compilation of qemu/osdep.h.
* Fix -object cryptodev-vhost-user

# gpg: Signature made Tue 13 Apr 2021 17:05:09 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

* remotes/bonzini-gitlab/tags/for-upstream:
  qapi/qom.json: Do not use CONFIG_VIRTIO_CRYPTO in common code
  osdep: protect qemu/osdep.h with extern "C"
  osdep: include glib-compat.h before other QEMU headers

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/3ddb05dbf21e...ad87669c8ee0