@@ -25,21 +25,6 @@ extern char shared_info_page[PAGE_SIZE];
void *device_tree;
-static int hvm_get_parameter(int idx, uint64_t *value)
-{
- struct xen_hvm_param xhv;
- int ret;
-
- xhv.domid = DOMID_SELF;
- xhv.index = idx;
- ret = HYPERVISOR_hvm_op(HVMOP_get_param, &xhv);
- if (ret < 0) {
- BUG();
- }
- *value = xhv.value;
- return ret;
-}
-
static void get_console(void)
{
uint64_t v = -1;
@@ -36,6 +36,33 @@
int in_callback;
+#ifndef CONFIG_PARAVIRT
+int hvm_get_parameter(int idx, uint64_t *value)
+{
+ struct xen_hvm_param xhv;
+ int ret;
+
+ xhv.domid = DOMID_SELF;
+ xhv.index = idx;
+ ret = HYPERVISOR_hvm_op(HVMOP_get_param, &xhv);
+ if ( ret < 0 )
+ BUG();
+
+ *value = xhv.value;
+ return ret;
+}
+
+int hvm_set_parameter(int idx, uint64_t value)
+{
+ struct xen_hvm_param xhv;
+
+ xhv.domid = DOMID_SELF;
+ xhv.index = idx;
+ xhv.value = value;
+ return HYPERVISOR_hvm_op(HVMOP_set_param, &xhv);
+}
+#endif
+
void do_hypervisor_callback(struct pt_regs *regs)
{
unsigned long l1, l2, l1i, l2i;
@@ -23,6 +23,7 @@
#else
#error "Unsupported architecture"
#endif
+#include <xen/hvm/hvm_op.h>
#include <mini-os/traps.h>
/*
@@ -37,6 +38,10 @@ extern union start_info_union start_info_union;
#define start_info (start_info_union.start_info)
/* hypervisor.c */
+#ifndef CONFIG_PARAVIRT
+int hvm_get_parameter(int idx, uint64_t *value);
+int hvm_set_parameter(int idx, uint64_t value);
+#endif
void force_evtchn_callback(void);
void do_hypervisor_callback(struct pt_regs *regs);
void mask_evtchn(uint32_t port);
@@ -324,6 +324,12 @@ HYPERVISOR_domctl(
return _hypercall1(int, domctl, op);
}
+static inline unsigned long
+HYPERVISOR_hvm_op(int op, void *arg)
+{
+ return _hypercall2(unsigned long, hvm_op, op, arg);
+}
+
#endif /* __HYPERCALL_X86_32_H__ */
/*
@@ -331,6 +331,12 @@ HYPERVISOR_domctl(
return _hypercall1(int, domctl, op);
}
+static inline unsigned long
+HYPERVISOR_hvm_op(int op, void *arg)
+{
+ return _hypercall2(unsigned long, hvm_op, op, arg);
+}
+
#endif /* __HYPERCALL_X86_64_H__ */
/*