isa: more qdev conversions.
cover isa: more qdev conversions.
Hi,
This patch series converts more isa devices to qdev.
Respin with review remarks fixed and more verbose
commit messages.
cheers,
Gerd
PATCH 1/5 floppy: add drive properties.
--- hw/fdc.c | 50 +++++++++++++++++++++++++++++++++++++------------- hw/fdc.h | 7 ++++--- hw/mips_jazz.c | 5 ++--- hw/mips_malta.c | 5 ++--- hw/pc.c | 6 ++---- hw/ppc_prep.c | 6 ++---- hw/sun4m.c | 16 ++++------------ hw/sun4u.c | 6 ++---- 8 files changed, 55 insertions(+), 46 deletions(-)
hw/fdc.c +37 -13
@@ -81,6 +81,7 @@ typedef enum fdisk_flags_t { } fdisk_flags_t; typedef struct fdrive_t { + DriveInfo *dinfo; BlockDriverState *bs; /* Drive status */ fdrive_type_t drive;
@@ -97,10 +98,10 @@ typedef struct fdrive_t {uint8_t ro;/* Is read-only */ } fdrive_t; -static void fd_init (fdrive_t *drv,BlockDriverState *bs) +static void fd_init (fdrive_t *drv) {/* Drive */ - drv->bs = bs; + drv->bs = drv->dinfo ? drv->dinfo->bdrv :NULL ; drv->drive =FDRIVE_DRV_NONE ; drv->perpendicular =0 ;/* Disk */
@@ -1829,43 +1830,50 @@ static void fdctrl_result_timer(void *opaque) }/* Init functions */ -static void fdctrl_connect_drives (fdctrl_t *fdctrl,BlockDriverState **fds) +static void fdctrl_connect_drives (fdctrl_t *fdctrl) {unsigned int i;for (i =0 ; i <MAX_FD ; i++) { -fd_init (&fdctrl->drives[i], fds[i]); +fd_init (&fdctrl->drives[i]);fd_revalidate (&fdctrl->drives[i]); } } -fdctrl_t *fdctrl_init_isa (BlockDriverState **fds) +fdctrl_t *fdctrl_init_isa (DriveInfo **fds) {fdctrl_t *fdctrl;ISADevice *dev;int dma_chann =2 ; - dev =isa_create_simple ("isa-fdc" ); + dev =isa_create ("isa-fdc" ); +qdev_prop_set_drive (&dev->qdev,"driveA" , fds[0 ]); +qdev_prop_set_drive (&dev->qdev,"driveB" , fds[1 ]); +if (qdev_init (&dev->qdev) !=0 ) +return NULL ; fdctrl = &(DO_UPCAST (fdctrl_isabus_t, busdev, dev)->state); fdctrl->dma_chann = dma_chann;DMA_register_channel (dma_chann, &fdctrl_transfer_handler, fdctrl); -fdctrl_connect_drives (fdctrl, fds); +fdctrl_connect_drives (fdctrl);return fdctrl; }fdctrl_t *fdctrl_init_sysbus (qemu_irq irq,int dma_chann,target_phys_addr_t mmio_base, -BlockDriverState **fds) +DriveInfo **fds) {fdctrl_t *fdctrl;DeviceState *dev;fdctrl_sysbus_t *sys; dev =qdev_create (NULL ,"sysbus-fdc" ); -qdev_init (dev); +qdev_prop_set_drive (dev,"driveA" , fds[0 ]); +qdev_prop_set_drive (dev,"driveB" , fds[1 ]); +if (qdev_init (dev) !=0 ) +return NULL ; sys =DO_UPCAST (fdctrl_sysbus_t, busdev.qdev, dev); fdctrl = &sys->state;sysbus_connect_irq (&sys->busdev,0 , irq);
@@ -1873,20 +1881,22 @@ fdctrl_t *fdctrl_init_sysbus(qemu_irq irq, int dma_chann, fdctrl->dma_chann = dma_chann;DMA_register_channel (dma_chann, &fdctrl_transfer_handler, fdctrl); -fdctrl_connect_drives (fdctrl, fds); +fdctrl_connect_drives (fdctrl);return fdctrl; }fdctrl_t *sun4m_fdctrl_init (qemu_irq irq,target_phys_addr_t io_base, -BlockDriverState **fds,qemu_irq *fdc_tc) +DriveInfo **fds,qemu_irq *fdc_tc) {DeviceState *dev;fdctrl_sysbus_t *sys;fdctrl_t *fdctrl; dev =qdev_create (NULL ,"SUNW,fdtwo" ); -qdev_init (dev); +qdev_prop_set_drive (dev,"drive" , fds[0 ]); +if (qdev_init (dev) !=0 ) +return NULL ; sys =DO_UPCAST (fdctrl_sysbus_t, busdev.qdev, dev); fdctrl = &sys->state;sysbus_connect_irq (&sys->busdev,0 , irq);
@@ -1895,7 +1905,7 @@ fdctrl_t *sun4m_fdctrl_init (qemu_irq irq, target_phys_addr_t io_base, fdctrl->dma_chann =-1 ; -fdctrl_connect_drives (fdctrl, fds); +fdctrl_connect_drives (fdctrl);return fdctrl; }
@@ -1985,18 +1995,32 @@ static ISADeviceInfo isa_fdc_info = { .init = isabus_fdc_init1, .qdev.name = "isa-fdc", .qdev.size = sizeof(fdctrl_isabus_t), + .qdev.props = (Property []) { +DEFINE_PROP_DRIVE ("driveA" , fdctrl_isabus_t, state.drives[0 ].dinfo), +DEFINE_PROP_DRIVE ("driveB" , fdctrl_isabus_t, state.drives[1 ].dinfo), +DEFINE_PROP_END_OF_LIST (), + }, };static SysBusDeviceInfo sysbus_fdc_info = { .init = sysbus_fdc_init1, .qdev.name ="sysbus-fdc" , .qdev.size =sizeof (fdctrl_sysbus_t), + .qdev.props = (Property []) { +DEFINE_PROP_DRIVE ("driveA" , fdctrl_sysbus_t, state.drives[0 ].dinfo), +DEFINE_PROP_DRIVE ("driveB" , fdctrl_sysbus_t, state.drives[1 ].dinfo), +DEFINE_PROP_END_OF_LIST (), + }, };static SysBusDeviceInfo sun4m_fdc_info = { .init = sun4m_fdc_init1, .qdev.name ="SUNW,fdtwo" , .qdev.size =sizeof (fdctrl_sysbus_t), + .qdev.props = (Property []) { +DEFINE_PROP_DRIVE ("drive" , fdctrl_sysbus_t, state.drives[0 ].dinfo), +DEFINE_PROP_END_OF_LIST (), + }, };static void fdc_register_devices (void )
hw/fdc.h +4 -3
@@ -1,12 +1,13 @@/* fdc.c */ +#include "sysemu.h" #define MAX_FD 2typedef struct fdctrl_t fdctrl_t ; -fdctrl_t *fdctrl_init_isa (BlockDriverState **fds); +fdctrl_t *fdctrl_init_isa (DriveInfo **fds);fdctrl_t *fdctrl_init_sysbus (qemu_irq irq,int dma_chann,target_phys_addr_t mmio_base, -BlockDriverState **fds); +DriveInfo **fds);fdctrl_t *sun4m_fdctrl_init (qemu_irq irq,target_phys_addr_t io_base, -BlockDriverState **fds,qemu_irq *fdc_tc); +DriveInfo **fds,qemu_irq *fdc_tc);int fdctrl_get_drive_type (fdctrl_t *fdctrl,int drive_num);
hw/mips_jazz.c +2 -3
@@ -126,7 +126,7 @@ void mips_jazz_init (ram_addr_t ram_size,int s_rtc, s_dma_dummy;NICInfo *nd;PITState *pit; -BlockDriverState *fds[MAX_FD ]; +DriveInfo *fds[MAX_FD ];qemu_irq esp_reset;ram_addr_t ram_offset;ram_addr_t bios_offset;
@@ -234,8 +234,7 @@ void mips_jazz_init (ram_addr_t ram_size,exit (1 ); }for (n =0 ; n <MAX_FD ; n++) { -DriveInfo *dinfo =drive_get (IF_FLOPPY ,0 , n); - fds[n] = dinfo ? dinfo->bdrv :NULL ; + fds[n] =drive_get (IF_FLOPPY ,0 , n); }fdctrl_init_sysbus (rc4030[1 ],0 ,0x80003000 , fds);
hw/mips_malta.c +2 -3
@@ -786,7 +786,7 @@ void mips_malta_init (ram_addr_t ram_size,int i;DriveInfo *dinfo;DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ]; -BlockDriverState *fd[MAX_FD ]; +DriveInfo *fd[MAX_FD ];int fl_idx =0 ;int fl_sectors =0 ;
@@ -947,8 +947,7 @@ void mips_malta_init (ram_addr_t ram_size,if (parallel_hds[0 ])parallel_init (0x378 ,isa_reserve_irq (7 ), parallel_hds[0 ]);for (i =0 ; i <MAX_FD ; i++) { - dinfo =drive_get (IF_FLOPPY ,0 , i); - fd[i] = dinfo ? dinfo->bdrv :NULL ; + fd[i] =drive_get (IF_FLOPPY ,0 , i); } floppy_controller =fdctrl_init_isa (fd);
hw/pc.c +2 -4
@@ -1133,9 +1133,8 @@ static void pc_init1(ram_addr_t ram_size,qemu_irq *isa_irq;qemu_irq *i8259;IsaIrqState *isa_irq_state; -DriveInfo *dinfo;DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ]; -BlockDriverState *fd[MAX_FD ]; +DriveInfo *fd[MAX_FD ];int using_vga = cirrus_vga_enabled || std_vga_enabled || vmsvga_enabled;void *fw_cfg;
@@ -1381,8 +1380,7 @@ static void pc_init1(ram_addr_t ram_size,#endif for (i =0 ; i <MAX_FD ; i++) { - dinfo =drive_get (IF_FLOPPY ,0 , i); - fd[i] = dinfo ? dinfo->bdrv :NULL ; + fd[i] =drive_get (IF_FLOPPY ,0 , i); } floppy_controller =fdctrl_init_isa (fd);
hw/ppc_prep.c +2 -4
@@ -563,9 +563,8 @@ static void ppc_prep_init (ram_addr_t ram_size,PCIBus *pci_bus;qemu_irq *i8259;int ppc_boot_device; -DriveInfo *dinfo;DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ]; -BlockDriverState *fd[MAX_FD ]; +DriveInfo *fd[MAX_FD ]; sysctrl =qemu_mallocz (sizeof (sysctrl_t));
@@ -720,8 +719,7 @@ static void ppc_prep_init (ram_addr_t ram_size,// SB16_init(); for (i =0 ; i <MAX_FD ; i++) { - dinfo =drive_get (IF_FLOPPY ,0 , i); - fd[i] = dinfo ? dinfo->bdrv :NULL ; + fd[i] =drive_get (IF_FLOPPY ,0 , i); }fdctrl_init_isa (fd);
hw/sun4m.c +4 -12
@@ -758,9 +758,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size,qemu_irq fdc_tc;qemu_irq *cpu_halt;unsigned long kernel_size; -BlockDriverState *fd[MAX_FD ]; +DriveInfo *fd[MAX_FD ];void *fw_cfg; -DriveInfo *dinfo;/* init CPUs */ if (!cpu_model)
@@ -834,10 +833,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size,if (hwdef->fd_base) {/* there is zero or one floppy drive */ memset (fd,0 ,sizeof (fd)); - dinfo =drive_get (IF_FLOPPY ,0 ,0 ); -if (dinfo) - fd[0 ] = dinfo->bdrv; - + fd[0 ] =drive_get (IF_FLOPPY ,0 ,0 );sun4m_fdctrl_init (slavio_irq[22 ], hwdef->fd_base, fd, &fdc_tc); }
@@ -1562,11 +1558,10 @@ static void sun4c_hw_init(const struct sun4c_hwdef *hwdef, ram_addr_t RAM_size,qemu_irq esp_reset;qemu_irq fdc_tc;unsigned long kernel_size; -BlockDriverState *fd[MAX_FD ]; +DriveInfo *fd[MAX_FD ];void *fw_cfg;DeviceState *dev;unsigned int i; -DriveInfo *dinfo;/* init CPU */ if (!cpu_model)
@@ -1618,10 +1613,7 @@ static void sun4c_hw_init(const struct sun4c_hwdef *hwdef, ram_addr_t RAM_size,if (hwdef->fd_base != (target_phys_addr_t)-1 ) {/* there is zero or one floppy drive */ memset (fd,0 ,sizeof (fd)); - dinfo =drive_get (IF_FLOPPY ,0 ,0 ); -if (dinfo) - fd[0 ] = dinfo->bdrv; - + fd[0 ] =drive_get (IF_FLOPPY ,0 ,0 );sun4m_fdctrl_init (slavio_irq[1 ], hwdef->fd_base, fd, &fdc_tc); }
hw/sun4u.c +2 -4
@@ -573,9 +573,8 @@ static void sun4uv_init(ram_addr_t RAM_size,PCIBus *pci_bus, *pci_bus2, *pci_bus3;qemu_irq *irq;DriveInfo *hd[MAX_IDE_BUS *MAX_IDE_DEVS ]; -BlockDriverState *fd[MAX_FD ]; +DriveInfo *fd[MAX_FD ];void *fw_cfg; -DriveInfo *dinfo;/* init CPUs */ env =cpu_devinit (cpu_model, hwdef);
@@ -631,8 +630,7 @@ static void sun4uv_init(ram_addr_t RAM_size,isa_create_simple ("i8042" );for (i =0 ; i <MAX_FD ; i++) { - dinfo =drive_get (IF_FLOPPY ,0 , i); - fd[i] = dinfo ? dinfo->bdrv :NULL ; + fd[i] =drive_get (IF_FLOPPY ,0 , i); }fdctrl_init_isa (fd); nvram =m48t59_init_isa (0x0074 ,NVRAM_SIZE ,59 );
Signature · 1 line
1.6.2.5
PATCH 2/5 floppy: move dma setup + drive connect to fdctrl_init_common()
In reply to Gerd Hoffmannisa-fdc is completely qdev-ified with this patch applied, all configuration uses properties.
sysbus-fdc needs dma_channel config fixed. There is only one user (mips_jazz) which uses dma channel 0. Can anyone knowing this platform suggest how to deal with it? Is hardcoding fine?
--- hw/fdc.c | 31 +++++++++++-------------------- 1 files changed, 11 insertions(+), 20 deletions(-)
hw/fdc.c +11 -20
@@ -1842,23 +1842,14 @@ static void fdctrl_connect_drives(fdctrl_t *fdctrl)fdctrl_t *fdctrl_init_isa (DriveInfo **fds) { -fdctrl_t *fdctrl;ISADevice *dev; -int dma_chann =2 ; dev =isa_create ("isa-fdc" );qdev_prop_set_drive (&dev->qdev,"driveA" , fds[0 ]);qdev_prop_set_drive (&dev->qdev,"driveB" , fds[1 ]);if (qdev_init (&dev->qdev) !=0 )return NULL ; - fdctrl = &(DO_UPCAST (fdctrl_isabus_t, busdev, dev)->state); - - fdctrl->dma_chann = dma_chann; -DMA_register_channel (dma_chann, &fdctrl_transfer_handler, fdctrl); - -fdctrl_connect_drives (fdctrl); - -return fdctrl; +return &(DO_UPCAST (fdctrl_isabus_t, busdev, dev)->state); } fdctrl_t *fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
@@ -1870,19 +1861,16 @@ fdctrl_t *fdctrl_init_sysbus(qemu_irq irq, int dma_chann,fdctrl_sysbus_t *sys; dev =qdev_create (NULL ,"sysbus-fdc" ); + sys =DO_UPCAST (fdctrl_sysbus_t, busdev.qdev, dev); + fdctrl = &sys->state; + fdctrl->dma_chann = dma_chann;/* FIXME */ qdev_prop_set_drive (dev,"driveA" , fds[0 ]);qdev_prop_set_drive (dev,"driveB" , fds[1 ]);if (qdev_init (dev) !=0 )return NULL ; - sys =DO_UPCAST (fdctrl_sysbus_t, busdev.qdev, dev); - fdctrl = &sys->state;sysbus_connect_irq (&sys->busdev,0 , irq);sysbus_mmio_map (&sys->busdev,0 , mmio_base); - fdctrl->dma_chann = dma_chann; -DMA_register_channel (dma_chann, &fdctrl_transfer_handler, fdctrl); -fdctrl_connect_drives (fdctrl); -return fdctrl; }
@@ -1903,10 +1891,6 @@ fdctrl_t *sun4m_fdctrl_init (qemu_irq irq, target_phys_addr_t io_base,sysbus_mmio_map (&sys->busdev,0 , io_base); *fdc_tc =qdev_get_gpio_in (dev,0 ); - fdctrl->dma_chann =-1 ; - -fdctrl_connect_drives (fdctrl); -return fdctrl; }
@@ -1937,6 +1921,10 @@ static int fdctrl_init_common(fdctrl_t *fdctrl) fdctrl->config =FD_CONFIG_EIS |FD_CONFIG_EFIFO ;/* Implicit seek, polling & FIFO enabled */ fdctrl->num_floppies =MAX_FD ; +if (fdctrl->dma_chann !=-1 ) +DMA_register_channel (fdctrl->dma_chann, &fdctrl_transfer_handler, fdctrl); +fdctrl_connect_drives (fdctrl); +fdctrl_external_reset (fdctrl);vmstate_register (-1 , &vmstate_fdc, fdctrl);qemu_register_reset (fdctrl_external_reset, fdctrl);
@@ -1949,6 +1937,7 @@ static int isabus_fdc_init1(ISADevice *dev)fdctrl_t *fdctrl = &isa->state;int iobase =0x3f0 ;int isairq =6 ; +int dma_chann =2 ;register_ioport_read (iobase +0x01 ,5 ,1 , &fdctrl_read_port, fdctrl);
@@ -1959,6 +1948,7 @@ static int isabus_fdc_init1(ISADevice *dev)register_ioport_write (iobase +0x07 ,1 ,1 , &fdctrl_write_port, fdctrl);isa_init_irq (&isa->busdev, &fdctrl->irq, isairq); + fdctrl->dma_chann = dma_chann;return fdctrl_init_common (fdctrl); }
@@ -1972,6 +1962,7 @@ static int sysbus_fdc_init1(SysBusDevice *dev)sysbus_init_mmio (dev,0x08 , io);sysbus_init_irq (dev, &fdctrl->irq);qdev_init_gpio_in (&dev->qdev, fdctrl_handle_tc,1 ); + fdctrl->dma_chann =-1 ;return fdctrl_init_common (fdctrl); }
Signature · 1 line
1.6.2.5
Re: [Qemu-devel] [PATCH 2/5] floppy: move dma setup + drive connect to fdctrl_init_common()
Hi,
Quoted 8 lines · Gerd Hoffmann
isa-fdc is completely qdev-ified with this patch applied, all configuration uses properties.
sysbus-fdc needs
dma_channelconfig fixed. There is only one user (mips_jazz) which uses dma channel 0. Can anyone knowing this platform suggest how to deal with it? Is hardcoding fine?
MIPS Jazz floppy drive should not be connected to ISA DMA, but to Jazz DMA. Unfortunately, atm, floppy emulation is too tied to isa dma controller to be able to do this (like esp which gets dma read/write function pointers)... Either you can change floppy to handle other dma engines, or you can hardcode the dma channel to whatever you want (will be wrong in all cases). I simply ask you to keep dma enabled.
Hervé
PATCH 3/5 qdev: don't crash on unset drive properties.
In reply to Gerd Hoffmann--- hw/qdev-properties.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
hw/qdev-properties.c +1 -1
@@ -180,7 +180,7 @@ static int parse_drive(DeviceState *dev, Property *prop, const char *str)static int print_drive (DeviceState *dev,Property *prop,char *dest,size_t len) {DriveInfo **ptr =qdev_get_prop_ptr (dev, prop); -return snprintf (dest, len,"%s" , (*ptr)->id); +return snprintf (dest, len,"%s" , (*ptr) ? (*ptr)->id :"<null>" ); }PropertyInfo qdev_prop_drive = {
Signature · 1 line
1.6.2.5
PATCH 4/5 serial: convert isa to qdev
In reply to Gerd HoffmannEverything using standard isa I/O ports and IRQ windup is considerd being an actual isa device. That are all serial_init() users except mips_mipssim() which seems to have a non-standard IRQ windup.
baud rate is fixed at 115200 now as no caller passed in something else.
--- hw/mips_malta.c | 4 +- hw/mips_r4k.c | 6 +--- hw/pc.c | 6 +--- hw/pc.h | 1 + hw/ppc_prep.c | 3 +- hw/serial.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++------- hw/sun4u.c | 6 +--- 7 files changed, 75 insertions(+), 28 deletions(-)
hw/mips_malta.c +2 -2
@@ -942,8 +942,8 @@ void mips_malta_init (ram_addr_t ram_size, isa_dev =isa_create_simple ("i8042" ); rtc_state =rtc_init (2000 ); -serial_init (0x3f8 ,isa_reserve_irq (4 ),115200 , serial_hds[0 ]); -serial_init (0x2f8 ,isa_reserve_irq (3 ),115200 , serial_hds[1 ]); +serial_isa_init (0 , serial_hds[0 ]); +serial_isa_init (1 , serial_hds[1 ]);if (parallel_hds[0 ])parallel_init (0x378 ,isa_reserve_irq (7 ), parallel_hds[0 ]);for (i =0 ; i <MAX_FD ; i++) {
hw/mips_r4k.c +1 -5
@@ -31,9 +31,6 @@ static const int ide_iobase[2] = { 0x1f0, 0x170 };static const int ide_iobase2[2 ] = {0x3f6 ,0x376 };static const int ide_irq[2 ] = {14 ,15 }; -static int serial_io[MAX_SERIAL_PORTS ] = {0x3f8 ,0x2f8 ,0x3e8 ,0x2e8 }; -static int serial_irq[MAX_SERIAL_PORTS ] = {4 ,3 ,4 ,3 }; -static PITState *pit;/* PIT i8254 */ /* i8254 PIT is attached to the IRQ0 at PIC i8259 */
@@ -262,8 +259,7 @@ void mips_r4k_init (ram_addr_t ram_size,for (i =0 ; i <MAX_SERIAL_PORTS ; i++) {if (serial_hds[i]) { -serial_init (serial_io[i], i8259[serial_irq[i]],115200 , - serial_hds[i]); +serial_isa_init (i, serial_hds[i]); } }
hw/pc.c +1 -5
@@ -1022,9 +1022,6 @@ static const int ne2000_io[NE2000_NB_MAX] = { 0x300, 0x320, 0x340, 0x360, 0x280, 0x380 };static const int ne2000_irq[NE2000_NB_MAX ] = {9 ,10 ,11 ,3 ,4 ,5 }; -static const int serial_io[MAX_SERIAL_PORTS ] = {0x3f8 ,0x2f8 ,0x3e8 ,0x2e8 }; -static const int serial_irq[MAX_SERIAL_PORTS ] = {4 ,3 ,4 ,3 }; -static const int parallel_io[MAX_PARALLEL_PORTS ] = {0x378 ,0x278 ,0x3bc };static const int parallel_irq[MAX_PARALLEL_PORTS ] = {7 ,7 ,7 };
@@ -1332,8 +1329,7 @@ static void pc_init1(ram_addr_t ram_size,for (i =0 ; i <MAX_SERIAL_PORTS ; i++) {if (serial_hds[i]) { -serial_init (serial_io[i],isa_reserve_irq (serial_irq[i]),115200 , - serial_hds[i]); +serial_isa_init (i, serial_hds[i]); } }
hw/pc.h +1 -0
@@ -12,6 +12,7 @@ SerialState *serial_init(int base, qemu_irq irq, int baudbase,SerialState *serial_mm_init (target_phys_addr_t base,int it_shift,qemu_irq irq,int baudbase,CharDriverState *chr,int ioregister); +SerialState *serial_isa_init (int index,CharDriverState *chr);/* parallel.c */
hw/ppc_prep.c +2 -1
@@ -685,7 +685,8 @@ static void ppc_prep_init (ram_addr_t ram_size,// pit = pit_init(0x40, i8259[0]); rtc_init (2000 ); -serial_init (0x3f8 , i8259[4 ],115200 , serial_hds[0 ]); +if (serial_hds[0 ]) +serial_isa_init (0 , serial_hds[0 ]); nb_nics1 = nb_nics;if (nb_nics1 >NE2000_NB_MAX ) nb_nics1 =NE2000_NB_MAX ;
hw/serial.c +67 -10
116 lines not on this page · raw message
hw/sun4u.c +1 -5
@@ -337,9 +337,6 @@ void cpu_tick_set_limit(void *opaque, uint64_t limit)ptimer_set_limit (opaque, -limit,0 ); } -static const int serial_io[MAX_SERIAL_PORTS ] = {0x3f8 ,0x2f8 ,0x3e8 ,0x2e8 }; -static const int serial_irq[MAX_SERIAL_PORTS ] = {4 ,3 ,4 ,3 }; -static const int parallel_io[MAX_PARALLEL_PORTS ] = {0x378 ,0x278 ,0x3bc };static const int parallel_irq[MAX_PARALLEL_PORTS ] = {7 ,7 ,7 };
@@ -602,8 +599,7 @@ static void sun4uv_init(ram_addr_t RAM_size, }for (; i <MAX_SERIAL_PORTS ; i++) {if (serial_hds[i]) { -serial_init (serial_io[i],NULL /*serial_irq[i]*/ ,115200 , - serial_hds[i]); +serial_isa_init (i, serial_hds[i]); } }
Signature · 1 line
1.6.2.5
Re: [Qemu-devel] [PATCH 4/5] serial: convert isa to qdev
Quoted 17 lines · Gerd Hoffmann
Everything using standard isa I/O ports and IRQ windup is considerd being an actual isa device. That are all
serial_init()users exceptmips_mipssim()which seems to have a non-standard IRQ windup.baud rate is fixed at 115200 now as no caller passed in something else.
Signed-off-by Gerd Hoffmann <[email protected]>--- hw/mips_malta.c | 4 +- hw/mips_r4k.c | 6 +--- hw/pc.c | 6 +--- hw/pc.h | 1 + hw/ppc_prep.c | 3 +- hw/serial.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++------- hw/sun4u.c | 6 +--- 7 files changed, 75 insertions(+), 28 deletions(-)
[...]
Quoted 5 lines
hw/ppc_prep.c +0
-0
hw/ppc_prep.c static void ppc_prep_init (ram_addr_t ram_size, · line 692
Quoted 9 lines
hw/ppc_prep.c +2
-1@@ -685,7 +685,8 @@ static void ppc_prep_init (ram_addr_t ram_size,// pit = pit_init(0x40, i8259[0]); rtc_init (2000 ); -serial_init (0x3f8 , i8259[4 ],115200 , serial_hds[0 ]); +if (serial_hds[0 ]) +serial_isa_init (0 , serial_hds[0 ]); nb_nics1 = nb_nics;if (nb_nics1 >NE2000_NB_MAX ) nb_nics1 =NE2000_NB_MAX ;
Why the new conditional? Bug fix perhaps?
[...]
PATCH 5/5 parallel: convert isa to qdev
In reply to Gerd Hoffmann--- hw/mips_malta.c | 2 +- hw/parallel.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++------- hw/pc.c | 3 +- hw/pc.h | 2 +- hw/sun4u.c | 3 +- 5 files changed, 57 insertions(+), 14 deletions(-)
hw/mips_malta.c +1 -1
@@ -945,7 +945,7 @@ void mips_malta_init (ram_addr_t ram_size,serial_isa_init (0 , serial_hds[0 ]);serial_isa_init (1 , serial_hds[1 ]);if (parallel_hds[0 ]) -parallel_init (0x378 ,isa_reserve_irq (7 ), parallel_hds[0 ]); +parallel_init (0 , parallel_hds[0 ]);for (i =0 ; i <MAX_FD ; i++) { fd[i] =drive_get (IF_FLOPPY ,0 , i); }
hw/parallel.c +53 -8
88 lines not on this page · raw message
hw/pc.c +1 -2
@@ -1335,8 +1335,7 @@ static void pc_init1(ram_addr_t ram_size,for (i =0 ; i <MAX_PARALLEL_PORTS ; i++) {if (parallel_hds[i]) { -parallel_init (parallel_io[i],isa_reserve_irq (parallel_irq[i]), - parallel_hds[i]); +parallel_init (i, parallel_hds[i]); } }
hw/pc.h +1 -1
@@ -17,7 +17,7 @@ SerialState *serial_isa_init(int index, CharDriverState *chr);/* parallel.c */ typedef struct ParallelState ParallelState ; -ParallelState *parallel_init (int base,qemu_irq irq,CharDriverState *chr); +ParallelState *parallel_init (int index,CharDriverState *chr);ParallelState *parallel_mm_init (target_phys_addr_t base,int it_shift,qemu_irq irq,CharDriverState *chr);/* i8259.c */
hw/sun4u.c +1 -2
@@ -605,8 +605,7 @@ static void sun4uv_init(ram_addr_t RAM_size,for (i =0 ; i <MAX_PARALLEL_PORTS ; i++) {if (parallel_hds[i]) { -parallel_init (parallel_io[i],NULL /*parallel_irq[i]*/ , - parallel_hds[i]); +parallel_init (i, parallel_hds[i]); } }
Signature · 1 line
1.6.2.5
Quoted 9 lines · Gerd Hoffmann
Hi,
This patch series converts more isa devices to qdev.
Respin with review remarks fixed and more verbose
commit messages.cheers,
Gerd
Looks good. Just one minor question on PATCH 4/5 remaining, see my reply to it.