[PATCH 0/2] Two miscellneous patches

[PATCH 0/2] Two miscellneous patches

[Wei Liu]

Wei Liu (2):
  libxc: xc_domain_resume_hvm is used by x86 only
  libxc: remove second unistd.h inclusion

 tools/libxc/include/xenctrl.h | 1 -
 tools/libxc/xc_resume.c       | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

[PATCH 1/2] libxc: xc_domain_resume_hvm is used by x86 only

[Wei Liu]

The call site is enclosed by x86 define guards.

Without this patch:

[  334s] xc_resume.c:112:12: error: 'xc_domain_resume_hvm' defined but not used [-Werror=unused-function]
[  334s]  static int xc_domain_resume_hvm(xc_interface *xch, uint32_t domid)

Reported-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 tools/libxc/xc_resume.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/libxc/xc_resume.c b/tools/libxc/xc_resume.c
index 6bf7d9c..2b6c308 100644
--- a/tools/libxc/xc_resume.c
+++ b/tools/libxc/xc_resume.c
@@ -109,6 +109,7 @@ static int xc_domain_resume_cooperative(xc_interface *xch, uint32_t domid)
     return do_domctl(xch, &domctl);
 }
 
+#if defined(__i386__) || defined(__x86_64__)
 static int xc_domain_resume_hvm(xc_interface *xch, uint32_t domid)
 {
     DECLARE_DOMCTL;
@@ -128,6 +129,7 @@ static int xc_domain_resume_hvm(xc_interface *xch, uint32_t domid)
     domctl.domain = domid;
     return do_domctl(xch, &domctl);
 }
+#endif
 
 static int xc_domain_resume_any(xc_interface *xch, uint32_t domid)
 {
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

[PATCH 2/2] libxc: remove second unistd.h inclusion

[Wei Liu]

There is already one a few lines above.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 tools/libxc/include/xenctrl.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h
index 13d5754..a964681 100644
--- a/tools/libxc/include/xenctrl.h
+++ b/tools/libxc/include/xenctrl.h
@@ -32,7 +32,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdbool.h>
-#include <unistd.h>
 #include <xen/xen.h>
 #include <xen/domctl.h>
 #include <xen/physdev.h>
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH 1/2] libxc: xc_domain_resume_hvm is used by x86 only

[Ian Jackson]

Wei Liu writes ("[PATCH 1/2] libxc: xc_domain_resume_hvm is used by x86 only"):
> The call site is enclosed by x86 define guards.
> 
> Without this patch:
> 
> [  334s] xc_resume.c:112:12: error: 'xc_domain_resume_hvm' defined but not used [-Werror=unused-function]
> [  334s]  static int xc_domain_resume_hvm(xc_interface *xch, uint32_t domid)
> 
> Reported-by: Olaf Hering <olaf@aepfle.de>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Thanks, I have committed both of these.  (I think we didn't want to
wait any longer for a Tested-by.)

Ian.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel