Support multiple watchdogs in the domain schema

Libvirt allows several watchdog devices since 9.1.0. The documentation now states: Having multiple watchdogs is usually not something very common, but be aware that this might happen, for example, when an implicit watchdog device is added as part of another device. For example the iTCO watchdog being part of the ich9 southbridge, which is used with the q35 machine type. Signed-off-by: Vasiliy Ulyanov <[email protected]>
KarstenB · Jul 19, 2023 · df896a5 · df896a5
1 parent d161611
commit df896a5
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/pkg/virt-launcher/virtwrap/api/deepcopy_generated.go b/pkg/virt-launcher/virtwrap/api/deepcopy_generated.go
diff --git a/pkg/virt-launcher/virtwrap/api/schema.go b/pkg/virt-launcher/virtwrap/api/schema.go
@@ -478,7 +478,7 @@ type Devices struct {
 	Inputs      []Input            `xml:"input"`
 	Serials     []Serial           `xml:"serial"`
 	Consoles    []Console          `xml:"console"`
-	Watchdog    *Watchdog          `xml:"watchdog,omitempty"`
+	Watchdogs   []Watchdog         `xml:"watchdog,omitempty"`
 	Rng         *Rng               `xml:"rng,omitempty"`
 	Filesystems []FilesystemDevice `xml:"filesystem,omitempty"`
 	Redirs      []RedirectedDevice `xml:"redirdev,omitempty"`

diff --git a/pkg/virt-launcher/virtwrap/api/schema_test.go b/pkg/virt-launcher/virtwrap/api/schema_test.go
@@ -348,10 +348,12 @@ var _ = ginkgo.Describe("Schema", func() {
 		exampleDomain.Spec.Devices.Consoles = []Console{
 			{Type: "pty"},
 		}
-		exampleDomain.Spec.Devices.Watchdog = &Watchdog{
-			Model:  "i6300esb",
-			Action: "poweroff",
-			Alias:  NewUserDefinedAlias("mywatchdog"),
+		exampleDomain.Spec.Devices.Watchdogs = []Watchdog{
+			{
+				Model:  "i6300esb",
+				Action: "poweroff",
+				Alias:  NewUserDefinedAlias("mywatchdog"),
+			},
 		}
 		exampleDomain.Spec.Devices.Rng = &Rng{
 			Model:   v1.VirtIO,

diff --git a/pkg/virt-launcher/virtwrap/converter/converter.go b/pkg/virt-launcher/virtwrap/converter/converter.go
@@ -1604,7 +1604,7 @@ func Convert_v1_VirtualMachineInstance_To_api_Domain(vmi *v1.VirtualMachineInsta
 		if err != nil {
 			return err
 		}
-		domain.Spec.Devices.Watchdog = newWatchdog
+		domain.Spec.Devices.Watchdogs = append(domain.Spec.Devices.Watchdogs, *newWatchdog)
 	}
 
 	if vmi.Spec.Domain.Devices.Rng != nil {

diff --git a/pkg/virt-launcher/virtwrap/converter/pci-placement.go b/pkg/virt-launcher/virtwrap/converter/pci-placement.go
@@ -53,8 +53,8 @@ func PlacePCIDevicesOnRootComplex(spec *api.DomainSpec) (err error) {
 			return err
 		}
 	}
-	if spec.Devices.Watchdog != nil {
-		spec.Devices.Watchdog.Address, err = assigner.PlacePCIDeviceAtNextSlot(spec.Devices.Watchdog.Address)
+	for i, watchdog := range spec.Devices.Watchdogs {
+		spec.Devices.Watchdogs[i].Address, err = assigner.PlacePCIDeviceAtNextSlot(watchdog.Address)
 		if err != nil {
 			return err
 		}