diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-02-16 17:46:52 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-02-16 17:46:52 +0000 |
| commit | ad584d37f2a86b392c25f3f00cc1f1532676c2d1 (patch) | |
| tree | df53f097f7eff5d7595d4a8a577d2c73e0806e86 /hw/m68k | |
| parent | 7a37b59f1d28e4b4c0f99f49aa305a59986f6643 (diff) | |
| parent | 65c9d60a3ad3249784348824eca69acac455bc02 (diff) | |
| download | qemu-ad584d37f2a86b392c25f3f00cc1f1532676c2d1.tar.gz | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* GUEST_PANICKED improvements (Anton)
* vCont gdbstub rewrite (Claudio)
* Fix CPU creation with -device (Liyang)
* Logging fixes for pty chardevs (Ed)
* Makefile "move if changed" fix (Lin)
* First part of cpu_exec refactoring (me)
* SVM emulation fix (me)
* apic_delivered fix (Pavel)
* "info ioapic" fix (Peter)
* qemu-nbd socket activation (Richard)
* QOMification of mcf_uart (Thomas)
# gpg: Signature made Thu 16 Feb 2017 17:37:31 GMT
# gpg: using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream: (23 commits)
target-i386: correctly propagate retaddr into SVM helpers
vl: log available guest crash information
report guest crash information in GUEST_PANICKED event
i386/cpu: add crash-information QOM property
Makefile: avoid leaving the temporary QEMU_PKGVERSION header file
vl: Move the cpu_synchronize_all_post_init() after generic devices initialization
qemu-nbd: Implement socket activation.
qemu-doc: Clarify that -vga std is now the default
cpu-exec: remove outermost infinite loop
cpu-exec: avoid repeated sigsetjmp on interrupts
cpu-exec: avoid cpu_loop_exit in cpu_handle_interrupt
cpu-exec: tighten barrier on TCG_EXIT_REQUESTED
cpu-exec: fix icount out-of-bounds access
hw/char/mcf_uart: QOMify the ColdFire UART
gdbstub: Fix vCont behaviour
move vm_start to cpus.c
char: drop data written to a disconnected pty
apic: reset apic_delivered global variable on machine reset
qemu-char: socket backend: disconnect on write error
test-vmstate: remove yield_until_fd_readable
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/m68k')
| -rw-r--r-- | hw/m68k/mcf5208.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index bad1d332ed..656351834e 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -255,9 +255,9 @@ static void mcf5208evb_init(MachineState *machine) /* Internal peripherals. */ pic = mcf_intc_init(address_space_mem, 0xfc048000, cpu); - mcf_uart_mm_init(address_space_mem, 0xfc060000, pic[26], serial_hds[0]); - mcf_uart_mm_init(address_space_mem, 0xfc064000, pic[27], serial_hds[1]); - mcf_uart_mm_init(address_space_mem, 0xfc068000, pic[28], serial_hds[2]); + mcf_uart_mm_init(0xfc060000, pic[26], serial_hds[0]); + mcf_uart_mm_init(0xfc064000, pic[27], serial_hds[1]); + mcf_uart_mm_init(0xfc068000, pic[28], serial_hds[2]); mcf5208_sys_init(address_space_mem, pic); |