PERFORCE change 161162 for review

[Marko Zec]

http://perforce.freebsd.org/chv.cgi?CH=161162

Change 161162 by zec at zec_amdx2 on 2009/04/27 08:07:49

	Nuke specialized version of malloc() and free(), which
	were macros anyway.

Affected files ...

.. //depot/projects/vimage/src/sys/kern/kern_vimage.c#81 edit

Differences ...

==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#81 (text+ko) ====

@@ -83,9 +83,6 @@
 #endif
 #endif
 
-#define vi_malloc(addr, type, flags) malloc((addr), (type), (flags))
-#define vi_free(addr, type) free((addr), (type))
-
 #ifndef VIMAGE_GLOBALS
 static TAILQ_HEAD(vnet_modlink_head, vnet_modlink) vnet_modlink_head;
 static TAILQ_HEAD(vnet_modpending_head, vnet_modlink) vnet_modpending_head;
@@ -158,7 +155,7 @@
 	if ((iarg == NULL) ^ (iname == NULL))
 		panic("invalid vnet module instance: %s", vmi->vmi_name);
 
-	vml = vi_malloc(sizeof(struct vnet_modlink), M_VIMAGE, M_NOWAIT);
+	vml = malloc(sizeof(struct vnet_modlink), M_VIMAGE, M_NOWAIT);
 	vml->vml_modinfo = vmi;
 	vml->vml_iarg = iarg;
 	vml->vml_iname = iname;
@@ -246,7 +243,7 @@
 	}
 
 	TAILQ_REMOVE(&vnet_modlink_head, vml, vml_mod_le);
-	vi_free(vml, M_VIMAGE);
+	free(vml, M_VIMAGE);
 }
 
 static int
@@ -308,7 +305,7 @@
 	if (vmi->vmi_size) {
 		if (curvnet->mod_data[vmi->vmi_id] == NULL)
 			panic("vi_destroy: %s\n", vmi->vmi_name);
-		vi_free(curvnet->mod_data[vmi->vmi_id], M_VNET);
+		free(curvnet->mod_data[vmi->vmi_id], M_VNET);
 		curvnet->mod_data[vmi->vmi_id] = NULL;
 	}
 #endif
@@ -715,7 +712,7 @@
 		goto vi_alloc_done;
 	free(vip, M_VIMAGE);
 
-	vip = vi_malloc(sizeof(struct vimage), M_VIMAGE, M_NOWAIT | M_ZERO);
+	vip = malloc(sizeof(struct vimage), M_VIMAGE, M_NOWAIT | M_ZERO);
 	if (vip == NULL)
 		panic("vi_alloc: malloc failed for vimage \"%s\"\n", name);
 	vip->vi_id = last_vi_id++;
@@ -729,20 +726,20 @@
 		panic("there can be only one default vimage!");
 	LIST_INSERT_HEAD(&vimage_head, vip, vi_le);
 
-	vnet = vi_malloc(sizeof(struct vnet), M_VNET, M_NOWAIT | M_ZERO);
+	vnet = malloc(sizeof(struct vnet), M_VNET, M_NOWAIT | M_ZERO);
 	if (vnet == NULL)
 		panic("vi_alloc: malloc failed for vnet \"%s\"\n", name);
 	vip->v_net = vnet;
 	vnet->vnet_id = last_vnet_id++;
 	vnet->vnet_magic_n = VNET_MAGIC_N;
 
-	vprocg = vi_malloc(sizeof(struct vprocg), M_VPROCG, M_NOWAIT | M_ZERO);
+	vprocg = malloc(sizeof(struct vprocg), M_VPROCG, M_NOWAIT | M_ZERO);
 	if (vprocg == NULL)
 		panic("vi_alloc: malloc failed for vprocg \"%s\"\n", name);
 	vip->v_procg = vprocg;
 	vprocg->vprocg_id = last_vprocg_id++;
 
-	vcpu = vi_malloc(sizeof(struct vcpu), M_VCPU, M_NOWAIT | M_ZERO);
+	vcpu = malloc(sizeof(struct vcpu), M_VCPU, M_NOWAIT | M_ZERO);
 	if (vcpu == NULL)
 		panic ("vi_alloc: malloc failed for vcpu \"%s\"\n", name);
 	vip->v_cpu = vcpu;
@@ -842,10 +839,10 @@
 
 	/* hopefully, we are finally OK to free the vnet container itself! */
 	vnet->vnet_magic_n = 0xdeadbeef;
-	vi_free(vnet, M_VNET);
-	vi_free(vprocg, M_VPROCG);
-	vi_free(vcpu, M_VCPU);
-	vi_free(vip, M_VIMAGE);
+	free(vnet, M_VNET);
+	free(vprocg, M_VPROCG);
+	free(vcpu, M_VCPU);
+	free(vip, M_VIMAGE);
 
 	return (0);
 }