Fix paths for relocated files
cover Fix paths for relocated files
Several files were renamed in previous commits, causing their entries in MAINTAINERS and source comments to reference outdated paths.
Update the filenames to reflect their current locations so that maintainer lookup works properly, and readers can find the correct files.
The rename history can be verified using:
git log -- <old_filename>
git show --stat <latest_commit_id>
I have also included the relevant commit IDs in each patch to make the review process easier.
Sean Wei (6):
MAINTAINERS: update docs file extensions (.txt -> .rst)
MAINTAINERS: fix paths for relocated files
MAINTAINERS: fix vendor capitalization (Vmware -> VMware)
MAINTAINERS: fix VMware filename typo (vwm -> vmw)
treewide: update docs file extensions (.txt -> .rst) in comments
treewide: fix paths for relocated files in comments
MAINTAINERS | 22 +++++++++++----------- docs/spin/tcg-exclusive.promela | 4 ++-- hw/acpi/nvdimm.c | 2 +- hw/acpi/pcihp.c | 2 +- hw/acpi/vmgenid.c | 6 +++--- hw/misc/ivshmem-flat.c | 2 +- hw/nvme/ctrl.c | 2 +- hw/ppc/spapr.c | 2 +- include/hw/acpi/pcihp.h | 2 +- include/hw/misc/ivshmem-flat.h | 2 +- target/arm/cpu.c | 2 +- target/loongarch/README | 2 +- tests/qtest/vmgenid-test.c | 2 +- 13 files changed, 26 insertions(+), 26 deletions(-)
Signature · 1 line
2.49.0
PATCH 1/6 MAINTAINERS: update docs file extensions (.txt -> .rst)
The documentation tree has been converted to reStructuredText, but two entries in MAINTAINERS still point to the removed *.txt files.
This prevents scripts/get_maintainer.pl from matching the documents.
Update those entries to *.rst so the maintainer script works again.
Related commits:
8472cc5dbe6 (Sep 2023): docs/specs/vmw_pvscsi-spec: Convert to rST 8e72ceee5cd (Jun 2022): Rename docs/specs/fw_cfg.txt to .rst
--- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
MAINTAINERS +2 -2
@@ -2531,7 +2531,7 @@ F: hw/net/net_tx_pkt* Vmware M: Dmitry Fleytman <[email protected]> S: Maintained -F: docs/specs/vmw_pvscsi-spec.txt +F: docs/specs/vmw_pvscsi-spec.rst F: hw/display/vmware_vga.c F: hw/net/vmxnet* F: hw/scsi/vmw_pvscsi*
@@ -2736,7 +2736,7 @@ Firmware configuration (fw_cfg) M: Philippe Mathieu-Daudé <[email protected]> R: Gerd Hoffmann <[email protected]> S: Supported -F: docs/specs/fw_cfg.txt +F: docs/specs/fw_cfg.rst F: hw/nvram/fw_cfg*.c F: stubs/fw_cfg.c F: include/hw/nvram/fw_cfg.h
Signature · 1 line
2.49.0
Re: [PATCH 1/6] MAINTAINERS: update docs file extensions (.txt -> .rst)
Quoted 30 lines · Sean Wei
The documentation tree has been converted to reStructuredText, but two entries in
MAINTAINERSstill point to the removed *.txt files.This prevents
scripts/get_maintainer.plfrom matching the documents.Update those entries to *.rst so the maintainer script works again.
Related commits:
8472cc5dbe6 (Sep 2023): docs/specs/vmw_pvscsi-spec: Convert to rST 8e72ceee5cd (Jun 2022): Rename docs/specs/fw_cfg.txt to .rstSigned-off-by Sean Wei <[email protected]>--- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)MAINTAINERS +1
-1@@ -2531,7 +2531,7 @@ F: hw/net/net_tx_pkt* Vmware M: Dmitry Fleytman <[email protected]> S: Maintained -F: docs/specs/vmw_pvscsi-spec.txt +F: docs/specs/vmw_pvscsi-spec.rst F: hw/display/vmware_vga.c F: hw/net/vmxnet* F: hw/scsi/vmw_pvscsi*
MAINTAINERS Firmware configuration (fw_cfg) · line 2742
Quoted 8 lines
MAINTAINERS +1
-1@@ -2736,7 +2736,7 @@ Firmware configuration (fw_cfg) M: Philippe Mathieu-Daudé <[email protected]> R: Gerd Hoffmann <[email protected]> S: Supported -F: docs/specs/fw_cfg.txt +F: docs/specs/fw_cfg.rst F: hw/nvram/fw_cfg*.c F: stubs/fw_cfg.c F: include/hw/nvram/fw_cfg.h
PATCH 2/6 MAINTAINERS: fix paths for relocated files
In reply to Sean WeiSeveral files were renamed in previous commits, causing their entries in MAINTAINERS to reference outdated paths.
This prevents scripts/get_maintainer.pl from correctly matching these files to their maintainers.
Update the filenames to reflect their current locations so that maintainer lookup works properly.
Related commits
---------------
c45460decbd (Oct 2023)
hw/input/stellaris_input: Rename to stellaris_gamepad Rename include/hw/input/{gamepad.h => stellaris_gamepad.h}
4faf359accb (Nov 2020)
docs: Move virtio-net-failover.rst into the system manual Rename docs/{ => system}/virtio-net-failover.rst
89857312f32 (Apr 2024)
hw/usb: move stubs out of stubs/
Rename stubs/usb-dev-stub.c => hw/usb/bus-stub.c
f2604d8508a (Apr 2024)
hw/virtio: move stubs out of stubs/
Rename stubs/virtio-md-pci.c => hw/virtio/virtio-md-stubs.c
2c888febdfa (Apr 2024)
memory-device: move stubs out of stubs/
Rename stubs/memory_device.c => hw/mem/memory-device-stubs.c
d481cec7565 (Oct 2024)
migration: Move cpu-throttle.c from system to migration Rename {system => migration}/cpu-throttle.c
864a3fa4392 (Jan 2023)
monitor: Rename misc.c to hmp-target.c
Rename monitor/{misc.c => hmp-target.c}
--- MAINTAINERS | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
MAINTAINERS +7 -7
@@ -1002,7 +1002,7 @@ L: [email protected] S: Odd Fixes F: hw/*/stellaris* F: hw/display/ssd03* -F: include/hw/input/gamepad.h +F: include/hw/input/stellaris_gamepad.h F: include/hw/timer/stellaris-gptm.h F: docs/system/arm/stellaris.rst F: tests/functional/test_arm_stellaris.py
@@ -2163,7 +2163,7 @@ F: hw/net/ F: include/hw/net/ F: tests/qtest/virtio-net-test.c F: tests/functional/test_info_usernet.py -F: docs/virtio-net-failover.rst +F: docs/system/virtio-net-failover.rst T: git https://github.com/jasowang/qemu.git net Parallel NOR Flash devices
@@ -2214,7 +2214,7 @@ F: tests/qtest/sdhci-test.c USB S: Orphan F: hw/usb/* -F: stubs/usb-dev-stub.c +F: hw/usb/bus-stub.c F: tests/qtest/usb-*-test.c F: docs/system/devices/usb.rst F: include/hw/usb.h
@@ -2469,7 +2469,7 @@ F: hw/s390x/virtio-ccw-md.h F: hw/s390x/virtio-ccw-md-stubs.c F: hw/virtio/virtio-md-pci.c F: include/hw/virtio/virtio-md-pci.h -F: stubs/virtio-md-pci.c +F: hw/virtio/virtio-md-stubs.c virtio-mem M: David Hildenbrand <[email protected]>
@@ -3187,7 +3187,7 @@ F: hw/mem/pc-dimm.c F: include/hw/mem/memory-device.h F: include/hw/mem/nvdimm.h F: include/hw/mem/pc-dimm.h -F: stubs/memory_device.c +F: hw/mem/memory-device-stubs.c F: docs/nvdimm.txt SPICE
@@ -3228,9 +3228,9 @@ F: util/qemu-timer*.c F: system/vl.c F: system/main.c F: system/cpus.c -F: system/cpu-throttle.c F: system/cpu-timers.c F: system/runstate* +F: migration/cpu-throttle.c F: qapi/run-state.json Read, Copy, Update (RCU)
@@ -3249,7 +3249,7 @@ Human Monitor (HMP) M: Dr. David Alan Gilbert <[email protected]> S: Maintained F: monitor/monitor-internal.h -F: monitor/misc.c +F: monitor/hmp-target.c F: monitor/monitor.c F: monitor/hmp* F: hmp.h
Signature · 1 line
2.49.0
Re: [PATCH 2/6] MAINTAINERS: fix paths for relocated files
Quoted 67 lines · Sean Wei
Several files were renamed in previous commits, causing their entries in
MAINTAINERSto reference outdated paths.
This preventsscripts/get_maintainer.plfrom correctly matching these files to their maintainers.Update the filenames to reflect their current locations so that maintainer lookup works properly.
Related commits
---------------
c45460decbd(Oct 2023)
hw/input/stellaris_input: Rename tostellaris_gamepadRenameinclude/hw/input/{gamepad.h=>stellaris_gamepad.h}
4faf359accb(Nov 2020)
docs: Movevirtio-net-failover.rstinto the system manual Rename docs/{ =>system}/virtio-net-failover.rst
89857312f32(Apr 2024)
hw/usb: move stubs out of stubs/
Renamestubs/usb-dev-stub.c=>hw/usb/bus-stub.c
f2604d8508a(Apr 2024)
hw/virtio: move stubs out of stubs/
Renamestubs/virtio-md-pci.c=>hw/virtio/virtio-md-stubs.c
2c888febdfa(Apr 2024)
memory-device: move stubs out of stubs/
Renamestubs/memory_device.c=>hw/mem/memory-device-stubs.c
d481cec7565(Oct 2024)
migration: Movecpu-throttle.cfrom system to migration Rename {system =>migration}/cpu-throttle.c864a3fa4392 (Jan 2023) monitor: Rename misc.c to hmp-target.c Rename monitor/{misc.c => hmp-target.c}Signed-off-by Sean Wei <[email protected]>--- MAINTAINERS | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)MAINTAINERS +2
-2@@ -1002,7 +1002,7 @@ L: [email protected] S: Odd Fixes F: hw/*/stellaris* F: hw/display/ssd03* -F: include/hw/input/gamepad.h +F: include/hw/input/stellaris_gamepad.h F: include/hw/timer/stellaris-gptm.h F: docs/system/arm/stellaris.rst F: tests/functional/test_arm_stellaris.py@@ -2163,7 +2163,7 @@ F: hw/net/ F: include/hw/net/ F: tests/qtest/virtio-net-test.c F: tests/functional/test_info_usernet.py -F: docs/virtio-net-failover.rst +F: docs/system/virtio-net-failover.rst T: git https://github.com/jasowang/qemu.git net Parallel NOR Flash devices
MAINTAINERS F: tests/qtest/sdhci-test.c · line 2217
Quoted 5 lines
MAINTAINERS +1
-1@@ -2214,7 +2214,7 @@ F: tests/qtest/sdhci-test.c USB S: Orphan F: hw/usb/* -F: stubs/usb-dev-stub.c +F: hw/usb/bus-stub.c
I think we could simply drop this line now completely since it is already covered by the previous hw/usb/* wildcard line.
MAINTAINERS F: hw/s390x/virtio-ccw-md.h · line 2472
Quoted 9 lines
MAINTAINERS +1
-1F: tests/qtest/usb-*-test.c F: docs/system/devices/usb.rst F: include/hw/usb.h@@ -2469,7 +2469,7 @@ F: hw/s390x/virtio-ccw-md.h F: hw/s390x/virtio-ccw-md-stubs.c F: hw/virtio/virtio-md-pci.c F: include/hw/virtio/virtio-md-pci.h -F: stubs/virtio-md-pci.c +F: hw/virtio/virtio-md-stubs.c
Could be merged with the hw/virtio/virtio-md-pci.c line by turning it into:
F: hw/virtio/virtio-md-*.c
MAINTAINERS F: hw/mem/pc-dimm.c · line 3190
Quoted 8 lines
MAINTAINERS +1
-1virtio-mem M: David Hildenbrand <[email protected]>@@ -3187,7 +3187,7 @@ F: hw/mem/pc-dimm.c F: include/hw/mem/memory-device.h F: include/hw/mem/nvdimm.h F: include/hw/mem/pc-dimm.h -F: stubs/memory_device.c +F: hw/mem/memory-device-stubs.c
This could be merged with the preceeding "hw/mem/memory-device.c" line, too, by turning it into:
F: hw/mem/memory-device*.c
Thomas
Re: [PATCH 2/6] MAINTAINERS: fix paths for relocated files
Quoted 100 lines · Thomas Huth
Quoted 69 lines · Sean Wei
Several files were renamed in previous commits, causing their entries in
MAINTAINERSto reference outdated paths.
This preventsscripts/get_maintainer.plfrom correctly matching these files to their maintainers.Update the filenames to reflect their current locations so that maintainer lookup works properly.
Related commits
---------------
c45460decbd(Oct 2023)
hw/input/stellaris_input: Rename tostellaris_gamepadRenameinclude/hw/input/{gamepad.h=>stellaris_gamepad.h}
4faf359accb(Nov 2020)
docs: Movevirtio-net-failover.rstinto the system manual Rename docs/{ =>system}/virtio-net-failover.rst
89857312f32(Apr 2024)
hw/usb: move stubs out of stubs/
Renamestubs/usb-dev-stub.c=>hw/usb/bus-stub.c
f2604d8508a(Apr 2024)
hw/virtio: move stubs out of stubs/
Renamestubs/virtio-md-pci.c=>hw/virtio/virtio-md-stubs.c
2c888febdfa(Apr 2024)
memory-device: move stubs out of stubs/
Renamestubs/memory_device.c=>hw/mem/memory-device-stubs.c
d481cec7565(Oct 2024)
migration: Movecpu-throttle.cfrom system to migration Rename {system =>migration}/cpu-throttle.c
864a3fa4392(Jan 2023)
monitor: Renamemisc.ctohmp-target.c
Renamemonitor/{misc.c=>hmp-target.c}Signed-off-by Sean Wei <[email protected]>---
MAINTAINERS| 14 +++++++-------1 file changed, 7 insertions(+), 7 deletions(-)MAINTAINERS +0
-0@@ -1002,7 +1002,7 @@ L: [email protected]S: Odd Fixes
F: hw/*/stellaris*
F: hw/display/ssd03*MAINTAINERS +1
-1-F: include/hw/input/gamepad.h +F: include/hw/input/stellaris_gamepad.hF:
include/hw/timer/stellaris-gptm.h
F:docs/system/arm/stellaris.rst
F:tests/functional/test_arm_stellaris.pyMAINTAINERS +0
-0@@ -2163,7 +2163,7 @@ F: hw/net/F:
include/hw/net/
F:tests/qtest/virtio-net-test.c
F:tests/functional/test_info_usernet.pyMAINTAINERS +1
-1-F: docs/virtio-net-failover.rst +F: docs/system/virtio-net-failover.rstT: git https://github.com/jasowang/qemu.git net
Parallel NOR Flash devicesMAINTAINERS +0
-0@@ -2214,7 +2214,7 @@ F: tests/qtest/sdhci-test.cUSB
S: Orphan
F: hw/usb/*MAINTAINERS
Quoted 2 lines
MAINTAINERS +1
-1-F: stubs/usb-dev-stub.c +F: hw/usb/bus-stub.cI think we could simply drop this line now completely since it is already covered by the previous hw/usb/* wildcard line.
MAINTAINERS
Quoted 9 lines
F:
tests/qtest/usb-*-test.c
F:docs/system/devices/usb.rst
F:include/hw/usb.hMAINTAINERS +0
-0@@ -2469,7 +2469,7 @@ F: hw/s390x/virtio-ccw-md.hF:
hw/s390x/virtio-ccw-md-stubs.c
F:hw/virtio/virtio-md-pci.c
F:include/hw/virtio/virtio-md-pci.hMAINTAINERS +1
-1-F: stubs/virtio-md-pci.c +F: hw/virtio/virtio-md-stubs.cCould be merged with the
hw/virtio/virtio-md-pci.cline by turning it into:F:
hw/virtio/virtio-md-*.cMAINTAINERS
Quoted 8 lines
virtio-mem
M: David Hildenbrand <[email protected]>MAINTAINERS +0
-0@@ -3187,7 +3187,7 @@ F: hw/mem/pc-dimm.cF:
include/hw/mem/memory-device.h
F:include/hw/mem/nvdimm.h
F:include/hw/mem/pc-dimm.hMAINTAINERS +1
-1-F: stubs/memory_device.c +F: hw/mem/memory-device-stubs.cThis could be merged with the preceeding "
hw/mem/memory-device.c" line, too, by turning it into:
Quoted 4 lines
F:
hw/mem/memory-device*.cThomas
Hi Thomas,
Oh yeah, those suggestions makes sense to me, and make this patch much better!
Should I send a PATCH v2 to the mailing list, or just attach the fix-up like this is enough? I've also reviewed other files and no other improvement found.
Best wishes,
Sean Wei
---
Several files were renamed in previous commits, causing their entries in MAINTAINERS to reference outdated paths.
This prevents scripts/get_maintainer.pl from correctly matching these files to their maintainers.
Update the filenames to reflect their current locations so that maintainer lookup works properly.
Related commits
---------------
c45460decbd (Oct 2023)
hw/input/stellaris_input: Rename to stellaris_gamepad Rename include/hw/input/{gamepad.h => stellaris_gamepad.h}
4faf359accb (Nov 2020)
docs: Move virtio-net-failover.rst into the system manual Rename docs/{ => system}/virtio-net-failover.rst
89857312f32 (Apr 2024)
hw/usb: move stubs out of stubs/
Rename stubs/usb-dev-stub.c => hw/usb/bus-stub.c
f2604d8508a (Apr 2024)
hw/virtio: move stubs out of stubs/
Rename stubs/virtio-md-pci.c => hw/virtio/virtio-md-stubs.c
2c888febdfa (Apr 2024)
memory-device: move stubs out of stubs/
Rename stubs/memory_device.c => hw/mem/memory-device-stubs.c
d481cec7565 (Oct 2024)
migration: Move cpu-throttle.c from system to migration Rename {system => migration}/cpu-throttle.c
864a3fa4392 (Jan 2023)
monitor: Rename misc.c to hmp-target.c
Rename monitor/{misc.c => hmp-target.c}
--- MAINTAINERS | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
MAINTAINERS +6 -9
@@ -1005,7 +1005,7 @@ L: [email protected] S: Odd Fixes F: hw/*/stellaris* F: hw/display/ssd03* -F: include/hw/input/gamepad.h +F: include/hw/input/stellaris_gamepad.h F: include/hw/timer/stellaris-gptm.h F: docs/system/arm/stellaris.rst F: tests/functional/test_arm_stellaris.py
@@ -2171,7 +2171,7 @@ F: hw/net/ F: include/hw/net/ F: tests/qtest/virtio-net-test.c F: tests/functional/test_info_usernet.py -F: docs/virtio-net-failover.rst +F: docs/system/virtio-net-failover.rst T: git https://github.com/jasowang/qemu.git net Parallel NOR Flash devices
@@ -2222,7 +2222,6 @@ F: tests/qtest/sdhci-test.c USB S: Orphan F: hw/usb/* -F: stubs/usb-dev-stub.c F: tests/qtest/usb-*-test.c F: docs/system/devices/usb.rst F: include/hw/usb.h
@@ -2475,9 +2474,8 @@ S: Supported F: hw/s390x/virtio-ccw-md.c F: hw/s390x/virtio-ccw-md.h F: hw/s390x/virtio-ccw-md-stubs.c -F: hw/virtio/virtio-md-pci.c +F: hw/virtio/virtio-md-*.c F: include/hw/virtio/virtio-md-pci.h -F: stubs/virtio-md-pci.c virtio-mem M: David Hildenbrand <[email protected]>
@@ -3195,13 +3193,12 @@ M: David Hildenbrand <[email protected]> M: Igor Mammedov <[email protected]> R: Xiao Guangrong <[email protected]> S: Supported -F: hw/mem/memory-device.c +F: hw/mem/memory-device*.c F: hw/mem/nvdimm.c F: hw/mem/pc-dimm.c F: include/hw/mem/memory-device.h F: include/hw/mem/nvdimm.h F: include/hw/mem/pc-dimm.h -F: stubs/memory_device.c F: docs/nvdimm.txt SPICE
@@ -3242,9 +3239,9 @@ F: util/qemu-timer*.c F: system/vl.c F: system/main.c F: system/cpus.c -F: system/cpu-throttle.c F: system/cpu-timers.c F: system/runstate* +F: migration/cpu-throttle.c F: qapi/run-state.json Read, Copy, Update (RCU)
@@ -3263,7 +3260,7 @@ Human Monitor (HMP) M: Dr. David Alan Gilbert <[email protected]> S: Maintained F: monitor/monitor-internal.h -F: monitor/misc.c +F: monitor/hmp-target.c F: monitor/monitor.c F: monitor/hmp* F: hmp.h
Signature · 1 line
2.50.0
Re: [PATCH 2/6] MAINTAINERS: fix paths for relocated files
Quoted 107 lines · Sean Wei
Quoted 100 lines · Thomas Huth
Quoted 69 lines · Sean Wei
Several files were renamed in previous commits, causing their entries in
MAINTAINERSto reference outdated paths.
This preventsscripts/get_maintainer.plfrom correctly matching these files to their maintainers.Update the filenames to reflect their current locations so that maintainer lookup works properly.
Related commits
---------------
c45460decbd(Oct 2023)
hw/input/stellaris_input: Rename tostellaris_gamepadRenameinclude/hw/input/{gamepad.h=>stellaris_gamepad.h}
4faf359accb(Nov 2020)
docs: Movevirtio-net-failover.rstinto the system manual Rename docs/{ =>system}/virtio-net-failover.rst
89857312f32(Apr 2024)
hw/usb: move stubs out of stubs/
Renamestubs/usb-dev-stub.c=>hw/usb/bus-stub.c
f2604d8508a(Apr 2024)
hw/virtio: move stubs out of stubs/
Renamestubs/virtio-md-pci.c=>hw/virtio/virtio-md-stubs.c
2c888febdfa(Apr 2024)
memory-device: move stubs out of stubs/
Renamestubs/memory_device.c=>hw/mem/memory-device-stubs.c
d481cec7565(Oct 2024)
migration: Movecpu-throttle.cfrom system to migration Rename {system =>migration}/cpu-throttle.c
864a3fa4392(Jan 2023)
monitor: Renamemisc.ctohmp-target.c
Renamemonitor/{misc.c=>hmp-target.c}Signed-off-by Sean Wei <[email protected]>---
MAINTAINERS| 14 +++++++-------1 file changed, 7 insertions(+), 7 deletions(-)MAINTAINERS +0
-0@@ -1002,7 +1002,7 @@ L: [email protected]S: Odd Fixes
F: hw/*/stellaris*
F: hw/display/ssd03*MAINTAINERS +1
-1-F: include/hw/input/gamepad.h +F: include/hw/input/stellaris_gamepad.hF:
include/hw/timer/stellaris-gptm.h
F:docs/system/arm/stellaris.rst
F:tests/functional/test_arm_stellaris.pyMAINTAINERS +0
-0@@ -2163,7 +2163,7 @@ F: hw/net/F:
include/hw/net/
F:tests/qtest/virtio-net-test.c
F:tests/functional/test_info_usernet.pyMAINTAINERS +1
-1-F: docs/virtio-net-failover.rst +F: docs/system/virtio-net-failover.rstT: git https://github.com/jasowang/qemu.git net
Parallel NOR Flash devicesMAINTAINERS +0
-0@@ -2214,7 +2214,7 @@ F: tests/qtest/sdhci-test.cUSB
S: Orphan
F: hw/usb/*MAINTAINERS
Quoted 2 lines
MAINTAINERS +1
-1-F: stubs/usb-dev-stub.c +F: hw/usb/bus-stub.cI think we could simply drop this line now completely since it is already covered by the previous hw/usb/* wildcard line.
MAINTAINERS
Quoted 9 lines
F:
tests/qtest/usb-*-test.c
F:docs/system/devices/usb.rst
F:include/hw/usb.hMAINTAINERS +0
-0@@ -2469,7 +2469,7 @@ F: hw/s390x/virtio-ccw-md.hF:
hw/s390x/virtio-ccw-md-stubs.c
F:hw/virtio/virtio-md-pci.c
F:include/hw/virtio/virtio-md-pci.hMAINTAINERS +1
-1-F: stubs/virtio-md-pci.c +F: hw/virtio/virtio-md-stubs.cCould be merged with the
hw/virtio/virtio-md-pci.cline by turning it into:F:
hw/virtio/virtio-md-*.cMAINTAINERS
Quoted 8 lines
virtio-mem
M: David Hildenbrand <[email protected]>MAINTAINERS +0
-0@@ -3187,7 +3187,7 @@ F: hw/mem/pc-dimm.cF:
include/hw/mem/memory-device.h
F:include/hw/mem/nvdimm.h
F:include/hw/mem/pc-dimm.hMAINTAINERS +1
-1-F: stubs/memory_device.c +F: hw/mem/memory-device-stubs.cThis could be merged with the preceeding "
hw/mem/memory-device.c" line, too, by turning it into:Quoted 4 lines
F:
hw/mem/memory-device*.cThomas
Quoted 5 lines
Hi Thomas,
Oh yeah, those suggestions makes sense to me, and make this patch much better!
Should I send a PATCH v2 to the mailing list, or just attach the fix-up like this is enough?
Normally I'd recommend a proper v2, but this time I was also able to apply your inlined updated patch, so no need to resend.
Thanks, I'll queue your patches for my next pull request.
Thomas
PATCH 3/6 MAINTAINERS: fix vendor capitalization (Vmware -> VMware)
In reply to Sean Wei"VMware" is the vendor's official spelling. Adjust the spelling in MAINTAINERS for consistency.
--- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
MAINTAINERS +1 -1
@@ -2528,7 +2528,7 @@ F: net/eth.c F: hw/net/net_rx_pkt* F: hw/net/net_tx_pkt* -Vmware +VMware M: Dmitry Fleytman <[email protected]> S: Maintained F: docs/specs/vmw_pvscsi-spec.rst
Signature · 1 line
2.49.0
PATCH 4/6 MAINTAINERS: fix VMware filename typo (vwm -> vmw)
In reply to Sean WeiThe entry for the VMware PVSCSI spec uses "vwm" instead of "vmw", which does not match any file in the tree.
Correct the path so scripts/get_maintainer.pl can match the file.
--- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
MAINTAINERS +1 -1
@@ -2539,7 +2539,7 @@ F: pc-bios/efi-vmxnet3.rom F: pc-bios/vgabios-vmware.bin F: roms/config.vga-vmware F: tests/qtest/vmxnet3-test.c -F: docs/specs/vwm_pvscsi-spec.rst +F: docs/specs/vmw_pvscsi-spec.rst Rocker M: Jiri Pirko <[email protected]>
Signature · 1 line
2.49.0
Re: [PATCH 4/6] MAINTAINERS: fix VMware filename typo (vwm -> vmw)
Quoted 15 lines · Sean Wei
The entry for the VMware PVSCSI spec uses "vwm" instead of "vmw", which does not match any file in the tree.
Correct the path so
scripts/get_maintainer.plcan match the file.Signed-off-by Sean Wei <[email protected]>--- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)MAINTAINERS +0
-0
MAINTAINERS F: pc-bios/efi-vmxnet3.rom · line 2542
Quoted 5 lines
MAINTAINERS +1
-1@@ -2539,7 +2539,7 @@ F: pc-bios/efi-vmxnet3.rom F: pc-bios/vgabios-vmware.bin F: roms/config.vga-vmware F: tests/qtest/vmxnet3-test.c -F: docs/specs/vwm_pvscsi-spec.rst +F: docs/specs/vmw_pvscsi-spec.rst
PATCH 5/6 treewide: update docs file extensions (.txt -> .rst) in comments
In reply to Sean WeiSeveral source comments still refer to docs with the old .txt extension that were previously converted to reStructuredText.
Update these references to use the correct .rst extensions to maintain accurate in-tree documentation pointers.
No functional changes.
Related commits:
50f8174c5c1 (Jul 2021): docs/specs/acpi_nvdimm: Convert to rST f054eb1c920 (Jul 2021): docs/specs/acpi_pci_hotplug: Convert to rST 912fb3678b8 (Sep 2023): docs/specs/vmgenid: Convert to rST bb1cff6ee04 (Sep 2023): docs/specs/ivshmem-spec: Convert to rST 55ff468f781 (Jan 2022): docs: Rename ppc-spapr-hotplug.txt to .rst
--- hw/acpi/nvdimm.c | 2 +- hw/acpi/pcihp.c | 2 +- hw/acpi/vmgenid.c | 6 +++--- hw/misc/ivshmem-flat.c | 2 +- hw/ppc/spapr.c | 2 +- include/hw/acpi/pcihp.h | 2 +- include/hw/misc/ivshmem-flat.h | 2 +- tests/qtest/vmgenid-test.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-)
hw/acpi/nvdimm.c +1 -1
@@ -535,7 +535,7 @@ nvdimm_dsm_no_payload(uint32_t func_ret_status, hwaddr dsm_mem_addr)#define NVDIMM_QEMU_RSVD_HANDLE_ROOT 0x10000 -/* Read FIT data, defined in docs/specs/acpi_nvdimm.txt. */ +/* Read FIT data, defined in docs/specs/acpi_nvdimm.rst. */ static void nvdimm_dsm_func_read_fit (NVDIMMState *state,NvdimmDsmIn *in,hwaddr dsm_mem_addr) {
hw/acpi/pcihp.c +1 -1
@@ -3,7 +3,7 @@* * QEMU supports PCI hotplug via ACPI. This module * implements the interface between QEMU and the ACPI BIOS. -* Interface specification - see docs/specs/acpi_pci_hotplug.txt +* Interface specification - see docs/specs/acpi_pci_hotplug.rst * * Copyright (c) 2013, Red Hat Inc, Michael S. Tsirkin ([email protected]) * Copyright (c) 2006 Fabrice Bellard
hw/acpi/vmgenid.c +3 -3
@@ -38,7 +38,7 @@ void vmgenid_build_acpi(VmGenIdState *vms, GArray *table_data, GArray *guid, guid_le =qemu_uuid_bswap (vms->guid);/* The GUID is written at a fixed offset into the fw_cfg file * in order to implement the "OVMF SDT Header probe suppressor" -* see docs/specs/vmgenid.txt for more details +* see docs/specs/vmgenid.rst for more details */ g_array_insert_vals (guid,VMGENID_GUID_OFFSET , guid_le.data,ARRAY_SIZE (guid_le.data));
@@ -101,7 +101,7 @@ void vmgenid_build_acpi(VmGenIdState *vms, GArray *table_data, GArray *guid,* < 4GB, but write 64 bits anyway. * The address that is patched in is offset in order to implement * the "OVMF SDT Header probe suppressor" -* see docs/specs/vmgenid.txt for more details. +* see docs/specs/vmgenid.rst for more details. */ bios_linker_loader_write_pointer(linker, VMGENID_ADDR_FW_CFG_FILE, 0, sizeof(uint64_t),
@@ -153,7 +153,7 @@ static void vmgenid_update_guest(VmGenIdState *vms) guid_le =qemu_uuid_bswap (vms->guid);/* The GUID is written at a fixed offset into the fw_cfg file * in order to implement the "OVMF SDT Header probe suppressor" -* see docs/specs/vmgenid.txt for more details. +* see docs/specs/vmgenid.rst for more details. */ cpu_physical_memory_write (vmgenid_addr, guid_le.data,sizeof (guid_le.data));
hw/misc/ivshmem-flat.c +1 -1
@@ -362,7 +362,7 @@ static bool ivshmem_flat_connect_server(DeviceState *dev, Error **errp)* * ivshmem_flat_recv_msg() calls return 'msg' and 'fd'. * -* See ./docs/specs/ivshmem-spec.txt for details on the protocol. +* See docs/specs/ivshmem-spec.rst for details on the protocol. */ /* Step 0 */
hw/ppc/spapr.c +1 -1
@@ -577,7 +577,7 @@ static int spapr_dt_dynamic_memory(SpaprMachineState *spapr, void *fdt,/* * Adds ibm,dynamic-reconfiguration-memory node. -* Refer to docs/specs/ppc-spapr-hotplug.txt for the documentation +* Refer to docs/specs/ppc-spapr-hotplug.rst for the documentation * of this device tree node. */ static int spapr_dt_dynamic_reconfiguration_memory(SpaprMachineState *spapr,
include/hw/acpi/pcihp.h +1 -1
@@ -3,7 +3,7 @@* * QEMU supports PCI hotplug via ACPI. This module * implements the interface between QEMU and the ACPI BIOS. -* Interface specification - see docs/specs/acpi_pci_hotplug.txt +* Interface specification - see docs/specs/acpi_pci_hotplug.rst * * Copyright (c) 2013, Red Hat Inc, Michael S. Tsirkin ([email protected]) * Copyright (c) 2006 Fabrice Bellard
include/hw/misc/ivshmem-flat.h +1 -1
@@ -36,7 +36,7 @@ typedef struct IvshmemFTState IvshmemFTState;DECLARE_INSTANCE_CHECKER (IvshmemFTState,IVSHMEM_FLAT ,TYPE_IVSHMEM_FLAT ) -/* Ivshmem registers. See ./docs/specs/ivshmem-spec.txt for details. */ +/* Ivshmem registers. See docs/specs/ivshmem-spec.rst for details. */enum ivshmem_registers {INTMASK =0 ,INTSTATUS =4 ,
tests/qtest/vmgenid-test.c +1 -1
@@ -61,7 +61,7 @@ static uint32_t acpi_find_vgia(QTestState *qts)/* The GUID is written at a fixed offset into the fw_cfg file * in order to implement the "OVMF SDT Header probe suppressor" -* see docs/specs/vmgenid.txt for more details +* see docs/specs/vmgenid.rst for more details */ guid_offset =le32_to_cpu (vgia_val) +VMGENID_GUID_OFFSET ;g_free (table_aml);
Signature · 1 line
2.49.0
Re: [PATCH 5/6] treewide: update docs file extensions (.txt -> .rst) in comments
Quoted 16 lines · Sean Wei
Several source comments still refer to docs with the old .txt extension that were previously converted to reStructuredText.
Update these references to use the correct .rst extensions to maintain accurate in-tree documentation pointers.
No functional changes.
Related commits:
50f8174c5c1 (Jul 2021): docs/specs/acpi_nvdimm: Convert to rST f054eb1c920 (Jul 2021): docs/specs/acpi_pci_hotplug: Convert to rST 912fb3678b8 (Sep 2023): docs/specs/vmgenid: Convert to rST bb1cff6ee04 (Sep 2023): docs/specs/ivshmem-spec: Convert to rST 55ff468f781 (Jan 2022): docs: Rename ppc-spapr-hotplug.txt to .rstSigned-off-by Sean Wei <[email protected]>
Quoted 10 lines
--- hw/acpi/nvdimm.c | 2 +- hw/acpi/pcihp.c | 2 +- hw/acpi/vmgenid.c | 6 +++--- hw/misc/ivshmem-flat.c | 2 +- hw/ppc/spapr.c | 2 +- include/hw/acpi/pcihp.h | 2 +- include/hw/misc/ivshmem-flat.h | 2 +- tests/qtest/vmgenid-test.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-)
Re: [PATCH 5/6] treewide: update docs file extensions (.txt -> .rst) in comments
In reply to Sean WeiQuoted 16 lines · Sean Wei
Several source comments still refer to docs with the old .txt extension that were previously converted to reStructuredText.
Update these references to use the correct .rst extensions to maintain accurate in-tree documentation pointers.
No functional changes.
Related commits:
50f8174c5c1 (Jul 2021): docs/specs/acpi_nvdimm: Convert to rST f054eb1c920 (Jul 2021): docs/specs/acpi_pci_hotplug: Convert to rST 912fb3678b8 (Sep 2023): docs/specs/vmgenid: Convert to rST bb1cff6ee04 (Sep 2023): docs/specs/ivshmem-spec: Convert to rST 55ff468f781 (Jan 2022): docs: Rename ppc-spapr-hotplug.txt to .rstSigned-off-by Sean Wei <[email protected]>
Quoted 10 lines
--- hw/acpi/nvdimm.c | 2 +- hw/acpi/pcihp.c | 2 +- hw/acpi/vmgenid.c | 6 +++--- hw/misc/ivshmem-flat.c | 2 +- hw/ppc/spapr.c | 2 +- include/hw/acpi/pcihp.h | 2 +- include/hw/misc/ivshmem-flat.h | 2 +- tests/qtest/vmgenid-test.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-)
Quoted 123 lines
hw/acpi/nvdimm.c +1
-1@@ -535,7 +535,7 @@ nvdimm_dsm_no_payload(uint32_t func_ret_status, hwaddr dsm_mem_addr)#define NVDIMM_QEMU_RSVD_HANDLE_ROOT 0x10000 -/* Read FIT data, defined in docs/specs/acpi_nvdimm.txt. */ +/* Read FIT data, defined in docs/specs/acpi_nvdimm.rst. */ static void nvdimm_dsm_func_read_fit (NVDIMMState *state,NvdimmDsmIn *in,hwaddr dsm_mem_addr) {hw/acpi/pcihp.c +1
-1@@ -3,7 +3,7 @@* * QEMU supports PCI hotplug via ACPI. This module * implements the interface between QEMU and the ACPI BIOS. -* Interface specification - see docs/specs/acpi_pci_hotplug.txt +* Interface specification - see docs/specs/acpi_pci_hotplug.rst * * Copyright (c) 2013, Red Hat Inc, Michael S. Tsirkin ([email protected]) * Copyright (c) 2006 Fabrice Bellard hw/acpi/vmgenid.c +3
-3@@ -38,7 +38,7 @@ void vmgenid_build_acpi(VmGenIdState *vms, GArray *table_data, GArray *guid, guid_le =qemu_uuid_bswap (vms->guid);/* The GUID is written at a fixed offset into the fw_cfg file * in order to implement the "OVMF SDT Header probe suppressor" -* see docs/specs/vmgenid.txt for more details +* see docs/specs/vmgenid.rst for more details */ g_array_insert_vals (guid,VMGENID_GUID_OFFSET , guid_le.data,ARRAY_SIZE (guid_le.data));@@ -101,7 +101,7 @@ void vmgenid_build_acpi(VmGenIdState *vms, GArray *table_data, GArray *guid,* < 4GB, but write 64 bits anyway. * The address that is patched in is offset in order to implement * the "OVMF SDT Header probe suppressor" -* see docs/specs/vmgenid.txt for more details. +* see docs/specs/vmgenid.rst for more details. */ bios_linker_loader_write_pointer(linker, VMGENID_ADDR_FW_CFG_FILE, 0, sizeof(uint64_t),@@ -153,7 +153,7 @@ static void vmgenid_update_guest(VmGenIdState *vms) guid_le =qemu_uuid_bswap (vms->guid);/* The GUID is written at a fixed offset into the fw_cfg file * in order to implement the "OVMF SDT Header probe suppressor" -* see docs/specs/vmgenid.txt for more details. +* see docs/specs/vmgenid.rst for more details. */ cpu_physical_memory_write (vmgenid_addr, guid_le.data,sizeof (guid_le.data));hw/misc/ivshmem-flat.c +1
-1@@ -362,7 +362,7 @@ static bool ivshmem_flat_connect_server(DeviceState *dev, Error **errp)* * ivshmem_flat_recv_msg() calls return 'msg' and 'fd'. * -* See ./docs/specs/ivshmem-spec.txt for details on the protocol. +* See docs/specs/ivshmem-spec.rst for details on the protocol. */ /* Step 0 */ hw/ppc/spapr.c +1
-1@@ -577,7 +577,7 @@ static int spapr_dt_dynamic_memory(SpaprMachineState *spapr, void *fdt,/* * Adds ibm,dynamic-reconfiguration-memory node. -* Refer to docs/specs/ppc-spapr-hotplug.txt for the documentation +* Refer to docs/specs/ppc-spapr-hotplug.rst for the documentation * of this device tree node. */ static int spapr_dt_dynamic_reconfiguration_memory(SpaprMachineState *spapr,include/hw/acpi/pcihp.h +1
-1@@ -3,7 +3,7 @@* * QEMU supports PCI hotplug via ACPI. This module * implements the interface between QEMU and the ACPI BIOS. -* Interface specification - see docs/specs/acpi_pci_hotplug.txt +* Interface specification - see docs/specs/acpi_pci_hotplug.rst * * Copyright (c) 2013, Red Hat Inc, Michael S. Tsirkin ([email protected]) * Copyright (c) 2006 Fabrice Bellard include/hw/misc/ivshmem-flat.h +1
-1@@ -36,7 +36,7 @@ typedef struct IvshmemFTState IvshmemFTState;DECLARE_INSTANCE_CHECKER (IvshmemFTState,IVSHMEM_FLAT ,TYPE_IVSHMEM_FLAT ) -/* Ivshmem registers. See ./docs/specs/ivshmem-spec.txt for details. */ +/* Ivshmem registers. See docs/specs/ivshmem-spec.rst for details. */enum ivshmem_registers {INTMASK =0 ,INTSTATUS =4 ,tests/qtest/vmgenid-test.c +1
-1@@ -61,7 +61,7 @@ static uint32_t acpi_find_vgia(QTestState *qts)/* The GUID is written at a fixed offset into the fw_cfg file * in order to implement the "OVMF SDT Header probe suppressor" -* see docs/specs/vmgenid.txt for more details +* see docs/specs/vmgenid.rst for more details */ guid_offset =le32_to_cpu (vgia_val) +VMGENID_GUID_OFFSET ;g_free (table_aml);
PATCH 6/6 treewide: fix paths for relocated files in comments
In reply to Sean WeiAfter the docs directory restructuring, several comments refer to paths that no longer exist.
Replace these references to the current file locations so readers can find the correct files.
Related commits
---------------
189c099f75f (Jul 2021)
docs: collect the disparate device emulation docs into one section Rename docs/system/{ => devices}/nvme.rst
5f4c96b779f (Feb 2023)
docs/system/loongarch: update loongson3.rst and rename it to virt.rst Rename docs/system/loongarch/{loongson3.rst => virt.rst}
fe0007f3c1d (Sep 2023)
exec: Rename cpu.c -> cpu-target.c
Rename cpus-common.c => cpu-common.c
42fa9665e59 (Apr 2025)
exec: Restrict 'cpu_ldst.h' to accel/tcg/ Rename include/{exec/cpu_ldst.h => accel/tcg/cpu-ldst.h}
--- docs/spin/tcg-exclusive.promela | 4 ++-- hw/nvme/ctrl.c | 2 +- target/arm/cpu.c | 2 +- target/loongarch/README | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
docs/spin/tcg-exclusive.promela +2 -2
@@ -1,6 +1,6 @@ /* * This model describes the implementation of exclusive sections in - * cpus-common.c (start_exclusive, end_exclusive, cpu_exec_start, + * cpu-common.c (start_exclusive, end_exclusive, cpu_exec_start, * cpu_exec_end). * * Author: Paolo Bonzini <[email protected]>
@@ -65,7 +65,7 @@ } #define COND_BROADCAST(c) c++ -// this is the logic from cpus-common.c +// this is the logic from cpu-common.c mutex_t mutex; cond_t exclusive_cond;
hw/nvme/ctrl.c +1 -1
@@ -22,7 +22,7 @@* * Usage * ----- -* See docs/system/nvme.rst for extensive documentation. +* See docs/system/devices/nvme.rst for extensive documentation. * * Add options: * -drive file=<file>,if=none,id=<drive_id>
target/arm/cpu.c +1 -1
@@ -2672,7 +2672,7 @@ static const char *arm_gdb_get_core_xml_file(CPUState *cs)* linux syscall TIF_TAGGED_ADDR setting, not TBI in general. * * There should be a better place to put this, but we need this in -* include/exec/cpu_ldst.h, and not some place linux-user specific. +* include/accel/tcg/cpu-ldst.h, and not some place linux-user specific. * * Note that arm-*-user will never set tagged_addr_enable. */
target/loongarch/README +1 -1
@@ -11,7 +11,7 @@ - System emulation - You can reference docs/system/loongarch/loongson3.rst to get the information about system emulation of LoongArch. + You can reference docs/system/loongarch/virt.rst to get the information about system emulation of LoongArch. - Linux-user emulation
Signature · 1 line
2.49.0
Re: [PATCH 6/6] treewide: fix paths for relocated files in comments
Quoted 25 lines · Sean Wei
After the docs directory restructuring, several comments refer to paths that no longer exist.
Replace these references to the current file locations so readers can find the correct files.
Related commits
---------------189c099f75f (Jul 2021) docs: collect the disparate device emulation docs into one section Rename docs/system/{ => devices}/nvme.rst 5f4c96b779f (Feb 2023) docs/system/loongarch: update loongson3.rst and rename it to virt.rst Rename docs/system/loongarch/{loongson3.rst => virt.rst} fe0007f3c1d (Sep 2023) exec: Rename cpu.c -> cpu-target.c Rename cpus-common.c => cpu-common.c 42fa9665e59 (Apr 2025) exec: Restrict 'cpu_ldst.h' to accel/tcg/ Rename include/{exec/cpu_ldst.h => accel/tcg/cpu-ldst.h}
Quoted 7 lines
Signed-off-by Sean Wei <[email protected]>--- docs/spin/tcg-exclusive.promela | 4 ++-- hw/nvme/ctrl.c | 2 +- target/arm/cpu.c | 2 +- target/loongarch/README | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)