Date: Wed, 21 May 2014 11:31:31 +0200 From: Nils Beyer <nbe@renzel.net> To: freebsd-virtualization@freebsd.org Subject: Re: bhyve: svm (amd-v) update References: <53748481.8010108@FreeBSD.org> <CALnRwMRpwc=DHib%2BeooftCkSP_K6XtVuR11AceDYju=mMBE2%2Bw@mail.gmail.com> <537BC30C.4070208@digiware.nl> <CALnRwMTH=x58VWp731zrbpck5x33VN4AwY85soVfbNvi4m6jNw@mail.gmail.com> <537C5AF0.7070403@digiware.nl>
| previous in thread | raw e-mail | index | archive | help
Hi Willem,
Willem Jan Withagen wrote:
> I'd be interested in the vlapic to if that helps the speed.
> But you can help me a lot if you give me the SVN commands to do what you
> described above.
These were my steps:
0) mv /usr/src /usr/src.bak
1) svnlite co svn://svn.freebsd.org/base/projects/bhyve_svm /usr/src
2) cd /usr/src
3) patch -p4 < /tmp/bhyve_svm_HEAD_r263780.patch
4) svnlite merge svn://svn.freebsd.org/base/head
one conflict in file "amdv.c" - enter "mf" (mine-full); in my previous
post, I mistakenly said "theirs-full"; what is, of course, wrong.
5) manually patch "amdv.c" with:
<----------------------- SNIP ----------------------------->
Index: sys/amd64/vmm/amd/amdv.c
===================================================================
--- sys/amd64/vmm/amd/amdv.c (revision 266491)
+++ sys/amd64/vmm/amd/amdv.c (working copy)
@@ -99,7 +99,7 @@
}
static void
-amd_iommu_add_device(void *domain, int bus, int slot, int func)
+amd_iommu_add_device(void *domain, uint16_t rid)
{
printf("amd_iommu_add_device: not implemented\n");
@@ -106,7 +106,7 @@
}
static void
-amd_iommu_remove_device(void *domain, int bus, int slot, int func)
+amd_iommu_remove_device(void *domain, uint16_t rid)
{
printf("amd_iommu_remove_device: not implemented\n");
<----------------------- SNIP ----------------------------->
6) should be fine now to compile and to integrate your patches
Thanks a lot for your work and regards,
Nils