From: Waldemar Kozaczuk <jwkozac...@gmail.com>
Committer: Waldemar Kozaczuk <jwkozac...@gmail.com>
Branch: master
Fixed indentation in xen.cc
Signed-off-by: Waldemar Kozaczuk <jwkozac...@gmail.com>
---
diff --git a/arch/x64/xen.cc b/arch/x64/xen.cc
--- a/arch/x64/xen.cc
+++ b/arch/x64/xen.cc
@@ -169,37 +169,37 @@ gsi_level_interrupt *xen_set_callback(int irqno)
void xen_init(processor::features_type &features, unsigned base)
{
- // Base + 1 would have given us the version number, it is mostly
- // uninteresting for us now
- auto x = processor::cpuid(base + 2);
- processor::wrmsr(x.b, cast_pointer(&hypercall_page));
-
- struct xen_feature_info info;
- // To fill up the array used by C code
- for (int i = 0; i < XENFEAT_NR_SUBMAPS; i++) {
- info.submap_idx = i;
- if (version_hypercall(XENVER_get_features, &info) < 0)
- assert(0);
- for (int j = 0; j < 32; j++)
- xen_features[i * 32 + j] = !!(info.submap & 1<<j);
- }
- features.xen_clocksource = xen_features[9] & 1;
- features.xen_vector_callback = xen_features[8] & 1;
- if (!features.xen_vector_callback)
- evtchn_irq_is_legacy();
-
- struct xen_add_to_physmap map;
- map.domid = DOMID_SELF;
- map.idx = 0;
- map.space = 0;
- map.gpfn = cast_pointer(&xen_shared_info) >> 12;
-
- // 7 => add to physmap
- if (memory_hypercall(XENMEM_add_to_physmap, &map))
+ // Base + 1 would have given us the version number, it is mostly
+ // uninteresting for us now
+ auto x = processor::cpuid(base + 2);
+ processor::wrmsr(x.b, cast_pointer(&hypercall_page));
+
+ struct xen_feature_info info;
+ // To fill up the array used by C code
+ for (int i = 0; i < XENFEAT_NR_SUBMAPS; i++) {
+ info.submap_idx = i;
+ if (version_hypercall(XENVER_get_features, &info) < 0)
assert(0);
+ for (int j = 0; j < 32; j++)
+ xen_features[i * 32 + j] = !!(info.submap & 1<<j);
+ }
+ features.xen_clocksource = xen_features[9] & 1;
+ features.xen_vector_callback = xen_features[8] & 1;
+ if (!features.xen_vector_callback)
+ evtchn_irq_is_legacy();
+
+ struct xen_add_to_physmap map;
+ map.domid = DOMID_SELF;
+ map.idx = 0;
+ map.space = 0;
+ map.gpfn = cast_pointer(&xen_shared_info) >> 12;
+
+ // 7 => add to physmap
+ if (memory_hypercall(XENMEM_add_to_physmap, &map))
+ assert(0);
- features.xen_pci = xen_pci_enabled();
- HYPERVISOR_shared_info = reinterpret_cast<shared_info_t
*>(&xen_shared_info);
+ features.xen_pci = xen_pci_enabled();
+ HYPERVISOR_shared_info = reinterpret_cast<shared_info_t
*>(&xen_shared_info);
}
void irq_init()
--
You received this message because you are subscribed to the Google Groups "OSv
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to osv-dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/osv-dev/000000000000ccba1b058bb3e479%40google.com.
For more options, visit https://groups.google.com/d/optout.
