accel/xen: Fix xen_enabled() behavior on target-agnostic objects
v2 cover accel/xen: Fix xen_enabled() behavior on target-agnostic objects
Since v1: Fix build error reported by Peter:
https://www.mail-archive.com/[email protected]/msg727251.html
Now following KVM implementation closely.
Philippe Mathieu-Daudé (1):
accel/xen: Fix xen_enabled() behavior on target-agnostic objects
include/sysemu/xen.h | 18 ++++++++++++++---- accel/stubs/xen-stub.c | 2 ++ accel/xen/xen-all.c | 7 +------ 3 files changed, 17 insertions(+), 10 deletions(-)
Signature · 1 line
2.21.3
PATCH v2 1/1 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.
--- include/sysemu/xen.h | 18 ++++++++++++++---- accel/stubs/xen-stub.c | 2 ++ accel/xen/xen-all.c | 7 +------ 3 files changed, 17 insertions(+), 10 deletions(-)
include/sysemu/xen.h +14 -4
@@ -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 -bool xen_enabled (void ); +#ifdef CONFIG_XEN_IS_POSSIBLE + +extern bool xen_allowed; + +#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
accel/stubs/xen-stub.c +2 -0
@@ -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) { }
accel/xen/xen-all.c +1 -6
@@ -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;
Signature · 1 line
2.21.3
Quoted 42 lines
-----Original Message-----
From: Philippe Mathieu-Daudé <[email protected]>
Sent: 04 August 2020 08:50
To: [email protected]
Cc: Peter Maydell <[email protected]>; Anthony Perard <[email protected]>; Paolo Bonzini <[email protected]>; Stefano Stabellini <[email protected]>; xen- [email protected]; Paul Durrant <[email protected]>; Philippe Mathieu-Daudé <[email protected]>; Paul Durrant <[email protected]>
Subject: [PATCH-for-5.1 v2 1/1] accel/xen: Fixxen_enabled()behavior on target-agnostic objects
CONFIG_XENis 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 asCONFIG_XENis never defined andxen_enabled()is always inlined as 'false'.Fix by following the KVM schema, defining
CONFIG_XEN_IS_POSSIBLEwhen we don't know to force the call of the non-inlined function, returning thexen_allowedboolean.Fixes da278d58a092 ("accel: Move Xen accelerator code under accel/xen/")Reported-by Paul Durrant <[email protected]>Suggested-by Peter Maydell <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/sysemu/xen.h | 18 ++++++++++++++---- accel/stubs/xen-stub.c | 2 ++ accel/xen/xen-all.c | 7 +------ 3 files changed, 17 insertions(+), 10 deletions(-)include/sysemu/xen.h +4
-1@@ -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
include/sysemu/xen.h line 23
Quoted 10 lines
include/sysemu/xen.h +8
-1+#else +# define CONFIG_XEN_IS_POSSIBLE +#endif -bool xen_enabled (void ); +#ifdef CONFIG_XEN_IS_POSSIBLE + +extern bool xen_allowed; + +#define xen_enabled () (xen_allowed)
Can this not move ahead of the #ifdef now (since xen_allowed is present in both xen-stub and xen-all)? I think this is what Peter was saying in his option '(2)'.
Paul
Quoted 53 lines
include/sysemu/xen.h +2
-2#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 accel/stubs/xen-stub.c +2
-0@@ -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) { }accel/xen/xen-all.c +1
-7@@ -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; --2.21.3
Hi Paul,
Quoted 46 lines · Paul Durrant
Quoted 46 lines
-----Original Message-----
From: Philippe Mathieu-Daudé <[email protected]>
Sent: 04 August 2020 08:50
To: [email protected]
Cc: Peter Maydell <[email protected]>; Anthony Perard <[email protected]>; Paolo Bonzini <[email protected]>; Stefano Stabellini <[email protected]>; xen- [email protected]; Paul Durrant <[email protected]>; Philippe Mathieu-Daudé <[email protected]>; Paul Durrant <[email protected]>
Subject: [PATCH-for-5.1 v2 1/1] accel/xen: Fixxen_enabled()behavior on target-agnostic objects
CONFIG_XENis 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 asCONFIG_XENis never defined andxen_enabled()is always inlined as 'false'.Fix by following the KVM schema, defining
CONFIG_XEN_IS_POSSIBLEwhen we don't know to force the call of the non-inlined function, returning thexen_allowedboolean.Fixes da278d58a092 ("accel: Move Xen accelerator code under accel/xen/")Reported-by Paul Durrant <[email protected]>Suggested-by Peter Maydell <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/sysemu/xen.h | 18 ++++++++++++++---- accel/stubs/xen-stub.c | 2 ++ accel/xen/xen-all.c | 7 +------ 3 files changed, 17 insertions(+), 10 deletions(-)include/sysemu/xen.h +7
-1@@ -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
Quoted 8 lines
include/sysemu/xen.h line 23
Quoted 6 lines
include/sysemu/xen.h +5
-1-bool xen_enabled (void ); +#ifdef CONFIG_XEN_IS_POSSIBLE + +extern bool xen_allowed; + +#define xen_enabled () (xen_allowed)Can this not move ahead of the #ifdef now (since
xen_allowedis present in both xen-stub and xen-all)? I think this is what Peter was saying in his option '(2)'.
I think I respected Peter's option '(2)', following how KVM does, this is the case with stub,
Quoted 10 lines
Paul
Quoted 7 lines
include/sysemu/xen.h +0
-0#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
Quoted 4 lines
include/sysemu/xen.h void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, · line 33
Quoted 4 lines
include/sysemu/xen.h +1
-1-#else /* !CONFIG_XEN */ +#else /* !CONFIG_XEN_IS_POSSIBLE */ #define xen_enabled () 0
^^^ here is the other case,
Quoted 17 lines
Quoted 17 lines
include/sysemu/xen.h +1
-1#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 accel/stubs/xen-stub.c +0
-0@@ -9,6 +9,8 @@#include "hw/xen/xen.h" #include "qapi/qapi-commands-misc.h"
Quoted 1 line
accel/stubs/xen-stub.c line 12
Quoted 1 line
accel/stubs/xen-stub.c +1
-0+bool xen_allowed;
here is the stub,
Quoted 12 lines
Quoted 12 lines
accel/stubs/xen-stub.c +1
-0+void xenstore_store_pv_console_info (int i,Chardev *chr) { }accel/xen/xen-all.c +0
-0@@ -32,12 +32,7 @@ do { } while (0)#endif
Quoted 7 lines
accel/xen/xen-all.c line 35
Quoted 7 lines
accel/xen/xen-all.c +1
-6-static bool xen_allowed; - -bool xen_enabled (void ) -{ -return xen_allowed; -} +bool xen_allowed;
here is the real variable.
Quoted 7 lines
Quoted 5 lines
accel/xen/xen-all.c +0
-1xc_interface *xen_xc;xenforeignmemory_handle *xen_fmem; --2.21.3
Paul Durrant
Reviewed-byQuoted 67 lines
-----Original Message-----
From: Philippe Mathieu-Daudé <[email protected]>
Sent: 04 August 2020 09:35
To: [email protected]; [email protected]
Cc: 'Peter Maydell' <[email protected]>; 'Anthony Perard' <[email protected]>; 'Paolo Bonzini' <[email protected]>; 'Stefano Stabellini' <[email protected]>; xen- [email protected]; 'Paul Durrant' <[email protected]>
Subject: Re: [PATCH-for-5.1 v2 1/1] accel/xen: Fixxen_enabled()behavior on target-agnostic objectsHi Paul,
Quoted 7 lines · Paul Durrant
Quoted 7 lines
-----Original Message-----
From: Philippe Mathieu-Daudé <[email protected]>
Sent: 04 August 2020 08:50
To: [email protected]
Cc: Peter Maydell <[email protected]>; Anthony Perard <[email protected]>; Paolo Bonzini <[email protected]>; Stefano Stabellini <[email protected]>; xen- [email protected]; Paul Durrant <[email protected]>; Philippe Mathieu-DaudéQuoted 39 lines
Quoted 39 lines
Paul Durrant <[email protected]>
Subject: [PATCH-for-5.1 v2 1/1] accel/xen: Fixxen_enabled()behavior on target-agnostic objects
CONFIG_XENis 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 asCONFIG_XENis never defined andxen_enabled()is always inlined as 'false'.Fix by following the KVM schema, defining
CONFIG_XEN_IS_POSSIBLEwhen we don't know to force the call of the non-inlined function, returning thexen_allowedboolean.Fixes da278d58a092 ("accel: Move Xen accelerator code under accel/xen/")Reported-by Paul Durrant <[email protected]>Suggested-by Peter Maydell <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/sysemu/xen.h | 18 ++++++++++++++---- accel/stubs/xen-stub.c | 2 ++ accel/xen/xen-all.c | 7 +------ 3 files changed, 17 insertions(+), 10 deletions(-)include/sysemu/xen.h +7
-1@@ -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 Quoted 8 lines
include/sysemu/xen.h line 23
Quoted 6 lines
include/sysemu/xen.h +5
-1-bool xen_enabled (void ); +#ifdef CONFIG_XEN_IS_POSSIBLE + +extern bool xen_allowed; + +#define xen_enabled () (xen_allowed)Can this not move ahead of the #ifdef now (since
xen_allowedis present in both xen-stub and xen-
Quoted 4 lines
all)? I think this is what Peter was saying in his option '(2)'.
I think I respected Peter's option '(2)', following how KVM does, this is the case with stub,
Ok, if it follows the KVM pattern then that's fine.
Quoted 5 lines · Philippe Mathieu-Daudé
CONFIG_XENis 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 asCONFIG_XENis never defined andxen_enabled()is always inlined as 'false'.
Quoted 8 lines
Fix by following the KVM schema, defining
CONFIG_XEN_IS_POSSIBLEwhen we don't know to force the call of the non-inlined function, returning thexen_allowedboolean.Fixes da278d58a092 ("accel: Move Xen accelerator code under accel/xen/")Reported-by Paul Durrant <[email protected]>Suggested-by Peter Maydell <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>
This time, I've also check that build all targets works...
I'll prepare the pull request right away.
Thank you,
Signature · 1 line
Anthony PERARD