pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

qemu-nvmm: sync with the latest NVMM



Module Name:	pkgsrc-wip
Committed By:	Maxime Villard <max%m00nbsd.net@localhost>
Pushed By:	maxv
Date:		Sun Oct 27 08:45:53 2019 +0100
Changeset:	2ec16c222d3ef93ba1bdefbfdba8f22580f6c1bb

Modified Files:
	qemu-nvmm/files/target_i386_nvmm-all.c

Log Message:
qemu-nvmm: sync with the latest NVMM

Add an nvmm_init() call.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2ec16c222d3ef93ba1bdefbfdba8f22580f6c1bb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qemu-nvmm/files/target_i386_nvmm-all.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diffs:
diff --git a/qemu-nvmm/files/target_i386_nvmm-all.c b/qemu-nvmm/files/target_i386_nvmm-all.c
index e65d63f8fb..1b4cf778a2 100644
--- a/qemu-nvmm/files/target_i386_nvmm-all.c
+++ b/qemu-nvmm/files/target_i386_nvmm-all.c
@@ -1130,10 +1130,17 @@ nvmm_accel_init(MachineState *ms)
     struct nvmm_capability cap;
     int ret, err;
 
+    ret = nvmm_init();
+    if (ret == -1) {
+        err = errno;
+        error_report("NVMM: Initialization failed, error=%d", errno);
+        return -err;
+    }
+
     ret = nvmm_capability(&cap);
     if (ret == -1) {
         err = errno;
-        error_report("NVMM: No accelerator found, error=%d", errno);
+        error_report("NVMM: Unable to fetch capability, error=%d", errno);
         return -err;
     }
     if (cap.version != 1) {


Home | Main Index | Thread Index | Old Index