* [PATCH] Re: [Xen-staging] [xen-unstable] [HVM] Save/restore: merge xc_linux_restore and xc_hvm_restore
[not found] <200704051414.l35EELcE008903@latara.uk.xensource.com>
@ 2007-04-05 17:02 ` Alex Williamson
0 siblings, 0 replies; only message in thread
From: Alex Williamson @ 2007-04-05 17:02 UTC (permalink / raw)
To: Keir Fraser, Tim Deegan; +Cc: xen-devel
On Thu, 2007-04-05 at 15:14 +0100, Xen staging patchbot-unstable wrote:
> # HG changeset patch
> # User Tim Deegan <Tim.Deegan@xensource.com>
> # Date 1175782282 -3600
> # Node ID e518f2fbdd724ca7b21789d2d075c7ee8665ddaa
> # Parent 602d061ff51f50d7b46bd5ca78c4b70fbe809d20
> [HVM] Save/restore: merge xc_linux_restore and xc_hvm_restore
> into one function (and one file) since they share a lot of code
Build fix for ia64. Keir/Tim, could you please check this into
xen-unstable.hg. Thanks,
Alex
Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---
diff -r 69ab63bee57c tools/libxc/ia64/xc_ia64_linux_restore.c
--- a/tools/libxc/ia64/xc_ia64_linux_restore.c Thu Apr 05 17:26:51 2007 +0100
+++ b/tools/libxc/ia64/xc_ia64_linux_restore.c Thu Apr 05 10:38:11 2007 -0600
@@ -59,9 +59,10 @@ read_page(int xc_handle, int io_fd, uint
}
int
-xc_linux_restore(int xc_handle, int io_fd, uint32_t dom,
+xc_domain_restore(int xc_handle, int io_fd, uint32_t dom,
unsigned int store_evtchn, unsigned long *store_mfn,
- unsigned int console_evtchn, unsigned long *console_mfn)
+ unsigned int console_evtchn, unsigned long *console_mfn,
+ unsigned int hvm, unsigned int pae)
{
DECLARE_DOMCTL;
int rc = 1, i;
@@ -80,6 +81,11 @@ xc_linux_restore(int xc_handle, int io_f
/* A temporary mapping of the guest's start_info page. */
start_info_t *start_info;
+
+ if (hvm) {
+ ERROR("HVM Restore is unsupported");
+ goto out;
+ }
/* For info only */
nr_pfns = 0;
^ permalink raw reply [flat|nested] only message in thread