From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: berrange@redhat.com, ehabkost@redhat.com,
David Hildenbrand <david@redhat.com>,
philmd@redhat.com, Cornelia Huck <cohuck@redhat.com>,
Halil Pasic <pasic@linux.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
qemu-s390x@nongnu.org, pbonzini@redhat.com,
Richard Henderson <rth@twiddle.net>
Subject: [PATCH v2 09/18] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes, eaes}-256
Date: Tue, 5 May 2020 17:29:17 +0200 [thread overview]
Message-ID: <20200505152926.18877-10-armbru@redhat.com> (raw)
In-Reply-To: <20200505152926.18877-1-armbru@redhat.com>
Both s390_features[S390_FEAT_PCC_CMAC_AES_256].name and
s390_features[S390_FEAT_PCC_CMAC_EAES_256].name is
"pcc-cmac-eaes-256". The former is obviously a pasto.
Impact:
* s390_feat_bitmap_to_ascii() misidentifies S390_FEAT_PCC_CMAC_AES_256
as "pcc-cmac-eaes-256". Affects QMP commands query-cpu-definitions,
query-cpu-model-expansion, query-cpu-model-baseline,
query-cpu-model-comparison, and the error message when
s390_realize_cpu_model() fails in check_compatibility().
* s390_cpu_list() also misidentifies it. Affects -cpu help.
* s390_cpu_model_register_props() creates CPU property
"pcc-cmac-eaes-256" twice. The second one fails, but the error is
ignored (a later commit will change that). Results in a single
property "pcc-cmac-eaes-256" with the description for
S390_FEAT_PCC_CMAC_AES_256, and no property for
S390_FEAT_PCC_CMAC_EAES_256. CPU properties are visible in CLI -cpu
and -device, QMP & HMP device_add, QMP device-list-properties, and
QOM introspection.
Fix by deleting the wayward 'e'.
Fixes: 782417446279717aa85320191a519b51f6d5dd31
Cc: Halil Pasic <pasic@linux.ibm.com>
Cc: Cornelia Huck <cohuck@redhat.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: David Hildenbrand <david@redhat.com>
Cc: qemu-s390x@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
target/s390x/cpu_features_def.inc.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/s390x/cpu_features_def.inc.h b/target/s390x/cpu_features_def.inc.h
index 60db28351d..5942f81f16 100644
--- a/target/s390x/cpu_features_def.inc.h
+++ b/target/s390x/cpu_features_def.inc.h
@@ -311,7 +311,7 @@ DEF_FEAT(PCC_CMAC_ETDEA_192, "pcc-cmac-etdea-128", PCC, 10, "PCC Compute-Last-Bl
DEF_FEAT(PCC_CMAC_TDEA, "pcc-cmac-etdea-192", PCC, 11, "PCC Compute-Last-Block-CMAC-Using-EncryptedTDEA-192")
DEF_FEAT(PCC_CMAC_AES_128, "pcc-cmac-aes-128", PCC, 18, "PCC Compute-Last-Block-CMAC-Using-AES-128")
DEF_FEAT(PCC_CMAC_AES_192, "pcc-cmac-aes-192", PCC, 19, "PCC Compute-Last-Block-CMAC-Using-AES-192")
-DEF_FEAT(PCC_CMAC_AES_256, "pcc-cmac-eaes-256", PCC, 20, "PCC Compute-Last-Block-CMAC-Using-AES-256")
+DEF_FEAT(PCC_CMAC_AES_256, "pcc-cmac-aes-256", PCC, 20, "PCC Compute-Last-Block-CMAC-Using-AES-256")
DEF_FEAT(PCC_CMAC_EAES_128, "pcc-cmac-eaes-128", PCC, 26, "PCC Compute-Last-Block-CMAC-Using-Encrypted-AES-128")
DEF_FEAT(PCC_CMAC_EAES_192, "pcc-cmac-eaes-192", PCC, 27, "PCC Compute-Last-Block-CMAC-Using-Encrypted-AES-192")
DEF_FEAT(PCC_CMAC_EAES_256, "pcc-cmac-eaes-256", PCC, 28, "PCC Compute-Last-Block-CMAC-Using-Encrypted-AES-256")
--
2.21.1
next prev parent reply other threads:[~2020-05-05 15:35 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-05 15:29 [PATCH v2 00/18] qom: Spring cleaning Markus Armbruster
2020-05-05 15:29 ` [PATCH v2 01/18] qom: Clearer reference counting in object_initialize_childv() Markus Armbruster
2020-05-05 15:29 ` [PATCH v2 02/18] qom: Clean up inconsistent use of gchar * vs. char * Markus Armbruster
2020-05-05 15:29 ` [PATCH v2 03/18] qom: Drop object_property_del_child()'s unused parameter @errp Markus Armbruster
2020-05-05 15:29 ` [PATCH v2 04/18] qom: Simplify object_property_get_enum() Markus Armbruster
2020-05-05 15:59 ` Philippe Mathieu-Daudé
2020-05-06 7:07 ` Markus Armbruster
2020-05-05 16:36 ` Paolo Bonzini
2020-05-05 15:29 ` [PATCH v2 05/18] qom: Drop convenience method object_property_get_uint16List() Markus Armbruster
2020-05-05 16:42 ` Paolo Bonzini
2020-05-06 7:25 ` Markus Armbruster
2020-05-05 15:29 ` [PATCH v2 06/18] qom: Make all the object_property_add_FOO() return the property Markus Armbruster
2020-05-05 15:29 ` [PATCH v2 07/18] qom: Drop object_property_set_description() parameter @errp Markus Armbruster
2020-05-05 15:29 ` [PATCH v2 08/18] tests/check-qom-proplist: Improve iterator coverage Markus Armbruster
2020-05-05 15:29 ` Markus Armbruster [this message]
2020-05-06 11:31 ` [PATCH v2 09/18] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes,eaes}-256 Cornelia Huck
2020-05-08 12:15 ` [PATCH v2 09/18] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes, eaes}-256 Markus Armbruster
2020-05-06 11:41 ` [PATCH v2 09/18] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes,eaes}-256 David Hildenbrand
2020-05-08 12:00 ` [PATCH v2 09/18] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes, eaes}-256 Markus Armbruster
2020-05-05 15:29 ` [PATCH v2 10/18] hw/isa/superio: Make the components QOM children Markus Armbruster
2020-05-05 15:29 ` [PATCH v2 11/18] e1000: Don't run e1000_instance_init() twice Markus Armbruster
2020-05-05 15:29 ` [PATCH v2 12/18] hw/arm/bcm2835: Drop futile attempts at QOM-adopting memory Markus Armbruster
2020-05-05 15:29 ` [PATCH v2 13/18] qdev: Clean up qdev_connect_gpio_out_named() Markus Armbruster
2020-05-05 15:29 ` [PATCH v2 14/18] qom: Drop parameter @errp of object_property_add() & friends Markus Armbruster
2020-05-05 15:29 ` [PATCH v2 15/18] Drop more @errp parameters after previous commit Markus Armbruster
2020-05-05 15:29 ` [PATCH v2 16/18] qdev: Unrealize must not fail Markus Armbruster
2020-05-05 15:29 ` [PATCH v2 17/18] spapr_pci: Drop some dead error handling Markus Armbruster
2020-05-05 15:29 ` [PATCH v2 18/18] qom: Drop @errp parameter of object_property_del() Markus Armbruster
2020-05-05 16:00 ` Philippe Mathieu-Daudé
2020-05-05 18:32 ` [PATCH v2 00/18] qom: Spring cleaning no-reply
2020-05-05 20:21 ` no-reply
2020-05-05 21:35 ` no-reply
2020-05-05 23:25 ` no-reply
2020-05-06 0:58 ` no-reply
2020-05-06 1:31 ` no-reply
2020-05-08 12:35 ` Markus Armbruster
2020-05-15 5:55 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200505152926.18877-10-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=ehabkost@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).