[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] b8fc61: hw/m68k/irqc: Pass CPU using QOM link
|
From: |
Alex Bennée |
|
Subject: |
[Qemu-commits] [qemu/qemu] b8fc61: hw/m68k/irqc: Pass CPU using QOM link property |
|
Date: |
Thu, 02 Nov 2023 18:31:42 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: b8fc6195504dfeca2d283f356e7c13a6fd391acb
https://github.com/qemu/qemu/commit/b8fc6195504dfeca2d283f356e7c13a6fd391acb
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: 2023-11-01 (Wed, 01 Nov 2023)
Changed paths:
M hw/intc/m68k_irqc.c
M hw/m68k/virt.c
M include/hw/intc/m68k_irqc.h
Log Message:
-----------
hw/m68k/irqc: Pass CPU using QOM link property
Avoid the interrupt controller directly access the 'first_cpu'
global. Pass 'cpu' from the board code.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231024083010.12453-2-philmd@linaro.org>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
Commit: 989c8a46cc9ec211b94c4dfa0f8fd8662ab697da
https://github.com/qemu/qemu/commit/989c8a46cc9ec211b94c4dfa0f8fd8662ab697da
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: 2023-11-01 (Wed, 01 Nov 2023)
Changed paths:
M hw/m68k/an5206.c
M hw/m68k/mcf5206.c
Log Message:
-----------
hw/m68k/mcf5206: Pass CPU using QOM link property
Avoid the interrupt controller directly access the first cpu via
the qemu_get_cpu() call. Pass it as argument to mcf5206_init()
from the board code.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231024083010.12453-3-philmd@linaro.org>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
Commit: 4768968960f74db92d9fac360c17838cda39614b
https://github.com/qemu/qemu/commit/4768968960f74db92d9fac360c17838cda39614b
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: 2023-11-01 (Wed, 01 Nov 2023)
Changed paths:
M hw/m68k/mcf_intc.c
Log Message:
-----------
hw/m68k/mcf_intc: Expose MMIO region via SysBus API
QOM objects shouldn't access each other internals fields
except using the QOM API.
Here the caller of mcf_intc_init() access the MMIO region from
the MCF_INTC state. Avoid that by exposing that region via
sysbus_init_mmio(), then get it with sysbus_mmio_get_region().
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Thomas Huth <huth@tuxfamily.org>
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
Message-ID: <20231024083010.12453-4-philmd@linaro.org>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
Commit: 4c4ee593d636dc462b6fe15e00c31d6ff6c72bd0
https://github.com/qemu/qemu/commit/4c4ee593d636dc462b6fe15e00c31d6ff6c72bd0
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: 2023-11-01 (Wed, 01 Nov 2023)
Changed paths:
M hw/m68k/mcf_intc.c
Log Message:
-----------
hw/m68k/mcf_intc: Pass CPU using QOM link property
QOM objects shouldn't access each other internals fields
except using the QOM API.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Thomas Huth <huth@tuxfamily.org>
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
Message-ID: <20231024083010.12453-5-philmd@linaro.org>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
Commit: b2897f7ed446aedf2e5ed33762ac823db13c2f56
https://github.com/qemu/qemu/commit/b2897f7ed446aedf2e5ed33762ac823db13c2f56
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: 2023-11-01 (Wed, 01 Nov 2023)
Changed paths:
M hw/m68k/next-cube.c
Log Message:
-----------
hw/m68k/next-cube: Do not open-code sysbus_create_simple()
Mechanical change using the following coccinelle script:
@@
identifier dev;
identifier sbd;
expression qom_type;
expression addr;
@@
- dev = qdev_new(qom_type);
- sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
- sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, addr);
+ dev = sysbus_create_simple(qom_type, addr, NULL);
then manually removing the 'dev' variable to avoid:
error: variable 'dev' set but not used [-Werror,-Wunused-but-set-variable]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
Message-ID: <20231024083010.12453-6-philmd@linaro.org>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
Commit: 7f090ed7103df119fa33651ae15958ddb5863f56
https://github.com/qemu/qemu/commit/7f090ed7103df119fa33651ae15958ddb5863f56
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: 2023-11-01 (Wed, 01 Nov 2023)
Changed paths:
M hw/m68k/virt.c
Log Message:
-----------
hw/m68k/virt: Do not open-code sysbus_create_simple()
Mechanical change using the following coccinelle script:
@@
identifier dev;
expression qom_type;
expression addr;
expression irq;
@@
- dev = qdev_new(qom_type);
- sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
- sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, addr);
- sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq);
+ dev = sysbus_create_simple(qom_type, addr, irq);
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
Message-ID: <20231024083010.12453-7-philmd@linaro.org>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
Commit: f213ccc96831191ac492bd36b9935effa01f95fd
https://github.com/qemu/qemu/commit/f213ccc96831191ac492bd36b9935effa01f95fd
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: 2023-11-01 (Wed, 01 Nov 2023)
Changed paths:
M hw/char/mcf_uart.c
M hw/m68k/mcf5206.c
M hw/m68k/mcf5208.c
M include/hw/m68k/mcf.h
Log Message:
-----------
hw/char/mcf_uart: Have mcf_uart_create() return DeviceState
There is no point in having mcf_uart_init() demote the DeviceState
pointer and return a void one. Directly return the real typedef.
mcf_uart_init() do both init + realize: rename as mcf_uart_create().
Similarly, mcf_uart_mm_init() do init / realize / mmap: rename as
mcf_uart_create_mmap().
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231019104929.16517-1-philmd@linaro.org>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
Commit: 87f4ba9ed3cfeab440c63169006e1bc19d031d21
https://github.com/qemu/qemu/commit/87f4ba9ed3cfeab440c63169006e1bc19d031d21
Author: Thomas Huth <huth@tuxfamily.org>
Date: 2023-11-01 (Wed, 01 Nov 2023)
Changed paths:
M hw/m68k/next-cube.c
Log Message:
-----------
hw/m68k/next-cube: Mirror BIOS to address 0
The ROM is also available at address 0, so add a proper mirror
for this address.
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-ID: <20230930132351.30282-2-huth@tuxfamily.org>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
Commit: f2a80c6ede47c93771f6a9f6cd82e4c0a1f54f86
https://github.com/qemu/qemu/commit/f2a80c6ede47c93771f6a9f6cd82e4c0a1f54f86
Author: Thomas Huth <huth@tuxfamily.org>
Date: 2023-11-02 (Thu, 02 Nov 2023)
Changed paths:
M hw/m68k/next-cube.c
Log Message:
-----------
m68k: Instantiate the ESP SCSI controller for the NeXTcube machine
The NeXTcube uses a NCR 53C90 SCSI interface for its disks, so we should
be able to use the ESP controller from QEMU here. The code here has been
basically taken from Bryce Lanham's GSoC 2011 contribution, except for
the next_scsi_init() function which has been rewritte as a replacement
for the esp_init() function (that has been removed quite a while ago).
Note that SCSI is not working yet. The ESP code likely needs some more
fixes first and there still might be some bugs left in they way we wire
it up for the NeXT-Cube machine.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-ID: <20230930132351.30282-4-huth@tuxfamily.org>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
Commit: a35c20961bb776ed8a4a7377f946b0f3149d3fe7
https://github.com/qemu/qemu/commit/a35c20961bb776ed8a4a7377f946b0f3149d3fe7
Author: Thomas Huth <huth@tuxfamily.org>
Date: 2023-11-02 (Thu, 02 Nov 2023)
Changed paths:
M tests/avocado/machine_m68k_nextcube.py
Log Message:
-----------
tests/avocado/machine_m68k_nextcube: Fix the download URL for the ROM image
If Avocado has to fetch this asset, the download fails with a 403 HTTP
error. Use a different URL to fix the issue.
Message-ID: <20231101201934.27637-1-huth@tuxfamily.org>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
Commit: 4a6a6cb60de80e9e90d9915abfec8d3d9fcc157c
https://github.com/qemu/qemu/commit/4a6a6cb60de80e9e90d9915abfec8d3d9fcc157c
Author: Stefan Hajnoczi <stefanha@redhat.com>
Date: 2023-11-02 (Thu, 02 Nov 2023)
Changed paths:
M hw/char/mcf_uart.c
M hw/intc/m68k_irqc.c
M hw/m68k/an5206.c
M hw/m68k/mcf5206.c
M hw/m68k/mcf5208.c
M hw/m68k/mcf_intc.c
M hw/m68k/next-cube.c
M hw/m68k/virt.c
M include/hw/intc/m68k_irqc.h
M include/hw/m68k/mcf.h
M tests/avocado/machine_m68k_nextcube.py
Log Message:
-----------
Merge tag 'm68k-pull-2023-11-02' of https://gitlab.com/huth/qemu into staging
* Avoid qemu_get_cpu() and first_cpu, and use properties instead
* Mirror next-cube bios to address 0
* Instantiate ESP SCSI controller in the next-cube machine
* Fix URL in the next-cube avocado test
# -----BEGIN PGP SIGNATURE-----
#
# iQJHBAABCAAxFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmVDbcETHGh1dGhAdHV4
# ZmFtaWx5Lm9yZwAKCRAu2dd0/nAttY1UEACfU8+L6ySkA6X0gtHKyMCQTna+RgGw
# TCQM3eUcL+/ZhcKrBBj397ea80h+VWrniixEpB2VSnQJsHraaIWtLTiOQFPRfVF9
# 4K5Nx/yuNq/6LX+jB5rvntKBeiU97E2XFZ7MKWQRhnjyUKeu6wAXtv4mhiLpj5wN
# PwbREVb0dqI7km/RAfUPJ4cAClokTIHUiUWRcaFR646weH6SU8JIOAyaGpeOhdYY
# QtWRIUThHjuGt2jfXzgOcX+kkc63BuxOn1OOVJpx5j39PhbXeIoPDQoY+EMgEztt
# HS7LYNqh7K8H2nmcgX7pzMEEZlJbDp5R8nLsK7G2a3/s3eAFc1ssAUQV8ZRmncNp
# gup6PDlNjoAb1qr8cu8vfdDMQzlGAIlH68YckSDHSa2H+bFF5LDWMsK1CKUz04x8
# XYub9uA2lH9j34B63Jbnk1grJsB/6gCFl3CTGgljL3kMZZncvmHSUi0TliX9v8pv
# xo7CH/SlG+Xp3XG72E2O01GZ4fZqaStDySr/xCc1hySurR2Ylw7qlu5e40nh8+CT
# CPjY9eWx/4mv7sNTCC/TndawKOBBfQpV3m+mWB2gNnLIuZmdnigcY+GuQaTwpTma
# PteoEMNgqE+H0FAC88n5SL9+tiAoEQ/Xu6HuBDqwJJC1d/+KqvJrkFH6BxzyFrH4
# nSBXNb8y1+qpkA==
# =MOWk
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 02 Nov 2023 17:37:05 HKT
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "huth@tuxfamily.org"
# 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
* tag 'm68k-pull-2023-11-02' of https://gitlab.com/huth/qemu:
tests/avocado/machine_m68k_nextcube: Fix the download URL for the ROM image
m68k: Instantiate the ESP SCSI controller for the NeXTcube machine
hw/m68k/next-cube: Mirror BIOS to address 0
hw/char/mcf_uart: Have mcf_uart_create() return DeviceState
hw/m68k/virt: Do not open-code sysbus_create_simple()
hw/m68k/next-cube: Do not open-code sysbus_create_simple()
hw/m68k/mcf_intc: Pass CPU using QOM link property
hw/m68k/mcf_intc: Expose MMIO region via SysBus API
hw/m68k/mcf5206: Pass CPU using QOM link property
hw/m68k/irqc: Pass CPU using QOM link property
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Compare: https://github.com/qemu/qemu/compare/6c9ae1ce82b6...4a6a6cb60de8