* [Qemu-devel] [PULL v2 00/54] Kconfig conversion, excluding ARM and MIPS
@ 2019-03-07 14:16 Paolo Bonzini
2019-03-07 14:16 ` [Qemu-devel] [PULL v2 26/54] tpm: express dependencies with Kconfig Paolo Bonzini
2019-03-07 18:35 ` [Qemu-devel] [PULL v2 00/54] Kconfig conversion, excluding ARM and MIPS Peter Maydell
0 siblings, 2 replies; 4+ messages in thread
From: Paolo Bonzini @ 2019-03-07 14:16 UTC (permalink / raw)
To: qemu-devel
The following changes since commit 1ba530a4ecba6015d52d8f392fd327cfa07bc37a:
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20190304' into staging (2019-03-04 13:38:54 +0000)
are available in the git repository at:
git://github.com/bonzini/qemu.git tags/for-upstream-kconfig
for you to fetch changes up to 1f749c0626f6f79cfc27fc3e6b910a6df03d3488:
kconfig: add documentation (2019-03-07 15:06:29 +0100)
----------------------------------------------------------------
Initial Kconfig work, excluding ARM and MIPS
----------------------------------------------------------------
Paolo Bonzini (42):
9pfs: remove unnecessary conditionals
xtensa: rename CONFIG_XTENSA_FPGA to CONFIG_XTENSA_XTFPGA
minikconfig: add parser skeleton
minikconfig: add AST
minikconfig: add semantic analysis
kconfig: introduce kconfig files
build: switch to Kconfig
minikconfig: implement allnoconfig and defconfig modes
kconfig: introduce CONFIG_TEST_DEVICES
ide: express dependencies with Kconfig
build: convert pci.mak to Kconfig
build: convert sound.mak to Kconfig
build: convert usb.mak to Kconfig
block: fix recursion in hw/block/dataplane
scsi: express dependencies with Kconfig
isa: express dependencies with kconfig
i386: express dependencies with Kconfig
i2c: express dependencies with Kconfig
ptimer: express dependencies with Kconfig
vfio: express vfio dependencies with Kconfig
tpm: express dependencies with Kconfig
isa: express SuperIO dependencies with Kconfig
ssi: express dependencies with kconfig
sd: express dependencies with kconfig
ipmi: express dependencies with kconfig
alpha-softmmu.mak: express dependencies with Kconfig
cris-softmmu.mak: express dependencies with Kconfig
hppa-softmmu.mak: express dependencies with Kconfig
lm32-softmmu.mak: express dependencies with Kconfig
m68k-softmmu.mak: express dependencies with Kconfig
microblaze-softmmu.mak: express dependencies with Kconfig
moxie-softmmu.mak: express dependencies with Kconfig
nios2-softmmu.mak: express dependencies with Kconfig
or1k-softmmu.mak: express dependencies with Kconfig
riscv-softmmu.mak: replace CONFIG_* with Kconfig "select" directives
sh4-softmmu.mak: express dependencies with Kconfig
sparc-softmmu.mak: express dependencies with Kconfig
sparc64-softmmu.mak: express dependencies with Kconfig
unicore32-softmmu.mak: express dependencies with Kconfig
xtensa-softmmu.mak: express dependencies with Kconfig
.travis.yml: test that no-default-device builds do not regress
kconfig: add documentation
Thomas Huth (6):
ppc64: Express dependencies of 'pseries' and 'powernv' machines with kconfig
ppc: Express dependencies of the 'prep' and '40p' machines with kconfig
ppc: Express dependencies of the Mac machines with kconfig
ppc: Express dependencies of the Sam460EX machines with kconfig
ppc: Express dependencies of the embedded machines with kconfig
s390x: express dependencies with Kconfig
Yang Zhong (6):
hw/display: make edid configurable
hw/pci/Makefile.objs: make pcie configurable
display: express dependencies with kconfig
hyperv: express dependencies with kconfig
virtio: express virtio dependencies with Kconfig
i386-softmmu.mak: remove all CONFIG_* except boards definitions
.travis.yml | 6 +
Kconfig.host | 33 ++
Makefile | 27 +-
Makefile.target | 7 +-
configure | 42 +-
default-configs/alpha-softmmu.mak | 26 +-
default-configs/arm-softmmu.mak | 18 +-
default-configs/cris-softmmu.mak | 6 +-
default-configs/hppa-softmmu.mak | 20 +-
default-configs/hyperv.mak | 2 -
default-configs/i386-softmmu.mak | 93 ++---
default-configs/lm32-softmmu.mak | 12 +-
default-configs/m68k-softmmu.mak | 4 +-
default-configs/microblaze-softmmu.mak | 12 +-
default-configs/mips-softmmu-common.mak | 10 +-
default-configs/mips64el-softmmu.mak | 2 +
default-configs/moxie-softmmu.mak | 7 +-
default-configs/nios2-softmmu.mak | 6 +-
default-configs/or1k-softmmu.mak | 5 +-
default-configs/pci.mak | 51 ---
default-configs/ppc-softmmu.mak | 60 ---
default-configs/ppc64-softmmu.mak | 13 -
default-configs/riscv32-softmmu.mak | 21 +-
default-configs/riscv64-softmmu.mak | 22 +-
default-configs/s390x-softmmu.mak | 23 +-
default-configs/sh4-softmmu.mak | 28 +-
default-configs/sh4eb-softmmu.mak | 22 +-
default-configs/sound.mak | 4 -
default-configs/sparc-softmmu.mak | 24 +-
default-configs/sparc64-softmmu.mak | 25 +-
default-configs/unicore32-softmmu.mak | 6 +-
default-configs/usb.mak | 11 -
default-configs/virtio.mak | 15 -
default-configs/xtensa-softmmu.mak | 8 +-
default-configs/xtensaeb-softmmu.mak | 7 +-
docs/devel/build-system.txt | 1 -
docs/devel/kconfig.rst | 305 ++++++++++++++
hw/9pfs/Kconfig | 4 +
hw/9pfs/Makefile.objs | 2 -
hw/Kconfig | 73 ++++
hw/Makefile.objs | 4 +-
hw/acpi/Kconfig | 29 ++
hw/adc/Kconfig | 2 +
hw/alpha/Kconfig | 12 +
hw/arm/Kconfig | 124 ++++++
hw/audio/Kconfig | 52 +++
hw/block/Kconfig | 39 ++
hw/block/Makefile.objs | 3 +-
hw/block/dataplane/Makefile.objs | 2 +-
hw/bt/Kconfig | 2 +
hw/char/Kconfig | 42 ++
hw/core/Kconfig | 11 +
hw/cpu/Kconfig | 8 +
hw/cris/Kconfig | 9 +
hw/display/Kconfig | 108 +++++
hw/display/Makefile.objs | 4 +-
hw/dma/Kconfig | 21 +
hw/gpio/Kconfig | 9 +
hw/hppa/Kconfig | 10 +
hw/hyperv/Kconfig | 8 +
hw/i2c/Kconfig | 27 ++
hw/i2c/Makefile.objs | 2 +-
hw/i386/Kconfig | 99 +++++
hw/i386/Makefile.objs | 5 +-
hw/ide/Kconfig | 54 +++
hw/input/Kconfig | 33 ++
hw/intc/Kconfig | 57 +++
hw/ipack/Kconfig | 4 +
hw/ipmi/Kconfig | 22 +
hw/isa/Kconfig | 53 +++
hw/lm32/Kconfig | 13 +
hw/m68k/Kconfig | 9 +
hw/mem/Kconfig | 11 +
hw/microblaze/Kconfig | 20 +
hw/mips/Kconfig | 21 +
hw/misc/Kconfig | 118 ++++++
hw/misc/macio/Kconfig | 11 +
hw/moxie/Kconfig | 3 +
hw/net/Kconfig | 125 ++++++
hw/nios2/Kconfig | 8 +
hw/nvram/Kconfig | 9 +
hw/openrisc/Kconfig | 5 +
hw/pci-bridge/Kconfig | 29 ++
hw/pci-host/Kconfig | 51 +++
hw/pci/Kconfig | 9 +
hw/pci/Makefile.objs | 9 +-
hw/pcmcia/Kconfig | 2 +
hw/ppc/Kconfig | 121 ++++++
hw/riscv/Kconfig | 33 ++
hw/s390x/Kconfig | 11 +
hw/s390x/Makefile.objs | 4 +-
hw/scsi/Kconfig | 54 +++
hw/scsi/Makefile.objs | 2 +-
hw/sd/Kconfig | 17 +
hw/sh4/Kconfig | 23 ++
hw/smbios/Kconfig | 2 +
hw/sparc/Kconfig | 26 ++
hw/sparc64/Kconfig | 19 +
hw/ssi/Kconfig | 18 +
hw/timer/Kconfig | 63 +++
hw/tpm/Kconfig | 24 ++
hw/tricore/Kconfig | 2 +
hw/unicore32/Kconfig | 5 +
hw/usb/Kconfig | 91 ++++
hw/usb/Makefile.objs | 2 +-
hw/vfio/Kconfig | 36 ++
hw/virtio/Kconfig | 31 ++
hw/virtio/Makefile.objs | 2 +
hw/watchdog/Kconfig | 16 +
hw/xtensa/Kconfig | 8 +
hw/xtensa/Makefile.objs | 2 +-
rules.mak | 2 +-
scripts/make_device_config.sh | 30 --
scripts/minikconf.py | 708 ++++++++++++++++++++++++++++++++
114 files changed, 3209 insertions(+), 514 deletions(-)
create mode 100644 Kconfig.host
delete mode 100644 default-configs/hyperv.mak
delete mode 100644 default-configs/pci.mak
delete mode 100644 default-configs/sound.mak
delete mode 100644 default-configs/usb.mak
delete mode 100644 default-configs/virtio.mak
create mode 100644 docs/devel/kconfig.rst
create mode 100644 hw/9pfs/Kconfig
create mode 100644 hw/Kconfig
create mode 100644 hw/acpi/Kconfig
create mode 100644 hw/adc/Kconfig
create mode 100644 hw/alpha/Kconfig
create mode 100644 hw/arm/Kconfig
create mode 100644 hw/audio/Kconfig
create mode 100644 hw/block/Kconfig
create mode 100644 hw/bt/Kconfig
create mode 100644 hw/char/Kconfig
create mode 100644 hw/core/Kconfig
create mode 100644 hw/cpu/Kconfig
create mode 100644 hw/cris/Kconfig
create mode 100644 hw/display/Kconfig
create mode 100644 hw/dma/Kconfig
create mode 100644 hw/gpio/Kconfig
create mode 100644 hw/hppa/Kconfig
create mode 100644 hw/hyperv/Kconfig
create mode 100644 hw/i2c/Kconfig
create mode 100644 hw/i386/Kconfig
create mode 100644 hw/ide/Kconfig
create mode 100644 hw/input/Kconfig
create mode 100644 hw/intc/Kconfig
create mode 100644 hw/ipack/Kconfig
create mode 100644 hw/ipmi/Kconfig
create mode 100644 hw/isa/Kconfig
create mode 100644 hw/lm32/Kconfig
create mode 100644 hw/m68k/Kconfig
create mode 100644 hw/mem/Kconfig
create mode 100644 hw/microblaze/Kconfig
create mode 100644 hw/mips/Kconfig
create mode 100644 hw/misc/Kconfig
create mode 100644 hw/misc/macio/Kconfig
create mode 100644 hw/moxie/Kconfig
create mode 100644 hw/net/Kconfig
create mode 100644 hw/nios2/Kconfig
create mode 100644 hw/nvram/Kconfig
create mode 100644 hw/openrisc/Kconfig
create mode 100644 hw/pci-bridge/Kconfig
create mode 100644 hw/pci-host/Kconfig
create mode 100644 hw/pci/Kconfig
create mode 100644 hw/pcmcia/Kconfig
create mode 100644 hw/ppc/Kconfig
create mode 100644 hw/riscv/Kconfig
create mode 100644 hw/s390x/Kconfig
create mode 100644 hw/scsi/Kconfig
create mode 100644 hw/sd/Kconfig
create mode 100644 hw/sh4/Kconfig
create mode 100644 hw/smbios/Kconfig
create mode 100644 hw/sparc/Kconfig
create mode 100644 hw/sparc64/Kconfig
create mode 100644 hw/ssi/Kconfig
create mode 100644 hw/timer/Kconfig
create mode 100644 hw/tpm/Kconfig
create mode 100644 hw/tricore/Kconfig
create mode 100644 hw/unicore32/Kconfig
create mode 100644 hw/usb/Kconfig
create mode 100644 hw/vfio/Kconfig
create mode 100644 hw/virtio/Kconfig
create mode 100644 hw/watchdog/Kconfig
create mode 100644 hw/xtensa/Kconfig
delete mode 100644 scripts/make_device_config.sh
create mode 100644 scripts/minikconf.py
--
1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Qemu-devel] [PULL v2 26/54] tpm: express dependencies with Kconfig
2019-03-07 14:16 [Qemu-devel] [PULL v2 00/54] Kconfig conversion, excluding ARM and MIPS Paolo Bonzini
@ 2019-03-07 14:16 ` Paolo Bonzini
2019-03-07 18:35 ` [Qemu-devel] [PULL v2 00/54] Kconfig conversion, excluding ARM and MIPS Peter Maydell
1 sibling, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2019-03-07 14:16 UTC (permalink / raw)
To: qemu-devel
This automatically removes the TPM backends from the
binary altogether if no front-ends are selected.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 24 ++++++++++++------------
hw/tpm/Kconfig | 10 +++++++++-
2 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/configure b/configure
index 0fdbab4..0fb4dce 100755
--- a/configure
+++ b/configure
@@ -466,7 +466,7 @@ gcrypt_hmac="no"
auth_pam=""
vte=""
virglrenderer=""
-tpm="yes"
+tpm=""
libssh2=""
live_block_migration="yes"
numa=""
@@ -3877,20 +3877,20 @@ EOF
fi
##########################################
-# TPM passthrough is only on x86 Linux
+# TPM emulation is only on POSIX
-if test "$targetos" = Linux && { test "$cpu" = i386 || test "$cpu" = x86_64; }; then
- tpm_passthrough=$tpm
-else
- tpm_passthrough=no
+if test "$tpm" = ""; then
+ if test "$mingw32" = "yes"; then
+ tpm=no
+ else
+ tpm=yes
+ fi
+elif test "$tpm" = "yes"; then
+ if test "$mingw32" = "yes" ; then
+ error_exit "TPM emulation only available on POSIX systems"
+ fi
fi
-# TPM emulator is for all posix systems
-if test "$mingw32" != "yes"; then
- tpm_emulator=$tpm
-else
- tpm_emulator=no
-fi
##########################################
# attr probe
diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig
index f654f0f..4c8ee87 100644
--- a/hw/tpm/Kconfig
+++ b/hw/tpm/Kconfig
@@ -1,16 +1,24 @@
-config TPM
+config TPMDEV
bool
+ depends on TPM
config TPM_TIS
bool
depends on TPM && ISA_BUS
+ select TPMDEV
config TPM_CRB
bool
depends on TPM && PC
+ select TPMDEV
config TPM_PASSTHROUGH
bool
+ default y
+ # FIXME: should check for x86 host as well
+ depends on TPMDEV && LINUX
config TPM_EMULATOR
bool
+ default y
+ depends on TPMDEV
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PULL v2 00/54] Kconfig conversion, excluding ARM and MIPS
2019-03-07 14:16 [Qemu-devel] [PULL v2 00/54] Kconfig conversion, excluding ARM and MIPS Paolo Bonzini
2019-03-07 14:16 ` [Qemu-devel] [PULL v2 26/54] tpm: express dependencies with Kconfig Paolo Bonzini
@ 2019-03-07 18:35 ` Peter Maydell
2019-03-07 20:57 ` Paolo Bonzini
1 sibling, 1 reply; 4+ messages in thread
From: Peter Maydell @ 2019-03-07 18:35 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: QEMU Developers
On Thu, 7 Mar 2019 at 14:18, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit 1ba530a4ecba6015d52d8f392fd327cfa07bc37a:
>
> Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20190304' into staging (2019-03-04 13:38:54 +0000)
>
> are available in the git repository at:
>
>
> git://github.com/bonzini/qemu.git tags/for-upstream-kconfig
>
> for you to fetch changes up to 1f749c0626f6f79cfc27fc3e6b910a6df03d3488:
>
> kconfig: add documentation (2019-03-07 15:06:29 +0100)
>
> ----------------------------------------------------------------
> Initial Kconfig work, excluding ARM and MIPS
This passes my build tests, but something in your workflow
has mangled a Cc: line in one of the commit messages.
In commit 11db78e98317e1a0c the accented character in
Hervé Poussineau's name has been mangled and isn't correct
UTF-8. Could you fix that up and resend, please?
PS: since the sphinx patchset just got in ahead of
yours, Sphinx now warns:
docs/devel/kconfig.rst: WARNING: document isn't included in any toctree
I'll send a followup patch which adds 'kconfig' to
docs/devel/index.rst once this is merged.
thanks
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PULL v2 00/54] Kconfig conversion, excluding ARM and MIPS
2019-03-07 18:35 ` [Qemu-devel] [PULL v2 00/54] Kconfig conversion, excluding ARM and MIPS Peter Maydell
@ 2019-03-07 20:57 ` Paolo Bonzini
0 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2019-03-07 20:57 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers
On 07/03/19 19:35, Peter Maydell wrote:
> On Thu, 7 Mar 2019 at 14:18, Paolo Bonzini <pbonzini@redhat.com> wrote:
>>
>> The following changes since commit 1ba530a4ecba6015d52d8f392fd327cfa07bc37a:
>>
>> Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20190304' into staging (2019-03-04 13:38:54 +0000)
>>
>> are available in the git repository at:
>>
>>
>> git://github.com/bonzini/qemu.git tags/for-upstream-kconfig
>>
>> for you to fetch changes up to 1f749c0626f6f79cfc27fc3e6b910a6df03d3488:
>>
>> kconfig: add documentation (2019-03-07 15:06:29 +0100)
>>
>> ----------------------------------------------------------------
>> Initial Kconfig work, excluding ARM and MIPS
>
> This passes my build tests, but something in your workflow
> has mangled a Cc: line in one of the commit messages.
> In commit 11db78e98317e1a0c the accented character in
> Hervé Poussineau's name has been mangled and isn't correct
> UTF-8. Could you fix that up and resend, please?
>
> PS: since the sphinx patchset just got in ahead of
> yours, Sphinx now warns:
> docs/devel/kconfig.rst: WARNING: document isn't included in any toctree
>
> I'll send a followup patch which adds 'kconfig' to
> docs/devel/index.rst once this is merged.
I just rebased and did the change myself, which was a good idea because
I also had to use ==== headings instead of ---- for the ToC to come out
right.
Thanks for working on Sphinx! I will dig out the Texinfo->Sphinx
patches for 4.1, as well as the small changes to kerneldoc that support
QEMU's hybrid of kerneldoc and gtkdoc.
Paolo
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-03-07 20:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-07 14:16 [Qemu-devel] [PULL v2 00/54] Kconfig conversion, excluding ARM and MIPS Paolo Bonzini
2019-03-07 14:16 ` [Qemu-devel] [PULL v2 26/54] tpm: express dependencies with Kconfig Paolo Bonzini
2019-03-07 18:35 ` [Qemu-devel] [PULL v2 00/54] Kconfig conversion, excluding ARM and MIPS Peter Maydell
2019-03-07 20:57 ` Paolo Bonzini
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.