At 09/21/2012 07:20 PM, Vasilis Liaskovitis Wrote: > Initialize the 32-bit and 64-bit pci starting offsets from values passed in by > the qemu paravirt interface QEMU_CFG_PCI_WINDOW. Qemu calculates the starting > offsets based on initial memory and hotplug-able dimms.
This patch can't be applied if I apply the other patches for seabios. And I don't find this patch in your tree. Thanks Wen Congyang > > Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovi...@profitbricks.com> > --- > src/paravirt.c | 6 ++++++ > src/paravirt.h | 2 ++ > src/pciinit.c | 5 ++--- > 3 files changed, 10 insertions(+), 3 deletions(-) > > diff --git a/src/paravirt.c b/src/paravirt.c > index 2a98d53..390ef30 100644 > --- a/src/paravirt.c > +++ b/src/paravirt.c > @@ -346,3 +346,9 @@ void qemu_cfg_romfile_setup(void) > dprintf(3, "Found fw_cfg file: %s (size=%d)\n", file->name, > file->size); > } > } > + > +void qemu_cfg_get_pci_offsets(u64 *pcimem_start, u64 *pcimem64_start) > +{ > + qemu_cfg_read_entry(pcimem_start, QEMU_CFG_PCI_WINDOW, sizeof(u64)); > + qemu_cfg_read((u8*)(pcimem64_start), sizeof(u64)); > +} > diff --git a/src/paravirt.h b/src/paravirt.h > index a284c41..b53ff88 100644 > --- a/src/paravirt.h > +++ b/src/paravirt.h > @@ -35,6 +35,7 @@ static inline int kvm_para_available(void) > #define QEMU_CFG_BOOT_MENU 0x0e > #define QEMU_CFG_MAX_CPUS 0x0f > #define QEMU_CFG_FILE_DIR 0x19 > +#define QEMU_CFG_PCI_WINDOW 0x1a > #define QEMU_CFG_ARCH_LOCAL 0x8000 > #define QEMU_CFG_ACPI_TABLES (QEMU_CFG_ARCH_LOCAL + 0) > #define QEMU_CFG_SMBIOS_ENTRIES (QEMU_CFG_ARCH_LOCAL + 1) > @@ -65,5 +66,6 @@ struct e820_reservation { > u32 qemu_cfg_e820_entries(void); > void* qemu_cfg_e820_load_next(void *addr); > void qemu_cfg_romfile_setup(void); > +void qemu_cfg_get_pci_offsets(u64 *pcimem_start, u64 *pcimem64_start); > > #endif > diff --git a/src/pciinit.c b/src/pciinit.c > index 68f302a..64468a0 100644 > --- a/src/pciinit.c > +++ b/src/pciinit.c > @@ -592,8 +592,7 @@ static void pci_region_map_entries(struct pci_bus > *busses, struct pci_region *r) > > static void pci_bios_map_devices(struct pci_bus *busses) > { > - pcimem_start = RamSize; > - > + qemu_cfg_get_pci_offsets(&pcimem_start, &pcimem64_start); > if (pci_bios_init_root_regions(busses)) { > struct pci_region r64_mem, r64_pref; > r64_mem.list = NULL; > @@ -611,7 +610,7 @@ static void pci_bios_map_devices(struct pci_bus *busses) > u64 align_mem = pci_region_align(&r64_mem); > u64 align_pref = pci_region_align(&r64_pref); > > - r64_mem.base = ALIGN(0x100000000LL + RamSizeOver4G, align_mem); > + r64_mem.base = ALIGN(pcimem64_start, align_mem); > r64_pref.base = ALIGN(r64_mem.base + sum_mem, align_pref); > pcimem64_start = r64_mem.base; > pcimem64_end = r64_pref.base + sum_pref; -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html