From: Masaki Kanno Subject: [PATCH] Improve information-gathering processing of SCSI devices by using lsscsi Date: Mon, 16 Feb 2009 11:37:52 +0900 Message-ID: <51C98FDF90BE14kanno.masaki@jp.fujitsu.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-tku2dIWmD5idD4K56oyLo" 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: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --Boundary-tku2dIWmD5idD4K56oyLo Content-Type: text/plain; charset=iso-2022-jp Content-Transfer-Encoding: 7bit Content-Description: Mail message body Hi, This patch improves an information-gathering processing of SCSI devices by using lsscsi command. In the case of xm scsi-attach, when the SCSI devices are specified in HCTL form or device name form, the processing is faster. If lsscsi command is not installed, the processing works by using information of /sys as before. Signed-off-by: Masaki Kanno Best regards, Kan --Boundary-tku2dIWmD5idD4K56oyLo Content-Type: application/octet-stream; name="improve_vscsi_util_by_lsscsi.patch" Content-Disposition: attachment; filename="improve_vscsi_util_by_lsscsi.patch" Content-Transfer-Encoding: base64 ZGlmZiAtciAwOWE2ZmEwNTliMzcgdG9vbHMvcHl0aG9uL3hlbi91dGlsL3ZzY3NpX3V0aWwu cHkKLS0tIGEvdG9vbHMvcHl0aG9uL3hlbi91dGlsL3ZzY3NpX3V0aWwucHkJRnJpIEZlYiAx MyAwOTo0ODo1NiAyMDA5ICswMDAwCisrKyBiL3Rvb2xzL3B5dGhvbi94ZW4vdXRpbC92c2Nz aV91dGlsLnB5CU1vbiBGZWIgMTYgMTE6MDM6MDQgMjAwOSArMDkwMApAQCAtNzgsOCArNzgs MzggQEAgZGVmIF92c2NzaV9nZXRfaGN0bF9ieShwaHluYW1lLCBzY3NpX2RldgogICAgIHJl dHVybiAoTm9uZSwgTm9uZSkKIAogCi1kZWYgdnNjc2lfZ2V0X3Njc2lkZXZpY2VzKCk6Ci0g ICAgIiIiIGdldCBhbGwgc2NzaSBkZXZpY2VzIiIiCitkZWYgX3ZzY3NpX2dldF9zY3NpaWQo c2cpOgorICAgIHNjc2lfaWQgPSBvcy5wb3BlbignL3NiaW4vc2NzaV9pZCAtZ3UgLXMgL2Ns YXNzL3Njc2lfZ2VuZXJpYy8nICsgc2cpLnJlYWQoKS5zcGxpdCgpCisgICAgaWYgbGVuKHNj c2lfaWQpOgorICAgICAgICByZXR1cm4gc2NzaV9pZFswXQorICAgIHJldHVybiBOb25lCisK KworZGVmIF92c2NzaV9nZXRfc2NzaWRldmljZXNfYnlfbHNzY3NpKG9wdGlvbiA9ICIiKToK KyAgICAiIiIgZ2V0IGFsbCBzY3NpIGRldmljZXMgaW5mb3JtYXRpb24gYnkgbHNzY3NpICIi IgorCisgICAgZGV2aWNlcyA9IFtdCisKKyAgICBmb3Igc2NzaWluZm8gaW4gb3MucG9wZW4o J2xzc2NzaSAtZyAlcycgJSBvcHRpb24pLnJlYWRsaW5lcygpOgorICAgICAgICBzID0gc2Nz aWluZm8uc3BsaXQoKQorICAgICAgICBoY3RsID0gc1swXVsxOi0xXQorICAgICAgICB0cnk6 CisgICAgICAgICAgICBkZXZuYW1lID0gc1stMl0uc3BsaXQoJy9kZXYvJylbMV0KKyAgICAg ICAgZXhjZXB0IEluZGV4RXJyb3I6CisgICAgICAgICAgICBkZXZuYW1lID0gTm9uZQorICAg ICAgICB0cnk6CisgICAgICAgICAgICBzZyA9IHNbLTFdLnNwbGl0KCcvZGV2LycpWzFdCisg ICAgICAgICAgICBzY3NpX2lkID0gX3ZzY3NpX2dldF9zY3NpaWQoc2cpCisgICAgICAgIGV4 Y2VwdCBJbmRleEVycm9yOgorICAgICAgICAgICAgc2cgPSBOb25lCisgICAgICAgICAgICBz Y3NpX2lkID0gTm9uZQorICAgICAgICBkZXZpY2VzLmFwcGVuZChbaGN0bCwgZGV2bmFtZSwg c2csIHNjc2lfaWRdKQorCisgICAgcmV0dXJuIGRldmljZXMKKworCitkZWYgX3ZzY3NpX2dl dF9zY3NpZGV2aWNlc19ieV9zeXNmcygpOgorICAgICIiIiBnZXQgYWxsIHNjc2kgZGV2aWNl cyBpbmZvcm1hdGlvbiBieSBzeXNmcyAiIiIKIAogICAgIGRldmljZXMgPSBbXQogICAgIHN5 c2ZzX21udCA9IHV0aWxzLmZpbmRfc3lzZnNfbW91bnQoKSAKQEAgLTEwMCwxOCArMTMwLDI5 IEBAIGRlZiB2c2NzaV9nZXRfc2NzaWRldmljZXMoKToKIAogICAgICAgICAgICAgICAgIGlm IHJlLm1hdGNoKCdec2NzaV9nZW5lcmljJywgZik6CiAgICAgICAgICAgICAgICAgICAgIHNn ID0gb3MucGF0aC5iYXNlbmFtZShyZWFscGF0aCkKLSAgICAgICAgICAgICAgICAgICAgbGlu ZXMgPSBvcy5wb3BlbignL3NiaW4vc2NzaV9pZCAtZ3UgLXMgL2NsYXNzL3Njc2lfZ2VuZXJp Yy8nICsgc2cpLnJlYWQoKS5zcGxpdCgpCi0gICAgICAgICAgICAgICAgICAgIGlmIGxlbihs aW5lcyk6Ci0gICAgICAgICAgICAgICAgICAgICAgICBzY3NpX2lkID0gbGluZXNbMF0KLQor ICAgICAgICAgICAgICAgICAgICBzY3NpX2lkID0gX3ZzY3NpX2dldF9zY3NpaWQoc2cpCiAg ICAgICAgICAgICBkZXZpY2VzLmFwcGVuZChbaGN0bCwgZGV2bmFtZSwgc2csIHNjc2lfaWRd KQogCiAgICAgcmV0dXJuIGRldmljZXMKKworCitkZWYgdnNjc2lfZ2V0X3Njc2lkZXZpY2Vz KCk6CisgICAgIiIiIGdldCBhbGwgc2NzaSBkZXZpY2VzIGluZm9ybWF0aW9uICIiIgorCisg ICAgZGV2aWNlcyA9IF92c2NzaV9nZXRfc2NzaWRldmljZXNfYnlfbHNzY3NpKCIiKQorICAg IGlmIGRldmljZXM6CisgICAgICAgIHJldHVybiBkZXZpY2VzCisgICAgcmV0dXJuIF92c2Nz aV9nZXRfc2NzaWRldmljZXNfYnlfc3lzZnMoKQogCiAKIGRlZiB2c2NzaV9nZXRfaGN0bF9h bmRfZGV2bmFtZV9ieSh0YXJnZXQsIHNjc2lfZGV2aWNlcyA9IE5vbmUpOgogICAgIGlmIHNj c2lfZGV2aWNlcyBpcyBOb25lOgotICAgICAgICBzY3NpX2RldmljZXMgPSB2c2NzaV9nZXRf c2NzaWRldmljZXMoKQorICAgICAgICBpZiBsZW4odGFyZ2V0LnNwbGl0KCc6JykpID09IDQ6 CisgICAgICAgICAgICBzY3NpX2RldmljZXMgPSBfdnNjc2lfZ2V0X3Njc2lkZXZpY2VzX2J5 X2xzc2NzaSh0YXJnZXQpCisgICAgICAgIGVsaWYgdGFyZ2V0LnN0YXJ0c3dpdGgoJy9kZXYv Jyk6IAorICAgICAgICAgICAgc2NzaV9kZXZpY2VzID0gX3ZzY3NpX2dldF9zY3NpZGV2aWNl c19ieV9sc3Njc2koInwgZ3JlcCAlcyIgJSB0YXJnZXQpCisgICAgICAgIGVsc2U6CisgICAg ICAgICAgICBzY3NpX2RldmljZXMgPSB2c2NzaV9nZXRfc2NzaWRldmljZXMoKQogCiAgICAg aWYgbGVuKHRhcmdldC5zcGxpdCgnOicpKSA9PSA0OgogICAgICAgICByZXR1cm4gX3ZzY3Np X2dldF9kZXZuYW1lX2J5KHRhcmdldCwgc2NzaV9kZXZpY2VzKQo= --Boundary-tku2dIWmD5idD4K56oyLo 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 --Boundary-tku2dIWmD5idD4K56oyLo--