Skip to content

Commit 30ee198

Browse files
martinezjavierbonzini
authored andcommitted
KVM: Reference to kvm_userspace_memory_region in doc and comments
There are still references to the removed kvm_memory_region data structure but the doc and comments should mention struct kvm_userspace_memory_region instead, since that is what's used by the ioctl that replaced the old one and this data structure support the same set of flags. Signed-off-by: Javier Martinez Canillas <[email protected]> Message-Id: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 66a9221 commit 30ee198

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

Documentation/virt/kvm/api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1309,7 +1309,7 @@ yet and must be cleared on entry.
13091309
__u64 userspace_addr; /* start of the userspace allocated memory */
13101310
};
13111311

1312-
/* for kvm_memory_region::flags */
1312+
/* for kvm_userspace_memory_region::flags */
13131313
#define KVM_MEM_LOG_DIRTY_PAGES (1UL << 0)
13141314
#define KVM_MEM_READONLY (1UL << 1)
13151315

include/linux/kvm_host.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
#endif
5151

5252
/*
53-
* The bit 16 ~ bit 31 of kvm_memory_region::flags are internally used
54-
* in kvm, other bits are visible for userspace which are defined in
53+
* The bit 16 ~ bit 31 of kvm_userspace_memory_region::flags are internally
54+
* used in kvm, other bits are visible for userspace which are defined in
5555
* include/linux/kvm_h.
5656
*/
5757
#define KVM_MEMSLOT_INVALID (1UL << 16)

include/uapi/linux/kvm.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ struct kvm_userspace_memory_region {
9696
};
9797

9898
/*
99-
* The bit 0 ~ bit 15 of kvm_memory_region::flags are visible for userspace,
100-
* other bits are reserved for kvm internal use which are defined in
101-
* include/linux/kvm_host.h.
99+
* The bit 0 ~ bit 15 of kvm_userspace_memory_region::flags are visible for
100+
* userspace, other bits are reserved for kvm internal use which are defined
101+
* in include/linux/kvm_host.h.
102102
*/
103103
#define KVM_MEM_LOG_DIRTY_PAGES (1UL << 0)
104104
#define KVM_MEM_READONLY (1UL << 1)

tools/include/uapi/linux/kvm.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ struct kvm_userspace_memory_region {
9696
};
9797

9898
/*
99-
* The bit 0 ~ bit 15 of kvm_memory_region::flags are visible for userspace,
100-
* other bits are reserved for kvm internal use which are defined in
101-
* include/linux/kvm_host.h.
99+
* The bit 0 ~ bit 15 of kvm_userspace_memory_region::flags are visible for
100+
* userspace, other bits are reserved for kvm internal use which are defined
101+
*in include/linux/kvm_host.h.
102102
*/
103103
#define KVM_MEM_LOG_DIRTY_PAGES (1UL << 0)
104104
#define KVM_MEM_READONLY (1UL << 1)

0 commit comments

Comments
 (0)