Refactor: Decouple Qemu Internal from pkg/instance
#3377
Conversation
pkg/driver/driver.go
Outdated
| @@ -71,6 +71,8 @@ type Driver interface { | |||
|
|
|||
| // GuestAgentConn returns the guest agent connection, or nil (if forwarded by ssh). | |||
| GuestAgentConn(_ context.Context) (net.Conn, error) | |||
|
|
|||
| CheckBinarySignature(_ context.Context, arch string) error | |||
There was a problem hiding this comment.
This should be probably just merged to the existing Validate() method
There was a problem hiding this comment.
@AkihiroSuda I did what you suggested. What about this?
the "github.com/lima-vm/lima/pkg/qemu" is also present in cmd/limactl/disk.go file and "github.com/lima-vm/lima/pkg/qemu/imgutil" in pkg/store/disk.go file
There was a problem hiding this comment.
The disk image operation seems another aspect and can be visited later.
Rather we should concentrate on decoupling pkg/limayaml from the VM drivers.
Quite complicated though.
pkg/qemu/qemu_driver.go
Outdated
| @@ -50,6 +50,25 @@ func New(driver *driver.BaseDriver) *LimaQemuDriver { | |||
| } | |||
|
|
|||
| func (l *LimaQemuDriver) Validate() error { | |||
| // Ask the user to sign the qemu binary with the "com.apple.security.hypervisor" if needed. | |||
| // Workaround for https://github.com/lima-vm/lima/issues/1742 | |||
| if runtime.GOOS == "darwin" && l.BaseDriver.Instance.VMType == limayaml.QEMU { | |||
There was a problem hiding this comment.
VMType == QEMU is always true here
There was a problem hiding this comment.
Please also squash the commits
pkg/qemu/qemu_driver.go
Outdated
| @@ -411,25 +430,6 @@ func (l *LimaQemuDriver) GuestAgentConn(ctx context.Context) (net.Conn, error) { | |||
| return dialContext, err | |||
| } | |||
|
|
|||
| func (l *LimaQemuDriver) CheckBinarySignature(_ context.Context, arch string) error { | |||
There was a problem hiding this comment.
For readability you can just keep this function with privatization (Check... -> check...), and call it from Validate()
Signed-off-by: Ansuman Sahoo <[email protected]>
unsuman
force-pushed
the
fix/decouple-vm-internals
branch
from
31adc47 to
e1b3f85
Compare
WIP
This PR fixes #1746 by making changes to the Driver interface. I've raised this as a draft PR because the
"github.com/lima-vm/lima/pkg/qemu"is also present incmd/limactl/disk.gofile and"github.com/lima-vm/lima/pkg/qemu/imgutil"inpkg/store/disk.gofile.Should I decouple these too? And more importantly, is my method of decoupling correct?