diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2014-06-02 15:25:15 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-06-19 16:41:49 +0300 |
| commit | 7e629d1d8d09d9e9294def8bcac9c0f283e9b909 (patch) | |
| tree | 469828cb7eaeba935756a7d2515dbdab1c0864ed | |
| parent | 0cd03d89b98154fcc03d9a8eeea70b9c50cb9457 (diff) | |
acpi: rename cpu_hotplug_defs.h to pc-hotplug.h
to make it more generic, so it could be used for memory hotplug
as well.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/i386/acpi-dsdt.dsl | 2 | ||||
| -rw-r--r-- | hw/i386/q35-acpi-dsdt.dsl | 2 | ||||
| -rw-r--r-- | include/hw/acpi/cpu_hotplug.h | 2 | ||||
| -rw-r--r-- | include/hw/acpi/pc-hotplug.h (renamed from include/hw/acpi/cpu_hotplug_defs.h) | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/hw/i386/acpi-dsdt.dsl b/hw/i386/acpi-dsdt.dsl index 0a1e252d21..8ae933bc38 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 f4d2a2daee..fddc3b27ff 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 4576400fd7..9e5d30c9df 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/pc-hotplug.h index 9f33663511..cee479de63 100644 --- a/include/hw/acpi/cpu_hotplug_defs.h +++ b/include/hw/acpi/pc-hotplug.h @@ -1,7 +1,7 @@ /* * QEMU ACPI hotplug utilities shared defines * - * Copyright (C) 2013 Red Hat Inc + * Copyright (C) 2014 Red Hat Inc * * Authors: * Igor Mammedov <imammedo@redhat.com> @@ -9,8 +9,8 @@ * 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 +#ifndef PC_HOTPLUG_H +#define PC_HOTPLUG_H /* * ONLY DEFINEs are permited in this file since it's shared |