From mboxrd@z Thu Jan 1 00:00:00 1970 From: aq Subject: [PATCH] blkint.h Date: Thu, 9 Jun 2005 20:59:03 +0900 Message-ID: <9cde8bff05060904594461015e@mail.gmail.com> Reply-To: aq Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_286_6543131.1118318343289" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Andrew Warfield , Xen Dev List-Id: xen-devel@lists.xenproject.org ------=_Part_286_6543131.1118318343289 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline hi Andrew, blkint.h is included by blktaplib.h, but it is not installed (see Makefile). there is another problem on #define __BLKINT_H__: this macro is put in the wrong place. anway, i think that only blktaplib.h uses this header, so how about merging them together, so at the same time fix those 2 problems? Here is a patch to do that. Signed-off-by: Nguyen Anh Quynh $ diffstat blktap.patch=20 blkint.h | 105 -------------------------------------------------------= ----- blktaplib.h | 43 ++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 105 deletions(-) ------=_Part_286_6543131.1118318343289 Content-Type: text/x-patch; name="blktap.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="blktap.patch" ZGlmZiAteCBCaXRLZWVwZXIgLXggU0NDUyAteCB4ZW4gLXggQ2hhbmdlU2V0IC1OdXJwIHhlbm8t dG9kYXkvdG9vbHMvYmxrdGFwL2Jsa2ludC5oIHhlbm8uMDYwOS90b29scy9ibGt0YXAvYmxraW50 LmgKLS0tIHhlbm8tdG9kYXkvdG9vbHMvYmxrdGFwL2Jsa2ludC5oCTIwMDUtMDYtMDEgMTQ6NTI6 MzAuMDAwMDAwMDAwICswOTAwCisrKyB4ZW5vLjA2MDkvdG9vbHMvYmxrdGFwL2Jsa2ludC5oCTE5 NzAtMDEtMDEgMDk6MDA6MDAuMDAwMDAwMDAwICswOTAwCkBAIC0xLDEwNSArMCwwIEBACi0vKgot ICogYmxraW50LmgKLSAqIAotICogSW50ZXJmYWNlcyBmb3IgdGhlIFhlbiBibG9jayBpbnRlcnBv c2l0aW9uIGRyaXZlci4KLSAqIAotICogKGMpIDIwMDQsIEFuZHJldyBXYXJmaWVsZCwgVW5pdmVy c2l0eSBvZiBDYW1icmlkZ2UKLSAqIAotICovCi0KLSNpZm5kZWYgX19CTEtJTlRfSF9fCi0KLS8v I2luY2x1ZGUgImJsa2lmLmgiCi0KLQotI2lmIDAKLS8qIFR5cGVzIG9mIHJpbmcuICovCi0jZGVm aW5lIEJMS0lGX1JFUV9SSU5HX1RZUEUgMQotI2RlZmluZSBCTEtJRl9SU1BfUklOR19UWVBFIDIK LQotLyogZ2VuZXJpYyByaW5nIHN0cnVjdC4gKi8KLXR5cGVkZWYgc3RydWN0IGJsa2lmX2dlbmVy aWNfcmluZ19zdHJ1Y3QgewotICAgIGludCB0eXBlOwotfSBibGtpZl9nZW5lcmljX3JpbmdfdDsK LQotLyogQSByZXF1ZXN0b3IncyB2aWV3IG9mIGEgcmluZy4gKi8KLXR5cGVkZWYgc3RydWN0IGJs a2lmX3JlcV9yaW5nX3N0cnVjdCB7Ci0KLSAgICBpbnQgdHlwZTsgICAgICAgICAgICAgICAgICAg IC8qIFdpbGwgYmUgQkxLSUZfUkVRX1JJTkdfVFlQRSAgICAgICAgKi8KLSAgICBCTEtJRl9SSU5H X0lEWCByZXFfcHJvZDsgICAgIC8qIFBSSVZBVEUgcmVxX3Byb2QgaW5kZXggICAgICAgICAgICAg Ki8KLSAgICBCTEtJRl9SSU5HX0lEWCByc3BfY29uczsgICAgIC8qIFJlc3BvbnNlIGNvbnN1bWVy IGluZGV4ICAgICAgICAgICAgKi8KLSAgICBibGtpZl9yaW5nX3QgKnJpbmc7ICAgICAgICAgIC8q IFBvaW50ZXIgdG8gc2hhcmVkIHJpbmcgc3RydWN0ICAgICAgKi8KLQotfSBibGtpZl9yZXFfcmlu Z190OwotCi0jZGVmaW5lIEJMS0lGX1JFUV9SSU5HX0lOSVQgeyBCTEtJRl9SRVFfUklOR19UWVBF LCAwLCAwLCAwIH0KLQotLyogQSByZXNwb25kZXIncyB2aWV3IG9mIGEgcmluZy4gKi8KLXR5cGVk ZWYgc3RydWN0IGJsa2lmX3JzcF9yaW5nX3N0cnVjdCB7Ci0KLSAgICBpbnQgdHlwZTsgICAgICAg ICAgICAgICAgICAgIC8qIFdpbGwgYmUgQkxLSUZfUkVRX1JJTkdfVFlQRSAgICAgICAgKi8KLSAg ICBCTEtJRl9SSU5HX0lEWCByc3BfcHJvZDsgICAgIC8qIFBSSVZBVEUgcnNwX3Byb2QgaW5kZXgg ICAgICAgICAgICAgKi8KLSAgICBCTEtJRl9SSU5HX0lEWCByZXFfY29uczsgICAgIC8qIFJlcXVl c3QgY29uc3VtZXIgaW5kZXggICAgICAgICAgICAgKi8KLSAgICBibGtpZl9yaW5nX3QgKnJpbmc7 ICAgICAgICAgIC8qIFBvaW50ZXIgdG8gc2hhcmVkIHJpbmcgc3RydWN0ICAgICAgKi8KLQotfSBi bGtpZl9yc3BfcmluZ190OwotCi0jZGVmaW5lIEJMS0lGX1JTUF9SSU5HX0lOSVQgeyBCTEtJRl9S U1BfUklOR19UWVBFLCAwLCAwLCAwIH0KLQotI2RlZmluZSBSSU5HKGEpIChibGtpZl9nZW5lcmlj X3JpbmdfdCAqKShhKQotaW5saW5lIGludCBCTEtUQVBfUklOR19GVUxMKGJsa2lmX2dlbmVyaWNf cmluZ190ICpyaW5nKTsKLSNlbmRpZgotCi0vKiAtLS0tLS0tWyBpbnRlcnBvc2l0aW9uIC0+IGNo YXJhY3RlciBkZXZpY2UgaW50ZXJmYWNlIF0tLS0tLS0tLS0tLS0tICovCi0KLS8qIC9kZXYveGVu L2Jsa3RhcCByZXNpZGVzIGF0IGRldmljZSBudW1iZXIgbWFqb3I9MTAsIG1pbm9yPTIwMiAgICAg ICAgKi8gCi0jZGVmaW5lIEJMS1RBUF9NSU5PUiAyMDIKLQotLyogc2l6ZSBvZiB0aGUgZXh0cmEg Vk1BIGFyZWEgdG8gbWFwIGluIGF0dGFjaGVkIHBhZ2VzLiAqLwotI2RlZmluZSBCTEtUQVBfVk1B X1BBR0VTIEJMS0lGX1JJTkdfU0laRQotCi0vKiBibGt0YXAgSU9DVExzOiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICovCi0jZGVmaW5lIEJMS1RB UF9JT0NUTF9LSUNLX0ZFICAgICAgICAgMQotI2RlZmluZSBCTEtUQVBfSU9DVExfS0lDS19CRSAg ICAgICAgIDIKLSNkZWZpbmUgQkxLVEFQX0lPQ1RMX1NFVE1PREUgICAgICAgICAzCi0jZGVmaW5l IEJMS1RBUF9JT0NUTF9QUklOVF9JRFhTICAgICAgMTAwICAgCi0KLS8qIGJsa3RhcCBzd2l0Y2hp bmcgbW9kZXM6IChTZXQgd2l0aCBCTEtUQVBfSU9DVExfU0VUTU9ERSkgICAgICAgICAgICAgKi8K LSNkZWZpbmUgQkxLVEFQX01PREVfUEFTU1RIUk9VR0ggICAgICAweDAwMDAwMDAwICAvKiBkZWZh dWx0ICAgICAgICAgICAgKi8KLSNkZWZpbmUgQkxLVEFQX01PREVfSU5URVJDRVBUX0ZFICAgICAw eDAwMDAwMDAxCi0jZGVmaW5lIEJMS1RBUF9NT0RFX0lOVEVSQ0VQVF9CRSAgICAgMHgwMDAwMDAw MgotI2RlZmluZSBCTEtUQVBfTU9ERV9DT1BZX0ZFICAgICAgICAgIDB4MDAwMDAwMDQKLSNkZWZp bmUgQkxLVEFQX01PREVfQ09QWV9CRSAgICAgICAgICAweDAwMDAwMDA4Ci0jZGVmaW5lIEJMS1RB UF9NT0RFX0NPUFlfRkVfUEFHRVMgICAgMHgwMDAwMDAxMAotI2RlZmluZSBCTEtUQVBfTU9ERV9D T1BZX0JFX1BBR0VTICAgIDB4MDAwMDAwMjAKLQotI2RlZmluZSBCTEtUQVBfTU9ERV9JTlRFUlBP U0UgXAotICAgICAgICAgICAoQkxLVEFQX01PREVfSU5URVJDRVBUX0ZFIHwgQkxLVEFQX01PREVf SU5URVJDRVBUX0JFKQotCi0jZGVmaW5lIEJMS1RBUF9NT0RFX0NPUFlfQk9USCBcCi0gICAgICAg ICAgIChCTEtUQVBfTU9ERV9DT1BZX0ZFIHwgQkxLVEFQX01PREVfQ09QWV9CRSkKLQotI2RlZmlu ZSBCTEtUQVBfTU9ERV9DT1BZX0JPVEhfUEFHRVMgXAotICAgICAgICAgICAoQkxLVEFQX01PREVf Q09QWV9GRV9QQUdFUyB8IEJMS1RBUF9NT0RFX0NPUFlfQkVfUEFHRVMpCi0KLXN0YXRpYyBpbmxp bmUgaW50IEJMS1RBUF9NT0RFX1ZBTElEKHVuc2lnbmVkIGxvbmcgYXJnKQotewotICAgIHJldHVy biAoCi0gICAgICAgICggYXJnID09IEJMS1RBUF9NT0RFX1BBU1NUSFJPVUdIICApIHx8Ci0gICAg ICAgICggYXJnID09IEJMS1RBUF9NT0RFX0lOVEVSQ0VQVF9GRSApIHx8Ci0gICAgICAgICggYXJn ID09IEJMS1RBUF9NT0RFX0lOVEVSQ0VQVF9CRSApIHx8Ci0gICAgICAgICggYXJnID09IEJMS1RB UF9NT0RFX0lOVEVSUE9TRSAgICApIHx8Ci0gICAgICAgICggKGFyZyAmIH5CTEtUQVBfTU9ERV9D T1BZX0ZFX1BBR0VTKSA9PSBCTEtUQVBfTU9ERV9DT1BZX0ZFICkgfHwKLSAgICAgICAgKCAoYXJn ICYgfkJMS1RBUF9NT0RFX0NPUFlfQkVfUEFHRVMpID09IEJMS1RBUF9NT0RFX0NPUFlfQkUgKSB8 fAotICAgICAgICAoIChhcmcgJiB+QkxLVEFQX01PREVfQ09QWV9CT1RIX1BBR0VTKSA9PSBCTEtU QVBfTU9ERV9DT1BZX0JPVEggKQotICAgICAgICApOwotfQotCi0KLQotCi0KLQotCi0jZGVmaW5l IF9fQkxLSU5UX0hfXwotI2VuZGlmCmRpZmYgLXggQml0S2VlcGVyIC14IFNDQ1MgLXggeGVuIC14 IENoYW5nZVNldCAtTnVycCB4ZW5vLXRvZGF5L3Rvb2xzL2Jsa3RhcC9ibGt0YXBsaWIuaCB4ZW5v LjA2MDkvdG9vbHMvYmxrdGFwL2Jsa3RhcGxpYi5oCi0tLSB4ZW5vLXRvZGF5L3Rvb2xzL2Jsa3Rh cC9ibGt0YXBsaWIuaAkyMDA1LTA2LTAxIDE0OjUyOjMwLjAwMDAwMDAwMCArMDkwMAorKysgeGVu by4wNjA5L3Rvb2xzL2Jsa3RhcC9ibGt0YXBsaWIuaAkyMDA1LTA2LTA5IDIwOjQ2OjI2LjE1NTE0 MDIwOCArMDkwMApAQCAtMTYsNiArMTYsNDkgQEAKICNpbmNsdWRlIDx4ZW4vaW8vZG9tYWluX2Nv bnRyb2xsZXIuaD4KICNpbmNsdWRlICJibGtpbnQuaCIKIAorLyogL2Rldi94ZW4vYmxrdGFwIHJl c2lkZXMgYXQgZGV2aWNlIG51bWJlciBtYWpvcj0xMCwgbWlub3I9MjAyICAgICAgICAqLyAKKyNk ZWZpbmUgQkxLVEFQX01JTk9SIDIwMgorCisvKiBzaXplIG9mIHRoZSBleHRyYSBWTUEgYXJlYSB0 byBtYXAgaW4gYXR0YWNoZWQgcGFnZXMuICovCisjZGVmaW5lIEJMS1RBUF9WTUFfUEFHRVMgQkxL SUZfUklOR19TSVpFCisKKy8qIGJsa3RhcCBJT0NUTHM6ICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKi8KKyNkZWZpbmUgQkxLVEFQX0lPQ1RMX0tJ Q0tfRkUgICAgICAgICAxCisjZGVmaW5lIEJMS1RBUF9JT0NUTF9LSUNLX0JFICAgICAgICAgMgor I2RlZmluZSBCTEtUQVBfSU9DVExfU0VUTU9ERSAgICAgICAgIDMKKyNkZWZpbmUgQkxLVEFQX0lP Q1RMX1BSSU5UX0lEWFMgICAgICAxMDAgICAKKworLyogYmxrdGFwIHN3aXRjaGluZyBtb2Rlczog KFNldCB3aXRoIEJMS1RBUF9JT0NUTF9TRVRNT0RFKSAgICAgICAgICAgICAqLworI2RlZmluZSBC TEtUQVBfTU9ERV9QQVNTVEhST1VHSCAgICAgIDB4MDAwMDAwMDAgIC8qIGRlZmF1bHQgICAgICAg ICAgICAqLworI2RlZmluZSBCTEtUQVBfTU9ERV9JTlRFUkNFUFRfRkUgICAgIDB4MDAwMDAwMDEK KyNkZWZpbmUgQkxLVEFQX01PREVfSU5URVJDRVBUX0JFICAgICAweDAwMDAwMDAyCisjZGVmaW5l IEJMS1RBUF9NT0RFX0NPUFlfRkUgICAgICAgICAgMHgwMDAwMDAwNAorI2RlZmluZSBCTEtUQVBf TU9ERV9DT1BZX0JFICAgICAgICAgIDB4MDAwMDAwMDgKKyNkZWZpbmUgQkxLVEFQX01PREVfQ09Q WV9GRV9QQUdFUyAgICAweDAwMDAwMDEwCisjZGVmaW5lIEJMS1RBUF9NT0RFX0NPUFlfQkVfUEFH RVMgICAgMHgwMDAwMDAyMAorCisjZGVmaW5lIEJMS1RBUF9NT0RFX0lOVEVSUE9TRSBcCisgICAg ICAgICAgIChCTEtUQVBfTU9ERV9JTlRFUkNFUFRfRkUgfCBCTEtUQVBfTU9ERV9JTlRFUkNFUFRf QkUpCisKKyNkZWZpbmUgQkxLVEFQX01PREVfQ09QWV9CT1RIIFwKKyAgICAgICAgICAgKEJMS1RB UF9NT0RFX0NPUFlfRkUgfCBCTEtUQVBfTU9ERV9DT1BZX0JFKQorCisjZGVmaW5lIEJMS1RBUF9N T0RFX0NPUFlfQk9USF9QQUdFUyBcCisgICAgICAgICAgIChCTEtUQVBfTU9ERV9DT1BZX0ZFX1BB R0VTIHwgQkxLVEFQX01PREVfQ09QWV9CRV9QQUdFUykKKworc3RhdGljIGlubGluZSBpbnQgQkxL VEFQX01PREVfVkFMSUQodW5zaWduZWQgbG9uZyBhcmcpCit7CisgICAgcmV0dXJuICgKKyAgICAg ICAgKCBhcmcgPT0gQkxLVEFQX01PREVfUEFTU1RIUk9VR0ggICkgfHwKKyAgICAgICAgKCBhcmcg PT0gQkxLVEFQX01PREVfSU5URVJDRVBUX0ZFICkgfHwKKyAgICAgICAgKCBhcmcgPT0gQkxLVEFQ X01PREVfSU5URVJDRVBUX0JFICkgfHwKKyAgICAgICAgKCBhcmcgPT0gQkxLVEFQX01PREVfSU5U RVJQT1NFICAgICkgfHwKKyAgICAgICAgKCAoYXJnICYgfkJMS1RBUF9NT0RFX0NPUFlfRkVfUEFH RVMpID09IEJMS1RBUF9NT0RFX0NPUFlfRkUgKSB8fAorICAgICAgICAoIChhcmcgJiB+QkxLVEFQ X01PREVfQ09QWV9CRV9QQUdFUykgPT0gQkxLVEFQX01PREVfQ09QWV9CRSApIHx8CisgICAgICAg ICggKGFyZyAmIH5CTEtUQVBfTU9ERV9DT1BZX0JPVEhfUEFHRVMpID09IEJMS1RBUF9NT0RFX0NP UFlfQk9USCApCisgICAgICAgICk7Cit9CisKICNkZWZpbmUgQkxLVEFQX1BBU1MgICAgIDAgLyog S2VlcCBwYXNzaW5nIHRoaXMgcmVxdWVzdCBhcyBub3JtYWwuICovCiAjZGVmaW5lIEJMS1RBUF9S RVNQT05EICAxIC8qIFJlcXVlc3QgaXMgbm93IGEgcmVwbHkuICBSZXR1cm4gaXQuICAqLwogI2Rl ZmluZSBCTEtUQVBfU1RPTEVOICAgMiAvKiBIb29rIGhhcyBzdG9sZW4gcmVxdWVzdC4gICAgICAg ICAgICAgKi8K ------=_Part_286_6543131.1118318343289 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel ------=_Part_286_6543131.1118318343289--