[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 18/31] acpi: rename cpu_hotplug_defs.h to acpi_de
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v2 18/31] acpi: rename cpu_hotplug_defs.h to acpi_defs.h |
Date: |
Tue, 20 May 2014 17:15:21 +0200 |
to make it more generic, so it could be used for memory hotplug
as well.
Signed-off-by: Igor Mammedov <address@hidden>
---
hw/i386/acpi-dsdt.dsl | 2 +-
hw/i386/q35-acpi-dsdt.dsl | 2 +-
include/hw/acpi/acpi_defs.h | 33 +++++++++++++++++++++++++++++++++
include/hw/acpi/cpu_hotplug.h | 2 +-
include/hw/acpi/cpu_hotplug_defs.h | 33 ---------------------------------
5 files changed, 36 insertions(+), 36 deletions(-)
create mode 100644 include/hw/acpi/acpi_defs.h
delete mode 100644 include/hw/acpi/cpu_hotplug_defs.h
diff --git a/hw/i386/acpi-dsdt.dsl b/hw/i386/acpi-dsdt.dsl
index 0a1e252..f93353f 100644
--- a/hw/i386/acpi-dsdt.dsl
+++ b/hw/i386/acpi-dsdt.dsl
@@ -306,7 +306,7 @@ DefinitionBlock (
}
}
-#include "hw/acpi/cpu_hotplug_defs.h"
+#include "hw/acpi/acpi_defs.h"
#define CPU_STATUS_BASE PIIX4_CPU_HOTPLUG_IO_BASE
#include "acpi-dsdt-cpu-hotplug.dsl"
diff --git a/hw/i386/q35-acpi-dsdt.dsl b/hw/i386/q35-acpi-dsdt.dsl
index f4d2a2d..3838fc7 100644
--- a/hw/i386/q35-acpi-dsdt.dsl
+++ b/hw/i386/q35-acpi-dsdt.dsl
@@ -402,7 +402,7 @@ DefinitionBlock (
define_gsi_link(GSIH, 0, 0x17)
}
-#include "hw/acpi/cpu_hotplug_defs.h"
+#include "hw/acpi/acpi_defs.h"
#define CPU_STATUS_BASE ICH9_CPU_HOTPLUG_IO_BASE
#include "acpi-dsdt-cpu-hotplug.dsl"
diff --git a/include/hw/acpi/acpi_defs.h b/include/hw/acpi/acpi_defs.h
new file mode 100644
index 0000000..0692b3b
--- /dev/null
+++ b/include/hw/acpi/acpi_defs.h
@@ -0,0 +1,33 @@
+/*
+ * QEMU ACPI hotplug utilities shared defines
+ *
+ * Copyright (C) 2014 Red Hat Inc
+ *
+ * Authors:
+ * Igor Mammedov <address@hidden>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+#ifndef ACPI_DEFS_H
+#define ACPI_DEFS_H
+
+/*
+ * ONLY DEFINEs are permited in this file since it's shared
+ * between C and ASL code.
+ */
+#define ACPI_CPU_HOTPLUG_STATUS 4
+
+/* Limit for CPU arch IDs for CPU hotplug. All hotpluggable CPUs should
+ * have CPUClass.get_arch_id() < ACPI_CPU_HOTPLUG_ID_LIMIT.
+ */
+#define ACPI_CPU_HOTPLUG_ID_LIMIT 256
+
+/* 256 CPU IDs, 8 bits per entry: */
+#define ACPI_GPE_PROC_LEN 32
+
+#define ICH9_CPU_HOTPLUG_IO_BASE 0x0CD8
+#define PIIX4_CPU_HOTPLUG_IO_BASE 0xaf00
+#define ACPI_CPU_HOTPLUG_BASE_PROP "cpu-hotplug-io-base"
+
+#endif
diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h
index 4576400..1562ce8 100644
--- a/include/hw/acpi/cpu_hotplug.h
+++ b/include/hw/acpi/cpu_hotplug.h
@@ -13,7 +13,7 @@
#define ACPI_HOTPLUG_H
#include "hw/acpi/acpi.h"
-#include "hw/acpi/cpu_hotplug_defs.h"
+#include "hw/acpi/acpi_defs.h"
typedef struct AcpiCpuHotplug {
MemoryRegion io;
diff --git a/include/hw/acpi/cpu_hotplug_defs.h
b/include/hw/acpi/cpu_hotplug_defs.h
deleted file mode 100644
index ce41e4c..0000000
--- a/include/hw/acpi/cpu_hotplug_defs.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * QEMU ACPI hotplug utilities shared defines
- *
- * Copyright (C) 2013 Red Hat Inc
- *
- * Authors:
- * Igor Mammedov <address@hidden>
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- */
-#ifndef ACPI_HOTPLUG_DEFS_H
-#define ACPI_HOTPLUG_DEFS_H
-
-/*
- * ONLY DEFINEs are permited in this file since it's shared
- * between C and ASL code.
- */
-#define ACPI_CPU_HOTPLUG_STATUS 4
-
-/* Limit for CPU arch IDs for CPU hotplug. All hotpluggable CPUs should
- * have CPUClass.get_arch_id() < ACPI_CPU_HOTPLUG_ID_LIMIT.
- */
-#define ACPI_CPU_HOTPLUG_ID_LIMIT 256
-
-/* 256 CPU IDs, 8 bits per entry: */
-#define ACPI_GPE_PROC_LEN 32
-
-#define ICH9_CPU_HOTPLUG_IO_BASE 0x0CD8
-#define PIIX4_CPU_HOTPLUG_IO_BASE 0xaf00
-#define ACPI_CPU_HOTPLUG_BASE_PROP "cpu-hotplug-io-base"
-
-#endif
--
1.7.1
- [Qemu-devel] [PATCH v2 07/31] qdev: hotplug for buss-less devices, (continued)
- [Qemu-devel] [PATCH v2 07/31] qdev: hotplug for buss-less devices, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 08/31] qdev: expose DeviceState.hotplugged field as a property, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 09/31] dimm: implement dimm device abstraction, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 10/31] memory: add memory_region_is_mapped() API, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 11/31] dimm: do not allow to set already used memdev, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 13/31] pc: exit QEMU if number of slots more than supported 256, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 14/31] pc: add 'etc/reserved-memory-end' fw_cfg interface for SeaBIOS, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 15/31] pc: add memory hotplug handler to PC_MACHINE, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 16/31] dimm: add busy address check and address auto-allocation, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 17/31] dimm: add busy slot check and slot auto-allocation, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 18/31] acpi: rename cpu_hotplug_defs.h to acpi_defs.h,
Igor Mammedov <=
- [Qemu-devel] [PATCH v2 19/31] acpi: memory hotplug ACPI hardware implementation, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 21/31] trace: pc: add DIMM slot & address allocation, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 24/31] pc: ich9 lpc: make it work with global/compat properties, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 29/31] pc: ACPI BIOS: implement memory hotplug interface, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 31/31] pc: ACPI BIOS: make GPE.3 handle memory hotplug event on PIIX and Q35 machines, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 20/31] trace: add acpi memory hotplug IO region events, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 12/31] pc: initialize memory hotplug address space, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 30/31] pc: ACPI BIOS: reserve SRAT entry for hotplug mem hole, Igor Mammedov, 2014/05/20