Skip to content

Commit

Permalink
lxd: DiskVMVirtiofsdStart usage
Browse files Browse the repository at this point in the history
Signed-off-by: Thomas Parrott <[email protected]>
  • Loading branch information
tomponline committed Jul 22, 2024
1 parent c1d8243 commit b5b3907
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lxd/device/disk.go
Original file line number Diff line number Diff line change
Expand Up @@ -1118,7 +1118,7 @@ func (d *disk) startVM() (*deviceConfig.RunConfig, error) {
logPath := filepath.Join(d.inst.LogPath(), fmt.Sprintf("disk.%s.log", filesystem.PathNameEncode(d.name)))
_ = os.Remove(logPath) // Remove old log if needed.

revertFunc, unixListener, err := DiskVMVirtiofsdStart(d.state.OS.KernelVersion, d.state.OS.ExecPath, d.inst, sockPath, pidPath, logPath, mount.DevPath, rawIDMaps)
revertFunc, unixListener, err := DiskVMVirtiofsdStart(d.state.OS.KernelVersion, d.inst, sockPath, pidPath, logPath, mount.DevPath, rawIDMaps)
if err != nil {
var errUnsupported UnsupportedError
if errors.As(err, &errUnsupported) {
Expand Down
2 changes: 1 addition & 1 deletion lxd/instance/drivers/driver_qemu.go
Original file line number Diff line number Diff line change
Expand Up @@ -1388,7 +1388,7 @@ func (d *qemu) start(stateful bool, op *operationlock.InstanceOperation) error {
// This is used by the lxd-agent in preference to 9p (due to its improved performance) and in scenarios
// where 9p isn't available in the VM guest OS.
configSockPath, configPIDPath := d.configVirtiofsdPaths()
revertFunc, unixListener, err := device.DiskVMVirtiofsdStart(d.state.OS.KernelVersion, d.state.OS.ExecPath, d, configSockPath, configPIDPath, "", configMntPath, nil)
revertFunc, unixListener, err := device.DiskVMVirtiofsdStart(d.state.OS.KernelVersion, d, configSockPath, configPIDPath, "", configMntPath, nil)
if err != nil {
var errUnsupported device.UnsupportedError
if !errors.As(err, &errUnsupported) {
Expand Down

0 comments on commit b5b3907

Please sign in to comment.