From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roger Pau Monne Subject: [PATCH 2/2] xl: allow specifying a default netdev in xl.conf Date: Fri, 25 Jan 2013 16:26:23 +0100 Message-ID: <1359127583-32490-3-git-send-email-roger.pau@citrix.com> References: <1359127583-32490-1-git-send-email-roger.pau@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1359127583-32490-1-git-send-email-roger.pau@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Ulf Kreutzberg , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org VGhpcyBhZGRzIGEgbmV3IGdsb2JhbCBvcHRpb24gaW4gdGhlIHhsIGNvbmZpZ3VyYXRpb24gZmls ZSBjYWxsZWQKImRlZmF1bHRuZXRkZXYiLCB0aGF0IGlzIHVzZWQgdG8gc3BlY2lmeSB0aGUgZGVm YXVsdCBuZXRkZXYgdG8gdXNlCndoZW4gbm9uZSBpcyBwYXNzZWQgaW4gdGhlIHZpZiBzcGVjaWZp Y2F0aW9uLgoKU2lnbmVkLW9mZi1ieTogUm9nZXIgUGF1IE1vbm7DqSA8cm9nZXIucGF1QGNpdHJp eC5jb20+CkNjOiBVbGYgS3JldXR6YmVyZyA8dWxmLmtyZXV0emJlcmdAaG9zdGV1cm9wZS5kZT4K LS0tCiBkb2NzL21hbi94bC5jb25mLnBvZC41ICAgfCAgICA2ICsrKysrKwogdG9vbHMvZXhhbXBs ZXMveGwuY29uZiAgIHwgICAgMyArKysKIHRvb2xzL2xpYnhsL3hsLmMgICAgICAgICB8ICAgIDQg KysrKwogdG9vbHMvbGlieGwveGwuaCAgICAgICAgIHwgICAgMSArCiB0b29scy9saWJ4bC94bF9j bWRpbXBsLmMgfCAgICA1ICsrKysrCiA1IGZpbGVzIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyks IDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZG9jcy9tYW4veGwuY29uZi5wb2QuNSBiL2Rv Y3MvbWFuL3hsLmNvbmYucG9kLjUKaW5kZXggODJjNmIyMC4uZDFhYTRjOSAxMDA2NDQKLS0tIGEv ZG9jcy9tYW4veGwuY29uZi5wb2QuNQorKysgYi9kb2NzL21hbi94bC5jb25mLnBvZC41CkBAIC04 Miw2ICs4MiwxMiBAQCBDb25maWd1cmVzIHRoZSBkZWZhdWx0IGJyaWRnZSB0byBzZXQgZm9yIHZp cnR1YWwgbmV0d29yayBkZXZpY2VzLgogCiBEZWZhdWx0OiBDPHhlbmJyMD4KIAorPWl0ZW0gQjxk ZWZhdWx0bmV0ZGV2PSJOQU1FIj4KKworQ29uZmlndXJlcyB0aGUgZGVmYXVsdCBuZXRkZXYgdG8g c2V0IGZvciB2aXJ0dWFsIG5ldHdvcmsgZGV2aWNlcy4KKworRGVmYXVsdDogQzxOb25lPgorCiA9 aXRlbSBCPG91dHB1dF9mb3JtYXQ9Impzb258c3hwIj4KIAogQ29uZmlndXJlcyB0aGUgZGVmYXVs dCBvdXRwdXQgZm9ybWF0IHVzZWQgYnkgeGwgd2hlbiBwcmludGluZyAibWFjaGluZQpkaWZmIC0t Z2l0IGEvdG9vbHMvZXhhbXBsZXMveGwuY29uZiBiL3Rvb2xzL2V4YW1wbGVzL3hsLmNvbmYKaW5k ZXggMjhhYjc5Ni4uMTIwYTQxYiAxMDA2NDQKLS0tIGEvdG9vbHMvZXhhbXBsZXMveGwuY29uZgor KysgYi90b29scy9leGFtcGxlcy94bC5jb25mCkBAIC0yMCwzICsyMCw2IEBACiAjIGlmIGRpc2Fi bGVkIHRoZSBvbGQgYmVoYXZpb3VyIHdpbGwgYmUgdXNlZCwgYW5kIGhvdHBsdWcgc2NyaXB0cyB3 aWxsIGJlCiAjIGxhdW5jaGVkIGJ5IHVkZXYuCiAjcnVuX2hvdHBsdWdfc2NyaXB0cz0xCisKKyMg ZGVmYXVsdCBuZXRkZXYgdG8gdXNlIHdpdGggdmlmLXJvdXRlIGhvdHBsdWcgc2NyaXB0CisjZGVm YXVsdG5ldGRldj0iZXRoMCIKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL3hsLmMgYi90b29scy9s aWJ4bC94bC5jCmluZGV4IGVjYmNkM2IuLjA2YTA5YzIgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhs L3hsLmMKKysrIGIvdG9vbHMvbGlieGwveGwuYwpAQCAtNDMsNiArNDMsNyBAQCBpbnQgcnVuX2hv dHBsdWdfc2NyaXB0cyA9IDE7CiBjaGFyICpsb2NrZmlsZTsKIGNoYXIgKmRlZmF1bHRfdmlmc2Ny aXB0ID0gTlVMTDsKIGNoYXIgKmRlZmF1bHRfYnJpZGdlID0gTlVMTDsKK2NoYXIgKmRlZmF1bHRf bmV0ZGV2ID0gTlVMTDsKIGVudW0gb3V0cHV0X2Zvcm1hdCBkZWZhdWx0X291dHB1dF9mb3JtYXQg PSBPVVRQVVRfRk9STUFUX0pTT047CiAKIHN0YXRpYyB4ZW50b29sbG9nX2xldmVsIG1pbm1zZ2xl dmVsID0gWFRMX1BST0dSRVNTOwpAQCAtOTEsNiArOTIsOSBAQCBzdGF0aWMgdm9pZCBwYXJzZV9n bG9iYWxfY29uZmlnKGNvbnN0IGNoYXIgKmNvbmZpZ2ZpbGUsCiAgICAgaWYgKCF4bHVfY2ZnX2dl dF9zdHJpbmcgKGNvbmZpZywgImRlZmF1bHRicmlkZ2UiLCAmYnVmLCAwKSkKIAlkZWZhdWx0X2Jy aWRnZSA9IHN0cmR1cChidWYpOwogCisgICAgaWYgKCF4bHVfY2ZnX2dldF9zdHJpbmcgKGNvbmZp ZywgImRlZmF1bHRuZXRkZXYiLCAmYnVmLCAwKSkKKyAgICAgICAgZGVmYXVsdF9uZXRkZXYgPSBz dHJkdXAoYnVmKTsKKwogICAgIGlmICgheGx1X2NmZ19nZXRfc3RyaW5nIChjb25maWcsICJvdXRw dXRfZm9ybWF0IiwgJmJ1ZiwgMCkpIHsKICAgICAgICAgaWYgKCFzdHJjbXAoYnVmLCAianNvbiIp KQogICAgICAgICAgICAgZGVmYXVsdF9vdXRwdXRfZm9ybWF0ID0gT1VUUFVUX0ZPUk1BVF9KU09O OwpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwveGwuaCBiL3Rvb2xzL2xpYnhsL3hsLmgKaW5kZXgg YmU2ZjM4Yi4uNWQ0MzU3MiAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGwveGwuaAorKysgYi90b29s cy9saWJ4bC94bC5oCkBAIC0xNDgsNiArMTQ4LDcgQEAgZXh0ZXJuIGludCBkcnlydW5fb25seTsK IGV4dGVybiBjaGFyICpsb2NrZmlsZTsKIGV4dGVybiBjaGFyICpkZWZhdWx0X3ZpZnNjcmlwdDsK IGV4dGVybiBjaGFyICpkZWZhdWx0X2JyaWRnZTsKK2V4dGVybiBjaGFyICpkZWZhdWx0X25ldGRl djsKIGV4dGVybiBjaGFyICpibGtkZXZfc3RhcnQ7CiAKIGVudW0gb3V0cHV0X2Zvcm1hdCB7CmRp ZmYgLS1naXQgYS90b29scy9saWJ4bC94bF9jbWRpbXBsLmMgYi90b29scy9saWJ4bC94bF9jbWRp bXBsLmMKaW5kZXggOTJhNjRlNC4uMmJiYmJjMSAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGwveGxf Y21kaW1wbC5jCisrKyBiL3Rvb2xzL2xpYnhsL3hsX2NtZGltcGwuYwpAQCAtMTE0MSw2ICsxMTQx LDExIEBAIHN0YXRpYyB2b2lkIHBhcnNlX2NvbmZpZ19kYXRhKGNvbnN0IGNoYXIgKmNvbmZpZ19z b3VyY2UsCiAgICAgICAgICAgICAgICAgbmljLT5icmlkZ2UgPSBzdHJkdXAoZGVmYXVsdF9icmlk Z2UpOwogICAgICAgICAgICAgfQogCisgICAgICAgICAgICBpZiAoZGVmYXVsdF9uZXRkZXYpIHsK KyAgICAgICAgICAgICAgICBmcmVlKG5pYy0+bmV0ZGV2KTsKKyAgICAgICAgICAgICAgICBuaWMt Pm5ldGRldiA9IHN0cmR1cChkZWZhdWx0X25ldGRldik7CisgICAgICAgICAgICB9CisKICAgICAg ICAgICAgIHAgPSBzdHJ0b2soYnVmMiwgIiwiKTsKICAgICAgICAgICAgIGlmICghcCkKICAgICAg ICAgICAgICAgICBnb3RvIHNraXBfbmljOwotLSAKMS43LjcuNSAoQXBwbGUgR2l0LTI2KQoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBt YWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcv eGVuLWRldmVsCg==