Misc hw/ide legacy clean up
PATCH 5/8 hw/ide/pci.c: Coding style update to fix checkpatch errors
In reply to BALATON ZoltanSpaces are required around a + operator and if statements should have braces even for single line. Also make it simpler by reversing the condition instead of breaking the loop.
--- hw/ide/pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
hw/ide/pci.c +3 -3
@@ -485,9 +485,9 @@ void pci_ide_create_devs(PCIDevice *dev, DriveInfo **hd_table)int i;for (i =0 ; i <4 ; i++) { -if (hd_table[i] ==NULL ) -continue ; -ide_create_drive (d->bus+bus[i], unit[i], hd_table[i]); +if (hd_table[i]) { +ide_create_drive (d->bus + bus[i], unit[i], hd_table[i]); + } } }
Signature · 1 line
2.21.1
cover Misc hw/ide legacy clean up
These are some clean ups to remove more legacy init functions and lessen dependence on include/hw/ide.h with some simplifications in board code. There should be no functional change.
BALATON Zoltan (8):
hw/ide: Get rid of piix3_init functions
hw/ide: Get rid of piix4_init function
hw/ide: Remove now unneded #include "hw/pci/pci.h" from hw/ide.h hw/ide: Move MAX_IDE_BUS define to one header hw/ide/pci.c: Coding style update to fix checkpatch errors hw/ide: Do ide_drive_get() within pci_ide_create_devs() hw/ide: Move MAX_IDE_DEVS define to hw/ide/internal.h hw/ide: Remove unneeded inclusion of hw/ide.h
hw/alpha/dp264.c | 15 +++------------ hw/hppa/hppa_sys.h | 1 - hw/hppa/machine.c | 3 --- hw/i386/pc_piix.c | 20 +++++++++----------- hw/ide/ahci_internal.h | 1 + hw/ide/pci.c | 10 ++++++---- hw/ide/piix.c | 31 +------------------------------ hw/isa/piix4.c | 14 +++++--------- hw/mips/mips_fulong2e.c | 6 +----- hw/mips/mips_malta.c | 6 ++---- hw/mips/mips_r4k.c | 4 +--- hw/ppc/mac_newworld.c | 2 -- hw/ppc/mac_oldworld.c | 2 -- hw/ppc/prep.c | 3 --- hw/sparc64/sun4u.c | 7 +------ include/hw/ide.h | 6 ------ include/hw/ide/internal.h | 3 +++ include/hw/ide/pci.h | 3 ++- include/hw/misc/macio/macio.h | 1 + include/hw/southbridge/piix.h | 3 +-- 20 files changed, 37 insertions(+), 104 deletions(-)
Signature · 1 line
2.21.1
PATCH 2/8 hw/ide: Get rid of piix4_init function
This removes pci_piix4_ide_init() function similar to clean up done to other ide devices.
--- hw/ide/piix.c | 12 +----------- hw/isa/piix4.c | 5 ++++- include/hw/ide.h | 1 - 3 files changed, 5 insertions(+), 13 deletions(-)
hw/ide/piix.c +1 -11
@@ -208,17 +208,6 @@ static void pci_piix_ide_exitfn(PCIDevice *dev) } } -/* hd_table must contain 4 block drivers */ -/* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */ -PCIDevice *pci_piix4_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn) -{ -PCIDevice *dev; - - dev =pci_create_simple (bus, devfn,"piix4-ide" ); -pci_ide_create_devs (dev, hd_table); -return dev; -} -/* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */ static void piix3_ide_class_init (ObjectClass *klass,void *data) {
@@ -247,6 +236,7 @@ static const TypeInfo piix3_ide_xen_info = { .class_init = piix3_ide_class_init, }; +/* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */ static void piix4_ide_class_init (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass);
hw/isa/piix4.c +4 -1
@@ -35,6 +35,7 @@#include "hw/timer/i8254.h" #include "hw/rtc/mc146818rtc.h" #include "hw/ide.h" +#include "hw/ide/pci.h" #include "migration/vmstate.h" #include "sysemu/reset.h" #include "sysemu/runstate.h"
@@ -255,10 +256,12 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, *isa_bus =ISA_BUS (qdev_get_child_bus (dev,"isa.0" )); } + pci =pci_create_simple (pci_bus, pci->devfn +1 ,"piix4-ide" ); hd = g_new(DriveInfo *, ide_drives);ide_drive_get (hd, ide_drives); -pci_piix4_ide_init (pci_bus, hd, pci->devfn +1 ); +pci_ide_create_devs (pci, hd);g_free (hd); +pci_create_simple (pci_bus, pci->devfn +2 ,"piix4-usb-uhci" );if (smbus) { *smbus = piix4_pm_init(pci_bus, pci->devfn + 3, 0x1100,
include/hw/ide.h +0 -1
@@ -12,7 +12,6 @@ ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq, DriveInfo *hd0, DriveInfo *hd1);/* ide-pci.c */ -PCIDevice *pci_piix4_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn);int pci_piix3_xen_ide_unplug (DeviceState *dev,bool aux);/* ide-mmio.c */
Signature · 1 line
2.21.1
PATCH 3/8 hw/ide: Remove now unneded #include "hw/pci/pci.h" from hw/ide.h
In reply to BALATON ZoltanAfter previous patches we don't need hw/pci/pci.h any more in hw/ide.h. Some files depended on implicit inclusion by this header which are also fixed up here.
--- hw/ide/ahci_internal.h | 1 + include/hw/ide.h | 1 - include/hw/ide/pci.h | 1 + include/hw/misc/macio/macio.h | 1 + 4 files changed, 3 insertions(+), 1 deletion(-)
hw/ide/ahci_internal.h +1 -0
@@ -27,6 +27,7 @@#include "hw/ide/ahci.h" #include "hw/ide/internal.h" #include "hw/sysbus.h" +#include "hw/pci/pci.h" #define AHCI_MEM_BAR_SIZE 0x1000#define AHCI_MAX_PORTS 32
include/hw/ide.h +0 -1
@@ -2,7 +2,6 @@#define HW_IDE_H #include "hw/isa/isa.h" -#include "hw/pci/pci.h" #include "exec/memory.h" #define MAX_IDE_DEVS 2
include/hw/ide/pci.h +1 -0
@@ -2,6 +2,7 @@#define HW_IDE_PCI_H #include "hw/ide/internal.h" +#include "hw/pci/pci.h" #define BM_STATUS_DMAING 0x01#define BM_STATUS_ERROR 0x02
include/hw/misc/macio/macio.h +1 -0
@@ -27,6 +27,7 @@#define MACIO_H #include "hw/char/escc.h" +#include "hw/pci/pci.h" #include "hw/ide/internal.h" #include "hw/intc/heathrow_pic.h" #include "hw/misc/macio/cuda.h"
Signature · 1 line
2.21.1
PATCH 6/8 hw/ide: Do ide_drive_get() within pci_ide_create_devs()
In reply to BALATON ZoltanThe pci_ide_create_devs() function takes a hd_table parameter but all callers just pass what ide_drive_get() returns so we can do it locally simplifying callers and removing hd_table parameter.
--- hw/alpha/dp264.c | 13 +++---------- hw/i386/pc_piix.c | 9 +++++---- hw/ide/pci.c | 5 +++-- hw/isa/piix4.c | 10 ++-------- hw/mips/mips_fulong2e.c | 4 +--- hw/mips/mips_malta.c | 2 +- hw/sparc64/sun4u.c | 6 +----- include/hw/ide/pci.h | 2 +- include/hw/southbridge/piix.h | 3 +-- 9 files changed, 18 insertions(+), 36 deletions(-)
hw/alpha/dp264.c +3 -10
@@ -15,7 +15,6 @@#include "qemu/error-report.h" #include "sysemu/sysemu.h" #include "hw/rtc/mc146818rtc.h" -#include "hw/ide.h" #include "hw/ide/pci.h" #include "hw/timer/i8254.h" #include "hw/isa/superio.h"
@@ -56,6 +55,7 @@ static void clipper_init(MachineState *machine)const char *initrd_filename = machine->initrd_filename;AlphaCPU *cpus[4 ];PCIBus *pci_bus; +PCIDevice *pci_dev;ISABus *isa_bus;qemu_irq rtc_irq;long size, i;
@@ -98,15 +98,8 @@ static void clipper_init(MachineState *machine)isa_create_simple (isa_bus,TYPE_SMC37C669_SUPERIO );/* IDE disk setup. */ - { -DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ]; -PCIDevice *pci_dev; - -ide_drive_get (hd,ARRAY_SIZE (hd)); - - pci_dev =pci_create_simple (pci_bus,-1 ,"cmd646-ide" ); -pci_ide_create_devs (pci_dev, hd); - } + pci_dev =pci_create_simple (pci_bus,-1 ,"cmd646-ide" ); +pci_ide_create_devs (pci_dev);/* Load PALcode. Given that this is not "real" cpu palcode, but one explicitly written for the emulation, we might as
hw/i386/pc_piix.c +5 -4
@@ -84,7 +84,6 @@ static void pc_init1(MachineState *machine,int piix3_devfn =-1 ;qemu_irq smi_irq;GSIState *gsi_state; -DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ];BusState *idebus[MAX_IDE_BUS ];ISADevice *rtc_state;MemoryRegion *ram_memory;
@@ -238,20 +237,22 @@ static void pc_init1(MachineState *machine,pc_nic_init (pcmc, isa_bus, pci_bus); -ide_drive_get (hd,ARRAY_SIZE (hd));if (pcmc->pci_enabled) {PCIDevice *dev; dev =pci_create_simple (pci_bus, piix3_devfn +1 ,xen_enabled () ?"piix3-ide-xen" :"piix3-ide" ); -pci_ide_create_devs (dev, hd); +pci_ide_create_devs (dev); idebus[0 ] =qdev_get_child_bus (&dev->qdev,"ide.0" ); idebus[1 ] =qdev_get_child_bus (&dev->qdev,"ide.1" );pc_cmos_init (pcms, idebus[0 ], idebus[1 ], rtc_state); }#ifdef CONFIG_IDE_ISA -else { + else { +DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ];int i; + +ide_drive_get (hd,ARRAY_SIZE (hd));for (i =0 ; i <MAX_IDE_BUS ; i++) {ISADevice *dev;char busname[] ="ide.0" ;
hw/ide/pci.c +3 -2
@@ -476,14 +476,15 @@ const VMStateDescription vmstate_ide_pci = { } }; -/* hd_table must contain 4 block drivers */ -void pci_ide_create_devs (PCIDevice *dev,DriveInfo **hd_table) +void pci_ide_create_devs (PCIDevice *dev) {PCIIDEState *d =PCI_IDE (dev); +DriveInfo *hd_table[MAX_IDE_BUS *MAX_IDE_DEVS ];static const int bus[4 ] = {0 ,0 ,1 ,1 };static const int unit[4 ] = {0 ,1 ,0 ,1 };int i; +ide_drive_get (hd_table,ARRAY_SIZE (hd_table));for (i =0 ; i <4 ; i++) {if (hd_table[i]) {ide_create_drive (d->bus + bus[i], unit[i], hd_table[i]);
hw/isa/piix4.c +2 -8
@@ -241,11 +241,8 @@ static void piix4_register_types(void)type_init (piix4_register_types) -DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, -I2CBus **smbus,size_t ide_buses) +DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, I2CBus **smbus) { -size_t ide_drives = ide_buses *MAX_IDE_DEVS ; -DriveInfo **hd;PCIDevice *pci;DeviceState *dev;
@@ -257,10 +254,7 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, } pci =pci_create_simple (pci_bus, pci->devfn +1 ,"piix4-ide" ); - hd = g_new(DriveInfo *, ide_drives); -ide_drive_get (hd, ide_drives); -pci_ide_create_devs (pci, hd); -g_free (hd); +pci_ide_create_devs (pci);pci_create_simple (pci_bus, pci->devfn +2 ,"piix4-usb-uhci" );if (smbus) {
hw/mips/mips_fulong2e.c +1 -3
@@ -238,7 +238,6 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc, {qemu_irq *i8259;ISABus *isa_bus; -DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ];PCIDevice *dev; isa_bus =vt82c686b_isa_init (pci_bus,PCI_DEVFN (slot,0 ));
@@ -258,8 +257,7 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc,isa_create_simple (isa_bus,TYPE_VT82C686B_SUPERIO ); dev =pci_create_simple (pci_bus,PCI_DEVFN (slot,1 ),"via-ide" ); -ide_drive_get (hd,ARRAY_SIZE (hd)); -pci_ide_create_devs (dev, hd); +pci_ide_create_devs (dev);pci_create_simple (pci_bus,PCI_DEVFN (slot,2 ),"vt82c686b-usb-uhci" );pci_create_simple (pci_bus,PCI_DEVFN (slot,3 ),"vt82c686b-usb-uhci" );
hw/mips/mips_malta.c +1 -1
@@ -1401,7 +1401,7 @@ void mips_malta_init(MachineState *machine) pci_bus =gt64120_register (s->i8259);/* Southbridge */ - dev =piix4_create (pci_bus, &isa_bus, &smbus,MAX_IDE_BUS ); + dev =piix4_create (pci_bus, &isa_bus, &smbus);/* Interrupt controller */ qdev_connect_gpio_out_named (dev,"intr" ,0 , i8259_irq);
hw/sparc64/sun4u.c +1 -5
@@ -50,7 +50,6 @@#include "hw/sparc/sparc64.h" #include "hw/nvram/fw_cfg.h" #include "hw/sysbus.h" -#include "hw/ide.h" #include "hw/ide/pci.h" #include "hw/loader.h" #include "hw/fw-path-provider.h"
@@ -562,7 +561,6 @@ static void sun4uv_init(MemoryRegion *address_space_mem,PCIBus *pci_bus, *pci_busA, *pci_busB;PCIDevice *ebus, *pci_dev;SysBusDevice *s; -DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ];DeviceState *iommu, *dev;FWCfgState *fw_cfg;NICInfo *nd;
@@ -662,12 +660,10 @@ static void sun4uv_init(MemoryRegion *address_space_mem,qemu_macaddr_default_if_unset (&macaddr); } -ide_drive_get (hd,ARRAY_SIZE (hd)); - pci_dev =pci_create (pci_busA,PCI_DEVFN (3 ,0 ),"cmd646-ide" );qdev_prop_set_uint32 (&pci_dev->qdev,"secondary" ,1 );qdev_init_nofail (&pci_dev->qdev); -pci_ide_create_devs (pci_dev, hd); +pci_ide_create_devs (pci_dev);/* Map NVRAM into I/O (ebus) space */ nvram =m48t59_init (NULL ,0 ,0 ,NVRAM_SIZE ,1968 ,59 );
include/hw/ide/pci.h +1 -1
@@ -63,7 +63,7 @@ static inline IDEState *bmdma_active_if(BMDMAState *bmdma)void bmdma_init (IDEBus *bus,BMDMAState *bm,PCIIDEState *d);void bmdma_cmd_writeb (BMDMAState *bm,uint32_t val);extern MemoryRegionOps bmdma_addr_ioport_ops; -void pci_ide_create_devs (PCIDevice *dev,DriveInfo **hd_table); +void pci_ide_create_devs (PCIDevice *dev);extern const VMStateDescription vmstate_ide_pci;extern const MemoryRegionOps pci_ide_cmd_le_ops;
include/hw/southbridge/piix.h +1 -2
@@ -68,7 +68,6 @@ extern PCIDevice *piix4_dev;PIIX3State *piix3_create (PCIBus *pci_bus,ISABus **isa_bus); -DeviceState *piix4_create (PCIBus *pci_bus,ISABus **isa_bus, -I2CBus **smbus,size_t ide_buses); +DeviceState *piix4_create (PCIBus *pci_bus,ISABus **isa_bus,I2CBus **smbus);#endif
Signature · 1 line
2.21.1
PATCH 7/8 hw/ide: Move MAX_IDE_DEVS define to hw/ide/internal.h
In reply to BALATON ZoltanWe can move it next to the MAX_IDE_BUS define now that less files use it.
--- include/hw/ide.h | 2 -- include/hw/ide/internal.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-)
include/hw/ide.h +0 -2
@@ -4,8 +4,6 @@#include "hw/isa/isa.h" #include "exec/memory.h" -#define MAX_IDE_DEVS 2 -/* ide-isa.c */ ISADevice *isa_ide_init (ISABus *bus,int iobase,int iobase2,int isairq,DriveInfo *hd0,DriveInfo *hd1);
include/hw/ide/internal.h +1 -0
@@ -28,6 +28,7 @@ typedef struct IDEDMAOps IDEDMAOps;#define IDE_BUS (obj) OBJECT_CHECK(IDEBus, (obj), TYPE_IDE_BUS)#define MAX_IDE_BUS 2 +#define MAX_IDE_DEVS 2/* Bits of HD_STATUS */ #define ERR_STAT 0x01
Signature · 1 line
2.21.1
PATCH 1/8 hw/ide: Get rid of piix3_init functions
In reply to BALATON ZoltanThis removes pci_piix3_ide_init() and pci_piix3_xen_ide_init() functions similar to clean up done to other ide devices.
--- hw/i386/pc_piix.c | 10 +++++----- hw/ide/pci.c | 1 + hw/ide/piix.c | 21 +-------------------- include/hw/ide.h | 2 -- 4 files changed, 7 insertions(+), 27 deletions(-)
hw/i386/pc_piix.c +5 -5
@@ -39,6 +39,7 @@#include "hw/usb.h" #include "net/net.h" #include "hw/ide.h" +#include "hw/ide/pci.h" #include "hw/irq.h" #include "sysemu/kvm.h" #include "hw/kvm/clock.h"
@@ -242,11 +243,10 @@ static void pc_init1(MachineState *machine,ide_drive_get (hd,ARRAY_SIZE (hd));if (pcmc->pci_enabled) {PCIDevice *dev; -if (xen_enabled ()) { - dev =pci_piix3_xen_ide_init (pci_bus, hd, piix3_devfn +1 ); - }else { - dev =pci_piix3_ide_init (pci_bus, hd, piix3_devfn +1 ); - } + + dev =pci_create_simple (pci_bus, piix3_devfn +1 , +xen_enabled () ?"piix3-ide-xen" :"piix3-ide" ); +pci_ide_create_devs (dev, hd); idebus[0 ] =qdev_get_child_bus (&dev->qdev,"ide.0" ); idebus[1 ] =qdev_get_child_bus (&dev->qdev,"ide.1" );pc_cmos_init (pcms, idebus[0 ], idebus[1 ], rtc_state);
hw/ide/pci.c +1 -0
@@ -476,6 +476,7 @@ const VMStateDescription vmstate_ide_pci = { } }; +/* hd_table must contain 4 block drivers */ void pci_ide_create_devs (PCIDevice *dev,DriveInfo **hd_table) {PCIIDEState *d =PCI_IDE (dev);
hw/ide/piix.c +1 -20
@@ -197,15 +197,6 @@ int pci_piix3_xen_ide_unplug(DeviceState *dev, bool aux)return 0 ; } -PCIDevice *pci_piix3_xen_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn) -{ -PCIDevice *dev; - - dev =pci_create_simple (bus, devfn,"piix3-ide-xen" ); -pci_ide_create_devs (dev, hd_table); -return dev; -} -static void pci_piix_ide_exitfn (PCIDevice *dev) {PCIIDEState *d =PCI_IDE (dev);
@@ -217,17 +208,6 @@ static void pci_piix_ide_exitfn(PCIDevice *dev) } } -/* hd_table must contain 4 block drivers */ -/* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */ -PCIDevice *pci_piix3_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn) -{ -PCIDevice *dev; - - dev =pci_create_simple (bus, devfn,"piix3-ide" ); -pci_ide_create_devs (dev, hd_table); -return dev; -} -/* hd_table must contain 4 block drivers */ /* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */ PCIDevice *pci_piix4_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn)
@@ -239,6 +219,7 @@ PCIDevice *pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn)return dev; } +/* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */ static void piix3_ide_class_init (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass);
include/hw/ide.h +0 -2
@@ -12,8 +12,6 @@ ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq, DriveInfo *hd0, DriveInfo *hd1);/* ide-pci.c */ -PCIDevice *pci_piix3_xen_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn); -PCIDevice *pci_piix3_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn);PCIDevice *pci_piix4_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn);int pci_piix3_xen_ide_unplug (DeviceState *dev,bool aux);
Signature · 1 line
2.21.1
PATCH 8/8 hw/ide: Remove unneeded inclusion of hw/ide.h
In reply to BALATON ZoltanAfter previous clean ups we can drop direct inclusion of hw/ide.h from several places.
--- hw/hppa/hppa_sys.h | 1 - hw/hppa/machine.c | 1 - hw/i386/pc_piix.c | 1 - hw/isa/piix4.c | 1 - hw/mips/mips_fulong2e.c | 1 - hw/ppc/mac_newworld.c | 1 - hw/ppc/mac_oldworld.c | 1 - hw/ppc/prep.c | 1 - 8 files changed, 8 deletions(-)
hw/hppa/hppa_sys.h +0 -1
@@ -5,7 +5,6 @@#include "hw/pci/pci.h" #include "hw/pci/pci_host.h" -#include "hw/ide.h" #include "hw/boards.h" #include "hw/intc/i8259.h"
hw/hppa/machine.c +0 -1
@@ -13,7 +13,6 @@#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "hw/rtc/mc146818rtc.h" -#include "hw/ide.h" #include "hw/timer/i8254.h" #include "hw/char/serial.h" #include "hw/net/lasi_82596.h"
hw/i386/pc_piix.c +0 -1
@@ -38,7 +38,6 @@#include "hw/pci/pci_ids.h" #include "hw/usb.h" #include "net/net.h" -#include "hw/ide.h" #include "hw/ide/pci.h" #include "hw/irq.h" #include "sysemu/kvm.h"
hw/isa/piix4.c +0 -1
@@ -34,7 +34,6 @@#include "hw/dma/i8257.h" #include "hw/timer/i8254.h" #include "hw/rtc/mc146818rtc.h" -#include "hw/ide.h" #include "hw/ide/pci.h" #include "migration/vmstate.h" #include "sysemu/reset.h"
hw/mips/mips_fulong2e.c +0 -1
@@ -36,7 +36,6 @@#include "audio/audio.h" #include "qemu/log.h" #include "hw/loader.h" -#include "hw/ide.h" #include "hw/ide/pci.h" #include "elf.h" #include "hw/isa/vt82c686.h"
hw/ppc/mac_newworld.c +0 -1
@@ -62,7 +62,6 @@#include "hw/char/escc.h" #include "hw/misc/macio/macio.h" #include "hw/ppc/openpic.h" -#include "hw/ide.h" #include "hw/loader.h" #include "hw/fw-path-provider.h" #include "elf.h"
hw/ppc/mac_oldworld.c +0 -1
@@ -41,7 +41,6 @@#include "hw/nvram/fw_cfg.h" #include "hw/char/escc.h" #include "hw/misc/macio/macio.h" -#include "hw/ide.h" #include "hw/loader.h" #include "hw/fw-path-provider.h" #include "elf.h"
hw/ppc/prep.c +0 -1
@@ -37,7 +37,6 @@#include "hw/boards.h" #include "qemu/error-report.h" #include "qemu/log.h" -#include "hw/ide.h" #include "hw/irq.h" #include "hw/loader.h" #include "hw/rtc/mc146818rtc.h"
Signature · 1 line
2.21.1
PATCH 4/8 hw/ide: Move MAX_IDE_BUS define to one header
In reply to BALATON ZoltanThere are several definitions of MAX_IDE_BUS in different boards (some of them unused) with the same value. Move it to include/hw/ide/internal.h to have it in a central place.
--- hw/alpha/dp264.c | 2 -- hw/hppa/machine.c | 2 -- hw/i386/pc_piix.c | 2 -- hw/mips/mips_fulong2e.c | 1 - hw/mips/mips_malta.c | 4 +--- hw/mips/mips_r4k.c | 4 +--- hw/ppc/mac_newworld.c | 1 - hw/ppc/mac_oldworld.c | 1 - hw/ppc/prep.c | 2 -- hw/sparc64/sun4u.c | 1 - include/hw/ide/internal.h | 2 ++ 11 files changed, 4 insertions(+), 18 deletions(-)
hw/alpha/dp264.c +0 -2
@@ -24,8 +24,6 @@#include "qemu/cutils.h" #include "net/net.h" -#define MAX_IDE_BUS 2 -static uint64_t cpu_alpha_superpage_to_phys (void *opaque,uint64_t addr) {if (((addr >>41 ) &3 ) ==2 ) {
hw/hppa/machine.c +0 -2
@@ -24,8 +24,6 @@#include "qemu/log.h" #include "net/net.h" -#define MAX_IDE_BUS 2 -static ISABus *hppa_isa_bus (void ) {ISABus *isa_bus;
hw/i386/pc_piix.c +0 -2
@@ -63,8 +63,6 @@#include "sysemu/numa.h" #include "hw/mem/nvdimm.h" -#define MAX_IDE_BUS 2 -#ifdef CONFIG_IDE_ISA static const int ide_iobase[MAX_IDE_BUS ] = {0x1f0 ,0x170 };static const int ide_iobase2[MAX_IDE_BUS ] = {0x3f6 ,0x376 };
hw/mips/mips_fulong2e.c +0 -1
@@ -55,7 +55,6 @@/* fulong 2e has a 512k flash: Winbond W39L040AP70Z */ #define BIOS_SIZE (512 * KiB) -#define MAX_IDE_BUS 2/* * PMON is not part of qemu and released with BSD license, anyone
hw/mips/mips_malta.c +1 -3
@@ -40,7 +40,7 @@#include "sysemu/arch_init.h" #include "qemu/log.h" #include "hw/mips/bios.h" -#include "hw/ide.h" +#include "hw/ide/internal.h" #include "hw/irq.h" #include "hw/loader.h" #include "elf.h"
@@ -68,8 +68,6 @@#define FLASH_SIZE 0x400000 -#define MAX_IDE_BUS 2 - typedef struct { MemoryRegion iomem; MemoryRegion iomem_lo; /* 0 - 0x900 */
hw/mips/mips_r4k.c +1 -3
@@ -25,7 +25,7 @@#include "hw/block/flash.h" #include "qemu/log.h" #include "hw/mips/bios.h" -#include "hw/ide.h" +#include "hw/ide/internal.h" #include "hw/loader.h" #include "elf.h" #include "hw/rtc/mc146818rtc.h"
@@ -37,8 +37,6 @@#include "sysemu/runstate.h" #include "qemu/error-report.h" -#define MAX_IDE_BUS 2 -static const int ide_iobase[2 ] = {0x1f0 ,0x170 };static const int ide_iobase2[2 ] = {0x3f6 ,0x376 };static const int ide_irq[2 ] = {14 ,15 };
hw/ppc/mac_newworld.c +0 -1
@@ -75,7 +75,6 @@#include "hw/sysbus.h" #include "trace.h" -#define MAX_IDE_BUS 2#define CFG_ADDR 0xf0000510#define TBFREQ (100UL * 1000UL * 1000UL)#define CLOCKFREQ (900UL * 1000UL * 1000UL)
hw/ppc/mac_oldworld.c +0 -1
@@ -51,7 +51,6 @@#include "kvm_ppc.h" #include "exec/address-spaces.h" -#define MAX_IDE_BUS 2#define CFG_ADDR 0xf0000510#define TBFREQ 16600000UL#define CLOCKFREQ 266000000UL
hw/ppc/prep.c +0 -2
@@ -56,8 +56,6 @@/* SMP is not enabled, for now */ #define MAX_CPUS 1 -#define MAX_IDE_BUS 2 -#define CFG_ADDR 0xf0000510#define KERNEL_LOAD_ADDR 0x01000000
hw/sparc64/sun4u.c +0 -1
@@ -66,7 +66,6 @@#define PBM_PCI_IO_BASE (PBM_SPECIAL_BASE + 0x02000000ULL)#define PROM_FILENAME "openbios-sparc64"#define NVRAM_SIZE 0x2000 -#define MAX_IDE_BUS 2#define BIOS_CFG_IOPORT 0x510#define FW_CFG_SPARC64_WIDTH (FW_CFG_ARCH_LOCAL + 0x00)#define FW_CFG_SPARC64_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01)
include/hw/ide/internal.h +2 -0
@@ -27,6 +27,8 @@ typedef struct IDEDMAOps IDEDMAOps;#define TYPE_IDE_BUS "IDE"#define IDE_BUS (obj) OBJECT_CHECK(IDEBus, (obj), TYPE_IDE_BUS) +#define MAX_IDE_BUS 2 +/* Bits of HD_STATUS */ #define ERR_STAT 0x01#define INDEX_STAT 0x02
Signature · 1 line
2.21.1
Re: [PATCH 6/8] hw/ide: Do ide_drive_get() within pci_ide_create_devs()
In reply to BALATON ZoltanQuoted 42 lines · BALATON Zoltan
The
pci_ide_create_devs()function takes ahd_tableparameter but all callers just pass whatide_drive_get()returns so we can do it locally simplifying callers and removinghd_tableparameter.Signed-off-by BALATON Zoltan <[email protected]>---
hw/alpha/dp264.c | 13 +++---------- hw/i386/pc_piix.c | 9 +++++---- hw/ide/pci.c | 5 +++-- hw/isa/piix4.c | 10 ++-------- hw/mips/mips_fulong2e.c | 4 +--- hw/mips/mips_malta.c | 2 +- hw/sparc64/sun4u.c | 6 +----- include/hw/ide/pci.h | 2 +- include/hw/southbridge/piix.h | 3 +-- 9 files changed, 18 insertions(+), 36 deletions(-)hw/alpha/dp264.c +1
-2@@ -15,7 +15,6 @@#include "qemu/error-report.h" #include "sysemu/sysemu.h" #include "hw/rtc/mc146818rtc.h" -#include "hw/ide.h" #include "hw/ide/pci.h" #include "hw/timer/i8254.h" #include "hw/isa/superio.h" @@ -56,6 +55,7 @@ static void clipper_init(MachineState *machine)const char *initrd_filename = machine->initrd_filename;AlphaCPU *cpus[4 ];PCIBus *pci_bus; +PCIDevice *pci_dev;ISABus *isa_bus;qemu_irq rtc_irq;long size, i;@@ -98,15 +98,8 @@ static void clipper_init(MachineState *machine)isa_create_simple (isa_bus,TYPE_SMC37C669_SUPERIO );/* IDE disk setup. */ - {
hw/alpha/dp264.c static void clipper_init(MachineState *machine) · line 102
Quoted 10 lines
hw/alpha/dp264.c +2
-8-DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ]; -PCIDevice *pci_dev; - -ide_drive_get (hd,ARRAY_SIZE (hd)); - - pci_dev =pci_create_simple (pci_bus,-1 ,"cmd646-ide" ); -pci_ide_create_devs (pci_dev, hd); - } + pci_dev =pci_create_simple (pci_bus,-1 ,"cmd646-ide" ); +pci_ide_create_devs (pci_dev);
Additionally, I think it may also make sense to move pci_ide_create_devs call into the realize methods of these IDE controllers so boards do not need to do it explicitely. These calls always follow the creation of the device immediately so could just be done internally in IDE device and simplify it further. I can attempt to prepare additional patches for that but first I'd like to hear if anyone has anything against that to avoid doing useless work.
Regards,
BALATON Zoltan
Quoted 187 lines
hw/alpha/dp264.c +0
-0/* Load PALcode. Given that this is not "real" cpu palcode, but one explicitly written for the emulation, we might as hw/i386/pc_piix.c +5
-4@@ -84,7 +84,6 @@ static void pc_init1(MachineState *machine,int piix3_devfn =-1 ;qemu_irq smi_irq;GSIState *gsi_state; -DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ];BusState *idebus[MAX_IDE_BUS ];ISADevice *rtc_state;MemoryRegion *ram_memory;@@ -238,20 +237,22 @@ static void pc_init1(MachineState *machine,pc_nic_init (pcmc, isa_bus, pci_bus); -ide_drive_get (hd,ARRAY_SIZE (hd));if (pcmc->pci_enabled) {PCIDevice *dev; dev =pci_create_simple (pci_bus, piix3_devfn +1 ,xen_enabled () ?"piix3-ide-xen" :"piix3-ide" ); -pci_ide_create_devs (dev, hd); +pci_ide_create_devs (dev); idebus[0 ] =qdev_get_child_bus (&dev->qdev,"ide.0" ); idebus[1 ] =qdev_get_child_bus (&dev->qdev,"ide.1" );pc_cmos_init (pcms, idebus[0 ], idebus[1 ], rtc_state); }#ifdef CONFIG_IDE_ISA -else { + else { +DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ];int i; + +ide_drive_get (hd,ARRAY_SIZE (hd));for (i =0 ; i <MAX_IDE_BUS ; i++) {ISADevice *dev;char busname[] ="ide.0" ;hw/ide/pci.c +3
-2@@ -476,14 +476,15 @@ const VMStateDescription vmstate_ide_pci = { } }; -/* hd_table must contain 4 block drivers */ -void pci_ide_create_devs (PCIDevice *dev,DriveInfo **hd_table) +void pci_ide_create_devs (PCIDevice *dev) {PCIIDEState *d =PCI_IDE (dev); +DriveInfo *hd_table[MAX_IDE_BUS *MAX_IDE_DEVS ];static const int bus[4 ] = {0 ,0 ,1 ,1 };static const int unit[4 ] = {0 ,1 ,0 ,1 };int i; +ide_drive_get (hd_table,ARRAY_SIZE (hd_table));for (i =0 ; i <4 ; i++) {if (hd_table[i]) {ide_create_drive (d->bus + bus[i], unit[i], hd_table[i]);hw/isa/piix4.c +2
-8@@ -241,11 +241,8 @@ static void piix4_register_types(void)type_init (piix4_register_types) -DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, -I2CBus **smbus,size_t ide_buses) +DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, I2CBus **smbus) { -size_t ide_drives = ide_buses *MAX_IDE_DEVS ; -DriveInfo **hd;PCIDevice *pci;DeviceState *dev;@@ -257,10 +254,7 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, } pci =pci_create_simple (pci_bus, pci->devfn +1 ,"piix4-ide" ); - hd = g_new(DriveInfo *, ide_drives); -ide_drive_get (hd, ide_drives); -pci_ide_create_devs (pci, hd); -g_free (hd); +pci_ide_create_devs (pci);pci_create_simple (pci_bus, pci->devfn +2 ,"piix4-usb-uhci" );if (smbus) {hw/mips/mips_fulong2e.c +1
-3@@ -238,7 +238,6 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc, {qemu_irq *i8259;ISABus *isa_bus; -DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ];PCIDevice *dev; isa_bus =vt82c686b_isa_init (pci_bus,PCI_DEVFN (slot,0 ));@@ -258,8 +257,7 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc,isa_create_simple (isa_bus,TYPE_VT82C686B_SUPERIO ); dev =pci_create_simple (pci_bus,PCI_DEVFN (slot,1 ),"via-ide" ); -ide_drive_get (hd,ARRAY_SIZE (hd)); -pci_ide_create_devs (dev, hd); +pci_ide_create_devs (dev);pci_create_simple (pci_bus,PCI_DEVFN (slot,2 ),"vt82c686b-usb-uhci" );pci_create_simple (pci_bus,PCI_DEVFN (slot,3 ),"vt82c686b-usb-uhci" );hw/mips/mips_malta.c +1
-1@@ -1401,7 +1401,7 @@ void mips_malta_init(MachineState *machine) pci_bus =gt64120_register (s->i8259);/* Southbridge */ - dev =piix4_create (pci_bus, &isa_bus, &smbus,MAX_IDE_BUS ); + dev =piix4_create (pci_bus, &isa_bus, &smbus);/* Interrupt controller */ qdev_connect_gpio_out_named (dev,"intr" ,0 , i8259_irq);hw/sparc64/sun4u.c +1
-5@@ -50,7 +50,6 @@#include "hw/sparc/sparc64.h" #include "hw/nvram/fw_cfg.h" #include "hw/sysbus.h" -#include "hw/ide.h" #include "hw/ide/pci.h" #include "hw/loader.h" #include "hw/fw-path-provider.h" @@ -562,7 +561,6 @@ static void sun4uv_init(MemoryRegion *address_space_mem,PCIBus *pci_bus, *pci_busA, *pci_busB;PCIDevice *ebus, *pci_dev;SysBusDevice *s; -DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ];DeviceState *iommu, *dev;FWCfgState *fw_cfg;NICInfo *nd;@@ -662,12 +660,10 @@ static void sun4uv_init(MemoryRegion *address_space_mem,qemu_macaddr_default_if_unset (&macaddr); } -ide_drive_get (hd,ARRAY_SIZE (hd)); - pci_dev =pci_create (pci_busA,PCI_DEVFN (3 ,0 ),"cmd646-ide" );qdev_prop_set_uint32 (&pci_dev->qdev,"secondary" ,1 );qdev_init_nofail (&pci_dev->qdev); -pci_ide_create_devs (pci_dev, hd); +pci_ide_create_devs (pci_dev);/* Map NVRAM into I/O (ebus) space */ nvram =m48t59_init (NULL ,0 ,0 ,NVRAM_SIZE ,1968 ,59 );include/hw/ide/pci.h +1
-1@@ -63,7 +63,7 @@ static inline IDEState *bmdma_active_if(BMDMAState *bmdma)void bmdma_init (IDEBus *bus,BMDMAState *bm,PCIIDEState *d);void bmdma_cmd_writeb (BMDMAState *bm,uint32_t val);extern MemoryRegionOps bmdma_addr_ioport_ops; -void pci_ide_create_devs (PCIDevice *dev,DriveInfo **hd_table); +void pci_ide_create_devs (PCIDevice *dev);extern const VMStateDescription vmstate_ide_pci;extern const MemoryRegionOps pci_ide_cmd_le_ops;include/hw/southbridge/piix.h +1
-2@@ -68,7 +68,6 @@ extern PCIDevice *piix4_dev;PIIX3State *piix3_create (PCIBus *pci_bus,ISABus **isa_bus); -DeviceState *piix4_create (PCIBus *pci_bus,ISABus **isa_bus, -I2CBus **smbus,size_t ide_buses); +DeviceState *piix4_create (PCIBus *pci_bus,ISABus **isa_bus,I2CBus **smbus);#endif
Re: [PATCH 6/8] hw/ide: Do ide_drive_get() within pci_ide_create_devs()
Quoted 11 lines · BALATON Zoltan
Quoted 3 lines
+
pci_dev=pci_create_simple(pci_bus, -1, "cmd646-ide"); +pci_ide_create_devs(pci_dev);Additionally, I think it may also make sense to move
pci_ide_create_devscall into the realize methods of these IDE controllers so boards do not need to do it explicitely. These calls always follow the creation of the device immediately so could just be done internally in IDE device and simplify it further. I can attempt to prepare additional patches for that but first I'd like to hear if anyone has anything against that to avoid doing useless work.
No, it's better to do it separately. I think that otherwise you could add another IDE controller with -device, and both controllers would try to add the drives.
Basically, separating the call means that only automatically added controllers obey "if=ide".
Paolo
Quoted 27 lines · BALATON Zoltan
These are some clean ups to remove more legacy init functions and lessen dependence on
include/hw/ide.hwith some simplifications in board code. There should be no functional change.BALATON Zoltan (8):
hw/ide: Get rid ofpiix3_initfunctions
hw/ide: Get rid ofpiix4_initfunction
hw/ide: Remove now unneded #include "hw/pci/pci.h" fromhw/ide.hhw/ide: MoveMAX_IDE_BUSdefine to one headerhw/ide/pci.c: Coding style update to fix checkpatch errors hw/ide: Doide_drive_get()withinpci_ide_create_devs()hw/ide: MoveMAX_IDE_DEVSdefine tohw/ide/internal.hhw/ide: Remove unneeded inclusion ofhw/ide.hhw/alpha/dp264.c | 15 +++------------ hw/hppa/hppa_sys.h | 1 - hw/hppa/machine.c | 3 --- hw/i386/pc_piix.c | 20 +++++++++----------- hw/ide/ahci_internal.h | 1 + hw/ide/pci.c | 10 ++++++---- hw/ide/piix.c | 31 +------------------------------ hw/isa/piix4.c | 14 +++++--------- hw/mips/mips_fulong2e.c | 6 +----- hw/mips/mips_malta.c | 6 ++---- hw/mips/mips_r4k.c | 4 +--- hw/ppc/mac_newworld.c | 2 -- hw/ppc/mac_oldworld.c | 2 --
Quoted 8 lines
hw/ppc/prep.c | 3 --- hw/sparc64/sun4u.c | 7 +------ include/hw/ide.h | 6 ------ include/hw/ide/internal.h | 3 +++ include/hw/ide/pci.h | 3 ++- include/hw/misc/macio/macio.h | 1 + include/hw/southbridge/piix.h | 3 +-- 20 files changed, 37 insertions(+), 104 deletions(-)
This looks like a good clean-up to me, but certainly it would be good to get a second opinion from people more familiar with the IDE code internals.
ATB,
Mark.
Quoted 38 lines · Mark Cave-Ayland
Quoted 27 lines · BALATON Zoltan
These are some clean ups to remove more legacy init functions and lessen dependence on
include/hw/ide.hwith some simplifications in board code. There should be no functional change.BALATON Zoltan (8):
hw/ide: Get rid ofpiix3_initfunctions
hw/ide: Get rid ofpiix4_initfunction
hw/ide: Remove now unneded #include "hw/pci/pci.h" fromhw/ide.hhw/ide: MoveMAX_IDE_BUSdefine to one headerhw/ide/pci.c: Coding style update to fix checkpatch errors hw/ide: Doide_drive_get()withinpci_ide_create_devs()hw/ide: MoveMAX_IDE_DEVSdefine tohw/ide/internal.hhw/ide: Remove unneeded inclusion ofhw/ide.hhw/alpha/dp264.c | 15 +++------------ hw/hppa/hppa_sys.h | 1 - hw/hppa/machine.c | 3 --- hw/i386/pc_piix.c | 20 +++++++++----------- hw/ide/ahci_internal.h | 1 + hw/ide/pci.c | 10 ++++++---- hw/ide/piix.c | 31 +------------------------------ hw/isa/piix4.c | 14 +++++--------- hw/mips/mips_fulong2e.c | 6 +----- hw/mips/mips_malta.c | 6 ++---- hw/mips/mips_r4k.c | 4 +--- hw/ppc/mac_newworld.c | 2 -- hw/ppc/mac_oldworld.c | 2 --Quoted 8 lines
hw/ppc/prep.c | 3 --- hw/sparc64/sun4u.c | 7 +------ include/hw/ide.h | 6 ------ include/hw/ide/internal.h | 3 +++ include/hw/ide/pci.h | 3 ++- include/hw/misc/macio/macio.h | 1 + include/hw/southbridge/piix.h | 3 +-- 20 files changed, 37 insertions(+), 104 deletions(-)
Quoted 4 lines
This looks like a good clean-up to me, but certainly it would be good to get a second opinion from people more familiar with the IDE code internals.
Reviewed-by Mark Cave-Ayland <[email protected]>
Yes, it looks good to me. Thanks!
Paolo
Re: [PATCH 1/8] hw/ide: Get rid of piix3_init functions
In reply to BALATON ZoltanQuoted 4 lines · BALATON Zoltan
This removes
pci_piix3_ide_init()andpci_piix3_xen_ide_init()functions similar to clean up done to other ide devices.Signed-off-by BALATON Zoltan <[email protected]>
Quoted 107 lines
--- hw/i386/pc_piix.c | 10 +++++----- hw/ide/pci.c | 1 + hw/ide/piix.c | 21 +-------------------- include/hw/ide.h | 2 -- 4 files changed, 7 insertions(+), 27 deletions(-)hw/i386/pc_piix.c +5
-5@@ -39,6 +39,7 @@#include "hw/usb.h" #include "net/net.h" #include "hw/ide.h" +#include "hw/ide/pci.h" #include "hw/irq.h" #include "sysemu/kvm.h" #include "hw/kvm/clock.h" @@ -242,11 +243,10 @@ static void pc_init1(MachineState *machine,ide_drive_get (hd,ARRAY_SIZE (hd));if (pcmc->pci_enabled) {PCIDevice *dev; -if (xen_enabled ()) { - dev =pci_piix3_xen_ide_init (pci_bus, hd, piix3_devfn +1 ); - }else { - dev =pci_piix3_ide_init (pci_bus, hd, piix3_devfn +1 ); - } + + dev =pci_create_simple (pci_bus, piix3_devfn +1 , +xen_enabled () ?"piix3-ide-xen" :"piix3-ide" ); +pci_ide_create_devs (dev, hd); idebus[0 ] =qdev_get_child_bus (&dev->qdev,"ide.0" ); idebus[1 ] =qdev_get_child_bus (&dev->qdev,"ide.1" );pc_cmos_init (pcms, idebus[0 ], idebus[1 ], rtc_state);hw/ide/pci.c +1
-0@@ -476,6 +476,7 @@ const VMStateDescription vmstate_ide_pci = { } }; +/* hd_table must contain 4 block drivers */ void pci_ide_create_devs (PCIDevice *dev,DriveInfo **hd_table) {PCIIDEState *d =PCI_IDE (dev);hw/ide/piix.c +1
-20@@ -197,15 +197,6 @@ int pci_piix3_xen_ide_unplug(DeviceState *dev, bool aux)return 0 ; } -PCIDevice *pci_piix3_xen_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn) -{ -PCIDevice *dev; - - dev =pci_create_simple (bus, devfn,"piix3-ide-xen" ); -pci_ide_create_devs (dev, hd_table); -return dev; -} -static void pci_piix_ide_exitfn (PCIDevice *dev) {PCIIDEState *d =PCI_IDE (dev);@@ -217,17 +208,6 @@ static void pci_piix_ide_exitfn(PCIDevice *dev) } } -/* hd_table must contain 4 block drivers */ -/* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */ -PCIDevice *pci_piix3_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn) -{ -PCIDevice *dev; - - dev =pci_create_simple (bus, devfn,"piix3-ide" ); -pci_ide_create_devs (dev, hd_table); -return dev; -} -/* hd_table must contain 4 block drivers */ /* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */ PCIDevice *pci_piix4_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn)@@ -239,6 +219,7 @@ PCIDevice *pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn)return dev; } +/* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */ static void piix3_ide_class_init (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass);include/hw/ide.h +0
-2@@ -12,8 +12,6 @@ ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq, DriveInfo *hd0, DriveInfo *hd1);/* ide-pci.c */ -PCIDevice *pci_piix3_xen_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn); -PCIDevice *pci_piix3_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn);PCIDevice *pci_piix4_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn);int pci_piix3_xen_ide_unplug (DeviceState *dev,bool aux);
Re: [PATCH 2/8] hw/ide: Get rid of piix4_init function
In reply to BALATON ZoltanQuoted 53 lines · BALATON Zoltan
This removes
pci_piix4_ide_init()function similar to clean up done to other ide devices.Signed-off-by BALATON Zoltan <[email protected]>--- hw/ide/piix.c | 12 +----------- hw/isa/piix4.c | 5 ++++- include/hw/ide.h | 1 - 3 files changed, 5 insertions(+), 13 deletions(-)hw/ide/piix.c +1
-11@@ -208,17 +208,6 @@ static void pci_piix_ide_exitfn(PCIDevice *dev) } } -/* hd_table must contain 4 block drivers */ -/* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */ -PCIDevice *pci_piix4_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn) -{ -PCIDevice *dev; - - dev =pci_create_simple (bus, devfn,"piix4-ide" ); -pci_ide_create_devs (dev, hd_table); -return dev; -} -/* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */ static void piix3_ide_class_init (ObjectClass *klass,void *data) {@@ -247,6 +236,7 @@ static const TypeInfo piix3_ide_xen_info = { .class_init = piix3_ide_class_init, }; +/* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */ static void piix4_ide_class_init (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass);hw/isa/piix4.c +1
-0@@ -35,6 +35,7 @@#include "hw/timer/i8254.h" #include "hw/rtc/mc146818rtc.h" #include "hw/ide.h" +#include "hw/ide/pci.h" #include "migration/vmstate.h" #include "sysemu/reset.h" #include "sysemu/runstate.h"
hw/isa/piix4.c DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, · line 259
Quoted 4 lines
hw/isa/piix4.c +1
-0@@ -255,10 +256,12 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, *isa_bus =ISA_BUS (qdev_get_child_bus (dev,"isa.0" )); } + pci =pci_create_simple (pci_bus, pci->devfn +1 ,"piix4-ide" );
Why are you re-assigning 'pci'?
Quoted 22 lines
hw/isa/piix4.c +2
-1hd = g_new(DriveInfo *, ide_drives);ide_drive_get (hd, ide_drives); -pci_piix4_ide_init (pci_bus, hd, pci->devfn +1 ); +pci_ide_create_devs (pci, hd);g_free (hd); +pci_create_simple (pci_bus, pci->devfn +2 ,"piix4-usb-uhci" );if (smbus) { *smbus = piix4_pm_init(pci_bus, pci->devfn + 3, 0x1100,include/hw/ide.h +0
-1@@ -12,7 +12,6 @@ ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq, DriveInfo *hd0, DriveInfo *hd1);/* ide-pci.c */ -PCIDevice *pci_piix4_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn);int pci_piix3_xen_ide_unplug (DeviceState *dev,bool aux);/* ide-mmio.c */
Re: [PATCH 3/8] hw/ide: Remove now unneded #include "hw/pci/pci.h" from hw/ide.h
In reply to BALATON ZoltanQuoted 5 lines · BALATON Zoltan
After previous patches we don't need
hw/pci/pci.hany more inhw/ide.h. Some files depended on implicit inclusion by this header which are also fixed up here.Signed-off-by BALATON Zoltan <[email protected]>
Quoted 56 lines
--- hw/ide/ahci_internal.h | 1 + include/hw/ide.h | 1 - include/hw/ide/pci.h | 1 + include/hw/misc/macio/macio.h | 1 + 4 files changed, 3 insertions(+), 1 deletion(-)hw/ide/ahci_internal.h +1
-0@@ -27,6 +27,7 @@#include "hw/ide/ahci.h" #include "hw/ide/internal.h" #include "hw/sysbus.h" +#include "hw/pci/pci.h" #define AHCI_MEM_BAR_SIZE 0x1000#define AHCI_MAX_PORTS 32include/hw/ide.h +0
-1@@ -2,7 +2,6 @@#define HW_IDE_H #include "hw/isa/isa.h" -#include "hw/pci/pci.h" #include "exec/memory.h" #define MAX_IDE_DEVS 2include/hw/ide/pci.h +1
-0@@ -2,6 +2,7 @@#define HW_IDE_PCI_H #include "hw/ide/internal.h" +#include "hw/pci/pci.h" #define BM_STATUS_DMAING 0x01#define BM_STATUS_ERROR 0x02include/hw/misc/macio/macio.h +1
-0@@ -27,6 +27,7 @@#define MACIO_H #include "hw/char/escc.h" +#include "hw/pci/pci.h" #include "hw/ide/internal.h" #include "hw/intc/heathrow_pic.h" #include "hw/misc/macio/cuda.h"
Re: [PATCH 5/8] hw/ide/pci.c: Coding style update to fix checkpatch errors
In reply to BALATON ZoltanQuoted 5 lines · BALATON Zoltan
Spaces are required around a + operator and if statements should have braces even for single line. Also make it simpler by reversing the condition instead of breaking the loop.
Signed-off-by BALATON Zoltan <[email protected]>
Quoted 22 lines
--- hw/ide/pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)hw/ide/pci.c +3
-3@@ -485,9 +485,9 @@ void pci_ide_create_devs(PCIDevice *dev, DriveInfo **hd_table)int i;for (i =0 ; i <4 ; i++) { -if (hd_table[i] ==NULL ) -continue ; -ide_create_drive (d->bus+bus[i], unit[i], hd_table[i]); +if (hd_table[i]) { +ide_create_drive (d->bus + bus[i], unit[i], hd_table[i]); + } } }
Re: [PATCH 2/8] hw/ide: Get rid of piix4_init function
In reply to Philippe Mathieu-DaudéQuoted 51 lines · Philippe Mathieu-Daudé
Quoted 50 lines · BALATON Zoltan
This removes
pci_piix4_ide_init()function similar to clean up done to other ide devices.Signed-off-by BALATON Zoltan <[email protected]>--- hw/ide/piix.c | 12 +----------- hw/isa/piix4.c | 5 ++++- include/hw/ide.h | 1 - 3 files changed, 5 insertions(+), 13 deletions(-)hw/ide/piix.c +0
-10@@ -208,17 +208,6 @@ static void pci_piix_ide_exitfn(PCIDevice *dev) } } -/* hd_table must contain 4 block drivers */ -/* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */ -PCIDevice *pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) -{ -PCIDevice *dev; - - dev =pci_create_simple (bus, devfn,"piix4-ide" ); -pci_ide_create_devs (dev, hd_table); -return dev; -} -/* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */ static void piix3_ide_class_init (ObjectClass *klass,void *data) {@@ -247,6 +236,7 @@ static const TypeInfo piix3_ide_xen_info = { .class_init = piix3_ide_class_init, }; +/* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */ static void piix4_ide_class_init(ObjectClass *klass, void *data) {DeviceClass *dc =DEVICE_CLASS (klass);hw/isa/piix4.c +1
-0@@ -35,6 +35,7 @@#include "hw/timer/i8254.h" #include "hw/rtc/mc146818rtc.h" #include "hw/ide.h" +#include "hw/ide/pci.h" #include "migration/vmstate.h" #include "sysemu/reset.h"
Quoted 8 lines
hw/isa/piix4.c DeviceState *piix4_create(PCIBus *pci_bus, ISABus · line 259
Quoted 6 lines
hw/isa/piix4.c +0
-0#include "sysemu/runstate.h" @@ -255,10 +256,12 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, *isa_bus =ISA_BUS (qdev_get_child_bus (dev,"isa.0" )); } + pci =pci_create_simple (pci_bus, pci->devfn +1 ,"piix4-ide" );Why are you re-assigning 'pci'?
Need a place to store it to pass to pci_ide_create_devs below and pci is unused at this point so it can be reused for this. (The variable pci pointing to a PCIDevice was only used at the beginning of the function to cast to dev then it's not needed any more.) Since this is very short func and the reassign is right after its previous usage this should not be too confusing and avoids needing to define another only once used variable fot this. See also patch 6 (http://patchwork.ozlabs.org/patch/1254687/) that simplifies it further.
We could also do without this variable and write:
dev = DEVICE(pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0),
true, TYPE_PIIX4_PCI_DEVICE));
or after patch 6 even
pci_ide_create_devs(pci_create_simple(pci_bus, pci->devfn + 1, "piix4-ide"));
but I think those are less readable than reusing variable pci here.
Regards,
BALATON Zoltan
Quoted 24 lines
Quoted 22 lines
hw/isa/piix4.c +2
-1hd = g_new(DriveInfo *, ide_drives);ide_drive_get (hd, ide_drives); -pci_piix4_ide_init (pci_bus, hd, pci->devfn +1 ); +pci_ide_create_devs (pci, hd);g_free (hd); +pci_create_simple (pci_bus, pci->devfn +2 ,"piix4-usb-uhci" );if (smbus) { *smbus = piix4_pm_init(pci_bus, pci->devfn + 3, 0x1100,include/hw/ide.h +0
-1@@ -12,7 +12,6 @@ ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq, DriveInfo *hd0, DriveInfo *hd1);/* ide-pci.c */ -PCIDevice *pci_piix4_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn);int pci_piix3_xen_ide_unplug (DeviceState *dev,bool aux);/* ide-mmio.c */
Re: [PATCH 2/8] hw/ide: Get rid of piix4_init function
In reply to BALATON ZoltanQuoted 53 lines · BALATON Zoltan
This removes
pci_piix4_ide_init()function similar to clean up done to other ide devices.Signed-off-by BALATON Zoltan <[email protected]>--- hw/ide/piix.c | 12 +----------- hw/isa/piix4.c | 5 ++++- include/hw/ide.h | 1 - 3 files changed, 5 insertions(+), 13 deletions(-)hw/ide/piix.c +1
-11@@ -208,17 +208,6 @@ static void pci_piix_ide_exitfn(PCIDevice *dev) } } -/* hd_table must contain 4 block drivers */ -/* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */ -PCIDevice *pci_piix4_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn) -{ -PCIDevice *dev; - - dev =pci_create_simple (bus, devfn,"piix4-ide" ); -pci_ide_create_devs (dev, hd_table); -return dev; -} -/* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */ static void piix3_ide_class_init (ObjectClass *klass,void *data) {@@ -247,6 +236,7 @@ static const TypeInfo piix3_ide_xen_info = { .class_init = piix3_ide_class_init, }; +/* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */ static void piix4_ide_class_init (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass);hw/isa/piix4.c +1
-0@@ -35,6 +35,7 @@#include "hw/timer/i8254.h" #include "hw/rtc/mc146818rtc.h" #include "hw/ide.h" +#include "hw/ide/pci.h" #include "migration/vmstate.h" #include "sysemu/reset.h" #include "sysemu/runstate.h"
hw/isa/piix4.c DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, · line 264
Quoted 10 lines
hw/isa/piix4.c +3
-1@@ -255,10 +256,12 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, *isa_bus =ISA_BUS (qdev_get_child_bus (dev,"isa.0" )); } + pci =pci_create_simple (pci_bus, pci->devfn +1 ,"piix4-ide" ); hd = g_new(DriveInfo *, ide_drives);ide_drive_get (hd, ide_drives); -pci_piix4_ide_init (pci_bus, hd, pci->devfn +1 ); +pci_ide_create_devs (pci, hd);g_free (hd); +
Why not move pci_create_simple down, and declare a new variable?
- pci_piix4_ide_init(pci_bus, hd, pci->devfn + 1); + pci_dev = pci_create_simple(pci_bus, pci->devfn + 1, "piix4-ide"); + pci_ide_create_devs(pci_dev, hd);
makes it clearer what's going on imho.
Quoted 17 lines
hw/isa/piix4.c +0
-0pci_create_simple (pci_bus, pci->devfn +2 ,"piix4-usb-uhci" );if (smbus) { *smbus = piix4_pm_init(pci_bus, pci->devfn + 3, 0x1100,include/hw/ide.h +0
-1@@ -12,7 +12,6 @@ ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq, DriveInfo *hd0, DriveInfo *hd1);/* ide-pci.c */ -PCIDevice *pci_piix4_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn);int pci_piix3_xen_ide_unplug (DeviceState *dev,bool aux);/* ide-mmio.c */ Signature · 1 line
2.21.1
Re: [PATCH 2/8] hw/ide: Get rid of piix4_init function
Quoted 70 lines · Michael S. Tsirkin
Quoted 53 lines · BALATON Zoltan
This removes
pci_piix4_ide_init()function similar to clean up done to other ide devices.Signed-off-by BALATON Zoltan <[email protected]>--- hw/ide/piix.c | 12 +----------- hw/isa/piix4.c | 5 ++++- include/hw/ide.h | 1 - 3 files changed, 5 insertions(+), 13 deletions(-)hw/ide/piix.c +1
-11@@ -208,17 +208,6 @@ static void pci_piix_ide_exitfn(PCIDevice *dev) } } -/* hd_table must contain 4 block drivers */ -/* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */ -PCIDevice *pci_piix4_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn) -{ -PCIDevice *dev; - - dev =pci_create_simple (bus, devfn,"piix4-ide" ); -pci_ide_create_devs (dev, hd_table); -return dev; -} -/* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */ static void piix3_ide_class_init (ObjectClass *klass,void *data) {@@ -247,6 +236,7 @@ static const TypeInfo piix3_ide_xen_info = { .class_init = piix3_ide_class_init, }; +/* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */ static void piix4_ide_class_init (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass);hw/isa/piix4.c +1
-0@@ -35,6 +35,7 @@#include "hw/timer/i8254.h" #include "hw/rtc/mc146818rtc.h" #include "hw/ide.h" +#include "hw/ide/pci.h" #include "migration/vmstate.h" #include "sysemu/reset.h" #include "sysemu/runstate.h" hw/isa/piix4.c DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, · line 264
Quoted 10 lines
hw/isa/piix4.c +3
-1@@ -255,10 +256,12 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, *isa_bus =ISA_BUS (qdev_get_child_bus (dev,"isa.0" )); } + pci =pci_create_simple (pci_bus, pci->devfn +1 ,"piix4-ide" ); hd = g_new(DriveInfo *, ide_drives);ide_drive_get (hd, ide_drives); -pci_piix4_ide_init (pci_bus, hd, pci->devfn +1 ); +pci_ide_create_devs (pci, hd);g_free (hd); +Why not move
pci_create_simpledown, and declare a new variable?(quoted diff) +2
-1- pci_piix4_ide_init(pci_bus, hd, pci->devfn + 1); + pci_dev = pci_create_simple(pci_bus, pci->devfn + 1, "piix4-ide"); + pci_ide_create_devs(pci_dev, hd);
Quoted 1 line
makes it clearer what's going on imho.
Ends up there after patch 6. Do you still think a new variable would be needed for this after that patch? It's pretty simple and clear without all the hd array stuff even reusing pci variable. (Or I could rename pci to pci_dev but really don't think it worth having two once used variable in such a simple function. Normally such variables are called dev but in this function that name is taken for a DeviceState *variable.)
Regards,
BALATON Zoltan
Quoted 20 lines
Quoted 18 lines
hw/isa/piix4.c +0
-0pci_create_simple (pci_bus, pci->devfn +2 ,"piix4-usb-uhci" );if (smbus) { *smbus = piix4_pm_init(pci_bus, pci->devfn + 3, 0x1100,include/hw/ide.h +0
-2@@ -12,7 +12,6 @@ ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq, DriveInfo *hd0, DriveInfo *hd1);/* ide-pci.c */ -PCIDevice *pci_piix4_ide_init (PCIBus *bus,DriveInfo **hd_table,int devfn);int pci_piix3_xen_ide_unplug (DeviceState *dev,bool aux);/* ide-mmio.c */ --2.21.1
Re: [PATCH 6/8] hw/ide: Do ide_drive_get() within pci_ide_create_devs()
In reply to Paolo BonziniQuoted 13 lines · Paolo Bonzini
Quoted 11 lines · BALATON Zoltan
Quoted 3 lines
+
pci_dev=pci_create_simple(pci_bus, -1, "cmd646-ide"); +pci_ide_create_devs(pci_dev);Additionally, I think it may also make sense to move
pci_ide_create_devscall into the realize methods of these IDE controllers so boards do not need to do it explicitely. These calls always follow the creation of the device immediately so could just be done internally in IDE device and simplify it further. I can attempt to prepare additional patches for that but first I'd like to hear if anyone has anything against that to avoid doing useless work.
Quoted 3 lines
No, it's better to do it separately. I think that otherwise you could add another IDE controller with -device, and both controllers would try to add the drives.
Correct.
Creating device frontends for -drive if=ide is the board's job. Boards may delegate to suitable helpers. I'd very much prefer these helpers not to live with device model code. Board and device model code should be cleanly separated to to reduce the temptation to muddle their responsibilities. It's separation of concerns.
I actually wish we had separate sub-trees for boards and devices instead of keeping both in hw/.
Quoted 2 lines
Basically, separating the call means that only automatically added controllers obey "if=ide".
Re: [PATCH 1/8] hw/ide: Get rid of piix3_init functions
In reply to BALATON ZoltanQuoted 2 lines · BALATON Zoltan
This removes
pci_piix3_ide_init()andpci_piix3_xen_ide_init()functions similar to clean up done to other ide devices.
Got a commit hash for "done to other ide devices"?
Quoted 1 line
Signed-off-by BALATON Zoltan <[email protected]>
Quoted 3 lines · BALATON Zoltan
These are some clean ups to remove more legacy init functions and lessen dependence on
include/hw/ide.hwith some simplifications in board code. There should be no functional change.
PATCH 1 could quote precedence more clearly in the commit message, but that's detail.
I don't like PATCH 4.
PATCH 1-3,5-8:
Re: [PATCH 4/8] hw/ide: Move MAX_IDE_BUS define to one header
In reply to BALATON ZoltanQuoted 5 lines · BALATON Zoltan
There are several definitions of
MAX_IDE_BUSin different boards (some of them unused) with the same value. Move it toinclude/hw/ide/internal.hto have it in a central place.Signed-off-by BALATON Zoltan <[email protected]>
This one feels a bit questionable.
The number of (PATA) IDE buses provides by a host bus adapter depends on the HBA. It happens to be 2 for all HBAs we implement, but it could really be anything.
Similar for SATA, where the common number is 6, but could really be anything. I can't see offhand whether any HBA we implement provides a different number.
By moving MAX_IDE_BUS to include/hw/ide/internal.h, you bake the accidental commonality into the interface to the IDE core. I'd prefer not to.
Re: [PATCH 6/8] hw/ide: Do ide_drive_get() within pci_ide_create_devs()
In reply to Markus ArmbrusterQuoted 21 lines · Markus Armbruster
Quoted 13 lines · Paolo Bonzini
Quoted 11 lines · BALATON Zoltan
Quoted 3 lines
+
pci_dev=pci_create_simple(pci_bus, -1, "cmd646-ide"); +pci_ide_create_devs(pci_dev);Additionally, I think it may also make sense to move
pci_ide_create_devscall into the realize methods of these IDE controllers so boards do not need to do it explicitely. These calls always follow the creation of the device immediately so could just be done internally in IDE device and simplify it further. I can attempt to prepare additional patches for that but first I'd like to hear if anyone has anything against that to avoid doing useless work.Quoted 3 lines
No, it's better to do it separately. I think that otherwise you could add another IDE controller with -device, and both controllers would try to add the drives.
Correct.
Quoted 8 lines
Creating device frontends for -drive if=ide is the board's job. Boards may delegate to suitable helpers. I'd very much prefer these helpers not to live with device model code. Board and device model code should be cleanly separated to to reduce the temptation to muddle their responsibilities. It's separation of concerns.
I actually wish we had separate sub-trees for boards and devices instead of keeping both in hw/.
Never too late!
To be clear, you suggest:
- one dir with machines, boards, system-on-module
- one dir with devices, cpu, system-on-chips
Correct?
Quoted 4 lines
Quoted 3 lines
Basically, separating the call means that only automatically added controllers obey "if=ide".
Re: [PATCH 4/8] hw/ide: Move MAX_IDE_BUS define to one header
In reply to Markus ArmbrusterQuoted 14 lines · Markus Armbruster
Quoted 5 lines · BALATON Zoltan
There are several definitions of
MAX_IDE_BUSin different boards (some of them unused) with the same value. Move it toinclude/hw/ide/internal.hto have it in a central place.Signed-off-by BALATON Zoltan <[email protected]>This one feels a bit questionable.
The number of (PATA) IDE buses provides by a host bus adapter depends on the HBA. It happens to be 2 for all HBAs we implement, but it could really be anything.
Quoted 7 lines
Similar for SATA, where the common number is 6, but could really be anything. I can't see offhand whether any HBA we implement provides a different number.
By moving
MAX_IDE_BUStoinclude/hw/ide/internal.h, you bake the accidental commonality into the interface to the IDE core. I'd prefer not to.
I agree with Markus here (I kept this commit tagged because I was thinking the same but didn't know how to express it correctly. Thanks Markus!).
Re: [PATCH 1/8] hw/ide: Get rid of piix3_init functions
In reply to Markus ArmbrusterQuoted 5 lines · Markus Armbruster
Quoted 2 lines · BALATON Zoltan
This removes
pci_piix3_ide_init()andpci_piix3_xen_ide_init()functions similar to clean up done to other ide devices.Got a commit hash for "done to other ide devices"?
Not yet in master, patches to CMD646 from Mark are queued in ide tree and I've submitted another one for via-ide as part of another series fixing that model which is also part of the latest version of that series revised by Mark. These are hopefully merged together so should appear close in log to be clear which these refer to.
Regards,
BALATON Zoltan
PATCH v2 1/1 hw/ide: Move MAX_IDE_DEVS define to hw/ide/internal.h
In reply to BALATON ZoltanWe can move this define now that less files use it to internal.h to further reduce dependency on hw/ide.h.
---
v2: Alternative version of patch 7 that applies without
[PATCH 4/8] hw/ide: Move MAX_IDE_BUS define to one header
include/hw/ide.h | 2 -- include/hw/ide/internal.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)
include/hw/ide.h +0 -2
@@ -4,8 +4,6 @@#include "hw/isa/isa.h" #include "exec/memory.h" -#define MAX_IDE_DEVS 2 -/* ide-isa.c */ ISADevice *isa_ide_init (ISABus *bus,int iobase,int iobase2,int isairq,DriveInfo *hd0,DriveInfo *hd1);
include/hw/ide/internal.h +2 -0
@@ -27,6 +27,8 @@ typedef struct IDEDMAOps IDEDMAOps;#define TYPE_IDE_BUS "IDE"#define IDE_BUS (obj) OBJECT_CHECK(IDEBus, (obj), TYPE_IDE_BUS) +#define MAX_IDE_DEVS 2 +/* Bits of HD_STATUS */ #define ERR_STAT 0x01#define INDEX_STAT 0x02
Signature · 1 line
2.21.1
Quoted 9 lines · Markus Armbruster
Quoted 3 lines · BALATON Zoltan
These are some clean ups to remove more legacy init functions and lessen dependence on
include/hw/ide.hwith some simplifications in board code. There should be no functional change.PATCH 1 could quote precedence more clearly in the commit message, but that's detail.
I don't like PATCH 4.
Sent alternative v2 version of patch 7 so you can drop patch 4 if you like, the rest of the series should apply unchanged. Note that there might be some places where MAX_IDE_BUS is defined but not used and current code probably has assumption about this being 2 elsewhere and would break with any other value so other than philosophical there should be no reason to keep this defined everywhere.
Quoted 2 lines
PATCH 1-3,5-8:
Reviewed-by Markus Armbruster <[email protected]>
Thanks.
Regards,
BALATON Zoltan
Re: [PATCH 6/8] hw/ide: Do ide_drive_get() within pci_ide_create_devs()
In reply to Philippe Mathieu-DaudéQuoted 31 lines · Philippe Mathieu-Daudé
Quoted 21 lines · Markus Armbruster
Quoted 13 lines · Paolo Bonzini
Quoted 11 lines · BALATON Zoltan
Quoted 3 lines
+
pci_dev=pci_create_simple(pci_bus, -1, "cmd646-ide"); +pci_ide_create_devs(pci_dev);Additionally, I think it may also make sense to move
pci_ide_create_devscall into the realize methods of these IDE controllers so boards do not need to do it explicitely. These calls always follow the creation of the device immediately so could just be done internally in IDE device and simplify it further. I can attempt to prepare additional patches for that but first I'd like to hear if anyone has anything against that to avoid doing useless work.Quoted 3 lines
No, it's better to do it separately. I think that otherwise you could add another IDE controller with -device, and both controllers would try to add the drives.
Correct.
Quoted 8 lines
Creating device frontends for -drive if=ide is the board's job. Boards may delegate to suitable helpers. I'd very much prefer these helpers not to live with device model code. Board and device model code should be cleanly separated to to reduce the temptation to muddle their responsibilities. It's separation of concerns.
I actually wish we had separate sub-trees for boards and devices instead of keeping both in hw/.
Quoted 8 lines
Never too late!
To be clear, you suggest:
- one dir with machines, boards, system-on-module
- one dir with devices, cpu, system-on-chipsCorrect?
In QOM terms:
* One sub-tree with descendants of TYPE_DEVICE
* One sub-tree with descendants of TYPE_MACHINE
Quoted 6 lines · BALATON Zoltan
Quoted 5 lines · Markus Armbruster
Quoted 3 lines · BALATON Zoltan
These are some clean ups to remove more legacy init functions and lessen dependence on
include/hw/ide.hwith some simplifications in board code. There should be no functional change.
Quoted 6 lines
Quoted 4 lines
PATCH 1 could quote precedence more clearly in the commit message, but that's detail.
I don't like PATCH 4.
Sent alternative v2 version of patch 7 so you can drop patch 4 if you like,
and patch 6 v2 also sent that is affected as well if you drop patch 4.
Quoted 10 lines
the rest of the series should apply unchanged. Note that there might be some places where
MAX_IDE_BUSis defined but not used and current code probably has assumption about this being 2 elsewhere and would break with any other value so other than philosophical there should be no reason to keep this defined everywhere.Quoted 2 lines
PATCH 1-3,5-8:
Reviewed-by Markus Armbruster <[email protected]>Thanks.
Regards,
BALATON Zoltan
PATCH v2 1/1 hw/ide: Do ide_drive_get() within pci_ide_create_devs()
In reply to BALATON ZoltanThe pci_ide_create_devs() function takes a hd_table parameter but all callers just pass what ide_drive_get() returns so we can do it locally simplifying callers and removing hd_table parameter.
---
v2: Alternative version that applies without [PATCH 4/8] hw/ide: Move
MAX_IDE_BUS define to one header
hw/alpha/dp264.c | 13 +++---------- hw/i386/pc_piix.c | 9 +++++---- hw/ide/pci.c | 4 +++- hw/isa/piix4.c | 10 ++-------- hw/mips/mips_fulong2e.c | 4 +--- hw/mips/mips_malta.c | 2 +- hw/sparc64/sun4u.c | 6 +----- include/hw/ide/pci.h | 2 +- include/hw/southbridge/piix.h | 3 +-- 9 files changed, 18 insertions(+), 35 deletions(-)
hw/alpha/dp264.c +3 -10
@@ -15,7 +15,6 @@#include "qemu/error-report.h" #include "sysemu/sysemu.h" #include "hw/rtc/mc146818rtc.h" -#include "hw/ide.h" #include "hw/ide/pci.h" #include "hw/timer/i8254.h" #include "hw/isa/superio.h"
@@ -58,6 +57,7 @@ static void clipper_init(MachineState *machine)const char *initrd_filename = machine->initrd_filename;AlphaCPU *cpus[4 ];PCIBus *pci_bus; +PCIDevice *pci_dev;ISABus *isa_bus;qemu_irq rtc_irq;long size, i;
@@ -100,15 +100,8 @@ static void clipper_init(MachineState *machine)isa_create_simple (isa_bus,TYPE_SMC37C669_SUPERIO );/* IDE disk setup. */ - { -DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ]; -PCIDevice *pci_dev; - -ide_drive_get (hd,ARRAY_SIZE (hd)); - - pci_dev =pci_create_simple (pci_bus,-1 ,"cmd646-ide" ); -pci_ide_create_devs (pci_dev, hd); - } + pci_dev =pci_create_simple (pci_bus,-1 ,"cmd646-ide" ); +pci_ide_create_devs (pci_dev);/* Load PALcode. Given that this is not "real" cpu palcode, but one explicitly written for the emulation, we might as
hw/i386/pc_piix.c +5 -4
@@ -86,7 +86,6 @@ static void pc_init1(MachineState *machine,int piix3_devfn =-1 ;qemu_irq smi_irq;GSIState *gsi_state; -DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ];BusState *idebus[MAX_IDE_BUS ];ISADevice *rtc_state;MemoryRegion *ram_memory;
@@ -240,20 +239,22 @@ static void pc_init1(MachineState *machine,pc_nic_init (pcmc, isa_bus, pci_bus); -ide_drive_get (hd,ARRAY_SIZE (hd));if (pcmc->pci_enabled) {PCIDevice *dev; dev =pci_create_simple (pci_bus, piix3_devfn +1 ,xen_enabled () ?"piix3-ide-xen" :"piix3-ide" ); -pci_ide_create_devs (dev, hd); +pci_ide_create_devs (dev); idebus[0 ] =qdev_get_child_bus (&dev->qdev,"ide.0" ); idebus[1 ] =qdev_get_child_bus (&dev->qdev,"ide.1" );pc_cmos_init (pcms, idebus[0 ], idebus[1 ], rtc_state); }#ifdef CONFIG_IDE_ISA -else { + else { +DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ];int i; + +ide_drive_get (hd,ARRAY_SIZE (hd));for (i =0 ; i <MAX_IDE_BUS ; i++) {ISADevice *dev;char busname[] ="ide.0" ;
hw/ide/pci.c +3 -1
@@ -477,13 +477,15 @@ const VMStateDescription vmstate_ide_pci = { };/* hd_table must contain 4 block drivers */ -void pci_ide_create_devs (PCIDevice *dev,DriveInfo **hd_table) +void pci_ide_create_devs (PCIDevice *dev) {PCIIDEState *d =PCI_IDE (dev); +DriveInfo *hd_table[2 *MAX_IDE_DEVS ];static const int bus[4 ] = {0 ,0 ,1 ,1 };static const int unit[4 ] = {0 ,1 ,0 ,1 };int i; +ide_drive_get (hd_table,ARRAY_SIZE (hd_table));for (i =0 ; i <4 ; i++) {if (hd_table[i]) {ide_create_drive (d->bus + bus[i], unit[i], hd_table[i]);
hw/isa/piix4.c +2 -8
@@ -241,11 +241,8 @@ static void piix4_register_types(void)type_init (piix4_register_types) -DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, -I2CBus **smbus,size_t ide_buses) +DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, I2CBus **smbus) { -size_t ide_drives = ide_buses *MAX_IDE_DEVS ; -DriveInfo **hd;PCIDevice *pci;DeviceState *dev;
@@ -257,10 +254,7 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, } pci =pci_create_simple (pci_bus, pci->devfn +1 ,"piix4-ide" ); - hd = g_new(DriveInfo *, ide_drives); -ide_drive_get (hd, ide_drives); -pci_ide_create_devs (pci, hd); -g_free (hd); +pci_ide_create_devs (pci);pci_create_simple (pci_bus, pci->devfn +2 ,"piix4-usb-uhci" );if (smbus) {
hw/mips/mips_fulong2e.c +1 -3
@@ -239,7 +239,6 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc, {qemu_irq *i8259;ISABus *isa_bus; -DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ];PCIDevice *dev; isa_bus =vt82c686b_isa_init (pci_bus,PCI_DEVFN (slot,0 ));
@@ -259,8 +258,7 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc,isa_create_simple (isa_bus,TYPE_VT82C686B_SUPERIO ); dev =pci_create_simple (pci_bus,PCI_DEVFN (slot,1 ),"via-ide" ); -ide_drive_get (hd,ARRAY_SIZE (hd)); -pci_ide_create_devs (dev, hd); +pci_ide_create_devs (dev);pci_create_simple (pci_bus,PCI_DEVFN (slot,2 ),"vt82c686b-usb-uhci" );pci_create_simple (pci_bus,PCI_DEVFN (slot,3 ),"vt82c686b-usb-uhci" );
hw/mips/mips_malta.c +1 -1
@@ -1403,7 +1403,7 @@ void mips_malta_init(MachineState *machine) pci_bus =gt64120_register (s->i8259);/* Southbridge */ - dev =piix4_create (pci_bus, &isa_bus, &smbus,MAX_IDE_BUS ); + dev =piix4_create (pci_bus, &isa_bus, &smbus);/* Interrupt controller */ qdev_connect_gpio_out_named (dev,"intr" ,0 , i8259_irq);
hw/sparc64/sun4u.c +1 -5
@@ -50,7 +50,6 @@#include "hw/sparc/sparc64.h" #include "hw/nvram/fw_cfg.h" #include "hw/sysbus.h" -#include "hw/ide.h" #include "hw/ide/pci.h" #include "hw/loader.h" #include "hw/fw-path-provider.h"
@@ -563,7 +562,6 @@ static void sun4uv_init(MemoryRegion *address_space_mem,PCIBus *pci_bus, *pci_busA, *pci_busB;PCIDevice *ebus, *pci_dev;SysBusDevice *s; -DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ];DeviceState *iommu, *dev;FWCfgState *fw_cfg;NICInfo *nd;
@@ -663,12 +661,10 @@ static void sun4uv_init(MemoryRegion *address_space_mem,qemu_macaddr_default_if_unset (&macaddr); } -ide_drive_get (hd,ARRAY_SIZE (hd)); - pci_dev =pci_create (pci_busA,PCI_DEVFN (3 ,0 ),"cmd646-ide" );qdev_prop_set_uint32 (&pci_dev->qdev,"secondary" ,1 );qdev_init_nofail (&pci_dev->qdev); -pci_ide_create_devs (pci_dev, hd); +pci_ide_create_devs (pci_dev);/* Map NVRAM into I/O (ebus) space */ nvram =m48t59_init (NULL ,0 ,0 ,NVRAM_SIZE ,1968 ,59 );
include/hw/ide/pci.h +1 -1
@@ -63,7 +63,7 @@ static inline IDEState *bmdma_active_if(BMDMAState *bmdma)void bmdma_init (IDEBus *bus,BMDMAState *bm,PCIIDEState *d);void bmdma_cmd_writeb (BMDMAState *bm,uint32_t val);extern MemoryRegionOps bmdma_addr_ioport_ops; -void pci_ide_create_devs (PCIDevice *dev,DriveInfo **hd_table); +void pci_ide_create_devs (PCIDevice *dev);extern const VMStateDescription vmstate_ide_pci;extern const MemoryRegionOps pci_ide_cmd_le_ops;
include/hw/southbridge/piix.h +1 -2
@@ -68,7 +68,6 @@ extern PCIDevice *piix4_dev;PIIX3State *piix3_create (PCIBus *pci_bus,ISABus **isa_bus); -DeviceState *piix4_create (PCIBus *pci_bus,ISABus **isa_bus, -I2CBus **smbus,size_t ide_buses); +DeviceState *piix4_create (PCIBus *pci_bus,ISABus **isa_bus,I2CBus **smbus);#endif
Signature · 1 line
2.21.1
Quoted 10 lines · BALATON Zoltan
Quoted 9 lines · BALATON Zoltan
Quoted 8 lines · Markus Armbruster
Quoted 3 lines · BALATON Zoltan
These are some clean ups to remove more legacy init functions and lessen dependence on
include/hw/ide.hwith some simplifications in board code. There should be no functional change.PATCH 1 could quote precedence more clearly in the commit message, but that's detail.
Quoted 22 lines
Quoted 4 lines
Quoted 1 line
I don't like PATCH 4.
Sent alternative v2 version of patch 7 so you can drop patch 4 if you like,
and patch 6 v2 also sent that is affected as well if you drop patch 4.
Quoted 14 lines
the rest of the series should apply unchanged. Note that there might be some places where
MAX_IDE_BUSis defined but not used and current code probably has assumption about this being 2 elsewhere and would break with any other value so other than philosophical there should be no reason to keep this defined everywhere.Quoted 2 lines
PATCH 1-3,5-8:
Reviewed-by Markus Armbruster <[email protected]>Thanks.
Regards,
BALATON Zoltan
Can you do me a favor and send a proper v2 of the whole series, with review tags applied?
--js