Skip to contentSkip to conversation

Make delaration and definition of xc_linux_save() the same

PATCH In review Horms 2 participants 3 messages Jan 12, 2006 – Jan 13, 2006

lore
Share & tools
lore

Horms

author
#0 lore raw

PATCH 1/1 Make delaration and definition of xc_linux_save() the same

8604:a51fcb5de470 introduced a discrepancy between the declaration and definition of xc_linux_save(). In particular the argument for the suspend pointer to function was null in one and int in the other. On inspection, int seemed to be correct, so I went with this. I also fixed up a few other cosmetic discrepancies.

tools/libxc/xc_ia64_stubs.c +2 -1
diff -r 1b89e2aed730 -r aa6c2e55dea5 tools/libxc/xc_ia64_stubs.c
@@ -23,7 +23,8 @@
 }
 
 int xc_linux_save(int xc_handle, int io_fd, uint32_t dom, uint32_t max_iters, 
-                  uint32_t max_factor, uint32_t flags, int (*suspend)(void))
+                  uint32_t max_factor, uint32_t flags /* XCFLAGS_xxx */, 
+		  int (*suspend)(int domid))
 {
     PERROR("xc_linux_save not implemented\n");
     return -1;
tools/libxc/xenguest.h +2 -2
diff -r 1b89e2aed730 -r aa6c2e55dea5 tools/libxc/xenguest.h
@@ -21,9 +21,9 @@
  * @parm dom the id of the domain
  * @return 0 on success, -1 on failure
  */
-int xc_linux_save(int xc_handle, int fd, uint32_t dom, uint32_t max_iters, 
+int xc_linux_save(int xc_handle, int fd_fd, uint32_t dom, uint32_t max_iters, 
                   uint32_t max_factor, uint32_t flags /* XCFLAGS_xxx */,
-                  int (*suspend)(int));
+                  int (*suspend)(int domid));
 
 
 /**
#1 lore raw
Quoted 7 lines · Horms

8604:a51fcb5de470 introduced a discrepancy between the declaration and definition of xc_linux_save(). In particular the argument for the suspend pointer to function was null in one and int in the other. On inspection, int seemed to be correct, so I went with this. I also fixed up a few other cosmetic discrepancies.

Thanks. I've applied this with s/fd_fd/io_fd, which is what I presume you meant.

Ewan.

Quoted 36 lines

diff -r 1b89e2aed730 -r aa6c2e55dea5 tools/libxc/xc_ia64_stubs.c

tools/libxc/xc_ia64_stubs.c +2 -1
@@ -23,7 +23,8 @@
 }
 
 int xc_linux_save(int xc_handle, int io_fd, uint32_t dom, uint32_t max_iters, 
-                  uint32_t max_factor, uint32_t flags, int (*suspend)(void))
+                  uint32_t max_factor, uint32_t flags /* XCFLAGS_xxx */, 
+		  int (*suspend)(int domid))
 {
     PERROR("xc_linux_save not implemented\n");
     return -1;

diff -r 1b89e2aed730 -r aa6c2e55dea5 tools/libxc/xenguest.h

tools/libxc/xenguest.h +2 -2
@@ -21,9 +21,9 @@
  * @parm dom the id of the domain
  * @return 0 on success, -1 on failure
  */
-int xc_linux_save(int xc_handle, int fd, uint32_t dom, uint32_t max_iters, 
+int xc_linux_save(int xc_handle, int fd_fd, uint32_t dom, uint32_t max_iters, 
                   uint32_t max_factor, uint32_t flags /* XCFLAGS_xxx */,
-                  int (*suspend)(int));
+                  int (*suspend)(int domid));
 
 
 /**

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

author
#2 lore raw
Quoted 8 lines · Ewan Mellor
Quoted 6 lines · Horms

8604:a51fcb5de470 introduced a discrepancy between the declaration and definition of xc_linux_save(). In particular the argument for the suspend pointer to function was null in one and int in the other. On inspection, int seemed to be correct, so I went with this. I also fixed up a few other cosmetic discrepancies.

Quoted 4 lines
Quoted 1 line

Thanks. I've applied this with s/fd_fd/io_fd, which is what I presume you meant.

Yes, indeed. Thanks.

Signature · 1 line
Horms