SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

trivial patches for 2024-12-28

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEZKoqtTHVaQM2a/75gqpKJDselHgFAmdv5ucACgkQgqpKJDse
 lHhneA//UIqio45IfMUFwlug8b4Cf/PRYU5+lgKh0SUOn4qpWS7IgF+zXWfk9/IF
 Qg9NH1TVTbEzAyHBhpSUUHPpxfPctcoDGCFVU6dYbgBmGjvQa/ov9Hl7B3Q28i6+
 9K2bRWCDLm05RXHIW2BeBSIXjla9AnE+THQa3dTmrKN4s3WP3+dx96k8sLt0DQQB
 5tT0ilnl3kW4Zhc/4NvDZoxam6Uo8U5EC5xwvXqgfZGRKNwhaAHJVRctDIXiD55c
 2kyZBlV5XdIxLsMHRkzu+ArrS5VTslelDsK7spCOJmLdJ56ylXE2sI82PWwh2/Hg
 GjQkpqKib4WWmlVmWL7TYupsoHodXSjYGzbv6rz7jk8xWc1tJ5iRmLdK03BWv4KN
 G1PkOwiKmZrZtbdY5vz74OhKcqKlijewQJLsUvm7spmr4MqrMn/yEyuAKwyKG3/E
 9KweB5q5KsO0KybCJ4ScMAUCIe5cc7AqSOk3XOKFu+gToccBUG8480UjFldM2Btm
 t8O+dvGJC0OyzlHDUEL4JfT155Kk81/zuKuqCi8dPNVy7juSRm8qNFDD+/GRmrXD
 RfcXRCY7HKHMHYLHltPxhKQ011NASgxpb8VPi8rD64rR4dZIUWiHibkp+BmzsK8M
 9qvUi+a0qNhUlkLL9cFqUgVl8kUOlNFperBsmdi/qncGNiBwK0U=
 =sH6V
 -----END PGP SIGNATURE-----

Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging

trivial patches for 2024-12-28

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCgAdFiEEZKoqtTHVaQM2a/75gqpKJDselHgFAmdv5ucACgkQgqpKJDse
# lHhneA//UIqio45IfMUFwlug8b4Cf/PRYU5+lgKh0SUOn4qpWS7IgF+zXWfk9/IF
# Qg9NH1TVTbEzAyHBhpSUUHPpxfPctcoDGCFVU6dYbgBmGjvQa/ov9Hl7B3Q28i6+
# 9K2bRWCDLm05RXHIW2BeBSIXjla9AnE+THQa3dTmrKN4s3WP3+dx96k8sLt0DQQB
# 5tT0ilnl3kW4Zhc/4NvDZoxam6Uo8U5EC5xwvXqgfZGRKNwhaAHJVRctDIXiD55c
# 2kyZBlV5XdIxLsMHRkzu+ArrS5VTslelDsK7spCOJmLdJ56ylXE2sI82PWwh2/Hg
# GjQkpqKib4WWmlVmWL7TYupsoHodXSjYGzbv6rz7jk8xWc1tJ5iRmLdK03BWv4KN
# G1PkOwiKmZrZtbdY5vz74OhKcqKlijewQJLsUvm7spmr4MqrMn/yEyuAKwyKG3/E
# 9KweB5q5KsO0KybCJ4ScMAUCIe5cc7AqSOk3XOKFu+gToccBUG8480UjFldM2Btm
# t8O+dvGJC0OyzlHDUEL4JfT155Kk81/zuKuqCi8dPNVy7juSRm8qNFDD+/GRmrXD
# RfcXRCY7HKHMHYLHltPxhKQ011NASgxpb8VPi8rD64rR4dZIUWiHibkp+BmzsK8M
# 9qvUi+a0qNhUlkLL9cFqUgVl8kUOlNFperBsmdi/qncGNiBwK0U=
# =sH6V
# -----END PGP SIGNATURE-----
# gpg: Signature made Sat 28 Dec 2024 06:54:15 EST
# gpg:                using RSA key 64AA2AB531D56903366BFEF982AA4A243B1E9478
# gpg: Good signature from "Michael Tokarev <mjt@debian.org>" [unknown]
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>" [unknown]
# gpg:                 aka "Michael Tokarev <mjt@tls.msk.ru>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 9D8B E14E 3F2A 9DD7 9199  28F1 61AD 3D98 ECDF 2C8E
#      Subkey fingerprint: 64AA 2AB5 31D5 6903 366B  FEF9 82AA 4A24 3B1E 9478

* tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu:
  qmp: update vhost-user protocol feature maps
  contrib/plugins/bbv.c: Start bb index from 1
  hw/riscv/riscv-iommu-sys.c: fix duplicated 'table_size'
  target/i386/cpu: Fix notes for CPU models
  docs: Replace 'since' -> 'removed in' in removed-features.rst
  docs: Correct release of TCG trace-events removal
  docs: Correct '-runas' and '-fsdev/-virtfs proxy' indentation
  vvfat: fix ubsan issue in create_long_filename
  hw/timer/hpet: Drop the unused macro
  hw/timer/hpet: Fix comment about capabilities register
  docs/devel: remove dead video link for sourcehut submit process

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2024-12-28 10:16:34 -05:00
commit 2b7a80e07a
10 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/vvfat.c
View File

@ -426,6 +426,10 @@ static direntry_t *create_long_filename(BDRVVVFATState *s, const char *filename)
else if(offset<22) offset=14+offset-10; else if(offset<22) offset=14+offset-10;
else offset=28+offset-22; else offset=28+offset-22;
entry=array_get(&(s->directory),s->directory.next-1-(i/26)); entry=array_get(&(s->directory),s->directory.next-1-(i/26));
/* ensure we don't write anything past entry->name */
if (offset >= sizeof(entry->name)) {
continue;
}
if (i >= 2 * length + 2) { if (i >= 2 * length + 2) {
entry->name[offset] = 0xff; entry->name[offset] = 0xff;
} else if (i % 2 == 0) { } else if (i % 2 == 0) {

2
contrib/plugins/bbv.c
View File

@ -109,7 +109,7 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
bb = g_new(Bb, 1); bb = g_new(Bb, 1);
bb->vaddr = vaddr; bb->vaddr = vaddr;
bb->count = qemu_plugin_scoreboard_new(sizeof(uint64_t)); bb->count = qemu_plugin_scoreboard_new(sizeof(uint64_t));
bb->index = g_hash_table_size(bbs); bb->index = g_hash_table_size(bbs) + 1;
g_hash_table_replace(bbs, &bb->vaddr, bb); g_hash_table_replace(bbs, &bb->vaddr, bb);
} }
g_rw_lock_writer_unlock(&bbs_lock); g_rw_lock_writer_unlock(&bbs_lock);

2
docs/about/deprecated.rst
View File

