* [PATCH-for-4.14 0/2] xen: build fixes for CONFIG_HYPFS
@ 2020-06-02 11:40 Juergen Gross
2020-06-02 11:40 ` [PATCH-for-4.14 1/2] xen: fix build with CONFIG_HYPFS_CONFIG enabled Juergen Gross
2020-06-02 11:40 ` [PATCH-for-4.14 2/2] xen/config: disable hypervisor filesystem for pv-shim Juergen Gross
0 siblings, 2 replies; 8+ messages in thread
From: Juergen Gross @ 2020-06-02 11:40 UTC (permalink / raw)
To: xen-devel
Cc: Juergen Gross, Stefano Stabellini, Julien Grall, Wei Liu, paul,
Andrew Cooper, Ian Jackson, George Dunlap, Jan Beulich,
Roger Pau Monné
Fixing an issue Andrew met, and disabling CONFIG_HYPFS in pv-shim.
Juergen Gross (2):
xen: fix build with CONFIG_HYPFS_CONFIG enabled
xen/config: disable hypervisor filesystem for pv-shim
xen/arch/x86/configs/pvshim_defconfig | 1 +
xen/common/Makefile | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--
2.26.2
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH-for-4.14 1/2] xen: fix build with CONFIG_HYPFS_CONFIG enabled
2020-06-02 11:40 [PATCH-for-4.14 0/2] xen: build fixes for CONFIG_HYPFS Juergen Gross
@ 2020-06-02 11:40 ` Juergen Gross
2020-06-02 11:55 ` Jan Beulich
2020-06-02 11:40 ` [PATCH-for-4.14 2/2] xen/config: disable hypervisor filesystem for pv-shim Juergen Gross
1 sibling, 1 reply; 8+ messages in thread
From: Juergen Gross @ 2020-06-02 11:40 UTC (permalink / raw)
To: xen-devel
Cc: Juergen Gross, Stefano Stabellini, Julien Grall, Wei Liu, paul,
Andrew Cooper, Ian Jackson, George Dunlap, Jan Beulich
Commit 58263ed7713e ("xen: add /buildinfo/config entry to hypervisor
filesystem") added a dependency to .config, but the hypervisor's build
config could be have another name via setting KCONFIG_CONFIG.
Fix that by using $(KCONFIG_CONFIG) instead. Additionally reference
the config file via $(XEN_ROOT) instead of a relative path.
Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
---
xen/common/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xen/common/Makefile b/xen/common/Makefile
index 91581e1815..2799f6510c 100644
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -75,7 +75,7 @@ obj-$(CONFIG_UBSAN) += ubsan/
obj-$(CONFIG_NEEDS_LIBELF) += libelf/
obj-$(CONFIG_HAS_DEVICE_TREE) += libfdt/
-config.gz: ../.config
+config.gz: $(XEN_ROOT)/xen/$(KCONFIG_CONFIG)
gzip -c $< >$@
config_data.o: config.gz
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH-for-4.14 2/2] xen/config: disable hypervisor filesystem for pv-shim
2020-06-02 11:40 [PATCH-for-4.14 0/2] xen: build fixes for CONFIG_HYPFS Juergen Gross
2020-06-02 11:40 ` [PATCH-for-4.14 1/2] xen: fix build with CONFIG_HYPFS_CONFIG enabled Juergen Gross
@ 2020-06-02 11:40 ` Juergen Gross
2020-06-02 11:55 ` Jan Beulich
1 sibling, 1 reply; 8+ messages in thread
From: Juergen Gross @ 2020-06-02 11:40 UTC (permalink / raw)
To: xen-devel
Cc: Juergen Gross, Wei Liu, paul, Andrew Cooper, Jan Beulich,
Roger Pau Monné
The pv-shim doesn't need the hypervisor filesystem, so disable it.
Signed-off-by: Juergen Gross <jgross@suse.com>
---
xen/arch/x86/configs/pvshim_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/xen/arch/x86/configs/pvshim_defconfig b/xen/arch/x86/configs/pvshim_defconfig
index 9710aa6238..830660e022 100644
--- a/xen/arch/x86/configs/pvshim_defconfig
+++ b/xen/arch/x86/configs/pvshim_defconfig
@@ -6,6 +6,7 @@ CONFIG_PV_SHIM=y
CONFIG_PV_SHIM_EXCLUSIVE=y
CONFIG_NR_CPUS=32
# Disable features not used by the PV shim
+# CONFIG_HYPFS is not set
# CONFIG_SHADOW_PAGING is not set
# CONFIG_BIGMEM is not set
# CONFIG_HVM_FEP is not set
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH-for-4.14 1/2] xen: fix build with CONFIG_HYPFS_CONFIG enabled
2020-06-02 11:40 ` [PATCH-for-4.14 1/2] xen: fix build with CONFIG_HYPFS_CONFIG enabled Juergen Gross
@ 2020-06-02 11:55 ` Jan Beulich
2020-06-02 12:07 ` Wei Liu
0 siblings, 1 reply; 8+ messages in thread
From: Jan Beulich @ 2020-06-02 11:55 UTC (permalink / raw)
To: Juergen Gross
Cc: Stefano Stabellini, Julien Grall, Wei Liu, paul, Andrew Cooper,
Ian Jackson, George Dunlap, xen-devel
On 02.06.2020 13:40, Juergen Gross wrote:
> --- a/xen/common/Makefile
> +++ b/xen/common/Makefile
> @@ -75,7 +75,7 @@ obj-$(CONFIG_UBSAN) += ubsan/
> obj-$(CONFIG_NEEDS_LIBELF) += libelf/
> obj-$(CONFIG_HAS_DEVICE_TREE) += libfdt/
>
> -config.gz: ../.config
> +config.gz: $(XEN_ROOT)/xen/$(KCONFIG_CONFIG)
Looking at all pre-existing uses of KCONFIG_CONFIG this is the
first one assuming it holds a relative path. The doc also doesn't
indicate it can't be an absolute one.
Jan
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH-for-4.14 2/2] xen/config: disable hypervisor filesystem for pv-shim
2020-06-02 11:40 ` [PATCH-for-4.14 2/2] xen/config: disable hypervisor filesystem for pv-shim Juergen Gross
@ 2020-06-02 11:55 ` Jan Beulich
0 siblings, 0 replies; 8+ messages in thread
From: Jan Beulich @ 2020-06-02 11:55 UTC (permalink / raw)
To: Juergen Gross
Cc: xen-devel, Andrew Cooper, Roger Pau Monné, Wei Liu, paul
On 02.06.2020 13:40, Juergen Gross wrote:
> The pv-shim doesn't need the hypervisor filesystem, so disable it.
>
> Signed-off-by: Juergen Gross <jgross@suse.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH-for-4.14 1/2] xen: fix build with CONFIG_HYPFS_CONFIG enabled
2020-06-02 11:55 ` Jan Beulich
@ 2020-06-02 12:07 ` Wei Liu
2020-06-02 12:19 ` Jürgen Groß
2020-06-02 12:36 ` Jan Beulich
0 siblings, 2 replies; 8+ messages in thread
From: Wei Liu @ 2020-06-02 12:07 UTC (permalink / raw)
To: Jan Beulich
Cc: Juergen Gross, Stefano Stabellini, Julien Grall, Wei Liu, paul,
Andrew Cooper, Ian Jackson, George Dunlap, xen-devel
On Tue, Jun 02, 2020 at 01:55:14PM +0200, Jan Beulich wrote:
> On 02.06.2020 13:40, Juergen Gross wrote:
> > --- a/xen/common/Makefile
> > +++ b/xen/common/Makefile
> > @@ -75,7 +75,7 @@ obj-$(CONFIG_UBSAN) += ubsan/
> > obj-$(CONFIG_NEEDS_LIBELF) += libelf/
> > obj-$(CONFIG_HAS_DEVICE_TREE) += libfdt/
> >
> > -config.gz: ../.config
> > +config.gz: $(XEN_ROOT)/xen/$(KCONFIG_CONFIG)
>
> Looking at all pre-existing uses of KCONFIG_CONFIG this is the
> first one assuming it holds a relative path. The doc also doesn't
> indicate it can't be an absolute one.
This is not an objection to this patch right?
Wei.
>
> Jan
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH-for-4.14 1/2] xen: fix build with CONFIG_HYPFS_CONFIG enabled
2020-06-02 12:07 ` Wei Liu
@ 2020-06-02 12:19 ` Jürgen Groß
2020-06-02 12:36 ` Jan Beulich
1 sibling, 0 replies; 8+ messages in thread
From: Jürgen Groß @ 2020-06-02 12:19 UTC (permalink / raw)
To: Wei Liu, Jan Beulich
Cc: Stefano Stabellini, Julien Grall, paul, Andrew Cooper,
Ian Jackson, George Dunlap, xen-devel
On 02.06.20 14:07, Wei Liu wrote:
> On Tue, Jun 02, 2020 at 01:55:14PM +0200, Jan Beulich wrote:
>> On 02.06.2020 13:40, Juergen Gross wrote:
>>> --- a/xen/common/Makefile
>>> +++ b/xen/common/Makefile
>>> @@ -75,7 +75,7 @@ obj-$(CONFIG_UBSAN) += ubsan/
>>> obj-$(CONFIG_NEEDS_LIBELF) += libelf/
>>> obj-$(CONFIG_HAS_DEVICE_TREE) += libfdt/
>>>
>>> -config.gz: ../.config
>>> +config.gz: $(XEN_ROOT)/xen/$(KCONFIG_CONFIG)
>>
>> Looking at all pre-existing uses of KCONFIG_CONFIG this is the
>> first one assuming it holds a relative path. The doc also doesn't
>> indicate it can't be an absolute one.
>
> This is not an objection to this patch right?
I can see his point.
In case KCONFIG_CONFIG is set to an absolute path the result won't
build.
The proper solution would be to test KCONFIG_CONFIG for being an
absolute path and do the prefixing of $(XEN_ROOT)/xen/ only if this
isn't the case.
I'll send V2 of this patch.
Juergen
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH-for-4.14 1/2] xen: fix build with CONFIG_HYPFS_CONFIG enabled
2020-06-02 12:07 ` Wei Liu
2020-06-02 12:19 ` Jürgen Groß
@ 2020-06-02 12:36 ` Jan Beulich
1 sibling, 0 replies; 8+ messages in thread
From: Jan Beulich @ 2020-06-02 12:36 UTC (permalink / raw)
To: Wei Liu
Cc: Juergen Gross, Stefano Stabellini, Julien Grall, paul,
Andrew Cooper, Ian Jackson, George Dunlap, xen-devel
On 02.06.2020 14:07, Wei Liu wrote:
> On Tue, Jun 02, 2020 at 01:55:14PM +0200, Jan Beulich wrote:
>> On 02.06.2020 13:40, Juergen Gross wrote:
>>> --- a/xen/common/Makefile
>>> +++ b/xen/common/Makefile
>>> @@ -75,7 +75,7 @@ obj-$(CONFIG_UBSAN) += ubsan/
>>> obj-$(CONFIG_NEEDS_LIBELF) += libelf/
>>> obj-$(CONFIG_HAS_DEVICE_TREE) += libfdt/
>>>
>>> -config.gz: ../.config
>>> +config.gz: $(XEN_ROOT)/xen/$(KCONFIG_CONFIG)
>>
>> Looking at all pre-existing uses of KCONFIG_CONFIG this is the
>> first one assuming it holds a relative path. The doc also doesn't
>> indicate it can't be an absolute one.
>
> This is not an objection to this patch right?
It is.
Jan
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-06-02 12:36 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-02 11:40 [PATCH-for-4.14 0/2] xen: build fixes for CONFIG_HYPFS Juergen Gross
2020-06-02 11:40 ` [PATCH-for-4.14 1/2] xen: fix build with CONFIG_HYPFS_CONFIG enabled Juergen Gross
2020-06-02 11:55 ` Jan Beulich
2020-06-02 12:07 ` Wei Liu
2020-06-02 12:19 ` Jürgen Groß
2020-06-02 12:36 ` Jan Beulich
2020-06-02 11:40 ` [PATCH-for-4.14 2/2] xen/config: disable hypervisor filesystem for pv-shim Juergen Gross
2020-06-02 11:55 ` Jan Beulich
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.