Re: [Xen-devel] [PATCH] VM generation ID save/restore and migrate

[Shriram Rajagopalan <rshriram@xxxxxxxxx>]

On Tue, Dec 6, 2011 at 11:56 AM, Shriram Rajagopalan <rshriram@xxxxxxxxx> wrote:

On Mon, Dec 5, 2011 at 2:07 AM, Paul Durrant <paul.durrant@xxxxxxxxxx> wrote:

diff -r a4d7c27ec1f1 -r 152a79fbe918 tools/xcutils/xc_restore.c
--- a/tools/xcutils/xc_restore.c        Fri Dec 02 13:51:17 2011 -0800
+++ b/tools/xcutils/xc_restore.c        Mon Dec 05 10:01:30 2011 +0000

@@ -23,7 +23,8 @@ main(int argc, char **argv)
    xc_interface *xch;
    int io_fd, ret;
    int superpages;
-    unsigned long store_mfn, console_mfn;
+    unsigned long store_mfn, console_mfn, vm_gid_addr;
+    int no_increment_gid;

    if ( (argc != 8) && (argc != 9) )
        errx(1, "usage: %s iofd domid store_evtchn "
@@ -40,19 +41,25 @@ main(int argc, char **argv)
    hvm  = atoi(argv[5]);
    pae  = atoi(argv[6]);
    apic = atoi(argv[7]);
-    if ( argc == 9 )
+    if ( argc >= 9 )
           superpages = atoi(argv[8]);
    else
           superpages = !!hvm;
+    if ( argc >= 10 )
+           no_increment_gid = !atoi(argv[9]);
+    else
+           no_increment_gid = 0;

There is a "if ( (argc != 8) && (argc != 9) ) err()" condition and then
there is "if (argc >= 10)".

shriram

forgot to cc xen-devel explicitly.
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel