ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pc_piix: rename kvm_enabled to smm_enabled 

We will enable SMM even if KVM is in use.  Rename the field and
arguments.

Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2015-06-18 18:30:17 +02:00
parent 6410848bec
commit 61e66c6237
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/acpi/piix4.c
View File

@ -72,7 +72,7 @@ typedef struct PIIX4PMState {
qemu_irq irq; qemu_irq irq;
qemu_irq smi_irq; qemu_irq smi_irq;
int kvm_enabled; int smm_enabled;
Notifier machine_ready; Notifier machine_ready;
Notifier powerdown_notifier; Notifier powerdown_notifier;
@ -322,7 +322,7 @@ static void piix4_reset(void *opaque)
pci_conf[0x40] = 0x01; /* PM io base read only bit */ pci_conf[0x40] = 0x01; /* PM io base read only bit */
pci_conf[0x80] = 0; pci_conf[0x80] = 0;
if (s->kvm_enabled) { if (!s->smm_enabled) {
/* Mark SMM as already inited (until KVM supports SMM). */ /* Mark SMM as already inited (until KVM supports SMM). */
pci_conf[0x5B] = 0x02; pci_conf[0x5B] = 0x02;
} }
@ -453,7 +453,7 @@ static void piix4_pm_realize(PCIDevice *dev, Error **errp)
/* APM */ /* APM */
apm_init(dev, &s->apm, apm_ctrl_changed, s); apm_init(dev, &s->apm, apm_ctrl_changed, s);
if (s->kvm_enabled) { if (!s->smm_enabled) {
/* Mark SMM as already inited to prevent SMM from running. KVM does not /* Mark SMM as already inited to prevent SMM from running. KVM does not
* support SMM mode. */ * support SMM mode. */
pci_conf[0x5B] = 0x02; pci_conf[0x5B] = 0x02;
@ -504,7 +504,7 @@ Object *piix4_pm_find(void)
I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
qemu_irq sci_irq, qemu_irq smi_irq, qemu_irq sci_irq, qemu_irq smi_irq,
int kvm_enabled, DeviceState **piix4_pm) int smm_enabled, DeviceState **piix4_pm)
{ {
DeviceState *dev; DeviceState *dev;
PIIX4PMState *s; PIIX4PMState *s;
@ -518,7 +518,7 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
s = PIIX4_PM(dev); s = PIIX4_PM(dev);
s->irq = sci_irq; s->irq = sci_irq;
s->smi_irq = smi_irq; s->smi_irq = smi_irq;
s->kvm_enabled = kvm_enabled; s->smm_enabled = smm_enabled;
if (xen_enabled()) { if (xen_enabled()) {
s->use_acpi_pci_hotplug = false; s->use_acpi_pci_hotplug = false;
} }

2
hw/i386/pc_piix.c
View File

@ -287,7 +287,7 @@ static void pc_init1(MachineState *machine)
/* TODO: Populate SPD eeprom data. */ /* TODO: Populate SPD eeprom data. */
smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100, smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100,
gsi[9], smi_irq, gsi[9], smi_irq,
kvm_enabled(), &piix4_pm); !kvm_enabled(), &piix4_pm);
smbus_eeprom_init(smbus, 8, NULL, 0); smbus_eeprom_init(smbus, 8, NULL, 0);
object_property_add_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_PROP, object_property_add_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_PROP,

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

@ -214,7 +214,7 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name);
I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
qemu_irq sci_irq, qemu_irq smi_irq, qemu_irq sci_irq, qemu_irq smi_irq,
int kvm_enabled, DeviceState **piix4_pm); int smm_enabled, DeviceState **piix4_pm);
void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr); void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr);
/* hpet.c */ /* hpet.c */