Skip to content

Commit 843f772

Browse files
fyin1lijinxia
fyin1
authored and
lijinxia
committed
hv: Change the struct cpu_gp_regs name to acrn_gp_regs
We will define the hypercall to set acrn vcpu registers and move this struct to acrn_commmon.h for reference from hypercall parameter definition. Tracked-On: #1231 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
1 parent b207f1b commit 843f772

File tree

7 files changed

+22
-22
lines changed

7 files changed

+22
-22
lines changed

‎hypervisor/arch/x86/static_checks.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,21 @@ CTASSERT(BOOT_CTX_CS_AR_OFFSET == offsetof(struct boot_ctx, cs_ar));
3030
CTASSERT(BOOT_CTX_EFER_LOW_OFFSET == offsetof(struct boot_ctx, ia32_efer));
3131
CTASSERT(BOOT_CTX_EFER_HIGH_OFFSET == offsetof(struct boot_ctx, ia32_efer) + 4);
3232

33-
CTASSERT(CPU_CONTEXT_OFFSET_RAX == offsetof(struct cpu_gp_regs, rax));
34-
CTASSERT(CPU_CONTEXT_OFFSET_RBX == offsetof(struct cpu_gp_regs, rbx));
35-
CTASSERT(CPU_CONTEXT_OFFSET_RCX == offsetof(struct cpu_gp_regs, rcx));
36-
CTASSERT(CPU_CONTEXT_OFFSET_RDX == offsetof(struct cpu_gp_regs, rdx));
37-
CTASSERT(CPU_CONTEXT_OFFSET_RBP == offsetof(struct cpu_gp_regs, rbp));
38-
CTASSERT(CPU_CONTEXT_OFFSET_RSI == offsetof(struct cpu_gp_regs, rsi));
39-
CTASSERT(CPU_CONTEXT_OFFSET_RDI == offsetof(struct cpu_gp_regs, rdi));
40-
CTASSERT(CPU_CONTEXT_OFFSET_R8 == offsetof(struct cpu_gp_regs, r8));
41-
CTASSERT(CPU_CONTEXT_OFFSET_R9 == offsetof(struct cpu_gp_regs, r9));
42-
CTASSERT(CPU_CONTEXT_OFFSET_R10 == offsetof(struct cpu_gp_regs, r10));
43-
CTASSERT(CPU_CONTEXT_OFFSET_R11 == offsetof(struct cpu_gp_regs, r11));
44-
CTASSERT(CPU_CONTEXT_OFFSET_R12 == offsetof(struct cpu_gp_regs, r12));
45-
CTASSERT(CPU_CONTEXT_OFFSET_R13 == offsetof(struct cpu_gp_regs, r13));
46-
CTASSERT(CPU_CONTEXT_OFFSET_R14 == offsetof(struct cpu_gp_regs, r14));
47-
CTASSERT(CPU_CONTEXT_OFFSET_R15 == offsetof(struct cpu_gp_regs, r15));
33+
CTASSERT(CPU_CONTEXT_OFFSET_RAX == offsetof(struct acrn_gp_regs, rax));
34+
CTASSERT(CPU_CONTEXT_OFFSET_RBX == offsetof(struct acrn_gp_regs, rbx));
35+
CTASSERT(CPU_CONTEXT_OFFSET_RCX == offsetof(struct acrn_gp_regs, rcx));
36+
CTASSERT(CPU_CONTEXT_OFFSET_RDX == offsetof(struct acrn_gp_regs, rdx));
37+
CTASSERT(CPU_CONTEXT_OFFSET_RBP == offsetof(struct acrn_gp_regs, rbp));
38+
CTASSERT(CPU_CONTEXT_OFFSET_RSI == offsetof(struct acrn_gp_regs, rsi));
39+
CTASSERT(CPU_CONTEXT_OFFSET_RDI == offsetof(struct acrn_gp_regs, rdi));
40+
CTASSERT(CPU_CONTEXT_OFFSET_R8 == offsetof(struct acrn_gp_regs, r8));
41+
CTASSERT(CPU_CONTEXT_OFFSET_R9 == offsetof(struct acrn_gp_regs, r9));
42+
CTASSERT(CPU_CONTEXT_OFFSET_R10 == offsetof(struct acrn_gp_regs, r10));
43+
CTASSERT(CPU_CONTEXT_OFFSET_R11 == offsetof(struct acrn_gp_regs, r11));
44+
CTASSERT(CPU_CONTEXT_OFFSET_R12 == offsetof(struct acrn_gp_regs, r12));
45+
CTASSERT(CPU_CONTEXT_OFFSET_R13 == offsetof(struct acrn_gp_regs, r13));
46+
CTASSERT(CPU_CONTEXT_OFFSET_R14 == offsetof(struct acrn_gp_regs, r14));
47+
CTASSERT(CPU_CONTEXT_OFFSET_R15 == offsetof(struct acrn_gp_regs, r15));
4848
CTASSERT(CPU_CONTEXT_OFFSET_CR2 == offsetof(struct run_context, cr2));
4949
CTASSERT(CPU_CONTEXT_OFFSET_IA32_SPEC_CTRL
5050
== offsetof(struct run_context, ia32_spec_ctrl));

