From nobody Sun Apr 12 07:21:49 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1770907464; cv=none; d=zohomail.com; s=zohoarc; b=U3D3BOI6mjObDloKYYFJeEVi243ybCJH4Vmnnzf3jHxz/Tz+QTguWCWant5l6vE1mrQ7flwHsNqWySsyHRCWpOKG9NoKsJCGFW9GvGa2EwU4Wnx1kNztwxKcJ5hKyxhvkV10pQvgGN/HTqYqt65Vt17gWLlp0IVlIkIx21mucTY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770907464; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=8e+pO/23r770rJp74Z6WNcABsTogv9mHs4szurDP7+w=; b=EjKYU6xAmQNPXcDEgKZ8XmO9Q01SZML8V2Xr7c+dupB8ddihAswKCULXG69HltbOK8A49hIDeT7vrXQK2jKXiA1hbqr/iTaNSOpLX35XoYcnmGL4IWqbrmO3qcq0OUTOpw1JDwIJfgC2q+RRUXxce7s+CWDd0HKRgX92cil57kg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1770907464526324.16492217345103; Thu, 12 Feb 2026 06:44:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vqXvR-0005xM-Ef; Thu, 12 Feb 2026 09:44:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vqXuz-0005O0-Ay for qemu-devel@nongnu.org; Thu, 12 Feb 2026 09:43:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vqXul-00064U-6c for qemu-devel@nongnu.org; Thu, 12 Feb 2026 09:43:44 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-16-WLhk3J_uPcC0gYca1a85dw-1; Thu, 12 Feb 2026 09:43:24 -0500 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4806fa4a180so60041535e9.2 for ; Thu, 12 Feb 2026 06:43:23 -0800 (PST) Received: from [10.60.241.123] (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4836c0da093sm24400705e9.7.2026.02.12.06.43.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Feb 2026 06:43:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770907408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8e+pO/23r770rJp74Z6WNcABsTogv9mHs4szurDP7+w=; b=T9wnda9msoAmqUETS8Rtci302XZY/6GCqhSjmNgtEBw+LOkbJwWuCQQB94gYHs7xOBFEfU JmJE0NRSchdw8G+QRd/nRgXX08HNEllMj8ldMbKpVKM51axfiOpMSJmvaYRx4pOeATmCgl ufVLJdJ8A+wqr1DwGWFgTHO0EuZl2UM= X-MC-Unique: WLhk3J_uPcC0gYca1a85dw-1 X-Mimecast-MFC-AGG-ID: WLhk3J_uPcC0gYca1a85dw_1770907403 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1770907402; x=1771512202; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8e+pO/23r770rJp74Z6WNcABsTogv9mHs4szurDP7+w=; b=eHEqiRPZD5Yl8xFTsvlxrziAgDQVkachyy05wYQNmd5bHzWJGBrvwuasKqAt49Vnl6 hMwxg+nBsgSHs2f3GsJMvyWjtSj1POqBHsc3o8nG6XEitM+MwLmwV8asPc8rsqLX2wj/ 4IzMPeYxt1a/sM5Qp3tc+pAnx1qMjpaY7bbBwWJfiFcgO60+t3Vrx8SNnKM3C3NgT69a I4Sf5//X3301ZALwqwxi2NUiAt5SRyfVu7ss2ynEsYhjgYv/rD6t9qfQewx2y2R1KkGc 8/gd7vOPDQyqxH7emO+6+VduH1hRE2HaFw8XgEOWNhn4UHTp/FiAYmIoyRGoMTuF6b3C frHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770907402; x=1771512202; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=8e+pO/23r770rJp74Z6WNcABsTogv9mHs4szurDP7+w=; b=u2lzGTEbqNLAQfDIsOkBePDapcc7M56GE0A+JLtuoqmAmDCYaofKWjPv9CPivMNjz5 LnJnFt3snrBCapX1qC2dYKqtbN66KMSWnYtFpwh5TyX3+AOlNR2r7KaYSDJ4B2zs+v7l JXuKjcxoiyEY7cVogHgSJ94qsbsc7nRz3nwQOltuY0bbzDgTz377CjQRKvrYrm8NCCY3 Ritk1DX+tlIKSD1o/bCvsHSPaAL5xXeIriN4Qwyn9lWWX3XV2CNkvJA0o05xdamc6V/y 9er2r/Zxp6pNbflpCbmE2HmNqcbUiRq16pJBIV616cornxH1sgyNWtS5umX9SONNmntB qLrw== X-Gm-Message-State: AOJu0Yza9+IiAYJEk7xZwJ8QNTdFDpvZigkYOMvExdHt7m1ySmRt0Rv2 CN+wHrQHLvthSHMgmLnMBNRwO7TyHzf1xKyxEZcrKjagpNfkh7ECeCLmI7ONDRW4mM0dNJZ6REt o055XDiHceep7gViTXfmkczCI9VQn4Awwihv3gKBXfv5Jp9gmfRnPaR+tbA/L84Yf3bmJmtmg7V gO4B0c4mPdKTL0j/YjZY2YBsRrVIET2fwrhsPrjCdq X-Gm-Gg: AZuq6aLFbKfKt0VVxeGaOMQsQb79AqaG7++h8eAgKMfpsNNjoyuIVi9YN0D6zJ/mKjE yjk/OvegflIf/Mtv5qg16Wwz7jUFilm9HYtZy3JEopdUo6WwCetD5PxArVP2zdq38HBXLBnNa5z zbyUpfkz5nEiaQo7dlViPhpJcAiN76a2pXl9jut+MoKfOp/g/eUdO/GUnVpSkpJFPpW+vyUpOVX AtAPYi7A5tfbz7yaZrCaJIJJCDd8EWvbzcW50Z6RRQ1FC3QSGoaDa0II/Hx8rBuAHofbpAMIOOG CCjdrrLdLQqFBssWz5IBh8B/zg3pQ9LIbyhq6kSWg50cYz9eXivk/+NulR5RnQNratLmHsbqZ1s b7OXkdA/mkmOgcULaNvJHX0kMzeFeU5eICPSjLF4Ih0d1YNfAiqK6DW2pZI2a4wnE2Y68dxi9Z5 BeT3CyZhvlp43CC1DhmSCeVQVSeZcHTXSuak7Ii80PqB/1wsycX2M= X-Received: by 2002:a05:600c:348f:b0:480:1dc6:2686 with SMTP id 5b1f17b1804b1-483656c571fmr48562235e9.13.1770907402030; Thu, 12 Feb 2026 06:43:22 -0800 (PST) X-Received: by 2002:a05:600c:348f:b0:480:1dc6:2686 with SMTP id 5b1f17b1804b1-483656c571fmr48561695e9.13.1770907401449; Thu, 12 Feb 2026 06:43:21 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Zhao Liu Subject: [PULL 16/41] hw/i386: Remove linuxboot.bin Date: Thu, 12 Feb 2026 15:42:18 +0100 Message-ID: <20260212144244.22579-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260212144244.22579-1-pbonzini@redhat.com> References: <20260212144244.22579-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, LOTS_OF_MONEY=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1770907466577158500 From: Philippe Mathieu-Daud=C3=A9 All machines now use the linuxboot_dma.bin binary, so it's safe to remove the non-DMA version (linuxboot.bin). Suggested-by: Thomas Huth Reviewed-by: Zhao Liu Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Zhao Liu Reviewed-by: Thomas Huth Link: https://lore.kernel.org/r/20260108033051.777361-16-zhao1.liu@intel.com Signed-off-by: Paolo Bonzini --- hw/i386/pc.c | 3 +- pc-bios/meson.build | 1 - pc-bios/optionrom/Makefile | 2 +- pc-bios/optionrom/linuxboot.S | 195 ---------------------------------- 4 files changed, 2 insertions(+), 199 deletions(-) delete mode 100644 pc-bios/optionrom/linuxboot.S diff --git a/hw/i386/pc.c b/hw/i386/pc.c index b033fc67cf9..c0e6a23bec1 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -669,8 +669,7 @@ void xen_load_linux(PCMachineState *pcms) =20 x86_load_linux(x86ms, fw_cfg, PC_FW_DATA, pcmc->pvh_enabled); for (i =3D 0; i < nb_option_roms; i++) { - assert(!strcmp(option_rom[i].name, "linuxboot.bin") || - !strcmp(option_rom[i].name, "linuxboot_dma.bin") || + assert(!strcmp(option_rom[i].name, "linuxboot_dma.bin") || !strcmp(option_rom[i].name, "pvh.bin") || !strcmp(option_rom[i].name, "multiboot_dma.bin")); rom_add_option(option_rom[i].name, option_rom[i].bootindex); diff --git a/pc-bios/meson.build b/pc-bios/meson.build index efe45c16705..2f470ed1294 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -63,7 +63,6 @@ blobs =3D [ 'efi-vmxnet3.rom', 'qemu-nsis.bmp', 'multiboot_dma.bin', - 'linuxboot.bin', 'linuxboot_dma.bin', 'kvmvapic.bin', 'pvh.bin', diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index 963a77a3298..f1c1b9efc21 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -2,7 +2,7 @@ include config.mak SRC_DIR :=3D $(TOPSRC_DIR)/pc-bios/optionrom VPATH =3D $(SRC_DIR) =20 -all: multiboot_dma.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin +all: multiboot_dma.bin linuxboot_dma.bin kvmvapic.bin pvh.bin # Dummy command so that make thinks it has done something @true =20 diff --git a/pc-bios/optionrom/linuxboot.S b/pc-bios/optionrom/linuxboot.S deleted file mode 100644 index ba821ab922d..00000000000 --- a/pc-bios/optionrom/linuxboot.S +++ /dev/null @@ -1,195 +0,0 @@ -/* - * Linux Boot Option ROM - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - * - * Copyright Novell Inc, 2009 - * Authors: Alexander Graf - * - * Based on code in hw/pc.c. - */ - -#include "optionrom.h" - -#define BOOT_ROM_PRODUCT "Linux loader" - -BOOT_ROM_START - -run_linuxboot: - - cli - cld - - jmp copy_kernel -boot_kernel: - - read_fw FW_CFG_SETUP_ADDR - - mov %eax, %ebx - shr $4, %ebx - - /* All segments contain real_addr */ - mov %bx, %ds - mov %bx, %es - mov %bx, %fs - mov %bx, %gs - mov %bx, %ss - - /* CX =3D CS we want to jump to */ - add $0x20, %bx - mov %bx, %cx - - /* SP =3D cmdline_addr-real_addr-16 */ - read_fw FW_CFG_CMDLINE_ADDR - mov %eax, %ebx - read_fw FW_CFG_SETUP_ADDR - sub %eax, %ebx - sub $16, %ebx - mov %ebx, %esp - - /* Build indirect lret descriptor */ - pushw %cx /* CS */ - xor %ax, %ax - pushw %ax /* IP =3D 0 */ - - /* Clear registers */ - xor %eax, %eax - xor %ebx, %ebx - xor %ecx, %ecx - xor %edx, %edx - xor %edi, %edi - xor %ebp, %ebp - - /* Jump to Linux */ - lret - - -copy_kernel: - /* Read info block in low memory (0x10000 or 0x90000) */ - read_fw FW_CFG_SETUP_ADDR - shr $4, %eax - mov %eax, %es - xor %edi, %edi - read_fw_blob_addr32_edi(FW_CFG_SETUP) - - cmpw $0x203, %es:0x206 // if protocol >=3D 0x203 - jae 1f // have initrd_max - movl $0x37ffffff, %es:0x22c // else assume 0x37ffffff -1: - - /* Check if using kernel-specified initrd address */ - read_fw FW_CFG_INITRD_ADDR - mov %eax, %edi // (load_kernel wants it in %edi) - read_fw FW_CFG_INITRD_SIZE // find end of initrd - add %edi, %eax - xor %es:0x22c, %eax // if it matches es:0x22c - and $-4096, %eax // (apart from padding for page) - jz load_kernel // then initrd is not at top - // of memory - - /* pc.c placed the initrd at end of memory. Compute a better - * initrd address based on e801 data. - */ - mov $0xe801, %ax - xor %cx, %cx - xor %dx, %dx - int $0x15 - - /* Output could be in AX/BX or CX/DX */ - or %cx, %cx - jnz 1f - or %dx, %dx - jnz 1f - mov %ax, %cx - mov %bx, %dx -1: - - or %dx, %dx - jnz 2f - addw $1024, %cx /* add 1 MB */ - movzwl %cx, %edi - shll $10, %edi /* convert to bytes */ - jmp 3f - -2: - addw $16777216 >> 16, %dx /* add 16 MB */ - movzwl %dx, %edi - shll $16, %edi /* convert to bytes */ - -3: - read_fw FW_CFG_INITRD_SIZE - subl %eax, %edi - andl $-4096, %edi /* EDI =3D start of initrd */ - movl %edi, %es:0x218 /* put it in the header */ - -load_kernel: - /* We need to load the kernel into memory we can't access in 16 bit - mode, so let's get into 32 bit mode, write the kernel and jump - back again. */ - - /* Reserve space on the stack for our GDT descriptor. */ - mov %esp, %ebp - sub $16, %esp - - /* Now create the GDT descriptor */ - movw $((3 * 8) - 1), -16(%bp) - mov %cs, %eax - movzwl %ax, %eax - shl $4, %eax - addl $gdt, %eax - movl %eax, -14(%bp) - - /* And load the GDT */ - data32 lgdt -16(%bp) - mov %ebp, %esp - - /* Get us to protected mode now */ - mov $1, %eax - mov %eax, %cr0 - - /* So we can set ES to a 32-bit segment */ - mov $0x10, %eax - mov %eax, %es - - /* We're now running in 16-bit CS, but 32-bit ES! */ - - /* Load kernel and initrd */ - read_fw_blob_addr32_edi(FW_CFG_INITRD) - read_fw_blob_addr32(FW_CFG_KERNEL) - read_fw_blob_addr32(FW_CFG_CMDLINE) - - /* And now jump into Linux! */ - mov $0, %eax - mov %eax, %cr0 - - /* ES =3D CS */ - mov %cs, %ax - mov %ax, %es - - jmp boot_kernel - -/* Variables */ - -.align 4, 0 -gdt: - /* 0x00 */ -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - /* 0x08: code segment (base=3D0, limit=3D0xfffff, type=3D32bit code exec/= read, DPL=3D0, 4k) */ -.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x9a, 0xcf, 0x00 - - /* 0x10: data segment (base=3D0, limit=3D0xfffff, type=3D32bit data read/= write, DPL=3D0, 4k) */ -.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x92, 0xcf, 0x00 - -BOOT_ROM_END --=20 2.52.0