openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

pc: make pit configurable 

Signed-off-by: Chao Peng <chao.p.peng@linux.intel.com>
Message-Id: <1478330391-74060-4-git-send-email-chao.p.peng@linux.intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Chao Peng 2016-11-05 03:19:50 -04:00 committed by Paolo Bonzini
parent 272f042877
commit feddd2fd91
4 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/i386/pc.c
View File

@ -1536,6 +1536,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
ISADevice **rtc_state, ISADevice **rtc_state,
bool create_fdctrl, bool create_fdctrl,
bool no_vmport, bool no_vmport,
bool has_pit,
uint32_t hpet_irqs) uint32_t hpet_irqs)
{ {
int i; int i;
@ -1589,7 +1590,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
qemu_register_boot_set(pc_boot_set, *rtc_state); qemu_register_boot_set(pc_boot_set, *rtc_state);
if (!xen_enabled()) { if (!xen_enabled() && has_pit) {
if (kvm_pit_in_kernel()) { if (kvm_pit_in_kernel()) {
pit = kvm_pit_init(isa_bus, 0x40); pit = kvm_pit_init(isa_bus, 0x40);
} else { } else {
@ -2187,6 +2188,20 @@ static void pc_machine_set_sata(Object *obj, bool value, Error **errp)
pcms->sata = value; pcms->sata = value;
} }
static bool pc_machine_get_pit(Object *obj, Error **errp)
{
PCMachineState *pcms = PC_MACHINE(obj);
return pcms->pit;
}
static void pc_machine_set_pit(Object *obj, bool value, Error **errp)
{
PCMachineState *pcms = PC_MACHINE(obj);
pcms->pit = value;
}
static void pc_machine_initfn(Object *obj) static void pc_machine_initfn(Object *obj)
{ {
PCMachineState *pcms = PC_MACHINE(obj); PCMachineState *pcms = PC_MACHINE(obj);
@ -2200,6 +2215,7 @@ static void pc_machine_initfn(Object *obj)
pcms->acpi_build_enabled = PC_MACHINE_GET_CLASS(pcms)->has_acpi_build; pcms->acpi_build_enabled = PC_MACHINE_GET_CLASS(pcms)->has_acpi_build;
pcms->smbus = true; pcms->smbus = true;
pcms->sata = true; pcms->sata = true;
pcms->pit = true;
} }
static void pc_machine_reset(void) static void pc_machine_reset(void)
@ -2366,6 +2382,9 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
object_class_property_add_bool(oc, PC_MACHINE_SATA, object_class_property_add_bool(oc, PC_MACHINE_SATA,
pc_machine_get_sata, pc_machine_set_sata, &error_abort); pc_machine_get_sata, pc_machine_set_sata, &error_abort);
object_class_property_add_bool(oc, PC_MACHINE_PIT,
pc_machine_get_pit, pc_machine_set_pit, &error_abort);
} }
static const TypeInfo pc_machine_info = { static const TypeInfo pc_machine_info = {

2
hw/i386/pc_piix.c
View File

@ -235,7 +235,7 @@ static void pc_init1(MachineState *machine,
/* init basic PC hardware */ /* init basic PC hardware */
pc_basic_device_init(isa_bus, pcms->gsi, &rtc_state, true, pc_basic_device_init(isa_bus, pcms->gsi, &rtc_state, true,
(pcms->vmport != ON_OFF_AUTO_ON), 0x4); (pcms->vmport != ON_OFF_AUTO_ON), pcms->pit, 0x4);
pc_nic_init(isa_bus, pci_bus); pc_nic_init(isa_bus, pci_bus);

3
hw/i386/pc_q35.c
View File

@ -227,7 +227,8 @@ static void pc_q35_init(MachineState *machine)
/* init basic PC hardware */ /* init basic PC hardware */
pc_basic_device_init(isa_bus, pcms->gsi, &rtc_state, !mc->no_floppy, pc_basic_device_init(isa_bus, pcms->gsi, &rtc_state, !mc->no_floppy,
(pcms->vmport != ON_OFF_AUTO_ON), 0xff0104); (pcms->vmport != ON_OFF_AUTO_ON), pcms->pit,
0xff0104);
/* connect pm stuff to lpc */ /* connect pm stuff to lpc */
ich9_lpc_pm_init(lpc, pc_machine_is_smm_enabled(pcms)); ich9_lpc_pm_init(lpc, pc_machine_is_smm_enabled(pcms));

3
include/hw/i386/pc.h
View File

@ -65,6 +65,7 @@ struct PCMachineState {
bool acpi_build_enabled; bool acpi_build_enabled;
bool smbus; bool smbus;
bool sata; bool sata;
bool pit;
/* RAM information (sizes, addresses, configuration): */ /* RAM information (sizes, addresses, configuration): */
ram_addr_t below_4g_mem_size, above_4g_mem_size; ram_addr_t below_4g_mem_size, above_4g_mem_size;
@ -92,6 +93,7 @@ struct PCMachineState {
#define PC_MACHINE_NVDIMM "nvdimm" #define PC_MACHINE_NVDIMM "nvdimm"
#define PC_MACHINE_SMBUS "smbus" #define PC_MACHINE_SMBUS "smbus"
#define PC_MACHINE_SATA "sata" #define PC_MACHINE_SATA "sata"
#define PC_MACHINE_PIT "pit"
/** /**
* PCMachineClass: * PCMachineClass:
@ -264,6 +266,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
ISADevice **rtc_state, ISADevice **rtc_state,
bool create_fdctrl, bool create_fdctrl,
bool no_vmport, bool no_vmport,
bool has_pit,
uint32_t hpet_irqs); uint32_t hpet_irqs);
void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd); void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd);
void pc_cmos_init(PCMachineState *pcms, void pc_cmos_init(PCMachineState *pcms,