mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KVM: Rename KVMState->nr_slots to nr_slots_max

Browse Source 
This value used to reflect the maximum supported memslots from KVM kernel.
Rename it to be clearer.

Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Link: https://lore.kernel.org/r/20240917163835.194664-5-peterx@redhat.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Peter Xu 2024-09-17 12:38:35 -04:00 committed by Paolo Bonzini
parent dbdc00ba5b
commit 943c742868
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
accel/kvm/kvm-all.c
View File

@ -183,8 +183,8 @@ static bool kvm_slots_grow(KVMMemoryListener *kml, unsigned int nr_slots_new)
unsigned int i, cur = kml->nr_slots_allocated; unsigned int i, cur = kml->nr_slots_allocated;
KVMSlot *slots; KVMSlot *slots;
if (nr_slots_new > kvm_state->nr_slots) { if (nr_slots_new > kvm_state->nr_slots_max) {
nr_slots_new = kvm_state->nr_slots; nr_slots_new = kvm_state->nr_slots_max;
} }
if (cur >= nr_slots_new) { if (cur >= nr_slots_new) {
@ -225,7 +225,7 @@ unsigned int kvm_get_max_memslots(void)
{ {
KVMState *s = KVM_STATE(current_accel()); KVMState *s = KVM_STATE(current_accel());
return s->nr_slots; return s->nr_slots_max;
} }
unsigned int kvm_get_free_memslots(void) unsigned int kvm_get_free_memslots(void)
@ -243,7 +243,7 @@ unsigned int kvm_get_free_memslots(void)
} }
kvm_slots_unlock(); kvm_slots_unlock();
return s->nr_slots - used_slots; return s->nr_slots_max - used_slots;
} }
/* Called with KVMMemoryListener.slots_lock held */ /* Called with KVMMemoryListener.slots_lock held */
@ -2611,10 +2611,10 @@ static int kvm_init(MachineState *ms)
(kvm_supported_memory_attributes & KVM_MEMORY_ATTRIBUTE_PRIVATE); (kvm_supported_memory_attributes & KVM_MEMORY_ATTRIBUTE_PRIVATE);
kvm_immediate_exit = kvm_check_extension(s, KVM_CAP_IMMEDIATE_EXIT); kvm_immediate_exit = kvm_check_extension(s, KVM_CAP_IMMEDIATE_EXIT);
s->nr_slots = kvm_check_extension(s, KVM_CAP_NR_MEMSLOTS); s->nr_slots_max = kvm_check_extension(s, KVM_CAP_NR_MEMSLOTS);
/* If unspecified, use the default value */ /* If unspecified, use the default value */
if (!s->nr_slots) { if (!s->nr_slots_max) {
s->nr_slots_max = KVM_MEMSLOTS_NR_MAX_DEFAULT; s->nr_slots_max = KVM_MEMSLOTS_NR_MAX_DEFAULT;
} }

4
include/sysemu/kvm_int.h
View File

@ -103,8 +103,8 @@ struct KVMDirtyRingReaper {
struct KVMState struct KVMState
{ {
AccelState parent_obj; AccelState parent_obj;
/* Max number of KVM slots supported */
int nr_slots; int nr_slots_max;
int fd; int fd;
int vmfd; int vmfd;
int coalesced_mmio; int coalesced_mmio;