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

x86: use typedef for SetupData struct 

The preferred style is SetupData as a typedef, not setup_data as a plain
struct.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
Suggested-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Message-Id: <20220921093134.2936487-2-Jason@zx2c4.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Jason A. Donenfeld 2022-09-21 11:31:32 +02:00 committed by Paolo Bonzini
parent e935b73508
commit eebb38a563
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/i386/x86.c
View File

@ -653,12 +653,12 @@ DeviceState *ioapic_init_secondary(GSIState *gsi_state)
return dev; return dev;
} }
struct setup_data { typedef struct SetupData {
uint64_t next; uint64_t next;
uint32_t type; uint32_t type;
uint32_t len; uint32_t len;
uint8_t data[]; uint8_t data[];
} __attribute__((packed)); } __attribute__((packed)) SetupData;
/* /*
@ -799,7 +799,7 @@ void x86_load_linux(X86MachineState *x86ms,
FILE *f; FILE *f;
char *vmode; char *vmode;
MachineState *machine = MACHINE(x86ms); MachineState *machine = MACHINE(x86ms);
struct setup_data *setup_data; SetupData *setup_data;
const char *kernel_filename = machine->kernel_filename; const char *kernel_filename = machine->kernel_filename;
const char *initrd_filename = machine->initrd_filename; const char *initrd_filename = machine->initrd_filename;
const char *dtb_filename = machine->dtb; const char *dtb_filename = machine->dtb;
@ -1082,11 +1082,11 @@ void x86_load_linux(X86MachineState *x86ms,
} }
setup_data_offset = QEMU_ALIGN_UP(kernel_size, 16); setup_data_offset = QEMU_ALIGN_UP(kernel_size, 16);
kernel_size = setup_data_offset + sizeof(struct setup_data) + dtb_size; kernel_size = setup_data_offset + sizeof(SetupData) + dtb_size;
kernel = g_realloc(kernel, kernel_size); kernel = g_realloc(kernel, kernel_size);
setup_data = (struct setup_data *)(kernel + setup_data_offset); setup_data = (SetupData *)(kernel + setup_data_offset);
setup_data->next = cpu_to_le64(first_setup_data); setup_data->next = cpu_to_le64(first_setup_data);
first_setup_data = prot_addr + setup_data_offset; first_setup_data = prot_addr + setup_data_offset;
setup_data->type = cpu_to_le32(SETUP_DTB); setup_data->type = cpu_to_le32(SETUP_DTB);
@ -1097,9 +1097,9 @@ void x86_load_linux(X86MachineState *x86ms,
if (!legacy_no_rng_seed) { if (!legacy_no_rng_seed) {
setup_data_offset = QEMU_ALIGN_UP(kernel_size, 16); setup_data_offset = QEMU_ALIGN_UP(kernel_size, 16);
kernel_size = setup_data_offset + sizeof(struct setup_data) + RNG_SEED_LENGTH; kernel_size = setup_data_offset + sizeof(SetupData) + RNG_SEED_LENGTH;
kernel = g_realloc(kernel, kernel_size); kernel = g_realloc(kernel, kernel_size);
setup_data = (struct setup_data *)(kernel + setup_data_offset); setup_data = (SetupData *)(kernel + setup_data_offset);
setup_data->next = cpu_to_le64(first_setup_data); setup_data->next = cpu_to_le64(first_setup_data);
first_setup_data = prot_addr + setup_data_offset; first_setup_data = prot_addr + setup_data_offset;
setup_data->type = cpu_to_le32(SETUP_RNG_SEED); setup_data->type = cpu_to_le32(SETUP_RNG_SEED);