From 7af7c876e46fa0444ea0930cfab599922a2367d2 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 25 Oct 2024 14:52:28 -0500 Subject: ignore 'custom' cpu settings from XML Signed-off-by: Jeff Carr --- libvirtxml.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'libvirtxml.go') diff --git a/libvirtxml.go b/libvirtxml.go index b873583..64b6814 100644 --- a/libvirtxml.go +++ b/libvirtxml.go @@ -330,13 +330,14 @@ func dumpNonStandardXML(domcfg *libvirtxml.Domain) (string, error) { case "host-model": domcfg.CPU = nil case "custom": - fmt.Printf("custom CPU: %+v\n", domcfg.CPU) - fmt.Printf("custom CPU Model: %+v\n", domcfg.CPU.Model) - // domcfg.CPU = nil updatedXML, _ := xml.MarshalIndent(domcfg.CPU, "", " ") - log.Info("Non-Standard XML Start") + log.Info("Ignore custom CPU Start") fmt.Println(string(updatedXML)) - log.Info("Non-Standard XML End") + log.Info("Ignore custom CPU End") + log.Info("Add --xml-ignore-cpu to ignore this") + if argv.IgnoreCpu { + domcfg.CPU = nil + } default: fmt.Printf("unknown CPU: %+v\n", domcfg.CPU) fmt.Printf("unknown CPU Model: %+v\n", domcfg.CPU.Model) @@ -348,10 +349,6 @@ func dumpNonStandardXML(domcfg *libvirtxml.Domain) (string, error) { } } - // this goes away if SecLabel is zero'd out? - //if domcfg.Metadata != nil { - // fmt.Printf("? Metadata: %+v\n", domcfg.Metadata) - //} var secnormal bool = true if len(domcfg.SecLabel) != 0 { for _, sec := range domcfg.SecLabel { @@ -367,6 +364,7 @@ func dumpNonStandardXML(domcfg *libvirtxml.Domain) (string, error) { if secnormal { domcfg.SecLabel = nil } + // ignore Metadata // this is probably something about what kind of OS you might be running // todo: get this directly from the disk image -- cgit v1.2.3