From 13da82466aa32ed7da902b53d33c407d535cf3d5 Mon Sep 17 00:00:00 2001 From: Jake Correnti Date: Tue, 25 Jul 2023 16:32:41 -0400 Subject: [PATCH] `Remove`: remove network and ready sockets from registry Signed-off-by: Jake Correnti --- pkg/machine/hyperv/machine.go | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkg/machine/hyperv/machine.go b/pkg/machine/hyperv/machine.go index 4f8ead3815..15a442c6a0 100644 --- a/pkg/machine/hyperv/machine.go +++ b/pkg/machine/hyperv/machine.go @@ -353,6 +353,18 @@ func (m *HyperVMachine) removeFilesAndConnections(files []string) { } } +func (m *HyperVMachine) removeNetworkAndReadySocketsFromRegistry() { + // Remove the HVSOCK for networking + if err := m.NetworkHVSock.Remove(); err != nil { + logrus.Errorf("unable to remove registry entry for %s: %q", m.NetworkHVSock.KeyName, err) + } + + // Remove the HVSOCK for events + if err := m.ReadyHVSock.Remove(); err != nil { + logrus.Errorf("unable to remove registry entry for %s: %q", m.ReadyHVSock.KeyName, err) + } +} + func (m *HyperVMachine) Remove(_ string, opts machine.RemoveOptions) (string, func() error, error) { var ( files []string @@ -384,16 +396,7 @@ func (m *HyperVMachine) Remove(_ string, opts machine.RemoveOptions) (string, fu confirmationMessage += "\n" return confirmationMessage, func() error { m.removeFilesAndConnections(files) - - // Remove the HVSOCK for networking - if err := m.NetworkHVSock.Remove(); err != nil { - logrus.Errorf("unable to remove registry entry for %s: %q", m.NetworkHVSock.KeyName, err) - } - - // Remove the HVSOCK for events - if err := m.ReadyHVSock.Remove(); err != nil { - logrus.Errorf("unable to remove registry entry for %s: %q", m.NetworkHVSock.KeyName, err) - } + m.removeNetworkAndReadySocketsFromRegistry() return vm.Remove(diskPath) }, nil }