[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/17] isa-superio: validate floppy.count value
From: |
Paolo Bonzini |
Subject: |
[PULL 10/17] isa-superio: validate floppy.count value |
Date: |
Tue, 20 Feb 2024 09:05:51 +0100 |
Ensure that the value is valid; it can only be zero or one.
And never create a floppy disk controller if it is zero.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/isa/isa-superio.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c
index 7dbfc374da3..e06a548c682 100644
--- a/hw/isa/isa-superio.c
+++ b/hw/isa/isa-superio.c
@@ -116,7 +116,9 @@ static void isa_superio_realize(DeviceState *dev, Error
**errp)
}
/* Floppy disc */
- if (!k->floppy.is_enabled || k->floppy.is_enabled(sio, 0)) {
+ assert(k->floppy.count <= 1);
+ if (k->floppy.count &&
+ (!k->floppy.is_enabled || k->floppy.is_enabled(sio, 0))) {
isa = isa_new(TYPE_ISA_FDC);
d = DEVICE(isa);
if (k->floppy.get_iobase) {
--
2.43.0
- [PULL 00/17] Build, x86 patches for 2024-02-16, Paolo Bonzini, 2024/02/20
- [PULL 01/17] i386/cpu: Clear FEAT_XSAVE_XSS_LO/HI leafs when CPUID_EXT_XSAVE is not available, Paolo Bonzini, 2024/02/20
- [PULL 02/17] i386/cpu: Mask with XCR0/XSS mask for FEAT_XSAVE_XCR0_HI and FEAT_XSAVE_XSS_HI leafs, Paolo Bonzini, 2024/02/20
- [PULL 03/17] target/i386: Add support of KVM_FEATURE_ASYNC_PF_VMEXIT for guest, Paolo Bonzini, 2024/02/20
- [PULL 04/17] i386/pc: Drop pc_machine_kvm_type(), Paolo Bonzini, 2024/02/20
- [PULL 05/17] physmem: replace function name with __func__ in ram_block_discard_range(), Paolo Bonzini, 2024/02/20
- [PULL 06/17] i386/cpuid: Decrease cpuid_i when skipping CPUID leaf 1F, Paolo Bonzini, 2024/02/20
- [PULL 08/17] i386/cpuid: Move leaf 7 to correct group, Paolo Bonzini, 2024/02/20
- [PULL 09/17] mips: remove unnecessary "select PTIMER", Paolo Bonzini, 2024/02/20
- [PULL 10/17] isa-superio: validate floppy.count value,
Paolo Bonzini <=
- [PULL 11/17] smc37c669: remove useless is_enabled functions, Paolo Bonzini, 2024/02/20
- [PULL 12/17] configure: do not create legacy symlinks, Paolo Bonzini, 2024/02/20
- [PULL 14/17] i386: xen: fix compilation --without-default-devices, Paolo Bonzini, 2024/02/20
- [PULL 13/17] configure: put all symlink creation together, Paolo Bonzini, 2024/02/20
- [PULL 16/17] usb: inline device creation functions, Paolo Bonzini, 2024/02/20
- [PULL 15/17] target/i386: Generate an illegal opcode exception on cmp instructions with lock prefix, Paolo Bonzini, 2024/02/20
- [PULL 17/17] ci: Fix again build-previous-qemu, Paolo Bonzini, 2024/02/20
- [PULL 07/17] i386/cpuid: Remove subleaf constraint on CPUID leaf 1F, Paolo Bonzini, 2024/02/20
- Re: [PULL 00/17] Build, x86 patches for 2024-02-16, Peter Maydell, 2024/02/20