Turns out, when introducing HMAT support in v6.6.0-rc1~249 I've forgot to allow "cache" attribute for <bandwidth/> element in RNG. It's parsed and formatted, but schema does not allow it. Fixes: a89bbbac86383a10be0cec5a93feb7ed820871eb Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1980162 Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx> --- docs/schemas/cputypes.rng | 5 +++++ tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args | 1 + tests/qemuxml2argvdata/numatune-hmat.xml | 1 + 3 files changed, 7 insertions(+) diff --git a/docs/schemas/cputypes.rng b/docs/schemas/cputypes.rng index 77c8fa783b..056e66e1b4 100644 --- a/docs/schemas/cputypes.rng +++ b/docs/schemas/cputypes.rng @@ -250,6 +250,11 @@ <attribute name="target"> <ref name="unsignedInt"/> </attribute> + <optional> + <attribute name="cache"> + <ref name="unsignedInt"/> + </attribute> + </optional> <attribute name="type"> <choice> <value>access</value> diff --git a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args index 1ec2e15095..54ab91b09c 100644 --- a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args @@ -30,6 +30,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \ -numa hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-latency,latency=5 \ -numa hmat-lb,initiator=0,target=0,hierarchy=first-level,data-type=access-latency,latency=10 \ -numa hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-bandwidth,bandwidth=204800K \ +-numa hmat-lb,initiator=0,target=0,hierarchy=first-level,data-type=access-bandwidth,bandwidth=208896K \ -numa hmat-cache,node-id=0,size=10K,level=1,associativity=direct,policy=write-back,line=8 \ -uuid c7a5fdb2-cdaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/numatune-hmat.xml b/tests/qemuxml2argvdata/numatune-hmat.xml index 51ff3c3425..a64d2ef3e2 100644 --- a/tests/qemuxml2argvdata/numatune-hmat.xml +++ b/tests/qemuxml2argvdata/numatune-hmat.xml @@ -30,6 +30,7 @@ <latency initiator='0' target='0' type='access' value='5'/> <latency initiator='0' target='0' cache='1' type='access' value='10'/> <bandwidth initiator='0' target='0' type='access' value='204800' unit='KiB'/> + <bandwidth initiator='0' target='0' cache='1' type='access' value='208896' unit='KiB'/> </interconnects> </numa> </cpu> -- 2.31.1
