mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/i386: Make pit a property of common x86 base machine type

Browse Source 
Both pc and microvm have pit property individually. Let's just make it
the property of common x86 base machine type.

Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-Id: <20220310122811.807794-2-xiaoyao.li@intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Xiaoyao Li 2022-03-10 20:28:10 +08:00 committed by Michael S. Tsirkin
parent 1f1a7b2269
commit 9dee7e5109
6 changed files with 31 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/i386/microvm.c
View File

@ -257,7 +257,7 @@ static void microvm_devices_init(MicrovmMachineState *mms)
g_free(i8259); g_free(i8259);
} }
if (mms->pit == ON_OFF_AUTO_ON || mms->pit == ON_OFF_AUTO_AUTO) { if (x86ms->pit == ON_OFF_AUTO_ON || x86ms->pit == ON_OFF_AUTO_AUTO) {
if (kvm_pit_in_kernel()) { if (kvm_pit_in_kernel()) {
kvm_pit_init(isa_bus, 0x40); kvm_pit_init(isa_bus, 0x40);
} else { } else {
@ -508,23 +508,6 @@ static void microvm_machine_set_pic(Object *obj, Visitor *v, const char *name,
visit_type_OnOffAuto(v, name, &mms->pic, errp); visit_type_OnOffAuto(v, name, &mms->pic, errp);
} }
static void microvm_machine_get_pit(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
MicrovmMachineState *mms = MICROVM_MACHINE(obj);
OnOffAuto pit = mms->pit;
visit_type_OnOffAuto(v, name, &pit, errp);
}
static void microvm_machine_set_pit(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
MicrovmMachineState *mms = MICROVM_MACHINE(obj);
visit_type_OnOffAuto(v, name, &mms->pit, errp);
}
static void microvm_machine_get_rtc(Object *obj, Visitor *v, const char *name, static void microvm_machine_get_rtc(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp) void *opaque, Error **errp)
{ {
@ -650,7 +633,6 @@ static void microvm_machine_initfn(Object *obj)
/* Configuration */ /* Configuration */
mms->pic = ON_OFF_AUTO_AUTO; mms->pic = ON_OFF_AUTO_AUTO;
mms->pit = ON_OFF_AUTO_AUTO;
mms->rtc = ON_OFF_AUTO_AUTO; mms->rtc = ON_OFF_AUTO_AUTO;
mms->pcie = ON_OFF_AUTO_AUTO; mms->pcie = ON_OFF_AUTO_AUTO;
mms->ioapic2 = ON_OFF_AUTO_AUTO; mms->ioapic2 = ON_OFF_AUTO_AUTO;
@ -709,13 +691,6 @@ static void microvm_class_init(ObjectClass *oc, void *data)
object_class_property_set_description(oc, MICROVM_MACHINE_PIC, object_class_property_set_description(oc, MICROVM_MACHINE_PIC,
"Enable i8259 PIC"); "Enable i8259 PIC");
object_class_property_add(oc, MICROVM_MACHINE_PIT, "OnOffAuto",
microvm_machine_get_pit,
microvm_machine_set_pit,
NULL, NULL);
object_class_property_set_description(oc, MICROVM_MACHINE_PIT,
"Enable i8254 PIT");
object_class_property_add(oc, MICROVM_MACHINE_RTC, "OnOffAuto", object_class_property_add(oc, MICROVM_MACHINE_RTC, "OnOffAuto",
microvm_machine_get_rtc, microvm_machine_get_rtc,
microvm_machine_set_rtc, microvm_machine_set_rtc,

24
hw/i386/pc.c
View File

@ -1123,6 +1123,7 @@ void pc_basic_device_init(struct PCMachineState *pcms,
ISADevice *pit = NULL; ISADevice *pit = NULL;
MemoryRegion *ioport80_io = g_new(MemoryRegion, 1); MemoryRegion *ioport80_io = g_new(MemoryRegion, 1);
MemoryRegion *ioportF0_io = g_new(MemoryRegion, 1); MemoryRegion *ioportF0_io = g_new(MemoryRegion, 1);
X86MachineState *x86ms = X86_MACHINE(pcms);
memory_region_init_io(ioport80_io, NULL, &ioport80_io_ops, NULL, "ioport80", 1); memory_region_init_io(ioport80_io, NULL, &ioport80_io_ops, NULL, "ioport80", 1);
memory_region_add_subregion(isa_bus->address_space_io, 0x80, ioport80_io); memory_region_add_subregion(isa_bus->address_space_io, 0x80, ioport80_io);
@ -1167,7 +1168,8 @@ void pc_basic_device_init(struct PCMachineState *pcms,
qemu_register_boot_set(pc_boot_set, *rtc_state); qemu_register_boot_set(pc_boot_set, *rtc_state);
if (!xen_enabled() && pcms->pit_enabled) { if (!xen_enabled() &&
(x86ms->pit == ON_OFF_AUTO_AUTO || x86ms->pit == ON_OFF_AUTO_ON)) {
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 {
@ -1537,20 +1539,6 @@ static void pc_machine_set_sata(Object *obj, bool value, Error **errp)
pcms->sata_enabled = value; pcms->sata_enabled = value;
} }
static bool pc_machine_get_pit(Object *obj, Error **errp)
{
PCMachineState *pcms = PC_MACHINE(obj);
return pcms->pit_enabled;
}
static void pc_machine_set_pit(Object *obj, bool value, Error **errp)
{
PCMachineState *pcms = PC_MACHINE(obj);
pcms->pit_enabled = value;
}
static bool pc_machine_get_hpet(Object *obj, Error **errp) static bool pc_machine_get_hpet(Object *obj, Error **errp)
{ {
PCMachineState *pcms = PC_MACHINE(obj); PCMachineState *pcms = PC_MACHINE(obj);
@ -1707,7 +1695,6 @@ 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_enabled = true; pcms->smbus_enabled = true;
pcms->sata_enabled = true; pcms->sata_enabled = true;
pcms->pit_enabled = true;
pcms->i8042_enabled = true; pcms->i8042_enabled = true;
pcms->max_fw_size = 8 * MiB; pcms->max_fw_size = 8 * MiB;
#ifdef CONFIG_HPET #ifdef CONFIG_HPET
@ -1836,11 +1823,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
object_class_property_set_description(oc, PC_MACHINE_SATA, object_class_property_set_description(oc, PC_MACHINE_SATA,
"Enable/disable Serial ATA bus"); "Enable/disable Serial ATA bus");
object_class_property_add_bool(oc, PC_MACHINE_PIT,
pc_machine_get_pit, pc_machine_set_pit);
object_class_property_set_description(oc, PC_MACHINE_PIT,
"Enable/disable Intel 8254 programmable interval timer emulation");
object_class_property_add_bool(oc, "hpet", object_class_property_add_bool(oc, "hpet",
pc_machine_get_hpet, pc_machine_set_hpet); pc_machine_get_hpet, pc_machine_set_hpet);
object_class_property_set_description(oc, "hpet", object_class_property_set_description(oc, "hpet",

25
hw/i386/x86.c
View File

@ -1244,6 +1244,23 @@ static void x86_machine_set_acpi(Object *obj, Visitor *v, const char *name,
visit_type_OnOffAuto(v, name, &x86ms->acpi, errp); visit_type_OnOffAuto(v, name, &x86ms->acpi, errp);
} }
static void x86_machine_get_pit(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
X86MachineState *x86ms = X86_MACHINE(obj);
OnOffAuto pit = x86ms->pit;
visit_type_OnOffAuto(v, name, &pit, errp);
}
static void x86_machine_set_pit(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
X86MachineState *x86ms = X86_MACHINE(obj);;
visit_type_OnOffAuto(v, name, &x86ms->pit, errp);
}
static char *x86_machine_get_oem_id(Object *obj, Error **errp) static char *x86_machine_get_oem_id(Object *obj, Error **errp)
{ {
X86MachineState *x86ms = X86_MACHINE(obj); X86MachineState *x86ms = X86_MACHINE(obj);
@ -1333,6 +1350,7 @@ static void x86_machine_initfn(Object *obj)
x86ms->smm = ON_OFF_AUTO_AUTO; x86ms->smm = ON_OFF_AUTO_AUTO;
x86ms->acpi = ON_OFF_AUTO_AUTO; x86ms->acpi = ON_OFF_AUTO_AUTO;
x86ms->pit = ON_OFF_AUTO_AUTO;
x86ms->pci_irq_mask = ACPI_BUILD_PCI_IRQS; x86ms->pci_irq_mask = ACPI_BUILD_PCI_IRQS;
x86ms->oem_id = g_strndup(ACPI_BUILD_APPNAME6, 6); x86ms->oem_id = g_strndup(ACPI_BUILD_APPNAME6, 6);
x86ms->oem_table_id = g_strndup(ACPI_BUILD_APPNAME8, 8); x86ms->oem_table_id = g_strndup(ACPI_BUILD_APPNAME8, 8);
@ -1364,6 +1382,13 @@ static void x86_machine_class_init(ObjectClass *oc, void *data)
object_class_property_set_description(oc, X86_MACHINE_ACPI, object_class_property_set_description(oc, X86_MACHINE_ACPI,
"Enable ACPI"); "Enable ACPI");
object_class_property_add(oc, X86_MACHINE_PIT, "OnOffAuto",
x86_machine_get_pit,
x86_machine_set_pit,
NULL, NULL);
object_class_property_set_description(oc, X86_MACHINE_PIT,
"Enable i8254 PIT");
object_class_property_add_str(oc, X86_MACHINE_OEM_ID, object_class_property_add_str(oc, X86_MACHINE_OEM_ID,
x86_machine_get_oem_id, x86_machine_get_oem_id,
x86_machine_set_oem_id); x86_machine_set_oem_id);

2
include/hw/i386/microvm.h
View File

@ -67,7 +67,6 @@
#define PCIE_ECAM_SIZE 0x10000000 #define PCIE_ECAM_SIZE 0x10000000
/* Machine type options */ /* Machine type options */
#define MICROVM_MACHINE_PIT "pit"
#define MICROVM_MACHINE_PIC "pic" #define MICROVM_MACHINE_PIC "pic"
#define MICROVM_MACHINE_RTC "rtc" #define MICROVM_MACHINE_RTC "rtc"
#define MICROVM_MACHINE_PCIE "pcie" #define MICROVM_MACHINE_PCIE "pcie"
@ -87,7 +86,6 @@ struct MicrovmMachineState {
/* Machine type options */ /* Machine type options */
OnOffAuto pic; OnOffAuto pic;
OnOffAuto pit;
OnOffAuto rtc; OnOffAuto rtc;
OnOffAuto pcie; OnOffAuto pcie;
OnOffAuto ioapic2; OnOffAuto ioapic2;

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

@ -46,7 +46,6 @@ typedef struct PCMachineState {
bool acpi_build_enabled; bool acpi_build_enabled;
bool smbus_enabled; bool smbus_enabled;
bool sata_enabled; bool sata_enabled;
bool pit_enabled;
bool hpet_enabled; bool hpet_enabled;
bool i8042_enabled; bool i8042_enabled;
bool default_bus_bypass_iommu; bool default_bus_bypass_iommu;
@ -64,7 +63,6 @@ typedef struct PCMachineState {
#define PC_MACHINE_VMPORT "vmport" #define PC_MACHINE_VMPORT "vmport"
#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"
#define PC_MACHINE_I8042 "i8042" #define PC_MACHINE_I8042 "i8042"
#define PC_MACHINE_MAX_FW_SIZE "max-fw-size" #define PC_MACHINE_MAX_FW_SIZE "max-fw-size"
#define PC_MACHINE_SMBIOS_EP "smbios-entry-point-type" #define PC_MACHINE_SMBIOS_EP "smbios-entry-point-type"

2
include/hw/i386/x86.h
View File

@ -65,6 +65,7 @@ struct X86MachineState {
OnOffAuto smm; OnOffAuto smm;
OnOffAuto acpi; OnOffAuto acpi;
OnOffAuto pit;
char *oem_id; char *oem_id;
char *oem_table_id; char *oem_table_id;
@ -84,6 +85,7 @@ struct X86MachineState {
#define X86_MACHINE_SMM "smm" #define X86_MACHINE_SMM "smm"
#define X86_MACHINE_ACPI "acpi" #define X86_MACHINE_ACPI "acpi"
#define X86_MACHINE_PIT "pit"
#define X86_MACHINE_OEM_ID "x-oem-id" #define X86_MACHINE_OEM_ID "x-oem-id"
#define X86_MACHINE_OEM_TABLE_ID "x-oem-table-id" #define X86_MACHINE_OEM_TABLE_ID "x-oem-table-id"
#define X86_MACHINE_BUS_LOCK_RATELIMIT "bus-lock-ratelimit" #define X86_MACHINE_BUS_LOCK_RATELIMIT "bus-lock-ratelimit"