[PATCH] Seperate smp from extra_params and add into default VM params

[PATCH] Seperate smp from extra_params and add into default VM params

[Yolkfull Chow]

We may need leave smp as standalone parameter of VM. Reasons I can proposal:
 1) memory is a standalone parameter, so is smp
 2) smp parameter is needed in some test case, say VM params_verify


Signed-off-by: Yolkfull Chow <yzhou@redhat.com>
---
 client/tests/kvm/kvm_tests.cfg.sample |    3 ++-
 client/tests/kvm/kvm_vm.py            |    4 ++++
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/client/tests/kvm/kvm_tests.cfg.sample b/client/tests/kvm/kvm_tests.cfg.sample
index 573206c..c16b615 100644
--- a/client/tests/kvm/kvm_tests.cfg.sample
+++ b/client/tests/kvm/kvm_tests.cfg.sample
@@ -18,6 +18,7 @@ kill_unresponsive_vms = yes
 # Some default VM params
 qemu_binary = qemu
 qemu_img_binary = qemu-img
+smp = 1
 mem = 512
 image_size = 10G
 shell_port = 22
@@ -751,7 +752,7 @@ variants:
     - @up:
         no autotest.npb
     - smp2:
-        extra_params += " -smp 2"
+        smp = 2
         used_cpus = 2
         stress_boot: used_cpus = 10
         timedrift.with_load: used_cpus = 100
diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py
index ee6796b..0b7a81e 100755
--- a/client/tests/kvm/kvm_vm.py
+++ b/client/tests/kvm/kvm_vm.py
@@ -261,6 +261,10 @@ class VM:
         if mem:
             qemu_cmd += " -m %s" % mem
 
+        smp = params.get("smp")
+        if smp:
+            qemu_cmd += " -smp %s" % smp
+
         iso = params.get("cdrom")
         if iso:
             iso = kvm_utils.get_path(root_dir, iso)
-- 
1.6.5.1

Re: [PATCH] Seperate smp from extra_params and add into default VM params

[Lucas Meneghel Rodrigues]

I am OK with it, applied, thanks!

On Tue, Nov 3, 2009 at 4:27 AM, Yolkfull Chow <yzhou@redhat.com> wrote:
> We may need leave smp as standalone parameter of VM. Reasons I can proposal:
>  1) memory is a standalone parameter, so is smp
>  2) smp parameter is needed in some test case, say VM params_verify
>
>
> Signed-off-by: Yolkfull Chow <yzhou@redhat.com>
> ---
>  client/tests/kvm/kvm_tests.cfg.sample |    3 ++-
>  client/tests/kvm/kvm_vm.py            |    4 ++++
>  2 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/client/tests/kvm/kvm_tests.cfg.sample b/client/tests/kvm/kvm_tests.cfg.sample
> index 573206c..c16b615 100644
> --- a/client/tests/kvm/kvm_tests.cfg.sample
> +++ b/client/tests/kvm/kvm_tests.cfg.sample
> @@ -18,6 +18,7 @@ kill_unresponsive_vms = yes
>  # Some default VM params
>  qemu_binary = qemu
>  qemu_img_binary = qemu-img
> +smp = 1
>  mem = 512
>  image_size = 10G
>  shell_port = 22
> @@ -751,7 +752,7 @@ variants:
>     - @up:
>         no autotest.npb
>     - smp2:
> -        extra_params += " -smp 2"
> +        smp = 2
>         used_cpus = 2
>         stress_boot: used_cpus = 10
>         timedrift.with_load: used_cpus = 100
> diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py
> index ee6796b..0b7a81e 100755
> --- a/client/tests/kvm/kvm_vm.py
> +++ b/client/tests/kvm/kvm_vm.py
> @@ -261,6 +261,10 @@ class VM:
>         if mem:
>             qemu_cmd += " -m %s" % mem
>
> +        smp = params.get("smp")
> +        if smp:
> +            qemu_cmd += " -smp %s" % smp
> +
>         iso = params.get("cdrom")
>         if iso:
>             iso = kvm_utils.get_path(root_dir, iso)
> --
> 1.6.5.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>



-- 
Lucas