aboutsummaryrefslogtreecommitdiffstats
path: root/tools/xcutils
diff options
context:
space:
mode:
authorTim Deegan <Tim.Deegan@xensource.com>2007-04-05 15:11:22 +0100
committerTim Deegan <Tim.Deegan@xensource.com>2007-04-05 15:11:22 +0100
commit538a65bcc3279e4539599de04d3317a5373c3b9f (patch)
treeddff11cb6bb1ddd0822d4e64cafd0c84bb1690c3 /tools/xcutils
parente1290b1524218d977a98825c8cec8c2cc12427ef (diff)
downloadxen-538a65bcc3279e4539599de04d3317a5373c3b9f.tar.gz
xen-538a65bcc3279e4539599de04d3317a5373c3b9f.tar.bz2
xen-538a65bcc3279e4539599de04d3317a5373c3b9f.zip
[HVM] Save/restore: merge xc_linux_restore and xc_hvm_restore
into one function (and one file) since they share a lot of code Signed-off-by: Tim Deegan <Tim.Deegan@øensource.com> --HG-- rename : tools/libxc/xc_linux_restore.c => tools/libxc/xc_domain_restore.c
Diffstat (limited to 'tools/xcutils')
-rw-r--r--tools/xcutils/xc_restore.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/tools/xcutils/xc_restore.c b/tools/xcutils/xc_restore.c
index fc1a59073e..e769c0be31 100644
--- a/tools/xcutils/xc_restore.c
+++ b/tools/xcutils/xc_restore.c
@@ -39,14 +39,8 @@ main(int argc, char **argv)
pae = atoi(argv[6]);
apic = atoi(argv[7]);
- if ( hvm )
- ret = xc_hvm_restore(xc_fd, io_fd, domid,
- store_evtchn, &store_mfn,
- pae, apic);
- else
- ret = xc_linux_restore(xc_fd, io_fd, domid,
- store_evtchn, &store_mfn,
- console_evtchn, &console_mfn);
+ ret = xc_domain_restore(xc_fd, io_fd, domid, store_evtchn, &store_mfn,
+ console_evtchn, &console_mfn, hvm, pae);
if ( ret == 0 )
{