Commit 6dd2a5c9 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Anthony Liguori
Browse files

pc_sysfw: do not make it a device anymore 



Move the code to hw/i386, the sole remaining property is available
as !pci_enabled.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-id: 1376069702-22330-4-git-send-email-aliguori@us.ibm.com

Rebased.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent a904410a

default-configs/i386-softmmu.mak

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ CONFIG_MC146818RTC=y 
CONFIG_PAM=y

CONFIG_PCI_PIIX=y

CONFIG_WDT_IB700=y

CONFIG_PC_SYSFW=y

CONFIG_XEN_I386=$(CONFIG_XEN)

CONFIG_ISA_DEBUG=y

CONFIG_ISA_TESTDEV=y

default-configs/x86_64-softmmu.mak

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ CONFIG_MC146818RTC=y 
CONFIG_PAM=y

CONFIG_PCI_PIIX=y

CONFIG_WDT_IB700=y

CONFIG_PC_SYSFW=y

CONFIG_XEN_I386=$(CONFIG_XEN)

CONFIG_ISA_DEBUG=y

CONFIG_ISA_TESTDEV=y

hw/block/Makefile.objs

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ common-obj-$(CONFIG_PFLASH_CFI02) += pflash_cfi02.o 
common-obj-$(CONFIG_XEN_BACKEND) += xen_disk.o

common-obj-$(CONFIG_ECC) += ecc.o

common-obj-$(CONFIG_ONENAND) += onenand.o

common-obj-$(CONFIG_PC_SYSFW) += pc_sysfw.o

common-obj-$(CONFIG_NVME_PCI) += nvme.o



obj-$(CONFIG_SH4) += tc58128.o

hw/i386/Makefile.objs

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_KVM) += kvm/

obj-y += multiboot.o smbios.o

obj-y += pc.o pc_piix.o pc_q35.o

obj-y += pc_sysfw.o

obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o



obj-y += kvmvapic.o

hw/i386/pc.c

+1 −1
Original line number Diff line number Diff line
@@ -1145,7 +1145,7 @@ FWCfgState *pc_memory_init(MemoryRegion *system_memory, 




    /* Initialize PC system firmware */

    pc_system_firmware_init(rom_memory);

    pc_system_firmware_init(rom_memory, guest_info->isapc_ram_fw);



    option_rom_mr = g_malloc(sizeof(*option_rom_mr));

    memory_region_init_ram(option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE);