[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 20/34] acpi: rename cpu_hotplug_defs.h to pc-hotp
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v3 20/34] acpi: rename cpu_hotplug_defs.h to pc-hotplug.h |
Date: |
Tue, 27 May 2014 15:01:17 +0200 |
to make it more generic, so it could be used for memory hotplug
as well.
Signed-off-by: Igor Mammedov <address@hidden>
---
v2:
- s/acpi_defs.h/pc-hotplug.h/, requested by mst
---
hw/i386/acpi-dsdt.dsl | 2 +-
hw/i386/q35-acpi-dsdt.dsl | 2 +-
include/hw/acpi/cpu_hotplug.h | 2 +-
include/hw/acpi/cpu_hotplug_defs.h | 33 ---------------------------------
include/hw/acpi/pc-hotplug.h | 33 +++++++++++++++++++++++++++++++++
5 files changed, 36 insertions(+), 36 deletions(-)
delete mode 100644 include/hw/acpi/cpu_hotplug_defs.h
create mode 100644 include/hw/acpi/pc-hotplug.h
diff --git a/hw/i386/acpi-dsdt.dsl b/hw/i386/acpi-dsdt.dsl
index 0a1e252..8ae933b 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/pc-hotplug.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..fddc3b2 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/pc-hotplug.h"
#define CPU_STATUS_BASE ICH9_CPU_HOTPLUG_IO_BASE
#include "acpi-dsdt-cpu-hotplug.dsl"
diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h
index 4576400..9e5d30c 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/pc-hotplug.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
diff --git a/include/hw/acpi/pc-hotplug.h b/include/hw/acpi/pc-hotplug.h
new file mode 100644
index 0000000..89bf922
--- /dev/null
+++ b/include/hw/acpi/pc-hotplug.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 PC_HOTPLUG_H
+#define PC_HOTPLUG_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 v3 25/34] acpi:piix4: add memory hotplug handling, (continued)
- [Qemu-devel] [PATCH v3 25/34] acpi:piix4: add memory hotplug handling, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 28/34] pc: migrate piix4 & ich9 MemHotplugState, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 30/34] pc: propagate memory hotplug event to ACPI device, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 31/34] pc: ACPI BIOS: implement memory hotplug interface, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 32/34] pc: add "hotplug-memory-region-size" property to PC_MACHINE, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 29/34] pc: add acpi-device link to PCMachineState, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 33/34] pc: ACPI BIOS: reserve SRAT entry for hotplug mem hole, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 16/34] pc: exit QEMU if compat machine doesn't support memory hotlpug, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 12/34] dimm: do not allow to set already used memdev, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 19/34] dimm: add busy slot check and slot auto-allocation, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 20/34] acpi: rename cpu_hotplug_defs.h to pc-hotplug.h,
Igor Mammedov <=
- [Qemu-devel] [PATCH v3 27/34] acpi:ich9: add memory hotplug handling, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 26/34] pc: ich9 lpc: make it work with global/compat properties, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 15/34] pc: add 'etc/reserved-memory-end' fw_cfg interface for SeaBIOS, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 34/34] pc: ACPI BIOS: make GPE.3 handle memory hotplug event on PIIX and Q35 machines, Igor Mammedov, 2014/05/27
- Re: [Qemu-devel] [PATCH v3 00/34] pc: ACPI memory hotplug, Peter Crosthwaite, 2014/05/29