diff options
author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-04-04 16:34:56 +0100 |
---|---|---|
committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-04-04 16:34:56 +0100 |
commit | d5f5ff766fffd248ff8368b5e2e81308c1655487 (patch) | |
tree | 8061ba914cb042fb0895647937e6e6decebcbd00 /tools/xcutils | |
parent | 087d43326ab4de5dbf25e67bd17dcc72262d2a65 (diff) | |
download | xen-d5f5ff766fffd248ff8368b5e2e81308c1655487.tar.gz xen-d5f5ff766fffd248ff8368b5e2e81308c1655487.tar.bz2 xen-d5f5ff766fffd248ff8368b5e2e81308c1655487.zip |
Clean up save/restore state record handling. No need for Python to
read out the 'p2m size' field. Also that field is not needed at all
for HVM guests.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'tools/xcutils')
-rw-r--r-- | tools/xcutils/xc_restore.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tools/xcutils/xc_restore.c b/tools/xcutils/xc_restore.c index 3309efffa1..fc1a59073e 100644 --- a/tools/xcutils/xc_restore.c +++ b/tools/xcutils/xc_restore.c @@ -21,10 +21,10 @@ main(int argc, char **argv) unsigned int xc_fd, io_fd, domid, store_evtchn, console_evtchn; unsigned int hvm, pae, apic; int ret; - unsigned long p2m_size, store_mfn, console_mfn; + unsigned long store_mfn, console_mfn; - if ( argc != 9 ) - errx(1, "usage: %s iofd domid p2m_size store_evtchn " + if ( argc != 8 ) + errx(1, "usage: %s iofd domid store_evtchn " "console_evtchn hvm pae apic", argv[0]); xc_fd = xc_interface_open(); @@ -33,18 +33,18 @@ main(int argc, char **argv) io_fd = atoi(argv[1]); domid = atoi(argv[2]); - p2m_size = atoi(argv[3]); - store_evtchn = atoi(argv[4]); - console_evtchn = atoi(argv[5]); - hvm = atoi(argv[6]); - pae = atoi(argv[7]); - apic = atoi(argv[8]); + store_evtchn = atoi(argv[3]); + console_evtchn = atoi(argv[4]); + hvm = atoi(argv[5]); + 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); + 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, p2m_size, + ret = xc_linux_restore(xc_fd, io_fd, domid, store_evtchn, &store_mfn, console_evtchn, &console_mfn); |