[Title] Apply temporary patch to acpi(PM) for x86_64 host

[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index d9075e6..be3a2a1 100644 (file)
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -379,7 +379,11 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
     PCIDevice *dev;
     PIIX4PMState *s;
 
+#if defined(CONFIG_MARU) && defined(__x86_64__)
+    dev = pci_create(bus, devfn, "MARU_PM");
+#else
     dev = pci_create(bus, devfn, "PIIX4_PM");
+#endif
     qdev_prop_set_uint32(&dev->qdev, "smb_io_base", smb_io_base);
 
     s = DO_UPCAST(PIIX4PMState, dev, dev);
@@ -394,7 +398,11 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
 }
 
 static PCIDeviceInfo piix4_pm_info = {
+#if defined(CONFIG_MARU) && defined(__x86_64__)
+    .qdev.name          = "MARU_PM",
+#else
     .qdev.name          = "PIIX4_PM",
+#endif
     .qdev.desc          = "PM",
     .qdev.size          = sizeof(PIIX4PMState),
     .qdev.vmsd          = &vmstate_acpi,

diff --git a/tizen/src/hw/maru_board.c b/tizen/src/hw/maru_board.c
index 5e68fad..8999fd9 100644 (file)
--- a/tizen/src/hw/maru_board.c
+++ b/tizen/src/hw/maru_board.c
@@ -241,7 +241,11 @@ static void maru_x86_machine_init(MemoryRegion *system_memory,
         }
         smi_irq = qemu_allocate_irqs(pc_acpi_smi_interrupt, first_cpu, 1);
         /* TODO: Populate SPD eeprom data.  */
+#if defined(__x86_64__)
+        smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100,
+#else
         smbus = maru_pm_init(pci_bus, piix3_devfn + 3, 0xb100,
+#endif
                               gsi[9], *cmos_s3, *smi_irq,
                               kvm_enabled());
         smbus_eeprom_init(smbus, 8, NULL, 0);