cryptospore / rpms / qemu-kvm

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