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

[Tycho Nightingale]

Author: tychon
Date: Mon Jun  9 19:55:50 2014
New Revision: 267294
URL: http://svnweb.freebsd.org/changeset/base/267294

Log:
  r267169 should apply to 64-bit BARs as well.
  
  Reviewed by:	neel

Modified:
  head/usr.sbin/bhyve/pci_emul.c

Modified: head/usr.sbin/bhyve/pci_emul.c
==============================================================================
--- head/usr.sbin/bhyve/pci_emul.c	Mon Jun  9 19:36:08 2014	(r267293)
+++ head/usr.sbin/bhyve/pci_emul.c	Mon Jun  9 19:55:50 2014	(r267294)
@@ -376,7 +376,7 @@ pci_emul_mem_handler(struct vmctx *ctx, 
 	offset = addr - pdi->pi_bar[bidx].addr;
 
 	if (dir == MEM_F_WRITE) {
-		if (pdi->pi_bar[bidx].type == PCIBAR_MEM32 && size == 8) {
+		if (size == 8) {
 			(*pe->pe_barwrite)(ctx, vcpu, pdi, bidx, offset,
 					   4, *val & 0xffffffff);
 			(*pe->pe_barwrite)(ctx, vcpu, pdi, bidx, offset + 4,
@@ -386,7 +386,7 @@ pci_emul_mem_handler(struct vmctx *ctx, 
 					   size, *val);
 		}
 	} else {
-		if (pdi->pi_bar[bidx].type == PCIBAR_MEM32 && size == 8) {
+		if (size == 8) {
 			*val = (*pe->pe_barread)(ctx, vcpu, pdi, bidx,
 						 offset, 4);
 			*val |= (*pe->pe_barread)(ctx, vcpu, pdi, bidx,