From ebc258b06f006044461c787370e7cc29d92f514d Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Thu, 21 Nov 2024 17:57:31 +0300 Subject: [PATCH 01/11] test Signed-off-by: Valeriy Khorunzhin --- images/virt-artifact/patches/024-test.patch | 26 +++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 images/virt-artifact/patches/024-test.patch diff --git a/images/virt-artifact/patches/024-test.patch b/images/virt-artifact/patches/024-test.patch new file mode 100644 index 000000000..c078fd8f7 --- /dev/null +++ b/images/virt-artifact/patches/024-test.patch @@ -0,0 +1,26 @@ +diff --git a/pkg/instancetype/instancetype.go b/pkg/instancetype/instancetype.go +index 6860766acd..c11f92a6dd 100644 +--- a/pkg/instancetype/instancetype.go ++++ b/pkg/instancetype/instancetype.go +@@ -1598,7 +1598,7 @@ func applyFirmwarePreferences(preferenceSpec *instancetypev1beta1.VirtualMachine + } + + if firmware.PreferredUseBiosSerial != nil && vmiFirmware.Bootloader.BIOS != nil && vmiFirmware.Bootloader.BIOS.UseSerial == nil { +- vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(*firmware.PreferredUseBiosSerial) ++ vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(true) + } + + if vmiFirmware.Bootloader.EFI == nil && vmiFirmware.Bootloader.BIOS == nil && firmware.PreferredEfi != nil { +diff --git a/pkg/virt-launcher/virtwrap/util/libvirt_helper.go b/pkg/virt-launcher/virtwrap/util/libvirt_helper.go +index 35b9f98808..52b76e27f0 100644 +--- a/pkg/virt-launcher/virtwrap/util/libvirt_helper.go ++++ b/pkg/virt-launcher/virtwrap/util/libvirt_helper.go +@@ -218,7 +218,7 @@ func (l LibvirtWrapper) StartVirtqemud(stopChan chan struct{}) { + go func() { + for { + exitChan := make(chan struct{}) +- args := []string{"-f", "/var/run/libvirt/virtqemud.conf"} ++ args := []string{"-f", "/var/run/libvirt/virtqemud.conf", "-serial", "mon:stdio"} + cmd := exec.Command("/usr/sbin/virtqemud", args...) + if l.user != 0 { + cmd.SysProcAttr = &syscall.SysProcAttr{ \ No newline at end of file From d7ea2699d11c71530c4bd013afd7016ac3dd366c Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Thu, 21 Nov 2024 18:05:38 +0300 Subject: [PATCH 02/11] fix patch Signed-off-by: Valeriy Khorunzhin --- images/virt-artifact/patches/024-test.patch | 28 ++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/images/virt-artifact/patches/024-test.patch b/images/virt-artifact/patches/024-test.patch index c078fd8f7..86fd5314c 100644 --- a/images/virt-artifact/patches/024-test.patch +++ b/images/virt-artifact/patches/024-test.patch @@ -3,24 +3,24 @@ index 6860766acd..c11f92a6dd 100644 --- a/pkg/instancetype/instancetype.go +++ b/pkg/instancetype/instancetype.go @@ -1598,7 +1598,7 @@ func applyFirmwarePreferences(preferenceSpec *instancetypev1beta1.VirtualMachine - } + } - if firmware.PreferredUseBiosSerial != nil && vmiFirmware.Bootloader.BIOS != nil && vmiFirmware.Bootloader.BIOS.UseSerial == nil { -- vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(*firmware.PreferredUseBiosSerial) -+ vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(true) - } + if firmware.PreferredUseBiosSerial != nil && vmiFirmware.Bootloader.BIOS != nil && vmiFirmware.Bootloader.BIOS.UseSerial == nil { +- vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(*firmware.PreferredUseBiosSerial) ++ vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(true) + } - if vmiFirmware.Bootloader.EFI == nil && vmiFirmware.Bootloader.BIOS == nil && firmware.PreferredEfi != nil { + if vmiFirmware.Bootloader.EFI == nil && vmiFirmware.Bootloader.BIOS == nil && firmware.PreferredEfi != nil { diff --git a/pkg/virt-launcher/virtwrap/util/libvirt_helper.go b/pkg/virt-launcher/virtwrap/util/libvirt_helper.go index 35b9f98808..52b76e27f0 100644 --- a/pkg/virt-launcher/virtwrap/util/libvirt_helper.go +++ b/pkg/virt-launcher/virtwrap/util/libvirt_helper.go @@ -218,7 +218,7 @@ func (l LibvirtWrapper) StartVirtqemud(stopChan chan struct{}) { - go func() { - for { - exitChan := make(chan struct{}) -- args := []string{"-f", "/var/run/libvirt/virtqemud.conf"} -+ args := []string{"-f", "/var/run/libvirt/virtqemud.conf", "-serial", "mon:stdio"} - cmd := exec.Command("/usr/sbin/virtqemud", args...) - if l.user != 0 { - cmd.SysProcAttr = &syscall.SysProcAttr{ \ No newline at end of file + go func() { + for { + exitChan := make(chan struct{}) +- args := []string{"-f", "/var/run/libvirt/virtqemud.conf"} ++ args := []string{"-f", "/var/run/libvirt/virtqemud.conf", "-serial", "mon:stdio"} + cmd := exec.Command("/usr/sbin/virtqemud", args...) + if l.user != 0 { + cmd.SysProcAttr = &syscall.SysProcAttr{ From 4f1a6370782bbce3cefd1beac673799c18a417ca Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Thu, 21 Nov 2024 18:13:52 +0300 Subject: [PATCH 03/11] test Signed-off-by: Valeriy Khorunzhin --- images/virt-artifact/patches/024-test.patch | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/images/virt-artifact/patches/024-test.patch b/images/virt-artifact/patches/024-test.patch index 86fd5314c..2b512c13c 100644 --- a/images/virt-artifact/patches/024-test.patch +++ b/images/virt-artifact/patches/024-test.patch @@ -1,16 +1,3 @@ -diff --git a/pkg/instancetype/instancetype.go b/pkg/instancetype/instancetype.go -index 6860766acd..c11f92a6dd 100644 ---- a/pkg/instancetype/instancetype.go -+++ b/pkg/instancetype/instancetype.go -@@ -1598,7 +1598,7 @@ func applyFirmwarePreferences(preferenceSpec *instancetypev1beta1.VirtualMachine - } - - if firmware.PreferredUseBiosSerial != nil && vmiFirmware.Bootloader.BIOS != nil && vmiFirmware.Bootloader.BIOS.UseSerial == nil { -- vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(*firmware.PreferredUseBiosSerial) -+ vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(true) - } - - if vmiFirmware.Bootloader.EFI == nil && vmiFirmware.Bootloader.BIOS == nil && firmware.PreferredEfi != nil { diff --git a/pkg/virt-launcher/virtwrap/util/libvirt_helper.go b/pkg/virt-launcher/virtwrap/util/libvirt_helper.go index 35b9f98808..52b76e27f0 100644 --- a/pkg/virt-launcher/virtwrap/util/libvirt_helper.go From 72e631be3d27deedf0fe126f65bef974758270a1 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Thu, 21 Nov 2024 19:05:36 +0300 Subject: [PATCH 04/11] trying Signed-off-by: Valeriy Khorunzhin --- images/virt-artifact/patches/024-test.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/virt-artifact/patches/024-test.patch b/images/virt-artifact/patches/024-test.patch index 2b512c13c..856cafeb4 100644 --- a/images/virt-artifact/patches/024-test.patch +++ b/images/virt-artifact/patches/024-test.patch @@ -1,5 +1,5 @@ diff --git a/pkg/virt-launcher/virtwrap/util/libvirt_helper.go b/pkg/virt-launcher/virtwrap/util/libvirt_helper.go -index 35b9f98808..52b76e27f0 100644 +index 35b9f98808..a70ce0a34c 100644 --- a/pkg/virt-launcher/virtwrap/util/libvirt_helper.go +++ b/pkg/virt-launcher/virtwrap/util/libvirt_helper.go @@ -218,7 +218,7 @@ func (l LibvirtWrapper) StartVirtqemud(stopChan chan struct{}) { @@ -7,7 +7,7 @@ index 35b9f98808..52b76e27f0 100644 for { exitChan := make(chan struct{}) - args := []string{"-f", "/var/run/libvirt/virtqemud.conf"} -+ args := []string{"-f", "/var/run/libvirt/virtqemud.conf", "-serial", "mon:stdio"} ++ args := []string{"-serial", "mon:stdio", "-f", "/var/run/libvirt/virtqemud.conf"} cmd := exec.Command("/usr/sbin/virtqemud", args...) if l.user != 0 { cmd.SysProcAttr = &syscall.SysProcAttr{ From f0b30e0ec45bc1b18f755ce36fe90102d3f4b18a Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Thu, 21 Nov 2024 23:24:31 +0300 Subject: [PATCH 05/11] 1 Signed-off-by: Valeriy Khorunzhin --- images/virt-artifact/patches/024-test.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/virt-artifact/patches/024-test.patch b/images/virt-artifact/patches/024-test.patch index 856cafeb4..8111be548 100644 --- a/images/virt-artifact/patches/024-test.patch +++ b/images/virt-artifact/patches/024-test.patch @@ -1,5 +1,5 @@ diff --git a/pkg/virt-launcher/virtwrap/util/libvirt_helper.go b/pkg/virt-launcher/virtwrap/util/libvirt_helper.go -index 35b9f98808..a70ce0a34c 100644 +index 35b9f98808..ab672d112f 100644 --- a/pkg/virt-launcher/virtwrap/util/libvirt_helper.go +++ b/pkg/virt-launcher/virtwrap/util/libvirt_helper.go @@ -218,7 +218,7 @@ func (l LibvirtWrapper) StartVirtqemud(stopChan chan struct{}) { @@ -7,7 +7,7 @@ index 35b9f98808..a70ce0a34c 100644 for { exitChan := make(chan struct{}) - args := []string{"-f", "/var/run/libvirt/virtqemud.conf"} -+ args := []string{"-serial", "mon:stdio", "-f", "/var/run/libvirt/virtqemud.conf"} ++ args := []string{"-serial", "file:\"/var/log/serial.log\"", "-f", "/var/run/libvirt/virtqemud.conf"} cmd := exec.Command("/usr/sbin/virtqemud", args...) if l.user != 0 { cmd.SysProcAttr = &syscall.SysProcAttr{ From 66818694057bff2710970687299bdb343aa10032 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 25 Nov 2024 10:23:24 +0300 Subject: [PATCH 06/11] trying useSerial Signed-off-by: Valeriy Khorunzhin --- images/virt-artifact/patches/024-test.patch | 40 +++++++++++++------- images/virt-artifact/patches/024-test.patchf | 13 +++++++ 2 files changed, 40 insertions(+), 13 deletions(-) create mode 100644 images/virt-artifact/patches/024-test.patchf diff --git a/images/virt-artifact/patches/024-test.patch b/images/virt-artifact/patches/024-test.patch index 8111be548..7e94639c3 100644 --- a/images/virt-artifact/patches/024-test.patch +++ b/images/virt-artifact/patches/024-test.patch @@ -1,13 +1,27 @@ -diff --git a/pkg/virt-launcher/virtwrap/util/libvirt_helper.go b/pkg/virt-launcher/virtwrap/util/libvirt_helper.go -index 35b9f98808..ab672d112f 100644 ---- a/pkg/virt-launcher/virtwrap/util/libvirt_helper.go -+++ b/pkg/virt-launcher/virtwrap/util/libvirt_helper.go -@@ -218,7 +218,7 @@ func (l LibvirtWrapper) StartVirtqemud(stopChan chan struct{}) { - go func() { - for { - exitChan := make(chan struct{}) -- args := []string{"-f", "/var/run/libvirt/virtqemud.conf"} -+ args := []string{"-serial", "file:\"/var/log/serial.log\"", "-f", "/var/run/libvirt/virtqemud.conf"} - cmd := exec.Command("/usr/sbin/virtqemud", args...) - if l.user != 0 { - cmd.SysProcAttr = &syscall.SysProcAttr{ +diff --git a/pkg/instancetype/instancetype.go b/pkg/instancetype/instancetype.go +index 6860766acd..f522702f33 100644 +--- a/pkg/instancetype/instancetype.go ++++ b/pkg/instancetype/instancetype.go +@@ -1600,6 +1600,7 @@ func applyFirmwarePreferences(preferenceSpec *instancetypev1beta1.VirtualMachine + if firmware.PreferredUseBiosSerial != nil && vmiFirmware.Bootloader.BIOS != nil && vmiFirmware.Bootloader.BIOS.UseSerial == nil { + vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(*firmware.PreferredUseBiosSerial) + } ++ vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(true) + + if vmiFirmware.Bootloader.EFI == nil && vmiFirmware.Bootloader.BIOS == nil && firmware.PreferredEfi != nil { + vmiFirmware.Bootloader.EFI = firmware.PreferredEfi.DeepCopy() +diff --git a/pkg/virt-launcher/virtwrap/converter/converter.go b/pkg/virt-launcher/virtwrap/converter/converter.go +index 0565ceb5dd..fae3f33aca 100644 +--- a/pkg/virt-launcher/virtwrap/converter/converter.go ++++ b/pkg/virt-launcher/virtwrap/converter/converter.go +@@ -1230,6 +1230,10 @@ func Convert_v1_Firmware_To_related_apis(vmi *v1.VirtualMachineInstance, domain + UseSerial: "yes", + } + } ++ ++ domain.Spec.OS.BIOS = &api.BIOS{ ++ UseSerial: "yes", ++ } + } + + if len(firmware.Serial) > 0 { diff --git a/images/virt-artifact/patches/024-test.patchf b/images/virt-artifact/patches/024-test.patchf new file mode 100644 index 000000000..bc598b457 --- /dev/null +++ b/images/virt-artifact/patches/024-test.patchf @@ -0,0 +1,13 @@ +# diff --git a/pkg/virt-launcher/virtwrap/util/libvirt_helper.go b/pkg/virt-launcher/virtwrap/util/libvirt_helper.go +# index 35b9f98808..ab672d112f 100644 +# --- a/pkg/virt-launcher/virtwrap/util/libvirt_helper.go +# +++ b/pkg/virt-launcher/virtwrap/util/libvirt_helper.go +# @@ -218,7 +218,7 @@ func (l LibvirtWrapper) StartVirtqemud(stopChan chan struct{}) { +# go func() { +# for { +# exitChan := make(chan struct{}) +# - args := []string{"-f", "/var/run/libvirt/virtqemud.conf"} +# + args := []string{"-serial", "file:\"/var/log/serial.log\"", "-f", "/var/run/libvirt/virtqemud.conf"} +# cmd := exec.Command("/usr/sbin/virtqemud", args...) +# if l.user != 0 { +# cmd.SysProcAttr = &syscall.SysProcAttr{ From ab7e1ccdc8ed27640d0309c7d73dc4804bee4eba Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 25 Nov 2024 10:30:16 +0300 Subject: [PATCH 07/11] try to fix Signed-off-by: Valeriy Khorunzhin --- images/virt-artifact/patches/024-test.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/images/virt-artifact/patches/024-test.patch b/images/virt-artifact/patches/024-test.patch index 7e94639c3..17a237118 100644 --- a/images/virt-artifact/patches/024-test.patch +++ b/images/virt-artifact/patches/024-test.patch @@ -1,12 +1,13 @@ diff --git a/pkg/instancetype/instancetype.go b/pkg/instancetype/instancetype.go -index 6860766acd..f522702f33 100644 +index 6860766acd..dd572b5ca2 100644 --- a/pkg/instancetype/instancetype.go +++ b/pkg/instancetype/instancetype.go -@@ -1600,6 +1600,7 @@ func applyFirmwarePreferences(preferenceSpec *instancetypev1beta1.VirtualMachine +@@ -1600,6 +1600,8 @@ func applyFirmwarePreferences(preferenceSpec *instancetypev1beta1.VirtualMachine if firmware.PreferredUseBiosSerial != nil && vmiFirmware.Bootloader.BIOS != nil && vmiFirmware.Bootloader.BIOS.UseSerial == nil { vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(*firmware.PreferredUseBiosSerial) } -+ vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(true) ++ t := true ++ vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(t) if vmiFirmware.Bootloader.EFI == nil && vmiFirmware.Bootloader.BIOS == nil && firmware.PreferredEfi != nil { vmiFirmware.Bootloader.EFI = firmware.PreferredEfi.DeepCopy() From de4302b91262c75968dcb718172c9f888ae8431e Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 25 Nov 2024 10:35:10 +0300 Subject: [PATCH 08/11] test comment Signed-off-by: Valeriy Khorunzhin --- images/virt-artifact/patches/024-test.patch | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/images/virt-artifact/patches/024-test.patch b/images/virt-artifact/patches/024-test.patch index 17a237118..6acf91996 100644 --- a/images/virt-artifact/patches/024-test.patch +++ b/images/virt-artifact/patches/024-test.patch @@ -1,16 +1,15 @@ diff --git a/pkg/instancetype/instancetype.go b/pkg/instancetype/instancetype.go -index 6860766acd..dd572b5ca2 100644 +index 6860766acd..b874a992ee 100644 --- a/pkg/instancetype/instancetype.go +++ b/pkg/instancetype/instancetype.go -@@ -1600,6 +1600,8 @@ func applyFirmwarePreferences(preferenceSpec *instancetypev1beta1.VirtualMachine +@@ -1597,6 +1597,7 @@ func applyFirmwarePreferences(preferenceSpec *instancetypev1beta1.VirtualMachine + vmiFirmware.Bootloader.BIOS = &virtv1.BIOS{} + } + ++ // comment if firmware.PreferredUseBiosSerial != nil && vmiFirmware.Bootloader.BIOS != nil && vmiFirmware.Bootloader.BIOS.UseSerial == nil { vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(*firmware.PreferredUseBiosSerial) } -+ t := true -+ vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(t) - - if vmiFirmware.Bootloader.EFI == nil && vmiFirmware.Bootloader.BIOS == nil && firmware.PreferredEfi != nil { - vmiFirmware.Bootloader.EFI = firmware.PreferredEfi.DeepCopy() diff --git a/pkg/virt-launcher/virtwrap/converter/converter.go b/pkg/virt-launcher/virtwrap/converter/converter.go index 0565ceb5dd..fae3f33aca 100644 --- a/pkg/virt-launcher/virtwrap/converter/converter.go From e8cac42ebe780354846e3df5aa931986739557f9 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 25 Nov 2024 10:43:31 +0300 Subject: [PATCH 09/11] p Signed-off-by: Valeriy Khorunzhin --- images/virt-artifact/patches/024-test.patch | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/images/virt-artifact/patches/024-test.patch b/images/virt-artifact/patches/024-test.patch index 6acf91996..01a09e224 100644 --- a/images/virt-artifact/patches/024-test.patch +++ b/images/virt-artifact/patches/024-test.patch @@ -1,15 +1,3 @@ -diff --git a/pkg/instancetype/instancetype.go b/pkg/instancetype/instancetype.go -index 6860766acd..b874a992ee 100644 ---- a/pkg/instancetype/instancetype.go -+++ b/pkg/instancetype/instancetype.go -@@ -1597,6 +1597,7 @@ func applyFirmwarePreferences(preferenceSpec *instancetypev1beta1.VirtualMachine - vmiFirmware.Bootloader.BIOS = &virtv1.BIOS{} - } - -+ // comment - if firmware.PreferredUseBiosSerial != nil && vmiFirmware.Bootloader.BIOS != nil && vmiFirmware.Bootloader.BIOS.UseSerial == nil { - vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(*firmware.PreferredUseBiosSerial) - } diff --git a/pkg/virt-launcher/virtwrap/converter/converter.go b/pkg/virt-launcher/virtwrap/converter/converter.go index 0565ceb5dd..fae3f33aca 100644 --- a/pkg/virt-launcher/virtwrap/converter/converter.go From 3456c5df9424e7b55d9b3e8ef0ba4524a8df3477 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 25 Nov 2024 11:34:15 +0300 Subject: [PATCH 10/11] ppp Signed-off-by: Valeriy Khorunzhin --- images/virt-artifact/patches/024-test.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/images/virt-artifact/patches/024-test.patch b/images/virt-artifact/patches/024-test.patch index 01a09e224..7e94639c3 100644 --- a/images/virt-artifact/patches/024-test.patch +++ b/images/virt-artifact/patches/024-test.patch @@ -1,3 +1,15 @@ +diff --git a/pkg/instancetype/instancetype.go b/pkg/instancetype/instancetype.go +index 6860766acd..f522702f33 100644 +--- a/pkg/instancetype/instancetype.go ++++ b/pkg/instancetype/instancetype.go +@@ -1600,6 +1600,7 @@ func applyFirmwarePreferences(preferenceSpec *instancetypev1beta1.VirtualMachine + if firmware.PreferredUseBiosSerial != nil && vmiFirmware.Bootloader.BIOS != nil && vmiFirmware.Bootloader.BIOS.UseSerial == nil { + vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(*firmware.PreferredUseBiosSerial) + } ++ vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(true) + + if vmiFirmware.Bootloader.EFI == nil && vmiFirmware.Bootloader.BIOS == nil && firmware.PreferredEfi != nil { + vmiFirmware.Bootloader.EFI = firmware.PreferredEfi.DeepCopy() diff --git a/pkg/virt-launcher/virtwrap/converter/converter.go b/pkg/virt-launcher/virtwrap/converter/converter.go index 0565ceb5dd..fae3f33aca 100644 --- a/pkg/virt-launcher/virtwrap/converter/converter.go From 7b83303886735b979e6864f18766d2724a3072a2 Mon Sep 17 00:00:00 2001 From: Valeriy Khorunzhin Date: Mon, 25 Nov 2024 11:39:37 +0300 Subject: [PATCH 11/11] patch Signed-off-by: Valeriy Khorunzhin --- images/virt-artifact/patches/024-test.patch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/images/virt-artifact/patches/024-test.patch b/images/virt-artifact/patches/024-test.patch index 7e94639c3..299a901b7 100644 --- a/images/virt-artifact/patches/024-test.patch +++ b/images/virt-artifact/patches/024-test.patch @@ -1,15 +1,16 @@ diff --git a/pkg/instancetype/instancetype.go b/pkg/instancetype/instancetype.go -index 6860766acd..f522702f33 100644 +index 6860766acd..127ea05475 100644 --- a/pkg/instancetype/instancetype.go +++ b/pkg/instancetype/instancetype.go -@@ -1600,6 +1600,7 @@ func applyFirmwarePreferences(preferenceSpec *instancetypev1beta1.VirtualMachine - if firmware.PreferredUseBiosSerial != nil && vmiFirmware.Bootloader.BIOS != nil && vmiFirmware.Bootloader.BIOS.UseSerial == nil { - vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(*firmware.PreferredUseBiosSerial) +@@ -553,6 +553,8 @@ func (m *InstancetypeMethods) ApplyToVmi(field *k8sfield.Path, instancetypeSpec + conflicts = append(conflicts, applyInstanceTypeAnnotations(instancetypeSpec.Annotations, vmiMetadata)...) } -+ vmiFirmware.Bootloader.BIOS.UseSerial = pointer.P(true) - if vmiFirmware.Bootloader.EFI == nil && vmiFirmware.Bootloader.BIOS == nil && firmware.PreferredEfi != nil { - vmiFirmware.Bootloader.EFI = firmware.PreferredEfi.DeepCopy() ++ vmiSpec.Domain.Firmware.Bootloader.BIOS.UseSerial = pointer.P(true) ++ + if preferenceSpec != nil { + // By design Preferences can't conflict with the VMI so we don't return any + applyCPUPreferences(preferenceSpec, vmiSpec) diff --git a/pkg/virt-launcher/virtwrap/converter/converter.go b/pkg/virt-launcher/virtwrap/converter/converter.go index 0565ceb5dd..fae3f33aca 100644 --- a/pkg/virt-launcher/virtwrap/converter/converter.go