diff options
| -rw-r--r-- | libvirtxml.go | 12 | ||||
| -rw-r--r-- | start.go | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/libvirtxml.go b/libvirtxml.go index a2e53e7..d4ed5f8 100644 --- a/libvirtxml.go +++ b/libvirtxml.go @@ -14,6 +14,7 @@ import ( "libvirt.org/go/libvirtxml" ) +/* func makeStandardXml(hostname string) *libvirtxml.Domain { log.Info("create new xml file for:", hostname) domcfg := &libvirtxml.Domain{} @@ -26,6 +27,7 @@ func makeStandardXml(hostname string) *libvirtxml.Domain { return domcfg } +*/ func writeoutXml(domcfg *libvirtxml.Domain, filename string) bool { xmldoc, err := domcfg.Marshal() @@ -59,7 +61,7 @@ func setDiskFilename(domcfg *libvirtxml.Domain, filename string) { } } -func addDefaultXml(d *libvirtxml.Domain, filename string) { +func AddDefaultXml(d *libvirtxml.Domain, filename string) error { /* fullname := "resources/xml/" + filename + ".xml" pfile, err := resources.ReadFile(fullname) @@ -72,11 +74,11 @@ func addDefaultXml(d *libvirtxml.Domain, filename string) { err := d.Unmarshal(filename) if err != nil { log.Info("Marshal failed on file", filename) - return } + return err } -func readXml(filename string) (*libvirtxml.Domain, error) { +func ReadXml(filename string) (*libvirtxml.Domain, error) { log.Verbose("parse xml file:", filename) hostname := filepath.Base(filename) @@ -241,7 +243,7 @@ func setRandomMacs(domcfg *libvirtxml.Domain) { // that is "standard". This is just a way to double check that // there might be something interesting in a VM // 'standard' here means what I think is standard -func dumpNonStandardXML(domcfg *libvirtxml.Domain) (string, error) { +func DumpNonStandardXML(domcfg *libvirtxml.Domain) (string, error) { // dump type if domcfg.Type == "kvm" { domcfg.Type = "" @@ -762,7 +764,7 @@ func warnUserOfNonStandardXML(domcfg *libvirtxml.Domain) (string, error) { } // dump out all the fields in libvirtxml.DomainDeviceList -func dumpLibvirtxmlDomainNames() { +func DumpLibvirtxmlDomainNames() { var domain libvirtxml.Domain t := reflect.TypeOf(domain) @@ -14,7 +14,8 @@ import ( ) // generate the XML for 'virsh create' -func startDropletXml(d *pb.Droplet) { +func StartDropletXml(d *pb.Droplet, domcfg *libvirtxml.Domain, hostname string) { + /* if d == nil { log.Info("droplet is nil") os.Exit(0) @@ -27,6 +28,7 @@ func startDropletXml(d *pb.Droplet) { // addDefaultXml(domcfg, "network") addDefaultXml(domcfg, "spice") addDefaultXml(domcfg, "qcow") + */ domcfg.Type = "kvm" domcfg.Name = d.Hostname |