Re: [Qemu-devel] [PATCH 08/33] pc: acpi: mark current CPU hotplug functions as legacy

2016-05-30 Thread Marcel Apfelbaum 

On 05/17/2016 05:43 PM, Igor Mammedov wrote:

Signed-off-by: Igor Mammedov 
---
  hw/acpi/cpu_hotplug.c|  8 
  hw/acpi/cpu_hotplug_acpi_table.c |  4 ++--
  hw/acpi/ich9.c   |  7 ---
  hw/acpi/piix4.c  |  6 +++---
  hw/i386/acpi-build.c |  3 ++-
  include/hw/acpi/cpu_hotplug.h| 12 ++--
  6 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c
index 4d86743..ba9d903 100644
--- a/hw/acpi/cpu_hotplug.c
+++ b/hw/acpi/cpu_hotplug.c
@@ -54,8 +54,8 @@ static void acpi_set_cpu_present_bit(AcpiCpuHotplug *g, 
CPUState *cpu,
  g->sts[cpu_id / 8] |= (1 << (cpu_id % 8));
  }

-void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq,
-  AcpiCpuHotplug *g, DeviceState *dev, Error **errp)
+void legacy_acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq,
+ AcpiCpuHotplug *g, DeviceState *dev, Error **errp)
  {
  acpi_set_cpu_present_bit(g, CPU(dev), errp);
  if (*errp != NULL) {
@@ -65,8 +65,8 @@ void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq,
  acpi_send_gpe_event(ar, irq, ACPI_CPU_HOTPLUG_STATUS);
  }

-void acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner,
-   AcpiCpuHotplug *gpe_cpu, uint16_t base)
+void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner,
+  AcpiCpuHotplug *gpe_cpu, uint16_t base)
  {
  CPUState *cpu;

diff --git a/hw/acpi/cpu_hotplug_acpi_table.c b/hw/acpi/cpu_hotplug_acpi_table.c
index 9fdde6d..fc79c54 100644
--- a/hw/acpi/cpu_hotplug_acpi_table.c
+++ b/hw/acpi/cpu_hotplug_acpi_table.c
@@ -24,8 +24,8 @@
  #define CPU_STATUS_MAP "PRS"
  #define CPU_SCAN_METHOD "PRSC"

-void build_cpu_hotplug_aml(Aml *ctx, MachineState *machine,
-   uint16_t io_base, uint16_t io_len)
+void build_legacy_cpu_hotplug_aml(Aml *ctx, MachineState *machine,
+  uint16_t io_base, uint16_t io_len)
  {
  Aml *dev;
  Aml *crs;
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 27e978f..af340d0 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -273,8 +273,8 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
  pm->powerdown_notifier.notify = pm_powerdown_req;
  qemu_register_powerdown_notifier(>powerdown_notifier);

-acpi_cpu_hotplug_init(pci_address_space_io(lpc_pci), OBJECT(lpc_pci),
-  >gpe_cpu, ICH9_CPU_HOTPLUG_IO_BASE);
+legacy_acpi_cpu_hotplug_init(pci_address_space_io(lpc_pci),
+OBJECT(lpc_pci), >gpe_cpu, ICH9_CPU_HOTPLUG_IO_BASE);

  if (pm->acpi_memory_hotplug.is_enabled) {
  acpi_memory_hotplug_init(pci_address_space_io(lpc_pci), 
OBJECT(lpc_pci),
@@ -437,7 +437,8 @@ void ich9_pm_device_plug_cb(ICH9LPCPMRegs *pm, DeviceState 
*dev, Error **errp)
  acpi_memory_plug_cb(>acpi_regs, pm->irq, >acpi_memory_hotplug,
  dev, errp);
  } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
-acpi_cpu_plug_cb(>acpi_regs, pm->irq, >gpe_cpu, dev, errp);
+legacy_acpi_cpu_plug_cb(>acpi_regs, pm->irq,
+>gpe_cpu, dev, errp);
  } else {
  error_setg(errp, "acpi: device plug request for not supported device"
 " type: %s", object_get_typename(OBJECT(dev)));
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 16abdf1..3e8d80b 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -352,7 +352,7 @@ static void piix4_device_plug_cb(HotplugHandler 
*hotplug_dev,
  acpi_pcihp_device_plug_cb(>ar, s->irq, >acpi_pci_hotplug, dev,
errp);
  } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
-acpi_cpu_plug_cb(>ar, s->irq, >gpe_cpu, dev, errp);
+legacy_acpi_cpu_plug_cb(>ar, s->irq, >gpe_cpu, dev, errp);
  } else {
  error_setg(errp, "acpi: device plug request for not supported device"
 " type: %s", object_get_typename(OBJECT(dev)));
@@ -570,8 +570,8 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion 
*parent,
  acpi_pcihp_init(OBJECT(s), >acpi_pci_hotplug, bus, parent,
  s->use_acpi_pci_hotplug);

-acpi_cpu_hotplug_init(parent, OBJECT(s), >gpe_cpu,
-  PIIX4_CPU_HOTPLUG_IO_BASE);
+legacy_acpi_cpu_hotplug_init(parent, OBJECT(s), >gpe_cpu,
+ PIIX4_CPU_HOTPLUG_IO_BASE);

  if (s->acpi_memory_hotplug.is_enabled) {
  acpi_memory_hotplug_init(parent, OBJECT(s), >acpi_memory_hotplug);
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 63e2723..2f6de43 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1935,7 +1935,8 @@ build_dsdt(GArray *table_data, GArray *linker,
  build_q35_pci0_int(dsdt);
  }

-build_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base, 
pm->cpu_hp_io_len);
+

[Qemu-devel] [PATCH 08/33] pc: acpi: mark current CPU hotplug functions as legacy

2016-05-17 Thread Igor Mammedov 
Signed-off-by: Igor Mammedov 
---
 hw/acpi/cpu_hotplug.c|  8 
 hw/acpi/cpu_hotplug_acpi_table.c |  4 ++--
 hw/acpi/ich9.c   |  7 ---
 hw/acpi/piix4.c  |  6 +++---
 hw/i386/acpi-build.c |  3 ++-
 include/hw/acpi/cpu_hotplug.h| 12 ++--
 6 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c
index 4d86743..ba9d903 100644
--- a/hw/acpi/cpu_hotplug.c
+++ b/hw/acpi/cpu_hotplug.c
@@ -54,8 +54,8 @@ static void acpi_set_cpu_present_bit(AcpiCpuHotplug *g, 
CPUState *cpu,
 g->sts[cpu_id / 8] |= (1 << (cpu_id % 8));
 }
 
-void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq,
-  AcpiCpuHotplug *g, DeviceState *dev, Error **errp)
+void legacy_acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq,
+ AcpiCpuHotplug *g, DeviceState *dev, Error **errp)
 {
 acpi_set_cpu_present_bit(g, CPU(dev), errp);
 if (*errp != NULL) {
@@ -65,8 +65,8 @@ void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq,
 acpi_send_gpe_event(ar, irq, ACPI_CPU_HOTPLUG_STATUS);
 }
 
-void acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner,
-   AcpiCpuHotplug *gpe_cpu, uint16_t base)
+void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner,
+  AcpiCpuHotplug *gpe_cpu, uint16_t base)
 {
 CPUState *cpu;
 
diff --git a/hw/acpi/cpu_hotplug_acpi_table.c b/hw/acpi/cpu_hotplug_acpi_table.c
index 9fdde6d..fc79c54 100644
--- a/hw/acpi/cpu_hotplug_acpi_table.c
+++ b/hw/acpi/cpu_hotplug_acpi_table.c
@@ -24,8 +24,8 @@
 #define CPU_STATUS_MAP "PRS"
 #define CPU_SCAN_METHOD "PRSC"
 
-void build_cpu_hotplug_aml(Aml *ctx, MachineState *machine,
-   uint16_t io_base, uint16_t io_len)
+void build_legacy_cpu_hotplug_aml(Aml *ctx, MachineState *machine,
+  uint16_t io_base, uint16_t io_len)
 {
 Aml *dev;
 Aml *crs;
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 27e978f..af340d0 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -273,8 +273,8 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
 pm->powerdown_notifier.notify = pm_powerdown_req;
 qemu_register_powerdown_notifier(>powerdown_notifier);
 
-acpi_cpu_hotplug_init(pci_address_space_io(lpc_pci), OBJECT(lpc_pci),
-  >gpe_cpu, ICH9_CPU_HOTPLUG_IO_BASE);
+legacy_acpi_cpu_hotplug_init(pci_address_space_io(lpc_pci),
+OBJECT(lpc_pci), >gpe_cpu, ICH9_CPU_HOTPLUG_IO_BASE);
 
 if (pm->acpi_memory_hotplug.is_enabled) {
 acpi_memory_hotplug_init(pci_address_space_io(lpc_pci), 
OBJECT(lpc_pci),
@@ -437,7 +437,8 @@ void ich9_pm_device_plug_cb(ICH9LPCPMRegs *pm, DeviceState 
*dev, Error **errp)
 acpi_memory_plug_cb(>acpi_regs, pm->irq, >acpi_memory_hotplug,
 dev, errp);
 } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
-acpi_cpu_plug_cb(>acpi_regs, pm->irq, >gpe_cpu, dev, errp);
+legacy_acpi_cpu_plug_cb(>acpi_regs, pm->irq,
+>gpe_cpu, dev, errp);
 } else {
 error_setg(errp, "acpi: device plug request for not supported device"
" type: %s", object_get_typename(OBJECT(dev)));
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 16abdf1..3e8d80b 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -352,7 +352,7 @@ static void piix4_device_plug_cb(HotplugHandler 
*hotplug_dev,
 acpi_pcihp_device_plug_cb(>ar, s->irq, >acpi_pci_hotplug, dev,
   errp);
 } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
-acpi_cpu_plug_cb(>ar, s->irq, >gpe_cpu, dev, errp);
+legacy_acpi_cpu_plug_cb(>ar, s->irq, >gpe_cpu, dev, errp);
 } else {
 error_setg(errp, "acpi: device plug request for not supported device"
" type: %s", object_get_typename(OBJECT(dev)));
@@ -570,8 +570,8 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion 
*parent,
 acpi_pcihp_init(OBJECT(s), >acpi_pci_hotplug, bus, parent,
 s->use_acpi_pci_hotplug);
 
-acpi_cpu_hotplug_init(parent, OBJECT(s), >gpe_cpu,
-  PIIX4_CPU_HOTPLUG_IO_BASE);
+legacy_acpi_cpu_hotplug_init(parent, OBJECT(s), >gpe_cpu,
+ PIIX4_CPU_HOTPLUG_IO_BASE);
 
 if (s->acpi_memory_hotplug.is_enabled) {
 acpi_memory_hotplug_init(parent, OBJECT(s), >acpi_memory_hotplug);
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 63e2723..2f6de43 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1935,7 +1935,8 @@ build_dsdt(GArray *table_data, GArray *linker,
 build_q35_pci0_int(dsdt);
 }
 
-build_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base, 
pm->cpu_hp_io_len);
+build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base,
+