[PATCH 2/2] tools: avoid redefinining xenevtchn_handle typedef for xc_suspend_*

[PATCH 2/2] tools: avoid redefinining xenevtchn_handle typedef for xc_suspend_*

[Ian Campbell]

Similar to the previous xentoollog case this is not allowed. Switch to
a forward decl of the struct and use of it in the APIs.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 tools/libxc/include/xenguest.h | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tools/libxc/include/xenguest.h b/tools/libxc/include/xenguest.h
index 050a537..d48b3ff 100644
--- a/tools/libxc/include/xenguest.h
+++ b/tools/libxc/include/xenguest.h
@@ -38,7 +38,7 @@
  * User not using xc_suspend_* / xc_await_suspent may not want to
  * include the full libxenevtchn API here.
  */
-typedef struct xenevtchn_handle xenevtchn_handle;
+struct xenevtchn_handle;
 
 /* callbacks provided by xc_domain_save */
 struct save_callbacks {
@@ -167,18 +167,22 @@ struct xc_hvm_firmware_module {
  * Sets *lockfd to -1.
  * Has deallocated everything even on error.
  */
-int xc_suspend_evtchn_release(xc_interface *xch, xenevtchn_handle *xce, int domid, int suspend_evtchn, int *lockfd);
+int xc_suspend_evtchn_release(xc_interface *xch,
+                              struct xenevtchn_handle *xce,
+                              int domid, int suspend_evtchn, int *lockfd);
 
 /**
  * This function eats the initial notification.
  * xce must not be used for anything else
  * See xc_suspend_evtchn_init_sane re lockfd.
  */
-int xc_suspend_evtchn_init_exclusive(xc_interface *xch, xenevtchn_handle *xce,
+int xc_suspend_evtchn_init_exclusive(xc_interface *xch,
+                                     struct xenevtchn_handle *xce,
                                      int domid, int port, int *lockfd);
 
 /* xce must not be used for anything else */
-int xc_await_suspend(xc_interface *xch, xenevtchn_handle *xce, int suspend_evtchn);
+int xc_await_suspend(xc_interface *xch, struct xenevtchn_handle *xce,
+                     int suspend_evtchn);
 
 /**
  * The port will be signaled immediately after this call
@@ -187,7 +191,8 @@ int xc_await_suspend(xc_interface *xch, xenevtchn_handle *xce, int suspend_evtch
  * and fed to xc_suspend_evtchn_release.  (On error *lockfd is
  * undefined and xc_suspend_evtchn_release is not allowed.)
  */
-int xc_suspend_evtchn_init_sane(xc_interface *xch, xenevtchn_handle *xce,
+int xc_suspend_evtchn_init_sane(xc_interface *xch,
+                                struct xenevtchn_handle *xce,
                                 int domid, int port, int *lockfd);
 
 int xc_mark_page_online(xc_interface *xch, unsigned long start,
-- 
2.6.1

Re: [PATCH 2/2] tools: avoid redefinining xenevtchn_handle typedef for xc_suspend_*

[Ian Jackson]

Ian Campbell writes ("[PATCH 2/2] tools: avoid redefinining xenevtchn_handle typedef for xc_suspend_*"):
> Similar to the previous xentoollog case this is not allowed. Switch to
> a forward decl of the struct and use of it in the APIs.

Both of these

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

Thanks,
Ian.

Re: [PATCH 2/2] tools: avoid redefinining xenevtchn_handle typedef for xc_suspend_*

[Boris Ostrovsky]

On 01/25/2016 12:22 PM, Ian Jackson wrote:
> Ian Campbell writes ("[PATCH 2/2] tools: avoid redefinining xenevtchn_handle typedef for xc_suspend_*"):
>> Similar to the previous xentoollog case this is not allowed. Switch to
>> a forward decl of the struct and use of it in the APIs.
> Both of these
>
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>


It's too late by now, so really FYI:

Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>

(for all three patches)

Re: [PATCH 2/2] tools: avoid redefinining xenevtchn_handle typedef for xc_suspend_*

[Olaf Hering]

On Mon, Jan 25, Ian Campbell wrote:

> Similar to the previous xentoollog case this is not allowed. Switch to
> a forward decl of the struct and use of it in the APIs.

Tested-by: Olaf Hering <olaf@aepfle.de>

Olaf

Re: [PATCH 2/2] tools: avoid redefinining xenevtchn_handle typedef for xc_suspend_*

[Ian Campbell]

On Mon, 2016-01-25 at 12:36 -0500, Boris Ostrovsky wrote:
> On 01/25/2016 12:22 PM, Ian Jackson wrote:
> > Ian Campbell writes ("[PATCH 2/2] tools: avoid redefinining
> > xenevtchn_handle typedef for xc_suspend_*"):
> > > Similar to the previous xentoollog case this is not allowed. Switch
> > > to
> > > a forward decl of the struct and use of it in the APIs.
> > Both of these
> > 
> > Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> > Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
> 
> 
> It's too late by now, so really FYI:
> 
> Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> 
> (for all three patches)

Thanks Boris and Olaf for testing. Hopefully that's the last of this batch
of issues.

/me stands on one leg, touches wood, crosses fingers.

Ian.