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 <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Osstest/Toolstack/libvirt.pm b/Osstest/Toolstack/libvirt.pm
index f5f099afa9ee11827678b70125b050d2954417c3..e9d3952ecc82977463d419207c0075317ebf6213 100644 (file)
--- 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 ed9071b12ef069dfd57c0b49cad2d34538b4b504..1d5d059cc0df9950d76cfa6e983fb8be1ec41e73 100644 (file)
--- 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 79386498e4ffc7e29300e7f7728bbe2bc6176306..5498c0a6fcd40b25ea2951e5ee184f27f265307e 100644 (file)
--- 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 fb6a1746fcc2bcd4508d943bf3942c65978ca41b..1aa9e690444b4fbd7e4b8ad830df1d8a1bacc925 100755 (executable)
--- 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 () {