diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-12-09 14:38:18 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-12-09 14:38:18 +0000 |
| commit | 28db503fd7a750861aa4381653800d4eb28b5426 (patch) | |
| tree | 585e3a258699ab4c1fb4d5cb324b9b796e420252 /hw | |
| parent | c923a30481baf87f631659085f94cd6000116192 (diff) | |
| parent | b0bed2c916286326b248da05b2ca5f6d152aba44 (diff) | |
| download | qemu-28db503fd7a750861aa4381653800d4eb28b5426.zip qemu-28db503fd7a750861aa4381653800d4eb28b5426.tar.gz qemu-28db503fd7a750861aa4381653800d4eb28b5426.tar.bz2 | |
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-12-09' into staging
* Gitlab-CI improvement patches by Philippe
* Some small fixes for tests
* Fix coverity warning in the mcf5206 code
# gpg: Signature made Wed 09 Dec 2020 07:13:12 GMT
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* remotes/huth-gitlab/tags/pull-request-2020-12-09:
hw/m68k/mcf5206: Don't leak IRQs in mcf5206_mbar_realize()
gitlab-ci: Move coroutine tests across to gitlab
gitlab-ci: Move user-static test across to gitlab
gitlab-ci: Update 'build-disabled' to cover all configurable options
gitlab-ci: Split CONFIGURE_ARGS one argument per line for build-disabled
fuzz: avoid double-fetches by default
tests/qtest/fuzz-test: Quit test_lp1878642 once done
test-qga: fix a resource leak in test_qga_guest_get_osinfo()
gitlab-ci: Add Xen cross-build jobs
gitlab-ci: Add KVM s390x cross-build jobs
gitlab-ci: Introduce 'cross_accel_build_job' template
gitlab-ci: Replace YAML anchors by extends (cross_system_build_job)
gitlab-ci: Document 'build-tcg-disabled' is a KVM X86 job
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/m68k/mcf5206.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c index 51d2e0d..92a194d 100644 --- a/hw/m68k/mcf5206.c +++ b/hw/m68k/mcf5206.c @@ -164,6 +164,7 @@ typedef struct { M68kCPU *cpu; MemoryRegion iomem; + qemu_irq *pic; m5206_timer_state *timer[2]; void *uart[2]; uint8_t scr; @@ -588,17 +589,16 @@ static const MemoryRegionOps m5206_mbar_ops = { static void mcf5206_mbar_realize(DeviceState *dev, Error **errp) { m5206_mbar_state *s = MCF5206_MBAR(dev); - qemu_irq *pic; memory_region_init_io(&s->iomem, NULL, &m5206_mbar_ops, s, "mbar", 0x00001000); sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); - pic = qemu_allocate_irqs(m5206_mbar_set_irq, s, 14); - s->timer[0] = m5206_timer_init(pic[9]); - s->timer[1] = m5206_timer_init(pic[10]); - s->uart[0] = mcf_uart_init(pic[12], serial_hd(0)); - s->uart[1] = mcf_uart_init(pic[13], serial_hd(1)); + s->pic = qemu_allocate_irqs(m5206_mbar_set_irq, s, 14); + s->timer[0] = m5206_timer_init(s->pic[9]); + s->timer[1] = m5206_timer_init(s->pic[10]); + s->uart[0] = mcf_uart_init(s->pic[12], serial_hd(0)); + s->uart[1] = mcf_uart_init(s->pic[13], serial_hd(1)); s->cpu = M68K_CPU(qemu_get_cpu(0)); } |