Return SPCI_MEM_* rather than SPCI_MSG_SEND for push memory sharing.
Bug: 132420445
Change-Id: I80cb9832f90899eeb57af2cf209f0fa5f2fc1ca9
diff --git a/inc/hf/api.h b/inc/hf/api.h
index dacc889..f8de195 100644
--- a/inc/hf/api.h
+++ b/inc/hf/api.h
@@ -60,7 +60,7 @@
struct spci_value api_spci_features(uint32_t function_id);
struct spci_value api_spci_run(spci_vm_id_t vm_id, spci_vcpu_index_t vcpu_idx,
const struct vcpu *current, struct vcpu **next);
-struct spci_value api_spci_mem_send(uint32_t share_type, ipaddr_t address,
+struct spci_value api_spci_mem_send(uint32_t share_func, ipaddr_t address,
uint32_t page_count,
uint32_t remaining_fragment_count,
uint32_t length, uint32_t handle,
diff --git a/inc/hf/spci_internal.h b/inc/hf/spci_internal.h
index 1fc226f..782b2d2 100644
--- a/inc/hf/spci_internal.h
+++ b/inc/hf/spci_internal.h
@@ -64,4 +64,4 @@
struct spci_value spci_msg_handle_architected_message(
struct vm_locked to_locked, struct vm_locked from_locked,
struct spci_memory_region *memory_region, uint32_t size,
- uint32_t attributes, struct mpool *api_page_pool);
+ uint32_t share_func, struct mpool *api_page_pool);
diff --git a/inc/hf/vm.h b/inc/hf/vm.h
index 9fff714..e421a3d 100644
--- a/inc/hf/vm.h
+++ b/inc/hf/vm.h
@@ -79,8 +79,11 @@
/** The size of the message currently in `recv`. */
uint32_t recv_size;
- /** The attributes of the message currently in `recv`. */
- uint32_t recv_attributes;
+ /**
+ * The SPCI function ID to use to deliver the message currently in
+ * `recv`.
+ */
+ uint32_t recv_func;
/**
* List of wait_entry structs representing VMs that want to be notified
diff --git a/inc/vmapi/hf/spci.h b/inc/vmapi/hf/spci.h
index e42c8d5..a70dcdd 100644
--- a/inc/vmapi/hf/spci.h
+++ b/inc/vmapi/hf/spci.h
@@ -63,11 +63,6 @@
#define SPCI_MSG_SEND_NOTIFY 0x1
#define SPCI_MSG_SEND_NOTIFY_MASK 0x1
-#define SPCI_MSG_SEND_LEGACY_MEMORY_DONATE 0x10
-#define SPCI_MSG_SEND_LEGACY_MEMORY_LEND 0x20
-#define SPCI_MSG_SEND_LEGACY_MEMORY_SHARE 0x30
-#define SPCI_MSG_SEND_LEGACY_MEMORY_RELINQUISH 0x40
-#define SPCI_MSG_SEND_LEGACY_MEMORY_MASK 0x70
#define SPCI_SLEEP_INDEFINITE 0