Ian Campbell
2012-Jan-12 08:37 UTC
Re: [PATCH 3 of 3] libxl: Align examples with current code.
On Wed, 2012-01-11 at 18:01 +0000, Dario Faggioli wrote:> Just make sure the syntax proposed in the various examples is > the right one. > > Signed-off-by: Dario Faggioli <dario.faggioli@citrix.com> > > 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 +0000These are the xend/xm examples which you didn''t change. Or is it that the current examples don''t actually reflect the current xend syntax either? The xl examples are xl* in the same directory. These are more minimal examples so I don''t think including affinity there is necessary. Instead you need to patch docs/man/xl.cfg.pod.5 to reflect the new syntax (and if necessary deprecate the old). BTW, I think we are in general happy for docs updates to go in the same patch as the corresponding code update. Ian.> @@ -59,10 +59,8 @@ name = "ExampleHVMDomain" > # xen_extended_power_mgmt=0 > > # List of which CPUS this domain is allowed to use, default Xen picks > -#cpus = "" # leave to Xen to pick > #cpus = "0" # all vcpus run on CPU0 > #cpus = "0-3,5,^1" # all vcpus run on cpus 0,2,3,5 > -#cpus = ["2", "3"] # VCPU0 runs on CPU2, VCPU1 runs on CPU3 > > # 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 = "xmexample.hvm" > #apic=1 > > # List of which CPUS this domain is allowed to use, default Xen picks > -#cpus = "" # leave to Xen to pick > #cpus = "0" # all vcpus run on CPU0 > #cpus = "0-3,5,^1" # all vcpus run on cpus 0,2,3,5 > -#cpus = ["2", "3"] # VCPU0 runs on CPU2, VCPU1 runs on CPU3 > > # 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 = "ExampleDomain" > #uuid = "06ed00fe-1162-4fc4-b5d8-11993ee4a8b9" > > # List of which CPUS this domain is allowed to use, default Xen picks > -#cpus = "" # leave to Xen to pick > #cpus = "0" # all vcpus run on CPU0 > #cpus = "0-3,5,^1" # all vcpus run on cpus 0,2,3,5 > -#cpus = ["2", "3"] # VCPU0 runs on CPU2, VCPU1 runs on CPU3 > > # Number of Virtual CPUS to use, default is 1 > #vcpus = 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 = "ExampleVTIDomain" > #vcpus=1 > > # List of which CPUS this domain is allowed to use, default Xen picks > -#cpus = "" # leave to Xen to pick > #cpus = "0" # all vcpus run on CPU0 > #cpus = "0-3,5,^1" # all vcpus run on cpus 0,2,3,5 > -#cpus = ["2", "3"] # VCPU0 runs on CPU2, VCPU1 runs on CPU3 > > # Log2 of VHPT size, default=23 (8MB), minimum=15 (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 = "ExampleDomain" > #uuid = "06ed00fe-1162-4fc4-b5d8-11993ee4a8b9" > > # List of which CPUS this domain is allowed to use, default Xen picks > -#cpus = "" # leave to Xen to pick > #cpus = "0" # all vcpus run on CPU0 > #cpus = "0-3,5,^1" # all vcpus run on cpus 0,2,3,5 > -#cpus = ["2", "3"] # VCPU0 runs on CPU2, VCPU1 runs on CPU3 > > # Number of Virtual CPUS to use, default is 1 > #vcpus = 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 = "VM%d" % vmid > #uuid = "06ed00fe-1162-4fc4-b5d8-11993ee4a8b9" > > # List of which CPUS this domain is allowed to use, default Xen picks > -#cpus = "" # leave to Xen to pick > #cpus = "0" # all vcpus run on CPU0 > #cpus = "0-3,5,^1" # all vcpus run on cpus 0,2,3,5 > -#cpus = ["2", "3"] # VCPU0 runs on CPU2, VCPU1 runs on CPU3 > -#cpus = "%s" % vmid # set based on vmid (mod number of CPUs) > > # Number of Virtual CPUS to use, default is 1 > #vcpus = 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 = "VM%d" % vmid > #uuid = "06ed00fe-1162-4fc4-b5d8-11993ee4a8b9" > > # List of which CPUS this domain is allowed to use, default Xen picks > -#cpus = "" # leave to Xen to pick > #cpus = "0" # all vcpus run on CPU0 > #cpus = "0-3,5,^1" # all vcpus run on cpus 0,2,3,5 > -#cpus = ["2", "3"] # VCPU0 runs on CPU2, VCPU1 runs on CPU3 > -cpus = "%s" % vmid # set based on vmid (mod number of CPUs) > > #---------------------------------------------------------------------------- > # Define network interfaces. >