‎hypervisor/bsp/uefi/uefi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ int uefi_sw_loader(struct vm *vm, struct vcpu *vcpu)
5252
vlapic_restore(vcpu_vlapic(vcpu), &uefi_lapic_regs);
5353

5454
vcpu->entry_addr = (void *)efi_ctx->rip;
55-
memcpy_s(&cur_context->guest_cpu_regs, sizeof(struct cpu_gp_regs),
56-
&efi_ctx->gprs, sizeof(struct cpu_gp_regs));
55+
memcpy_s(&cur_context->guest_cpu_regs, sizeof(struct acrn_gp_regs),
56+
&efi_ctx->gprs, sizeof(struct acrn_gp_regs));
5757

5858
/* defer irq enabling till vlapic is ready */
5959
CPU_IRQ_ENABLE();

‎hypervisor/include/arch/x86/cpu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
*/
168168
enum cpu_reg_name {
169169
/* General purpose register layout should align with
170-
* struct cpu_gp_regs
170+
* struct acrn_gp_regs
171171
*/
172172
CPU_REG_RAX,
173173
CPU_REG_RCX,

‎hypervisor/include/arch/x86/guest/gpr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/* General-purpose register layout aligned with the general-purpose register idx
1111
* when vmexit, such as vmexit due to CR access, refer to SMD Vol.3C 27-6.
1212
*/
13-
struct cpu_gp_regs {
13+
struct acrn_gp_regs {
1414
uint64_t rax;
1515
uint64_t rcx;
1616
uint64_t rdx;

‎hypervisor/include/arch/x86/guest/vcpu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ struct run_context {
7777
* in vmx_asm.S match
7878
*/
7979
union {
80-
struct cpu_gp_regs regs;
80+
struct acrn_gp_regs regs;
8181
uint64_t longs[NUM_GPRS];
8282
} guest_cpu_regs;
8383

‎hypervisor/include/arch/x86/guest/vm0_boot.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ struct boot_ctx {
6969
uint32_t cs_ar;
7070
uint64_t ia32_efer;
7171
#ifdef CONFIG_EFI_STUB
72-
struct cpu_gp_regs gprs;
72+
struct acrn_gp_regs gprs;
7373
uint64_t rip;
7474
uint64_t rflags;
7575
void *rsdp;

‎hypervisor/include/arch/x86/irq.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
* Definition of the stack frame layout
4545
*/
4646
struct intr_excp_ctx {
47-
struct cpu_gp_regs gp_regs;
47+
struct acrn_gp_regs gp_regs;
4848
uint64_t vector;
4949
uint64_t error_code;
5050
uint64_t rip;

0 commit comments

Comments
 (0)