Skip to contentSkip to conversation

Finish fixes for eclair-x86_64-allcode

PATCH In review Andrew Cooper 4 participants 7 messages Jun 2 – Jun 3

lore
Share & tools
lore
#0 lore raw

cover Finish fixes for eclair-x86_64-allcode

Depends on Jan's "[PATCH v3] x86/PV: drop a local variable from pv_emulate_gate_op()" which is ready to go in but not committed yet.

Andrew Cooper (2):
x86/shadow: Deviate multi.h as being included multiple times
CI: Mark eclair-x86_64-allcode as blocking now that it's clean

 automation/gitlab-ci/analyze.yaml | 1 -
 xen/arch/x86/mm/shadow/multi.h    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
2.39.5
#1 lore raw

PATCH 1/2 x86/shadow: Deviate multi.h as being included multiple times

Introduce a range to search for the devation marker.

This resolves a MISRA D4.10 violation.

---
CC: Jan Beulich <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: [email protected] <[email protected]>
CC: Nicola Vetrini <[email protected]>

v2:
* Use a range to search for the devation marker.

I can't for the life of me get adjusting the deviation config to work.

---
 xen/arch/x86/mm/shadow/multi.h | 1 +
 1 file changed, 1 insertion(+)
xen/arch/x86/mm/shadow/multi.h +1 -0
index fc86d7a8d9cd..3f2562d25e9b 100644
@@ -8,6 +8,7 @@
  * Parts based on earlier work by Michael A Fetterman, Ian Pratt et al.
  */
 
+/* SAF-8-safe inclusion procedure left to caller */
 extern int
 SHADOW_INTERNAL_NAME(sh_map_and_validate_gl1e, GUEST_LEVELS)(
     struct vcpu *v, mfn_t gl1mfn, void *new_gl1p, u32 size);
Signature · 1 line
2.39.5
Acked-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] x86/shadow: Deviate multi.h as being included multiple times

Quoted 1 line · Andrew Cooper

Introduce a range to search for the devation marker.

This wants updating in light of the range, for whatever reason, not working (as you mention below).

Quoted 1 line

This resolves a MISRA D4.10 violation.

Is "resolve" really the right term here? If you don't want to repeat "deviate", maybe "address"? (Yet as always: You're the native speaker, so you'll know best.)

Quoted 1 line

With the commit message adjusted:

Jan

#3 lore raw

PATCH 2/2 CI: Mark eclair-x86_64-allcode as blocking now that it's clean

In reply to Andrew Cooper

---
CC: Anthony PERARD <[email protected]>
CC: Michal Orzel <[email protected]>
CC: Jan Beulich <[email protected]>
CC: Julien Grall <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: Nicola Vetrini <[email protected]>

---
 automation/gitlab-ci/analyze.yaml | 1 -
 1 file changed, 1 deletion(-)
automation/gitlab-ci/analyze.yaml +0 -1
index 9bf032931fc4..673110d40ed3 100644
@@ -62,7 +62,6 @@ eclair-x86_64-allcode:
       CONFIG_XEN_GUEST=y
       CONFIG_XHCI=y
       CONFIG_XSM=y
-  allow_failure: true
 
 eclair-x86_64-testing:
   extends: eclair-x86_64-allcode
Signature · 1 line
2.39.5
Acked-by on v1 2/2
#4 lore raw

Re: [PATCH 2/2] CI: Mark eclair-x86_64-allcode as blocking now that it's clean

Quoted 9 lines · Andrew Cooper

---
CC: Anthony PERARD <[email protected]>
CC: Michal Orzel <[email protected]>
CC: Jan Beulich <[email protected]>
CC: Julien Grall <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: Nicola Vetrini <[email protected]>

Assuming the pipeline is clean:

Quoted 19 lines
---
 automation/gitlab-ci/analyze.yaml | 1 -
 1 file changed, 1 deletion(-)
automation/gitlab-ci/analyze.yaml +0 -1
index 9bf032931fc4..673110d40ed3 100644
@@ -62,7 +62,6 @@ eclair-x86_64-allcode:
       CONFIG_XEN_GUEST=y
       CONFIG_XHCI=y
       CONFIG_XSM=y
-  allow_failure: true
 
 eclair-x86_64-testing:
   extends: eclair-x86_64-allcode
Signature · 1 line
2.39.5
#5 lore raw
In reply to Andrew Cooper
Quoted 11 lines · Andrew Cooper

Depends on Jan's "[PATCH v3] x86/PV: drop a local variable from pv_emulate_gate_op()" which is ready to go in but not committed yet.

Andrew Cooper (2):
x86/shadow: Deviate multi.h as being included multiple times
CI: Mark eclair-x86_64-allcode as blocking now that it's clean

  automation/gitlab-ci/analyze.yaml | 1 -
  xen/arch/x86/mm/shadow/multi.h    | 1 +
  2 files changed, 1 insertion(+), 1 deletion(-)

Thanks.

~ Oleksii

#6 lore raw
In reply to Andrew Cooper
Quoted 2 lines · Andrew Cooper

Depends on Jan's "[PATCH v3] x86/PV: drop a local variable from pv_emulate_gate_op()" which is ready to go in but not committed yet.

Will push as soon as
https://gitlab.com/xen-project/hardware/xen-staging/-/pipelines/2572460164
made it.

Jan

Quoted 8 lines

Andrew Cooper (2):
x86/shadow: Deviate multi.h as being included multiple times
CI: Mark eclair-x86_64-allcode as blocking now that it's clean

 automation/gitlab-ci/analyze.yaml | 1 -
 xen/arch/x86/mm/shadow/multi.h    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)