| Message ID | 20170922160111.31885-1-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | remove i386/pc dependency from non-PC world (part 1) | expand |
Hi, Le 22/09/2017 à 18:01, Philippe Mathieu-Daudé a écrit : > - move the header from hw/isa/ to hw/dma/ > - add entry for i82374 in MAINTAINERS > - remove the old i386/pc dependency > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > include/hw/{isa/i8257.h => dma/i8257_dma.h} | 6 ++++++ > include/hw/isa/isa.h | 2 -- > hw/dma/i82374.c | 3 ++- > hw/dma/i8257.c | 4 ++-- > hw/i386/pc.c | 3 ++- > hw/mips/mips_fulong2e.c | 3 ++- > hw/mips/mips_jazz.c | 3 ++- > hw/mips/mips_malta.c | 3 ++- > hw/sparc/sun4m.c | 4 ---- > hw/sparc64/sun4u.c | 4 ---- > MAINTAINERS | 2 ++ > 11 files changed, 20 insertions(+), 17 deletions(-) > rename include/hw/{isa/i8257.h => dma/i8257_dma.h} (86%) > > diff --git a/include/hw/isa/i8257.h b/include/hw/dma/i8257_dma.h > similarity index 86% > rename from include/hw/isa/i8257.h > rename to include/hw/dma/i8257_dma.h > index 88a2766a3f..0041565177 100644 > --- a/include/hw/isa/i8257.h > +++ b/include/hw/dma/i8257_dma.h > @@ -1,6 +1,10 @@ > #ifndef HW_I8257_H > #define HW_I8257_H > > +#include "hw/hw.h" > +#include "hw/isa/isa.h" > +#include "exec/ioport.h" > + > #define TYPE_I8257 "i8257" > > typedef struct I8257Regs { > @@ -40,4 +44,6 @@ typedef struct I8257State { > PortioList portio_pageh; > } I8257State; > > +void i8257_dma_init(ISABus *bus, int high_page_enable); > + As you're changing the DMA_init prototype, can you add an Error **errp parameter, and pass &error_abort in each caller? See http://lists.gnu.org/archive/html/qemu-devel/2017-09/msg00262.html for more details Hervé > #endif > diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h > index 95593408ef..b9dbab24b4 100644 > --- a/include/hw/isa/isa.h > +++ b/include/hw/isa/isa.h > @@ -151,6 +151,4 @@ static inline ISABus *isa_bus_from_device(ISADevice *d) > return ISA_BUS(qdev_get_parent_bus(DEVICE(d))); > } > > -/* i8257.c */ > -void DMA_init(ISABus *bus, int high_page_enable); > #endif > diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c > index 6c0f975df0..4048bedcf2 100644 > --- a/hw/dma/i82374.c > +++ b/hw/dma/i82374.c > @@ -24,6 +24,7 @@ > > #include "qemu/osdep.h" > #include "hw/isa/isa.h" > +#include "hw/dma/i8257_dma.h" > > #define TYPE_I82374 "i82374" > #define I82374(obj) OBJECT_CHECK(I82374State, (obj), TYPE_I82374) > @@ -123,7 +124,7 @@ static void i82374_realize(DeviceState *dev, Error **errp) > portio_list_add(&s->port_list, isa_address_space_io(&s->parent_obj), > s->iobase); > > - DMA_init(isa_bus_from_device(ISA_DEVICE(dev)), 1); > + i8257_dma_init(isa_bus_from_device(ISA_DEVICE(dev)), 1); > memset(s->commands, 0, sizeof(s->commands)); > } > > diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c > index bd23e893bf..a8f26b003b 100644 > --- a/hw/dma/i8257.c > +++ b/hw/dma/i8257.c > @@ -24,7 +24,7 @@ > #include "qemu/osdep.h" > #include "hw/hw.h" > #include "hw/isa/isa.h" > -#include "hw/isa/i8257.h" > +#include "hw/dma/i8257_dma.h" > #include "qemu/main-loop.h" > #include "trace.h" > > @@ -622,7 +622,7 @@ static void i8257_register_types(void) > > type_init(i8257_register_types) > > -void DMA_init(ISABus *bus, int high_page_enable) > +void i8257_dma_init(ISABus *bus, int high_page_enable) > { > ISADevice *isa1, *isa2; > DeviceState *d; > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 3aa10c780b..76d4be5991 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -39,6 +39,7 @@ > #include "elf.h" > #include "multiboot.h" > #include "hw/timer/mc146818rtc.h" > +#include "hw/dma/i8257_dma.h" > #include "hw/timer/i8254.h" > #include "hw/input/i8042.h" > #include "hw/audio/pcspk.h" > @@ -1582,7 +1583,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, > port92_init(port92, a20_line[1]); > g_free(a20_line); > > - DMA_init(isa_bus, 0); > + i8257_dma_init(isa_bus, 0); > > for(i = 0; i < MAX_FD; i++) { > fd[i] = drive_get(IF_FLOPPY, 0, i); > diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c > index a35745a407..6dc6a0ac18 100644 > --- a/hw/mips/mips_fulong2e.c > +++ b/hw/mips/mips_fulong2e.c > @@ -22,6 +22,7 @@ > #include "qapi/error.h" > #include "hw/hw.h" > #include "hw/i386/pc.h" > +#include "hw/dma/i8257_dma.h" > #include "hw/char/serial.h" > #include "hw/block/fdc.h" > #include "net/net.h" > @@ -365,7 +366,7 @@ static void mips_fulong2e_init(MachineState *machine) > > /* init other devices */ > pit = i8254_pit_init(isa_bus, 0x40, 0, NULL); > - DMA_init(isa_bus, 0); > + i8257_dma_init(isa_bus, 0); > > /* Super I/O */ > isa_create_simple(isa_bus, TYPE_I8042); > diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c > index 1bbef7eeb5..1b54602c1d 100644 > --- a/hw/mips/mips_jazz.c > +++ b/hw/mips/mips_jazz.c > @@ -27,6 +27,7 @@ > #include "hw/mips/mips.h" > #include "hw/mips/cpudevs.h" > #include "hw/i386/pc.h" > +#include "hw/dma/i8257_dma.h" > #include "hw/char/serial.h" > #include "hw/isa/isa.h" > #include "hw/block/fdc.h" > @@ -223,7 +224,7 @@ static void mips_jazz_init(MachineState *machine, > /* ISA devices */ > i8259 = i8259_init(isa_bus, env->irq[4]); > isa_bus_irqs(isa_bus, i8259); > - DMA_init(isa_bus, 0); > + i8257_dma_init(isa_bus, 0); > pit = i8254_pit_init(isa_bus, 0x40, 0, NULL); > pcspk_init(isa_bus, pit); > > diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c > index 45c7f589aa..050da36f1d 100644 > --- a/hw/mips/mips_malta.c > +++ b/hw/mips/mips_malta.c > @@ -27,6 +27,7 @@ > #include "cpu.h" > #include "hw/hw.h" > #include "hw/i386/pc.h" > +#include "hw/dma/i8257_dma.h" > #include "hw/char/serial.h" > #include "hw/block/fdc.h" > #include "net/net.h" > @@ -1219,7 +1220,7 @@ void mips_malta_init(MachineState *machine) > smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size); > g_free(smbus_eeprom_buf); > pit = i8254_pit_init(isa_bus, 0x40, 0, NULL); > - DMA_init(isa_bus, 0); > + i8257_dma_init(isa_bus, 0); > > /* Super I/O */ > isa_create_simple(isa_bus, TYPE_I8042); > diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c > index e1bdd4828d..a4ba3d2917 100644 > --- a/hw/sparc/sun4m.c > +++ b/hw/sparc/sun4m.c > @@ -101,10 +101,6 @@ struct sun4m_hwdef { > uint8_t nvram_machine_id; > }; > > -void DMA_init(ISABus *bus, int high_page_enable) > -{ > -} > - > static void fw_cfg_boot_set(void *opaque, const char *boot_device, > Error **errp) > { > diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c > index 973daed977..fd10741607 100644 > --- a/hw/sparc64/sun4u.c > +++ b/hw/sparc64/sun4u.c > @@ -86,10 +86,6 @@ typedef struct EbusState { > MemoryRegion bar1; > } EbusState; > > -void DMA_init(ISABus *bus, int high_page_enable) > -{ > -} > - > static void fw_cfg_boot_set(void *opaque, const char *boot_device, > Error **errp) > { > diff --git a/MAINTAINERS b/MAINTAINERS > index cc1f8bb66b..a79723601c 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -707,6 +707,7 @@ F: hw/ppc/rs6000_mc.c > F: hw/pci-host/prep.[hc] > F: hw/isa/i82378.c > F: hw/isa/pc87312.[hc] > +F: hw/dma/i82374.c > F: pc-bios/ppc_rom.bin > > sPAPR > @@ -849,6 +850,7 @@ F: hw/misc/pc-testdev.c > F: hw/timer/hpet* > F: hw/timer/i8254* > F: hw/timer/mc146818rtc* > +F: include/hw/dma/i8257_dma.h > F: include/hw/i2c/pm_smbus.h > F: include/hw/input/i8042.h > F: include/hw/timer/hpet.h >
On 09/22/2017 02:43 PM, Hervé Poussineau wrote: > Le 22/09/2017 à 18:01, Philippe Mathieu-Daudé a écrit : [...] >> +void i8257_dma_init(ISABus *bus, int high_page_enable); >> + > > As you're changing the DMA_init prototype, can you add an Error **errp > parameter, and pass &error_abort in each caller? > > See http://lists.gnu.org/archive/html/qemu-devel/2017-09/msg00262.html > for more details If Eduardo doesn't have a patch ready I can do it.
On Fri, Sep 22, 2017 at 03:08:03PM -0300, Philippe Mathieu-Daudé wrote: > On 09/22/2017 02:43 PM, Hervé Poussineau wrote: > > Le 22/09/2017 à 18:01, Philippe Mathieu-Daudé a écrit : > [...] > > > +void i8257_dma_init(ISABus *bus, int high_page_enable); > > > + > > > > As you're changing the DMA_init prototype, can you add an Error **errp > > parameter, and pass &error_abort in each caller? > > > > See http://lists.gnu.org/archive/html/qemu-devel/2017-09/msg00262.html > > for more details > > If Eduardo doesn't have a patch ready I can do it. Please go ahead. You can also use my patch set (v2) for that as a base if you want. https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg08007.html
diff --git a/include/hw/isa/i8257.h b/include/hw/dma/i8257_dma.h similarity index 86% rename from include/hw/isa/i8257.h rename to include/hw/dma/i8257_dma.h index 88a2766a3f..0041565177 100644 --- a/include/hw/isa/i8257.h +++ b/include/hw/dma/i8257_dma.h @@ -1,6 +1,10 @@ #ifndef HW_I8257_H #define HW_I8257_H +#include "hw/hw.h" +#include "hw/isa/isa.h" +#include "exec/ioport.h" + #define TYPE_I8257 "i8257" typedef struct I8257Regs { @@ -40,4 +44,6 @@ typedef struct I8257State { PortioList portio_pageh; } I8257State; +void i8257_dma_init(ISABus *bus, int high_page_enable); + #endif diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index 95593408ef..b9dbab24b4 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -151,6 +151,4 @@ static inline ISABus *isa_bus_from_device(ISADevice *d) return ISA_BUS(qdev_get_parent_bus(DEVICE(d))); } -/* i8257.c */ -void DMA_init(ISABus *bus, int high_page_enable); #endif diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c index 6c0f975df0..4048bedcf2 100644 --- a/hw/dma/i82374.c +++ b/hw/dma/i82374.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/isa/isa.h" +#include "hw/dma/i8257_dma.h" #define TYPE_I82374 "i82374" #define I82374(obj) OBJECT_CHECK(I82374State, (obj), TYPE_I82374) @@ -123,7 +124,7 @@ static void i82374_realize(DeviceState *dev, Error **errp) portio_list_add(&s->port_list, isa_address_space_io(&s->parent_obj), s->iobase); - DMA_init(isa_bus_from_device(ISA_DEVICE(dev)), 1); + i8257_dma_init(isa_bus_from_device(ISA_DEVICE(dev)), 1); memset(s->commands, 0, sizeof(s->commands)); } diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index bd23e893bf..a8f26b003b 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/isa/isa.h" -#include "hw/isa/i8257.h" +#include "hw/dma/i8257_dma.h" #include "qemu/main-loop.h" #include "trace.h" @@ -622,7 +622,7 @@ static void i8257_register_types(void) type_init(i8257_register_types) -void DMA_init(ISABus *bus, int high_page_enable) +void i8257_dma_init(ISABus *bus, int high_page_enable) { ISADevice *isa1, *isa2; DeviceState *d; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 3aa10c780b..76d4be5991 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -39,6 +39,7 @@ #include "elf.h" #include "multiboot.h" #include "hw/timer/mc146818rtc.h" +#include "hw/dma/i8257_dma.h" #include "hw/timer/i8254.h" #include "hw/input/i8042.h" #include "hw/audio/pcspk.h" @@ -1582,7 +1583,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, port92_init(port92, a20_line[1]); g_free(a20_line); - DMA_init(isa_bus, 0); + i8257_dma_init(isa_bus, 0); for(i = 0; i < MAX_FD; i++) { fd[i] = drive_get(IF_FLOPPY, 0, i); diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index a35745a407..6dc6a0ac18 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -22,6 +22,7 @@ #include "qapi/error.h" #include "hw/hw.h" #include "hw/i386/pc.h" +#include "hw/dma/i8257_dma.h" #include "hw/char/serial.h" #include "hw/block/fdc.h" #include "net/net.h" @@ -365,7 +366,7 @@ static void mips_fulong2e_init(MachineState *machine) /* init other devices */ pit = i8254_pit_init(isa_bus, 0x40, 0, NULL); - DMA_init(isa_bus, 0); + i8257_dma_init(isa_bus, 0); /* Super I/O */ isa_create_simple(isa_bus, TYPE_I8042); diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 1bbef7eeb5..1b54602c1d 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -27,6 +27,7 @@ #include "hw/mips/mips.h" #include "hw/mips/cpudevs.h" #include "hw/i386/pc.h" +#include "hw/dma/i8257_dma.h" #include "hw/char/serial.h" #include "hw/isa/isa.h" #include "hw/block/fdc.h" @@ -223,7 +224,7 @@ static void mips_jazz_init(MachineState *machine, /* ISA devices */ i8259 = i8259_init(isa_bus, env->irq[4]); isa_bus_irqs(isa_bus, i8259); - DMA_init(isa_bus, 0); + i8257_dma_init(isa_bus, 0); pit = i8254_pit_init(isa_bus, 0x40, 0, NULL); pcspk_init(isa_bus, pit); diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 45c7f589aa..050da36f1d 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -27,6 +27,7 @@ #include "cpu.h" #include "hw/hw.h" #include "hw/i386/pc.h" +#include "hw/dma/i8257_dma.h" #include "hw/char/serial.h" #include "hw/block/fdc.h" #include "net/net.h" @@ -1219,7 +1220,7 @@ void mips_malta_init(MachineState *machine) smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size); g_free(smbus_eeprom_buf); pit = i8254_pit_init(isa_bus, 0x40, 0, NULL); - DMA_init(isa_bus, 0); + i8257_dma_init(isa_bus, 0); /* Super I/O */ isa_create_simple(isa_bus, TYPE_I8042); diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index e1bdd4828d..a4ba3d2917 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -101,10 +101,6 @@ struct sun4m_hwdef { uint8_t nvram_machine_id; }; -void DMA_init(ISABus *bus, int high_page_enable) -{ -} - static void fw_cfg_boot_set(void *opaque, const char *boot_device, Error **errp) { diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 973daed977..fd10741607 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -86,10 +86,6 @@ typedef struct EbusState { MemoryRegion bar1; } EbusState; -void DMA_init(ISABus *bus, int high_page_enable) -{ -} - static void fw_cfg_boot_set(void *opaque, const char *boot_device, Error **errp) { diff --git a/MAINTAINERS b/MAINTAINERS index cc1f8bb66b..a79723601c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -707,6 +707,7 @@ F: hw/ppc/rs6000_mc.c F: hw/pci-host/prep.[hc] F: hw/isa/i82378.c F: hw/isa/pc87312.[hc] +F: hw/dma/i82374.c F: pc-bios/ppc_rom.bin sPAPR @@ -849,6 +850,7 @@ F: hw/misc/pc-testdev.c F: hw/timer/hpet* F: hw/timer/i8254* F: hw/timer/mc146818rtc* +F: include/hw/dma/i8257_dma.h F: include/hw/i2c/pm_smbus.h F: include/hw/input/i8042.h F: include/hw/timer/hpet.h
- move the header from hw/isa/ to hw/dma/ - add entry for i82374 in MAINTAINERS - remove the old i386/pc dependency Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- include/hw/{isa/i8257.h => dma/i8257_dma.h} | 6 ++++++ include/hw/isa/isa.h | 2 -- hw/dma/i82374.c | 3 ++- hw/dma/i8257.c | 4 ++-- hw/i386/pc.c | 3 ++- hw/mips/mips_fulong2e.c | 3 ++- hw/mips/mips_jazz.c | 3 ++- hw/mips/mips_malta.c | 3 ++- hw/sparc/sun4m.c | 4 ---- hw/sparc64/sun4u.c | 4 ---- MAINTAINERS | 2 ++ 11 files changed, 20 insertions(+), 17 deletions(-) rename include/hw/{isa/i8257.h => dma/i8257_dma.h} (86%)