diff --git a/hypervisor/dm/vpci/pci_pt.c b/hypervisor/dm/vpci/pci_pt.c
index 01b9d2fb4..34225eb74 100644
--- a/hypervisor/dm/vpci/pci_pt.c
+++ b/hypervisor/dm/vpci/pci_pt.c
@@ -260,31 +260,12 @@ static void vdev_pt_allow_io_vbar(struct pci_vdev *vdev, uint32_t idx)
 	/* For SOS, all port IO access is allowed by default, so skip SOS here */
 	if (!is_sos_vm(vm)) {
 		struct pci_vbar *vbar = &vdev->vbars[idx];
-		if (vbar->base_gpa != 0UL) {
-			allow_guest_pio_access(vm, (uint16_t)vbar->base_gpa, (uint32_t)(vbar->size));
+		if (vbar->base_hpa != 0UL) {
+			allow_guest_pio_access(vm, (uint16_t)vbar->base_hpa, (uint32_t)(vbar->size));
 		}
 	}
 }
 
-/**
- * @brief Deny IO bar access
- * @pre vdev != NULL
- * @pre vdev->vpci != NULL
- */
-static void vdev_pt_deny_io_vbar(struct pci_vdev *vdev, uint32_t idx)
-{
-	struct acrn_vm *vm = vpci2vm(vdev->vpci);
-
-	/* For SOS, all port IO access is allowed by default, so skip SOS here */
-	if (!is_sos_vm(vm)) {
-		struct pci_vbar *vbar = &vdev->vbars[idx];
-		if (vbar->base_gpa != 0UL) {
-			deny_guest_pio_access(vm, (uint16_t)(vbar->base_gpa), (uint32_t)(vbar->size));
-		}
-
-	}
-}
-
 /**
  * @pre vdev != NULL
  */
@@ -293,7 +274,7 @@ void vdev_pt_write_vbar(struct pci_vdev *vdev, uint32_t idx, uint32_t val)
 	struct pci_vbar *vbar = &vdev->vbars[idx];
 
 	if (is_pci_io_bar(vbar)) {
-		vpci_update_one_vbar(vdev, idx, val, vdev_pt_allow_io_vbar, vdev_pt_deny_io_vbar);
+		vpci_update_one_vbar(vdev, idx, val, NULL, NULL);
 	} else if (is_pci_mem_bar(vbar)) {
 		vpci_update_one_vbar(vdev, idx, val, vdev_pt_map_mem_vbar, vdev_pt_unmap_mem_vbar);
 	}
@@ -426,6 +407,10 @@ static void init_bars(struct pci_vdev *vdev, bool is_sriov_bar)
 				if (!is_sriov_bar) {
 					pci_vdev_write_vbar(vdev, idx, lo);
 				}
+
+				if (is_pci_io_bar(vbar)) {
+					vdev_pt_allow_io_vbar(vdev, idx);
+				}
 			}
 		}
 	}
diff --git a/hypervisor/dm/vpci/vpci.c b/hypervisor/dm/vpci/vpci.c
index 73b7fcb9e..8e7db822a 100644
--- a/hypervisor/dm/vpci/vpci.c
+++ b/hypervisor/dm/vpci/vpci.c
@@ -784,9 +784,6 @@ int32_t vpci_deassign_pcidev(struct acrn_vm *tgt_vm, struct acrn_pcidev *pcidev)
 	return ret;
 }
 
-/*
- * @pre unmap_cb != NULL
- */
 void vpci_update_one_vbar(struct pci_vdev *vdev, uint32_t bar_idx, uint32_t val,
 		map_pcibar map_cb, unmap_pcibar unmap_cb)
 {
@@ -796,7 +793,9 @@ void vpci_update_one_vbar(struct pci_vdev *vdev, uint32_t bar_idx, uint32_t val,
 	if (vbar->is_mem64hi) {
 		update_idx -= 1U;
 	}
-	unmap_cb(vdev, update_idx);
+	if (unmap_cb != NULL) {
+		unmap_cb(vdev, update_idx);
+	}
 	pci_vdev_write_vbar(vdev, bar_idx, val);
 	if ((map_cb != NULL) && (vdev->vbars[update_idx].base_gpa != 0UL)) {
 		map_cb(vdev, update_idx);