From 508eb929a88e6ec39e5ed5058e9ab228c9746911 Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Thu, 18 Dec 2014 13:02:03 +0100 Subject: [PATCH] Re-enable rumphyper_pci and PCI passthrough libs. Fixed by adding relevant symbols to minios global namespace. Compile tested only. Signed-off-by: Martin Lucina --- Makefile | 7 ++----- rumphyper_pci.c | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 4b7e8df..3c9bcbd 100644 --- a/Makefile +++ b/Makefile @@ -24,9 +24,7 @@ ifeq ($(TARGET_ARCH),x86_64) CFLAGS += -m64 -mno-red-zone -fno-reorder-blocks -fno-asynchronous-unwind-tables endif -# TODO: This was never actually enabled in previous builds(?) and needs more -# symbols from Mini-OS. -# RUMP_LIBS_PCI = -lrumpdev_pci -lrumpdev_pci_if_wm -lrumpdev_miiphy +RUMP_LIBS_PCI = -lrumpdev_pci -lrumpdev_pci_if_wm -lrumpdev_miiphy RUMP_LIBS_FS = -lrumpfs_ffs -lrumpfs_cd9660 -lrumpdev_disk -lrumpdev -lrumpvfs RUMP_LIBS_NET = -lrumpnet_config -lrumpdev_bpf -lrumpnet_xenif -lrumpnet_netinet RUMP_LIBS_NET+= -lrumpnet_net -lrumpxen_xendev -lrumpnet @@ -45,8 +43,7 @@ rump-src-y += lib/_lwp.c rump-src-y += rumphyper_base.c rump-src-y += rumphyper_net.c -# TODO: See above. -# rump-src-y += rumphyper_pci.c +rump-src-y += rumphyper_pci.c rump-src-y += rumphyper_synch.c rump-src-y += rumphyper_stubs.c diff --git a/rumphyper_pci.c b/rumphyper_pci.c index 85a52aa..68377dc 100644 --- a/rumphyper_pci.c +++ b/rumphyper_pci.c @@ -39,7 +39,7 @@ void * rumpcomp_pci_map(unsigned long addr, unsigned long len) { - return ioremap_nocache(addr, len); + return minios_ioremap_nocache(addr, len); } int @@ -123,7 +123,7 @@ rumpcomp_pci_dmalloc(size_t size, size_t align, for (i = 0; size >> (i + PAGE_SHIFT); i++) continue; - va = alloc_contig_pages(i, 0); /* XXX: MD interface */ + va = minios_alloc_contig_pages(i, 0); /* XXX: MD interface */ *vap = (uintptr_t)va; *pap = virt_to_mach(va); -- 2.39.5