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

i386/kvm: Delete kvm_allows_irq0_override()

Browse Source 
As IRQ routing is always available on x86,
kvm_allows_irq0_override() will always return true, so we don't
need the function anymore.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200922201922.2153598-4-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2020-09-22 16:19:22 -04:00
parent 8981bae23e
commit eafa08683f
6 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/i386/fw_cfg.c
View File

@ -123,7 +123,7 @@ FWCfgState *fw_cfg_arch_create(MachineState *ms,
fw_cfg_add_bytes(fw_cfg, FW_CFG_ACPI_TABLES, fw_cfg_add_bytes(fw_cfg, FW_CFG_ACPI_TABLES,
acpi_tables, acpi_tables_len); acpi_tables, acpi_tables_len);
#endif #endif
fw_cfg_add_i32(fw_cfg, FW_CFG_IRQ0_OVERRIDE, kvm_allows_irq0_override()); fw_cfg_add_i32(fw_cfg, FW_CFG_IRQ0_OVERRIDE, 1);
fw_cfg_add_bytes(fw_cfg, FW_CFG_E820_TABLE, fw_cfg_add_bytes(fw_cfg, FW_CFG_E820_TABLE,
&e820_reserve, sizeof(e820_reserve)); &e820_reserve, sizeof(e820_reserve));

2
hw/i386/microvm.c
View File

@ -290,7 +290,7 @@ static void microvm_memory_init(MicrovmMachineState *mms)
fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, machine->smp.cpus); fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, machine->smp.cpus);
fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, machine->smp.max_cpus); fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, machine->smp.max_cpus);
fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)machine->ram_size); fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)machine->ram_size);
fw_cfg_add_i32(fw_cfg, FW_CFG_IRQ0_OVERRIDE, kvm_allows_irq0_override()); fw_cfg_add_i32(fw_cfg, FW_CFG_IRQ0_OVERRIDE, 1);
fw_cfg_add_bytes(fw_cfg, FW_CFG_E820_TABLE, fw_cfg_add_bytes(fw_cfg, FW_CFG_E820_TABLE,
&e820_reserve, sizeof(e820_reserve)); &e820_reserve, sizeof(e820_reserve));
fw_cfg_add_file(fw_cfg, "etc/e820", e820_table, fw_cfg_add_file(fw_cfg, "etc/e820", e820_table,

2
hw/i386/pc.c
View File

@ -827,7 +827,7 @@ void pc_guest_info_init(PCMachineState *pcms)
MachineState *ms = MACHINE(pcms); MachineState *ms = MACHINE(pcms);
X86MachineState *x86ms = X86_MACHINE(pcms); X86MachineState *x86ms = X86_MACHINE(pcms);
x86ms->apic_xrupt_override = kvm_allows_irq0_override(); x86ms->apic_xrupt_override = true;
pcms->numa_nodes = ms->numa_state->num_nodes; pcms->numa_nodes = ms->numa_state->num_nodes;
pcms->node_mem = g_malloc0(pcms->numa_nodes * pcms->node_mem = g_malloc0(pcms->numa_nodes *
sizeof *pcms->node_mem); sizeof *pcms->node_mem);

5
target/i386/kvm-stub.c
View File

@ -13,11 +13,6 @@
#include "cpu.h" #include "cpu.h"
#include "kvm_i386.h" #include "kvm_i386.h"
bool kvm_allows_irq0_override(void)
{
return 1;
}
#ifndef __OPTIMIZE__ #ifndef __OPTIMIZE__
bool kvm_has_smm(void) bool kvm_has_smm(void)
{ {

5
target/i386/kvm.c
View File

@ -154,11 +154,6 @@ bool kvm_has_exception_payload(void)
return has_exception_payload; return has_exception_payload;
} }
bool kvm_allows_irq0_override(void)
{
return !kvm_irqchip_in_kernel() || kvm_has_gsi_routing();
}
static bool kvm_x2apic_api_set_flags(uint64_t flags) static bool kvm_x2apic_api_set_flags(uint64_t flags)
{ {
KVMState *s = KVM_STATE(current_accel()); KVMState *s = KVM_STATE(current_accel());

1
target/i386/kvm_i386.h
View File

@ -32,7 +32,6 @@
#endif /* CONFIG_KVM */ #endif /* CONFIG_KVM */
bool kvm_allows_irq0_override(void);
bool kvm_has_smm(void); bool kvm_has_smm(void);
bool kvm_has_adjust_clock(void); bool kvm_has_adjust_clock(void);
bool kvm_has_adjust_clock_stable(void); bool kvm_has_adjust_clock_stable(void);