instance/driver_qemu: properly calculate VHOST_VSOCK_SET_GUEST_CID #13519
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…GUEST_CID We can't hardcode VHOST_VSOCK_SET_GUEST_CID ioctl() number, because it may be different depending on the platform. Signed-off-by: Alexander Mikhalitsyn <[email protected]>
mihalicyn
changed the title
roosterfish
reviewed
May 31, 2024
| @@ -8093,8 +8105,7 @@ func (d *qemu) acquireVsockID(vsockID uint32) (*os.File, error) { | |||
| // The vsock Context ID cannot be supplied as type uint32. | |||
| vsockIDInt := uint64(vsockID) | |||
|
|
|||
| // 0x4008AF60 = VHOST_VSOCK_SET_GUEST_CID = _IOW(VHOST_VIRTIO, 0x60, __u64) | |||
| _, _, errno := unix.Syscall(unix.SYS_IOCTL, vsockF.Fd(), 0x4008AF60, uintptr(unsafe.Pointer(&vsockIDInt))) | |||
| _, _, errno := unix.Syscall(unix.SYS_IOCTL, vsockF.Fd(), C.VHOST_VSOCK_SET_GUEST_CID, uintptr(unsafe.Pointer(&vsockIDInt))) | |||
There was a problem hiding this comment.
@mihalicyn Nice to know! If I remember correctly I have copied the comment from https://github.com/canonical/lxd/blob/main/lxd/storage/drivers/driver_btrfs_utils.go#L64 back then.
So I guess we should update this line in the Btrfs driver too to get the right platform agnostic number?
There was a problem hiding this comment.
Ah, it is a good point, thanks, Julian! I think I need to fix this too.
cc @simondeziel Simon, do we have any options to test LXD on ppc64le?
There was a problem hiding this comment.
@mihalicyn, ssh [email protected]
ubuntu@P10d-LPAR03:~$ ssh-import-id lp:mihalicyn
2024-05-31 15:55:25,758 INFO Authorized key ['4096', 'SHA256:bwq1dun/CdBl0nXIvP5g+XoRtgj1DekD/0jBH3x6EsM', 'amikhalitsyn', '(RSA)']
2024-05-31 15:55:25,759 INFO [1] SSH keys [Authorized]
Courtesy of Sergio from the server team. We'll need to return it once done with it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…GUEST_CID
We can't hardcode VHOST_VSOCK_SET_GUEST_CID ioctl() number, because it may be different depending on the platform.