From ce1ad06980f78675067a2519a76601cb6cdc692b Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Fri, 28 Jun 2024 13:17:35 +0200 Subject: vm/qemu: use the default vmimpl.Multiplex() function --- vm/qemu/qemu.go | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) (limited to 'vm/qemu') diff --git a/vm/qemu/qemu.go b/vm/qemu/qemu.go index 3749dd317..3a5e9f8a6 100644 --- a/vm/qemu/qemu.go +++ b/vm/qemu/qemu.go @@ -672,34 +672,7 @@ func (inst *instance) Run(timeout time.Duration, stop <-chan bool, command strin return nil, nil, err } wpipe.Close() - errc := make(chan error, 1) - signal := func(err error) { - select { - case errc <- err: - default: - } - } - - go func() { - select { - case <-time.After(timeout): - signal(vmimpl.ErrTimeout) - case <-stop: - signal(vmimpl.ErrTimeout) - case err := <-inst.merger.Err: - cmd.Process.Kill() - if cmdErr := cmd.Wait(); cmdErr == nil { - // If the command exited successfully, we got EOF error from merger. - // But in this case no error has happened and the EOF is expected. - err = nil - } - signal(err) - return - } - cmd.Process.Kill() - cmd.Wait() - }() - return inst.merger.Output, errc, nil + return vmimpl.Multiplex(cmd, inst.merger, nil, timeout, stop, nil, inst.debug) } func (inst *instance) Info() ([]byte, error) { -- cgit mrf-deployment