@@ -203,18 +203,16 @@ func executeVirtV2v(source string, args []string) error {
203
203
v2vCmd .Stderr = writer
204
204
defer writer .Close ()
205
205
206
- done := make (chan error , 1 )
207
206
if source == OVA {
208
207
monitorStdoutPipe , err := monitorCmd .StdoutPipe ()
209
208
if err != nil {
210
209
fmt .Printf ("Error setting up stdout pipe: %v\n " , err )
211
210
return err
212
211
}
213
212
monitorOut := io .TeeReader (monitorStdoutPipe , os .Stdout )
214
- go parseFirmware (monitorOut , done )
213
+ go parseFirmware (monitorOut )
215
214
} else {
216
215
monitorCmd .Stdout = os .Stdout
217
- done <- nil
218
216
}
219
217
220
218
if err := monitorCmd .Start (); err != nil {
@@ -236,15 +234,10 @@ func executeVirtV2v(source string, args []string) error {
236
234
return err
237
235
}
238
236
239
- if err := <- done ; err != nil {
240
- fmt .Printf ("Error getting output from monitor command: %v\n " , err )
241
- return err
242
- }
243
-
244
237
return nil
245
238
}
246
239
247
- func parseFirmware (reader io.Reader , done chan error ) {
240
+ func parseFirmware (reader io.Reader ) {
248
241
scanner := bufio .NewScanner (reader )
249
242
const maxCapacity = 1024 * 1024
250
243
buf := make ([]byte , 0 , 64 * 1024 )
@@ -257,8 +250,6 @@ func parseFirmware(reader io.Reader, done chan error) {
257
250
firmware = "efi"
258
251
}
259
252
}
260
-
261
- done <- scanner .Err ()
262
253
}
263
254
264
255
func getXMLFile (dir , fileExtension string ) (string , error ) {
0 commit comments