From nobody Tue Dec 16 07:06:21 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520983297447800.921466962882; Tue, 13 Mar 2018 16:21:37 -0700 (PDT) Received: from localhost ([::1]:43466 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evtEe-0008Qg-Ha for importer@patchew.org; Tue, 13 Mar 2018 19:21:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evsiK-0005y3-R6 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evsiJ-0003jd-3y for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:12 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:33475) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evsiI-0003iK-QR for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:11 -0400 Received: by mail-wr0-x242.google.com with SMTP id r8so2594970wrg.0 for ; Tue, 13 Mar 2018 15:48:10 -0700 (PDT) Received: from donizetti.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id x107sm1557951wrb.97.2018.03.13.15.48.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Mar 2018 15:48:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yDi6n/qIPG7JPfRaWfZbi9IJlv70wL3esgqYSMo41JQ=; b=uYwF5GyzO6xufr5f6CkAT/BBcHIByoliq7NpuZX08YXAMmHuFbYZfsfcbLiNq3x/EZ XIPOd25Jsocc5k9sWQGHwYsUgUsi+WiaTrYQRA2m9+4npB8f0AJzjxqCMnrOtvJiJ4QD QJG8t9wJS6N5GZUGRWDmGSXMJXjK+MZcjh2dBGsgH1Pq72Ud0oM958iW4L4zptcWJlei 5r8pKtFfmgUAyTELqo3WvEeFTiscksS429rSk4YZ1oX2VFvB0sxYlTSl9g4yoB6XtMgu q0bFTLHQLpaFG8VwBb5qd8KhAiomBu6sCmqcgjvihv+sqFqTqsDY9U8wyIcvguFTthX8 a7Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=yDi6n/qIPG7JPfRaWfZbi9IJlv70wL3esgqYSMo41JQ=; b=ruNHD6V+NQJMb/oCjmZN6IO1WAE3Z4dEZrC1ObtkV9AikR5SAB+Xu/pMRNHlkDchex ihep+03s3o19Y9HQjq/B0sA1VR5wzLjsK1xnfK7RFzr7xXCtoLraDORXE7EYO0QFKlVd 9x8nNzZ+TvkEtAkexuOOsjeKzKpHLtNp4r/Zy+QNMIl5/qQ+2hZbg9LQ3Nn6Uu2jJn+g INP94Im6sRo7aUcDxdGVsNAhrrnmCK1iyEXeTiO1pQiyXKLVW+CLUq16I6p+FayHrgcn v83tsybbrHrwffegyQ8hqltIF5k/tdJiphAyl3pH8pBFKs8lwynIRujcRIKzL01mzg6F JuDQ== X-Gm-Message-State: AElRT7EuCUHipMA/vBynfQ4aBwCQpKFB+QIEcjT+K6z+XL9WGcvEI6iP xpB0P6xENzPyelXyxSYe9OnNedWb X-Google-Smtp-Source: AG47ELvhT3HXWtabSweh/F33jBCx/Gdc8pbliTZbsa4Npn5ZNgGdFGmMN9fIL+XJuuop0Vtzfa/Brg== X-Received: by 10.223.173.3 with SMTP id p3mr1936407wrc.202.1520981289306; Tue, 13 Mar 2018 15:48:09 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 23:46:48 +0100 Message-Id: <20180313224719.4954-39-pbonzini@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313224719.4954-1-pbonzini@redhat.com> References: <20180313224719.4954-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PULL 38/69] hw/isa/superio: Factor out the floppy disc controller code from pc87312.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20180308223946.26784-13-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/isa/isa-superio.c | 36 ++++++++++++++++++++++++++++++++++++ hw/isa/pc87312.c | 46 +++++++++++++++++++-------------------------= -- hw/isa/trace-events | 2 +- include/hw/isa/pc87312.h | 4 ---- include/hw/isa/superio.h | 2 ++ 5 files changed, 58 insertions(+), 32 deletions(-) diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c index 6962421aad..4b5e280b38 100644 --- a/hw/isa/isa-superio.c +++ b/hw/isa/isa-superio.c @@ -11,7 +11,10 @@ */ #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qapi/error.h" #include "sysemu/sysemu.h" +#include "sysemu/block-backend.h" +#include "sysemu/blockdev.h" #include "chardev/char.h" #include "hw/isa/superio.h" #include "hw/char/serial.h" @@ -25,6 +28,7 @@ static void isa_superio_realize(DeviceState *dev, Error *= *errp) ISADevice *isa; DeviceState *d; Chardev *chr; + DriveInfo *drive; char *name; int i; =20 @@ -107,6 +111,38 @@ static void isa_superio_realize(DeviceState *dev, Erro= r **errp) g_free(name); } } + + /* Floppy disc */ + if (!k->floppy.is_enabled || k->floppy.is_enabled(sio, 0)) { + isa =3D isa_create(bus, "isa-fdc"); + d =3D DEVICE(isa); + if (k->floppy.get_iobase) { + qdev_prop_set_uint32(d, "iobase", k->floppy.get_iobase(sio, 0)= ); + } + if (k->floppy.get_irq) { + qdev_prop_set_uint32(d, "irq", k->floppy.get_irq(sio, 0)); + } + /* FIXME use a qdev drive property instead of drive_get() */ + drive =3D drive_get(IF_FLOPPY, 0, 0); + if (drive !=3D NULL) { + qdev_prop_set_drive(d, "driveA", blk_by_legacy_dinfo(drive), + &error_fatal); + } + /* FIXME use a qdev drive property instead of drive_get() */ + drive =3D drive_get(IF_FLOPPY, 0, 1); + if (drive !=3D NULL) { + qdev_prop_set_drive(d, "driveB", blk_by_legacy_dinfo(drive), + &error_fatal); + } + qdev_init_nofail(d); + sio->floppy =3D isa; + trace_superio_create_floppy(0, + k->floppy.get_iobase ? + k->floppy.get_iobase(sio, 0) : -1, + k->floppy.get_irq ? + k->floppy.get_irq(sio, 0) : -1); + } + } =20 static void isa_superio_class_init(ObjectClass *oc, void *data) diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c index c2837bca43..a1845a91c3 100644 --- a/hw/isa/pc87312.c +++ b/hw/isa/pc87312.c @@ -27,8 +27,6 @@ #include "hw/isa/pc87312.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "sysemu/block-backend.h" -#include "sysemu/blockdev.h" #include "trace.h" =20 =20 @@ -129,16 +127,26 @@ static bool is_uart_enabled(ISASuperIODevice *sio, ui= nt8_t i) =20 /* Floppy controller */ =20 -static inline bool is_fdc_enabled(PC87312State *s) +static bool is_fdc_enabled(ISASuperIODevice *sio, uint8_t index) { + PC87312State *s =3D PC87312(sio); + assert(!index); return s->regs[REG_FER] & FER_FDC_EN; } =20 -static inline uint16_t get_fdc_iobase(PC87312State *s) +static uint16_t get_fdc_iobase(ISASuperIODevice *sio, uint8_t index) { + PC87312State *s =3D PC87312(sio); + assert(!index); return (s->regs[REG_FER] & FER_FDC_ADDR) ? 0x370 : 0x3f0; } =20 +static unsigned int get_fdc_irq(ISASuperIODevice *sio, uint8_t index) +{ + assert(!index); + return 6; +} + =20 /* IDE controller */ =20 @@ -272,7 +280,6 @@ static void pc87312_realize(DeviceState *dev, Error **e= rrp) DeviceState *d; ISADevice *isa; ISABus *bus; - DriveInfo *drive; Error *local_err =3D NULL; =20 s =3D PC87312(dev); @@ -287,28 +294,6 @@ static void pc87312_realize(DeviceState *dev, Error **= errp) return; } =20 - if (is_fdc_enabled(s)) { - isa =3D isa_create(bus, "isa-fdc"); - d =3D DEVICE(isa); - qdev_prop_set_uint32(d, "iobase", get_fdc_iobase(s)); - qdev_prop_set_uint32(d, "irq", 6); - /* FIXME use a qdev drive property instead of drive_get() */ - drive =3D drive_get(IF_FLOPPY, 0, 0); - if (drive !=3D NULL) { - qdev_prop_set_drive(d, "driveA", blk_by_legacy_dinfo(drive), - &error_fatal); - } - /* FIXME use a qdev drive property instead of drive_get() */ - drive =3D drive_get(IF_FLOPPY, 0, 1); - if (drive !=3D NULL) { - qdev_prop_set_drive(d, "driveB", blk_by_legacy_dinfo(drive), - &error_fatal); - } - qdev_init_nofail(d); - s->fdc.dev =3D isa; - trace_pc87312_info_floppy(get_fdc_iobase(s)); - } - if (is_ide_enabled(s)) { isa =3D isa_create(bus, "isa-ide"); d =3D DEVICE(isa); @@ -370,6 +355,12 @@ static void pc87312_class_init(ObjectClass *klass, voi= d *data) .get_iobase =3D get_uart_iobase, .get_irq =3D get_uart_irq, }; + sc->floppy =3D (ISASuperIOFuncs){ + .count =3D 1, + .is_enabled =3D is_fdc_enabled, + .get_iobase =3D get_fdc_iobase, + .get_irq =3D get_fdc_irq, + }; } =20 static const TypeInfo pc87312_type_info =3D { @@ -378,6 +369,7 @@ static const TypeInfo pc87312_type_info =3D { .instance_size =3D sizeof(PC87312State), .instance_init =3D pc87312_initfn, .class_init =3D pc87312_class_init, + /* FIXME use a qdev drive property instead of drive_get() */ }; =20 static void pc87312_register_types(void) diff --git a/hw/isa/trace-events b/hw/isa/trace-events index c78dd6c353..8d9900882f 100644 --- a/hw/isa/trace-events +++ b/hw/isa/trace-events @@ -3,9 +3,9 @@ # hw/isa/isa-superio.c superio_create_parallel(int id, uint16_t base, unsigned int irq) "id=3D%d,= base 0x%03x, irq %u" superio_create_serial(int id, uint16_t base, unsigned int irq) "id=3D%d, b= ase 0x%03x, irq %u" +superio_create_floppy(int id, uint16_t base, unsigned int irq) "id=3D%d, b= ase 0x%03x, irq %u" =20 # hw/isa/pc87312.c pc87312_io_read(uint32_t addr, uint32_t val) "read addr=3D0x%x val=3D0x%x" pc87312_io_write(uint32_t addr, uint32_t val) "write addr=3D0x%x val=3D0x%= x" -pc87312_info_floppy(uint32_t base) "base 0x%x" pc87312_info_ide(uint32_t base) "base 0x%x" diff --git a/include/hw/isa/pc87312.h b/include/hw/isa/pc87312.h index 1480615a2c..e16263d4b1 100644 --- a/include/hw/isa/pc87312.h +++ b/include/hw/isa/pc87312.h @@ -39,10 +39,6 @@ typedef struct PC87312State { uint16_t iobase; uint8_t config; /* initial configuration */ =20 - struct { - ISADevice *dev; - } fdc; - struct { ISADevice *dev; } ide; diff --git a/include/hw/isa/superio.h b/include/hw/isa/superio.h index 0b516721c3..e8007b9eee 100644 --- a/include/hw/isa/superio.h +++ b/include/hw/isa/superio.h @@ -29,6 +29,7 @@ typedef struct ISASuperIODevice { =20 ISADevice *parallel[MAX_PARALLEL_PORTS]; ISADevice *serial[MAX_SERIAL_PORTS]; + ISADevice *floppy; } ISASuperIODevice; =20 typedef struct ISASuperIOFuncs { @@ -47,6 +48,7 @@ typedef struct ISASuperIOClass { =20 ISASuperIOFuncs parallel; ISASuperIOFuncs serial; + ISASuperIOFuncs floppy; } ISASuperIOClass; =20 #endif /* HW_ISA_SUPERIO_H */ --=20 2.14.3