dddaf7aa9e
- vdpa-dev: Fix initialisation order to restore VDUSE compatibility - tcg: Allow top bit of SIMD_DATA_BITS to be set in simd_desc() - migration: fix-possible-int-overflow - target/m68k: Map FPU exceptions to FPSR register - qemu-options: Fix CXL Fixed Memory Window interleave-granularity typo - hvf: arm: Fix encodings for ID_AA64PFR1_EL1 and debug System registers - hw/intc/arm_gic: Fix handling of NS view of GICC_APR<n> - qio: Inherit follow_coroutine_ctx across TLS - target/riscv: Fix the element agnostic function problem - accel/tcg: Fix typo causing tb->page_addr[1] to not be recorded - tcg/loongarch64: Fix tcg_out_movi vs some pcrel pointers - migration: Fix file migration with fdset - ui/vnc: don't return an empty SASL mechlist to the client - target/arm: Fix FJCVTZS vs flush-to-zero - hw/ppc/e500: Prefer QOM cast - sphinx/qapidoc: Fix to generate doc for explicit, unboxed arguments - hw/ppc/e500: Remove unused "irqs" parameter - hw/ppc/e500: Add missing device tree properties to i2c controller node - hw/i386/amd_iommu: Don't leak memory in amdvi_update_iotlb() - hw/arm/mps2-tz.c: fix RX/TX interrupts order - target/i386: csv: Add support to migrate the incoming context for CSV3 guest - target/i386: csv: Add support to migrate the outgoing context for CSV3 guest - target/i386: csv: Add support to migrate the incoming page for CSV3 guest - target/i386: csv: Add support to migrate the outgoing page for CSV3 guest - linux-headers: update kernel headers to include CSV3 migration cmds - vfio: Only map shared region for CSV3 virtual machine - vga: Force full update for CSV3 guest - target/i386: csv: Load initial image to private memory for CSV3 guest - target/i386: csv: Do not register/unregister guest secure memory for CSV3 guest - target/i386: cpu: Populate CPUID 0x8000_001F when CSV3 is active - target/i386: csv: Add command to load vmcb to CSV3 guest memory - target/i386: csv: Add command to load data to CSV3 guest memory - target/i386: csv: Add command to initialize CSV3 context - target/i386: csv: Add CSV3 context - next-kbd: convert to use qemu_input_handler_register() - qemu/bswap: Undefine CPU_CONVERT() once done - exec/memop: Remove unused memop_big_endian() helper - hw/nvme: fix handling of over-committed queues - 9pfs: fix crash on 'Treaddir' request - hw/misc/psp: Pin the hugepage memory specified by mem2 during use for psp - hw/misc: support tkm use mem2 memory - hw/i386: add mem2 option for qemu - kvm: add support for guest physical bits - target/i386: add guest-phys-bits cpu property Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit f45f35e88509a4ffa9f62332ee9601e9fe1f8d09)
53 lines
1.5 KiB
Diff
53 lines
1.5 KiB
Diff
From ed3c233cc00d4c30718fc64b3afc48a51b4eb438 Mon Sep 17 00:00:00 2001
|
|
From: jiangxin <jiangxin@hygon.cn>
|
|
Date: Wed, 25 Aug 2021 14:29:40 +0800
|
|
Subject: [PATCH] target/i386: csv: Load initial image to private memory for
|
|
CSV3 guest
|
|
|
|
The initial image of CSV3 guest should be loaded into private memory
|
|
before boot the guest.
|
|
|
|
Add APIs to implement the image load.
|
|
|
|
Signed-off-by: Xin Jiang <jiangxin@hygon.cn>
|
|
Signed-off-by: hanliyang <hanliyang@hygon.cn>
|
|
---
|
|
hw/i386/pc_sysfw.c | 14 +++++++++++++-
|
|
1 file changed, 13 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
|
|
index c8d9e71b88..2bbcbb8d35 100644
|
|
--- a/hw/i386/pc_sysfw.c
|
|
+++ b/hw/i386/pc_sysfw.c
|
|
@@ -37,6 +37,7 @@
|
|
#include "hw/block/flash.h"
|
|
#include "sysemu/kvm.h"
|
|
#include "sev.h"
|
|
+#include "csv.h"
|
|
|
|
#define FLASH_SECTOR_SIZE 4096
|
|
|
|
@@ -263,7 +264,18 @@ void x86_firmware_configure(void *ptr, int size)
|
|
error_report("failed to locate and/or save reset vector");
|
|
exit(1);
|
|
}
|
|
+ if (csv3_enabled()) {
|
|
+ ram_addr_t offset = 0;
|
|
+ MemoryRegion *mr;
|
|
|
|
- sev_encrypt_flash(ptr, size, &error_fatal);
|
|
+ mr = memory_region_from_host(ptr, &offset);
|
|
+ if (!mr) {
|
|
+ error_report("failed to get memory region of flash");
|
|
+ exit(1);
|
|
+ }
|
|
+ csv3_load_data(mr->addr + offset, ptr, size, &error_fatal);
|
|
+ } else {
|
|
+ sev_encrypt_flash(ptr, size, &error_fatal);
|
|
+ }
|
|
}
|
|
}
|
|
--
|
|
2.41.0.windows.1
|
|
|