D6054.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D6054.diff
View Options

	Index: head/usr.sbin/bhyve/fwctl.c
	===================================================================
	--- head/usr.sbin/bhyve/fwctl.c
	+++ head/usr.sbin/bhyve/fwctl.c
	@@ -348,7 +348,7 @@

	/* 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);

	Index: head/usr.sbin/bhyve/pci_ahci.c
	===================================================================
	--- head/usr.sbin/bhyve/pci_ahci.c
	+++ head/usr.sbin/bhyve/pci_ahci.c
	@@ -741,7 +741,7 @@

	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;
	@@ -847,7 +847,7 @@

	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;