* [PULL 0/1] xen queue 2020-08-04
@ 2020-08-04 9:26 Anthony PERARD
2020-08-04 9:26 ` [PULL 1/1] accel/xen: Fix xen_enabled() behavior on target-agnostic objects Anthony PERARD
2020-08-04 12:02 ` [PULL 0/1] xen queue 2020-08-04 Peter Maydell
0 siblings, 2 replies; 4+ messages in thread
From: Anthony PERARD @ 2020-08-04 9:26 UTC (permalink / raw)
To: qemu-devel; +Cc: Anthony PERARD, Peter Maydell, xen-devel
The following changes since commit 5c1c3e4f02e458cf280c677c817ae4fd1ed9bf10:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200803' into staging (2020-08-03 20:34:26 +0100)
are available in the Git repository at:
https://xenbits.xen.org/git-http/people/aperard/qemu-dm.git tags/pull-xen-20200804
for you to fetch changes up to 8e0ef068942e4152f0d23e76ca1f5e35dc4456f7:
accel/xen: Fix xen_enabled() behavior on target-agnostic objects (2020-08-04 10:21:35 +0100)
----------------------------------------------------------------
xen patch
Bug fix.
----------------------------------------------------------------
Philippe Mathieu-Daudé (1):
accel/xen: Fix xen_enabled() behavior on target-agnostic objects
accel/stubs/xen-stub.c | 2 ++
accel/xen/xen-all.c | 7 +------
include/sysemu/xen.h | 18 ++++++++++++++----
3 files changed, 17 insertions(+), 10 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PULL 1/1] accel/xen: Fix xen_enabled() behavior on target-agnostic objects
2020-08-04 9:26 [PULL 0/1] xen queue 2020-08-04 Anthony PERARD
@ 2020-08-04 9:26 ` Anthony PERARD
2020-08-04 12:02 ` [PULL 0/1] xen queue 2020-08-04 Peter Maydell
1 sibling, 0 replies; 4+ messages in thread
From: Anthony PERARD @ 2020-08-04 9:26 UTC (permalink / raw)
To: qemu-devel
Cc: Anthony PERARD, Peter Maydell, Philippe Mathieu-Daudé, xen-devel
From: Philippe Mathieu-Daudé <philmd@redhat.com>
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>
---
accel/stubs/xen-stub.c | 2 ++
accel/xen/xen-all.c | 7 +------
include/sysemu/xen.h | 18 ++++++++++++++----
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/accel/stubs/xen-stub.c b/accel/stubs/xen-stub.c
index dcca4e678a13..8ae658acff5f 100644
--- a/accel/stubs/xen-stub.c
+++ b/accel/stubs/xen-stub.c
@@ -9,6 +9,8 @@
#include "hw/xen/xen.h"
#include "qapi/qapi-commands-misc.h"
+bool xen_allowed;
+
void xenstore_store_pv_console_info(int i, Chardev *chr)
{
}
diff --git a/accel/xen/xen-all.c b/accel/xen/xen-all.c
index 0c24d4b191a4..60b971d0a82f 100644
--- a/accel/xen/xen-all.c
+++ b/accel/xen/xen-all.c
@@ -32,12 +32,7 @@
do { } while (0)
#endif
-static bool xen_allowed;
-
-bool xen_enabled(void)
-{
- return xen_allowed;
-}
+bool xen_allowed;
xc_interface *xen_xc;
xenforeignmemory_handle *xen_fmem;
diff --git a/include/sysemu/xen.h b/include/sysemu/xen.h
index 1ca292715e69..2c2c429ea8bf 100644
--- a/include/sysemu/xen.h
+++ b/include/sysemu/xen.h
@@ -8,9 +8,19 @@
#ifndef SYSEMU_XEN_H
#define SYSEMU_XEN_H
-#ifdef CONFIG_XEN
+#ifdef NEED_CPU_H
+# ifdef CONFIG_XEN
+# define CONFIG_XEN_IS_POSSIBLE
+# endif
+#else
+# define CONFIG_XEN_IS_POSSIBLE
+#endif
+
+#ifdef CONFIG_XEN_IS_POSSIBLE
+
+extern bool xen_allowed;
-bool xen_enabled(void);
+#define xen_enabled() (xen_allowed)
#ifndef CONFIG_USER_ONLY
void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length);
@@ -18,7 +28,7 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size,
struct MemoryRegion *mr, Error **errp);
#endif
-#else /* !CONFIG_XEN */
+#else /* !CONFIG_XEN_IS_POSSIBLE */
#define xen_enabled() 0
#ifndef CONFIG_USER_ONLY
@@ -33,6 +43,6 @@ static inline void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size,
}
#endif
-#endif /* CONFIG_XEN */
+#endif /* CONFIG_XEN_IS_POSSIBLE */
#endif
--
Anthony PERARD
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PULL 0/1] xen queue 2020-08-04
2020-08-04 9:26 [PULL 0/1] xen queue 2020-08-04 Anthony PERARD
2020-08-04 9:26 ` [PULL 1/1] accel/xen: Fix xen_enabled() behavior on target-agnostic objects Anthony PERARD
@ 2020-08-04 12:02 ` Peter Maydell
1 sibling, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2020-08-04 12:02 UTC (permalink / raw)
To: Anthony PERARD; +Cc: open list:X86, QEMU Developers
On Tue, 4 Aug 2020 at 10:26, Anthony PERARD <anthony.perard@citrix.com> wrote:
>
> The following changes since commit 5c1c3e4f02e458cf280c677c817ae4fd1ed9bf10:
>
> Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200803' into staging (2020-08-03 20:34:26 +0100)
>
> are available in the Git repository at:
>
> https://xenbits.xen.org/git-http/people/aperard/qemu-dm.git tags/pull-xen-20200804
>
> for you to fetch changes up to 8e0ef068942e4152f0d23e76ca1f5e35dc4456f7:
>
> accel/xen: Fix xen_enabled() behavior on target-agnostic objects (2020-08-04 10:21:35 +0100)
>
> ----------------------------------------------------------------
> xen patch
>
> Bug fix.
>
> ----------------------------------------------------------------
> Philippe Mathieu-Daudé (1):
> accel/xen: Fix xen_enabled() behavior on target-agnostic objects
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PULL 1/1] accel/xen: Fix xen_enabled() behavior on target-agnostic objects
2020-08-03 16:52 [PULL 0/1] xen queue 2020-08-03 Anthony PERARD
@ 2020-08-03 16:52 ` Anthony PERARD
0 siblings, 0 replies; 4+ messages in thread
From: Anthony PERARD @ 2020-08-03 16:52 UTC (permalink / raw)
To: qemu-devel
Cc: Anthony PERARD, Peter Maydell, Philippe Mathieu-Daudé, xen-devel
From: Philippe Mathieu-Daudé <philmd@redhat.com>
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: Anthony PERARD <anthony.perard@citrix.com>
Tested-by: Paul Durrant <paul@xen.org>
Message-Id: <20200728100925.10454-1-philmd@redhat.com>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
include/sysemu/xen.h | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/include/sysemu/xen.h b/include/sysemu/xen.h
index 1ca292715e69..385a1fa2bff8 100644
--- a/include/sysemu/xen.h
+++ b/include/sysemu/xen.h
@@ -8,7 +8,15 @@
#ifndef SYSEMU_XEN_H
#define SYSEMU_XEN_H
-#ifdef CONFIG_XEN
+#ifdef NEED_CPU_H
+# ifdef CONFIG_XEN
+# define CONFIG_XEN_IS_POSSIBLE
+# endif
+#else
+# define CONFIG_XEN_IS_POSSIBLE
+#endif
+
+#ifdef CONFIG_XEN_IS_POSSIBLE
bool xen_enabled(void);
@@ -18,7 +26,7 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size,
struct MemoryRegion *mr, Error **errp);
#endif
-#else /* !CONFIG_XEN */
+#else /* !CONFIG_XEN_IS_POSSIBLE */
#define xen_enabled() 0
#ifndef CONFIG_USER_ONLY
@@ -33,6 +41,6 @@ static inline void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size,
}
#endif
-#endif /* CONFIG_XEN */
+#endif /* CONFIG_XEN_IS_POSSIBLE */
#endif
--
Anthony PERARD
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-08-04 12:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-04 9:26 [PULL 0/1] xen queue 2020-08-04 Anthony PERARD
2020-08-04 9:26 ` [PULL 1/1] accel/xen: Fix xen_enabled() behavior on target-agnostic objects Anthony PERARD
2020-08-04 12:02 ` [PULL 0/1] xen queue 2020-08-04 Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2020-08-03 16:52 [PULL 0/1] xen queue 2020-08-03 Anthony PERARD
2020-08-03 16:52 ` [PULL 1/1] accel/xen: Fix xen_enabled() behavior on target-agnostic objects Anthony PERARD
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).