On 01/06/2015 11:33, Paolo Bonzini wrote:
+ looker->mem_type = looker->mtrr_state->fixed_ranges[index];in mtrr_lookup_fixed_start is the same as this:
+ looker->start = fixed_mtrr_range_end_addr(seg, index);
+ return true;
in mtrr_lookup_fixed_next. Can you try to make them more common?
+ end = fixed_mtrr_range_end_addr(looker->seg, looker->index);
+
+ /* switch to next segment. */
+ if (end >= eseg->end) {
+ looker->seg++;
+ looker->index = 0;
+
+ /* have looked up for all fixed MTRRs. */
+ if (looker->seg >= ARRAY_SIZE(fixed_seg_table))
+ return mtrr_lookup_var_start(looker);
+
+ end = fixed_mtrr_range_end_addr(looker->seg, looker->index);
+ }
+
+ looker->mem_type = mtrr_state->fixed_ranges[looker->index];
+ looker->start = end;
Basically you should have
+#define mtrr_for_each_mem_type(_looker_, _mtrr_, _gpa_start_, _gpa_end_) \
+ for (mtrr_lookup_init(_looker_, _mtrr_, _gpa_start_, _gpa_end_); \
+ !mtrr_lookup_end(_looker_); mtrr_lookup_next(_looker_))
... where the above code I quoted would be part of mtrr_lookup_end.