From: Ian Campbell Date: Tue, 2 Dec 2014 12:53:26 +0000 (+0000) Subject: ts-guest-start: Use guest_create X-Git-Tag: wip.xsm-13-actual.base~38 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=99c7380887f1d2cc395f5f47449dbb3e39e8159a;p=people%2Fliuw%2Fosstest.git ts-guest-start: Use guest_create This allows us to abolish CfgPathVar which was inconsistently used, appears redundant with $gho->{CfgPath} and in any case never set to anything other than 'cfgpath'. This was intended to deal with toolstacks with a different cfg format (such as very early versions of xl) but is no longer relevant. I think if this need arises again in a future toolstack this functionality could be reintroduced pretty trivially via the toolstack abstraction which is added by this series. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- diff --git a/Osstest/Toolstack/libvirt.pm b/Osstest/Toolstack/libvirt.pm index f5f099a..e9d3952 100644 --- a/Osstest/Toolstack/libvirt.pm +++ b/Osstest/Toolstack/libvirt.pm @@ -28,7 +28,6 @@ sub new { Host => $ho, NewDaemons => [qw(libvirtd)], Dom0MemFixed => 1, - CfgPathVar => 'cfgpath', ExtraPackages => [qw(libnl1 libavahi-client3)], }, $class; } diff --git a/Osstest/Toolstack/xend.pm b/Osstest/Toolstack/xend.pm index ed9071b..1d5d059 100644 --- a/Osstest/Toolstack/xend.pm +++ b/Osstest/Toolstack/xend.pm @@ -30,7 +30,6 @@ sub new { NewDaemons => [qw(xend)], OldDaemonInitd => 'xend', _Command => 'xm', - CfgPathVar => 'cfgpath', Dom0MemFixed => 1, }, $class; } diff --git a/Osstest/Toolstack/xl.pm b/Osstest/Toolstack/xl.pm index 7938649..5498c0a 100644 --- a/Osstest/Toolstack/xl.pm +++ b/Osstest/Toolstack/xl.pm @@ -29,7 +29,6 @@ sub new { NewDaemons => [], Dom0MemFixed => 1, _Command => 'xl', - CfgPathVar => 'cfgpath', RestoreNeedsConfig => 1, }, $class; } diff --git a/ts-guest-start b/ts-guest-start index fb6a174..1aa9e69 100755 --- a/ts-guest-start +++ b/ts-guest-start @@ -26,7 +26,7 @@ our ($ho,$gho) = ts_get_host_guest(@ARGV); sub start () { guest_umount_lv($ho, $gho); - toolstack($ho)->create($r{ $gho->{Guest}.'_'. toolstack($ho)->{CfgPathVar} }); + guest_create($gho); } sub checkstart () {