|
 |
d81766 |
From 75e13be918f567469054a2bc387d202b0848757b Mon Sep 17 00:00:00 2001
|
|
|
d81766 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
Date: Sat, 2 Nov 2013 14:10:18 +0100
|
|
|
d81766 |
Subject: rhel: Drop "cfi.pflash01" and "isa-ide" device
|
|
|
d81766 |
|
|
|
d81766 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
Message-id: <1383401418-4444-3-git-send-email-armbru@redhat.com>
|
|
|
d81766 |
Patchwork-id: 55269
|
|
|
d81766 |
O-Subject: [PATCH 7.0 qemu-kvm 2/2] rhel: Drop "cfi.pflash01" and "isa-ide" device
|
|
|
d81766 |
Bugzilla: 1001076
|
|
|
d81766 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Alex Williamson <alex.williamson@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
We can drop a device from the build only when it isn't referenced from
|
|
|
d81766 |
code we build. References come in two forms: extern symbols, and qdev
|
|
|
d81766 |
driver names.
|
|
|
d81766 |
|
|
|
d81766 |
Unresolved extern symbols pose no real danger, because they fail
|
|
|
d81766 |
safely at link time. Note for the curious: the optimizer gets rid of
|
|
|
d81766 |
the reference to isa_ide_init() in hw/i386/pc_piix.c.
|
|
|
d81766 |
|
|
|
d81766 |
Unresolved driver names get detected only at runtime, so we better be
|
|
|
d81766 |
extra careful. There is just one occurence of either driver name
|
|
|
d81766 |
outside the code dropped by this patch: "isa-ide" in hw/isa/pc87312.c.
|
|
|
d81766 |
Compiled only when CONFIG_PC87312 is enabled. It isn't in our build.
|
|
|
d81766 |
|
|
|
d81766 |
"cfi.pflash01" is already no-user. Drop it anyway, because it's easy
|
|
|
d81766 |
and safe.
|
|
|
d81766 |
|
|
|
d81766 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
|
|
|
d81766 |
index ddf71dc..c79d215 100644
|
|
|
d81766 |
--- a/default-configs/x86_64-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/x86_64-softmmu.mak
|
|
|
d81766 |
@@ -17,11 +17,9 @@ CONFIG_FDC=y
|
|
|
d81766 |
CONFIG_ACPI=y
|
|
|
d81766 |
CONFIG_APM=y
|
|
|
d81766 |
CONFIG_I8257=y
|
|
|
d81766 |
-CONFIG_IDE_ISA=y
|
|
|
d81766 |
CONFIG_IDE_PIIX=y
|
|
|
d81766 |
CONFIG_PIIX_PCI=y
|
|
|
d81766 |
CONFIG_I8259=y
|
|
|
d81766 |
-CONFIG_PFLASH_CFI01=y
|
|
|
d81766 |
CONFIG_TPM_TIS=$(CONFIG_TPM)
|
|
|
d81766 |
CONFIG_PCI_HOTPLUG_OLD=y
|
|
|
d81766 |
CONFIG_MC146818RTC=y
|