Date: Wed, 5 Dec 2018 21:49:39 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r341606 - stable/10/usr.sbin/bhyve Message-ID: <201812052149.wB5LndpM039002@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Wed Dec 5 21:49:39 2018 New Revision: 341606 URL: https://svnweb.freebsd.org/changeset/base/341606 Log: MFC r298454 (araujo): Use MIN()/MAX() macros from sys/param.h. Modified: stable/10/usr.sbin/bhyve/fwctl.c stable/10/usr.sbin/bhyve/pci_ahci.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/bhyve/fwctl.c ============================================================================== --- stable/10/usr.sbin/bhyve/fwctl.c Wed Dec 5 19:53:09 2018 (r341605) +++ stable/10/usr.sbin/bhyve/fwctl.c Wed Dec 5 21:49:39 2018 (r341606) @@ -348,7 +348,7 @@ fwctl_request_data(uint32_t value) /* Make sure remaining size is >= 0 */ rinfo.req_size -= sizeof(uint32_t); - remlen = (rinfo.req_size > 0) ? rinfo.req_size: 0; + remlen = MAX(rinfo.req_size, 0); (*rinfo.req_op->op_data)(value, remlen); Modified: stable/10/usr.sbin/bhyve/pci_ahci.c ============================================================================== --- stable/10/usr.sbin/bhyve/pci_ahci.c Wed Dec 5 19:53:09 2018 (r341605) +++ stable/10/usr.sbin/bhyve/pci_ahci.c Wed Dec 5 21:49:39 2018 (r341606) @@ -798,7 +798,7 @@ read_prdt(struct ahci_port *p, int slot, uint8_t *cfis dbcsz = (prdt->dbc & DBCMASK) + 1; ptr = paddr_guest2host(ahci_ctx(p->pr_sc), prdt->dba, dbcsz); - sublen = len < dbcsz ? len : dbcsz; + sublen = MIN(len, dbcsz); memcpy(to, ptr, sublen); len -= sublen; to += sublen; @@ -912,7 +912,7 @@ write_prdt(struct ahci_port *p, int slot, uint8_t *cfi dbcsz = (prdt->dbc & DBCMASK) + 1; ptr = paddr_guest2host(ahci_ctx(p->pr_sc), prdt->dba, dbcsz); - sublen = len < dbcsz ? len : dbcsz; + sublen = MIN(len, dbcsz); memcpy(ptr, from, sublen); len -= sublen; from += sublen;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812052149.wB5LndpM039002>