@ -75,7 +75,7 @@ marked deprecated since 9.0, users have to ensure that all the topology members
described with -smp are supported by the target machine. described with -smp are supported by the target machine.
``-runas`` (since 9.1) ``-runas`` (since 9.1)
---------------------- ''''''''''''''''''''''
Use ``-run-with user=..`` instead. Use ``-run-with user=..`` instead.

24
docs/about/removed-features.rst
View File

@ -403,13 +403,13 @@ Sound card devices should be created using ``-device`` or ``-audio``.
The exception is ``pcspk`` which can be activated using ``-machine The exception is ``pcspk`` which can be activated using ``-machine
pcspk-audiodev=<name>``. pcspk-audiodev=<name>``.
``-watchdog`` (since 7.2) ``-watchdog`` (removed in 7.2)
''''''''''''''''''''''''' ''''''''''''''''''''''''''''''
Use ``-device`` instead. Use ``-device`` instead.
Hexadecimal sizes with scaling multipliers (since 8.0) Hexadecimal sizes with scaling multipliers (removed in 8.0)
'''''''''''''''''''''''''''''''''''''''''''''''''''''' '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
Input parameters that take a size value should only use a size suffix Input parameters that take a size value should only use a size suffix
(such as 'k' or 'M') when the base is written in decimal, and not when (such as 'k' or 'M') when the base is written in decimal, and not when
@ -510,15 +510,15 @@ than zero.
Removed along with the ``compression`` migration capability. Removed along with the ``compression`` migration capability.
``-device virtio-blk,scsi=on|off`` (since 9.1) ``-device virtio-blk,scsi=on|off`` (removed in 9.1)
'''''''''''''''''''''''''''''''''''''''''''''' '''''''''''''''''''''''''''''''''''''''''''''''''''
The virtio-blk SCSI passthrough feature is a legacy VIRTIO feature. VIRTIO 1.0 The virtio-blk SCSI passthrough feature is a legacy VIRTIO feature. VIRTIO 1.0
and later do not support it because the virtio-scsi device was introduced for and later do not support it because the virtio-scsi device was introduced for
full SCSI support. Use virtio-scsi instead when SCSI passthrough is required. full SCSI support. Use virtio-scsi instead when SCSI passthrough is required.
``-fsdev proxy`` and ``-virtfs proxy`` (since 9.2) ``-fsdev proxy`` and ``-virtfs proxy`` (removed in 9.2)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ '''''''''''''''''''''''''''''''''''''''''''''''''''''''
The 9p ``proxy`` filesystem backend driver was originally developed to The 9p ``proxy`` filesystem backend driver was originally developed to
enhance security by dispatching low level filesystem operations from 9p enhance security by dispatching low level filesystem operations from 9p
@ -532,8 +532,8 @@ security model option, or switch to ``virtiofs``. The virtiofs daemon
``virtiofsd`` uses vhost to eliminate the high latency costs of the 9p ``virtiofsd`` uses vhost to eliminate the high latency costs of the 9p
``proxy`` backend. ``proxy`` backend.
``-portrait`` and ``-rotate`` (since 9.2) ``-portrait`` and ``-rotate`` (removed in 9.2)
''''''''''''''''''''''''''''''''''''''''' ''''''''''''''''''''''''''''''''''''''''''''''
The ``-portrait`` and ``-rotate`` options were documented as only The ``-portrait`` and ``-rotate`` options were documented as only
working with the PXA LCD device, and all the machine types using working with the PXA LCD device, and all the machine types using
@ -1087,8 +1087,8 @@ processor IP (see `Intel discontinuance notification`_).
TCG introspection features TCG introspection features
-------------------------- --------------------------
TCG trace-events (since 6.2) TCG trace-events (removed in 7.0)
'''''''''''''''''''''''''''' '''''''''''''''''''''''''''''''''
The ability to add new TCG trace points had bit rotted and as the The ability to add new TCG trace points had bit rotted and as the
feature can be replicated with TCG plugins it was removed. If feature can be replicated with TCG plugins it was removed. If

5
docs/devel/submitting-a-patch.rst
View File

@ -252,10 +252,7 @@ patches to the QEMU mailing list by following these steps:
#. Send your patches to the QEMU mailing list using the web-based #. Send your patches to the QEMU mailing list using the web-based
``git-send-email`` UI at https://git.sr.ht/~USERNAME/qemu/send-email ``git-send-email`` UI at https://git.sr.ht/~USERNAME/qemu/send-email
`This video Documentation for sourcehut is available `here
<https://spacepub.space/videos/watch/ad258d23-0ac6-488c-83fc-2bacf578de3a>`__
shows the web-based ``git-send-email`` workflow. Documentation is
available `here
<https://man.sr.ht/git.sr.ht/#sending-patches-upstream>`__. <https://man.sr.ht/git.sr.ht/#sending-patches-upstream>`__.
.. _cc_the_relevant_maintainer: .. _cc_the_relevant_maintainer:

2
hw/riscv/riscv-iommu-sys.c
View File

@ -121,7 +121,7 @@ static void riscv_iommu_sysdev_init_msi(RISCVIOMMUStateSys *s,
uint32_t n_vectors) uint32_t n_vectors)
{ {
RISCVIOMMUState *iommu = &s->iommu; RISCVIOMMUState *iommu = &s->iommu;
uint32_t table_size = table_size = n_vectors * PCI_MSIX_ENTRY_SIZE; uint32_t table_size = n_vectors * PCI_MSIX_ENTRY_SIZE;
uint32_t table_offset = RISCV_IOMMU_REG_MSI_CONFIG; uint32_t table_offset = RISCV_IOMMU_REG_MSI_CONFIG;
uint32_t pba_size = QEMU_ALIGN_UP(n_vectors, 64) / 8; uint32_t pba_size = QEMU_ALIGN_UP(n_vectors, 64) / 8;
uint32_t pba_offset = RISCV_IOMMU_REG_MSI_CONFIG + 256; uint32_t pba_offset = RISCV_IOMMU_REG_MSI_CONFIG + 256;

2
hw/timer/hpet.c
View File

@ -736,7 +736,7 @@ static void hpet_realize(DeviceState *dev, Error **errp)
timer->state = s; timer->state = s;
} }
/* 64-bit main counter; LegacyReplacementRoute. */ /* 64-bit General Capabilities and ID Register; LegacyReplacementRoute. */
s->capability = 0x8086a001ULL; s->capability = 0x8086a001ULL;
s->capability |= (s->num_timers - 1) << HPET_ID_NUM_TIM_SHIFT; s->capability |= (s->num_timers - 1) << HPET_ID_NUM_TIM_SHIFT;
s->capability |= ((uint64_t)(HPET_CLK_PERIOD * FS_PER_NS) << 32); s->capability |= ((uint64_t)(HPET_CLK_PERIOD * FS_PER_NS) << 32);

6
hw/virtio/virtio-qmp.c
View File

@ -121,6 +121,12 @@ static const qmp_virtio_feature_map_t vhost_user_protocol_map[] = {
FEATURE_ENTRY(VHOST_USER_PROTOCOL_F_STATUS, \ FEATURE_ENTRY(VHOST_USER_PROTOCOL_F_STATUS, \
"VHOST_USER_PROTOCOL_F_STATUS: Querying and notifying back-end " "VHOST_USER_PROTOCOL_F_STATUS: Querying and notifying back-end "
"device status supported"), "device status supported"),
FEATURE_ENTRY(VHOST_USER_PROTOCOL_F_SHARED_OBJECT, \
"VHOST_USER_PROTOCOL_F_SHARED_OBJECT: Backend shared object "
"supported"),
FEATURE_ENTRY(VHOST_USER_PROTOCOL_F_DEVICE_STATE, \
"VHOST_USER_PROTOCOL_F_DEVICE_STATE: Backend device state transfer "
"supported"),
{ -1, "" } { -1, "" }
}; };

1
include/hw/timer/hpet.h
View File

@ -58,7 +58,6 @@
#define HPET_TN_CFG_WRITE_MASK 0x7f4e #define HPET_TN_CFG_WRITE_MASK 0x7f4e
#define HPET_TN_INT_ROUTE_SHIFT 9 #define HPET_TN_INT_ROUTE_SHIFT 9
#define HPET_TN_INT_ROUTE_CAP_SHIFT 32 #define HPET_TN_INT_ROUTE_CAP_SHIFT 32
#define HPET_TN_CFG_BITS_READONLY_OR_RESERVED 0xffff80b1U
struct hpet_fw_entry struct hpet_fw_entry
{ {

3
target/i386/cpu.c
View File

@ -3692,6 +3692,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
}, },
{ {
.version = 4, .version = 4,
.note = "IBRS, EPT switching, no TSX",
.props = (PropValue[]) { .props = (PropValue[]) {
{ "vmx-eptp-switching", "on" }, { "vmx-eptp-switching", "on" },
{ /* end of list */ } { /* end of list */ }
@ -3826,7 +3827,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
}, },
}, },
{ .version = 4, { .version = 4,
.note = "ARCH_CAPABILITIES, no TSX", .note = "ARCH_CAPABILITIES, EPT switching, no TSX",
.props = (PropValue[]) { .props = (PropValue[]) {
{ "vmx-eptp-switching", "on" }, { "vmx-eptp-switching", "on" },
{ /* end of list */ } { /* end of list */ }