yeahuh / rpms / qemu-kvm

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