On Mon, 2006-08-28 at 08:35 +0900, Doi....@jp.fujitsu.com wrote:
In PV-on-HVM driver code, is_running_on_xen and HYPERVISOR_ioremap
have to be used as valid feature. Thus we modified like this.
Doesn't the below do what you need w/o breaking the CONFIG_XEN=n
build? It's important to keep both builds working. Thanks,
Alex
Signed-off-by: Alex Williamson <alex...@hp.com>
---
diff -r 3e0685ecfe64 linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h Fri Aug 25 16:21:39
2006 -0600
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h Sun Aug 27 19:50:59
2006 -0600
@@ -59,8 +59,6 @@ extern shared_info_t *HYPERVISOR_shared_
extern shared_info_t *HYPERVISOR_shared_info;
extern start_info_t *xen_start_info;
-#define is_initial_xendomain() (xen_start_info->flags & SIF_INITDOMAIN)
-
void force_evtchn_callback(void);
/* Turn jiffies into Xen system time. XXX Implement me. */
@@ -182,10 +180,26 @@ MULTI_update_va_mapping(
mcl->result = 0;
}
+static inline void
+MULTI_grant_table_op(multicall_entry_t *mcl, unsigned int cmd,
+ void *uop, unsigned int count)
+{
+ mcl->op = __HYPERVISOR_grant_table_op;
+ mcl->args[0] = cmd;
+ mcl->args[1] = (unsigned long)uop;
+ mcl->args[2] = count;
+}
+
// for debug
asmlinkage int xprintk(const char *fmt, ...);
#define xprintd(fmt, ...) xprintk("%s:%d " fmt, __func__, __LINE__, \
##__VA_ARGS__)
#endif /* CONFIG_XEN */
+#ifdef CONFIG_XEN_PRIVILEGED_GUEST
+#define is_initial_xendomain() (xen_start_info->flags & SIF_INITDOMAIN)
+#else
+#define is_initial_xendomain() 0
+#endif
+
#endif /* __HYPERVISOR_H__ */
16 messages in com.xensource.lists.xen-ia64-develRe: [Xen-ia64-devel] PV-on-HVM driver...
.patch, .patch, .patch, 2 more