Commit 04baa223 authored by Aaron Lewis's avatar Aaron Lewis Committed by Paolo Bonzini
Browse files

selftests: kvm/x86: Add the helper function create_pmu_event_filter



Add a helper function that creates a pmu event filter given an event
list.  Currently, a pmu event filter can only be created with the same
hard coded event list.  Add a way to create one given a different event
list.

Also, rename make_pmu_event_filter to alloc_pmu_event_filter to clarify
it's purpose given the introduction of create_pmu_event_filter.

No functional changes intended.

Signed-off-by: default avatarAaron Lewis <aaronlewis@google.com>
Message-Id: <20220517051238.2566934-2-aaronlewis@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4ac19ead
Loading
Loading
Loading
Loading
+14 −4
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static bool sanity_check_pmu(struct kvm_vm *vm)
	return success;
}

static struct kvm_pmu_event_filter *make_pmu_event_filter(uint32_t nevents)
static struct kvm_pmu_event_filter *alloc_pmu_event_filter(uint32_t nevents)
{
	struct kvm_pmu_event_filter *f;
	int size = sizeof(*f) + nevents * sizeof(f->events[0]);
@@ -220,19 +220,29 @@ static struct kvm_pmu_event_filter *make_pmu_event_filter(uint32_t nevents)
	return f;
}

static struct kvm_pmu_event_filter *event_filter(uint32_t action)

static struct kvm_pmu_event_filter *
create_pmu_event_filter(const uint64_t event_list[],
			int nevents, uint32_t action)
{
	struct kvm_pmu_event_filter *f;
	int i;

	f = make_pmu_event_filter(ARRAY_SIZE(event_list));
	f = alloc_pmu_event_filter(nevents);
	f->action = action;
	for (i = 0; i < ARRAY_SIZE(event_list); i++)
	for (i = 0; i < nevents; i++)
		f->events[i] = event_list[i];

	return f;
}

static struct kvm_pmu_event_filter *event_filter(uint32_t action)
{
	return create_pmu_event_filter(event_list,
				       ARRAY_SIZE(event_list),
				       action);
}

/*
 * Remove the first occurrence of 'event' (if any) from the filter's
 * event list.