From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59888) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etzW2-0007QJ-BK for qemu-devel@nongnu.org; Thu, 08 Mar 2018 12:39:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etzW1-0008Ll-0e for qemu-devel@nongnu.org; Thu, 08 Mar 2018 12:39:42 -0500 Received: from smtp.citrix.com ([66.165.176.89]:31749) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1etzW0-0008KY-PI for qemu-devel@nongnu.org; Thu, 08 Mar 2018 12:39:40 -0500 From: Ian Jackson Date: Thu, 8 Mar 2018 17:39:11 +0000 Message-ID: <1520530757-4477-6-git-send-email-ian.jackson@eu.citrix.com> In-Reply-To: <1520530757-4477-1-git-send-email-ian.jackson@eu.citrix.com> References: <1520530757-4477-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 05/11] xen: move xc_interface compatibility fallback further up the file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: xen-devel@lists.xenproject.org, Ian Jackson , Ross Lagerwall , Anthony PERARD , Juergen Gross , Stefano Stabellini , Ian Jackson We are going to want to use the dummy xendevicemodel_handle type in new stub functions in the CONFIG_XEN_CTRL_INTERFACE_VERSION < 41000 section. So we need to provide that definition, or (as applicable) include the appropriate header, earlier in the file. (Ideally the newer compatibility layers would be at the bottom of the file, so that they can naturally benefit from the compatibility layers for earlier version. But that's rather too much for this series.) No functional change. Signed-off-by: Ian Jackson Acked-by: Anthony PERARD Acked-by: Stefano Stabellini --- v2: New patch in v2 of the series --- include/hw/xen/xen_common.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 1766bb9..60c4ebb 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -78,6 +78,17 @@ static inline void *xenforeignmemory_map(xc_interface *h, uint32_t dom, extern xenforeignmemory_handle *xen_fmem; +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40900 + +typedef xc_interface xendevicemodel_handle; + +#else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 40900 */ + +#undef XC_WANT_COMPAT_DEVICEMODEL_API +#include + +#endif + #if CONFIG_XEN_CTRL_INTERFACE_VERSION < 41000 #define XEN_COMPAT_PHYSMAP @@ -105,8 +116,6 @@ static inline int xentoolcore_restrict_all(domid_t domid) #if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40900 -typedef xc_interface xendevicemodel_handle; - static inline xendevicemodel_handle *xendevicemodel_open( struct xentoollog_logger *logger, unsigned int open_flags) { @@ -228,11 +237,6 @@ static inline int xendevicemodel_set_mem_type( return xc_hvm_set_mem_type(dmod, domid, mem_type, first_pfn, nr); } -#else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 40900 */ - -#undef XC_WANT_COMPAT_DEVICEMODEL_API -#include - #endif extern xendevicemodel_handle *xen_dmod; -- 2.1.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [PATCH 05/11] xen: move xc_interface compatibility fallback further up the file Date: Thu, 8 Mar 2018 17:39:11 +0000 Message-ID: <1520530757-4477-6-git-send-email-ian.jackson@eu.citrix.com> References: <1520530757-4477-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1etza2-00073z-HP for xen-devel@lists.xenproject.org; Thu, 08 Mar 2018 17:43:50 +0000 In-Reply-To: <1520530757-4477-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: Juergen Gross , Stefano Stabellini , Ian Jackson , Ross Lagerwall , Anthony PERARD , xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org V2UgYXJlIGdvaW5nIHRvIHdhbnQgdG8gdXNlIHRoZSBkdW1teSB4ZW5kZXZpY2Vtb2RlbF9oYW5k bGUgdHlwZSBpbgpuZXcgc3R1YiBmdW5jdGlvbnMgaW4gdGhlIENPTkZJR19YRU5fQ1RSTF9JTlRF UkZBQ0VfVkVSU0lPTiA8IDQxMDAwCnNlY3Rpb24uICBTbyB3ZSBuZWVkIHRvIHByb3ZpZGUgdGhh dCBkZWZpbml0aW9uLCBvciAoYXMgYXBwbGljYWJsZSkKaW5jbHVkZSB0aGUgYXBwcm9wcmlhdGUg aGVhZGVyLCBlYXJsaWVyIGluIHRoZSBmaWxlLgoKKElkZWFsbHkgdGhlIG5ld2VyIGNvbXBhdGli aWxpdHkgbGF5ZXJzIHdvdWxkIGJlIGF0IHRoZSBib3R0b20gb2YgdGhlCmZpbGUsIHNvIHRoYXQg dGhleSBjYW4gbmF0dXJhbGx5IGJlbmVmaXQgZnJvbSB0aGUgY29tcGF0aWJpbGl0eSBsYXllcnMK Zm9yIGVhcmxpZXIgdmVyc2lvbi4gIEJ1dCB0aGF0J3MgcmF0aGVyIHRvbyBtdWNoIGZvciB0aGlz IHNlcmllcy4pCgpObyBmdW5jdGlvbmFsIGNoYW5nZS4KClNpZ25lZC1vZmYtYnk6IElhbiBKYWNr c29uIDxJYW4uSmFja3NvbkBldS5jaXRyaXguY29tPgpBY2tlZC1ieTogQW50aG9ueSBQRVJBUkQg PGFudGhvbnkucGVyYXJkQGNpdHJpeC5jb20+CkFja2VkLWJ5OiBTdGVmYW5vIFN0YWJlbGxpbmkg PHNzdGFiZWxsaW5pQGtlcm5lbC5vcmc+Ci0tLQp2MjogTmV3IHBhdGNoIGluIHYyIG9mIHRoZSBz ZXJpZXMKLS0tCiBpbmNsdWRlL2h3L3hlbi94ZW5fY29tbW9uLmggfCAxOCArKysrKysrKysrKy0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMSBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2luY2x1ZGUvaHcveGVuL3hlbl9jb21tb24uaCBiL2luY2x1ZGUvaHcveGVu L3hlbl9jb21tb24uaAppbmRleCAxNzY2YmI5Li42MGM0ZWJiIDEwMDY0NAotLS0gYS9pbmNsdWRl L2h3L3hlbi94ZW5fY29tbW9uLmgKKysrIGIvaW5jbHVkZS9ody94ZW4veGVuX2NvbW1vbi5oCkBA IC03OCw2ICs3OCwxNyBAQCBzdGF0aWMgaW5saW5lIHZvaWQgKnhlbmZvcmVpZ25tZW1vcnlfbWFw KHhjX2ludGVyZmFjZSAqaCwgdWludDMyX3QgZG9tLAogCiBleHRlcm4geGVuZm9yZWlnbm1lbW9y eV9oYW5kbGUgKnhlbl9mbWVtOwogCisjaWYgQ09ORklHX1hFTl9DVFJMX0lOVEVSRkFDRV9WRVJT SU9OIDwgNDA5MDAKKwordHlwZWRlZiB4Y19pbnRlcmZhY2UgeGVuZGV2aWNlbW9kZWxfaGFuZGxl OworCisjZWxzZSAvKiBDT05GSUdfWEVOX0NUUkxfSU5URVJGQUNFX1ZFUlNJT04gPj0gNDA5MDAg Ki8KKworI3VuZGVmIFhDX1dBTlRfQ09NUEFUX0RFVklDRU1PREVMX0FQSQorI2luY2x1ZGUgPHhl bmRldmljZW1vZGVsLmg+CisKKyNlbmRpZgorCiAjaWYgQ09ORklHX1hFTl9DVFJMX0lOVEVSRkFD RV9WRVJTSU9OIDwgNDEwMDAKIAogI2RlZmluZSBYRU5fQ09NUEFUX1BIWVNNQVAKQEAgLTEwNSw4 ICsxMTYsNiBAQCBzdGF0aWMgaW5saW5lIGludCB4ZW50b29sY29yZV9yZXN0cmljdF9hbGwoZG9t aWRfdCBkb21pZCkKIAogI2lmIENPTkZJR19YRU5fQ1RSTF9JTlRFUkZBQ0VfVkVSU0lPTiA8IDQw OTAwCiAKLXR5cGVkZWYgeGNfaW50ZXJmYWNlIHhlbmRldmljZW1vZGVsX2hhbmRsZTsKLQogc3Rh dGljIGlubGluZSB4ZW5kZXZpY2Vtb2RlbF9oYW5kbGUgKnhlbmRldmljZW1vZGVsX29wZW4oCiAg ICAgc3RydWN0IHhlbnRvb2xsb2dfbG9nZ2VyICpsb2dnZXIsIHVuc2lnbmVkIGludCBvcGVuX2Zs YWdzKQogewpAQCAtMjI4LDExICsyMzcsNiBAQCBzdGF0aWMgaW5saW5lIGludCB4ZW5kZXZpY2Vt b2RlbF9zZXRfbWVtX3R5cGUoCiAgICAgcmV0dXJuIHhjX2h2bV9zZXRfbWVtX3R5cGUoZG1vZCwg ZG9taWQsIG1lbV90eXBlLCBmaXJzdF9wZm4sIG5yKTsKIH0KIAotI2Vsc2UgLyogQ09ORklHX1hF Tl9DVFJMX0lOVEVSRkFDRV9WRVJTSU9OID49IDQwOTAwICovCi0KLSN1bmRlZiBYQ19XQU5UX0NP TVBBVF9ERVZJQ0VNT0RFTF9BUEkKLSNpbmNsdWRlIDx4ZW5kZXZpY2Vtb2RlbC5oPgotCiAjZW5k aWYKIAogZXh0ZXJuIHhlbmRldmljZW1vZGVsX2hhbmRsZSAqeGVuX2Rtb2Q7Ci0tIAoyLjEuNAoK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZl bCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlz dHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=