Convert some MIPS Jazz devices to qdev
v2 cover Convert some MIPS Jazz devices to qdev
changes v1 -> v2:
- create sysbus devices instead of using a custom bus
Patch description:
This patch series converts some of the devices used by MIPS Jazz emulation to qdev devices.
Makefile.objs | 1 + Makefile.target | 2 +- default-configs/mips-softmmu.mak | 1 + default-configs/mips64-softmmu.mak | 1 + default-configs/mips64el-softmmu.mak | 1 + default-configs/mipsel-softmmu.mak | 1 + hw/ds1225y.c | 151 ++++++++++--------- hw/fdc.c | 24 --- hw/fdc.h | 2 - hw/g364fb.c | 120 ++++++++------- hw/jazz_led.c | 81 ++++++---- hw/mips.h | 17 +-- hw/mips_jazz.c | 39 +++--- hw/pc.h | 5 - hw/pckbd.c | 55 +++++--- hw/rc4030.c | 274 ++++++++++++++++++++-------------- hw/vga-isa-mm.c | 94 +++++++----- 17 files changed, 471 insertions(+), 398 deletions(-)
PATCH v2 1/8 qdev: convert i8042 to sysbus device
Use it in Jazz emulation
Remove i8042_mm_init() function, which is not used anymore
--- hw/mips_jazz.c | 3 ++- hw/pc.h | 3 --- hw/pckbd.c | 55 +++++++++++++++++++++++++++++++++++-------------------- 3 files changed, 37 insertions(+), 24 deletions(-)
hw/mips_jazz.c +2 -1
@@ -37,6 +37,7 @@#include "loader.h" #include "mc146818rtc.h" #include "blockdev.h" +#include "sysbus.h" enum jazz_model_e {
@@ -263,7 +264,7 @@ void mips_jazz_init (ram_addr_t ram_size,cpu_register_physical_memory (0x80004000 ,0x00001000 , s_rtc);/* Keyboard (i8042) */ -i8042_mm_init (rc4030[6 ], rc4030[7 ],0x80005000 ,0x1000 ,0x1 ); +sysbus_create_varargs ("rc4030-i8042" ,0x80005000 , rc4030[6 ], rc4030[7 ],NULL );/* Serial ports */ if (serial_hds[0 ]) {
hw/pc.h +0 -3
@@ -74,9 +74,6 @@ void *vmmouse_init(void *m);/* pckbd.c */ void i8042_init (qemu_irq kbd_irq,qemu_irq mouse_irq,uint32_t io_base); -void i8042_mm_init (qemu_irq kbd_irq,qemu_irq mouse_irq, -target_phys_addr_t base,ram_addr_t size, -target_phys_addr_t mask);void i8042_isa_mouse_fake_event (void *opaque);void i8042_setup_a20_line (ISADevice *dev,qemu_irq *a20_out);
hw/pckbd.c +35 -20
75 lines not on this page · raw message
Signature · 1 line
1.7.1.GIT
Re: [Qemu-devel] [PATCH 1/8] [MIPS] qdev: convert i8042 to sysbus device
Quoted 111 lines · Hervé Poussineau
Use it in Jazz emulation
Removei8042_mm_init()function, which is not used anymoreSigned-off-by Hervé Poussineau <[email protected]>--- hw/mips_jazz.c | 3 ++- hw/pc.h | 3 --- hw/pckbd.c | 55 +++++++++++++++++++++++++++++++++++-------------------- 3 files changed, 37 insertions(+), 24 deletions(-)hw/mips_jazz.c +2
-1@@ -37,6 +37,7 @@#include "loader.h" #include "mc146818rtc.h" #include "blockdev.h" +#include "sysbus.h" enum jazz_model_e {@@ -263,7 +264,7 @@ void mips_jazz_init (ram_addr_t ram_size,cpu_register_physical_memory (0x80004000 ,0x00001000 , s_rtc);/* Keyboard (i8042) */ -i8042_mm_init (rc4030[6 ], rc4030[7 ],0x80005000 ,0x1000 ,0x1 ); +sysbus_create_varargs ("rc4030-i8042" ,0x80005000 , rc4030[6 ], rc4030[7 ],NULL );/* Serial ports */ if (serial_hds[0 ]) {hw/pc.h +0
-3@@ -74,9 +74,6 @@ void *vmmouse_init(void *m);/* pckbd.c */ void i8042_init (qemu_irq kbd_irq,qemu_irq mouse_irq,uint32_t io_base); -void i8042_mm_init (qemu_irq kbd_irq,qemu_irq mouse_irq, -target_phys_addr_t base,ram_addr_t size, -target_phys_addr_t mask);void i8042_isa_mouse_fake_event (void *opaque);void i8042_setup_a20_line (ISADevice *dev,qemu_irq *a20_out);hw/pckbd.c +24
-20@@ -26,6 +26,7 @@#include "pc.h" #include "ps2.h" #include "sysemu.h" +#include "sysbus.h" /* debug PC keyboard */ //#define DEBUG_KBD @@ -424,26 +425,6 @@ static CPUWriteMemoryFunc * const kbd_mm_write[] = { &kbd_mm_writeb, }; -void i8042_mm_init (qemu_irq kbd_irq,qemu_irq mouse_irq, -target_phys_addr_t base,ram_addr_t size, -target_phys_addr_t mask) -{ -KBDState *s =qemu_mallocz (sizeof (KBDState)); -int s_io_memory; - - s->irq_kbd = kbd_irq; - s->irq_mouse = mouse_irq; - s->mask = mask; - -vmstate_register (NULL ,0 , &vmstate_kbd, s); - s_io_memory =cpu_register_io_memory (kbd_mm_read, kbd_mm_write, s); -cpu_register_physical_memory (base, size, s_io_memory); - - s->kbd =ps2_kbd_init (kbd_update_kbd_irq, s); - s->mouse =ps2_mouse_init (kbd_update_aux_irq, s); -qemu_register_reset (kbd_reset, s); -} - typedef struct ISAKBDState { ISADevice dev; KBDState kbd;@@ -503,8 +484,42 @@ static ISADeviceInfo i8042_info = { .init = i8042_initfn, }; +typedef struct SysBusKBDState { +SysBusDevice busdev; +KBDState kbd; +}SysBusKBDState ; + +static int i8042_sysbus_initfn (SysBusDevice *dev) +{ +KBDState *s = &FROM_SYSBUS (SysBusKBDState, dev)->kbd; +int s_io; + +sysbus_init_irq (dev, &s->irq_kbd); +sysbus_init_irq (dev, &s->irq_mouse); + + s_io =cpu_register_io_memory (kbd_mm_read, kbd_mm_write, s); +sysbus_init_mmio (dev,0x1000 , s_io); + + s->mask =0x1 ; + s->kbd =ps2_kbd_init (kbd_update_kbd_irq, s); + s->mouse =ps2_mouse_init (kbd_update_aux_irq, s); +qemu_register_reset (kbd_reset, s); + +return 0 ; +}
hw/pckbd.c static ISADeviceInfo i8042_info = { · line 519
Quoted 10 lines
hw/pckbd.c +10
-0+ +static SysBusDeviceInfo i8042_sysbus_info = { + .qdev.name ="rc4030-i8042" , + .qdev.size =sizeof (SysBusKBDState), + .init = i8042_sysbus_initfn, + .qdev.props = (Property []) { +DEFINE_PROP_END_OF_LIST (), + }, +}; +
Shouldn't you initialize qdev.vmsd here?
Quoted 6 lines
hw/pckbd.c +1
-0static void i8042_register (void ) {isa_qdev_register (&i8042_info); +sysbus_register_withprop (&i8042_sysbus_info); }device_init (i8042_register)
PATCH v2 2/8 qdev: convert ds1225y nvram to sysbus device
In reply to Hervé PoussineauUse it in Jazz emulation
Remove protection stuff, which doesn't belong to this device
Remove ds1225y_init() and ds1225y_set_protection() functions, which are not used anymore
--- hw/ds1225y.c | 151 ++++++++++++++++++++++++++++++-------------------------- hw/mips.h | 4 -- hw/mips_jazz.c | 4 +- 3 files changed, 83 insertions(+), 76 deletions(-)
hw/ds1225y.c +81 -70
@@ -22,31 +22,34 @@* THE SOFTWARE. */ -#include "hw.h" -#include "mips.h" -#include "nvram.h" +#include "sysbus.h" //#define DEBUG_NVRAM -typedef struct ds1225y_t -{ -uint32_t chip_size; +#ifdef DEBUG_NVRAM +#define DPRINTF (fmt, ...) \ + do { printf("nvram: " fmt , ## __VA_ARGS__); } while (0) +#else +#define DPRINTF (fmt, ...) do {} while (0) +#endif + +typedef struct { +DeviceState qdev; +int32_t chip_size; +char * filename;QEMUFile *file;uint8_t *contents; -uint8_t protection; -}ds1225y_t ; - +}NvRamState ;static uint32_t nvram_readb (void *opaque,target_phys_addr_t addr) { -ds1225y_t *s = opaque; +NvRamState *s = opaque;uint32_t val; val = s->contents[addr]; -#ifdef DEBUG_NVRAM -printf ("nvram: read 0x%x at " TARGET_FMT_lx"\n" , val, addr); -#endif +DPRINTF ("read 0x%x at " TARGET_FMT_plx"\n" , val, addr); +return val; }
@@ -70,11 +73,9 @@ static uint32_t nvram_readl (void *opaque, target_phys_addr_t addr)static void nvram_writeb (void *opaque,target_phys_addr_t addr,uint32_t val) { -ds1225y_t *s = opaque; +NvRamState *s = opaque; -#ifdef DEBUG_NVRAM -printf ("nvram: write 0x%x at " TARGET_FMT_lx"\n" , val, addr); -#endif +DPRINTF ("write 0x%x at " TARGET_FMT_plx"\n" , val, addr); s->contents[addr] = val &0xff ;if (s->file) {
@@ -98,34 +99,6 @@ static void nvram_writel (void *opaque, target_phys_addr_t addr, uint32_t val)nvram_writeb (opaque, addr +3 , (val >>24 ) &0xff ); } -static void nvram_writeb_protected (void *opaque,target_phys_addr_t addr,uint32_t val) -{ -ds1225y_t *s = opaque; - -if (s->protection !=7 ) { -#ifdef DEBUG_NVRAM -printf ("nvram: prevent write of 0x%x at " TARGET_FMT_lx"\n" , val, addr); -#endif -return ; - } - -nvram_writeb (opaque, addr, val); -} - -static void nvram_writew_protected (void *opaque,target_phys_addr_t addr,uint32_t val) -{ -nvram_writeb_protected (opaque, addr, val &0xff ); -nvram_writeb_protected (opaque, addr +1 , (val >>8 ) &0xff ); -} - -static void nvram_writel_protected (void *opaque,target_phys_addr_t addr,uint32_t val) -{ -nvram_writeb_protected (opaque, addr, val &0xff ); -nvram_writeb_protected (opaque, addr +1 , (val >>8 ) &0xff ); -nvram_writeb_protected (opaque, addr +2 , (val >>16 ) &0xff ); -nvram_writeb_protected (opaque, addr +3 , (val >>24 ) &0xff ); -} -static CPUReadMemoryFunc *const nvram_read[] = { &nvram_readb, &nvram_readw,
@@ -138,43 +111,81 @@ static CPUWriteMemoryFunc * const nvram_write[] = { &nvram_writel, }; -static CPUWriteMemoryFunc *const nvram_write_protected[] = { - &nvram_writeb_protected, - &nvram_writew_protected, - &nvram_writel_protected, +static int nvram_post_load (void *opaque,int version_id) +{ +NvRamState *s = opaque; + +if (s->file) { +qemu_fclose (s->file); + } + +/* Write back nvram contents */ + s->file =qemu_fopen (s->filename,"wb" ); +if (s->file) { +/* Write back contents, as 'wb' mode cleaned the file */ +qemu_put_buffer (s->file, s->contents, s->chip_size); +qemu_fflush (s->file); + } + +return 0 ; +} + +static const VMStateDescription vmstate_nvram = { + .name ="nvram" , + .version_id =0 , + .minimum_version_id =0 , + .minimum_version_id_old =0 , + .post_load = nvram_post_load, + .fields = (VMStateField []) { +VMSTATE_VARRAY_INT32 (contents, NvRamState, chip_size,0 , vmstate_info_uint8, + uint8_t), +VMSTATE_END_OF_LIST () + } }; -/* Initialisation routine */ -void *ds1225y_init (target_phys_addr_t mem_base,const char *filename) +typedef struct { +SysBusDevice busdev; +NvRamState nvram; +}SysBusNvRamState ; + +static int nvram_sysbus_initfn (SysBusDevice *dev) { -ds1225y_t *s; -int mem_indexRW, mem_indexRP; +NvRamState *s = &FROM_SYSBUS (SysBusNvRamState, dev)->nvram;QEMUFile *file; +int s_io; - s =qemu_mallocz (sizeof (ds1225y_t)); - s->chip_size =0x2000 ;/* Fixed for ds1225y chip: 8 KiB */ s->contents =qemu_mallocz (s->chip_size); - s->protection =7 ; + + s_io =cpu_register_io_memory (nvram_read, nvram_write, s); +sysbus_init_mmio (dev, s->chip_size, s_io);/* Read current file */ - file =qemu_fopen (filename,"rb" ); + file =qemu_fopen (s->filename,"rb" );if (file) {/* Read nvram contents */ qemu_get_buffer (file, s->contents, s->chip_size);qemu_fclose (file); } - s->file =qemu_fopen (filename,"wb" ); -if (s->file) { -/* Write back contents, as 'wb' mode cleaned the file */ -qemu_put_buffer (s->file, s->contents, s->chip_size); -qemu_fflush (s->file); - } +nvram_post_load (s,0 ); -/* Read/write memory */ - mem_indexRW =cpu_register_io_memory (nvram_read, nvram_write, s); -cpu_register_physical_memory (mem_base, s->chip_size, mem_indexRW); -/* Read/write protected memory */ - mem_indexRP =cpu_register_io_memory (nvram_read, nvram_write_protected, s); -cpu_register_physical_memory (mem_base + s->chip_size, s->chip_size, mem_indexRP); -return s; +return 0 ; } + +static SysBusDeviceInfo nvram_sysbus_info = { + .qdev.name ="nvram" , + .qdev.size =sizeof (SysBusNvRamState), + .qdev.vmsd = &vmstate_nvram, + .init = nvram_sysbus_initfn, + .qdev.props = (Property []) { +DEFINE_PROP_INT32 ("size" , SysBusNvRamState, nvram.chip_size,0x2000 ), +DEFINE_PROP_STRING ("filename" , SysBusNvRamState, nvram.filename), +DEFINE_PROP_END_OF_LIST (), + }, +}; + +static void nvram_register (void ) +{ +sysbus_register_withprop (&nvram_sysbus_info); +} + +device_init (nvram_register)
hw/mips.h +0 -4
@@ -8,10 +8,6 @@ PCIBus *pci_gt64120_init(qemu_irq *pic);/* bonito.c */ PCIBus *bonito_init (qemu_irq *pic); -/* ds1225y.c */ -void *ds1225y_init (target_phys_addr_t mem_base,const char *filename); -void ds1225y_set_protection (void *opaque,int protection); -/* g364fb.c */ int g364fb_mm_init(target_phys_addr_t vram_base, target_phys_addr_t ctrl_base, int it_shift,
hw/mips_jazz.c +2 -2
@@ -290,8 +290,8 @@ void mips_jazz_init (ram_addr_t ram_size,/* FIXME: missing Jazz sound at 0x8000c000, rc4030[2] */ audio_init (i8259); -/* NVRAM: Unprotected at 0x9000, Protected at 0xa000, Read only at 0xb000 */ -ds1225y_init (0x80009000 ,"nvram" ); +/* NVRAM */ +sysbus_create_simple ("nvram" ,0x80009000 ,NULL );/* LED indicator */ jazz_led_init (0x8000f000 );
Signature · 1 line
1.7.1.GIT
Re: [Qemu-devel] [PATCH 2/8] [MIPS] qdev: convert ds1225y nvram to sysbus device
2010/9/8 Hervé Poussineau <[email protected]>:
Quoted 120 lines
Use it in Jazz emulation
Remove protection stuff, which doesn't belong to this device
Removeds1225y_init()andds1225y_set_protection()functions, which are not used anymoreSigned-off-by Hervé Poussineau <[email protected]>---
hw/ds1225y.c | 151 ++++++++++++++++++++++++++++++--------------------------hw/mips.h| 4 --
hw/mips_jazz.c | 4 +-3 files changed, 83 insertions(+), 76 deletions(-)hw/ds1225y.c +18
-49@@ -22,31 +22,34 @@* THE SOFTWARE. */ -#include "hw.h" -#include "mips.h" -#include "nvram.h" +#include "sysbus.h" //#define DEBUG_NVRAM -typedef struct ds1225y_t -{ - uint32_t chip_size; +#ifdef DEBUG_NVRAM +#define DPRINTF (fmt, ...) \ + do { printf("nvram: " fmt , ## __VA_ARGS__); } while (0) +#else +#define DPRINTF (fmt, ...) do {} while (0) +#endif + +typedef struct { + DeviceState qdev; + int32_t chip_size; + char* filename; QEMUFile *file; uint8_t *contents; - uint8_t protection; -}ds1225y_t ; - +}NvRamState ; static uint32_t nvram_readb (void *opaque, target_phys_addr_t addr) { - ds1225y_t *s = opaque; + NvRamState *s = opaque; uint32_t val; val = s->contents[addr]; -#ifdef DEBUG_NVRAM - printf("nvram: read 0x%x at " TARGET_FMT_lx "\n", val, addr); -#endif + DPRINTF("read 0x%x at " TARGET_FMT_plx "\n", val, addr); + return val; }@@ -70,11 +73,9 @@ static uint32_t nvram_readl (void *opaque, target_phys_addr_t addr) static void nvram_writeb (void *opaque, target_phys_addr_t addr, uint32_t val) { - ds1225y_t *s = opaque; + NvRamState *s = opaque; -#ifdef DEBUG_NVRAM - printf("nvram: write 0x%x at " TARGET_FMT_lx "\n", val, addr); -#endif + DPRINTF("write 0x%x at " TARGET_FMT_plx "\n", val, addr); s->contents[addr] = val & 0xff; if (s->file) {@@ -98,34 +99,6 @@ static void nvram_writel (void *opaque, target_phys_addr_t addr, uint32_t val) nvram_writeb(opaque, addr + 3, (val >> 24) & 0xff); } -static void nvram_writeb_protected (void *opaque,target_phys_addr_t addr,uint32_t val) -{ - ds1225y_t *s = opaque; - - if (s->protection != 7) { -#ifdef DEBUG_NVRAM - printf("nvram: prevent write of 0x%x at " TARGET_FMT_lx "\n", val, addr); -#endif - return; - } - - nvram_writeb(opaque, addr, val); -} - -static void nvram_writew_protected (void *opaque,target_phys_addr_t addr,uint32_t val) -{ - nvram_writeb_protected(opaque, addr, val & 0xff); - nvram_writeb_protected(opaque, addr + 1, (val >> 8) & 0xff); -} - -static void nvram_writel_protected (void *opaque,target_phys_addr_t addr,uint32_t val) -{ - nvram_writeb_protected(opaque, addr, val & 0xff); - nvram_writeb_protected(opaque, addr + 1, (val >> 8) & 0xff); - nvram_writeb_protected(opaque, addr + 2, (val >> 16) & 0xff); - nvram_writeb_protected(opaque, addr + 3, (val >> 24) & 0xff); -} - static CPUReadMemoryFunc * const nvram_read[] = { &nvram_readb, &nvram_readw,@@ -138,43 +111,81 @@ static CPUWriteMemoryFunc * const nvram_write[] = { &nvram_writel, }; -static CPUWriteMemoryFunc *const nvram_write_protected[] = { - &nvram_writeb_protected, - &nvram_writew_protected, - &nvram_writel_protected,
hw/ds1225y.c static CPUWriteMemoryFunc * const nvram_write[] = { · line 123
Quoted 10 lines
hw/ds1225y.c +10
-0+static int nvram_post_load (void *opaque,int version_id) +{ + NvRamState *s = opaque; + + if (s->file) { + qemu_fclose(s->file); + } + + /* Write back nvram contents */ + s->file = qemu_fopen(s->filename, "wb");
How about ftruncate(fileno(s->file), 0)?
Quoted 124 lines
hw/ds1225y.c +53
-21+ if (s->file) { + /* Write back contents, as 'wb' mode cleaned the file */ + qemu_put_buffer(s->file, s->contents, s->chip_size); + qemu_fflush(s->file); + } + + return 0; +} + +static const VMStateDescription vmstate_nvram = { + .name = "nvram", + .version_id = 0, + .minimum_version_id = 0, + .minimum_version_id_old = 0, + .post_load = nvram_post_load, + .fields = (VMStateField []) { + VMSTATE_VARRAY_INT32(contents, NvRamState, chip_size, 0, vmstate_info_uint8, + uint8_t), + VMSTATE_END_OF_LIST() + } }; -/* Initialisation routine */ -void *ds1225y_init (target_phys_addr_t mem_base,const char *filename) +typedef struct { + SysBusDevice busdev; + NvRamState nvram; +}SysBusNvRamState ; + +static int nvram_sysbus_initfn (SysBusDevice *dev) { - ds1225y_t *s; - int mem_indexRW, mem_indexRP; + NvRamState *s = &FROM_SYSBUS(SysBusNvRamState, dev)->nvram; QEMUFile *file; + int s_io; - s = qemu_mallocz(sizeof(ds1225y_t)); - s->chip_size = 0x2000; /* Fixed for ds1225y chip: 8 KiB */ s->contents = qemu_mallocz(s->chip_size); - s->protection = 7; + + s_io = cpu_register_io_memory(nvram_read, nvram_write, s); + sysbus_init_mmio(dev, s->chip_size, s_io); /* Read current file */ - file = qemu_fopen(filename, "rb"); + file = qemu_fopen(s->filename, "rb"); if (file) { /* Read nvram contents */ qemu_get_buffer(file, s->contents, s->chip_size); qemu_fclose(file); } - s->file = qemu_fopen(filename, "wb"); - if (s->file) { - /* Write back contents, as 'wb' mode cleaned the file */ - qemu_put_buffer(s->file, s->contents, s->chip_size); - qemu_fflush(s->file); - } + nvram_post_load(s, 0); - /* Read/write memory */ - mem_indexRW = cpu_register_io_memory(nvram_read, nvram_write, s); - cpu_register_physical_memory(mem_base, s->chip_size, mem_indexRW); - /* Read/write protected memory */ - mem_indexRP = cpu_register_io_memory(nvram_read, nvram_write_protected, s); - cpu_register_physical_memory(mem_base + s->chip_size, s->chip_size, mem_indexRP); - return s; + return 0; } + +static SysBusDeviceInfo nvram_sysbus_info = { + .qdev.name = "nvram", + .qdev.size = sizeof(SysBusNvRamState), + .qdev.vmsd = &vmstate_nvram, + .init = nvram_sysbus_initfn, + .qdev.props = (Property[]) { + DEFINE_PROP_INT32("size", SysBusNvRamState, nvram.chip_size, 0x2000), + DEFINE_PROP_STRING("filename", SysBusNvRamState, nvram.filename), + DEFINE_PROP_END_OF_LIST(), + }, +}; + +static void nvram_register (void ) +{ + sysbus_register_withprop(&nvram_sysbus_info); +} + +device_init (nvram_register)hw/mips.h +0
-4@@ -8,10 +8,6 @@ PCIBus *pci_gt64120_init(qemu_irq *pic); /* bonito.c */ PCIBus *bonito_init(qemu_irq *pic); -/* ds1225y.c */ -void *ds1225y_init (target_phys_addr_t mem_base,const char *filename); -void ds1225y_set_protection (void *opaque,int protection); - /* g364fb.c */ int g364fb_mm_init(target_phys_addr_t vram_base, target_phys_addr_t ctrl_base, int it_shift,hw/mips_jazz.c +2
-3@@ -290,8 +290,8 @@ void mips_jazz_init (ram_addr_t ram_size, /* FIXME: missing Jazz sound at 0x8000c000, rc4030[2] */ audio_init(i8259); - /* NVRAM: Unprotected at 0x9000, Protected at 0xa000, Read only at 0xb000 */ - ds1225y_init(0x80009000, "nvram"); + /* NVRAM */ + sysbus_create_simple("nvram", 0x80009000, NULL); /* LED indicator */ jazz_led_init(0x8000f000); --1.7.1.GIT
Re: [Qemu-devel] [PATCH 2/8] [MIPS] qdev: convert ds1225y nvram to sysbus device
In reply to Hervé PoussineauQuoted 5 lines · Hervé Poussineau
Use it in Jazz emulation
Remove protection stuff, which doesn't belong to this device
Removeds1225y_init()andds1225y_set_protection()functions, which are not used anymoreSigned-off-by Hervé Poussineau <[email protected]>
I think this would be easier to review if you split it up some, perhaps cleanup such as DPRINTF(), removal of protection stuff, and qdev conversion.
Quoted 24 lines
--- hw/ds1225y.c | 151 ++++++++++++++++++++++++++++++-------------------------- hw/mips.h | 4 -- hw/mips_jazz.c | 4 +- 3 files changed, 83 insertions(+), 76 deletions(-)hw/ds1225y.c +1
-6@@ -22,31 +22,34 @@* THE SOFTWARE. */ -#include "hw.h" -#include "mips.h" -#include "nvram.h" +#include "sysbus.h" //#define DEBUG_NVRAM -typedef struct ds1225y_t -{ - uint32_t chip_size;
hw/ds1225y.c line 38
Quoted 10 lines
hw/ds1225y.c +10
-0+#ifdef DEBUG_NVRAM +#define DPRINTF (fmt, ...) \ + do { printf("nvram: " fmt , ## __VA_ARGS__); } while (0) +#else +#define DPRINTF (fmt, ...) do {} while (0) +#endif + +typedef struct { + DeviceState qdev; + int32_t chip_size;
You change chip_size from unsigned to signed. Why?
Quoted 7 lines
hw/ds1225y.c +2
-3+char * filename;QEMUFile *file;uint8_t *contents; -uint8_t protection; -} ds1225y_t; - +} NvRamState;
[...]
PATCH v2 3/8 qdev: convert jazz-led to sysbus device
In reply to Hervé PoussineauUse it in Jazz emulation
Remove jazz_led_init() function, which is not used anymore Compile jazz_led.c file only once
--- Makefile.objs | 1 + Makefile.target | 2 +- default-configs/mips-softmmu.mak | 1 + default-configs/mips64-softmmu.mak | 1 + default-configs/mips64el-softmmu.mak | 1 + default-configs/mipsel-softmmu.mak | 1 + hw/jazz_led.c | 81 ++++++++++++++++++++-------------- hw/mips.h | 3 - hw/mips_jazz.c | 2 +- 9 files changed, 55 insertions(+), 38 deletions(-)
Makefile.objs +1 -0
@@ -231,6 +231,7 @@ hw-obj-$(CONFIG_RC4030) += rc4030.o hw-obj-$(CONFIG_DP8393X) += dp8393x.o hw-obj-$(CONFIG_DS1225Y) += ds1225y.o hw-obj-$(CONFIG_MIPSNET) += mipsnet.o +hw-obj-$(CONFIG_JAZZ_LED) += jazz_led.o # Sound sound-obj-y =
Makefile.target +1 -1
@@ -223,7 +223,7 @@ obj-ppc-$(CONFIG_FDT) += device_tree.o obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o obj-mips-y += mips_addr.o mips_timer.o mips_int.o obj-mips-y += vga.o i8259.o -obj-mips-y += g364fb.o jazz_led.o +obj-mips-y += g364fb.o obj-mips-y += gt64xxx.o mc146818rtc.o obj-mips-y += cirrus_vga.o obj-mips-$(CONFIG_FULONG) += bonito.o vt82c686.o mips_fulong2e.o
default-configs/mips-softmmu.mak +1 -0
@@ -30,3 +30,4 @@ CONFIG_DP8393X=y CONFIG_DS1225Y=y CONFIG_MIPSNET=y CONFIG_PFLASH_CFI01=y +CONFIG_JAZZ_LED=y
default-configs/mips64-softmmu.mak +1 -0
@@ -30,3 +30,4 @@ CONFIG_DP8393X=y CONFIG_DS1225Y=y CONFIG_MIPSNET=y CONFIG_PFLASH_CFI01=y +CONFIG_JAZZ_LED=y
default-configs/mips64el-softmmu.mak +1 -0
@@ -32,3 +32,4 @@ CONFIG_DS1225Y=y CONFIG_MIPSNET=y CONFIG_PFLASH_CFI01=y CONFIG_FULONG=y +CONFIG_JAZZ_LED=y
default-configs/mipsel-softmmu.mak +1 -0
@@ -30,3 +30,4 @@ CONFIG_DP8393X=y CONFIG_DS1225Y=y CONFIG_MIPSNET=y CONFIG_PFLASH_CFI01=y +CONFIG_JAZZ_LED=y
hw/jazz_led.c +48 -33
143 lines not on this page · raw message
hw/mips.h +0 -3
@@ -16,9 +16,6 @@ int g364fb_mm_init(target_phys_addr_t vram_base,/* mipsnet.c */ void mipsnet_init (int base,qemu_irq irq,NICInfo *nd); -/* jazz_led.c */ -extern void jazz_led_init (target_phys_addr_t base); -/* rc4030.c */ typedef struct rc4030DMAState *rc4030_dma ;void rc4030_dma_memory_rw (void *opaque,target_phys_addr_t addr,uint8_t *buf,int len,int is_write);
hw/mips_jazz.c +1 -1
@@ -294,7 +294,7 @@ void mips_jazz_init (ram_addr_t ram_size,sysbus_create_simple ("nvram" ,0x80009000 ,NULL );/* LED indicator */ -jazz_led_init (0x8000f000 ); +sysbus_create_simple ("jazz-led" ,0x8000f000 ,NULL ); } static
Signature · 1 line
1.7.1.GIT
Re: [Qemu-devel] [PATCH 3/8] [MIPS] qdev: convert jazz-led to sysbus device
Quoted 3 lines · Hervé Poussineau
Use it in Jazz emulation
Removejazz_led_init()function, which is not used anymore Compilejazz_led.cfile only once
[...]
Quoted 4 lines
hw/jazz_led.c +0
-0
[...]
hw/jazz_led.c static uint32_t led_readb(void *opaque, target_phys_addr_t addr) · line 76
Quoted 13 lines
hw/jazz_led.c +0
-5@@ -70,30 +70,18 @@ static uint32_t led_readb(void *opaque, target_phys_addr_t addr)static uint32_t led_readw (void *opaque,target_phys_addr_t addr) {uint32_t v; -#ifdef TARGET_WORDS_BIGENDIAN - v =led_readb (opaque, addr) <<8 ; - v |=led_readb (opaque, addr +1 ); -#else v =led_readb (opaque, addr); v |=led_readb (opaque, addr +1 ) <<8 ; -#endif return v; }
Stupid question: why can you drop the #if here?
[...]
PATCH v2 4/8 qdev: Use qdev floppy disk controller in Jazz emulation
In reply to Hervé PoussineauRemove fdctrl_init_sysbus() function, which is not used anymore
--- hw/fdc.c | 24 ------------------------ hw/fdc.h | 2 -- hw/mips_jazz.c | 10 +--------- 3 files changed, 1 insertions(+), 35 deletions(-)
hw/fdc.c +0 -24
@@ -1889,30 +1889,6 @@ FDCtrl *fdctrl_init_isa(DriveInfo **fds)return &(DO_UPCAST (FDCtrlISABus, busdev, dev)->state); } -FDCtrl *fdctrl_init_sysbus (qemu_irq irq,int dma_chann, -target_phys_addr_t mmio_base,DriveInfo **fds) -{ -FDCtrl *fdctrl; -DeviceState *dev; -FDCtrlSysBus *sys; - - dev =qdev_create (NULL ,"sysbus-fdc" ); - sys =DO_UPCAST (FDCtrlSysBus, busdev.qdev, dev); - fdctrl = &sys->state; - fdctrl->dma_chann = dma_chann;/* FIXME */ -if (fds[0 ]) { -qdev_prop_set_drive_nofail (dev,"driveA" , fds[0 ]->bdrv); - } -if (fds[1 ]) { -qdev_prop_set_drive_nofail (dev,"driveB" , fds[1 ]->bdrv); - } -qdev_init_nofail (dev); -sysbus_connect_irq (&sys->busdev,0 , irq); -sysbus_mmio_map (&sys->busdev,0 , mmio_base); - -return fdctrl; -} -FDCtrl *sun4m_fdctrl_init (qemu_irq irq,target_phys_addr_t io_base,DriveInfo **fds,qemu_irq *fdc_tc) {
hw/fdc.h +0 -2
@@ -7,8 +7,6 @@typedef struct FDCtrl FDCtrl ;FDCtrl *fdctrl_init_isa (DriveInfo **fds); -FDCtrl *fdctrl_init_sysbus (qemu_irq irq,int dma_chann, -target_phys_addr_t mmio_base,DriveInfo **fds);FDCtrl *sun4m_fdctrl_init (qemu_irq irq,target_phys_addr_t io_base,DriveInfo **fds,qemu_irq *fdc_tc);int fdctrl_get_drive_type (FDCtrl *fdctrl,int drive_num);
hw/mips_jazz.c +1 -9
@@ -137,7 +137,6 @@ void mips_jazz_init (ram_addr_t ram_size,int s_rtc, s_dma_dummy;NICInfo *nd;PITState *pit; -DriveInfo *fds[MAX_FD ];qemu_irq esp_reset;qemu_irq *cpu_exit_irq;ram_addr_t ram_offset;
@@ -249,14 +248,7 @@ void mips_jazz_init (ram_addr_t ram_size, rc4030[5], &esp_reset);/* Floppy */ -if (drive_get_max_bus (IF_FLOPPY ) >=MAX_FD ) { -fprintf (stderr,"qemu: too many floppy drives\n" ); -exit (1 ); - } -for (n =0 ; n <MAX_FD ; n++) { - fds[n] =drive_get (IF_FLOPPY ,0 , n); - } -fdctrl_init_sysbus (rc4030[1 ],0 ,0x80003000 , fds); +sysbus_create_simple ("sysbus-fdc" ,0x80003000 , rc4030[1 ]);/* Real time clock */ rtc_init (1980 ,NULL );
Signature · 1 line
1.7.1.GIT
PATCH v2 5/8 qdev: convert ISA VGA MM to sysbus device
In reply to Hervé PoussineauUse it in Jazz emulation
Remove isa_vga_mm_init() function, which is not used anymore
--- hw/mips_jazz.c | 2 +- hw/pc.h | 2 - hw/vga-isa-mm.c | 94 ++++++++++++++++++++++++++++++++----------------------- 3 files changed, 56 insertions(+), 42 deletions(-)
hw/mips_jazz.c +1 -1
@@ -218,7 +218,7 @@ void mips_jazz_init (ram_addr_t ram_size,g364fb_mm_init (0x40000000 ,0x60000000 ,0 , rc4030[3 ]);break ;case JAZZ_PICA61 : -isa_vga_mm_init (0x40000000 ,0x60000000 ,0 ); +sysbus_create_simple ("sysbus-vga" ,0x60000000 ,NULL );break ;default :break ;
hw/pc.h +0 -2
@@ -153,8 +153,6 @@ extern enum vga_retrace_method vga_retrace_method;int isa_vga_init (void );int pci_vga_init (PCIBus *bus,unsigned long vga_bios_offset,int vga_bios_size); -int isa_vga_mm_init (target_phys_addr_t vram_base, -target_phys_addr_t ctrl_base,int it_shift);/* cirrus_vga.c */ void pci_cirrus_vga_init (PCIBus *bus);
hw/vga-isa-mm.c +55 -39
153 lines not on this page · raw message
Signature · 1 line
1.7.1.GIT
Re: [Qemu-devel] [PATCH 5/8] [MIPS] qdev: convert ISA VGA MM to sysbus device
2010/9/8 Hervé Poussineau <[email protected]>:
Quoted 150 lines
Use it in Jazz emulation
Removeisa_vga_mm_init()function, which is not used anymoreSigned-off-by Hervé Poussineau <[email protected]>---
hw/mips_jazz.c | 2 +-
hw/pc.h | 2 -
hw/vga-isa-mm.c | 94 ++++++++++++++++++++++++++++++++-----------------------3 files changed, 56 insertions(+), 42 deletions(-)hw/mips_jazz.c +0
-0@@ -218,7 +218,7 @@ void mips_jazz_init (ram_addr_t ram_size, g364fb_mm_init(0x40000000, 0x60000000, 0, rc4030[3]); break;case
JAZZ_PICA61:
- isa_vga_mm_init(0x40000000,0x60000000, 0);
+ sysbus_create_simple("sysbus-vga",0x60000000, NULL); break;
default:
break;hw/pc.h +0
-2@@ -153,8 +153,6 @@ extern enum vga_retrace_method vga_retrace_method; int isa_vga_init(void); int pci_vga_init(PCIBus *bus, unsigned long vga_bios_offset, int vga_bios_size); -int isa_vga_mm_init (target_phys_addr_t vram_base, - target_phys_addr_t ctrl_base, int it_shift); /* cirrus_vga.c */ void pci_cirrus_vga_init(PCIBus *bus);hw/vga-isa-mm.c +36
-22@@ -21,62 +21,58 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" + #include "console.h" -#include "pc.h" #include "vga_int.h" #include "pixel_ops.h" -#include "qemu-timer.h" +#include "sysbus.h" -typedef struct ISAVGAMMState { - VGACommonState vga; - int it_shift; -}ISAVGAMMState ; +#define VRAM_BASE 0x40000000 /* Memory mapped interface */ static uint32_t vga_mm_readb (void *opaque, target_phys_addr_t addr) { - ISAVGAMMState *s = opaque; + VGACommonState *s = opaque; - return vga_ioport_read(&s->vga, addr >> s->it_shift) & 0xff; + return vga_ioport_read(s, addr) & 0xff; } static void vga_mm_writeb (void *opaque, target_phys_addr_t addr, uint32_t value) { - ISAVGAMMState *s = opaque; + VGACommonState *s = opaque; - vga_ioport_write(&s->vga, addr >> s->it_shift, value & 0xff); + vga_ioport_write(s, addr, value & 0xff); } static uint32_t vga_mm_readw (void *opaque, target_phys_addr_t addr) { - ISAVGAMMState *s = opaque; + VGACommonState *s = opaque; - return vga_ioport_read(&s->vga, addr >> s->it_shift) & 0xffff; + return vga_ioport_read(s, addr) & 0xffff; } static void vga_mm_writew (void *opaque, target_phys_addr_t addr, uint32_t value) { - ISAVGAMMState *s = opaque; + VGACommonState *s = opaque; - vga_ioport_write(&s->vga, addr >> s->it_shift, value & 0xffff); + vga_ioport_write(s, addr, value & 0xffff); } static uint32_t vga_mm_readl (void *opaque, target_phys_addr_t addr) { - ISAVGAMMState *s = opaque; + VGACommonState *s = opaque; - return vga_ioport_read(&s->vga, addr >> s->it_shift); + return vga_ioport_read(s, addr); } static void vga_mm_writel (void *opaque, target_phys_addr_t addr, uint32_t value) { - ISAVGAMMState *s = opaque; + VGACommonState *s = opaque; - vga_ioport_write(&s->vga, addr >> s->it_shift, value); + vga_ioport_write(s, addr, value); } static CPUReadMemoryFunc * const vga_mm_read_ctrl[] = {@@ -91,36 +87,56 @@ static CPUWriteMemoryFunc * const vga_mm_write_ctrl[] = { &vga_mm_writel, }; -static void vga_mm_init (ISAVGAMMState *s,target_phys_addr_t vram_base, - target_phys_addr_t ctrl_base, int it_shift) +typedef struct { + SysBusDevice busdev; + VGACommonState vga; +}SysBusVGAState ; + +static const VMStateDescription vmstate_vga = { + .name = "sysbus-vga", + .version_id = 0, + .minimum_version_id = 0, + .minimum_version_id_old = 0, + .fields = (VMStateField []) { + VMSTATE_STRUCT(vga, SysBusVGAState, 0, vmstate_vga_common, VGACommonState), + VMSTATE_END_OF_LIST() + } +}; + +static int vga_sysbus_initfn (SysBusDevice *dev) { + VGACommonState *s = &FROM_SYSBUS(SysBusVGAState, dev)->vga; int s_ioport_ctrl, vga_io_memory; - s->it_shift = it_shift; + vga_common_init(s, VGA_RAM_SIZE); + s->bank_offset = 0; + s_ioport_ctrl = cpu_register_io_memory(vga_mm_read_ctrl, vga_mm_write_ctrl, s);
hw/vga-isa-mm.c static CPUWriteMemoryFunc * const vga_mm_write_ctrl[] = { · line 108
Quoted 10 lines
hw/vga-isa-mm.c +2
-5vga_io_memory = cpu_register_io_memory(vga_mem_read, vga_mem_write, s); - vmstate_register(NULL, 0, &vmstate_vga_common, s); + cpu_register_physical_memory(VRAM_BASE + 0x000a0000, 0x20000, vga_io_memory); + qemu_register_coalesced_mmio(VRAM_BASE + 0x000a0000, 0x20000); - cpu_register_physical_memory(ctrl_base, 0x100000, s_ioport_ctrl); - s->vga.bank_offset = 0; - cpu_register_physical_memory(vram_base + 0x000a0000, 0x20000, vga_io_memory); - qemu_register_coalesced_mmio(vram_base + 0x000a0000, 0x20000);
These should be created with sysbus_init_mmio(), but that doesn't handle MMIO coalescing. Perhaps we need sysbus_init_coalesced_mmio().
Quoted 40 lines
hw/vga-isa-mm.c +17
-13-} + sysbus_init_mmio(dev, 0x100000, s_ioport_ctrl); -int isa_vga_mm_init (target_phys_addr_t vram_base, - target_phys_addr_t ctrl_base, int it_shift) -{ - ISAVGAMMState *s; + s->ds = graphic_console_init(s->update, s->invalidate, + s->screen_dump, s->text_update, s); - s = qemu_mallocz(sizeof(*s)); + vga_init_vbe(s); - vga_common_init(&s->vga, VGA_RAM_SIZE); - vga_mm_init(s, vram_base, ctrl_base, it_shift); + return 0; +} - s->vga.ds = graphic_console_init(s->vga.update, s->vga.invalidate, - s->vga.screen_dump, s->vga.text_update, s); +static SysBusDeviceInfo vga_sysbus_info = { + .qdev.name = "sysbus-vga", + .qdev.size = sizeof(SysBusVGAState), + .qdev.vmsd = &vmstate_vga, + .init = vga_sysbus_initfn, +}; - vga_init_vbe(&s->vga); - return 0; +static void vga_register (void ) +{ + sysbus_register_withprop(&vga_sysbus_info); } + +device_init (vga_register) --1.7.1.GIT
PATCH v2 6/8 qdev: convert g364fb to sysbus device
In reply to Hervé PoussineauUse it in Jazz emulation
Remove g364fb_mm_init() function, which is not used anymore
--- hw/g364fb.c | 120 +++++++++++++++++++++++++++++-------------------------- hw/mips.h | 5 -- hw/mips_jazz.c | 2 +- 3 files changed, 64 insertions(+), 63 deletions(-)
hw/g364fb.c +63 -57
@@ -17,10 +17,9 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "mips.h" #include "console.h" #include "pixel_ops.h" +#include "sysbus.h" //#define DEBUG_G364
@@ -33,11 +32,14 @@ do { printf("g364: " fmt , ## __VA_ARGS__); } while (0)#define BADF (fmt, ...) \ do { fprintf(stderr, "g364 ERROR: " fmt , ## __VA_ARGS__);} while (0) +#define VRAM_BASE 0x40000000 + typedef struct G364State { + DeviceState qdev; /* hardware */ uint8_t *vram; ram_addr_t vram_offset; - int vram_size; + uint32_t vram_size; qemu_irq irq; /* registers */ uint8_t color_palette[256][3];
@@ -279,9 +281,8 @@ static inline void g364fb_invalidate_display(void *opaque) } } -static void g364fb_reset (void *opaque) +static void g364fb_reset (G364State *s) { -G364State *s = opaque;qemu_irq_lower (s->irq);memset (s->color_palette,0 ,sizeof (s->color_palette));
@@ -292,7 +293,7 @@ static void g364fb_reset(void *opaque) s->top_of_screen =0 ; s->width = s->height =0 ;memset (s->vram,0 , s->vram_size); -g364fb_invalidate_display (opaque); +g364fb_invalidate_display (s); }static void g364fb_screen_dump (void *opaque,const char *filename)
@@ -534,28 +535,9 @@ static CPUWriteMemoryFunc * const g364fb_ctrl_write[3] = { g364fb_ctrl_writel, }; -static int g364fb_load (QEMUFile *f,void *opaque,int version_id) +static int g364fb_post_load (void *opaque,int version_id) {G364State *s = opaque; -unsigned int i, vram_size; - -if (version_id !=1 ) -return -EINVAL ; - - vram_size =qemu_get_be32 (f); -if (vram_size < s->vram_size) -return -EINVAL ; -qemu_get_buffer (f, s->vram, s->vram_size); -for (i =0 ; i <256 ; i++) -qemu_get_buffer (f, s->color_palette[i],3 ); -for (i =0 ; i <3 ; i++) -qemu_get_buffer (f, s->cursor_palette[i],3 ); -qemu_get_buffer (f, (uint8_t *)s->cursor,sizeof (s->cursor)); - s->cursor_position =qemu_get_be32 (f); - s->ctla =qemu_get_be32 (f); - s->top_of_screen =qemu_get_be32 (f); - s->width =qemu_get_be32 (f); - s->height =qemu_get_be32 (f);/* force refresh */ g364fb_update_depth (s);
@@ -564,51 +546,75 @@ static int g364fb_load(QEMUFile *f, void *opaque, int version_id)return 0 ; } -static void g364fb_save (QEMUFile *f,void *opaque) -{ -G364State *s = opaque; -int i; +static const VMStateDescription vmstate_g364fb = { + .name ="g364fb" , + .version_id =0 , + .minimum_version_id =0 , + .minimum_version_id_old =0 , + .post_load = g364fb_post_load, + .fields = (VMStateField []) { +/* FIXME: vram? */ +VMSTATE_BUFFER_UNSAFE (color_palette, G364State,0 ,256 *3 ), +VMSTATE_BUFFER_UNSAFE (cursor_palette, G364State,0 ,9 ), +VMSTATE_UINT16_ARRAY (cursor, G364State,512 ), +VMSTATE_UINT32 (cursor_position, G364State), +VMSTATE_UINT32 (ctla, G364State), +VMSTATE_UINT32 (top_of_screen, G364State), +VMSTATE_UINT32 (width, G364State), +VMSTATE_UINT32 (height, G364State), +VMSTATE_END_OF_LIST () + } +}; -qemu_put_be32 (f, s->vram_size); -qemu_put_buffer (f, s->vram, s->vram_size); -for (i =0 ; i <256 ; i++) -qemu_put_buffer (f, s->color_palette[i],3 ); -for (i =0 ; i <3 ; i++) -qemu_put_buffer (f, s->cursor_palette[i],3 ); -qemu_put_buffer (f, (uint8_t *)s->cursor,sizeof (s->cursor)); -qemu_put_be32 (f, s->cursor_position); -qemu_put_be32 (f, s->ctla); -qemu_put_be32 (f, s->top_of_screen); -qemu_put_be32 (f, s->width); -qemu_put_be32 (f, s->height); -} +typedef struct { +SysBusDevice busdev; +G364State g364; +}SysBusG364State ; -int g364fb_mm_init (target_phys_addr_t vram_base, -target_phys_addr_t ctrl_base,int it_shift, -qemu_irq irq) +static int g364fb_sysbus_initfn (SysBusDevice *dev) { -G364State *s; +G364State *s = &FROM_SYSBUS (SysBusG364State, dev)->g364;int io_ctrl; - s =qemu_mallocz (sizeof (G364State)); - - s->vram_size =8 *1024 *1024 ; s->vram_offset =qemu_ram_alloc (NULL ,"g364fb.vram" , s->vram_size); s->vram =qemu_get_ram_ptr (s->vram_offset); - s->irq = irq; - -qemu_register_reset (g364fb_reset, s); -register_savevm (NULL ,"g364fb" ,0 ,1 , g364fb_save, g364fb_load, s); -g364fb_reset (s); +sysbus_init_irq (dev, &s->irq); s->ds =graphic_console_init (g364fb_update_display, g364fb_invalidate_display, g364fb_screen_dump,NULL , s); -cpu_register_physical_memory (vram_base, s->vram_size, s->vram_offset); +cpu_register_physical_memory (VRAM_BASE , s->vram_size, s->vram_offset); io_ctrl =cpu_register_io_memory (g364fb_ctrl_read, g364fb_ctrl_write, s); -cpu_register_physical_memory (ctrl_base,0x200000 , io_ctrl); +sysbus_init_mmio (dev,0x200000 , io_ctrl); + +g364fb_post_load (s,0 );return 0 ; } + +static void g364fb_sysbus_reset (DeviceState *d) +{ +G364State *s = &container_of (d, SysBusG364State, busdev.qdev)->g364; +g364fb_reset (s); +} + +static SysBusDeviceInfo g364fb_sysbus_info = { + .qdev.name ="g364" , + .qdev.size =sizeof (SysBusG364State), + .qdev.vmsd = &vmstate_g364fb, + .qdev.reset = g364fb_sysbus_reset, + .init = g364fb_sysbus_initfn, + .qdev.props = (Property []) { +DEFINE_PROP_HEX32 ("vram_size" , SysBusG364State, g364.vram_size,8 *1024 *1024 ), +DEFINE_PROP_END_OF_LIST (), + }, +}; + +static void g364fb_register (void ) +{ +sysbus_register_withprop (&g364fb_sysbus_info); +} + +device_init (g364fb_register)
hw/mips.h +0 -5
@@ -8,11 +8,6 @@ PCIBus *pci_gt64120_init(qemu_irq *pic);/* bonito.c */ PCIBus *bonito_init (qemu_irq *pic); -/* g364fb.c */ -int g364fb_mm_init (target_phys_addr_t vram_base, -target_phys_addr_t ctrl_base,int it_shift, -qemu_irq irq); -/* mipsnet.c */ void mipsnet_init (int base,qemu_irq irq,NICInfo *nd);
hw/mips_jazz.c +1 -1
@@ -215,7 +215,7 @@ void mips_jazz_init (ram_addr_t ram_size,/* Video card */ switch (jazz_model) {case JAZZ_MAGNUM : -g364fb_mm_init (0x40000000 ,0x60000000 ,0 , rc4030[3 ]); +sysbus_create_simple ("g364" ,0x60000000 , rc4030[3 ]);break ;case JAZZ_PICA61 :sysbus_create_simple ("sysbus-vga" ,0x60000000 ,NULL );
Signature · 1 line
1.7.1.GIT
Re: [Qemu-devel] [PATCH 6/8] [MIPS] qdev: convert g364fb to sysbus device
2010/9/8 Hervé Poussineau <[email protected]>:
Quoted 155 lines
Use it in Jazz emulation
Removeg364fb_mm_init()function, which is not used anymoreSigned-off-by Hervé Poussineau <[email protected]>---
hw/g364fb.c | 120 +++++++++++++++++++++++++++++--------------------------hw/mips.h| 5 --
hw/mips_jazz.c | 2 +-3 files changed, 64 insertions(+), 63 deletions(-)hw/g364fb.c +33
-53@@ -17,10 +17,9 @@* with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" -#include "mips.h" #include "console.h" #include "pixel_ops.h" +#include "sysbus.h" //#define DEBUG_G364@@ -33,11 +32,14 @@ do { printf("g364: " fmt , ## __VA_ARGS__); } while (0) #define BADF(fmt, ...) \ do { fprintf(stderr, "g364 ERROR: " fmt , ## __VA_ARGS__);} while (0) +#define VRAM_BASE 0x40000000 + typedef struct G364State { + DeviceState qdev; /* hardware */ uint8_t *vram; ram_addr_t vram_offset; - int vram_size; + uint32_t vram_size; qemu_irq irq; /* registers */ uint8_t color_palette[256][3];@@ -279,9 +281,8 @@ static inline void g364fb_invalidate_display(void *opaque) } } -static void g364fb_reset (void *opaque) +static void g364fb_reset (G364State *s) { - G364State *s = opaque; qemu_irq_lower(s->irq); memset(s->color_palette, 0, sizeof(s->color_palette));@@ -292,7 +293,7 @@ static void g364fb_reset(void *opaque) s->top_of_screen = 0; s->width = s->height = 0; memset(s->vram, 0, s->vram_size); - g364fb_invalidate_display(opaque); + g364fb_invalidate_display(s); } static void g364fb_screen_dump(void *opaque, const char *filename)@@ -534,28 +535,9 @@ static CPUWriteMemoryFunc * const g364fb_ctrl_write[3] = { g364fb_ctrl_writel, }; -static int g364fb_load (QEMUFile *f,void *opaque,int version_id) +static int g364fb_post_load (void *opaque,int version_id) { G364State *s = opaque; - unsigned int i, vram_size; - - if (version_id != 1) - return -EINVAL; - - vram_size = qemu_get_be32(f); - if (vram_size < s->vram_size) - return -EINVAL; - qemu_get_buffer(f, s->vram, s->vram_size); - for (i = 0; i < 256; i++) - qemu_get_buffer(f, s->color_palette[i], 3); - for (i = 0; i < 3; i++) - qemu_get_buffer(f, s->cursor_palette[i], 3); - qemu_get_buffer(f, (uint8_t *)s->cursor, sizeof(s->cursor)); - s->cursor_position = qemu_get_be32(f); - s->ctla = qemu_get_be32(f); - s->top_of_screen = qemu_get_be32(f); - s->width = qemu_get_be32(f); - s->height = qemu_get_be32(f); /* force refresh */ g364fb_update_depth(s);@@ -564,51 +546,75 @@ static int g364fb_load(QEMUFile *f, void *opaque, int version_id) return 0; } -static void g364fb_save (QEMUFile *f,void *opaque) -{ - G364State *s = opaque; - int i; +static const VMStateDescription vmstate_g364fb = { + .name = "g364fb", + .version_id = 0, + .minimum_version_id = 0, + .minimum_version_id_old = 0, + .post_load = g364fb_post_load, + .fields = (VMStateField []) { + /* FIXME: vram? */ + VMSTATE_BUFFER_UNSAFE(color_palette, G364State, 0, 256 * 3), + VMSTATE_BUFFER_UNSAFE(cursor_palette, G364State, 0, 9), + VMSTATE_UINT16_ARRAY(cursor, G364State, 512), + VMSTATE_UINT32(cursor_position, G364State), + VMSTATE_UINT32(ctla, G364State), + VMSTATE_UINT32(top_of_screen, G364State), + VMSTATE_UINT32(width, G364State), + VMSTATE_UINT32(height, G364State), + VMSTATE_END_OF_LIST() + } +}; - qemu_put_be32(f, s->vram_size); - qemu_put_buffer(f, s->vram, s->vram_size); - for (i = 0; i < 256; i++) - qemu_put_buffer(f, s->color_palette[i], 3); - for (i = 0; i < 3; i++) - qemu_put_buffer(f, s->cursor_palette[i], 3); - qemu_put_buffer(f, (uint8_t *)s->cursor, sizeof(s->cursor)); - qemu_put_be32(f, s->cursor_position); - qemu_put_be32(f, s->ctla); - qemu_put_be32(f, s->top_of_screen); - qemu_put_be32(f, s->width); - qemu_put_be32(f, s->height); -} +typedef struct { + SysBusDevice busdev; + G364State g364; +}SysBusG364State ; -int g364fb_mm_init (target_phys_addr_t vram_base, - target_phys_addr_t ctrl_base, int it_shift, - qemu_irq irq) +static int g364fb_sysbus_initfn (SysBusDevice *dev) { - G364State *s; + G364State *s = &FROM_SYSBUS(SysBusG364State, dev)->g364; int io_ctrl; - s = qemu_mallocz(sizeof(G364State)); - - s->vram_size = 8 * 1024 * 1024; s->vram_offset = qemu_ram_alloc(NULL, "g364fb.vram", s->vram_size); s->vram = qemu_get_ram_ptr(s->vram_offset); - s->irq = irq; - - qemu_register_reset(g364fb_reset, s);
hw/g364fb.c static int g364fb_load(QEMUFile *f, void *opaque, int version_id) · line 587
Quoted 10 lines
hw/g364fb.c +2
-3- register_savevm(NULL, "g364fb", 0, 1, g364fb_save, g364fb_load, s); - g364fb_reset(s); + sysbus_init_irq(dev, &s->irq); s->ds = graphic_console_init(g364fb_update_display, g364fb_invalidate_display, g364fb_screen_dump, NULL, s); - cpu_register_physical_memory(vram_base, s->vram_size, s->vram_offset); + cpu_register_physical_memory(VRAM_BASE, s->vram_size, s->vram_offset);
Just register another region with sysbus_init_mmio().
Quoted 68 lines
hw/g364fb.c +28
-1io_ctrl = cpu_register_io_memory(g364fb_ctrl_read, g364fb_ctrl_write, s); - cpu_register_physical_memory(ctrl_base, 0x200000, io_ctrl); + sysbus_init_mmio(dev, 0x200000, io_ctrl); + + g364fb_post_load(s, 0); return 0; } + +static void g364fb_sysbus_reset (DeviceState *d) +{ + G364State *s = &container_of(d, SysBusG364State, busdev.qdev)->g364; + g364fb_reset(s); +} + +static SysBusDeviceInfo g364fb_sysbus_info = { + .qdev.name = "g364", + .qdev.size = sizeof(SysBusG364State), + .qdev.vmsd = &vmstate_g364fb, + .qdev.reset = g364fb_sysbus_reset, + .init = g364fb_sysbus_initfn, + .qdev.props = (Property[]) { + DEFINE_PROP_HEX32("vram_size", SysBusG364State, g364.vram_size, 8 * 1024 * 1024), + DEFINE_PROP_END_OF_LIST(), + }, +}; + +static void g364fb_register (void ) +{ + sysbus_register_withprop(&g364fb_sysbus_info); +} + +device_init (g364fb_register)hw/mips.h +0
-5@@ -8,11 +8,6 @@ PCIBus *pci_gt64120_init(qemu_irq *pic); /* bonito.c */ PCIBus *bonito_init(qemu_irq *pic); -/* g364fb.c */ -int g364fb_mm_init (target_phys_addr_t vram_base, - target_phys_addr_t ctrl_base, int it_shift, - qemu_irq irq); - /* mipsnet.c */ void mipsnet_init(int base, qemu_irq irq, NICInfo *nd);hw/mips_jazz.c +0
-0@@ -215,7 +215,7 @@ void mips_jazz_init (ram_addr_t ram_size, /* Video card */ switch (jazz_model) {case
JAZZ_MAGNUM:
- g364fb_mm_init(0x40000000,0x60000000, 0, rc4030[3]);
+ sysbus_create_simple("g364",0x60000000, rc4030[3]); break;
caseJAZZ_PICA61:
sysbus_create_simple("sysbus-vga", 0x60000000, NULL); --
1.7.1.GIT
PATCH v2 7/8 qdev: convert jazz irq controller to sysbus device
In reply to Hervé PoussineauUse it in Jazz emulation
--- hw/mips.h | 3 +- hw/mips_jazz.c | 10 +++- hw/rc4030.c | 145 +++++++++++++++++++++++++++++++++++++++----------------- 3 files changed, 111 insertions(+), 47 deletions(-)
hw/mips.h +1 -2
@@ -17,8 +17,7 @@ void rc4030_dma_memory_rw(void *opaque, target_phys_addr_t addr, uint8_t *buf, ivoid rc4030_dma_read (void *dma,uint8_t *buf,int len);void rc4030_dma_write (void *dma,uint8_t *buf,int len); -void *rc4030_init (qemu_irq timer,qemu_irq jazz_bus, -qemu_irq **irqs,rc4030_dma **dmas); +void *rc4030_init (qemu_irq timer,rc4030_dma **dmas);/* dp8393x.c */ void dp83932_init(NICInfo *nd, target_phys_addr_t base, int it_shift,
hw/mips_jazz.c +8 -2
@@ -131,7 +131,8 @@ void mips_jazz_init (ram_addr_t ram_size,char *filename;int bios_size, n;CPUState *env; -qemu_irq *rc4030, *i8259; +DeviceState *dev; +qemu_irq rc4030[16 ], *i8259;rc4030_dma *dmas;void * rc4030_opaque;int s_rtc, s_dma_dummy;
@@ -190,7 +191,12 @@ void mips_jazz_init (ram_addr_t ram_size,cpu_mips_clock_init (env);/* Chipset */ - rc4030_opaque =rc4030_init (env->irq[6 ], env->irq[3 ], &rc4030, &dmas); + dev =sysbus_create_simple ("jazzio" ,0xf0000000 , env->irq[3 ]); +for (n =0 ; n <16 ; n++) { + rc4030[n] =qdev_get_gpio_in (dev, n); + } + + rc4030_opaque =rc4030_init (env->irq[6 ], &dmas); s_dma_dummy =cpu_register_io_memory (dma_dummy_read, dma_dummy_write,NULL );cpu_register_physical_memory (0x8000d000 ,0x00001000 , s_dma_dummy);
hw/rc4030.c +102 -43
273 lines not on this page · raw message
Signature · 1 line
1.7.1.GIT
PATCH v2 8/8 qdev: convert rc4030 to sysbus device
In reply to Hervé PoussineauUse it in Jazz emulation
Remove rc4030_init() function, which is not used anymore
--- hw/mips.h | 4 +- hw/mips_jazz.c | 8 +-- hw/rc4030.c | 135 ++++++++++++++++++++++++++----------------------------- 3 files changed, 69 insertions(+), 78 deletions(-)
hw/mips.h +2 -2
@@ -16,8 +16,8 @@ typedef struct rc4030DMAState *rc4030_dma;void rc4030_dma_memory_rw (void *opaque,target_phys_addr_t addr,uint8_t *buf,int len,int is_write);void rc4030_dma_read (void *dma,uint8_t *buf,int len);void rc4030_dma_write (void *dma,uint8_t *buf,int len); - -void *rc4030_init (qemu_irq timer,rc4030_dma **dmas); +extern rc4030_dma *rc4030_dmas; +extern void *rc4030_dma_opaque;/* dp8393x.c */ void dp83932_init(NICInfo *nd, target_phys_addr_t base, int it_shift,
hw/mips_jazz.c +3 -5
@@ -133,8 +133,6 @@ void mips_jazz_init (ram_addr_t ram_size,CPUState *env;DeviceState *dev;qemu_irq rc4030[16 ], *i8259; -rc4030_dma *dmas; -void * rc4030_opaque;int s_rtc, s_dma_dummy;NICInfo *nd;PITState *pit;
@@ -196,7 +194,7 @@ void mips_jazz_init (ram_addr_t ram_size, rc4030[n] =qdev_get_gpio_in (dev, n); } - rc4030_opaque =rc4030_init (env->irq[6 ], &dmas); +sysbus_create_simple ("rc4030" ,0x80000000 , env->irq[6 ]); s_dma_dummy =cpu_register_io_memory (dma_dummy_read, dma_dummy_write,NULL );cpu_register_physical_memory (0x8000d000 ,0x00001000 , s_dma_dummy);
@@ -237,7 +235,7 @@ void mips_jazz_init (ram_addr_t ram_size, nd->model =qemu_strdup ("dp83932" );if (strcmp (nd->model,"dp83932" ) ==0 ) {dp83932_init (nd,0x80001000 ,2 , rc4030[4 ], - rc4030_opaque, rc4030_dma_memory_rw); + rc4030_dma_opaque, rc4030_dma_memory_rw);break ; }else if (strcmp (nd->model,"?" ) ==0 ) {fprintf (stderr,"qemu: Supported NICs: dp83932\n" );
@@ -250,7 +248,7 @@ void mips_jazz_init (ram_addr_t ram_size,/* SCSI adapter */ esp_init (0x80002000 ,0 , - rc4030_dma_read, rc4030_dma_write, dmas[0 ], + rc4030_dma_read, rc4030_dma_write, rc4030_dmas[0 ], rc4030[5 ], &esp_reset);/* Floppy */
hw/rc4030.c +64 -71
176 lines not on this page · raw message
Signature · 1 line
1.7.1.GIT
Re: [Qemu-devel] [PATCH 8/8] [MIPS] qdev: convert rc4030 to sysbus device
2010/9/8 Hervé Poussineau <[email protected]>:
Quoted 15 lines
Use it in Jazz emulation
Removerc4030_init()function, which is not used anymoreSigned-off-by Hervé Poussineau <[email protected]>---
hw/mips.h | 4 +-
hw/mips_jazz.c | 8 +--
hw/rc4030.c | 135 ++++++++++++++++++++++++++-----------------------------3 files changed, 69 insertions(+), 78 deletions(-)hw/mips.h +0
-0
hw/mips.h typedef struct rc4030DMAState *rc4030_dma; · line 20
Quoted 7 lines
hw/mips.h +2
-2@@ -16,8 +16,8 @@ typedef struct rc4030DMAState *rc4030_dma; void rc4030_dma_memory_rw(void *opaque, target_phys_addr_t addr, uint8_t *buf, int len, int is_write); void rc4030_dma_read(void *dma, uint8_t *buf, int len); void rc4030_dma_write(void *dma, uint8_t *buf, int len); - -void *rc4030_init (qemu_irq timer,rc4030_dma **dmas); +extern rc4030_dma *rc4030_dmas; +extern void *rc4030_dma_opaque;
These should be device properties (DEFINE_PROP_PTR, qdev_set_prop_ptr().
Quoted 233 lines
hw/mips.h +0
-0/* dp8393x.c */ void dp83932_init(NICInfo *nd, target_phys_addr_t base, int it_shift,hw/mips_jazz.c +3
-5@@ -133,8 +133,6 @@ void mips_jazz_init (ram_addr_t ram_size, CPUState *env; DeviceState *dev; qemu_irq rc4030[16], *i8259; - rc4030_dma *dmas; - void* rc4030_opaque; int s_rtc, s_dma_dummy; NICInfo *nd; PITState *pit;@@ -196,7 +194,7 @@ void mips_jazz_init (ram_addr_t ram_size, rc4030[n] = qdev_get_gpio_in(dev, n); } - rc4030_opaque = rc4030_init(env->irq[6], &dmas); + sysbus_create_simple("rc4030", 0x80000000, env->irq[6]); s_dma_dummy = cpu_register_io_memory(dma_dummy_read, dma_dummy_write, NULL); cpu_register_physical_memory(0x8000d000, 0x00001000, s_dma_dummy);@@ -237,7 +235,7 @@ void mips_jazz_init (ram_addr_t ram_size, nd->model = qemu_strdup("dp83932"); if (strcmp(nd->model, "dp83932") == 0) { dp83932_init(nd, 0x80001000, 2, rc4030[4], - rc4030_opaque, rc4030_dma_memory_rw); + rc4030_dma_opaque, rc4030_dma_memory_rw); break; } else if (strcmp(nd->model, "?") == 0) { fprintf(stderr, "qemu: Supported NICs: dp83932\n");@@ -250,7 +248,7 @@ void mips_jazz_init (ram_addr_t ram_size, /* SCSI adapter */ esp_init(0x80002000, 0, - rc4030_dma_read, rc4030_dma_write, dmas[0], + rc4030_dma_read, rc4030_dma_write, rc4030_dmas[0], rc4030[5], &esp_reset); /* Floppy */hw/rc4030.c +4
-2@@ -45,6 +45,9 @@ static const char* irq_names[] = { "parallel", "floppy", "sound", "video", #define RC4030_ERROR(fmt, ...) \ do { fprintf(stderr, "rc4030 ERROR: %s: " fmt, __func__ , ## __VA_ARGS__); } while (0) +rc4030_dma *rc4030_dmas =NULL ; +void *rc4030_dma_opaque =NULL ; + /********************************************************/ /* rc4030 emulation */@@ -584,9 +587,8 @@ static void jazzio_reset(JazzIoState* s) qemu_irq_lower(s->irq); } -static void rc4030_reset (void *opaque) +static void rc4030_reset (rc4030State *s) { - rc4030State *s = opaque; int i;
s->config=0x410; /* some boards seem to accept0x104too */hw/rc4030.c +60
-70@@ -611,63 +613,6 @@ static void rc4030_reset(void *opaque) qemu_irq_lower(s->timer_irq); } -static int rc4030_load (QEMUFile *f,void *opaque,int version_id) -{ - rc4030State* s = opaque; - int i, j; - - if (version_id != 2) - return -EINVAL; - - s->config = qemu_get_be32(f); - s->invalid_address_register = qemu_get_be32(f); - for (i = 0; i < 8; i++) - for (j = 0; j < 4; j++) - s->dma_regs[i][j] = qemu_get_be32(f); - s->dma_tl_base = qemu_get_be32(f); - s->dma_tl_limit = qemu_get_be32(f); - s->cache_maint = qemu_get_be32(f); - s->remote_failed_address = qemu_get_be32(f); - s->memory_failed_address = qemu_get_be32(f); - s->cache_ptag = qemu_get_be32(f); - s->cache_ltag = qemu_get_be32(f); - s->cache_bmask = qemu_get_be32(f); - s->offset210 = qemu_get_be32(f); - s->nvram_protect = qemu_get_be32(f); - for (i = 0; i < 15; i++) - s->rem_speed[i] = qemu_get_be32(f); - s->itr = qemu_get_be32(f); - - set_next_tick(s); - - return 0; -} - -static void rc4030_save (QEMUFile *f,void *opaque) -{ - rc4030State* s = opaque; - int i, j; - - qemu_put_be32(f, s->config); - qemu_put_be32(f, s->invalid_address_register); - for (i = 0; i < 8; i++) - for (j = 0; j < 4; j++) - qemu_put_be32(f, s->dma_regs[i][j]); - qemu_put_be32(f, s->dma_tl_base); - qemu_put_be32(f, s->dma_tl_limit); - qemu_put_be32(f, s->cache_maint); - qemu_put_be32(f, s->remote_failed_address); - qemu_put_be32(f, s->memory_failed_address); - qemu_put_be32(f, s->cache_ptag); - qemu_put_be32(f, s->cache_ltag); - qemu_put_be32(f, s->cache_bmask); - qemu_put_be32(f, s->offset210); - qemu_put_be32(f, s->nvram_protect); - for (i = 0; i < 15; i++) - qemu_put_be32(f, s->rem_speed[i]); - qemu_put_be32(f, s->itr); -} - void rc4030_dma_memory_rw(void *opaque, target_phys_addr_t addr, uint8_t *buf, int len, int is_write) { rc4030State *s = opaque;@@ -788,28 +733,75 @@ static rc4030_dma *rc4030_allocate_dmas(void *opaque, int n) return s; } -void *rc4030_init (qemu_irq timer,rc4030_dma **dmas) +static int rc4030_post_load (void *opaque,int version_id) { - rc4030State *s; - int s_chipset; - - s = qemu_mallocz(sizeof(rc4030State)); + rc4030State *s = opaque; + set_next_tick(s); + return 0; +} - *dmas = rc4030_allocate_dmas(s, 4); +static const VMStateDescription vmstate_rc4030 = { + .name = "rc4030", + .version_id = 0, + .minimum_version_id = 0, + .minimum_version_id_old = 0, + .post_load = rc4030_post_load, + .fields = (VMStateField []) { + VMSTATE_UINT32(config, rc4030State), + VMSTATE_UINT32(invalid_address_register, rc4030State), + VMSTATE_BUFFER_UNSAFE(dma_regs, rc4030State, 0, 8 * 3 * sizeof(uint32_t)), + VMSTATE_UINT32(dma_tl_base, rc4030State), + VMSTATE_UINT32(dma_tl_limit, rc4030State), + VMSTATE_UINT32(cache_maint, rc4030State), + VMSTATE_UINT32(remote_failed_address, rc4030State), + VMSTATE_UINT32(memory_failed_address, rc4030State), + VMSTATE_UINT32(cache_ptag, rc4030State), + VMSTATE_UINT32(cache_ltag, rc4030State), + VMSTATE_UINT32(cache_bmask, rc4030State), + VMSTATE_UINT32(offset210, rc4030State), + VMSTATE_UINT32(nvram_protect, rc4030State), + VMSTATE_UINT32_ARRAY(rem_speed, rc4030State, 16), + VMSTATE_UINT32(itr, rc4030State), + VMSTATE_END_OF_LIST() + } +}; - s->periodic_timer = qemu_new_timer(vm_clock, rc4030_periodic_timer, s); - s->timer_irq = timer; +typedef struct { + SysBusDevice busdev; + rc4030State rc4030; +}SysBusRc4030State ; - qemu_register_reset(rc4030_reset, s); - register_savevm(NULL, "rc4030", 0, 2, rc4030_save, rc4030_load, s); +static void rc4030_sysbus_reset (DeviceState *d) +{ + rc4030State *s = &container_of(d, SysBusRc4030State, busdev.qdev)->rc4030; rc4030_reset(s); +} + +static int rc4030_sysbus_initfn (SysBusDevice *dev) +{ + rc4030State *s = &FROM_SYSBUS(SysBusRc4030State, dev)->rc4030; + int s_chipset; + + rc4030_dmas = rc4030_allocate_dmas(s, 4); + rc4030_dma_opaque = s; + + s->periodic_timer = qemu_new_timer(vm_clock, rc4030_periodic_timer, s); + sysbus_init_irq(dev, &s->timer_irq); s_chipset = cpu_register_io_memory(rc4030_read, rc4030_write, s); - cpu_register_physical_memory(0x80000000, 0x300, s_chipset); + sysbus_init_mmio(dev, 0x300, s_chipset); - return s; + return 0; } +static SysBusDeviceInfo rc4030_sysbus_info = { + .qdev.name = "rc4030", + .qdev.size = sizeof(SysBusRc4030State), + .qdev.vmsd = &vmstate_rc4030, + .qdev.reset = rc4030_sysbus_reset, + .init = rc4030_sysbus_initfn, +}; + static int jazzio_post_load(void *opaque, int version_id) { JazzIoState *s = opaque;@@ -878,6 +870,7 @@ static SysBusDeviceInfo jazzio_sysbus_info = { static void jazz_register(void) { + sysbus_register_withprop(&rc4030_sysbus_info); sysbus_register_withprop(&jazzio_sysbus_info); } --1.7.1.GIT
Re: [Qemu-devel] [PATCH 8/8] [MIPS] qdev: convert rc4030 to sysbus device
Quoted 11 lines · Blue Swirl
2010/9/8 Hervé Poussineau <[email protected]>:
Quoted 10 lines
Use it in Jazz emulation
Removerc4030_init()function, which is not used anymoreSigned-off-by Hervé Poussineau <[email protected]>---
hw/mips.h | 4 +-
hw/mips_jazz.c | 8 +--
hw/rc4030.c | 135 ++++++++++++++++++++++++++-----------------------------3 files changed, 69 insertions(+), 78 deletions(-)
Quoted 14 lines
hw/mips.h typedef struct rc4030DMAState *rc4030_dma; · line 20
Quoted 12 lines
hw/mips.h +2
-2@@ -16,8 +16,8 @@ typedef struct rc4030DMAState *rc4030_dma; void rc4030_dma_memory_rw(void *opaque, target_phys_addr_t addr, uint8_t *buf, int len, int is_write); void rc4030_dma_read(void *dma, uint8_t *buf, int len); void rc4030_dma_write(void *dma, uint8_t *buf, int len); - -void *rc4030_init (qemu_irq timer,rc4030_dma **dmas); +extern rc4030_dma *rc4030_dmas; +extern void *rc4030_dma_opaque;These should be device properties (
DEFINE_PROP_PTR,qdev_set_prop_ptr().
Note: DEFINE_PROP_PTR() & friends are for dirty hacks only. Maybe we should talk about how to do it cleanly.
[...]
Re: [Qemu-devel] [PATCH 8/8] [MIPS] qdev: convert rc4030 to sysbus device
Quoted 28 lines · Markus Armbruster
Quoted 11 lines · Blue Swirl
2010/9/8 Hervé Poussineau <[email protected]>:
Quoted 10 lines
Use it in Jazz emulation
Removerc4030_init()function, which is not used anymoreSigned-off-by Hervé Poussineau <[email protected]>---
hw/mips.h | 4 +-
hw/mips_jazz.c | 8 +--
hw/rc4030.c | 135 ++++++++++++++++++++++++++-----------------------------3 files changed, 69 insertions(+), 78 deletions(-)Quoted 14 lines
hw/mips.h typedef struct rc4030DMAState *rc4030_dma; · line 20
Quoted 12 lines
hw/mips.h +2
-2@@ -16,8 +16,8 @@ typedef struct rc4030DMAState *rc4030_dma; void rc4030_dma_memory_rw(void *opaque, target_phys_addr_t addr, uint8_t *buf, int len, int is_write); void rc4030_dma_read(void *dma, uint8_t *buf, int len); void rc4030_dma_write(void *dma, uint8_t *buf, int len); - -void *rc4030_init (qemu_irq timer,rc4030_dma **dmas); +extern rc4030_dma *rc4030_dmas; +extern void *rc4030_dma_opaque;These should be device properties (
DEFINE_PROP_PTR,qdev_set_prop_ptr().
Quoted 2 lines
Note:
DEFINE_PROP_PTR()& friends are for dirty hacks only. Maybe we should talk about how to do it cleanly.
We'd probably need something like an unified DMA structure at qdev level. Then the global DMA access and mapping routines should be hidden inside that structure.
Another interesting case is pcnet/lance, there also the bus is different (PCI vs. SysBus). Can we still have common DMA structure, or do we need PCIDMA and SysBusDMA?