| Message ID | 1242858392-9704-1-git-send-email-mburns@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Just found out this is really not going to work like I thought it would. I'll rework and repost later. Mike Burns wrote: > See comments and example in control file for details. > > Signed-off-by: Mike Burns <mburns@redhat.com> > --- > client/tests/kvm_runtest_2/control | 6 ++++++ > client/tests/kvm_runtest_2/kvm_install.py | 7 +++++++ > 2 files changed, 13 insertions(+), 0 deletions(-) > > diff --git a/client/tests/kvm_runtest_2/control b/client/tests/kvm_runtest_2/control > index d6e26bc..02b1d22 100644 > --- a/client/tests/kvm_runtest_2/control > +++ b/client/tests/kvm_runtest_2/control > @@ -74,6 +74,12 @@ params = { > > ## Custom install > "install_script": 'custom_kvm_install.sh param1' > + > + ## Additional kernel modules to install > + ## Must be a comma separated list of values > + ## Installed in the order they are listed. > + ## to install mod1.ko, mod2.ko, mod3.ko, you would set like this: > + #"additional_modules": 'mod1,mod2,mod3' > } > > # Comment the job.run_test line if you do not want to install kvm on the host. > diff --git a/client/tests/kvm_runtest_2/kvm_install.py b/client/tests/kvm_runtest_2/kvm_install.py > index 392ef0c..4b703f6 100755 > --- a/client/tests/kvm_runtest_2/kvm_install.py > +++ b/client/tests/kvm_runtest_2/kvm_install.py > @@ -237,6 +237,13 @@ def __load_kvm_modules(): > os.chdir("x86") > utils.system("/sbin/insmod ./kvm.ko && sleep 1 && /sbin/insmod ./kvm-%s.ko" % vendor) > > + #Add additional modules specified in params by "additional_modules" > + #Modules must be named <value>.ko and be located in the > + #same location as kvm and kvm-vendor modules > + for module in params.get("additional_modules").split(","): > + kvm_log.info("Installing module \"%s\"" % module) > + utils.system("/sbin/insmod ./%s.ko" % module ) > + > #elif self.config.load_modules == "no": > #kvm_log.info("user requested not to load kvm modules") > > -- 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
----- "Mike Burns" <mburns@redhat.com> wrote: > See comments and example in control file for details. > > Signed-off-by: Mike Burns <mburns@redhat.com> > --- > client/tests/kvm_runtest_2/control | 6 ++++++ > client/tests/kvm_runtest_2/kvm_install.py | 7 +++++++ > 2 files changed, 13 insertions(+), 0 deletions(-) > > diff --git a/client/tests/kvm_runtest_2/control > b/client/tests/kvm_runtest_2/control > index d6e26bc..02b1d22 100644 > --- a/client/tests/kvm_runtest_2/control > +++ b/client/tests/kvm_runtest_2/control > @@ -74,6 +74,12 @@ params = { > > ## Custom install > "install_script": 'custom_kvm_install.sh param1' > + > + ## Additional kernel modules to install > + ## Must be a comma separated list of values > + ## Installed in the order they are listed. > + ## to install mod1.ko, mod2.ko, mod3.ko, you would set like > this: > + #"additional_modules": 'mod1,mod2,mod3' > } Just for consistency, maybe we should make it a space separated list? Every other list is separated by spaces, like 'vms = vm1 dst'. > # Comment the job.run_test line if you do not want to install kvm on > the host. > diff --git a/client/tests/kvm_runtest_2/kvm_install.py > b/client/tests/kvm_runtest_2/kvm_install.py > index 392ef0c..4b703f6 100755 > --- a/client/tests/kvm_runtest_2/kvm_install.py > +++ b/client/tests/kvm_runtest_2/kvm_install.py > @@ -237,6 +237,13 @@ def __load_kvm_modules(): > os.chdir("x86") > utils.system("/sbin/insmod ./kvm.ko && sleep 1 && /sbin/insmod > ./kvm-%s.ko" % vendor) > > + #Add additional modules specified in params by > "additional_modules" > + #Modules must be named <value>.ko and be located in the > + #same location as kvm and kvm-vendor modules > + for module in params.get("additional_modules").split(","): It should probably be a good idea to provide a default value here, because "additional_modules" isn't necessarily defined, in which case split() will throw an exception. Something like: params.get("additional_modules", "") which returns "" in case "additional_modules" is undefined. > + kvm_log.info("Installing module \"%s\"" % module) > + utils.system("/sbin/insmod ./%s.ko" % module ) > + > #elif self.config.load_modules == "no": > #kvm_log.info("user requested not to load kvm modules") > > -- > 1.5.5.6 > > -- > 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 -- 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
diff --git a/client/tests/kvm_runtest_2/control b/client/tests/kvm_runtest_2/control index d6e26bc..02b1d22 100644 --- a/client/tests/kvm_runtest_2/control +++ b/client/tests/kvm_runtest_2/control @@ -74,6 +74,12 @@ params = { ## Custom install "install_script": 'custom_kvm_install.sh param1' + + ## Additional kernel modules to install + ## Must be a comma separated list of values + ## Installed in the order they are listed. + ## to install mod1.ko, mod2.ko, mod3.ko, you would set like this: + #"additional_modules": 'mod1,mod2,mod3' } # Comment the job.run_test line if you do not want to install kvm on the host. diff --git a/client/tests/kvm_runtest_2/kvm_install.py b/client/tests/kvm_runtest_2/kvm_install.py index 392ef0c..4b703f6 100755 --- a/client/tests/kvm_runtest_2/kvm_install.py +++ b/client/tests/kvm_runtest_2/kvm_install.py @@ -237,6 +237,13 @@ def __load_kvm_modules(): os.chdir("x86") utils.system("/sbin/insmod ./kvm.ko && sleep 1 && /sbin/insmod ./kvm-%s.ko" % vendor) + #Add additional modules specified in params by "additional_modules" + #Modules must be named <value>.ko and be located in the + #same location as kvm and kvm-vendor modules + for module in params.get("additional_modules").split(","): + kvm_log.info("Installing module \"%s\"" % module) + utils.system("/sbin/insmod ./%s.ko" % module ) + #elif self.config.load_modules == "no": #kvm_log.info("user requested not to load kvm modules")
See comments and example in control file for details. Signed-off-by: Mike Burns <mburns@redhat.com> --- client/tests/kvm_runtest_2/control | 6 ++++++ client/tests/kvm_runtest_2/kvm_install.py | 7 +++++++ 2 files changed, 13 insertions(+), 0 deletions(-)