* [PULL 01/17] hw/rdma/vmw/pvrdma_cmd: Use correct struct in query_port()
2023-10-21 12:05 [PULL 00/17] Trivial patches for 2023-10-21 Michael Tokarev
@ 2023-10-21 12:05 ` Michael Tokarev
2023-10-21 12:05 ` [PULL 02/17] hw/ppc/ppc440_uc: Remove dead l2sram_update_mappings() Michael Tokarev
` (16 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tokarev @ 2023-10-21 12:05 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, qemu-trivial, qemu-stable, Michael Tokarev
From: Peter Maydell <peter.maydell@linaro.org>
In query_port() we pass the address of a local pvrdma_port_attr
struct to the rdma_query_backend_port() function. Unfortunately,
rdma_backend_query_port() wants a pointer to a struct ibv_port_attr,
and the two are not the same length.
Coverity spotted this (CID 1507146): pvrdma_port_attr is 48 bytes
long, and ibv_port_attr is 52 bytes, because it has a few extra
fields at the end.
Fortunately, all we do with the attrs struct after the call is to
read a few specific fields out of it which are all at the same
offsets in both structs, so we can simply make the local variable the
correct type. This also lets us drop the cast (which should have
been a bit of a warning flag that we were doing something wrong
here).
We do however need to add extra casts for the fields of the
struct that are enums: clang will complain about the implicit
cast to a different enum type otherwise.
Cc: qemu-stable@nongnu.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
hw/rdma/vmw/pvrdma_cmd.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c
index c6ed025982..d385d18d9c 100644
--- a/hw/rdma/vmw/pvrdma_cmd.c
+++ b/hw/rdma/vmw/pvrdma_cmd.c
@@ -129,23 +129,27 @@ static int query_port(PVRDMADev *dev, union pvrdma_cmd_req *req,
{
struct pvrdma_cmd_query_port *cmd = &req->query_port;
struct pvrdma_cmd_query_port_resp *resp = &rsp->query_port_resp;
- struct pvrdma_port_attr attrs = {};
+ struct ibv_port_attr attrs = {};
if (cmd->port_num > MAX_PORTS) {
return -EINVAL;
}
- if (rdma_backend_query_port(&dev->backend_dev,
- (struct ibv_port_attr *)&attrs)) {
+ if (rdma_backend_query_port(&dev->backend_dev, &attrs)) {
return -ENOMEM;
}
memset(resp, 0, sizeof(*resp));
- resp->attrs.state = dev->func0->device_active ? attrs.state :
- PVRDMA_PORT_DOWN;
- resp->attrs.max_mtu = attrs.max_mtu;
- resp->attrs.active_mtu = attrs.active_mtu;
+ /*
+ * The state, max_mtu and active_mtu fields are enums; the values
+ * for pvrdma_port_state and pvrdma_mtu match those for
+ * ibv_port_state and ibv_mtu, so we can cast them safely.
+ */
+ resp->attrs.state = dev->func0->device_active ?
+ (enum pvrdma_port_state)attrs.state : PVRDMA_PORT_DOWN;
+ resp->attrs.max_mtu = (enum pvrdma_mtu)attrs.max_mtu;
+ resp->attrs.active_mtu = (enum pvrdma_mtu)attrs.active_mtu;
resp->attrs.phys_state = attrs.phys_state;
resp->attrs.gid_tbl_len = MIN(MAX_PORT_GIDS, attrs.gid_tbl_len);
resp->attrs.max_msg_sz = 1024;
--
2.39.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 02/17] hw/ppc/ppc440_uc: Remove dead l2sram_update_mappings()
2023-10-21 12:05 [PULL 00/17] Trivial patches for 2023-10-21 Michael Tokarev
2023-10-21 12:05 ` [PULL 01/17] hw/rdma/vmw/pvrdma_cmd: Use correct struct in query_port() Michael Tokarev
@ 2023-10-21 12:05 ` Michael Tokarev
2023-10-21 12:05 ` [PULL 03/17] MAINTAINERS: Cover hw/ppc/ppc440_uc.c with Sam460ex board Michael Tokarev
` (15 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tokarev @ 2023-10-21 12:05 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé, qemu-trivial, BALATON Zoltan,
Michael Tokarev
From: Philippe Mathieu-Daudé <philmd@linaro.org>
Apparently l2sram_update_mappings() bit-rotted over time,
when defining MAP_L2SRAM we get:
hw/ppc/ppc440_uc.c:83:17: error: no member named 'isarc' in 'struct ppc4xx_l2sram_t'
if (l2sram->isarc != isarc ||
~~~~~~ ^
hw/ppc/ppc440_uc.c:84:18: error: no member named 'isacntl' in 'struct ppc4xx_l2sram_t'
(l2sram->isacntl & 0x80000000) != (isacntl & 0x80000000)) {
~~~~~~ ^
hw/ppc/ppc440_uc.c:85:21: error: no member named 'isacntl' in 'struct ppc4xx_l2sram_t'
if (l2sram->isacntl & 0x80000000) {
~~~~~~ ^
hw/ppc/ppc440_uc.c:88:50: error: no member named 'isarc_ram' in 'struct ppc4xx_l2sram_t'
&l2sram->isarc_ram);
~~~~~~ ^
hw/ppc/ppc440_uc.c:93:50: error: no member named 'isarc_ram' in 'struct ppc4xx_l2sram_t'
&l2sram->isarc_ram);
~~~~~~ ^
hw/ppc/ppc440_uc.c:96:17: error: no member named 'dsarc' in 'struct ppc4xx_l2sram_t'
if (l2sram->dsarc != dsarc ||
~~~~~~ ^
hw/ppc/ppc440_uc.c:97:18: error: no member named 'dsacntl' in 'struct ppc4xx_l2sram_t'
(l2sram->dsacntl & 0x80000000) != (dsacntl & 0x80000000)) {
~~~~~~ ^
hw/ppc/ppc440_uc.c:98:21: error: no member named 'dsacntl' in 'struct ppc4xx_l2sram_t'
if (l2sram->dsacntl & 0x80000000) {
~~~~~~ ^
hw/ppc/ppc440_uc.c:100:52: error: no member named 'dsarc' in 'struct ppc4xx_l2sram_t'
if (!(isacntl & 0x80000000) || l2sram->dsarc != isarc) {
~~~~~~ ^
hw/ppc/ppc440_uc.c:103:54: error: no member named 'dsarc_ram' in 'struct ppc4xx_l2sram_t'
&l2sram->dsarc_ram);
~~~~~~ ^
hw/ppc/ppc440_uc.c:111:54: error: no member named 'dsarc_ram' in 'struct ppc4xx_l2sram_t'
&l2sram->dsarc_ram);
~~~~~~ ^
Remove that dead code.
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
hw/ppc/ppc440_uc.c | 42 ------------------------------------------
1 file changed, 42 deletions(-)
diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
index 4181c843a8..7d6ca70387 100644
--- a/hw/ppc/ppc440_uc.c
+++ b/hw/ppc/ppc440_uc.c
@@ -73,46 +73,6 @@ typedef struct ppc4xx_l2sram_t {
uint32_t isram0[11];
} ppc4xx_l2sram_t;
-#ifdef MAP_L2SRAM
-static void l2sram_update_mappings(ppc4xx_l2sram_t *l2sram,
- uint32_t isarc, uint32_t isacntl,
- uint32_t dsarc, uint32_t dsacntl)
-{
- if (l2sram->isarc != isarc ||
- (l2sram->isacntl & 0x80000000) != (isacntl & 0x80000000)) {
- if (l2sram->isacntl & 0x80000000) {
- /* Unmap previously assigned memory region */
- memory_region_del_subregion(get_system_memory(),
- &l2sram->isarc_ram);
- }
- if (isacntl & 0x80000000) {
- /* Map new instruction memory region */
- memory_region_add_subregion(get_system_memory(), isarc,
- &l2sram->isarc_ram);
- }
- }
- if (l2sram->dsarc != dsarc ||
- (l2sram->dsacntl & 0x80000000) != (dsacntl & 0x80000000)) {
- if (l2sram->dsacntl & 0x80000000) {
- /* Beware not to unmap the region we just mapped */
- if (!(isacntl & 0x80000000) || l2sram->dsarc != isarc) {
- /* Unmap previously assigned memory region */
- memory_region_del_subregion(get_system_memory(),
- &l2sram->dsarc_ram);
- }
- }
- if (dsacntl & 0x80000000) {
- /* Beware not to remap the region we just mapped */
- if (!(isacntl & 0x80000000) || dsarc != isarc) {
- /* Map new data memory region */
- memory_region_add_subregion(get_system_memory(), dsarc,
- &l2sram->dsarc_ram);
- }
- }
- }
-}
-#endif
-
static uint32_t dcr_read_l2sram(void *opaque, int dcrn)
{
ppc4xx_l2sram_t *l2sram = opaque;
@@ -193,7 +153,6 @@ static void dcr_write_l2sram(void *opaque, int dcrn, uint32_t val)
/*l2sram->isram1[dcrn - DCR_L2CACHE_BASE] = val;*/
break;
}
- /*l2sram_update_mappings(l2sram, isarc, isacntl, dsarc, dsacntl);*/
}
static void l2sram_reset(void *opaque)
@@ -203,7 +162,6 @@ static void l2sram_reset(void *opaque)
memset(l2sram->l2cache, 0, sizeof(l2sram->l2cache));
l2sram->l2cache[DCR_L2CACHE_STAT - DCR_L2CACHE_BASE] = 0x80000000;
memset(l2sram->isram0, 0, sizeof(l2sram->isram0));
- /*l2sram_update_mappings(l2sram, isarc, isacntl, dsarc, dsacntl);*/
}
void ppc4xx_l2sram_init(CPUPPCState *env)
--
2.39.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 03/17] MAINTAINERS: Cover hw/ppc/ppc440_uc.c with Sam460ex board
2023-10-21 12:05 [PULL 00/17] Trivial patches for 2023-10-21 Michael Tokarev
2023-10-21 12:05 ` [PULL 01/17] hw/rdma/vmw/pvrdma_cmd: Use correct struct in query_port() Michael Tokarev
2023-10-21 12:05 ` [PULL 02/17] hw/ppc/ppc440_uc: Remove dead l2sram_update_mappings() Michael Tokarev
@ 2023-10-21 12:05 ` Michael Tokarev
2023-10-21 12:05 ` [PULL 04/17] MAINTAINERS: Add the nios2 interrupt controller to the nios2 section Michael Tokarev
` (14 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tokarev @ 2023-10-21 12:05 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé, qemu-trivial, BALATON Zoltan,
Michael Tokarev
From: Philippe Mathieu-Daudé <philmd@linaro.org>
hw/ppc/ppc440_uc.c implements the TYPE_PPC460EX_PCIE_HOST
device, which is used by the aCube Sam460ex board.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: BALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
MAINTAINERS | 1 +
1 file changed, 1 insertion(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 7f9912baa0..c814ed04c4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1495,6 +1495,7 @@ M: BALATON Zoltan <balaton@eik.bme.hu>
L: qemu-ppc@nongnu.org
S: Maintained
F: hw/ppc/sam460ex.c
+F: hw/ppc/ppc440_uc.c
F: hw/ppc/ppc440_pcix.c
F: hw/display/sm501*
F: hw/ide/sii3112.c
--
2.39.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 04/17] MAINTAINERS: Add the nios2 interrupt controller to the nios2 section
2023-10-21 12:05 [PULL 00/17] Trivial patches for 2023-10-21 Michael Tokarev
` (2 preceding siblings ...)
2023-10-21 12:05 ` [PULL 03/17] MAINTAINERS: Cover hw/ppc/ppc440_uc.c with Sam460ex board Michael Tokarev
@ 2023-10-21 12:05 ` Michael Tokarev
2023-10-21 12:05 ` [PULL 05/17] MAINTAINERS: Add include/hw/intc/i8259.h to the PC chip section Michael Tokarev
` (13 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tokarev @ 2023-10-21 12:05 UTC (permalink / raw)
To: qemu-devel; +Cc: Thomas Huth, qemu-trivial, Michael Tokarev
From: Thomas Huth <thuth@redhat.com>
These files obviously belong to the nios2 target, so they should
be listed in the nios2 section in the MAINTAINERS file.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
MAINTAINERS | 2 ++
1 file changed, 2 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index c814ed04c4..5732d2f6ad 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -284,7 +284,9 @@ R: Marek Vasut <marex@denx.de>
S: Orphan
F: target/nios2/
F: hw/nios2/
+F: hw/intc/nios2_vic.c
F: disas/nios2.c
+F: include/hw/intc/nios2_vic.h
F: configs/devices/nios2-softmmu/default.mak
F: tests/docker/dockerfiles/debian-nios2-cross.d/build-toolchain.sh
F: tests/tcg/nios2/
--
2.39.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 05/17] MAINTAINERS: Add include/hw/intc/i8259.h to the PC chip section
2023-10-21 12:05 [PULL 00/17] Trivial patches for 2023-10-21 Michael Tokarev
` (3 preceding siblings ...)
2023-10-21 12:05 ` [PULL 04/17] MAINTAINERS: Add the nios2 interrupt controller to the nios2 section Michael Tokarev
@ 2023-10-21 12:05 ` Michael Tokarev
2023-10-21 12:05 ` [PULL 06/17] MAINTAINERS: Add docs/devel/ebpf_rss.rst to the EBPF section Michael Tokarev
` (12 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tokarev @ 2023-10-21 12:05 UTC (permalink / raw)
To: qemu-devel; +Cc: Thomas Huth, qemu-trivial, Michael Tokarev
From: Thomas Huth <thuth@redhat.com>
i8259.c is already listed here, so the corresponding header should
be mentioned in this section, too.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
MAINTAINERS | 1 +
1 file changed, 1 insertion(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 5732d2f6ad..ab95af5be2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1781,6 +1781,7 @@ F: include/hw/dma/i8257.h
F: include/hw/i2c/pm_smbus.h
F: include/hw/input/i8042.h
F: include/hw/intc/ioapic*
+F: include/hw/intc/i8259.h
F: include/hw/isa/i8259_internal.h
F: include/hw/isa/superio.h
F: include/hw/timer/hpet.h
--
2.39.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 06/17] MAINTAINERS: Add docs/devel/ebpf_rss.rst to the EBPF section
2023-10-21 12:05 [PULL 00/17] Trivial patches for 2023-10-21 Michael Tokarev
` (4 preceding siblings ...)
2023-10-21 12:05 ` [PULL 05/17] MAINTAINERS: Add include/hw/intc/i8259.h to the PC chip section Michael Tokarev
@ 2023-10-21 12:05 ` Michael Tokarev
2023-10-21 12:05 ` [PULL 07/17] MAINTAINERS: Fix a couple s390 paths Michael Tokarev
` (11 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tokarev @ 2023-10-21 12:05 UTC (permalink / raw)
To: qemu-devel
Cc: Thomas Huth, qemu-trivial, Philippe Mathieu-Daudé,
Michael Tokarev
From: Thomas Huth <thuth@redhat.com>
This doc file obviously belongs to the EBPF section.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
MAINTAINERS | 1 +
1 file changed, 1 insertion(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index ab95af5be2..27e5b882ae 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3940,6 +3940,7 @@ M: Jason Wang <jasowang@redhat.com>
R: Andrew Melnychenko <andrew@daynix.com>
R: Yuri Benditovich <yuri.benditovich@daynix.com>
S: Maintained
+F: docs/devel/ebpf_rss.rst
F: ebpf/*
F: tools/ebpf/*
--
2.39.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 07/17] MAINTAINERS: Fix a couple s390 paths
2023-10-21 12:05 [PULL 00/17] Trivial patches for 2023-10-21 Michael Tokarev
` (5 preceding siblings ...)
2023-10-21 12:05 ` [PULL 06/17] MAINTAINERS: Add docs/devel/ebpf_rss.rst to the EBPF section Michael Tokarev
@ 2023-10-21 12:05 ` Michael Tokarev
2023-10-21 12:05 ` [PULL 08/17] ppc/{bamboo, virtex_ml507}: Remove useless dependency on ppc405.h header Michael Tokarev
` (10 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tokarev @ 2023-10-21 12:05 UTC (permalink / raw)
To: qemu-devel
Cc: Eric Farman, qemu-trivial, Claudio Imbrenda, Thomas Huth,
Philippe Mathieu-Daudé, Michael Tokarev
From: Eric Farman <farman@linux.ibm.com>
These are simple typos, since the directories don't exist but the
files themselves do in hw/s390x/
Fixes: 56e3483402 ("MAINTAINERS: split out s390x sections")
Signed-off-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
MAINTAINERS | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 27e5b882ae..167f0fe3ac 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2602,7 +2602,7 @@ M: Halil Pasic <pasic@linux.ibm.com>
M: Christian Borntraeger <borntraeger@linux.ibm.com>
S: Supported
F: hw/s390x/storage-keys.h
-F: hw/390x/s390-skeys*.c
+F: hw/s390x/s390-skeys*.c
L: qemu-s390x@nongnu.org
S390 storage attribute device
@@ -2610,7 +2610,7 @@ M: Halil Pasic <pasic@linux.ibm.com>
M: Christian Borntraeger <borntraeger@linux.ibm.com>
S: Supported
F: hw/s390x/storage-attributes.h
-F: hw/s390/s390-stattrib*.c
+F: hw/s390x/s390-stattrib*.c
L: qemu-s390x@nongnu.org
S390 floating interrupt controller
--
2.39.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 08/17] ppc/{bamboo, virtex_ml507}: Remove useless dependency on ppc405.h header
2023-10-21 12:05 [PULL 00/17] Trivial patches for 2023-10-21 Michael Tokarev
` (6 preceding siblings ...)
2023-10-21 12:05 ` [PULL 07/17] MAINTAINERS: Fix a couple s390 paths Michael Tokarev
@ 2023-10-21 12:05 ` Michael Tokarev
2023-10-21 12:05 ` [PULL 09/17] MAINTAINERS: Adjust file list for PPC ref405ep machine Michael Tokarev
` (9 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tokarev @ 2023-10-21 12:05 UTC (permalink / raw)
To: qemu-devel
Cc: Cédric Le Goater, qemu-trivial, Edgar E. Iglesias,
Daniel Henrique Barboza, Michael Tokarev
From: Cédric Le Goater <clg@kaod.org>
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com> (odd fixer:virtex_ml507)
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
hw/ppc/ppc440_bamboo.c | 1 -
hw/ppc/virtex_ml507.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 45f409c838..a189942de4 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -24,7 +24,6 @@
#include "elf.h"
#include "hw/char/serial.h"
#include "hw/ppc/ppc.h"
-#include "ppc405.h"
#include "sysemu/sysemu.h"
#include "sysemu/reset.h"
#include "hw/sysbus.h"
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index f2f81bd425..d02f330650 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -43,7 +43,6 @@
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc4xx.h"
#include "hw/qdev-properties.h"
-#include "ppc405.h"
#include <libfdt.h>
--
2.39.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 09/17] MAINTAINERS: Adjust file list for PPC ref405ep machine
2023-10-21 12:05 [PULL 00/17] Trivial patches for 2023-10-21 Michael Tokarev
` (7 preceding siblings ...)
2023-10-21 12:05 ` [PULL 08/17] ppc/{bamboo, virtex_ml507}: Remove useless dependency on ppc405.h header Michael Tokarev
@ 2023-10-21 12:05 ` Michael Tokarev
2023-10-21 12:05 ` [PULL 10/17] MAINTAINERS: Adjust file list for PPC 4xx CPUs Michael Tokarev
` (8 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tokarev @ 2023-10-21 12:05 UTC (permalink / raw)
To: qemu-devel
Cc: Cédric Le Goater, qemu-trivial, Philippe Mathieu-Daudé,
Daniel Henrique Barboza, Michael Tokarev
From: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
MAINTAINERS | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 167f0fe3ac..af1fc5d76d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1367,7 +1367,8 @@ PowerPC Machines
405 (ref405ep)
L: qemu-ppc@nongnu.org
S: Orphan
-F: hw/ppc/ppc405_boards.c
+F: hw/ppc/ppc405*
+F: tests/avocado/ppc_405.py
Bamboo
L: qemu-ppc@nongnu.org
--
2.39.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 10/17] MAINTAINERS: Adjust file list for PPC 4xx CPUs
2023-10-21 12:05 [PULL 00/17] Trivial patches for 2023-10-21 Michael Tokarev
` (8 preceding siblings ...)
2023-10-21 12:05 ` [PULL 09/17] MAINTAINERS: Adjust file list for PPC ref405ep machine Michael Tokarev
@ 2023-10-21 12:05 ` Michael Tokarev
2023-10-21 12:05 ` [PULL 11/17] MAINTAINERS: Adjust file list for PPC e500 machines Michael Tokarev
` (7 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tokarev @ 2023-10-21 12:05 UTC (permalink / raw)
To: qemu-devel
Cc: Cédric Le Goater, qemu-trivial, Daniel Henrique Barboza,
Michael Tokarev
From: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
MAINTAINERS | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index af1fc5d76d..ddac1eea9d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1998,7 +1998,9 @@ F: docs/specs/acpi_hest_ghes.rst
ppc4xx
L: qemu-ppc@nongnu.org
S: Orphan
-F: hw/ppc/ppc4*.c
+F: hw/ppc/ppc4xx*.c
+F: hw/ppc/ppc440_uc.c
+F: hw/ppc/ppc440.h
F: hw/i2c/ppc4xx_i2c.c
F: include/hw/ppc/ppc4xx.h
F: include/hw/i2c/ppc4xx_i2c.h
--
2.39.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 11/17] MAINTAINERS: Adjust file list for PPC e500 machines
2023-10-21 12:05 [PULL 00/17] Trivial patches for 2023-10-21 Michael Tokarev
` (9 preceding siblings ...)
2023-10-21 12:05 ` [PULL 10/17] MAINTAINERS: Adjust file list for PPC 4xx CPUs Michael Tokarev
@ 2023-10-21 12:05 ` Michael Tokarev
2023-10-21 12:05 ` [PULL 12/17] MAINTAINERS: Adjust file list for PPC pseries machine Michael Tokarev
` (6 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tokarev @ 2023-10-21 12:05 UTC (permalink / raw)
To: qemu-devel
Cc: Cédric Le Goater, qemu-trivial, Daniel Henrique Barboza,
Michael Tokarev
From: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
MAINTAINERS | 2 ++
1 file changed, 2 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index ddac1eea9d..da5bff8ec0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1380,6 +1380,7 @@ e500
L: qemu-ppc@nongnu.org
S: Orphan
F: hw/ppc/e500*
+F: hw/ppc/ppce500_spin.c
F: hw/gpio/mpc8xxx.c
F: hw/i2c/mpc_i2c.c
F: hw/net/fsl_etsec/
@@ -1389,6 +1390,7 @@ F: include/hw/pci-host/ppce500.h
F: pc-bios/u-boot.e500
F: hw/intc/openpic_kvm.h
F: include/hw/ppc/openpic_kvm.h
+F: docs/system/ppc/ppce500.rst
mpc8544ds
L: qemu-ppc@nongnu.org
--
2.39.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 12/17] MAINTAINERS: Adjust file list for PPC pseries machine
2023-10-21 12:05 [PULL 00/17] Trivial patches for 2023-10-21 Michael Tokarev
` (10 preceding siblings ...)
2023-10-21 12:05 ` [PULL 11/17] MAINTAINERS: Adjust file list for PPC e500 machines Michael Tokarev
@ 2023-10-21 12:05 ` Michael Tokarev
2023-10-21 12:05 ` [PULL 13/17] MAINTAINERS: Add fw_cfg.c to PPC mac99 machine Michael Tokarev
` (5 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tokarev @ 2023-10-21 12:05 UTC (permalink / raw)
To: qemu-devel
Cc: Cédric Le Goater, qemu-trivial, Daniel Henrique Barboza,
Michael Tokarev
From: Cédric Le Goater <clg@kaod.org>
The fdt.{c.h} files provide a helper routine used by the pseries and
pnv machines. Attached it to the list of the larger one: pseries.
Protected Execution Facility (PEF) is the confidential guest support
for PPC pseries machines.
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
MAINTAINERS | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index da5bff8ec0..303f4c7900 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1463,6 +1463,10 @@ F: hw/*/spapr*
F: include/hw/*/spapr*
F: hw/*/xics*
F: include/hw/*/xics*
+F: include/hw/ppc/fdt.h
+F: hw/ppc/fdt.c
+F: include/hw/ppc/pef.h
+F: hw/ppc/pef.c
F: pc-bios/slof.bin
F: docs/system/ppc/pseries.rst
F: docs/specs/ppc-spapr-*
--
2.39.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 13/17] MAINTAINERS: Add fw_cfg.c to PPC mac99 machine
2023-10-21 12:05 [PULL 00/17] Trivial patches for 2023-10-21 Michael Tokarev
` (11 preceding siblings ...)
2023-10-21 12:05 ` [PULL 12/17] MAINTAINERS: Adjust file list for PPC pseries machine Michael Tokarev
@ 2023-10-21 12:05 ` Michael Tokarev
2023-10-21 12:05 ` [PULL 14/17] MAINTAINERS: Add PPC common files to PowerPC TCG CPUs Michael Tokarev
` (4 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tokarev @ 2023-10-21 12:05 UTC (permalink / raw)
To: qemu-devel
Cc: Cédric Le Goater, qemu-trivial, Mark Cave-Ayland,
Daniel Henrique Barboza, Michael Tokarev
From: Cédric Le Goater <clg@kaod.org>
The hw/ppc/fw_cfg.c file contains the implementation of
fw_cfg_arch_key_name(), used by the common nvram model. List it under
mac99 machine next to the mac_nvram model.
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
MAINTAINERS | 1 +
1 file changed, 1 insertion(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 303f4c7900..543a6be00d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1410,6 +1410,7 @@ F: hw/pci-bridge/dec.[hc]
F: hw/misc/macio/
F: hw/misc/mos6522.c
F: hw/nvram/mac_nvram.c
+F: hw/ppc/fw_cfg.c
F: hw/input/adb*
F: include/hw/misc/macio/
F: include/hw/misc/mos6522.h
--
2.39.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 14/17] MAINTAINERS: Add PPC common files to PowerPC TCG CPUs
2023-10-21 12:05 [PULL 00/17] Trivial patches for 2023-10-21 Michael Tokarev
` (12 preceding siblings ...)
2023-10-21 12:05 ` [PULL 13/17] MAINTAINERS: Add fw_cfg.c to PPC mac99 machine Michael Tokarev
@ 2023-10-21 12:05 ` Michael Tokarev
2023-10-21 12:05 ` [PULL 15/17] MAINTAINERS: Add unvalued folders in tests/tcg/ to the right sections Michael Tokarev
` (3 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tokarev @ 2023-10-21 12:05 UTC (permalink / raw)
To: qemu-devel
Cc: Cédric Le Goater, qemu-trivial, Daniel Henrique Barboza,
Michael Tokarev
From: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
MAINTAINERS | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 543a6be00d..6b1f9747d4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -310,6 +310,11 @@ F: target/ppc/
F: hw/ppc/ppc.c
F: hw/ppc/ppc_booke.c
F: include/hw/ppc/ppc.h
+F: hw/ppc/meson.build
+F: hw/ppc/trace*
+F: configs/devices/ppc*
+F: docs/system/ppc/embedded.rst
+F: docs/system/target-ppc.rst
RISC-V TCG CPUs
M: Palmer Dabbelt <palmer@dabbelt.com>
--
2.39.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 15/17] MAINTAINERS: Add unvalued folders in tests/tcg/ to the right sections
2023-10-21 12:05 [PULL 00/17] Trivial patches for 2023-10-21 Michael Tokarev
` (13 preceding siblings ...)
2023-10-21 12:05 ` [PULL 14/17] MAINTAINERS: Add PPC common files to PowerPC TCG CPUs Michael Tokarev
@ 2023-10-21 12:05 ` Michael Tokarev
2023-10-21 12:05 ` [PULL 16/17] MAINTAINERS: Fix typo in openpic_kvm.c entry Michael Tokarev
` (2 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tokarev @ 2023-10-21 12:05 UTC (permalink / raw)
To: qemu-devel
Cc: Thomas Huth, qemu-trivial, Philippe Mathieu-Daudé,
Cédric Le Goater, Michael Tokarev
From: Thomas Huth <thuth@redhat.com>
Some subfolders in tests/tcg/ are already listed in the MAINTAINERS
file, some others aren't listed yet. Add the missing ones now to the
MAINTAINERS file, too, to make sure that get_maintainers.pl reports
the correct maintainer.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
MAINTAINERS | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 6b1f9747d4..00b145280b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -245,6 +245,7 @@ M: Richard Henderson <richard.henderson@linaro.org>
S: Maintained
F: target/hppa/
F: disas/hppa.c
+F: tests/tcg/hppa/
LoongArch TCG CPUs
M: Song Gao <gaosong@loongson.cn>
@@ -258,6 +259,7 @@ M: Laurent Vivier <laurent@vivier.eu>
S: Maintained
F: target/m68k/
F: disas/m68k.c
+F: tests/tcg/m68k/
MicroBlaze TCG CPUs
M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
@@ -315,6 +317,7 @@ F: hw/ppc/trace*
F: configs/devices/ppc*
F: docs/system/ppc/embedded.rst
F: docs/system/target-ppc.rst
+F: tests/tcg/ppc*/*
RISC-V TCG CPUs
M: Palmer Dabbelt <palmer@dabbelt.com>
@@ -333,6 +336,7 @@ F: hw/intc/riscv*
F: include/hw/riscv/
F: linux-user/host/riscv32/
F: linux-user/host/riscv64/
+F: tests/tcg/riscv64/
RISC-V XThead* extensions
M: Christoph Muellner <christoph.muellner@vrull.eu>
@@ -374,6 +378,7 @@ F: target/sh4/
F: hw/sh4/
F: disas/sh4.c
F: include/hw/sh4/
+F: tests/tcg/sh4/
SPARC TCG CPUs
M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
@@ -384,6 +389,7 @@ F: hw/sparc/
F: hw/sparc64/
F: include/hw/sparc/sparc64.h
F: disas/sparc.c
+F: tests/tcg/sparc64/
X86 TCG CPUs
M: Paolo Bonzini <pbonzini@redhat.com>
--
2.39.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 16/17] MAINTAINERS: Fix typo in openpic_kvm.c entry
2023-10-21 12:05 [PULL 00/17] Trivial patches for 2023-10-21 Michael Tokarev
` (14 preceding siblings ...)
2023-10-21 12:05 ` [PULL 15/17] MAINTAINERS: Add unvalued folders in tests/tcg/ to the right sections Michael Tokarev
@ 2023-10-21 12:05 ` Michael Tokarev
2023-10-21 12:05 ` [PULL 17/17] MAINTAINERS: Add the ompic.c file to the or1k-sim section Michael Tokarev
2023-10-24 1:15 ` [PULL 00/17] Trivial patches for 2023-10-21 Stefan Hajnoczi
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tokarev @ 2023-10-21 12:05 UTC (permalink / raw)
To: qemu-devel
Cc: Thomas Huth, qemu-trivial, Cédric Le Goater,
Philippe Mathieu-Daudé, Michael Tokarev
From: Thomas Huth <thuth@redhat.com>
It's a .c file, not a header!
Fixes: ff8cdbbd7e ("MAINTAINERS: Add information for OpenPIC")
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
MAINTAINERS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 00b145280b..7fd7a0201c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1399,7 +1399,7 @@ F: hw/pci-host/ppce500.c
F: include/hw/ppc/ppc_e500.h
F: include/hw/pci-host/ppce500.h
F: pc-bios/u-boot.e500
-F: hw/intc/openpic_kvm.h
+F: hw/intc/openpic_kvm.c
F: include/hw/ppc/openpic_kvm.h
F: docs/system/ppc/ppce500.rst
--
2.39.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PULL 17/17] MAINTAINERS: Add the ompic.c file to the or1k-sim section
2023-10-21 12:05 [PULL 00/17] Trivial patches for 2023-10-21 Michael Tokarev
` (15 preceding siblings ...)
2023-10-21 12:05 ` [PULL 16/17] MAINTAINERS: Fix typo in openpic_kvm.c entry Michael Tokarev
@ 2023-10-21 12:05 ` Michael Tokarev
2023-10-24 1:15 ` [PULL 00/17] Trivial patches for 2023-10-21 Stefan Hajnoczi
17 siblings, 0 replies; 19+ messages in thread
From: Michael Tokarev @ 2023-10-21 12:05 UTC (permalink / raw)
To: qemu-devel; +Cc: Thomas Huth, qemu-trivial, Michael Tokarev
From: Thomas Huth <thuth@redhat.com>
The or1k-sim machine is the only one using the ompic, so let's add
this file to the corresponding sections in the MAINTAINERS file.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
MAINTAINERS | 1 +
1 file changed, 1 insertion(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 7fd7a0201c..65b7a05070 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1371,6 +1371,7 @@ or1k-sim
M: Jia Liu <proljc@gmail.com>
S: Maintained
F: docs/system/openrisc/or1k-sim.rst
+F: hw/intc/ompic.c
F: hw/openrisc/openrisc_sim.c
PowerPC Machines
--
2.39.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PULL 00/17] Trivial patches for 2023-10-21
2023-10-21 12:05 [PULL 00/17] Trivial patches for 2023-10-21 Michael Tokarev
` (16 preceding siblings ...)
2023-10-21 12:05 ` [PULL 17/17] MAINTAINERS: Add the ompic.c file to the or1k-sim section Michael Tokarev
@ 2023-10-24 1:15 ` Stefan Hajnoczi
17 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2023-10-24 1:15 UTC (permalink / raw)
To: Michael Tokarev; +Cc: qemu-devel, Michael Tokarev, qemu-trivial
[-- Attachment #1: Type: text/plain, Size: 115 bytes --]
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/8.2 for any user-visible changes.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread