[Qemu-commits] [qemu/qemu] 8e0ef0: accel/xen: Fix xen_enabled() behavior on target-ag...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 8e0ef068942e4152f0d23e76ca1f5e35dc4456f7
      
https://github.com/qemu/qemu/commit/8e0ef068942e4152f0d23e76ca1f5e35dc4456f7
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-08-04 (Tue, 04 Aug 2020)

  Changed paths:
    M accel/stubs/xen-stub.c
    M accel/xen/xen-all.c
    M include/sysemu/xen.h

  Log Message:
  -----------
  accel/xen: Fix xen_enabled() behavior on target-agnostic objects

CONFIG_XEN is generated by configure and stored in "config-target.h",
which is (obviously) only include for target-specific objects.
This is a problem for target-agnostic objects as CONFIG_XEN is never
defined and xen_enabled() is always inlined as 'false'.

Fix by following the KVM schema, defining CONFIG_XEN_IS_POSSIBLE
when we don't know to force the call of the non-inlined function,
returning the xen_allowed boolean.

Fixes: da278d58a092 ("accel: Move Xen accelerator code under accel/xen/")
Reported-by: Paul Durrant <pdurrant@amazon.com>
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paul Durrant <paul@xen.org>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
Message-Id: <20200804074930.13104-2-philmd@redhat.com>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>


  Commit: d15532d91be177e7528310e0110e39f915779a99
      
https://github.com/qemu/qemu/commit/d15532d91be177e7528310e0110e39f915779a99
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-08-04 (Tue, 04 Aug 2020)

  Changed paths:
    M accel/stubs/xen-stub.c
    M accel/xen/xen-all.c
    M include/sysemu/xen.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/aperard/tags/pull-xen-20200804' into 
staging

xen patch

Bug fix.

# gpg: Signature made Tue 04 Aug 2020 10:24:51 BST
# gpg:                using RSA key F80C006308E22CFD8A92E7980CF5572FD7FB55AF
# gpg:                issuer "anthony.perard@citrix.com"
# gpg: Good signature from "Anthony PERARD <anthony.perard@gmail.com>" 
[marginal]
# gpg:                 aka "Anthony PERARD <anthony.perard@citrix.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: 5379 2F71 024C 600F 778A  7161 D8D5 7199 DF83 42C8
#      Subkey fingerprint: F80C 0063 08E2 2CFD 8A92  E798 0CF5 572F D7FB 55AF

* remotes/aperard/tags/pull-xen-20200804:
  accel/xen: Fix xen_enabled() behavior on target-agnostic objects

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


Compare: https://github.com/qemu/qemu/compare/bcc983234ba0...d15532d91be1