diff options
| -rw-r--r-- | hw/pci-host/apb.c | 4 | ||||
| -rw-r--r-- | include/sysemu/char.h | 5 | ||||
| -rw-r--r-- | include/ui/console.h | 5 | ||||
| -rw-r--r-- | pc-bios/openbios-ppc | bin | 734008 -> 734012 bytes | |||
| -rw-r--r-- | pc-bios/openbios-sparc32 | bin | 381512 -> 381512 bytes | |||
| -rw-r--r-- | pc-bios/openbios-sparc64 | bin | 1598376 -> 1616768 bytes | |||
| -rw-r--r-- | qemu-char.c | 1 | ||||
| m--------- | roms/openbios | 0 | ||||
| -rw-r--r-- | stubs/vc-init.c | 2 |
9 files changed, 8 insertions, 9 deletions
diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c index 6fa2723449..d238a84f95 100644 --- a/hw/pci-host/apb.c +++ b/hw/pci-host/apb.c @@ -333,7 +333,7 @@ static void iommu_config_write(void *opaque, hwaddr addr, is->regs[IOMMU_CTRL >> 3] &= 0xffffffffULL; is->regs[IOMMU_CTRL >> 3] |= val << 32; } else { - is->regs[IOMMU_CTRL] = val; + is->regs[IOMMU_CTRL >> 3] = val; } break; case IOMMU_CTRL + 0x4: @@ -345,7 +345,7 @@ static void iommu_config_write(void *opaque, hwaddr addr, is->regs[IOMMU_BASE >> 3] &= 0xffffffffULL; is->regs[IOMMU_BASE >> 3] |= val << 32; } else { - is->regs[IOMMU_BASE] = val; + is->regs[IOMMU_BASE >> 3] = val; } break; case IOMMU_BASE + 0x4: diff --git a/include/sysemu/char.h b/include/sysemu/char.h index 3b835f6fb3..672ed39a31 100644 --- a/include/sysemu/char.h +++ b/include/sysemu/char.h @@ -350,4 +350,9 @@ CharDriverState *qemu_chr_open_msmouse(void); /* baum.c */ CharDriverState *chr_baum_init(void); +/* console.c */ +typedef CharDriverState *(VcHandler)(ChardevVC *vc); + +void register_vc_handler(VcHandler *handler); +CharDriverState *vc_init(ChardevVC *vc); #endif diff --git a/include/ui/console.h b/include/ui/console.h index edbaa9b475..845526ed01 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -310,11 +310,6 @@ void qemu_console_copy(QemuConsole *con, int src_x, int src_y, DisplaySurface *qemu_console_surface(QemuConsole *con); DisplayState *qemu_console_displaystate(QemuConsole *console); -typedef CharDriverState *(VcHandler)(ChardevVC *vc); - -CharDriverState *vc_init(ChardevVC *vc); -void register_vc_handler(VcHandler *handler); - /* sdl.c */ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame); diff --git a/pc-bios/openbios-ppc b/pc-bios/openbios-ppc Binary files differindex 8a213894be..0f2fc3a0af 100644 --- a/pc-bios/openbios-ppc +++ b/pc-bios/openbios-ppc diff --git a/pc-bios/openbios-sparc32 b/pc-bios/openbios-sparc32 Binary files differindex d4d00e501f..8917b558e6 100644 --- a/pc-bios/openbios-sparc32 +++ b/pc-bios/openbios-sparc32 diff --git a/pc-bios/openbios-sparc64 b/pc-bios/openbios-sparc64 Binary files differindex 4182052d65..cf72a59ee1 100644 --- a/pc-bios/openbios-sparc64 +++ b/pc-bios/openbios-sparc64 diff --git a/qemu-char.c b/qemu-char.c index b3bd3b5af4..e4eb985b57 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -23,7 +23,6 @@ */ #include "qemu-common.h" #include "monitor/monitor.h" -#include "ui/console.h" #include "sysemu/sysemu.h" #include "qemu/timer.h" #include "sysemu/char.h" diff --git a/roms/openbios b/roms/openbios -Subproject 1ac3fb92c109f5545d373a0576b87750c53cce1 +Subproject a056ccbebaa802b22bed59e2e07ea78f256243c diff --git a/stubs/vc-init.c b/stubs/vc-init.c index 2af054fe6b..308dfa0800 100644 --- a/stubs/vc-init.c +++ b/stubs/vc-init.c @@ -1,5 +1,5 @@ #include "qemu-common.h" -#include "ui/console.h" +#include "sysemu/char.h" CharDriverState *vc_init(ChardevVC *vc) { |