D37170.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D37170.diff
View Options

	diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c
	--- a/sys/amd64/vmm/io/vlapic.c
	+++ b/sys/amd64/vmm/io/vlapic.c
	@@ -905,7 +905,7 @@
	}
	}

	-static VMM_STAT_ARRAY(IPIS_SENT, VM_MAXCPU, "ipis sent to vcpu");
	+static VMM_STAT_ARRAY(IPIS_SENT, VMM_STAT_NELEMS_VCPU, "ipis sent to vcpu");

	static void
	vlapic_set_tpr(struct vlapic *vlapic, uint8_t val)
	diff --git a/sys/amd64/vmm/vmm_stat.h b/sys/amd64/vmm/vmm_stat.h
	--- a/sys/amd64/vmm/vmm_stat.h
	+++ b/sys/amd64/vmm/vmm_stat.h
	@@ -58,6 +58,8 @@

	void vmm_stat_register(void *arg);

	+#define VMM_STAT_NELEMS_VCPU (-1)
	+
	#define VMM_STAT_FDEFINE(type, nelems, desc, func, scope) \
	struct vmm_stat_type type[1] = { \
	{ -1, nelems, desc, func, scope } \
	diff --git a/sys/amd64/vmm/vmm_stat.c b/sys/amd64/vmm/vmm_stat.c
	--- a/sys/amd64/vmm/vmm_stat.c
	+++ b/sys/amd64/vmm/vmm_stat.c
	@@ -70,6 +70,9 @@
	if (vst->scope == VMM_STAT_SCOPE_AMD && !vmm_is_svm())
	return;

	+ if (vst->nelems == VMM_STAT_NELEMS_VCPU)
	+ vst->nelems = VM_MAXCPU;
	+
	if (vst_num_elems + vst->nelems >= MAX_VMM_STAT_ELEMS) {
	printf("Cannot accommodate vmm stat type \"%s\"!\n", vst->desc);
	return;