Merge pull request #7 from rossphilipson/acpi-pm-feature

[acpi] Agent portion of the ACPI PM feature.
OpenXT · Jun 2, 2015 · 3332a75 · 3332a75
2 parents 20860b2 + 86c2c2e
commit 3332a75
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/ioemu-device.c b/src/ioemu-device.c
@@ -261,13 +261,12 @@ static  bool xen_pci_pt_device_parse_options (struct device_model *devmodel,
 
 ioemu_device_init (xen_pci_pt, xen_pci_pt_device_parse_options);
 
-/* OXT-217 this will be re-used as the xen_acpi_pm param
-static  bool xenbattery_device_parse_options (struct device_model *devmodel,
-                                              const char *device)
+static  bool xen_acpi_pm_device_parse_options (struct device_model *devmodel,
+                                               const char *device)
 {
     (void) device;
     (void) devmodel;
 
     return true;
 }
-ioemu_device_init (xenbattery, xenbattery_device_parse_options);*/
+ioemu_device_init (xen_acpi_pm, xen_acpi_pm_device_parse_options);
diff --git a/src/qemu-device.c b/src/qemu-device.c
@@ -290,18 +290,17 @@ static  bool xenmou_device_parse_options (struct device_model *devmodel,
 
 qemu_device_init (xenmou, xenmou_device_parse_options);
 
-/* OXT-217 this will be re-used as the xen_acpi_pm param
-static  bool xenbattery_device_parse_options (struct device_model *devmodel,
-                                              const char *device)
+static  bool xen_acpi_pm_device_parse_options (struct device_model *devmodel,
+                                               const char *device)
 {
     (void) device;
 
-    SPAWN_ADD_ARG (devmodel, "-xenbattery");
+    SPAWN_ADD_ARG (devmodel, "-xen-acpi-pm");
 
     return true;
 }
 
-qemu_device_init (xenbattery, xenbattery_device_parse_options);*/
+qemu_device_init (xen_acpi_pm, xen_acpi_pm_device_parse_options);
 
 static  bool xen_pci_pt_device_parse_options (struct device_model *devmodel,
                                               const char *device)