| From a73d17d9798440ecd0c6bc45a016093fddfea944 Mon Sep 17 00:00:00 2001 |
| From: Markus Armbruster <armbru@redhat.com> |
| Date: Sat, 2 Nov 2013 14:10:17 +0100 |
| Subject: [PATCH 47/81] rhel: Revert downstream changes to unused default-configs/*.mak |
| |
| RH-Author: Markus Armbruster <armbru@redhat.com> |
| Message-id: <1383401418-4444-2-git-send-email-armbru@redhat.com> |
| Patchwork-id: 55268 |
| O-Subject: [PATCH 7.0 qemu-kvm 1/2] rhel: Revert downstream changes to unused default-configs/*.mak |
| Bugzilla: 1001076 |
| RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com> |
| RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com> |
| RH-Acked-by: Alex Williamson <alex.williamson@redhat.com> |
| |
| From: Markus Armbruster <armbru@redhat.com> |
| |
| Pointless conflict magnets. "Unused" means they don't affect the RHEL |
| build in any way. |
| |
| Signed-off-by: Markus Armbruster <armbru@redhat.com> |
| |
| default-configs/alpha-softmmu.mak | 1 + |
| default-configs/i386-softmmu.mak | 5 +++++ |
| default-configs/mips-softmmu.mak | 3 +++ |
| default-configs/mips64-softmmu.mak | 3 +++ |
| default-configs/mips64el-softmmu.mak | 3 +++ |
| default-configs/mipsel-softmmu.mak | 3 +++ |
| default-configs/ppc-softmmu.mak | 2 ++ |
| default-configs/ppc64-softmmu.mak | 2 ++ |
| default-configs/ppcemb-softmmu.mak | 1 + |
| default-configs/sparc-softmmu.mak | 1 + |
| default-configs/sparc64-softmmu.mak | 1 + |
| 11 files changed, 25 insertions(+) |
| |
| Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com> |
| |
| default-configs/alpha-softmmu.mak | 1 + |
| default-configs/i386-softmmu.mak | 5 +++++ |
| default-configs/mips-softmmu.mak | 3 +++ |
| default-configs/mips64-softmmu.mak | 3 +++ |
| default-configs/mips64el-softmmu.mak | 3 +++ |
| default-configs/mipsel-softmmu.mak | 3 +++ |
| default-configs/ppc-softmmu.mak | 2 ++ |
| default-configs/ppc64-softmmu.mak | 2 ++ |
| default-configs/ppcemb-softmmu.mak | 1 + |
| default-configs/sparc-softmmu.mak | 1 + |
| default-configs/sparc64-softmmu.mak | 1 + |
| 11 files changed, 25 insertions(+), 0 deletions(-) |
| |
| diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak |
| index f2792ad..18e5337 100644 |
| |
| |
| @@ -10,6 +10,7 @@ CONFIG_VGA_PCI=y |
| CONFIG_VGA_CIRRUS=y |
| CONFIG_IDE_CORE=y |
| CONFIG_IDE_QDEV=y |
| +CONFIG_VMWARE_VGA=y |
| CONFIG_IDE_CMD646=y |
| CONFIG_I8259=y |
| CONFIG_MC146818RTC=y |
| diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak |
| index 54df7bd..03deca2 100644 |
| |
| |
| @@ -8,8 +8,10 @@ CONFIG_QXL=$(CONFIG_SPICE) |
| CONFIG_VGA_PCI=y |
| CONFIG_VGA_ISA=y |
| CONFIG_VGA_CIRRUS=y |
| +CONFIG_VMWARE_VGA=y |
| CONFIG_VMMOUSE=y |
| CONFIG_SERIAL=y |
| +CONFIG_PARALLEL=y |
| CONFIG_I8254=y |
| CONFIG_PCSPK=y |
| CONFIG_PCKBD=y |
| @@ -19,7 +21,10 @@ CONFIG_APM=y |
| 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 |
| CONFIG_PFLASH_CFI01=y |
| CONFIG_TPM_TIS=$(CONFIG_TPM) |
| diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak |
| index b4eef8c..b443702 100644 |
| |
| |
| @@ -10,7 +10,9 @@ CONFIG_VGA_PCI=y |
| CONFIG_VGA_ISA=y |
| CONFIG_VGA_ISA_MM=y |
| CONFIG_VGA_CIRRUS=y |
| +CONFIG_VMWARE_VGA=y |
| CONFIG_SERIAL=y |
| +CONFIG_PARALLEL=y |
| CONFIG_I8254=y |
| CONFIG_PCSPK=y |
| CONFIG_PCKBD=y |
| @@ -21,6 +23,7 @@ CONFIG_I8257=y |
| CONFIG_PIIX4=y |
| CONFIG_IDE_ISA=y |
| CONFIG_IDE_PIIX=y |
| +CONFIG_NE2000_ISA=y |
| CONFIG_RC4030=y |
| CONFIG_DP8393X=y |
| CONFIG_DS1225Y=y |
| diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak |
| index c7a9232..d638957 100644 |
| |
| |
| @@ -10,7 +10,9 @@ CONFIG_VGA_PCI=y |
| CONFIG_VGA_ISA=y |
| CONFIG_VGA_ISA_MM=y |
| CONFIG_VGA_CIRRUS=y |
| +CONFIG_VMWARE_VGA=y |
| CONFIG_SERIAL=y |
| +CONFIG_PARALLEL=y |
| CONFIG_I8254=y |
| CONFIG_PCSPK=y |
| CONFIG_PCKBD=y |
| @@ -21,6 +23,7 @@ CONFIG_I8257=y |
| CONFIG_PIIX4=y |
| CONFIG_IDE_ISA=y |
| CONFIG_IDE_PIIX=y |
| +CONFIG_NE2000_ISA=y |
| CONFIG_RC4030=y |
| CONFIG_DP8393X=y |
| CONFIG_DS1225Y=y |
| diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak |
| index 79bdfdb..c9be3f4 100644 |
| |
| |
| @@ -10,7 +10,9 @@ CONFIG_VGA_PCI=y |
| CONFIG_VGA_ISA=y |
| CONFIG_VGA_ISA_MM=y |
| CONFIG_VGA_CIRRUS=y |
| +CONFIG_VMWARE_VGA=y |
| CONFIG_SERIAL=y |
| +CONFIG_PARALLEL=y |
| CONFIG_I8254=y |
| CONFIG_PCSPK=y |
| CONFIG_PCKBD=y |
| @@ -22,6 +24,7 @@ CONFIG_PIIX4=y |
| CONFIG_IDE_ISA=y |
| CONFIG_IDE_PIIX=y |
| CONFIG_IDE_VIA=y |
| +CONFIG_NE2000_ISA=y |
| CONFIG_RC4030=y |
| CONFIG_DP8393X=y |
| CONFIG_DS1225Y=y |
| diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak |
| index beb6819..4f4a449 100644 |
| |
| |
| @@ -10,7 +10,9 @@ CONFIG_VGA_PCI=y |
| CONFIG_VGA_ISA=y |
| CONFIG_VGA_ISA_MM=y |
| CONFIG_VGA_CIRRUS=y |
| +CONFIG_VMWARE_VGA=y |
| CONFIG_SERIAL=y |
| +CONFIG_PARALLEL=y |
| CONFIG_I8254=y |
| CONFIG_PCSPK=y |
| CONFIG_PCKBD=y |
| @@ -21,6 +23,7 @@ CONFIG_I8257=y |
| CONFIG_PIIX4=y |
| CONFIG_IDE_ISA=y |
| CONFIG_IDE_PIIX=y |
| +CONFIG_NE2000_ISA=y |
| CONFIG_RC4030=y |
| CONFIG_DP8393X=y |
| CONFIG_DS1225Y=y |
| diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak |
| index 7f6ea0f..cc3587f 100644 |
| |
| |
| @@ -10,6 +10,7 @@ CONFIG_M48T59=y |
| CONFIG_VGA=y |
| CONFIG_VGA_PCI=y |
| CONFIG_SERIAL=y |
| +CONFIG_PARALLEL=y |
| CONFIG_I8254=y |
| CONFIG_PCKBD=y |
| CONFIG_FDC=y |
| @@ -33,6 +34,7 @@ CONFIG_PPCE500_PCI=y |
| CONFIG_IDE_ISA=y |
| CONFIG_IDE_CMD646=y |
| CONFIG_IDE_MACIO=y |
| +CONFIG_NE2000_ISA=y |
| CONFIG_PFLASH_CFI01=y |
| CONFIG_PFLASH_CFI02=y |
| CONFIG_PTIMER=y |
| diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak |
| index 29a8be6..884ea8a 100644 |
| |
| |
| @@ -10,6 +10,7 @@ CONFIG_M48T59=y |
| CONFIG_VGA=y |
| CONFIG_VGA_PCI=y |
| CONFIG_SERIAL=y |
| +CONFIG_PARALLEL=y |
| CONFIG_I8254=y |
| CONFIG_PCKBD=y |
| CONFIG_FDC=y |
| @@ -33,6 +34,7 @@ CONFIG_PPCE500_PCI=y |
| CONFIG_IDE_ISA=y |
| CONFIG_IDE_CMD646=y |
| CONFIG_IDE_MACIO=y |
| +CONFIG_NE2000_ISA=y |
| CONFIG_PFLASH_CFI01=y |
| CONFIG_PFLASH_CFI02=y |
| CONFIG_PTIMER=y |
| diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak |
| index a8ab6e3..be93e03 100644 |
| |
| |
| @@ -29,6 +29,7 @@ CONFIG_PPCE500_PCI=y |
| CONFIG_IDE_ISA=y |
| CONFIG_IDE_CMD646=y |
| CONFIG_IDE_MACIO=y |
| +CONFIG_NE2000_ISA=y |
| CONFIG_PFLASH_CFI01=y |
| CONFIG_PFLASH_CFI02=y |
| CONFIG_PTIMER=y |
| diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak |
| index ddba71d..8fc93dd 100644 |
| |
| |
| @@ -7,6 +7,7 @@ CONFIG_M48T59=y |
| CONFIG_PTIMER=y |
| CONFIG_FDC=y |
| CONFIG_EMPTY_SLOT=y |
| +CONFIG_PCNET_COMMON=y |
| CONFIG_LANCE=y |
| CONFIG_TCX=y |
| CONFIG_SLAVIO=y |
| diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak |
| index 2998f34..9b08ee8 100644 |
| |
| |
| @@ -8,6 +8,7 @@ CONFIG_PTIMER=y |
| CONFIG_VGA=y |
| CONFIG_VGA_PCI=y |
| CONFIG_SERIAL=y |
| +CONFIG_PARALLEL=y |
| CONFIG_PCKBD=y |
| CONFIG_FDC=y |
| CONFIG_IDE_ISA=y |
| -- |
| 1.7.1 |
| |