From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dario Faggioli Subject: [PATCH 3 of 3] libxl: Align examples with current code. Date: Wed, 11 Jan 2012 18:01:59 +0000 Message-ID: <1326304919.12973.5.camel@Abyss> References: <1326304198.2401.6.camel@Abyss> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6288012544328851556==" Return-path: In-Reply-To: <1326304198.2401.6.camel@Abyss> 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 Cc: "Ian.Campbell" , Ian Jackson List-Id: xen-devel@lists.xenproject.org --===============6288012544328851556== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-kAYgasmKBl9sKJO0wAYY" --=-kAYgasmKBl9sKJO0wAYY Content-Type: multipart/mixed; boundary="=-1vLiKAUMVhc3Ke1u4zse" --=-1vLiKAUMVhc3Ke1u4zse Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Just make sure the syntax proposed in the various examples is the right one. Signed-off-by: Dario Faggioli diff -r 897ea4d3c2d7 tools/examples/xmexample.hvm --- a/tools/examples/xmexample.hvm Wed Jan 11 17:28:53 2012 +0000 +++ b/tools/examples/xmexample.hvm Wed Jan 11 17:32:34 2012 +0000 @@ -59,10 +59,8 @@ name =3D "ExampleHVMDomain" # xen_extended_power_mgmt=3D0 =20 # List of which CPUS this domain is allowed to use, default Xen picks -#cpus =3D "" # leave to Xen to pick #cpus =3D "0" # all vcpus run on CPU0 #cpus =3D "0-3,5,^1" # all vcpus run on cpus 0,2,3,5 -#cpus =3D ["2", "3"] # VCPU0 runs on CPU2, VCPU1 runs on CPU3 =20 # Optionally define mac and/or bridge for the network interfaces. # Random MACs are assigned if not given. diff -r 897ea4d3c2d7 tools/examples/xmexample.hvm-stubdom --- a/tools/examples/xmexample.hvm-stubdom Wed Jan 11 17:28:53 2012 +0000 +++ b/tools/examples/xmexample.hvm-stubdom Wed Jan 11 17:32:34 2012 +0000 @@ -50,10 +50,8 @@ name =3D "xmexample.hvm" #apic=3D1 =20 # List of which CPUS this domain is allowed to use, default Xen picks -#cpus =3D "" # leave to Xen to pick #cpus =3D "0" # all vcpus run on CPU0 #cpus =3D "0-3,5,^1" # all vcpus run on cpus 0,2,3,5 -#cpus =3D ["2", "3"] # VCPU0 runs on CPU2, VCPU1 runs on CPU3 =20 # Optionally define mac and/or bridge for the network interfaces. # Random MACs are assigned if not given. diff -r 897ea4d3c2d7 tools/examples/xmexample.pv-grub --- a/tools/examples/xmexample.pv-grub Wed Jan 11 17:28:53 2012 +0000 +++ b/tools/examples/xmexample.pv-grub Wed Jan 11 17:32:34 2012 +0000 @@ -35,10 +35,8 @@ name =3D "ExampleDomain" #uuid =3D "06ed00fe-1162-4fc4-b5d8-11993ee4a8b9" =20 # List of which CPUS this domain is allowed to use, default Xen picks -#cpus =3D "" # leave to Xen to pick #cpus =3D "0" # all vcpus run on CPU0 #cpus =3D "0-3,5,^1" # all vcpus run on cpus 0,2,3,5 -#cpus =3D ["2", "3"] # VCPU0 runs on CPU2, VCPU1 runs on CPU3 =20 # Number of Virtual CPUS to use, default is 1 #vcpus =3D 1 diff -r 897ea4d3c2d7 tools/examples/xmexample.vti --- a/tools/examples/xmexample.vti Wed Jan 11 17:28:53 2012 +0000 +++ b/tools/examples/xmexample.vti Wed Jan 11 17:32:34 2012 +0000 @@ -31,10 +31,8 @@ name =3D "ExampleVTIDomain" #vcpus=3D1 =20 # List of which CPUS this domain is allowed to use, default Xen picks -#cpus =3D "" # leave to Xen to pick #cpus =3D "0" # all vcpus run on CPU0 #cpus =3D "0-3,5,^1" # all vcpus run on cpus 0,2,3,5 -#cpus =3D ["2", "3"] # VCPU0 runs on CPU2, VCPU1 runs on CPU3 =20 # Log2 of VHPT size, default=3D23 (8MB), minimum=3D15 (32KB). # In Windows OS, smaller size shows better performance. diff -r 897ea4d3c2d7 tools/examples/xmexample1 --- a/tools/examples/xmexample1 Wed Jan 11 17:28:53 2012 +0000 +++ b/tools/examples/xmexample1 Wed Jan 11 17:32:34 2012 +0000 @@ -31,10 +31,8 @@ name =3D "ExampleDomain" #uuid =3D "06ed00fe-1162-4fc4-b5d8-11993ee4a8b9" =20 # List of which CPUS this domain is allowed to use, default Xen picks -#cpus =3D "" # leave to Xen to pick #cpus =3D "0" # all vcpus run on CPU0 #cpus =3D "0-3,5,^1" # all vcpus run on cpus 0,2,3,5 -#cpus =3D ["2", "3"] # VCPU0 runs on CPU2, VCPU1 runs on CPU3 =20 # Number of Virtual CPUS to use, default is 1 #vcpus =3D 1 diff -r 897ea4d3c2d7 tools/examples/xmexample2 --- a/tools/examples/xmexample2 Wed Jan 11 17:28:53 2012 +0000 +++ b/tools/examples/xmexample2 Wed Jan 11 17:32:34 2012 +0000 @@ -60,11 +60,8 @@ name =3D "VM%d" % vmid #uuid =3D "06ed00fe-1162-4fc4-b5d8-11993ee4a8b9" =20 # List of which CPUS this domain is allowed to use, default Xen picks -#cpus =3D "" # leave to Xen to pick #cpus =3D "0" # all vcpus run on CPU0 #cpus =3D "0-3,5,^1" # all vcpus run on cpus 0,2,3,5 -#cpus =3D ["2", "3"] # VCPU0 runs on CPU2, VCPU1 runs on CPU3 -#cpus =3D "%s" % vmid # set based on vmid (mod number of CPUs) =20 # Number of Virtual CPUS to use, default is 1 #vcpus =3D 1 diff -r 897ea4d3c2d7 tools/examples/xmexample3 --- a/tools/examples/xmexample3 Wed Jan 11 17:28:53 2012 +0000 +++ b/tools/examples/xmexample3 Wed Jan 11 17:32:34 2012 +0000 @@ -60,11 +60,8 @@ name =3D "VM%d" % vmid #uuid =3D "06ed00fe-1162-4fc4-b5d8-11993ee4a8b9" =20 # List of which CPUS this domain is allowed to use, default Xen picks -#cpus =3D "" # leave to Xen to pick #cpus =3D "0" # all vcpus run on CPU0 #cpus =3D "0-3,5,^1" # all vcpus run on cpus 0,2,3,5 -#cpus =3D ["2", "3"] # VCPU0 runs on CPU2, VCPU1 runs on CPU3 -cpus =3D "%s" % vmid # set based on vmid (mod number of CPUs) =20 #-------------------------------------------------------------------------= --- # Define network interfaces. --=20 <> (Raistlin Majere) ------------------------------------------------------------------- Dario Faggioli, http://retis.sssup.it/people/faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK) PhD Candidate, ReTiS Lab, Scuola Superiore Sant'Anna, Pisa (Italy) --=-1vLiKAUMVhc3Ke1u4zse Content-Disposition: attachment; filename="adjust-examples.patch" Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="adjust-examples.patch"; charset="UTF-8" IyBIRyBjaGFuZ2VzZXQgcGF0Y2gNCiMgUGFyZW50IDg5N2VhNGQzYzJkNzYxNzQ0MmU0Yjk3YTcy MzcwNDY0Y2Y3ZmM5M2YNCmxpYnhsOiBBbGlnbiBleGFtcGxlcyB3aXRoIGN1cnJlbnQgY29kZS4N Cg0KSnVzdCBtYWtlIHN1cmUgdGhlIHN5bnRheCBwcm9wb3NlZCBpbiB0aGUgdmFyaW91cyBleGFt cGxlcyBpcw0KdGhlIHJpZ2h0IG9uZS4NCg0KU2lnbmVkLW9mZi1ieTogRGFyaW8gRmFnZ2lvbGkg PGRhcmlvLmZhZ2dpb2xpQGNpdHJpeC5jb20+DQoNCmRpZmYgLXIgODk3ZWE0ZDNjMmQ3IHRvb2xz L2V4YW1wbGVzL3htZXhhbXBsZS5odm0NCi0tLSBhL3Rvb2xzL2V4YW1wbGVzL3htZXhhbXBsZS5o dm0JV2VkIEphbiAxMSAxNzoyODo1MyAyMDEyICswMDAwDQorKysgYi90b29scy9leGFtcGxlcy94 bWV4YW1wbGUuaHZtCVdlZCBKYW4gMTEgMTc6MzI6MzQgMjAxMiArMDAwMA0KQEAgLTU5LDEwICs1 OSw4IEBAIG5hbWUgPSAiRXhhbXBsZUhWTURvbWFpbiINCiAjIHhlbl9leHRlbmRlZF9wb3dlcl9t Z210PTANCiANCiAjIExpc3Qgb2Ygd2hpY2ggQ1BVUyB0aGlzIGRvbWFpbiBpcyBhbGxvd2VkIHRv IHVzZSwgZGVmYXVsdCBYZW4gcGlja3MNCi0jY3B1cyA9ICIiICAgICAgICAgIyBsZWF2ZSB0byBY ZW4gdG8gcGljaw0KICNjcHVzID0gIjAiICAgICAgICAjIGFsbCB2Y3B1cyBydW4gb24gQ1BVMA0K ICNjcHVzID0gIjAtMyw1LF4xIiAjIGFsbCB2Y3B1cyBydW4gb24gY3B1cyAwLDIsMyw1DQotI2Nw dXMgPSBbIjIiLCAiMyJdICMgVkNQVTAgcnVucyBvbiBDUFUyLCBWQ1BVMSBydW5zIG9uIENQVTMN CiANCiAjIE9wdGlvbmFsbHkgZGVmaW5lIG1hYyBhbmQvb3IgYnJpZGdlIGZvciB0aGUgbmV0d29y ayBpbnRlcmZhY2VzLg0KICMgUmFuZG9tIE1BQ3MgYXJlIGFzc2lnbmVkIGlmIG5vdCBnaXZlbi4N CmRpZmYgLXIgODk3ZWE0ZDNjMmQ3IHRvb2xzL2V4YW1wbGVzL3htZXhhbXBsZS5odm0tc3R1YmRv bQ0KLS0tIGEvdG9vbHMvZXhhbXBsZXMveG1leGFtcGxlLmh2bS1zdHViZG9tCVdlZCBKYW4gMTEg MTc6Mjg6NTMgMjAxMiArMDAwMA0KKysrIGIvdG9vbHMvZXhhbXBsZXMveG1leGFtcGxlLmh2bS1z dHViZG9tCVdlZCBKYW4gMTEgMTc6MzI6MzQgMjAxMiArMDAwMA0KQEAgLTUwLDEwICs1MCw4IEBA IG5hbWUgPSAieG1leGFtcGxlLmh2bSINCiAjYXBpYz0xDQogDQogIyBMaXN0IG9mIHdoaWNoIENQ VVMgdGhpcyBkb21haW4gaXMgYWxsb3dlZCB0byB1c2UsIGRlZmF1bHQgWGVuIHBpY2tzDQotI2Nw dXMgPSAiIiAgICAgICAgICMgbGVhdmUgdG8gWGVuIHRvIHBpY2sNCiAjY3B1cyA9ICIwIiAgICAg ICAgIyBhbGwgdmNwdXMgcnVuIG9uIENQVTANCiAjY3B1cyA9ICIwLTMsNSxeMSIgIyBhbGwgdmNw dXMgcnVuIG9uIGNwdXMgMCwyLDMsNQ0KLSNjcHVzID0gWyIyIiwgIjMiXSAjIFZDUFUwIHJ1bnMg b24gQ1BVMiwgVkNQVTEgcnVucyBvbiBDUFUzDQogDQogIyBPcHRpb25hbGx5IGRlZmluZSBtYWMg YW5kL29yIGJyaWRnZSBmb3IgdGhlIG5ldHdvcmsgaW50ZXJmYWNlcy4NCiAjIFJhbmRvbSBNQUNz IGFyZSBhc3NpZ25lZCBpZiBub3QgZ2l2ZW4uDQpkaWZmIC1yIDg5N2VhNGQzYzJkNyB0b29scy9l eGFtcGxlcy94bWV4YW1wbGUucHYtZ3J1Yg0KLS0tIGEvdG9vbHMvZXhhbXBsZXMveG1leGFtcGxl LnB2LWdydWIJV2VkIEphbiAxMSAxNzoyODo1MyAyMDEyICswMDAwDQorKysgYi90b29scy9leGFt cGxlcy94bWV4YW1wbGUucHYtZ3J1YglXZWQgSmFuIDExIDE3OjMyOjM0IDIwMTIgKzAwMDANCkBA IC0zNSwxMCArMzUsOCBAQCBuYW1lID0gIkV4YW1wbGVEb21haW4iDQogI3V1aWQgPSAiMDZlZDAw ZmUtMTE2Mi00ZmM0LWI1ZDgtMTE5OTNlZTRhOGI5Ig0KIA0KICMgTGlzdCBvZiB3aGljaCBDUFVT IHRoaXMgZG9tYWluIGlzIGFsbG93ZWQgdG8gdXNlLCBkZWZhdWx0IFhlbiBwaWNrcw0KLSNjcHVz ID0gIiIgICAgICAgICAjIGxlYXZlIHRvIFhlbiB0byBwaWNrDQogI2NwdXMgPSAiMCIgICAgICAg ICMgYWxsIHZjcHVzIHJ1biBvbiBDUFUwDQogI2NwdXMgPSAiMC0zLDUsXjEiICMgYWxsIHZjcHVz IHJ1biBvbiBjcHVzIDAsMiwzLDUNCi0jY3B1cyA9IFsiMiIsICIzIl0gIyBWQ1BVMCBydW5zIG9u IENQVTIsIFZDUFUxIHJ1bnMgb24gQ1BVMw0KIA0KICMgTnVtYmVyIG9mIFZpcnR1YWwgQ1BVUyB0 byB1c2UsIGRlZmF1bHQgaXMgMQ0KICN2Y3B1cyA9IDENCmRpZmYgLXIgODk3ZWE0ZDNjMmQ3IHRv b2xzL2V4YW1wbGVzL3htZXhhbXBsZS52dGkNCi0tLSBhL3Rvb2xzL2V4YW1wbGVzL3htZXhhbXBs ZS52dGkJV2VkIEphbiAxMSAxNzoyODo1MyAyMDEyICswMDAwDQorKysgYi90b29scy9leGFtcGxl cy94bWV4YW1wbGUudnRpCVdlZCBKYW4gMTEgMTc6MzI6MzQgMjAxMiArMDAwMA0KQEAgLTMxLDEw ICszMSw4IEBAIG5hbWUgPSAiRXhhbXBsZVZUSURvbWFpbiINCiAjdmNwdXM9MQ0KIA0KICMgTGlz dCBvZiB3aGljaCBDUFVTIHRoaXMgZG9tYWluIGlzIGFsbG93ZWQgdG8gdXNlLCBkZWZhdWx0IFhl biBwaWNrcw0KLSNjcHVzID0gIiIgICAgICAgICAjIGxlYXZlIHRvIFhlbiB0byBwaWNrDQogI2Nw dXMgPSAiMCIgICAgICAgICMgYWxsIHZjcHVzIHJ1biBvbiBDUFUwDQogI2NwdXMgPSAiMC0zLDUs XjEiICMgYWxsIHZjcHVzIHJ1biBvbiBjcHVzIDAsMiwzLDUNCi0jY3B1cyA9IFsiMiIsICIzIl0g IyBWQ1BVMCBydW5zIG9uIENQVTIsIFZDUFUxIHJ1bnMgb24gQ1BVMw0KIA0KICMgTG9nMiBvZiBW SFBUIHNpemUsIGRlZmF1bHQ9MjMgKDhNQiksIG1pbmltdW09MTUgKDMyS0IpLg0KICMgSW4gV2lu ZG93cyBPUywgc21hbGxlciBzaXplIHNob3dzIGJldHRlciBwZXJmb3JtYW5jZS4NCmRpZmYgLXIg ODk3ZWE0ZDNjMmQ3IHRvb2xzL2V4YW1wbGVzL3htZXhhbXBsZTENCi0tLSBhL3Rvb2xzL2V4YW1w bGVzL3htZXhhbXBsZTEJV2VkIEphbiAxMSAxNzoyODo1MyAyMDEyICswMDAwDQorKysgYi90b29s cy9leGFtcGxlcy94bWV4YW1wbGUxCVdlZCBKYW4gMTEgMTc6MzI6MzQgMjAxMiArMDAwMA0KQEAg LTMxLDEwICszMSw4IEBAIG5hbWUgPSAiRXhhbXBsZURvbWFpbiINCiAjdXVpZCA9ICIwNmVkMDBm ZS0xMTYyLTRmYzQtYjVkOC0xMTk5M2VlNGE4YjkiDQogDQogIyBMaXN0IG9mIHdoaWNoIENQVVMg dGhpcyBkb21haW4gaXMgYWxsb3dlZCB0byB1c2UsIGRlZmF1bHQgWGVuIHBpY2tzDQotI2NwdXMg PSAiIiAgICAgICAgICMgbGVhdmUgdG8gWGVuIHRvIHBpY2sNCiAjY3B1cyA9ICIwIiAgICAgICAg IyBhbGwgdmNwdXMgcnVuIG9uIENQVTANCiAjY3B1cyA9ICIwLTMsNSxeMSIgIyBhbGwgdmNwdXMg cnVuIG9uIGNwdXMgMCwyLDMsNQ0KLSNjcHVzID0gWyIyIiwgIjMiXSAjIFZDUFUwIHJ1bnMgb24g Q1BVMiwgVkNQVTEgcnVucyBvbiBDUFUzDQogDQogIyBOdW1iZXIgb2YgVmlydHVhbCBDUFVTIHRv IHVzZSwgZGVmYXVsdCBpcyAxDQogI3ZjcHVzID0gMQ0KZGlmZiAtciA4OTdlYTRkM2MyZDcgdG9v bHMvZXhhbXBsZXMveG1leGFtcGxlMg0KLS0tIGEvdG9vbHMvZXhhbXBsZXMveG1leGFtcGxlMglX ZWQgSmFuIDExIDE3OjI4OjUzIDIwMTIgKzAwMDANCisrKyBiL3Rvb2xzL2V4YW1wbGVzL3htZXhh bXBsZTIJV2VkIEphbiAxMSAxNzozMjozNCAyMDEyICswMDAwDQpAQCAtNjAsMTEgKzYwLDggQEAg bmFtZSA9ICJWTSVkIiAlIHZtaWQNCiAjdXVpZCA9ICIwNmVkMDBmZS0xMTYyLTRmYzQtYjVkOC0x MTk5M2VlNGE4YjkiDQogDQogIyBMaXN0IG9mIHdoaWNoIENQVVMgdGhpcyBkb21haW4gaXMgYWxs b3dlZCB0byB1c2UsIGRlZmF1bHQgWGVuIHBpY2tzDQotI2NwdXMgPSAiIiAgICAgICAgICMgbGVh dmUgdG8gWGVuIHRvIHBpY2sNCiAjY3B1cyA9ICIwIiAgICAgICAgIyBhbGwgdmNwdXMgcnVuIG9u IENQVTANCiAjY3B1cyA9ICIwLTMsNSxeMSIgIyBhbGwgdmNwdXMgcnVuIG9uIGNwdXMgMCwyLDMs NQ0KLSNjcHVzID0gWyIyIiwgIjMiXSAjIFZDUFUwIHJ1bnMgb24gQ1BVMiwgVkNQVTEgcnVucyBv biBDUFUzDQotI2NwdXMgPSAiJXMiICUgdm1pZCAjIHNldCBiYXNlZCBvbiB2bWlkIChtb2QgbnVt YmVyIG9mIENQVXMpDQogDQogIyBOdW1iZXIgb2YgVmlydHVhbCBDUFVTIHRvIHVzZSwgZGVmYXVs dCBpcyAxDQogI3ZjcHVzID0gMQ0KZGlmZiAtciA4OTdlYTRkM2MyZDcgdG9vbHMvZXhhbXBsZXMv eG1leGFtcGxlMw0KLS0tIGEvdG9vbHMvZXhhbXBsZXMveG1leGFtcGxlMwlXZWQgSmFuIDExIDE3 OjI4OjUzIDIwMTIgKzAwMDANCisrKyBiL3Rvb2xzL2V4YW1wbGVzL3htZXhhbXBsZTMJV2VkIEph biAxMSAxNzozMjozNCAyMDEyICswMDAwDQpAQCAtNjAsMTEgKzYwLDggQEAgbmFtZSA9ICJWTSVk IiAlIHZtaWQNCiAjdXVpZCA9ICIwNmVkMDBmZS0xMTYyLTRmYzQtYjVkOC0xMTk5M2VlNGE4Yjki DQogDQogIyBMaXN0IG9mIHdoaWNoIENQVVMgdGhpcyBkb21haW4gaXMgYWxsb3dlZCB0byB1c2Us IGRlZmF1bHQgWGVuIHBpY2tzDQotI2NwdXMgPSAiIiAgICAgICAgICMgbGVhdmUgdG8gWGVuIHRv IHBpY2sNCiAjY3B1cyA9ICIwIiAgICAgICAgIyBhbGwgdmNwdXMgcnVuIG9uIENQVTANCiAjY3B1 cyA9ICIwLTMsNSxeMSIgIyBhbGwgdmNwdXMgcnVuIG9uIGNwdXMgMCwyLDMsNQ0KLSNjcHVzID0g WyIyIiwgIjMiXSAjIFZDUFUwIHJ1bnMgb24gQ1BVMiwgVkNQVTEgcnVucyBvbiBDUFUzDQotY3B1 cyA9ICIlcyIgJSB2bWlkICMgc2V0IGJhc2VkIG9uIHZtaWQgKG1vZCBudW1iZXIgb2YgQ1BVcykN CiANCiAjLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KICMgRGVmaW5lIG5ldHdvcmsgaW50ZXJmYWNlcy4N Cg== --=-1vLiKAUMVhc3Ke1u4zse-- --=-kAYgasmKBl9sKJO0wAYY Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk8NzpcACgkQk4XaBE3IOsTY4wCdFIwyH6bQsa/kM3qcasrxrj3d HqoAn0W7hWCNNXNq86QiHfK5lI+GgQbB =ntXt -----END PGP SIGNATURE----- --=-kAYgasmKBl9sKJO0wAYY-- --===============6288012544328851556== 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 --===============6288012544328851556==--