ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/i386/sev: Replace qemu_map_ram_ptr with address_space_map 

Use address_space_map/unmap and check for errors.

Signed-off-by: Dov Murik <dovmurik@linux.ibm.com>
Acked-by: Brijesh Singh <brijesh.singh@amd.com>
[Two lines wrapped for length - Daniel]
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Dov Murik 2021-11-11 10:00:48 +00:00 committed by Daniel P. Berrangé
parent ddcc0d898e
commit 58603ba268
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
target/i386/sev.c
View File

@ -37,6 +37,7 @@
#include "qapi/qmp/qerror.h" #include "qapi/qmp/qerror.h"
#include "exec/confidential-guest-support.h" #include "exec/confidential-guest-support.h"
#include "hw/i386/pc.h" #include "hw/i386/pc.h"
#include "exec/address-spaces.h"
#define TYPE_SEV_GUEST "sev-guest" #define TYPE_SEV_GUEST "sev-guest"
OBJECT_DECLARE_SIMPLE_TYPE(SevGuestState, SEV_GUEST) OBJECT_DECLARE_SIMPLE_TYPE(SevGuestState, SEV_GUEST)
@ -1232,6 +1233,9 @@ bool sev_add_kernel_loader_hashes(SevKernelLoaderContext *ctx, Error **errp)
uint8_t kernel_hash[HASH_SIZE]; uint8_t kernel_hash[HASH_SIZE];
uint8_t *hashp; uint8_t *hashp;
size_t hash_len = HASH_SIZE; size_t hash_len = HASH_SIZE;
hwaddr mapped_len = sizeof(*padded_ht);
MemTxAttrs attrs = { 0 };
bool ret = true;
/* /*
* Only add the kernel hashes if the sev-guest configuration explicitly * Only add the kernel hashes if the sev-guest configuration explicitly
@ -1292,7 +1296,12 @@ bool sev_add_kernel_loader_hashes(SevKernelLoaderContext *ctx, Error **errp)
* Populate the hashes table in the guest's memory at the OVMF-designated * Populate the hashes table in the guest's memory at the OVMF-designated
* area for the SEV hashes table * area for the SEV hashes table
*/ */
padded_ht = qemu_map_ram_ptr(NULL, area->base); padded_ht = address_space_map(&address_space_memory, area->base,
&mapped_len, true, attrs);
if (!padded_ht || mapped_len != sizeof(*padded_ht)) {
error_setg(errp, "SEV: cannot map hashes table guest memory area");
return false;
}
ht = &padded_ht->ht; ht = &padded_ht->ht;
ht->guid = sev_hash_table_header_guid; ht->guid = sev_hash_table_header_guid;
@ -1314,10 +1323,13 @@ bool sev_add_kernel_loader_hashes(SevKernelLoaderContext *ctx, Error **errp)
memset(padded_ht->padding, 0, sizeof(padded_ht->padding)); memset(padded_ht->padding, 0, sizeof(padded_ht->padding));
if (sev_encrypt_flash((uint8_t *)padded_ht, sizeof(*padded_ht), errp) < 0) { if (sev_encrypt_flash((uint8_t *)padded_ht, sizeof(*padded_ht), errp) < 0) {
return false; ret = false;
} }
return true; address_space_unmap(&address_space_memory, padded_ht,
mapped_len, true, mapped_len);
return ret;
} }
static void static void