[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/13] pc_piix: rename kvm_enabled to smm_enabled
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 11/13] pc_piix: rename kvm_enabled to smm_enabled |
Date: |
Mon, 6 Jul 2015 16:22:19 +0200 |
We will enable SMM even if KVM is in use. Rename the field and
arguments.
Acked-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/acpi/piix4.c | 10 +++++-----
hw/i386/pc_piix.c | 2 +-
include/hw/i386/pc.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 3af0fa7..2cd2fee 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -72,7 +72,7 @@ typedef struct PIIX4PMState {
qemu_irq irq;
qemu_irq smi_irq;
- int kvm_enabled;
+ int smm_enabled;
Notifier machine_ready;
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[0x80] = 0;
- if (s->kvm_enabled) {
+ if (!s->smm_enabled) {
/* Mark SMM as already inited (until KVM supports SMM). */
pci_conf[0x5B] = 0x02;
}
@@ -453,7 +453,7 @@ static void piix4_pm_realize(PCIDevice *dev, Error **errp)
/* APM */
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
* support SMM mode. */
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,
qemu_irq sci_irq, qemu_irq smi_irq,
- int kvm_enabled, DeviceState **piix4_pm)
+ int smm_enabled, DeviceState **piix4_pm)
{
DeviceState *dev;
PIIX4PMState *s;
@@ -518,7 +518,7 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t
smb_io_base,
s = PIIX4_PM(dev);
s->irq = sci_irq;
s->smi_irq = smi_irq;
- s->kvm_enabled = kvm_enabled;
+ s->smm_enabled = smm_enabled;
if (xen_enabled()) {
s->use_acpi_pci_hotplug = false;
}
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index e142f75..8d0313e 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -287,7 +287,7 @@ static void pc_init1(MachineState *machine)
/* TODO: Populate SPD eeprom data. */
smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100,
gsi[9], smi_irq,
- kvm_enabled(), &piix4_pm);
+ !kvm_enabled(), &piix4_pm);
smbus_eeprom_init(smbus, 8, NULL, 0);
object_property_add_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_PROP,
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 328c8f7..10783b2 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -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,
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);
/* hpet.c */
--
1.8.3.1
- [Qemu-devel] [PULL 00/13] KVM patches (SMM implementation) for 2015-07-06, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 03/13] target-i386: add support for SMBASE MSR and SMIs, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 04/13] kvm-all: put kvm_mem_flags to more work, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 01/13] linux-headers: Update to 4.2-rc1, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 02/13] piix4/ich9: do not raise SMI on ACPI enable/disable commands, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 05/13] kvm-all: remove useless typedef, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 08/13] kvm-all: add support for multiple address spaces, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 06/13] kvm-all: move internal types to kvm_int.h, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 09/13] kvm-all: kvm_irqchip_create is not expected to fail, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 07/13] kvm-all: make KVM's memory listener more generic, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 11/13] pc_piix: rename kvm_enabled to smm_enabled,
Paolo Bonzini <=
- [Qemu-devel] [PULL 13/13] pc: add SMM property, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 12/13] ich9: add smm_enabled field and arguments, Paolo Bonzini, 2015/07/06
- [Qemu-devel] [PULL 10/13] target-i386: register a separate KVM address space including SMRAM regions, Paolo Bonzini, 2015/07/06