mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-12-16 17:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compile acpi only once

Browse Source 
Use qemu_irqs to trigger CMOS S3 and SMI events.

Avoid using kvm.h, which uses CPUState.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl
2010-03-29 19:23:52 +00:00
parent ad96090a01
commit 53b67b3052
12 changed files with 56 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
hw/pc.c
View File

@@ -46,6 +46,7 @@
#include "loader.h"
#include "elf.h"
#include "multiboot.h"
#include "kvm.h"
/* output Bochs bios info messages */
//#define DEBUG_BIOS
@@ -752,6 +753,26 @@ int cpu_is_bsp(CPUState *env)
return env->cpu_index == 0;
}
/* set CMOS shutdown status register (index 0xF) as S3_resume(0xFE)
BIOS will read it and start S3 resume at POST Entry */
static void cmos_set_s3_resume(void *opaque, int irq, int level)
{
RTCState *s = opaque;
if (level) {
rtc_set_memory(s, 0xF, 0xFE);
}
}
static void acpi_smi_interrupt(void *opaque, int irq, int level)
{
CPUState *s = opaque;
if (level) {
cpu_interrupt(s, CPU_INTERRUPT_SMI);
}
}
static CPUState *pc_new_cpu(const char *cpu_model)
{
CPUState *env;
@@ -792,6 +813,8 @@ static void pc_init1(ram_addr_t ram_size,
qemu_irq *cpu_irq;
qemu_irq *isa_irq;
qemu_irq *i8259;
qemu_irq *cmos_s3;
qemu_irq *smi_irq;
IsaIrqState *isa_irq_state;
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
DriveInfo *fd[MAX_FD];
@@ -1006,9 +1029,12 @@ static void pc_init1(ram_addr_t ram_size,
uint8_t *eeprom_buf = qemu_mallocz(8 * 256); /* XXX: make this persistent */
i2c_bus *smbus;
cmos_s3 = qemu_allocate_irqs(cmos_set_s3_resume, rtc_state, 1);
smi_irq = qemu_allocate_irqs(acpi_smi_interrupt, first_cpu, 1);
/* TODO: Populate SPD eeprom data. */
smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100,
isa_reserve_irq(9));
isa_reserve_irq(9), *cmos_s3, *smi_irq,
kvm_enabled());
for (i = 0; i < 8; i++) {
DeviceState *eeprom;
eeprom = qdev_create((BusState *)smbus, "smbus-eeprom");
@@ -1060,14 +1086,6 @@ static void pc_init_isa(ram_addr_t ram_size,
initrd_filename, cpu_model, 0);
}
/* set CMOS shutdown status register (index 0xF) as S3_resume(0xFE)
BIOS will read it and start S3 resume at POST Entry */
void cmos_set_s3_resume(void)
{
if (rtc_state)
rtc_set_memory(rtc_state, 0xF, 0xFE);
}
static QEMUMachine pc_machine = {
.name = "pc-0.13",
.alias = "pc",