Commit 61e66c62 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6410848b

hw/acpi/piix4.c

+5 −5
Original line number Diff line number Diff line
@@ -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;

    }

hw/i386/pc_piix.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

include/hw/i386/pc.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */