qemu-nvmm: improvements

[Maxime Villard <max%m00nbsd.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Maxime Villard <max%m00nbsd.net@localhost>
Pushed By:	maxv
Date:		Sat Dec 29 16:56:58 2018 +0100
Changeset:	6585d78a2528347e8e3d09ebde62860cbe4d6550

Modified Files:
	qemu-nvmm/distinfo
	qemu-nvmm/patches/patch-nvmm-support

Log Message:
qemu-nvmm: improvements

 - Sync with libnvmm, register the callbacks beforehand.
 - Remove unused var in nvmm_handle_msr.
 - Error out if address_space_rw fails.

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

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

diffstat:
 qemu-nvmm/distinfo                   |  2 +-
 qemu-nvmm/patches/patch-nvmm-support | 41 +++++++++++++++++++++++++-----------
 2 files changed, 30 insertions(+), 13 deletions(-)

diffs:
diff --git a/qemu-nvmm/distinfo b/qemu-nvmm/distinfo
index 814c80ce09..0cf87dddaf 100644
--- a/qemu-nvmm/distinfo
+++ b/qemu-nvmm/distinfo
@@ -13,5 +13,5 @@ SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
 SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
 SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
 SHA1 (patch-hw_usb_dev-mtp.c) = 66543b5559d92f8e2fa9a6eb85e5dfe7c1ad3339
-SHA1 (patch-nvmm-support) = a593635800f83081f69cb328c8abf8c0124cd74a
+SHA1 (patch-nvmm-support) = 434efdf8ec5ceb05f42318324d7c3df59a124cfa
 SHA1 (patch-tests_Makefile.include) = 42345d697cb2e324dccf1d68bd8d61e8001c6162
diff --git a/qemu-nvmm/patches/patch-nvmm-support b/qemu-nvmm/patches/patch-nvmm-support
index 172760e153..f3d3220b9a 100644
--- a/qemu-nvmm/patches/patch-nvmm-support
+++ b/qemu-nvmm/patches/patch-nvmm-support
@@ -427,8 +427,8 @@ Add NVMM support.
  obj-$(CONFIG_WHPX) += whpx-all.o
 +obj-$(CONFIG_NVMM) += nvmm-all.o
 --- target/i386/nvmm-all.c	1970-01-01 01:00:00.000000000 +0100
-+++ target/i386/nvmm-all.c	2018-12-15 14:48:22.478267925 +0100
-@@ -0,0 +1,1064 @@
++++ target/i386/nvmm-all.c	2018-12-29 16:39:37.626985638 +0100
+@@ -0,0 +1,1081 @@
 +/*
 + * Copyright (c) 2018 The NetBSD Foundation, Inc.
 + * All rights reserved.
@@ -897,36 +897,51 @@ Add NVMM support.
 +/* -------------------------------------------------------------------------- */
 +
 +static void
++nvmm_io_callback(struct nvmm_io *io)
++{
++	MemTxAttrs attrs = { 0 };
++	int ret;
++
++	ret = address_space_rw(&address_space_io, io->port, attrs, io->data,
++	    io->size, !io->in);
++	if (ret != MEMTX_OK) {
++		error_report("NVMM: I/O Transaction Failed "
++		    "[%s, port=%lu, size=%zu]", (io->in ? "in" : "out"),
++		    io->port, io->size);
++	}
++}
++
++static void
 +nvmm_mem_callback(struct nvmm_mem *mem)
 +{
 +	cpu_physical_memory_rw(mem->gpa, mem->data, mem->size, mem->write);
 +}
++
++static const struct nvmm_callbacks nvmm_callbacks = {
++	.io = nvmm_io_callback,
++	.mem = nvmm_mem_callback
++};
++
++/* -------------------------------------------------------------------------- */
++
 +static int
 +nvmm_handle_mem(struct nvmm_machine *mach, struct nvmm_vcpu *vcpu,
 +    struct nvmm_exit *exit)
 +{
-+	return nvmm_assist_mem(mach, vcpu->cpuid, exit, nvmm_mem_callback);
++	return nvmm_assist_mem(mach, vcpu->cpuid, exit);
 +}
 +
-+static void
-+nvmm_io_callback(struct nvmm_io *io)
-+{
-+	MemTxAttrs attrs = { 0 };
-+	address_space_rw(&address_space_io, io->port, attrs, io->data,
-+	    io->size, !io->in);
-+}
 +static int
 +nvmm_handle_io(struct nvmm_machine *mach, struct nvmm_vcpu *vcpu,
 +    struct nvmm_exit *exit)
 +{
-+	return nvmm_assist_io(mach, vcpu->cpuid, exit, nvmm_io_callback);
++	return nvmm_assist_io(mach, vcpu->cpuid, exit);
 +}
 +
 +static int
 +nvmm_handle_msr(struct nvmm_machine *mach, CPUState *cpu,
 +    struct nvmm_exit *exit)
 +{
-+	struct CPUX86State *env = (CPUArchState *)(cpu->env_ptr);
 +	struct nvmm_vcpu *vcpu = get_nvmm_vcpu(cpu);
 +	X86CPU *x86_cpu = X86_CPU(cpu);
 +	struct nvmm_x64_state state;
@@ -1456,6 +1471,8 @@ Add NVMM support.
 +		return -ENOSPC;
 +	}
 +
++	nvmm_callbacks_register(&nvmm_callbacks);
++
 +	memory_listener_register(&nvmm_memory_listener, &address_space_memory);
 +	ram_block_notifier_add(&nvmm_ram_notifier);
 +