svn commit: r266935 - head/usr.sbin/bhyve

[Neel Natu]

Author: neel
Date: Sun Jun  1 02:47:09 2014
New Revision: 266935
URL: http://svnweb.freebsd.org/changeset/base/266935

Log:
  Use MIN(a,b) from <sys/param.h> instead of rolling our own version.
  
  Pointed out by:	grehan

Modified:
  head/usr.sbin/bhyve/inout.c
  head/usr.sbin/bhyve/pci_virtio_block.c

Modified: head/usr.sbin/bhyve/inout.c
==============================================================================
--- head/usr.sbin/bhyve/inout.c	Sun Jun  1 02:13:07 2014	(r266934)
+++ head/usr.sbin/bhyve/inout.c	Sun Jun  1 02:47:09 2014	(r266935)
@@ -55,10 +55,6 @@ SET_DECLARE(inout_port_set, struct inout
 #define	VERIFY_IOPORT(port, size) \
 	assert((port) >= 0 && (size) > 0 && ((port) + (size)) <= MAX_IOPORTS)
 
-#ifndef min
-#define	min(a, b)	((a) < (b) ? (a) : (b))
-#endif
-
 static struct {
 	const char	*name;
 	int		flags;
@@ -156,7 +152,7 @@ emulate_inout(struct vmctx *ctx, int vcp
 		count = vis->count & vie_size2mask(addrsize);
 
 		/* Limit number of back-to-back in/out emulations to 16 */
-		iterations = min(count, 16);
+		iterations = MIN(count, 16);
 		while (iterations > 0) {
 			if (vie_calculate_gla(vis->paging.cpu_mode,
 			    vis->seg_name, &vis->seg_desc, index, bytes,

Modified: head/usr.sbin/bhyve/pci_virtio_block.c
==============================================================================
--- head/usr.sbin/bhyve/pci_virtio_block.c	Sun Jun  1 02:13:07 2014	(r266934)
+++ head/usr.sbin/bhyve/pci_virtio_block.c	Sun Jun  1 02:47:09 2014	(r266935)
@@ -52,10 +52,6 @@ __FBSDID("$FreeBSD$");
 #include "pci_emul.h"
 #include "virtio.h"
 
-#ifndef min
-#define	min(a, b)	((a) < (b) ? (a) : (b))
-#endif
-
 #define VTBLK_RINGSZ	64
 
 #define VTBLK_MAXSEGS	32
@@ -217,7 +213,7 @@ pci_vtblk_proc(struct pci_vtblk_softc *s
 	case VBH_OP_IDENT:
 		/* Assume a single buffer */
 		strlcpy(iov[1].iov_base, sc->vbsc_ident,
-		    min(iov[1].iov_len, sizeof(sc->vbsc_ident)));
+		    MIN(iov[1].iov_len, sizeof(sc->vbsc_ident)));
 		err = 0;
 		break;
 	default: