Commit c9c08545 authored by Igor Mammedov's avatar Igor Mammedov Committed by Michael S. Tsirkin
Browse files

memhp: move memory hotplug only defines to memory_hotplug.c 



Move defines used locally only by memory_hotplug.c into it
from header files.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
parent d1957dac

hw/acpi/memory_hotplug.c

+24 −0
Original line number Diff line number Diff line
@@ -7,6 +7,30 @@ 
#include "trace.h"

#include "qapi-event.h"



#define MEMORY_SLOTS_NUMBER          "MDNR"

#define MEMORY_HOTPLUG_IO_REGION     "HPMR"

#define MEMORY_SLOT_ADDR_LOW         "MRBL"

#define MEMORY_SLOT_ADDR_HIGH        "MRBH"

#define MEMORY_SLOT_SIZE_LOW         "MRLL"

#define MEMORY_SLOT_SIZE_HIGH        "MRLH"

#define MEMORY_SLOT_PROXIMITY        "MPX"

#define MEMORY_SLOT_ENABLED          "MES"

#define MEMORY_SLOT_INSERT_EVENT     "MINS"

#define MEMORY_SLOT_REMOVE_EVENT     "MRMV"

#define MEMORY_SLOT_EJECT            "MEJ"

#define MEMORY_SLOT_SLECTOR          "MSEL"

#define MEMORY_SLOT_OST_EVENT        "MOEV"

#define MEMORY_SLOT_OST_STATUS       "MOSC"

#define MEMORY_SLOT_LOCK             "MLCK"

#define MEMORY_SLOT_STATUS_METHOD    "MRST"

#define MEMORY_SLOT_CRS_METHOD       "MCRS"

#define MEMORY_SLOT_OST_METHOD       "MOST"

#define MEMORY_SLOT_PROXIMITY_METHOD "MPXM"

#define MEMORY_SLOT_EJECT_METHOD     "MEJ0"

#define MEMORY_SLOT_NOTIFY_METHOD    "MTFY"

#define MEMORY_SLOT_SCAN_METHOD      "MSCN"

#define MEMORY_HOTPLUG_DEVICE        "MHPD"



static ACPIOSTInfo *acpi_memory_device_status(int slot, MemStatus *mdev)

{

    ACPIOSTInfo *info = g_new0(ACPIOSTInfo, 1);

include/hw/acpi/memory_hotplug.h

+0 −3
Original line number Diff line number Diff line
@@ -47,9 +47,6 @@ extern const VMStateDescription vmstate_memory_hotplug; 


void acpi_memory_ospm_status(MemHotplugState *mem_st, ACPIOSTInfoList ***list);



#define MEMORY_HOTPLUG_DEVICE        "MHPD"

#define MEMORY_SLOT_SCAN_METHOD      "MSCN"



void build_memory_hotplug_aml(Aml *table, uint32_t nr_mem,

                              uint16_t io_base, uint16_t io_len,

                              const char *res_root,

include/hw/acpi/pc-hotplug.h

+0 −22
Original line number Diff line number Diff line
@@ -32,26 +32,4 @@ 
#define ACPI_MEMORY_HOTPLUG_IO_LEN 24

#define ACPI_MEMORY_HOTPLUG_BASE 0x0a00



#define MEMORY_SLOTS_NUMBER          "MDNR"

#define MEMORY_HOTPLUG_IO_REGION     "HPMR"

#define MEMORY_SLOT_ADDR_LOW         "MRBL"

#define MEMORY_SLOT_ADDR_HIGH        "MRBH"

#define MEMORY_SLOT_SIZE_LOW         "MRLL"

#define MEMORY_SLOT_SIZE_HIGH        "MRLH"

#define MEMORY_SLOT_PROXIMITY        "MPX"

#define MEMORY_SLOT_ENABLED          "MES"

#define MEMORY_SLOT_INSERT_EVENT     "MINS"

#define MEMORY_SLOT_REMOVE_EVENT     "MRMV"

#define MEMORY_SLOT_EJECT            "MEJ"

#define MEMORY_SLOT_SLECTOR          "MSEL"

#define MEMORY_SLOT_OST_EVENT        "MOEV"

#define MEMORY_SLOT_OST_STATUS       "MOSC"

#define MEMORY_SLOT_LOCK             "MLCK"

#define MEMORY_SLOT_STATUS_METHOD    "MRST"

#define MEMORY_SLOT_CRS_METHOD       "MCRS"

#define MEMORY_SLOT_OST_METHOD       "MOST"

#define MEMORY_SLOT_PROXIMITY_METHOD "MPXM"

#define MEMORY_SLOT_EJECT_METHOD     "MEJ0"

#define MEMORY_SLOT_NOTIFY_METHOD    "MTFY"



#endif