9:11 a.m.
Commit 65b0b746b516 changed spice tests to use latest caps. Before this
change, "FLAG_REAL_CAPS" wasn't being set in testQemuInfoInitArgs(). The
absence of this flag triggered the code path inside
testCompareXMLToArgv() that executed testUpdateQEMUCaps(). This function
will update the host CPU via virQEMUCapsUpdateHostCPUModel() into
virQEMUCapsInitHostCPUModel(). In this function,
virQEMUCapsInitCPUModel() would end up updating the hostCPU inside the
qemuCaps (via virQEMUCapsProbeHostCPU()). Before the forementioned
commit, the host CPU was being defaulted to x86_64, vendor Intel, for
the 'graphics-spice-timeout' test that is using the 'pc' machine type
and 'accel=kvm'.
Today, "FLAG_REAL_CAPS" is being set because we're using the latest caps
from x86_64. This means that the whole code path mentioned above is
skipped. qemuCaps are now being loaded via virQEMUCapsLoadCache()
directly. Without the handling being done by testUpdateQEMUCaps(), the
host CPU is being retrieved later on, down below
qemuProcessCreatePretendCmdPrepare() into qemuProcessUpdateGuestCPU().
The latter will attempt to update the domain cpu and executing a
virCPUCompare with the hostCPU and def->cpu.
All this logic ended up causing a failure of the
'graphics-spice-timeout' test in ppc64 and s390x hosts. This test is
being run with KVM acceleration, and the KVM driver for ppc64 and s390x
will return a default x86_64 CPU with vendor "AMD", making
virCPUCompare() fail with the following message:
"QEMU XML-2-ARGV graphics-spice-timeout.x86_64-latest ... libvirt: CPU
Driver error : the CPU is incompatible with host CPU: host CPU vendor does
not match required CPU vendor Intel"
Fix this test by setting cpu check='none' and avoid the virCPUCompare()
that causes the problem for ppc64 and s390x hosts.
Reported-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
---
Sending as a RFC because I'm not sure if this patch fixes the
problem for s390x. Boris, can you please test and see if this
fix works for you?
tests/qemuxml2argvdata/graphics-spice-timeout.xml | 2 +-
.../qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.xml
b/tests/qemuxml2argvdata/graphics-spice-timeout.xml
index 065318651f..33dae5c4bf 100644
--- a/tests/qemuxml2argvdata/graphics-spice-timeout.xml
+++ b/tests/qemuxml2argvdata/graphics-spice-timeout.xml
@@ -15,7 +15,7 @@
<apic/>
<pae/>
</features>
- <cpu match='exact'>
+ <cpu match='exact' check='none'>
<model>core2duo</model>
<vendor>Intel</vendor>
<topology sockets='1' dies='1' cores='2'
threads='1'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml
b/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml
index fd34a6caf5..9e6782d00b 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml
@@ -15,7 +15,7 @@
<apic/>
<pae/>
</features>
- <cpu mode='custom' match='exact' check='partial'>
+ <cpu mode='custom' match='exact' check='none'>
<model fallback='allow'>core2duo</model>
<vendor>Intel</vendor>
<topology sockets='1' dies='1' cores='2'
threads='1'/>
--
2.31.1
7:51 p.m.
On Tue, Nov 16, 2021 at 21:11:50 -0300, Daniel Henrique Barboza wrote:
Commit 65b0b746b516 changed spice tests to use latest caps. Before
this
change, "FLAG_REAL_CAPS" wasn't being set in testQemuInfoInitArgs(). The
absence of this flag triggered the code path inside
testCompareXMLToArgv() that executed testUpdateQEMUCaps(). This function
will update the host CPU via virQEMUCapsUpdateHostCPUModel() into
virQEMUCapsInitHostCPUModel(). In this function,
virQEMUCapsInitCPUModel() would end up updating the hostCPU inside the
qemuCaps (via virQEMUCapsProbeHostCPU()). Before the forementioned
commit, the host CPU was being defaulted to x86_64, vendor Intel, for
the 'graphics-spice-timeout' test that is using the 'pc' machine type
and 'accel=kvm'.
Today, "FLAG_REAL_CAPS" is being set because we're using the latest caps
from x86_64. This means that the whole code path mentioned above is
skipped. qemuCaps are now being loaded via virQEMUCapsLoadCache()
directly. Without the handling being done by testUpdateQEMUCaps(), the
host CPU is being retrieved later on, down below
qemuProcessCreatePretendCmdPrepare() into qemuProcessUpdateGuestCPU().
The latter will attempt to update the domain cpu and executing a
virCPUCompare with the hostCPU and def->cpu.
All this logic ended up causing a failure of the
'graphics-spice-timeout' test in ppc64 and s390x hosts. This test is
being run with KVM acceleration, and the KVM driver for ppc64 and s390x
will return a default x86_64 CPU with vendor "AMD", making
virCPUCompare() fail with the following message:
With all of this description which sounds plausible and pointing to the
root cause of tests not being stable enough when used with real caps,
the fix you are proposing seems to really just fix the symptom.
This patch itself is acceptable as is, but doesn't really fix the real
issue. If you don't plan on addressing the root cause, please:
1) note in the commit message for this commit that it's not really
fixing the root cause, just the symptom
2) file an upstream issue with your analysis so that we don't forget
that this is still broken
"QEMU XML-2-ARGV graphics-spice-timeout.x86_64-latest ...
libvirt: CPU
Driver error : the CPU is incompatible with host CPU: host CPU vendor does
not match required CPU vendor Intel"
Fix this test by setting cpu check='none' and avoid the virCPUCompare()
that causes the problem for ppc64 and s390x hosts.
To resolve point 1), be more explicit that it's just a symptom fix in
this sentence.
Reported-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
---
Sending as a RFC because I'm not sure if this patch fixes the
problem for s390x. Boris, can you please test and see if this
fix works for you?
It is plausible it will work, there are other cases which use
match='exact' check='none' using real caps on X86 and they don't seem
to
be causing problems.
8:12 p.m.
On 11/17/21 07:51, Peter Krempa wrote:
On Tue, Nov 16, 2021 at 21:11:50 -0300, Daniel Henrique Barboza
wrote:
> Commit 65b0b746b516 changed spice tests to use latest caps. Before this
> change, "FLAG_REAL_CAPS" wasn't being set in testQemuInfoInitArgs().
The
> absence of this flag triggered the code path inside
> testCompareXMLToArgv() that executed testUpdateQEMUCaps(). This function
> will update the host CPU via virQEMUCapsUpdateHostCPUModel() into
> virQEMUCapsInitHostCPUModel(). In this function,
> virQEMUCapsInitCPUModel() would end up updating the hostCPU inside the
> qemuCaps (via virQEMUCapsProbeHostCPU()). Before the forementioned
> commit, the host CPU was being defaulted to x86_64, vendor Intel, for
> the 'graphics-spice-timeout' test that is using the 'pc' machine
type
> and 'accel=kvm'.
>
> Today, "FLAG_REAL_CAPS" is being set because we're using the latest
caps
> from x86_64. This means that the whole code path mentioned above is
> skipped. qemuCaps are now being loaded via virQEMUCapsLoadCache()
> directly. Without the handling being done by testUpdateQEMUCaps(), the
> host CPU is being retrieved later on, down below
> qemuProcessCreatePretendCmdPrepare() into qemuProcessUpdateGuestCPU().
> The latter will attempt to update the domain cpu and executing a
> virCPUCompare with the hostCPU and def->cpu.
>
> All this logic ended up causing a failure of the
> 'graphics-spice-timeout' test in ppc64 and s390x hosts. This test is
> being run with KVM acceleration, and the KVM driver for ppc64 and s390x
> will return a default x86_64 CPU with vendor "AMD", making
> virCPUCompare() fail with the following message:
With all of this description which sounds plausible and pointing to the
root cause of tests not being stable enough when used with real caps,
the fix you are proposing seems to really just fix the symptom.
This patch itself is acceptable as is, but doesn't really fix the real
issue. If you don't plan on addressing the root cause, please:
I'll wait to see if that fixes the problem Boris was experiencing with
s390x. Meanwhile I'll dig further to see if I can detect the root cause
of the problem (e.g. can we default to an Intel CPU instead of AMD).
1) note in the commit message for this commit that it's not really
fixing the root cause, just the symptom
2) file an upstream issue with your analysis so that we don't forget
that this is still broken
If I fail to fix the root cause in a sensible time I'll end up pushing this
patch - with the adjustments you suggested - to not let the tests being
broken for too long.
I'll file the bug shortly.
Thanks,
Daniel
> "QEMU XML-2-ARGV graphics-spice-timeout.x86_64-latest ... libvirt: CPU
> Driver error : the CPU is incompatible with host CPU: host CPU vendor does
> not match required CPU vendor Intel"
>
> Fix this test by setting cpu check='none' and avoid the virCPUCompare()
> that causes the problem for ppc64 and s390x hosts.
To resolve point 1), be more explicit that it's just a symptom fix in
this sentence.
>
> Reported-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
> Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
> ---
>
> Sending as a RFC because I'm not sure if this patch fixes the
> problem for s390x. Boris, can you please test and see if this
> fix works for you?
It is plausible it will work, there are other cases which use
match='exact' check='none' using real caps on X86 and they don't seem
to
be causing problems.
8:26 p.m.
On 11/17/21 12:12 PM, Daniel Henrique Barboza wrote:
On 11/17/21 07:51, Peter Krempa wrote:
> On Tue, Nov 16, 2021 at 21:11:50 -0300, Daniel Henrique Barboza wrote:
>> Commit 65b0b746b516 changed spice tests to use latest caps. Before this
>> change, "FLAG_REAL_CAPS" wasn't being set in
testQemuInfoInitArgs(). The
>> absence of this flag triggered the code path inside
>> testCompareXMLToArgv() that executed testUpdateQEMUCaps(). This function
>> will update the host CPU via virQEMUCapsUpdateHostCPUModel() into
>> virQEMUCapsInitHostCPUModel(). In this function,
>> virQEMUCapsInitCPUModel() would end up updating the hostCPU inside the
>> qemuCaps (via virQEMUCapsProbeHostCPU()). Before the forementioned
>> commit, the host CPU was being defaulted to x86_64, vendor Intel, for
>> the 'graphics-spice-timeout' test that is using the 'pc' machine
type
>> and 'accel=kvm'.
>>
>> Today, "FLAG_REAL_CAPS" is being set because we're using the latest
caps
>> from x86_64. This means that the whole code path mentioned above is
>> skipped. qemuCaps are now being loaded via virQEMUCapsLoadCache()
>> directly. Without the handling being done by testUpdateQEMUCaps(), the
>> host CPU is being retrieved later on, down below
>> qemuProcessCreatePretendCmdPrepare() into qemuProcessUpdateGuestCPU().
>> The latter will attempt to update the domain cpu and executing a
>> virCPUCompare with the hostCPU and def->cpu.
>>
>> All this logic ended up causing a failure of the
>> 'graphics-spice-timeout' test in ppc64 and s390x hosts. This test is
>> being run with KVM acceleration, and the KVM driver for ppc64 and s390x
>> will return a default x86_64 CPU with vendor "AMD", making
>> virCPUCompare() fail with the following message:
>
> With all of this description which sounds plausible and pointing to the
> root cause of tests not being stable enough when used with real caps,
> the fix you are proposing seems to really just fix the symptom.
>
> This patch itself is acceptable as is, but doesn't really fix the real
> issue. If you don't plan on addressing the root cause, please:
I'll wait to see if that fixes the problem Boris was experiencing with
s390x. Meanwhile I'll dig further to see if I can detect the root cause
of the problem (e.g. can we default to an Intel CPU instead of AMD).
>
> 1) note in the commit message for this commit that it's not really
> fixing the root cause, just the symptom
>
> 2) file an upstream issue with your analysis so that we don't forget
> that this is still broken
If I fail to fix the root cause in a sensible time I'll end up pushing this
patch - with the adjustments you suggested - to not let the tests being
broken for too long.
It is already broken since 11/4 for all none-x86 architectures and I
think it should be fixed ASAP even if it is a patch fixing the symptoms
only.
Btw why is the sanity check of the CI only run on x86?
I'll file the bug shortly.
Thanks,
Daniel
>
>> "QEMU XML-2-ARGV graphics-spice-timeout.x86_64-latest ... libvirt: CPU
>> Driver error : the CPU is incompatible with host CPU: host CPU vendor
>> does
>> not match required CPU vendor Intel"
>>
>> Fix this test by setting cpu check='none' and avoid the virCPUCompare()
>> that causes the problem for ppc64 and s390x hosts.
>
> To resolve point 1), be more explicit that it's just a symptom fix in
> this sentence.
>
>>
>> Reported-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
>> Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
>> ---
>>
>> Sending as a RFC because I'm not sure if this patch fixes the
>> problem for s390x. Boris, can you please test and see if this
>> fix works for you?
>
> It is plausible it will work, there are other cases which use
> match='exact' check='none' using real caps on X86 and they don't
seem to
> be causing problems.
>
--
Mit freundlichen Grüßen/Kind regards
Boris Fiuczynski
IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Gregor Pillen
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294
8:36 p.m.
On 11/17/21 12:12 PM, Daniel Henrique Barboza wrote:
On 11/17/21 07:51, Peter Krempa wrote:
> On Tue, Nov 16, 2021 at 21:11:50 -0300, Daniel Henrique Barboza wrote:
>> Commit 65b0b746b516 changed spice tests to use latest caps. Before this
>> change, "FLAG_REAL_CAPS" wasn't being set in
testQemuInfoInitArgs(). The
>> absence of this flag triggered the code path inside
>> testCompareXMLToArgv() that executed testUpdateQEMUCaps(). This function
>> will update the host CPU via virQEMUCapsUpdateHostCPUModel() into
>> virQEMUCapsInitHostCPUModel(). In this function,
>> virQEMUCapsInitCPUModel() would end up updating the hostCPU inside the
>> qemuCaps (via virQEMUCapsProbeHostCPU()). Before the forementioned
>> commit, the host CPU was being defaulted to x86_64, vendor Intel, for
>> the 'graphics-spice-timeout' test that is using the 'pc' machine
type
>> and 'accel=kvm'.
>>
>> Today, "FLAG_REAL_CAPS" is being set because we're using the latest
caps
>> from x86_64. This means that the whole code path mentioned above is
>> skipped. qemuCaps are now being loaded via virQEMUCapsLoadCache()
>> directly. Without the handling being done by testUpdateQEMUCaps(), the
>> host CPU is being retrieved later on, down below
>> qemuProcessCreatePretendCmdPrepare() into qemuProcessUpdateGuestCPU().
>> The latter will attempt to update the domain cpu and executing a
>> virCPUCompare with the hostCPU and def->cpu.
>>
>> All this logic ended up causing a failure of the
>> 'graphics-spice-timeout' test in ppc64 and s390x hosts. This test is
>> being run with KVM acceleration, and the KVM driver for ppc64 and s390x
>> will return a default x86_64 CPU with vendor "AMD", making
>> virCPUCompare() fail with the following message:
>
> With all of this description which sounds plausible and pointing to the
> root cause of tests not being stable enough when used with real caps,
> the fix you are proposing seems to really just fix the symptom.
>
> This patch itself is acceptable as is, but doesn't really fix the real
> issue. If you don't plan on addressing the root cause, please:
I'll wait to see if that fixes the problem Boris was experiencing with
s390x. Meanwhile I'll dig further to see if I can detect the root cause
of the problem (e.g. can we default to an Intel CPU instead of AMD).
Switching the default from AMD to Intel would also not address the root
cause.
I think that the root cause for the failure when running the mocked
tests are intersects with architecture bound compiles. In this case it
is: https://gitlab.com/libvirt/libvirt/-/blob/master/src/cpu/cpu_x86.c#L3514
The same is true for arm:
https://gitlab.com/libvirt/libvirt/-/blob/master/src/cpu/cpu_arm.c#L713
Does anyone have a good idea how to mock this?
>
> 1) note in the commit message for this commit that it's not really
> fixing the root cause, just the symptom
>
> 2) file an upstream issue with your analysis so that we don't forget
> that this is still broken
If I fail to fix the root cause in a sensible time I'll end up pushing this
patch - with the adjustments you suggested - to not let the tests being
broken for too long.
I'll file the bug shortly.
Thanks,
Daniel
>
>> "QEMU XML-2-ARGV graphics-spice-timeout.x86_64-latest ... libvirt: CPU
>> Driver error : the CPU is incompatible with host CPU: host CPU vendor
>> does
>> not match required CPU vendor Intel"
>>
>> Fix this test by setting cpu check='none' and avoid the virCPUCompare()
>> that causes the problem for ppc64 and s390x hosts.
>
> To resolve point 1), be more explicit that it's just a symptom fix in
> this sentence.
>
>>
>> Reported-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
>> Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
>> ---
>>
>> Sending as a RFC because I'm not sure if this patch fixes the
>> problem for s390x. Boris, can you please test and see if this
>> fix works for you?
>
> It is plausible it will work, there are other cases which use
> match='exact' check='none' using real caps on X86 and they don't
seem to
> be causing problems.
>
--
Mit freundlichen Grüßen/Kind regards
Boris Fiuczynski
IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Gregor Pillen
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294
9:06 p.m.
On Wed, Nov 17, 2021 at 12:36:26 +0100, Boris Fiuczynski wrote:
On 11/17/21 12:12 PM, Daniel Henrique Barboza wrote:
>
>
> On 11/17/21 07:51, Peter Krempa wrote:
> > On Tue, Nov 16, 2021 at 21:11:50 -0300, Daniel Henrique Barboza wrote:
[...]
> > This patch itself is acceptable as is, but doesn't
really fix the real
> > issue. If you don't plan on addressing the root cause, please:
>
>
> I'll wait to see if that fixes the problem Boris was experiencing with
> s390x. Meanwhile I'll dig further to see if I can detect the root cause
> of the problem (e.g. can we default to an Intel CPU instead of AMD).
Switching the default from AMD to Intel would also not address the root
cause.
In addition the capability test data which is the base for the _LATEST
caps are always based on a real qemu run which is unfortunately CPU
specific. One potential fix would be to run it in a nested VM with an
emulated CPU but that would defeat the purpose in certain parts.
The X86 caps are generated mainly by me and I have an AMD box so for now
there's no intention to change that in any way.
8:02 p.m.
On 11/17/21 1:11 AM, Daniel Henrique Barboza wrote:
Commit 65b0b746b516 changed spice tests to use latest caps. Before
this
change, "FLAG_REAL_CAPS" wasn't being set in testQemuInfoInitArgs(). The
absence of this flag triggered the code path inside
testCompareXMLToArgv() that executed testUpdateQEMUCaps(). This function
will update the host CPU via virQEMUCapsUpdateHostCPUModel() into
virQEMUCapsInitHostCPUModel(). In this function,
virQEMUCapsInitCPUModel() would end up updating the hostCPU inside the
qemuCaps (via virQEMUCapsProbeHostCPU()). Before the forementioned
commit, the host CPU was being defaulted to x86_64, vendor Intel, for
the 'graphics-spice-timeout' test that is using the 'pc' machine type
and 'accel=kvm'.
Today, "FLAG_REAL_CAPS" is being set because we're using the latest caps
from x86_64. This means that the whole code path mentioned above is
skipped. qemuCaps are now being loaded via virQEMUCapsLoadCache()
directly. Without the handling being done by testUpdateQEMUCaps(), the
host CPU is being retrieved later on, down below
qemuProcessCreatePretendCmdPrepare() into qemuProcessUpdateGuestCPU().
The latter will attempt to update the domain cpu and executing a
virCPUCompare with the hostCPU and def->cpu.
All this logic ended up causing a failure of the
'graphics-spice-timeout' test in ppc64 and s390x hosts. This test is
being run with KVM acceleration, and the KVM driver for ppc64 and s390x
will return a default x86_64 CPU with vendor "AMD", making
virCPUCompare() fail with the following message:
"QEMU XML-2-ARGV graphics-spice-timeout.x86_64-latest ... libvirt: CPU
Driver error : the CPU is incompatible with host CPU: host CPU vendor does
not match required CPU vendor Intel"
Fix this test by setting cpu check='none' and avoid the virCPUCompare()
that causes the problem for ppc64 and s390x hosts.
Reported-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
---
Sending as a RFC because I'm not sure if this patch fixes the
problem for s390x. Boris, can you please test and see if this
fix works for you?
The proposed patch works on s390x as well.
Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
tests/qemuxml2argvdata/graphics-spice-timeout.xml | 2 +-
.../qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.xml
b/tests/qemuxml2argvdata/graphics-spice-timeout.xml
index 065318651f..33dae5c4bf 100644
--- a/tests/qemuxml2argvdata/graphics-spice-timeout.xml
+++ b/tests/qemuxml2argvdata/graphics-spice-timeout.xml
@@ -15,7 +15,7 @@
<apic/>
<pae/>
</features>
- <cpu match='exact'>
+ <cpu match='exact' check='none'>
<model>core2duo</model>
<vendor>Intel</vendor>
<topology sockets='1' dies='1' cores='2'
threads='1'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml
b/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml
index fd34a6caf5..9e6782d00b 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml
@@ -15,7 +15,7 @@
<apic/>
<pae/>
</features>
- <cpu mode='custom' match='exact' check='partial'>
+ <cpu mode='custom' match='exact' check='none'>
<model fallback='allow'>core2duo</model>
<vendor>Intel</vendor>
<topology sockets='1' dies='1' cores='2'
threads='1'/>
--
Mit freundlichen Grüßen/Kind regards
Boris Fiuczynski
IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Gregor Pillen
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294
8:16 p.m.
On 11/17/21 08:02, Boris Fiuczynski wrote:
On 11/17/21 1:11 AM, Daniel Henrique Barboza wrote:
> Commit 65b0b746b516 changed spice tests to use latest caps. Before this
> change, "FLAG_REAL_CAPS" wasn't being set in testQemuInfoInitArgs().
The
> absence of this flag triggered the code path inside
> testCompareXMLToArgv() that executed testUpdateQEMUCaps(). This function
> will update the host CPU via virQEMUCapsUpdateHostCPUModel() into
> virQEMUCapsInitHostCPUModel(). In this function,
> virQEMUCapsInitCPUModel() would end up updating the hostCPU inside the
> qemuCaps (via virQEMUCapsProbeHostCPU()). Before the forementioned
> commit, the host CPU was being defaulted to x86_64, vendor Intel, for
> the 'graphics-spice-timeout' test that is using the 'pc' machine
type
> and 'accel=kvm'.
>
> Today, "FLAG_REAL_CAPS" is being set because we're using the latest
caps
> from x86_64. This means that the whole code path mentioned above is
> skipped. qemuCaps are now being loaded via virQEMUCapsLoadCache()
> directly. Without the handling being done by testUpdateQEMUCaps(), the
> host CPU is being retrieved later on, down below
> qemuProcessCreatePretendCmdPrepare() into qemuProcessUpdateGuestCPU().
> The latter will attempt to update the domain cpu and executing a
> virCPUCompare with the hostCPU and def->cpu.
>
> All this logic ended up causing a failure of the
> 'graphics-spice-timeout' test in ppc64 and s390x hosts. This test is
> being run with KVM acceleration, and the KVM driver for ppc64 and s390x
> will return a default x86_64 CPU with vendor "AMD", making
> virCPUCompare() fail with the following message:
>
> "QEMU XML-2-ARGV graphics-spice-timeout.x86_64-latest ... libvirt: CPU
> Driver error : the CPU is incompatible with host CPU: host CPU vendor does
> not match required CPU vendor Intel"
>
> Fix this test by setting cpu check='none' and avoid the virCPUCompare()
> that causes the problem for ppc64 and s390x hosts.
>
> Reported-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
> Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
> ---
>
> Sending as a RFC because I'm not sure if this patch fixes the
> problem for s390x. Boris, can you please test and see if this
> fix works for you?
The proposed patch works on s390x as well.
Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
Thanks for checking. I'll hold this patch a little* to see if we can fix the
real cause of the bug, which can be something to do with how we are defaulting
x86_64 cpus for ppc64 and s390x.
* just a couple of days. No need to let the build being broken more than that.
Daniel
>
>
> tests/qemuxml2argvdata/graphics-spice-timeout.xml | 2 +-
> .../qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.xml
b/tests/qemuxml2argvdata/graphics-spice-timeout.xml
> index 065318651f..33dae5c4bf 100644
> --- a/tests/qemuxml2argvdata/graphics-spice-timeout.xml
> +++ b/tests/qemuxml2argvdata/graphics-spice-timeout.xml
> @@ -15,7 +15,7 @@
> <apic/>
> <pae/>
> </features>
> - <cpu match='exact'>
> + <cpu match='exact' check='none'>
> <model>core2duo</model>
> <vendor>Intel</vendor>
> <topology sockets='1' dies='1' cores='2'
threads='1'/>
> diff --git a/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml
b/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml
> index fd34a6caf5..9e6782d00b 100644
> --- a/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml
> +++ b/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml
> @@ -15,7 +15,7 @@
> <apic/>
> <pae/>
> </features>
> - <cpu mode='custom' match='exact' check='partial'>
> + <cpu mode='custom' match='exact' check='none'>
> <model fallback='allow'>core2duo</model>
> <vendor>Intel</vendor>
> <topology sockets='1' dies='1' cores='2'
threads='1'/>
>
8:26 p.m.
On Wed, Nov 17, 2021 at 08:16:05 -0300, Daniel Henrique Barboza wrote:
On 11/17/21 08:02, Boris Fiuczynski wrote:
> On 11/17/21 1:11 AM, Daniel Henrique Barboza wrote:
[...]
> > fix works for you?
>
> The proposed patch works on s390x as well.
>
> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
Thanks for checking. I'll hold this patch a little* to see if we can fix the
real cause of the bug, which can be something to do with how we are defaulting
x86_64 cpus for ppc64 and s390x.
* just a couple of days. No need to let the build being broken more than that.
I don't think that's necessary, the CPU checking is totally irrelevant
to the test you are fixing. If you manage to fix the root cause it can
definitely be done separately.
8:28 p.m.
On 11/17/21 08:26, Peter Krempa wrote:
On Wed, Nov 17, 2021 at 08:16:05 -0300, Daniel Henrique Barboza
wrote:
> On 11/17/21 08:02, Boris Fiuczynski wrote:
>> On 11/17/21 1:11 AM, Daniel Henrique Barboza wrote:
[...]
>>> fix works for you?
>>
>> The proposed patch works on s390x as well.
>>
>> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
>
>
> Thanks for checking. I'll hold this patch a little* to see if we can fix the
> real cause of the bug, which can be something to do with how we are defaulting
> x86_64 cpus for ppc64 and s390x.
>
>
>
> * just a couple of days. No need to let the build being broken more than that.
I don't think that's necessary, the CPU checking is totally irrelevant
to the test you are fixing. If you manage to fix the root cause it can
definitely be done separately.
Boris also mentioned that this is broken since Nov 4th. I'll make the commit msg
adjustments you mentioned and push it.
1247
days inactive
1247
days old
9 comments
3 participants
participants (3)
-
Boris Fiuczynski -
Daniel Henrique Barboza -
Peter Krempa