qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 10/17] isa-superio: validate floppy.count value
Date: Tue, 20 Feb 2024 09:05:51 +0100	[thread overview]
Message-ID: <20240220080558.365903-11-pbonzini@redhat.com> (raw)
In-Reply-To: <20240220080558.365903-1-pbonzini@redhat.com>

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



  parent reply	other threads:[~2024-02-20  8:08 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-20  8:05 [PULL 00/17] Build, x86 patches for 2024-02-16 Paolo Bonzini
2024-02-20  8:05 ` [PULL 01/17] i386/cpu: Clear FEAT_XSAVE_XSS_LO/HI leafs when CPUID_EXT_XSAVE is not available Paolo Bonzini
2024-02-20  8:05 ` [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  8:05 ` [PULL 03/17] target/i386: Add support of KVM_FEATURE_ASYNC_PF_VMEXIT for guest Paolo Bonzini
2024-02-20  8:05 ` [PULL 04/17] i386/pc: Drop pc_machine_kvm_type() Paolo Bonzini
2024-02-20  8:05 ` [PULL 05/17] physmem: replace function name with __func__ in ram_block_discard_range() Paolo Bonzini
2024-02-20  8:05 ` [PULL 06/17] i386/cpuid: Decrease cpuid_i when skipping CPUID leaf 1F Paolo Bonzini
2024-02-20  8:05 ` [PULL 07/17] i386/cpuid: Remove subleaf constraint on " Paolo Bonzini
2024-02-20  8:05 ` [PULL 08/17] i386/cpuid: Move leaf 7 to correct group Paolo Bonzini
2024-02-20  8:05 ` [PULL 09/17] mips: remove unnecessary "select PTIMER" Paolo Bonzini
2024-02-20  8:05 ` Paolo Bonzini [this message]
2024-02-20  8:05 ` [PULL 11/17] smc37c669: remove useless is_enabled functions Paolo Bonzini
2024-02-20  8:05 ` [PULL 12/17] configure: do not create legacy symlinks Paolo Bonzini
2024-02-20  8:05 ` [PULL 13/17] configure: put all symlink creation together Paolo Bonzini
2024-02-20  8:05 ` [PULL 14/17] i386: xen: fix compilation --without-default-devices Paolo Bonzini
2024-02-20  8:05 ` [PULL 15/17] target/i386: Generate an illegal opcode exception on cmp instructions with lock prefix Paolo Bonzini
2024-02-20  8:05 ` [PULL 16/17] usb: inline device creation functions Paolo Bonzini
2024-02-20  8:05 ` [PULL 17/17] ci: Fix again build-previous-qemu Paolo Bonzini
2024-02-20 15:26 ` [PULL 00/17] Build, x86 patches for 2024-02-16 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240220080558.365903-11-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).