From owner-svn-src-user@FreeBSD.ORG  Mon Feb 16 17:13:00 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ADA9C1065673;
	Mon, 16 Feb 2009 17:13:00 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9CD898FC0A;
	Mon, 16 Feb 2009 17:13:00 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1GHD0qE071317;
	Mon, 16 Feb 2009 17:13:00 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1GHD0Ck071315;
	Mon, 16 Feb 2009 17:13:00 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200902161713.n1GHD0Ck071315@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Mon, 16 Feb 2009 17:13:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188683 - in user/dfr/xenhvm/7/sys/xen/interface:
	arch-x86 hvm
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Feb 2009 17:13:01 -0000

Author: dfr
Date: Mon Feb 16 17:13:00 2009
New Revision: 188683
URL: http://svn.freebsd.org/changeset/base/188683

Log:
  Diff reduction with user/dfr/xenhvm/6

Modified:
  user/dfr/xenhvm/7/sys/xen/interface/arch-x86/xen.h
  user/dfr/xenhvm/7/sys/xen/interface/hvm/params.h

Modified: user/dfr/xenhvm/7/sys/xen/interface/arch-x86/xen.h
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/interface/arch-x86/xen.h	Mon Feb 16 17:11:34 2009	(r188682)
+++ user/dfr/xenhvm/7/sys/xen/interface/arch-x86/xen.h	Mon Feb 16 17:13:00 2009	(r188683)
@@ -32,7 +32,8 @@
 #define ___DEFINE_XEN_GUEST_HANDLE(name, type) \
     typedef struct { type *p; } __guest_handle_ ## name
 #else
-#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \
+#error "using old handle"
+#define ___DEFINE_XEN_GUEST_HANDLE(name, type)  \
     typedef type * __guest_handle_ ## name
 #endif
 
@@ -50,7 +51,7 @@
 #if defined(__i386__)
 #include <xen/interface/arch-x86/xen-x86_32.h>
 #elif defined(__x86_64__)
-#include "xen-x86_64.h"
+#include <xen/interface/arch-x86/xen-x86_64.h>
 #endif
 
 #ifndef __ASSEMBLY__

Modified: user/dfr/xenhvm/7/sys/xen/interface/hvm/params.h
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/interface/hvm/params.h	Mon Feb 16 17:11:34 2009	(r188682)
+++ user/dfr/xenhvm/7/sys/xen/interface/hvm/params.h	Mon Feb 16 17:13:00 2009	(r188683)
@@ -21,7 +21,7 @@
 #ifndef __XEN_PUBLIC_HVM_PARAMS_H__
 #define __XEN_PUBLIC_HVM_PARAMS_H__
 
-#include "hvm_op.h"
+#include <xen/interface/hvm/hvm_op.h>
 
 /*
  * Parameter space for HVMOP_{set,get}_param.