On 9/12/23 03:13, Peter Krempa wrote: > On Mon, Sep 11, 2023 at 17:07:09 -0400, Collin Walling wrote: >> Check for the QEMU capability to query for a static-recommended CPU >> model via CPU model expansion. Cache this capability for later. >> >> Signed-off-by: Collin Walling <walling@xxxxxxxxxxxxx> >> Reviewed-by: Boris Fiuczynski <fiuczy@xxxxxxxxxxxxx> >> --- >> src/qemu/qemu_capabilities.c | 2 ++ >> src/qemu/qemu_capabilities.h | 1 + >> tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies | 6 +++++- >> tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 + >> 4 files changed, 9 insertions(+), 1 deletion(-) > > [...] > >> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies >> index 57ce64e88e..8cd7312bea 100644 >> --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies >> +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies >> @@ -15398,12 +15398,16 @@ >> }, >> { >> "name": "full" >> + }, >> + { >> + "name": "static-recommended" >> } >> ], >> "meta-type": "enum", >> "values": [ >> "static", >> - "full" >> + "full", >> + "static-recommended" > > This is suspicious. We usually don't allow manual modification of the > file because it can be overwritten by a subsequent update of the file. > > Could you please properly update the capability dump, by running > tests/qemucapsprobe /path/to/qemu-system-s390x > > /path/to/libvirt.git/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies > > and commiting that to a separate commit. Ideally do this with the > released qemu-8.1, so that we have the most recent dump. > Understood. Thank you for the advice on how to generate the caps. I will keep this noted for the future on next version and any future contributions. -- Regards, Collin