github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-21 08:50:27 +00:00
Code Issues Projects Releases Wiki Activity

HV: treewide: give names to unnamed structs/unions

Browse Source 
According to the syntax defined in C99, each struct/union field must have an
identifier. This patch adds names to the previously unnamed fields for C99
compatibility.

Here is a summary of the names (marked with a pair of *stars*) added.

struct trusty_mem:

    union {
        struct {
            struct key_info key_info;
            struct trusty_startup_param startup_param;
        } *data*;
        uint8_t page[CPU_PAGE_SIZE];
    } first_page;

struct ptdev_remapping_info:

    union {
        struct ptdev_msi_info msi;
        struct ptdev_intx_info intx;
    } *ptdev_intr_info*;

union code_segment_descriptor:

    uint64_t value;
    struct {
        union {
            ...
        } low32;
        union {
            ...
        } high32;
    } *fields*;

    similar changes are made to the following structures.
    * union data_segment_descriptor,
    * union system_segment_descriptor,
    * union tss_64_descriptor, and
    * union idt_64_descriptor

struct trace_entry:

    union {
        struct {
            uint32_t a, b, c, d;
        } *fields_32*;
        struct {
            uint8_t a1, a2, a3, a4;
            uint8_t b1, b2, b3, b4;
            uint8_t c1, c2, c3, c4;
            uint8_t d1, d2, d3, d4;
        } *fields_8*;
        struct {
            uint64_t e;
            uint64_t f;
        } *fields_64*;
        char str[16];
    } *payload*;

Signed-off-by: Junjie Mao <junjie.mao@intel.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
This commit is contained in:
Junjie Mao
2018-05-28 23:22:49 +08:00
committed by lijinxia
parent ef3cb5ba1c
commit 004d2e2696
7 changed files with 129 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hypervisor/include/arch/x86/assign.h
View File

@@ -80,7 +80,7 @@ struct ptdev_remapping_info {
union {
struct ptdev_msi_info msi;
struct ptdev_intx_info intx;
};
} ptdev_intr_info;
};
void ptdev_intx_ack(struct vm *vm, int virt_pin,

8
hypervisor/include/arch/x86/gdt.h
View File

@@ -134,7 +134,7 @@ union code_segment_descriptor {
uint32_t base_31_24:8;
} bits;
} high32;
};
} fields;
} __aligned(8);
/*
@@ -169,7 +169,7 @@ union data_segment_descriptor {
uint32_t base_31_24:8;
} bits;
} high32;
};
} fields;
} __aligned(8);
/*
@@ -201,7 +201,7 @@ union system_segment_descriptor {
uint32_t base_31_24:8;
} bits;
} high32;
};
} fields;
} __aligned(8);
/*
@@ -242,7 +242,7 @@ union tss_64_descriptor {
uint32_t rsvd_31_13:20;
} bits;
} offset_12;
};
} fields;
} __aligned(8);
/*****************************************************************************

2
hypervisor/include/arch/x86/idt.h
View File

@@ -75,7 +75,7 @@ union idt_64_descriptor {
} high32;
uint32_t offset_63_32;
uint32_t rsvd;
};
} fields;
} __aligned(8);
/*****************************************************************************

40
hypervisor/include/debug/trace.h
View File

@@ -81,19 +81,19 @@ struct trace_entry {
union {
struct {
uint32_t a, b, c, d;
};
} fields_32;
struct {
uint8_t a1, a2, a3, a4;
uint8_t b1, b2, b3, b4;
uint8_t c1, c2, c3, c4;
uint8_t d1, d2, d3, d4;
};
} fields_8;
struct {
uint64_t e;
uint64_t f;
};
} fields_64;
char str[16];
};
} payload;
} __attribute__((aligned(8)));
static inline bool
@@ -128,8 +128,8 @@ TRACE_2L(int evid, uint64_t e, uint64_t f)
if (!trace_check(cpu_id, evid))
return;
entry.e = e;
entry.f = f;
entry.payload.fields_64.e = e;
entry.payload.fields_64.f = f;
_trace_put(cpu_id, evid, &entry);
}
@@ -143,10 +143,10 @@ TRACE_4I(int evid, uint32_t a, uint32_t b, uint32_t c,
if (!trace_check(cpu_id, evid))
return;
entry.a = a;
entry.b = b;
entry.c = c;
entry.d = d;
entry.payload.fields_32.a = a;
entry.payload.fields_32.b = b;
entry.payload.fields_32.c = c;
entry.payload.fields_32.d = d;
_trace_put(cpu_id, evid, &entry);
}
@@ -160,12 +160,12 @@ TRACE_6C(int evid, uint8_t a1, uint8_t a2, uint8_t a3,
if (!trace_check(cpu_id, evid))
return;
entry.a1 = a1;
entry.a2 = a2;
entry.a3 = a3;
entry.a4 = a4;
entry.b1 = b1;
entry.b2 = b2;
entry.payload.fields_8.a1 = a1;
entry.payload.fields_8.a2 = a2;
entry.payload.fields_8.a3 = a3;
entry.payload.fields_8.a4 = a4;
entry.payload.fields_8.b1 = b1;
entry.payload.fields_8.b2 = b2;
_trace_put(cpu_id, evid, &entry);
}
@@ -183,15 +183,15 @@ TRACE_16STR(int evid, const char name[])
if (!trace_check(cpu_id, evid))
return;
entry.e = 0;
entry.f = 0;
entry.payload.fields_64.e = 0;
entry.payload.fields_64.f = 0;
len = strnlen_s(name, 20);
len = (len > 16) ? 16 : len;
for (i = 0; i < len; i++)
entry.str[i] = name[i];
entry.payload.str[i] = name[i];
entry.str[15] = 0;
entry.payload.str[15] = 0;
_trace_put(cpu_id, evid, &entry);
}