Page MenuHomeFreeBSD
Files F163236951

D31051.id.diff
No OneTemporary
Actions

D31051.id.diff
View Options

diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c
--- a/usr.sbin/bhyve/pci_emul.c
+++ b/usr.sbin/bhyve/pci_emul.c
@@ -43,6 +43,7 @@
#include <strings.h>
#include <assert.h>
#include <stdbool.h>
+#include <sysexits.h>
#include <machine/vmm.h>
#include <machine/vmm_snapshot.h>
@@ -110,6 +111,11 @@
#define PCI_EMUL_ECFG_SIZE (MAXBUSES * 1024 * 1024) /* 1MB per bus */
SYSRES_MEM(PCI_EMUL_ECFG_BASE, PCI_EMUL_ECFG_SIZE);
+/*
+ * OVMF always uses 0xC0000000 as base address for 32 bit PCI MMIO. Don't
+ * change this address without changing it in OVMF.
+ */
+#define PCI_EMUL_MEMBASE32 0xC0000000
#define PCI_EMUL_MEMLIMIT32 PCI_EMUL_ECFG_BASE
#define PCI_EMUL_MEMSIZE64 (32*GB)
@@ -1156,8 +1162,11 @@
int bus, slot, func;
int error;
+ if (vm_get_lowmem_limit(ctx) > PCI_EMUL_MEMBASE32)
+ errx(EX_OSERR, "Invalid lowmem limit");
+
pci_emul_iobase = PCI_EMUL_IOBASE;
- pci_emul_membase32 = vm_get_lowmem_limit(ctx);
+ pci_emul_membase32 = PCI_EMUL_MEMBASE32;
pci_emul_membase64 = 4*GB + vm_get_highmem_size(ctx);
pci_emul_membase64 = roundup2(pci_emul_membase64, PCI_EMUL_MEMSIZE64);
@@ -1262,8 +1271,8 @@
/*
* The guest physical memory map looks like the following:
* [0, lowmem) guest system memory
- * [lowmem, lowmem_limit) memory hole (may be absent)
- * [lowmem_limit, 0xE0000000) PCI hole (32-bit BAR allocation)
+ * [lowmem, 0xC0000000) memory hole (may be absent)
+ * [0xC0000000, 0xE0000000) PCI hole (32-bit BAR allocation)
* [0xE0000000, 0xF0000000) PCI extended config window
* [0xF0000000, 4GB) LAPIC, IOAPIC, HPET, firmware
* [4GB, 4GB + highmem)

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 22, 7:47 AM (15 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35320556
Default Alt Text
D31051.id.diff (1 KB)

Event Timeline