Remove their instanciation from malta board, to not have them twice.
Automatically create serial/parallel ports in PIIX4 if not provided.
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/isa/piix4.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++
hw/mips/mips_malta.c | 41 +++++++++++++++++---------------
2 files changed, 89 insertions(+), 19 deletions(-)
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 1aab78cdd2..7a13e83270 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -28,8 +28,10 @@
#include "hw/i386/pc.h"
#include "hw/pci/pci.h"
#include "hw/isa/isa.h"
+#include "hw/char/isa.h"
#include "hw/sysbus.h"
#include "hw/timer/i8254.h"
+#include "qapi/error.h"
PCIDevice *piix4_dev;
@@ -38,6 +40,10 @@ typedef struct PIIX4State {
qemu_irq cpu_intr;
qemu_irq *isa;
+ FDCtrlISABus floppy;
+ ISASerialState serial[2];
+ ISAParallelState parallel;
+
/* Reset Control Register */
MemoryRegion rcr_mem;
uint8_t rcr;
@@ -141,6 +147,8 @@ static void piix4_realize(PCIDevice *pci_dev, Error **errp)
PIIX4State *s = DO_UPCAST(PIIX4State, dev, pci_dev);
ISABus *isa_bus;
qemu_irq *i8259_out_irq;
+ int i;
+ Error *err = NULL;
isa_bus = isa_bus_new(dev, pci_address_space(pci_dev),
pci_address_space_io(pci_dev), errp);
@@ -172,10 +180,68 @@ static void piix4_realize(PCIDevice *pci_dev, Error **errp)
/* Super I/O */
isa_create_simple(isa_bus, "i8042");
+ /* floppy */
+ qdev_set_parent_bus(DEVICE(&s->floppy), BUS(isa_bus));
+ object_property_set_bool(OBJECT(&s->floppy), true, "realized", &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
+
+ /* serial ports */
+ for (i = 0; i < 2; i++) {
+ qdev_set_parent_bus(DEVICE(&s->serial[i]), BUS(isa_bus));
+ if (!qemu_chr_fe_backend_connected(&s->serial[i].state.chr)) {
+ char prop[] = "serial?";
+ char label[] = "piix4.serial?";
+ prop[6] = i + '0';
+ label[12] = i + '0';
+ qdev_prop_set_chr(dev, prop, qemu_chr_new(label, "null"));
+ }
+ object_property_set_bool(OBJECT(&s->serial[i]), true, "realized", &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
+ }
+
+ /* parallel port */
+ qdev_set_parent_bus(DEVICE(&s->parallel), BUS(isa_bus));
+ if (!qemu_chr_fe_backend_connected(&s->parallel.state.chr)) {
+ qdev_prop_set_chr(dev, "parallel",
+ qemu_chr_new("pii4x.parallel", "null"));
+ }
+ object_property_set_bool(OBJECT(&s->parallel), true, "realized", &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
+
piix4_dev = pci_dev;
qemu_register_reset(piix4_reset, s);
}
+static void piix4_init(Object *obj)
+{
+ PIIX4State *s = PIIX4_PCI_DEVICE(obj);
+ int i;
+
+ object_initialize(&s->floppy, sizeof(s->floppy), TYPE_ISA_FDC);
+ for (i = 0; i < 2; i++) {
+ object_initialize(&s->serial[i], sizeof(s->serial[i]), TYPE_ISA_SERIAL);
+ }
+ object_initialize(&s->parallel, sizeof(s->parallel), TYPE_ISA_PARALLEL);
+
+ object_property_add_alias(obj, "floppy", OBJECT(&s->floppy), "driveA",
+ &error_abort);
+ object_property_add_alias(obj, "serial0", OBJECT(&s->serial[0]), "chardev",
+ &error_abort);
+ object_property_add_alias(obj, "serial1", OBJECT(&s->serial[1]), "chardev",
+ &error_abort);
+ object_property_add_alias(obj, "parallel", OBJECT(&s->parallel), "chardev",
+ &error_abort);
+}
+
static void piix4_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
@@ -199,6 +265,7 @@ static const TypeInfo piix4_info = {
.name = TYPE_PIIX4_PCI_DEVICE,
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PIIX4State),
+ .instance_init = piix4_init,
.class_init = piix4_class_init,
.interfaces = (InterfaceInfo[]) {
{ INTERFACE_CONVENTIONAL_PCI_DEVICE },
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 7498fad006..30fb30fc0e 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -1003,7 +1003,7 @@ void mips_malta_init(MachineState *machine)
int i;
DriveInfo *dinfo;
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
- DriveInfo *fd[MAX_FD];
+ DriveInfo *fd;
int fl_idx = 0;
int fl_sectors = bios_size >> 16;
int be;
@@ -1018,15 +1018,6 @@ void mips_malta_init(MachineState *machine)
qdev_init_nofail(dev);
- /* Make sure the first 3 serial ports are associated with a device. */
- for(i = 0; i < 3; i++) {
- if (!serial_hds[i]) {
- char label[32];
- snprintf(label, sizeof(label), "serial%d", i);
- serial_hds[i] = qemu_chr_new(label, "null");
- }
- }
-
/* create CPU */
mips_create_cpu(s, machine->cpu_type, &cbus_irq, &i8259_irq);
@@ -1069,6 +1060,9 @@ void mips_malta_init(MachineState *machine)
#endif
/* FPGA */
/* The CBUS UART is attached to the MIPS CPU INT2 pin, ie interrupt 4 */
+ if (!serial_hds[2]) {
+ serial_hds[2] = qemu_chr_new("serial2", "null");
+ }
malta_fpga_init(system_memory, FPGA_ADDRESS, cbus_irq, serial_hds[2]);
/* Load firmware in flash / BIOS. */
@@ -1184,9 +1178,25 @@ void mips_malta_init(MachineState *machine)
/* Southbridge */
ide_drive_get(hd, ARRAY_SIZE(hd));
- pci = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0),
- true, "PIIX4");
+ pci = pci_create_multifunction(pci_bus, PCI_DEVFN(10, 0),
+ true, "PIIX4");
dev = DEVICE(pci);
+
+ /* Floppy */
+ fd = drive_get(IF_FLOPPY, 0, 0);
+ if (fd) {
+ qdev_prop_set_drive(dev, "floppy", blk_by_legacy_dinfo(fd),
+ &error_fatal);
+ }
+
+ /* Serial ports */
+ qdev_prop_set_chr(dev, "serial0", serial_hds[0]);
+ qdev_prop_set_chr(dev, "serial1", serial_hds[1]);
+
+ /* Parallel port */
+ qdev_prop_set_chr(dev, "parallel", parallel_hds[0]);
+
+ qdev_init_nofail(dev);
isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0"));
piix4_devfn = pci->devfn;
@@ -1205,13 +1215,6 @@ void mips_malta_init(MachineState *machine)
/* Super I/O */
mc146818_rtc_init(isa_bus, 2000, NULL);
- serial_hds_isa_init(isa_bus, 0, 2);
- parallel_hds_isa_init(isa_bus, 1);
-
- for(i = 0; i < MAX_FD; i++) {
- fd[i] = drive_get(IF_FLOPPY, 0, i);
- }
- fdctrl_init_isa(isa_bus, fd);
/* Network card */
network_init(pci_bus);
--
2.11.0
On 01/06/2018 12:37 PM, Hervé Poussineau wrote:
> Remove their instanciation from malta board, to not have them twice.
> Automatically create serial/parallel ports in PIIX4 if not provided.
>
> Acked-by: Michael S. Tsirkin <mst@redhat.com>
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
> hw/isa/piix4.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++
> hw/mips/mips_malta.c | 41 +++++++++++++++++---------------
> 2 files changed, 89 insertions(+), 19 deletions(-)
>
> diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
> index 1aab78cdd2..7a13e83270 100644
> --- a/hw/isa/piix4.c
> +++ b/hw/isa/piix4.c
> @@ -28,8 +28,10 @@
> #include "hw/i386/pc.h"
> #include "hw/pci/pci.h"
> #include "hw/isa/isa.h"
> +#include "hw/char/isa.h"
> #include "hw/sysbus.h"
> #include "hw/timer/i8254.h"
> +#include "qapi/error.h"
>
> PCIDevice *piix4_dev;
>
> @@ -38,6 +40,10 @@ typedef struct PIIX4State {
> qemu_irq cpu_intr;
> qemu_irq *isa;
>
> + FDCtrlISABus floppy;
> + ISASerialState serial[2];
> + ISAParallelState parallel;
What I don't like here is we duplicate the common superio model like the
one you wrote for the PC87312.
A cleaner way could be adding a INTERFACE_SUPERIO_ISA_DEVICE
InterfaceInfo which could also be used by the LPC devices.
> +
> /* Reset Control Register */
> MemoryRegion rcr_mem;
> uint8_t rcr;
> @@ -141,6 +147,8 @@ static void piix4_realize(PCIDevice *pci_dev, Error **errp)
> PIIX4State *s = DO_UPCAST(PIIX4State, dev, pci_dev);
> ISABus *isa_bus;
> qemu_irq *i8259_out_irq;
> + int i;
> + Error *err = NULL;
>
> isa_bus = isa_bus_new(dev, pci_address_space(pci_dev),
> pci_address_space_io(pci_dev), errp);
> @@ -172,10 +180,68 @@ static void piix4_realize(PCIDevice *pci_dev, Error **errp)
> /* Super I/O */
> isa_create_simple(isa_bus, "i8042");
>
> + /* floppy */
> + qdev_set_parent_bus(DEVICE(&s->floppy), BUS(isa_bus));
> + object_property_set_bool(OBJECT(&s->floppy), true, "realized", &err);
> + if (err) {
> + error_propagate(errp, err);
> + return;
> + }
> +
> + /* serial ports */
> + for (i = 0; i < 2; i++) {
> + qdev_set_parent_bus(DEVICE(&s->serial[i]), BUS(isa_bus));
> + if (!qemu_chr_fe_backend_connected(&s->serial[i].state.chr)) {
> + char prop[] = "serial?";
> + char label[] = "piix4.serial?";
> + prop[6] = i + '0';
> + label[12] = i + '0';
> + qdev_prop_set_chr(dev, prop, qemu_chr_new(label, "null"));
> + }
> + object_property_set_bool(OBJECT(&s->serial[i]), true, "realized", &err);
> + if (err) {
> + error_propagate(errp, err);
> + return;
> + }
> + }
> +
> + /* parallel port */
> + qdev_set_parent_bus(DEVICE(&s->parallel), BUS(isa_bus));
> + if (!qemu_chr_fe_backend_connected(&s->parallel.state.chr)) {
> + qdev_prop_set_chr(dev, "parallel",
> + qemu_chr_new("pii4x.parallel", "null"));
> + }
> + object_property_set_bool(OBJECT(&s->parallel), true, "realized", &err);
> + if (err) {
> + error_propagate(errp, err);
> + return;
> + }
> +
> piix4_dev = pci_dev;
> qemu_register_reset(piix4_reset, s);
> }
>
> +static void piix4_init(Object *obj)
> +{
> + PIIX4State *s = PIIX4_PCI_DEVICE(obj);
> + int i;
> +
> + object_initialize(&s->floppy, sizeof(s->floppy), TYPE_ISA_FDC);
> + for (i = 0; i < 2; i++) {
> + object_initialize(&s->serial[i], sizeof(s->serial[i]), TYPE_ISA_SERIAL);
> + }
> + object_initialize(&s->parallel, sizeof(s->parallel), TYPE_ISA_PARALLEL);
> +
> + object_property_add_alias(obj, "floppy", OBJECT(&s->floppy), "driveA",
> + &error_abort);
> + object_property_add_alias(obj, "serial0", OBJECT(&s->serial[0]), "chardev",
> + &error_abort);
> + object_property_add_alias(obj, "serial1", OBJECT(&s->serial[1]), "chardev",
> + &error_abort);
> + object_property_add_alias(obj, "parallel", OBJECT(&s->parallel), "chardev",
> + &error_abort);
> +}
> +
> static void piix4_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> @@ -199,6 +265,7 @@ static const TypeInfo piix4_info = {
> .name = TYPE_PIIX4_PCI_DEVICE,
> .parent = TYPE_PCI_DEVICE,
> .instance_size = sizeof(PIIX4State),
> + .instance_init = piix4_init,
> .class_init = piix4_class_init,
> .interfaces = (InterfaceInfo[]) {
> { INTERFACE_CONVENTIONAL_PCI_DEVICE },
> diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
> index 7498fad006..30fb30fc0e 100644
> --- a/hw/mips/mips_malta.c
> +++ b/hw/mips/mips_malta.c
> @@ -1003,7 +1003,7 @@ void mips_malta_init(MachineState *machine)
> int i;
> DriveInfo *dinfo;
> DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
> - DriveInfo *fd[MAX_FD];
> + DriveInfo *fd;
> int fl_idx = 0;
> int fl_sectors = bios_size >> 16;
> int be;
> @@ -1018,15 +1018,6 @@ void mips_malta_init(MachineState *machine)
>
> qdev_init_nofail(dev);
>
> - /* Make sure the first 3 serial ports are associated with a device. */
> - for(i = 0; i < 3; i++) {
> - if (!serial_hds[i]) {
> - char label[32];
> - snprintf(label, sizeof(label), "serial%d", i);
> - serial_hds[i] = qemu_chr_new(label, "null");
> - }
> - }
> -
> /* create CPU */
> mips_create_cpu(s, machine->cpu_type, &cbus_irq, &i8259_irq);
>
> @@ -1069,6 +1060,9 @@ void mips_malta_init(MachineState *machine)
> #endif
> /* FPGA */
> /* The CBUS UART is attached to the MIPS CPU INT2 pin, ie interrupt 4 */
> + if (!serial_hds[2]) {
> + serial_hds[2] = qemu_chr_new("serial2", "null");
> + }
> malta_fpga_init(system_memory, FPGA_ADDRESS, cbus_irq, serial_hds[2]);
>
> /* Load firmware in flash / BIOS. */
> @@ -1184,9 +1178,25 @@ void mips_malta_init(MachineState *machine)
> /* Southbridge */
> ide_drive_get(hd, ARRAY_SIZE(hd));
>
> - pci = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0),
> - true, "PIIX4");
> + pci = pci_create_multifunction(pci_bus, PCI_DEVFN(10, 0),
> + true, "PIIX4");
> dev = DEVICE(pci);
> +
> + /* Floppy */
> + fd = drive_get(IF_FLOPPY, 0, 0);
> + if (fd) {
> + qdev_prop_set_drive(dev, "floppy", blk_by_legacy_dinfo(fd),
> + &error_fatal);
> + }
> +
> + /* Serial ports */
> + qdev_prop_set_chr(dev, "serial0", serial_hds[0]);
> + qdev_prop_set_chr(dev, "serial1", serial_hds[1]);
> +
> + /* Parallel port */
> + qdev_prop_set_chr(dev, "parallel", parallel_hds[0]);
> +
> + qdev_init_nofail(dev);
> isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0"));
> piix4_devfn = pci->devfn;
>
> @@ -1205,13 +1215,6 @@ void mips_malta_init(MachineState *machine)
>
> /* Super I/O */
> mc146818_rtc_init(isa_bus, 2000, NULL);
> - serial_hds_isa_init(isa_bus, 0, 2);
> - parallel_hds_isa_init(isa_bus, 1);
> -
> - for(i = 0; i < MAX_FD; i++) {
> - fd[i] = drive_get(IF_FLOPPY, 0, i);
> - }
> - fdctrl_init_isa(isa_bus, fd);
>
> /* Network card */
> network_init(pci_bus);
>
© 2016 - 2025 Red Hat, Inc.