From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46941) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cj6tP-0003bw-9Z for qemu-devel@nongnu.org; Wed, 01 Mar 2017 11:14:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cj6tL-0004h8-Um for qemu-devel@nongnu.org; Wed, 01 Mar 2017 11:14:19 -0500 Received: from smtp.citrix.com ([66.165.176.89]:12661) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1cj6tL-0004gL-Kw for qemu-devel@nongnu.org; Wed, 01 Mar 2017 11:14:15 -0500 Date: Wed, 1 Mar 2017 16:13:41 +0000 From: Anthony PERARD Message-ID: <20170301161340.GD1760@perard.uk.xensource.com> References: <1487861635-17560-1-git-send-email-paul.durrant@citrix.com> <1487861635-17560-4-git-send-email-paul.durrant@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <1487861635-17560-4-git-send-email-paul.durrant@citrix.com> Subject: Re: [Qemu-devel] [PATCH 3/5] xen: create wrappers for all other uses of xc_hvm_XXX() functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paul Durrant Cc: xen-devel@lists.xenproject.org, qemu-devel@nongnu.org, Stefano Stabellini , Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" On Thu, Feb 23, 2017 at 02:53:53PM +0000, Paul Durrant wrote: > This patch creates inline wrapper functions in xen_common.h for all open > coded calls to xc_hvm_XXX() functions outside of xen_common.h so that use > of xen_xc can be made implicit. This again is in preparation for the move > to using libxendevicemodel. > > Signed-off-by: Paul Durrant > --- > diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h > index 1e08b98..31cf25f 100644 > --- a/include/hw/xen/xen_common.h > +++ b/include/hw/xen/xen_common.h > @@ -26,6 +26,50 @@ extern xc_interface *xen_xc; > * We don't support Xen prior to 4.2.0. > */ > > +static inline int xen_set_mem_type(domid_t domid, hvmmem_type_t type, > + uint64_t first_pfn, uint32_t nr) > +{ I don't know if it matters from where the functions are called, but here, xc_hvm_set_mem_type takes a "uint64_t nr" (and not uint32_t). > + return xc_hvm_set_mem_type(xen_xc, domid, type, first_pfn, nr); > +} > + > +static inline int xen_set_pci_intx_level(domid_t domid, uint16_t segment, > + uint8_t bus, uint8_t device, > + uint8_t intx, unsigned int level) > +{ > + return xc_hvm_set_pci_intx_level(xen_xc, domid, segment, bus, device, > + intx, level); > +} > + > +static inline int xen_set_pci_link_route(domid_t domid, uint8_t link, > + uint8_t irq) > +{ > + return xc_hvm_set_pci_link_route(xen_xc, domid, link, irq); > +} > + > +static inline int xen_inject_msi(domid_t domid, uint64_t msi_addr, > + uint32_t msi_data) > +{ > + return xc_hvm_inject_msi(xen_xc, domid, msi_addr, msi_data); > +} > + > +static inline int xen_set_isa_irq_level(domid_t domid, uint8_t irq, > + unsigned int level) > +{ > + return xc_hvm_set_isa_irq_level(xen_xc, domid, irq, level); > +} > + > +static inline int xen_track_dirty_vram(domid_t domid, uint64_t first_pfn, > + uint32_t nr, unsigned long *bitmap) > +{ Same here. > + return xc_hvm_track_dirty_vram(xen_xc, domid, first_pfn, nr, bitmap); > +} > + > +static inline int xen_modified_memory(domid_t domid, uint64_t first_pfn, > + uint32_t nr) > +{ And here. > + return xc_hvm_modified_memory(xen_xc, domid, first_pfn, nr); > +} > + > /* Xen 4.2 through 4.6 */ > #if CONFIG_XEN_CTRL_INTERFACE_VERSION < 471 > The rest looks good. -- Anthony PERARD From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anthony PERARD Subject: Re: [PATCH 3/5] xen: create wrappers for all other uses of xc_hvm_XXX() functions Date: Wed, 1 Mar 2017 16:13:41 +0000 Message-ID: <20170301161340.GD1760@perard.uk.xensource.com> References: <1487861635-17560-1-git-send-email-paul.durrant@citrix.com> <1487861635-17560-4-git-send-email-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cj6tN-00088Z-7Y for xen-devel@lists.xenproject.org; Wed, 01 Mar 2017 16:14:17 +0000 Content-Disposition: inline In-Reply-To: <1487861635-17560-4-git-send-email-paul.durrant@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Paul Durrant Cc: Stefano Stabellini , Eduardo Habkost , "Michael S. Tsirkin" , qemu-devel@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Richard Henderson List-Id: xen-devel@lists.xenproject.org T24gVGh1LCBGZWIgMjMsIDIwMTcgYXQgMDI6NTM6NTNQTSArMDAwMCwgUGF1bCBEdXJyYW50IHdy b3RlOgo+IFRoaXMgcGF0Y2ggY3JlYXRlcyBpbmxpbmUgd3JhcHBlciBmdW5jdGlvbnMgaW4geGVu X2NvbW1vbi5oIGZvciBhbGwgb3Blbgo+IGNvZGVkIGNhbGxzIHRvIHhjX2h2bV9YWFgoKSBmdW5j dGlvbnMgb3V0c2lkZSBvZiB4ZW5fY29tbW9uLmggc28gdGhhdCB1c2UKPiBvZiB4ZW5feGMgY2Fu IGJlIG1hZGUgaW1wbGljaXQuIFRoaXMgYWdhaW4gaXMgaW4gcHJlcGFyYXRpb24gZm9yIHRoZSBt b3ZlCj4gdG8gdXNpbmcgbGlieGVuZGV2aWNlbW9kZWwuCj4gCj4gU2lnbmVkLW9mZi1ieTogUGF1 bCBEdXJyYW50IDxwYXVsLmR1cnJhbnRAY2l0cml4LmNvbT4KPiAtLS0KPiBkaWZmIC0tZ2l0IGEv aW5jbHVkZS9ody94ZW4veGVuX2NvbW1vbi5oIGIvaW5jbHVkZS9ody94ZW4veGVuX2NvbW1vbi5o Cj4gaW5kZXggMWUwOGI5OC4uMzFjZjI1ZiAxMDA2NDQKPiAtLS0gYS9pbmNsdWRlL2h3L3hlbi94 ZW5fY29tbW9uLmgKPiArKysgYi9pbmNsdWRlL2h3L3hlbi94ZW5fY29tbW9uLmgKPiBAQCAtMjYs NiArMjYsNTAgQEAgZXh0ZXJuIHhjX2ludGVyZmFjZSAqeGVuX3hjOwo+ICAgKiBXZSBkb24ndCBz dXBwb3J0IFhlbiBwcmlvciB0byA0LjIuMC4KPiAgICovCj4gIAo+ICtzdGF0aWMgaW5saW5lIGlu dCB4ZW5fc2V0X21lbV90eXBlKGRvbWlkX3QgZG9taWQsIGh2bW1lbV90eXBlX3QgdHlwZSwKPiAr ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50NjRfdCBmaXJzdF9wZm4sIHVp bnQzMl90IG5yKQo+ICt7CgpJIGRvbid0IGtub3cgaWYgaXQgbWF0dGVycyBmcm9tIHdoZXJlIHRo ZSBmdW5jdGlvbnMgYXJlIGNhbGxlZCwgYnV0CmhlcmUsIHhjX2h2bV9zZXRfbWVtX3R5cGUgdGFr ZXMgYSAidWludDY0X3QgbnIiIChhbmQgbm90IHVpbnQzMl90KS4KCj4gKyAgICByZXR1cm4geGNf aHZtX3NldF9tZW1fdHlwZSh4ZW5feGMsIGRvbWlkLCB0eXBlLCBmaXJzdF9wZm4sIG5yKTsKPiAr fQo+ICsKPiArc3RhdGljIGlubGluZSBpbnQgeGVuX3NldF9wY2lfaW50eF9sZXZlbChkb21pZF90 IGRvbWlkLCB1aW50MTZfdCBzZWdtZW50LAo+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHVpbnQ4X3QgYnVzLCB1aW50OF90IGRldmljZSwKPiArICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50OF90IGludHgsIHVuc2lnbmVkIGludCBs ZXZlbCkKPiArewo+ICsgICAgcmV0dXJuIHhjX2h2bV9zZXRfcGNpX2ludHhfbGV2ZWwoeGVuX3hj LCBkb21pZCwgc2VnbWVudCwgYnVzLCBkZXZpY2UsCj4gKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBpbnR4LCBsZXZlbCk7Cj4gK30KPiArCj4gK3N0YXRpYyBpbmxpbmUgaW50 IHhlbl9zZXRfcGNpX2xpbmtfcm91dGUoZG9taWRfdCBkb21pZCwgdWludDhfdCBsaW5rLAo+ICsg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQ4X3QgaXJxKQo+ICt7 Cj4gKyAgICByZXR1cm4geGNfaHZtX3NldF9wY2lfbGlua19yb3V0ZSh4ZW5feGMsIGRvbWlkLCBs aW5rLCBpcnEpOwo+ICt9Cj4gKwo+ICtzdGF0aWMgaW5saW5lIGludCB4ZW5faW5qZWN0X21zaShk b21pZF90IGRvbWlkLCB1aW50NjRfdCBtc2lfYWRkciwKPiArICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgdWludDMyX3QgbXNpX2RhdGEpCj4gK3sKPiArICAgIHJldHVybiB4Y19odm1f aW5qZWN0X21zaSh4ZW5feGMsIGRvbWlkLCBtc2lfYWRkciwgbXNpX2RhdGEpOwo+ICt9Cj4gKwo+ ICtzdGF0aWMgaW5saW5lIGludCB4ZW5fc2V0X2lzYV9pcnFfbGV2ZWwoZG9taWRfdCBkb21pZCwg dWludDhfdCBpcnEsCj4gKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1 bnNpZ25lZCBpbnQgbGV2ZWwpCj4gK3sKPiArICAgIHJldHVybiB4Y19odm1fc2V0X2lzYV9pcnFf bGV2ZWwoeGVuX3hjLCBkb21pZCwgaXJxLCBsZXZlbCk7Cj4gK30KPiArCj4gK3N0YXRpYyBpbmxp bmUgaW50IHhlbl90cmFja19kaXJ0eV92cmFtKGRvbWlkX3QgZG9taWQsIHVpbnQ2NF90IGZpcnN0 X3BmbiwKPiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3Qg bnIsIHVuc2lnbmVkIGxvbmcgKmJpdG1hcCkKPiArewoKU2FtZSBoZXJlLgoKPiArICAgIHJldHVy biB4Y19odm1fdHJhY2tfZGlydHlfdnJhbSh4ZW5feGMsIGRvbWlkLCBmaXJzdF9wZm4sIG5yLCBi aXRtYXApOwo+ICt9Cj4gKwo+ICtzdGF0aWMgaW5saW5lIGludCB4ZW5fbW9kaWZpZWRfbWVtb3J5 KGRvbWlkX3QgZG9taWQsIHVpbnQ2NF90IGZpcnN0X3BmbiwKPiArICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCBucikKPiArewoKQW5kIGhlcmUuCgo+ICsgICAg cmV0dXJuIHhjX2h2bV9tb2RpZmllZF9tZW1vcnkoeGVuX3hjLCBkb21pZCwgZmlyc3RfcGZuLCBu cik7Cj4gK30KPiArCj4gIC8qIFhlbiA0LjIgdGhyb3VnaCA0LjYgKi8KPiAgI2lmIENPTkZJR19Y RU5fQ1RSTF9JTlRFUkZBQ0VfVkVSU0lPTiA8IDQ3MQo+ICAKClRoZSByZXN0IGxvb2tzIGdvb2Qu CgotLSAKQW50aG9ueSBQRVJBUkQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5v cmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=