Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 312c5404011f6a80d1467a19abd916fd203dd7d4
https://github.com/qemu/qemu/commit/312c5404011f6a80d1467a19abd916fd203dd7d4
Author: Stefan Berger <[email protected]>
Date: 2024-10-18 (Fri, 18 Oct 2024)
Changed paths:
M backends/tpm/tpm_emulator.c
M backends/tpm/tpm_ioctl.h
M backends/tpm/trace-events
Log Message:
-----------
tpm: Use new ptm_cap_n structure for PTM_GET_CAPABILITY
Use the new ptm_cap_n structure for getting the PTM_GET_CAPABILITY response
from swtpm. Previously only 17 bits could possibly have been set in ptm_cap
(uint64_t) in big endian order and those bits are now found in the 2nd
32bit word in the response in the caps field.
This data structure makes it now clear that the 1st 32bit word carries the
tpm_result like all the other response structures of all other commands
do.
The changes are taken from the swtpm project's tpm_ioctl.h.
Reviewed-by: Daniel P. Berrangé <[email protected]>
Signed-off-by: Stefan Berger <[email protected]>
Commit: d2bcaacc17c4427bdb2d959cd91a42425fcca3c9
https://github.com/qemu/qemu/commit/d2bcaacc17c4427bdb2d959cd91a42425fcca3c9
Author: Stefan Berger <[email protected]>
Date: 2024-10-18 (Fri, 18 Oct 2024)
Changed paths:
M backends/tpm/tpm_emulator.c
Log Message:
-----------
tpm_emulator: Read control channel response in 2 passes
Error responses from swtpm are typically only 4 bytes long with the
exception of a few commands that return more bytes. Therefore, read the
entire response in 2 steps and stop if the first few bytes indicate an
error response with no subsequent bytes readable. Read the rest in a 2nd
step, if needed. This avoids getting stuck while waiting for too many
bytes in case of an error. The 'getting stuck' condition has not been
observed in practice so far, though.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2615
Reviewed-by: Daniel P. Berrangé <[email protected]>
Signed-off-by: Stefan Berger <[email protected]>
Commit: d9280ea3174700170d39c4cdd3f587f260757711
https://github.com/qemu/qemu/commit/d9280ea3174700170d39c4cdd3f587f260757711
Author: Stefan Berger <[email protected]>
Date: 2024-10-18 (Fri, 18 Oct 2024)
Changed paths:
M tests/qtest/tpm-tests.c
Log Message:
-----------
tests: Wait for migration completion on destination QEMU to avoid failures
Rather than waiting for the completion of migration on the source side,
wait for it on the destination QEMU side to avoid accessing the TPM TIS
memory mapped registers before QEMU could restore their state. This
error condition could be triggered on busy systems where the destination
QEMU did not have enough time to restore the TIS state while the test case
was already reading its registers. The test case was for example reading
the STS register and received an unexpected value (0xffffffff), which
lead to a segmentation fault later on due to trying to read 0xffff bytes
from the TIS into a buffer.
Cc: <[email protected]>
Reported-by: Fabiano Rosas <[email protected]>
Reviewed-by: Daniel P. Berrangé <[email protected]>
Signed-off-by: Stefan Berger <[email protected]>
Commit: bdebb722cfbdc107717551dbbc423887314e9d92
https://github.com/qemu/qemu/commit/bdebb722cfbdc107717551dbbc423887314e9d92
Author: Markus Armbruster <[email protected]>
Date: 2024-10-18 (Fri, 18 Oct 2024)
Changed paths:
M qga/qapi-schema.json
Log Message:
-----------
qga/qapi-schema: Drop obsolete note on "unsupported" errors
The note talks about "unsupported" errors and QERR_UNSUPPORTED. The
former is vague, and the latter makes sense only in C, not in external
interface documentation. Fortunately, we don't have to address this
anymore: recent merge commit 3b5efc553eb got rid of these errors.
Delete the note.
Signed-off-by: Markus Armbruster <[email protected]>
Message-ID: <[email protected]>
Commit: bd783b5cd6ed02d83357632aa230c73166704cdb
https://github.com/qemu/qemu/commit/bd783b5cd6ed02d83357632aa230c73166704cdb
Author: Markus Armbruster <[email protected]>
Date: 2024-10-18 (Fri, 18 Oct 2024)
Changed paths:
M include/qapi/qmp/qerror.h
M qga/commands-win32.c
Log Message:
-----------
qga: Improve error for guest-set-user-password parameter @crypted
The Windows version of guest-set-user-password rejects argument
"crypted": true with the rather useless "this feature or command is
not currently supported". Improve to "'crypted' must be off on this
host".
QERR_UNSUPPORTED is now unused. Drop.
Signed-off-by: Markus Armbruster <[email protected]>
Message-ID: <[email protected]>
Commit: fd1d47740dd0f796119ddaecff9c8dac94620a94
https://github.com/qemu/qemu/commit/fd1d47740dd0f796119ddaecff9c8dac94620a94
Author: Markus Armbruster <[email protected]>
Date: 2024-10-18 (Fri, 18 Oct 2024)
Changed paths:
M qga/commands-bsd.c
M qga/commands-linux.c
M qga/commands-posix.c
Log Message:
-----------
error: Drop superfluous #include "qapi/qmp/qerror.h"
Signed-off-by: Markus Armbruster <[email protected]>
Message-ID: <[email protected]>
Reviewed-by: Daniel P. Berrangé <[email protected]>
Commit: 0f799b83bd44b8ce6e2c577db9f6eb74770c14b8
https://github.com/qemu/qemu/commit/0f799b83bd44b8ce6e2c577db9f6eb74770c14b8
Author: Markus Armbruster <[email protected]>
Date: 2024-10-18 (Fri, 18 Oct 2024)
Changed paths:
M util/block-helpers.c
Log Message:
-----------
block: Improve errors about block sizes
Block sizes need to be a power of two between 512 and an arbitrary
limit, currently 2MiB.
Commit 5937835ac4c factored block size checking out of set_blocksize()
into new check_block_size(), for reuse in block/export/.
Its two error messages are okay for the original purpose:
$ qemu-system-x86_64 -device ide-hd,physical_block_size=1
qemu-system-x86_64: -device ide-hd,physical_block_size=1: Property
.physical_block_size doesn't take value 1 (minimum: 512, maximum: 2097152)
$ qemu-system-x86_64 -device ide-hd,physical_block_size=513
qemu-system-x86_64: -device ide-hd,physical_block_size=513: Property
.physical_block_size doesn't take value '513', it's not a power of 2
They're mildly off for block exports:
$ qemu-storage-daemon --blockdev
node-name=nod0,driver=file,filename=foo.img --export
type=vduse-blk,id=exp0,node-name=nod0,name=foo,logical-block-size=1
qemu-storage-daemon: --export
type=vduse-blk,id=exp0,node-name=nod0,name=foo,logical-block-size=1: Property
exp0.logical-block-size doesn't take value 1 (minimum: 512, maximum: 2097152)
The error message talks about a property. CLI options like --export
don't have properties, they have parameters.
Replace the two error messages by a single one that's okay for both
purposes. Looks like this:
qemu-storage-daemon: --export
type=vduse-blk,id=exp0,node-name=nod0,name=foo,logical-block-size=1: parameter
logical-block-size must be a power of 2 between 512 and 2097152
Signed-off-by: Markus Armbruster <[email protected]>
Message-ID: <[email protected]>
Reviewed-by: Daniel P. Berrangé <[email protected]>
Commit: 5551449bb8e58d0dacb43b3d436b201b28324ee9
https://github.com/qemu/qemu/commit/5551449bb8e58d0dacb43b3d436b201b28324ee9
Author: Markus Armbruster <[email protected]>
Date: 2024-10-18 (Fri, 18 Oct 2024)
Changed paths:
M block/export/vduse-blk.c
M block/export/vhost-user-blk-server.c
M hw/core/qdev-properties-system.c
M util/block-helpers.c
M util/block-helpers.h
Log Message:
-----------
block: Adjust check_block_size() signature
Parameter @id is no longer used, drop. Return a bool to indicate
success / failure, as recommended by qapi/error.h.
Signed-off-by: Markus Armbruster <[email protected]>
Message-ID: <[email protected]>
Reviewed-by: Daniel P. Berrangé <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Commit: f91cf8175bd40142a2dfddbd8e761b8ca1adc30f
https://github.com/qemu/qemu/commit/f91cf8175bd40142a2dfddbd8e761b8ca1adc30f
Author: Markus Armbruster <[email protected]>
Date: 2024-10-18 (Fri, 18 Oct 2024)
Changed paths:
M target/i386/cpu.c
Log Message:
-----------
target/i386/cpu: Avoid mixing signed and unsigned in property setters
Properties "family", "model", and "stepping" are visited as signed
integers. They are backed by bits in CPUX86State member
@cpuid_version. The code to extract and insert these bits mixes
signed and unsigned. Not actually wrong, but avoiding such mixing is
good practice.
Visit them as unsigned integers instead.
This adds a few mildly ugly cast in arguments of error_setg(). The
next commit will get rid of them again.
Property "tsc-frequency" is also visited as signed integer. The value
ultimately flows into the kernel, where it is 31 bits unsigned. The
QEMU code freely mixes int, uint32_t, int64_t. I elect not to attempt
draining this swamp today.
Signed-off-by: Markus Armbruster <[email protected]>
Message-ID: <[email protected]>
Reviewed-by: Daniel P. Berrangé <[email protected]>
Reviewed-by: Igor Mammedov <[email protected]>
Commit: dac7f90c1ccb717959fb216ace7126be5e3f330a
https://github.com/qemu/qemu/commit/dac7f90c1ccb717959fb216ace7126be5e3f330a
Author: Markus Armbruster <[email protected]>
Date: 2024-10-18 (Fri, 18 Oct 2024)
Changed paths:
M target/i386/cpu.c
Log Message:
-----------
target/i386/cpu: Improve errors for out of bounds property values
The error message for a "stepping" value that is out of bounds is a
bit odd:
$ qemu-system-x86_64 -cpu qemu64,stepping=16
qemu-system-x86_64: can't apply global qemu64-x86_64-cpu.stepping=16:
Property .stepping doesn't take value 16 (minimum: 0, maximum: 15)
The "can't apply global" part is an unfortunate artifact of -cpu's
implementation. Left for another day.
The remainder feels overly verbose. Change it to
qemu64-x86_64-cpu: can't apply global qemu64-x86_64-cpu.stepping=16:
parameter 'stepping' can be at most 15
Likewise for "family", "model", and "tsc-frequency".
Signed-off-by: Markus Armbruster <[email protected]>
Message-ID: <[email protected]>
Reviewed-by: Daniel P. Berrangé <[email protected]>
Reviewed-by: Igor Mammedov <[email protected]>
Commit: 627c1e012cb3f14745f9b7d991642894a4402d5c
https://github.com/qemu/qemu/commit/627c1e012cb3f14745f9b7d991642894a4402d5c
Author: Markus Armbruster <[email protected]>
Date: 2024-10-18 (Fri, 18 Oct 2024)
Changed paths:
M hw/intc/openpic.c
Log Message:
-----------
hw/intc/openpic: Improve errors for out of bounds property values
The error message doesn't matter much, as the "openpic" device isn't
user-creatable. But it's the last use of
QERR_PROPERTY_VALUE_OUT_OF_RANGE, which has to go. Change the message
just like the previous commit did for x86 CPUs.
Signed-off-by: Markus Armbruster <[email protected]>
Message-ID: <[email protected]>
Reviewed-by: Daniel P. Berrangé <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Commit: 1824e9fc646c68e42e3f823b208382563ce5dc83
https://github.com/qemu/qemu/commit/1824e9fc646c68e42e3f823b208382563ce5dc83
Author: Markus Armbruster <[email protected]>
Date: 2024-10-18 (Fri, 18 Oct 2024)
Changed paths:
M include/qapi/qmp/qerror.h
Log Message:
-----------
qerror: QERR_PROPERTY_VALUE_OUT_OF_RANGE is no longer used, drop
Signed-off-by: Markus Armbruster <[email protected]>
Message-ID: <[email protected]>
Reviewed-by: Daniel P. Berrangé <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Commit: 19a989096e5d439c78a887bb51d4d9a5310557c9
https://github.com/qemu/qemu/commit/19a989096e5d439c78a887bb51d4d9a5310557c9
Author: Peter Maydell <[email protected]>
Date: 2024-10-18 (Fri, 18 Oct 2024)
Changed paths:
M block/export/vduse-blk.c
M block/export/vhost-user-blk-server.c
M hw/core/qdev-properties-system.c
M hw/intc/openpic.c
M include/qapi/qmp/qerror.h
M qga/commands-bsd.c
M qga/commands-linux.c
M qga/commands-posix.c
M qga/commands-win32.c
M qga/qapi-schema.json
M target/i386/cpu.c
M util/block-helpers.c
M util/block-helpers.h
Log Message:
-----------
Merge tag 'pull-error-2024-10-18' of https://repo.or.cz/qemu/armbru into
staging
Error reporting patches for 2024-10-18
# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmcSXQQSHGFybWJydUBy
# ZWRoYXQuY29tAAoJEDhwtADrkYZTRKcP/R/nmE22MJBDT8LLZEaQpvkqEURpHFVY
# uHcLPBfezWy2A9qgWiPMKEs9Q7L3qpJq2FKCPFx7VyzctMcYt2W70AzVpaBOBkTN
# g5JAyFaJ3cGj6VT/HDZrBeIpySHZI1ynZyRqLvay5aV6l2dIzMWAcpFI4w6He0yJ
# 9CVV5z8K3zh7a7HjkBeWeKn75W2v6cE1PnRlPIsA4Q05LGVU6iHOhZ9LCJYpgIlL
# StJh1zlscSItMbHnfdx0iEiEuoP/nqwoFbA+XpDRzZOLX6+dm2oVwFoApv95bE+/
# CZ8QIy3zda6+V1AGhTfBqDV/NfZZCqzi58YPOo+ny4+sNKXsU7/z2OQzGNVd7NqF
# fpflJAPOe+1tuAd/c40VrJn/DN+TgYVV199kMNfbBojMNaoJh262uvQ9L0NuLcW+
# v0cKYRJsTIIHOFj7NwHR8ALY6ZlE3pdLvz9AivFuLLtK+RtfKw2YQvTDTmqXgRsG
# J6glqTeN+2M9cYb7/r6Kc/P9TGEaSEoCwmAadfmfwLSW/m1UkrqNzn+iC4m1iLe1
# bq+N1iW5T4nhibw8dFCvD4AwFSP9VQNAy5AlKW78Y+K/xAC2781A8PHV9QAIM1/t
# Kz6FRts0Jg6uyB0I7AAZ9k18i1oiEqoz3SjGWpQlTiI7VCMCpgHX6nvwWFPf3Zxa
# Rn0SUg10eUW9
# =sR8Q
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 18 Oct 2024 14:05:08 BST
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "[email protected]"
# gpg: Good signature from "Markus Armbruster <[email protected]>" [full]
# gpg: aka "Markus Armbruster <[email protected]>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* tag 'pull-error-2024-10-18' of https://repo.or.cz/qemu/armbru:
qerror: QERR_PROPERTY_VALUE_OUT_OF_RANGE is no longer used, drop
hw/intc/openpic: Improve errors for out of bounds property values
target/i386/cpu: Improve errors for out of bounds property values
target/i386/cpu: Avoid mixing signed and unsigned in property setters
block: Adjust check_block_size() signature
block: Improve errors about block sizes
error: Drop superfluous #include "qapi/qmp/qerror.h"
qga: Improve error for guest-set-user-password parameter @crypted
qga/qapi-schema: Drop obsolete note on "unsupported" errors
Signed-off-by: Peter Maydell <[email protected]>
Commit: cc5adbbd50d81555b8eb73602ec16fde40b55be4
https://github.com/qemu/qemu/commit/cc5adbbd50d81555b8eb73602ec16fde40b55be4
Author: Peter Maydell <[email protected]>
Date: 2024-10-18 (Fri, 18 Oct 2024)
Changed paths:
M backends/tpm/tpm_emulator.c
M backends/tpm/tpm_ioctl.h
M backends/tpm/trace-events
M tests/qtest/tpm-tests.c
Log Message:
-----------
Merge tag 'pull-tpm-2024-10-18-1' of https://github.com/stefanberger/qemu-tpm
into staging
Merge tpm 2024/10/18 v1
# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCAAdFiEEuBi5yt+QicLVzsZrda1lgCoLQhEFAmcSXq4ACgkQda1lgCoL
# QhHTRQgAhlSeKfhK1iJsExOmkT/mgAsfoawRUl4DZW4nVmm1xjXmRYcGK8cgEFPn
# gw8UJp294cQqxzP9iehEvXP5zkrjmkIQm8fE3hh9nim6bREeo66uDfcfHJEnUK7i
# eLXLChsTvpCRO6TtILW65jXwvajPzC5ZBu2Wsbao4HUdEPWAm/g6+gMnaHMe4Dq/
# ml19bOhPJy7J7+0g8dBVannD2X/PKbXhBEjbBu15QdvzW8jQNp4s6z3YN84Fec6X
# IoDm+rr0ZZ7hZL/zrbLFT5yGPc23lyVWGyvXBUUNBZCy0jYUFwP7XJFuKwfHp1F1
# 323i4AWBF4fqCtodJje15L+xIJKi1A==
# =c7lX
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 18 Oct 2024 14:12:14 BST
# gpg: using RSA key B818B9CADF9089C2D5CEC66B75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <[email protected]>"
[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: B818 B9CA DF90 89C2 D5CE C66B 75AD 6580 2A0B 4211
* tag 'pull-tpm-2024-10-18-1' of https://github.com/stefanberger/qemu-tpm:
tests: Wait for migration completion on destination QEMU to avoid failures
tpm_emulator: Read control channel response in 2 passes
tpm: Use new ptm_cap_n structure for PTM_GET_CAPABILITY
Signed-off-by: Peter Maydell <[email protected]>
Compare: https://github.com/qemu/qemu/compare/f1dd640896ee...cc5adbbd50d8
To unsubscribe from these emails, change your notification settings at
https://github.com/qemu/qemu/settings/notifications
