6c5e9f07c4
- i386/cpuid: Move leaf 7 to correct group - i386/cpuid: Decrease cpuid_i when skipping CPUID leaf 1F - i386/cpu: Mask with XCR0/XSS mask for FEAT_XSAVE_XCR0_HI and FEAT_XSAVE_XSS_HI leafs - i386/cpu: Clear FEAT_XSAVE_XSS_LO/HI leafs when CPUID_EXT_XSAVE is not available - target/i386: Change wrong XFRM value in SGX CPUID leaf - target/i386: Enable support for XSAVES based features - target/i386: Add kvm_get_one_msr helper - hw/block/hd-geometry: Do not override specified bios-chs-trans mainline inclusion commit fd8a68ad6823d33bedeba20a22857867a1c3890e category: bugfix - linux-user/riscv: Align signal frame to 16 bytes mainline inclusion commit 1eaa63429a9944265c92efdb94c02fabb231f564 category: bugfix - ipmi:smbus: Add a check around a memcpy mainline inclusion commit 3fde641e7286f9b968bdb3b4b922c6465f2a9abc category: bugfix - tests/tcg/linux-test: Fix random hangs in test_socket mainline inclusion commit b9e6074fc5b429b1e956e9c60db7e284a91e0f3d category: bugfix - qemu-options.hx: Don't claim "-serial" has limit of 4 serial ports Before v2.12, the implementation of serial ports was limited to a value of MAX_SERIAL_PORTS = 4. We now dynamically allocate the data structures for serial ports, so this limit is no longer present, but the documentation for the -serial options still reads: - target/ppc: Modify the uncorrect value irq to n_IRQ - block-migration: Ensure we don't crash during migration cleanup - target/s390x: fix handling of zeroes in vfmin/vfmax mainline inclusion commit 13c59eb09bd6d1fbc13f08b708226421f14a232b category: bugfix - hw/virtio/virtio-iommu: Enforce power-of-two notify for both MAP and UNMAP mainline inclusion commit 0522be9a0c0094088ccef7aab352c57f483ca250 category: bugfix - configure: Add missing POSIX-required space mainline inclusion commit 35a7a6fc5624b1df828d82f2dfa74d0e4188b3b2 category: bugfix - vga: fix incorrect line height in 640x200x2 mode mainline inclusion commit 37e7b86766244b62a406747bb78e049390d0b528 category: bugfix - hw/ide/core: set ERR_STAT in unsupported command completion - linux-user/flatload.c: Fix setting of image_info::end_code mainline inclusion commit 734a659ad264ac080457167e845ffabbaaa66d0e category: bugfix - load_elf: fix iterator's type for elf file processing - hw/misc/mps2-scc: Free MPS2SCC::oscclk[] array on finalize() - hw/nvram/xlnx-efuse: Free XlnxEFuse::ro_bits[] array on finalize() - hw/nvram/xlnx-efuse-ctrl: Free XlnxVersalEFuseCtrl[] "pg0-lock" array - chardev/char.c: fix "abstract device type" error message - block/rbd: fix handling of holes in .bdrv_co_block_status - qga: treat get-guest-fsinfo as "best effort" mainline inclusion commit bbb0151cf2e82489120a15df5e2eb9653312b0ec category: bugfix - usb/hcd-xhci: check slotid in xhci_wakeup_endpoint() mainline inclusion commit 84218892f05515d20347fde4506e1944eb11cb25 category: bugfix - hw/display/bcm2835_fb: Fix framebuffer allocation address mainline inclusion commit 5865d99fe88d8c8fa437c18c6b63fb2a8165634f category: bugfix - block/parallels: Fix buffer-based write call mainline inclusion commit eba088f91d21d9e42a81bef847173da30c5da961 category: bugfix - vl: Improve error message for conflicting -incoming and -loadvm - hw/smbios: Fix OEM strings table option validation Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 5d1a5160936dce1757c09050d97d12f42642794b)
64 lines
2.4 KiB
Diff
64 lines
2.4 KiB
Diff
From 0f13c505e833761a336bc4619b05afc373ebfdaa Mon Sep 17 00:00:00 2001
|
|
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
Date: Thu, 21 Mar 2024 05:59:43 +0000
|
|
Subject: [PATCH] hw/block/hd-geometry: Do not override specified
|
|
bios-chs-trans mainline inclusion commit
|
|
fd8a68ad6823d33bedeba20a22857867a1c3890e category: bugfix
|
|
|
|
---------------------------------------------------------------
|
|
|
|
For small disk images (<4 GiB), QEMU and SeaBIOS default to the
|
|
LARGE/ECHS disk translation method, but it is not uncommon for other
|
|
BIOS software to use LBA in these cases as well. Some operating
|
|
system boot loaders (e.g., NT 4) do not handle LARGE translations
|
|
outside of fixed configurations. See, e.g., Q154052:
|
|
|
|
"When starting an x86 based computer, Ntdetect.com retrieves and
|
|
stores Interrupt 13 information. . . If the disk controller is using a
|
|
32 sector/64 head translation scheme, this boundary will be 1 GB. If
|
|
the controller uses 63 sector/255 head translation [AUTHOR: i.e.,
|
|
LBA], the limit will be 4 GB."
|
|
|
|
To accommodate these situations, hd_geometry_guess() now follows the
|
|
disk translation specified by the user even when the ATA disk geometry
|
|
is guessed.
|
|
|
|
hd_geometry_guess():
|
|
* Only set the disk translation when translation is AUTO.
|
|
* Show the soon-to-be active translation (*ptrans) in the trace rather
|
|
than what was guessed.
|
|
|
|
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/56
|
|
Buglink: https://bugs.launchpad.net/qemu/+bug/1745312
|
|
|
|
Signed-off-by: Lev Kujawski <lkujaw@member.fsf.org>
|
|
Message-Id: <20220707204045.999544-1-lkujaw@member.fsf.org>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
|
Signed-off-by: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/block/hd-geometry.c | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/block/hd-geometry.c b/hw/block/hd-geometry.c
|
|
index dcbccee294..67462f1752 100644
|
|
--- a/hw/block/hd-geometry.c
|
|
+++ b/hw/block/hd-geometry.c
|
|
@@ -150,7 +150,12 @@ void hd_geometry_guess(BlockBackend *blk,
|
|
translation = BIOS_ATA_TRANSLATION_NONE;
|
|
}
|
|
if (ptrans) {
|
|
- *ptrans = translation;
|
|
+ if (*ptrans == BIOS_ATA_TRANSLATION_AUTO) {
|
|
+ *ptrans = translation;
|
|
+ } else {
|
|
+ /* Defer to the translation specified by the user. */
|
|
+ translation = *ptrans;
|
|
+ }
|
|
}
|
|
trace_hd_geometry_guess(blk, *pcyls, *pheads, *psecs, translation);
|
|
}
|
|
--
|
|
2.27.0
|
|
|