|
 |
d81766 |
From e2d3e5b47c9034b18edd8518acff4fa4e7dba36c Mon Sep 17 00:00:00 2001
|
|
|
d81766 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
d81766 |
Date: Wed, 22 May 2013 11:59:23 +0200
|
|
|
d81766 |
Subject: Disable unsupported emulated network devices
|
|
|
d81766 |
|
|
|
d81766 |
Bugzilla: 921974
|
|
|
d81766 |
|
|
|
d81766 |
Disable following network devices as they are not supported:
|
|
|
d81766 |
- ne2k_isa
|
|
|
d81766 |
- ne2k_pci
|
|
|
d81766 |
- pcnet
|
|
|
d81766 |
- vmxnet3
|
|
|
d81766 |
|
|
|
d81766 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
Conflicts:
|
|
|
d81766 |
default-configs/ppcemb-softmmu.mak
|
|
|
d81766 |
|
|
|
d81766 |
Rebase note:
|
|
|
d81766 |
- 2.0
|
|
|
d81766 |
Added following devices:
|
|
|
d81766 |
CONFIG_MACIO=y
|
|
|
d81766 |
CONFIG_CUDA=y
|
|
|
d81766 |
CONFIG_ADB=y
|
|
|
d81766 |
CONFIG_MAC_NVRAM=y
|
|
|
d81766 |
CONFIG_MAC_DBDMA=y
|
|
|
d81766 |
CONFIG_HEATHROW_PIC=y
|
|
|
d81766 |
CONFIG_GRACKLE_PCI=y
|
|
|
d81766 |
CONFIG_UNIN_PCI=y
|
|
|
d81766 |
CONFIG_DEC_PCI=y
|
|
|
d81766 |
CONFIG_PPCE500_PCI=y
|
|
|
d81766 |
CONFIG_IDE_ISA=y
|
|
|
d81766 |
CONFIG_IDE_CMD646=y
|
|
|
d81766 |
CONFIG_IDE_MACIO=y
|
|
|
d81766 |
|
|
|
d81766 |
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
|
|
|
d81766 |
index 319025b..77e05e5 100644
|
|
|
d81766 |
--- a/default-configs/i386-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/i386-softmmu.mak
|
|
|
d81766 |
@@ -20,7 +20,6 @@ CONFIG_APM=y
|
|
|
d81766 |
CONFIG_I8257=y
|
|
|
d81766 |
CONFIG_IDE_ISA=y
|
|
|
d81766 |
CONFIG_IDE_PIIX=y
|
|
|
d81766 |
-CONFIG_NE2000_ISA=y
|
|
|
d81766 |
CONFIG_PIIX_PCI=y
|
|
|
d81766 |
CONFIG_HPET=y
|
|
|
d81766 |
CONFIG_I8259=y
|
|
|
d81766 |
diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak
|
|
|
d81766 |
index ac798a7..d0b89ab 100644
|
|
|
d81766 |
--- a/default-configs/mips-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/mips-softmmu.mak
|
|
|
d81766 |
@@ -21,7 +21,6 @@ CONFIG_I8257=y
|
|
|
d81766 |
CONFIG_PIIX4=y
|
|
|
d81766 |
CONFIG_IDE_ISA=y
|
|
|
d81766 |
CONFIG_IDE_PIIX=y
|
|
|
d81766 |
-CONFIG_NE2000_ISA=y
|
|
|
d81766 |
CONFIG_RC4030=y
|
|
|
d81766 |
CONFIG_DP8393X=y
|
|
|
d81766 |
CONFIG_DS1225Y=y
|
|
|
d81766 |
diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak
|
|
|
d81766 |
index 4afe6c0..d21eebe 100644
|
|
|
d81766 |
--- a/default-configs/mips64-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/mips64-softmmu.mak
|
|
|
d81766 |
@@ -21,7 +21,6 @@ CONFIG_I8257=y
|
|
|
d81766 |
CONFIG_PIIX4=y
|
|
|
d81766 |
CONFIG_IDE_ISA=y
|
|
|
d81766 |
CONFIG_IDE_PIIX=y
|
|
|
d81766 |
-CONFIG_NE2000_ISA=y
|
|
|
d81766 |
CONFIG_RC4030=y
|
|
|
d81766 |
CONFIG_DP8393X=y
|
|
|
d81766 |
CONFIG_DS1225Y=y
|
|
|
d81766 |
diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
|
|
|
d81766 |
index fe907e4..df4664d 100644
|
|
|
d81766 |
--- a/default-configs/mips64el-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/mips64el-softmmu.mak
|
|
|
d81766 |
@@ -22,7 +22,6 @@ CONFIG_PIIX4=y
|
|
|
d81766 |
CONFIG_IDE_ISA=y
|
|
|
d81766 |
CONFIG_IDE_PIIX=y
|
|
|
d81766 |
CONFIG_IDE_VIA=y
|
|
|
d81766 |
-CONFIG_NE2000_ISA=y
|
|
|
d81766 |
CONFIG_RC4030=y
|
|
|
d81766 |
CONFIG_DP8393X=y
|
|
|
d81766 |
CONFIG_DS1225Y=y
|
|
|
d81766 |
diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak
|
|
|
d81766 |
index f9acb4b..2d9cece 100644
|
|
|
d81766 |
--- a/default-configs/mipsel-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/mipsel-softmmu.mak
|
|
|
d81766 |
@@ -21,7 +21,6 @@ CONFIG_I8257=y
|
|
|
d81766 |
CONFIG_PIIX4=y
|
|
|
d81766 |
CONFIG_IDE_ISA=y
|
|
|
d81766 |
CONFIG_IDE_PIIX=y
|
|
|
d81766 |
-CONFIG_NE2000_ISA=y
|
|
|
d81766 |
CONFIG_RC4030=y
|
|
|
d81766 |
CONFIG_DP8393X=y
|
|
|
d81766 |
CONFIG_DS1225Y=y
|
|
|
d81766 |
diff --git a/default-configs/pci.mak b/default-configs/pci.mak
|
|
|
d81766 |
index 95c477f..6cc2b1b 100644
|
|
|
d81766 |
--- a/default-configs/pci.mak
|
|
|
d81766 |
+++ b/default-configs/pci.mak
|
|
|
d81766 |
@@ -4,15 +4,11 @@ CONFIG_VIRTIO=y
|
|
|
d81766 |
CONFIG_USB_UHCI=y
|
|
|
d81766 |
CONFIG_USB_EHCI=y
|
|
|
d81766 |
CONFIG_USB_XHCI=y
|
|
|
d81766 |
-CONFIG_NE2000_PCI=y
|
|
|
d81766 |
CONFIG_EEPRO100_PCI=y
|
|
|
d81766 |
-CONFIG_PCNET_PCI=y
|
|
|
d81766 |
-CONFIG_PCNET_COMMON=y
|
|
|
d81766 |
CONFIG_AC97=y
|
|
|
d81766 |
CONFIG_HDA=y
|
|
|
d81766 |
CONFIG_RTL8139_PCI=y
|
|
|
d81766 |
CONFIG_E1000_PCI=y
|
|
|
d81766 |
-CONFIG_VMXNET3_PCI=y
|
|
|
d81766 |
CONFIG_IDE_CORE=y
|
|
|
d81766 |
CONFIG_IDE_QDEV=y
|
|
|
d81766 |
CONFIG_IDE_PCI=y
|
|
|
d81766 |
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
|
|
|
d81766 |
index 33f8d84..73f46dc 100644
|
|
|
d81766 |
--- a/default-configs/ppc-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/ppc-softmmu.mak
|
|
|
d81766 |
@@ -33,7 +33,6 @@ CONFIG_PPCE500_PCI=y
|
|
|
d81766 |
CONFIG_IDE_ISA=y
|
|
|
d81766 |
CONFIG_IDE_CMD646=y
|
|
|
d81766 |
CONFIG_IDE_MACIO=y
|
|
|
d81766 |
-CONFIG_NE2000_ISA=y
|
|
|
d81766 |
CONFIG_PFLASH_CFI01=y
|
|
|
d81766 |
CONFIG_PFLASH_CFI02=y
|
|
|
d81766 |
CONFIG_PTIMER=y
|
|
|
d81766 |
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
|
|
|
d81766 |
index 37a15b7..a9798a8 100644
|
|
|
d81766 |
--- a/default-configs/ppc64-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/ppc64-softmmu.mak
|
|
|
d81766 |
@@ -33,7 +33,6 @@ CONFIG_PPCE500_PCI=y
|
|
|
d81766 |
CONFIG_IDE_ISA=y
|
|
|
d81766 |
CONFIG_IDE_CMD646=y
|
|
|
d81766 |
CONFIG_IDE_MACIO=y
|
|
|
d81766 |
-CONFIG_NE2000_ISA=y
|
|
|
d81766 |
CONFIG_PFLASH_CFI01=y
|
|
|
d81766 |
CONFIG_PFLASH_CFI02=y
|
|
|
d81766 |
CONFIG_PTIMER=y
|
|
|
d81766 |
diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
|
|
|
d81766 |
index e032761..aa2bdb1 100644
|
|
|
d81766 |
--- a/default-configs/ppcemb-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/ppcemb-softmmu.mak
|
|
|
d81766 |
@@ -9,6 +9,19 @@ CONFIG_VGA_PCI=y
|
|
|
d81766 |
CONFIG_SERIAL=y
|
|
|
d81766 |
CONFIG_I8257=y
|
|
|
d81766 |
CONFIG_OPENPIC=y
|
|
|
d81766 |
+CONFIG_MACIO=y
|
|
|
d81766 |
+CONFIG_CUDA=y
|
|
|
d81766 |
+CONFIG_ADB=y
|
|
|
d81766 |
+CONFIG_MAC_NVRAM=y
|
|
|
d81766 |
+CONFIG_MAC_DBDMA=y
|
|
|
d81766 |
+CONFIG_HEATHROW_PIC=y
|
|
|
d81766 |
+CONFIG_GRACKLE_PCI=y
|
|
|
d81766 |
+CONFIG_UNIN_PCI=y
|
|
|
d81766 |
+CONFIG_DEC_PCI=y
|
|
|
d81766 |
+CONFIG_PPCE500_PCI=y
|
|
|
d81766 |
+CONFIG_IDE_ISA=y
|
|
|
d81766 |
+CONFIG_IDE_CMD646=y
|
|
|
d81766 |
+CONFIG_IDE_MACIO=y
|
|
|
d81766 |
CONFIG_PFLASH_CFI01=y
|
|
|
d81766 |
CONFIG_PFLASH_CFI02=y
|
|
|
d81766 |
CONFIG_PTIMER=y
|
|
|
d81766 |
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
|
|
|
d81766 |
index ab796b3..775e16a 100644
|
|
|
d81766 |
--- a/default-configs/sparc-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/sparc-softmmu.mak
|
|
|
d81766 |
@@ -7,7 +7,6 @@ CONFIG_M48T59=y
|
|
|
d81766 |
CONFIG_PTIMER=y
|
|
|
d81766 |
CONFIG_FDC=y
|
|
|
d81766 |
CONFIG_EMPTY_SLOT=y
|
|
|
d81766 |
-CONFIG_PCNET_COMMON=y
|
|
|
d81766 |
CONFIG_LANCE=y
|
|
|
d81766 |
CONFIG_TCX=y
|
|
|
d81766 |
CONFIG_CG3=y
|
|
|
d81766 |
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
|
|
|
d81766 |
index f35a222..199bab9 100644
|
|
|
d81766 |
--- a/default-configs/x86_64-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/x86_64-softmmu.mak
|
|
|
d81766 |
@@ -20,7 +20,6 @@ CONFIG_APM=y
|
|
|
d81766 |
CONFIG_I8257=y
|
|
|
d81766 |
CONFIG_IDE_ISA=y
|
|
|
d81766 |
CONFIG_IDE_PIIX=y
|
|
|
d81766 |
-CONFIG_NE2000_ISA=y
|
|
|
d81766 |
CONFIG_PIIX_PCI=y
|
|
|
d81766 |
CONFIG_HPET=y
|
|
|
d81766 |
CONFIG_I8259=y
|