Remove some unused CONFIG_* variables
cover Remove some unused CONFIG_* variables
There are a few CONFIG_* variables defined in default-configs/ that are never referenced. These were found using:
$ for i in `grep -h -E '^CONFIG' default-configs/* | sed -e 's/=.*//' | sort | uniq`
do
echo -n "$i: "
git grep $i | grep -v default-configs | wc -l
done | grep ": 0"
CONFIG_IPMI_EXTERN: 0
CONFIG_ISA_MMIO: 0
CONFIG_PAM: 0
CONFIG_PIIX_PCI: 0NB, the IPMI_EXTERN one is special - it should have been used, so I sent a separate patch for that one.
Daniel P. Berrange (3):
default-configs: remove CONFIG_PAM
default-configs: removed obsolete CONFIG_ISA_MMIO
default-configs: remove CONFIG_PIIX_PCI
default-configs/arm-softmmu.mak | 1 - default-configs/i386-softmmu.mak | 2 -- default-configs/ppc-softmmu.mak | 1 - default-configs/ppc64-softmmu.mak | 1 - default-configs/sparc64-softmmu.mak | 1 - default-configs/x86_64-softmmu.mak | 2 -- 6 files changed, 8 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/3 default-configs: remove CONFIG_PAM
The CONFIG_PAM=y setting was added in
commit c0907c9e6417cb959dfd9ef6873221536ec91351
Author: Paolo Bonzini <[email protected]>
Date: Tue Feb 5 15:06:20 2013 +0100
hw: move PCI bridges to hw/pci-* or hw/ARCH
but nothing in that commit, nor anything pre-existing, ever referenced CONFIG_PAM.
--- default-configs/i386-softmmu.mak | 1 - default-configs/x86_64-softmmu.mak | 1 - 2 files changed, 2 deletions(-)
default-configs/i386-softmmu.mak +0 -1
@@ -37,7 +37,6 @@ CONFIG_I8259=y CONFIG_PFLASH_CFI01=y CONFIG_TPM_TIS=$(CONFIG_TPM) CONFIG_MC146818RTC=y -CONFIG_PAM=y CONFIG_PCI_PIIX=y CONFIG_WDT_IB700=y CONFIG_XEN_I386=$(CONFIG_XEN)
default-configs/x86_64-softmmu.mak +0 -1
@@ -37,7 +37,6 @@ CONFIG_I8259=y CONFIG_PFLASH_CFI01=y CONFIG_TPM_TIS=$(CONFIG_TPM) CONFIG_MC146818RTC=y -CONFIG_PAM=y CONFIG_PCI_PIIX=y CONFIG_WDT_IB700=y CONFIG_XEN_I386=$(CONFIG_XEN)
Signature · 1 line
2.7.4
PATCH 2/3 default-configs: removed obsolete CONFIG_ISA_MMIO
In reply to Daniel P. BerrangeThe use of the CONFIG_ISA_MMIO setting was removed in
commit 61fcb628627ea464dc1954f615ae13edfefd284f
Author: Paolo Bonzini <[email protected]>
Date: Mon Jul 22 15:54:24 2013 +0200
isa_mmio: delete
but this commit only removed it from some of the default config files.
--- default-configs/arm-softmmu.mak | 1 - default-configs/ppc-softmmu.mak | 1 - default-configs/ppc64-softmmu.mak | 1 - default-configs/sparc64-softmmu.mak | 1 - 4 files changed, 4 deletions(-)
default-configs/arm-softmmu.mak +0 -1
@@ -3,7 +3,6 @@ include pci.mak include usb.mak CONFIG_VGA=y -CONFIG_ISA_MMIO=y CONFIG_NAND=y CONFIG_ECC=y CONFIG_SERIAL=y
default-configs/ppc-softmmu.mak +0 -1
@@ -3,7 +3,6 @@ include pci.mak include sound.mak include usb.mak -CONFIG_ISA_MMIO=y CONFIG_ESCC=y CONFIG_M48T59=y CONFIG_SERIAL=y
default-configs/ppc64-softmmu.mak +0 -1
@@ -4,7 +4,6 @@ include pci.mak include sound.mak include usb.mak CONFIG_VIRTIO_VGA=y -CONFIG_ISA_MMIO=y CONFIG_ESCC=y CONFIG_M48T59=y CONFIG_SERIAL=y
default-configs/sparc64-softmmu.mak +0 -1
@@ -2,7 +2,6 @@ include pci.mak include usb.mak -CONFIG_ISA_MMIO=y CONFIG_M48T59=y CONFIG_PTIMER=y CONFIG_SERIAL=y
Signature · 1 line
2.7.4
PATCH 3/3 default-configs: remove CONFIG_PIIX_PCI
In reply to Daniel P. BerrangeThe CONFIG_PIIX_PCI=y setting was added in
commit 70615c38ded2a20ad8282b7dcde95482fc0a7744
Author: Blue Swirl <[email protected]>
Date: Mon Mar 22 20:18:40 2010 +0000
Compile sound devices only once
but nothing in that commit, nor anything pre-existing, ever referenced CONFIG_PIIX_PCI.
--- default-configs/i386-softmmu.mak | 1 - default-configs/x86_64-softmmu.mak | 1 - 2 files changed, 2 deletions(-)
default-configs/i386-softmmu.mak +0 -1
@@ -30,7 +30,6 @@ CONFIG_I8257=y CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y CONFIG_NE2000_ISA=y -CONFIG_PIIX_PCI=y CONFIG_HPET=y CONFIG_APPLESMC=y CONFIG_I8259=y
default-configs/x86_64-softmmu.mak +0 -1
@@ -30,7 +30,6 @@ CONFIG_I8257=y CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y CONFIG_NE2000_ISA=y -CONFIG_PIIX_PCI=y CONFIG_HPET=y CONFIG_APPLESMC=y CONFIG_I8259=y
Signature · 1 line
2.7.4
Paolo Bonzini
AppliedQuoted 22 lines · Daniel P. Berrange
There are a few CONFIG_* variables defined in default-configs/ that are never referenced. These were found using:
$ for i in `grep -h -E '^CONFIG' default-configs/* | sed -e 's/=.*//' | sort | uniq` do echo -n "$i: " git grep $i | grep -v default-configs | wc -l done | grep ": 0" CONFIG_IPMI_EXTERN: 0 CONFIG_ISA_MMIO: 0 CONFIG_PAM: 0 CONFIG_PIIX_PCI: 0NB, the
IPMI_EXTERNone is special - it should have been used, so I sent a separate patch for that one.Daniel P. Berrange (3):
default-configs: removeCONFIG_PAM
default-configs: removed obsoleteCONFIG_ISA_MMIO
default-configs: removeCONFIG_PIIX_PCI
Quoted 8 lines
default-configs/arm-softmmu.mak | 1 - default-configs/i386-softmmu.mak | 2 -- default-configs/ppc-softmmu.mak | 1 - default-configs/ppc64-softmmu.mak | 1 - default-configs/sparc64-softmmu.mak | 1 - default-configs/x86_64-softmmu.mak | 2 -- 6 files changed, 8 deletions(-)
Queued for 2.8, thanks.
Paolo