[siemens/jailhouse] efbf1f: core, inmates: Fix CONFIG var leaks from Linux

1 view
Skip to first unread message

GitHub

unread,
Jul 23, 2017, 6:11:02 AM7/23/17
to jailho...@googlegroups.com
Branch: refs/heads/next
Home: https://github.com/siemens/jailhouse
Commit: efbf1f64ceaeac42a64b2109b6b3a9cdbc6d4065
https://github.com/siemens/jailhouse/commit/efbf1f64ceaeac42a64b2109b6b3a9cdbc6d4065
Author: Jan Kiszka <jan.k...@siemens.com>
Date: 2017-07-23 (Sun, 23 Jul 2017)

Changed paths:
M Kbuild
M hypervisor/Makefile
M hypervisor/arch/arm-common/Kbuild
M hypervisor/arch/x86/Kbuild
M inmates/lib/arm/Makefile.lib
M inmates/lib/arm64/Makefile.lib

Log Message:
-----------
core, inmates: Fix CONFIG var leaks from Linux

This logically reverts ee56c6d71a4e: While exporting our config vars
from the top level worked fine, kbuild seems to pull in the kernel's
variables on each subdir recursion. E.g., CONFIG_ARM_GIC_V3 can leak
this way from Linux where it has different semantics and will break
GICv2 targets.

Fix this by including config.mk in each makefile that makes use of
config vars and is in a separate subdir.

config.mk is generated unconditionally. So remove the optional inclusion
in hypervisor/Makefile at this chance.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>


Commit: 09794ad9d497b2b76869741653ac78a5501d8512
https://github.com/siemens/jailhouse/commit/09794ad9d497b2b76869741653ac78a5501d8512
Author: Jan Kiszka <jan.k...@siemens.com>
Date: 2017-07-23 (Sun, 23 Jul 2017)

Changed paths:
M driver/pci.c

Log Message:
-----------
driver: Add recognition of GIVv3 to vPCI registration

On GICv3 systems, match against this interrupt controller in order to
hook up the virtual PCI host controller.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>


Commit: 0d6d5c661889baba9e480c67e34969c3aedcd68c
https://github.com/siemens/jailhouse/commit/0d6d5c661889baba9e480c67e34969c3aedcd68c
Author: Jan Kiszka <jan.k...@siemens.com>
Date: 2017-07-23 (Sun, 23 Jul 2017)

Changed paths:
M inmates/lib/arm/include/mach.h
M inmates/lib/arm64/include/mach.h

Log Message:
-----------
inmates: arm, arm64: Pull out common TIMER_IRQ definition

So far, all SoCs provide us IRQ 27 as timer interrupt. Let's see if
there will ever be a difference, but it will remain the minority for
quite a while then.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>


Compare: https://github.com/siemens/jailhouse/compare/7ef4b98ebe04...0d6d5c661889
Reply all
Reply to author
Forward
0 new messages