Skip to content

Commit be670da

Browse files
bkhizgiyahadas
authored andcommitted
OVA: remove synchronization for firmware detection scanner
Signed-off-by: Bella Khizgiyaev <bkhizgiy@redhat.com>
1 parent b7c2898 commit be670da

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

virt-v2v/cold/entrypoint.go

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -203,18 +203,16 @@ func executeVirtV2v(source string, args []string) error {
203203
v2vCmd.Stderr = writer
204204
defer writer.Close()
205205

206-
done := make(chan error, 1)
207206
if source == OVA {
208207
monitorStdoutPipe, err := monitorCmd.StdoutPipe()
209208
if err != nil {
210209
fmt.Printf("Error setting up stdout pipe: %v\n", err)
211210
return err
212211
}
213212
monitorOut := io.TeeReader(monitorStdoutPipe, os.Stdout)
214-
go parseFirmware(monitorOut, done)
213+
go parseFirmware(monitorOut)
215214
} else {
216215
monitorCmd.Stdout = os.Stdout
217-
done <- nil
218216
}
219217

220218
if err := monitorCmd.Start(); err != nil {
@@ -236,15 +234,10 @@ func executeVirtV2v(source string, args []string) error {
236234
return err
237235
}
238236

239-
if err := <-done; err != nil {
240-
fmt.Printf("Error getting output from monitor command: %v\n", err)
241-
return err
242-
}
243-
244237
return nil
245238
}
246239

247-
func parseFirmware(reader io.Reader, done chan error) {
240+
func parseFirmware(reader io.Reader) {
248241
scanner := bufio.NewScanner(reader)
249242
const maxCapacity = 1024 * 1024
250243
buf := make([]byte, 0, 64*1024)
@@ -257,8 +250,6 @@ func parseFirmware(reader io.Reader, done chan error) {
257250
firmware = "efi"
258251
}
259252
}
260-
261-
done <- scanner.Err()
262253
}
263254

264255
func getXMLFile(dir, fileExtension string) (string, error) {

0 commit comments

Comments
 (0)