diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2024-09-05 16:12:08 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2024-12-16 07:31:28 +0100 |
| commit | 214191f6b57458814d279a53539d64c6e54e764b (patch) | |
| tree | a525b2cdced298f29c45582c82d25089579ec0c4 | |
| parent | 57e2cc9abf5da38f600354fe920ff20e719607b4 (diff) | |
| download | qemu-214191f6b57458814d279a53539d64c6e54e764b.zip qemu-214191f6b57458814d279a53539d64c6e54e764b.tar.gz qemu-214191f6b57458814d279a53539d64c6e54e764b.tar.bz2 | |
x86/loader: read complete kernel
Load the complete kernel (including setup) into memory. Excluding the
setup is handled later when adding the FW_CFG_KERNEL_SIZE and
FW_CFG_KERNEL_DATA entries.
This is a preparation for the next patch which adds a new fw_cfg file
containing the complete, unpatched kernel. No functional change.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-ID: <20240905141211.1253307-4-kraxel@redhat.com>
| -rw-r--r-- | hw/i386/x86-common.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/hw/i386/x86-common.c b/hw/i386/x86-common.c index dadc9d9..28341b4 100644 --- a/hw/i386/x86-common.c +++ b/hw/i386/x86-common.c @@ -895,7 +895,6 @@ void x86_load_linux(X86MachineState *x86ms, fprintf(stderr, "qemu: invalid kernel header\n"); exit(1); } - kernel_size -= setup_size; setup = g_malloc(setup_size); kernel = g_malloc(kernel_size); @@ -904,6 +903,7 @@ void x86_load_linux(X86MachineState *x86ms, fprintf(stderr, "fread() failed\n"); exit(1); } + fseek(f, 0, SEEK_SET); if (fread(kernel, 1, kernel_size, f) != kernel_size) { fprintf(stderr, "fread() failed\n"); exit(1); @@ -950,10 +950,11 @@ void x86_load_linux(X86MachineState *x86ms, } fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr); - fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size); - fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size); - sev_load_ctx.kernel_data = (char *)kernel; - sev_load_ctx.kernel_size = kernel_size; + fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size - setup_size); + fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, + kernel + setup_size, kernel_size - setup_size); + sev_load_ctx.kernel_data = (char *)kernel + setup_size; + sev_load_ctx.kernel_size = kernel_size - setup_size; fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_ADDR, real_addr); fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_SIZE, setup_size); |