Page MenuHomeFreeBSD
Files F107199147

D37653.diff
No OneTemporary
Actions

D37653.diff
View Options

diff --git a/usr.sbin/bhyve/atkbdc.c b/usr.sbin/bhyve/atkbdc.c
--- a/usr.sbin/bhyve/atkbdc.c
+++ b/usr.sbin/bhyve/atkbdc.c
@@ -307,7 +307,7 @@
}
static int
-atkbdc_data_handler(struct vmctx *ctx __unused, int vcpu __unused, int in,
+atkbdc_data_handler(struct vmctx *ctx __unused, int in,
int port __unused, int bytes, uint32_t *eax, void *arg)
{
struct atkbdc_softc *sc;
@@ -393,7 +393,7 @@
}
static int
-atkbdc_sts_ctl_handler(struct vmctx *ctx, int vcpu __unused, int in,
+atkbdc_sts_ctl_handler(struct vmctx *ctx, int in,
int port __unused, int bytes, uint32_t *eax, void *arg)
{
struct atkbdc_softc *sc;
diff --git a/usr.sbin/bhyve/fwctl.c b/usr.sbin/bhyve/fwctl.c
--- a/usr.sbin/bhyve/fwctl.c
+++ b/usr.sbin/bhyve/fwctl.c
@@ -516,7 +516,7 @@
}
static int
-fwctl_handler(struct vmctx *ctx __unused, int vcpu __unused, int in,
+fwctl_handler(struct vmctx *ctx __unused, int in,
int port __unused, int bytes, uint32_t *eax, void *arg __unused)
{
diff --git a/usr.sbin/bhyve/inout.h b/usr.sbin/bhyve/inout.h
--- a/usr.sbin/bhyve/inout.h
+++ b/usr.sbin/bhyve/inout.h
@@ -39,7 +39,7 @@
/*
* inout emulation handlers return 0 on success and -1 on failure.
*/
-typedef int (*inout_func_t)(struct vmctx *ctx, int vcpu, int in, int port,
+typedef int (*inout_func_t)(struct vmctx *ctx, int in, int port,
int bytes, uint32_t *eax, void *arg);
struct inout_port {
diff --git a/usr.sbin/bhyve/inout.c b/usr.sbin/bhyve/inout.c
--- a/usr.sbin/bhyve/inout.c
+++ b/usr.sbin/bhyve/inout.c
@@ -66,7 +66,7 @@
} inout_handlers[MAX_IOPORTS];
static int
-default_inout(struct vmctx *ctx __unused, int vcpu __unused, int in,
+default_inout(struct vmctx *ctx __unused, int in,
int port __unused, int bytes, uint32_t *eax, void *arg __unused)
{
if (in) {
@@ -186,7 +186,7 @@
if (!in)
vm_copyin(iov, &val, bytes);
- retval = handler(ctx, vcpu, in, port, bytes, &val, arg);
+ retval = handler(ctx, in, port, bytes, &val, arg);
if (retval != 0)
break;
@@ -225,7 +225,7 @@
} else {
eax = vmexit->u.inout.eax;
val = eax & vie_size2mask(bytes);
- retval = handler(ctx, vcpu, in, port, bytes, &val, arg);
+ retval = handler(ctx, in, port, bytes, &val, arg);
if (retval == 0 && in) {
eax &= ~vie_size2mask(bytes);
eax |= val & vie_size2mask(bytes);
diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c
--- a/usr.sbin/bhyve/pci_emul.c
+++ b/usr.sbin/bhyve/pci_emul.c
@@ -447,7 +447,7 @@
}
static int
-pci_emul_io_handler(struct vmctx *ctx, int vcpu __unused, int in, int port,
+pci_emul_io_handler(struct vmctx *ctx, int in, int port,
int bytes, uint32_t *eax, void *arg)
{
struct pci_devinst *pdi = arg;
@@ -2217,7 +2217,7 @@
static int cfgenable, cfgbus, cfgslot, cfgfunc, cfgoff;
static int
-pci_emul_cfgaddr(struct vmctx *ctx __unused, int vcpu __unused, int in,
+pci_emul_cfgaddr(struct vmctx *ctx __unused, int in,
int port __unused, int bytes, uint32_t *eax, void *arg __unused)
{
uint32_t x;
@@ -2247,7 +2247,7 @@
INOUT_PORT(pci_cfgaddr, CONF1_ADDR_PORT, IOPORT_F_INOUT, pci_emul_cfgaddr);
static int
-pci_emul_cfgdata(struct vmctx *ctx, int vcpu __unused, int in, int port,
+pci_emul_cfgdata(struct vmctx *ctx, int in, int port,
int bytes, uint32_t *eax, void *arg __unused)
{
int coff;
diff --git a/usr.sbin/bhyve/pci_lpc.c b/usr.sbin/bhyve/pci_lpc.c
--- a/usr.sbin/bhyve/pci_lpc.c
+++ b/usr.sbin/bhyve/pci_lpc.c
@@ -180,7 +180,7 @@
}
static int
-lpc_uart_io_handler(struct vmctx *ctx __unused, int vcpu __unused, int in,
+lpc_uart_io_handler(struct vmctx *ctx __unused, int in,
int port, int bytes, uint32_t *eax, void *arg)
{
int offset;
diff --git a/usr.sbin/bhyve/pctestdev.c b/usr.sbin/bhyve/pctestdev.c
--- a/usr.sbin/bhyve/pctestdev.c
+++ b/usr.sbin/bhyve/pctestdev.c
@@ -72,14 +72,14 @@
static uint8_t pctestdev_iomem_buf[IOMEM_LEN];
static uint32_t pctestdev_ioport_data;
-static int pctestdev_debugexit_io(struct vmctx *ctx, int vcpu, int in,
+static int pctestdev_debugexit_io(struct vmctx *ctx, int in,
int port, int bytes, uint32_t *eax, void *arg);
static int pctestdev_iomem_io(struct vmctx *ctx, int vcpu, int dir,
uint64_t addr, int size, uint64_t *val, void *arg1,
long arg2);
-static int pctestdev_ioport_io(struct vmctx *ctx, int vcpu, int in,
+static int pctestdev_ioport_io(struct vmctx *ctx, int in,
int port, int bytes, uint32_t *eax, void *arg);
-static int pctestdev_irq_io(struct vmctx *ctx, int vcpu, int in,
+static int pctestdev_irq_io(struct vmctx *ctx, int in,
int port, int bytes, uint32_t *eax, void *arg);
const char *
@@ -178,7 +178,7 @@
}
static int
-pctestdev_debugexit_io(struct vmctx *ctx __unused, int vcpu __unused, int in,
+pctestdev_debugexit_io(struct vmctx *ctx __unused, int in,
int port __unused, int bytes __unused, uint32_t *eax, void *arg __unused)
{
if (in)
@@ -211,7 +211,7 @@
}
static int
-pctestdev_ioport_io(struct vmctx *ctx __unused, int vcpu __unused, int in,
+pctestdev_ioport_io(struct vmctx *ctx __unused, int in,
int port, int bytes, uint32_t *eax, void *arg __unused)
{
uint32_t mask;
@@ -234,7 +234,7 @@
}
static int
-pctestdev_irq_io(struct vmctx *ctx, int vcpu __unused, int in, int port,
+pctestdev_irq_io(struct vmctx *ctx, int in, int port,
int bytes, uint32_t *eax, void *arg __unused)
{
int irq;
diff --git a/usr.sbin/bhyve/pm.c b/usr.sbin/bhyve/pm.c
--- a/usr.sbin/bhyve/pm.c
+++ b/usr.sbin/bhyve/pm.c
@@ -60,7 +60,7 @@
* reset.
*/
static int
-reset_handler(struct vmctx *ctx __unused, int vcpu __unused, int in,
+reset_handler(struct vmctx *ctx __unused, int in,
int port __unused, int bytes, uint32_t *eax, void *arg __unused)
{
int error;
@@ -158,7 +158,7 @@
}
static int
-pm1_status_handler(struct vmctx *ctx, int vcpu __unused, int in,
+pm1_status_handler(struct vmctx *ctx, int in,
int port __unused, int bytes, uint32_t *eax, void *arg __unused)
{
@@ -182,7 +182,7 @@
}
static int
-pm1_enable_handler(struct vmctx *ctx, int vcpu __unused, int in,
+pm1_enable_handler(struct vmctx *ctx, int in,
int port __unused, int bytes, uint32_t *eax, void *arg __unused)
{
@@ -235,7 +235,7 @@
#define PM1_ALWAYS_ZERO 0xc003
static int
-pm1_control_handler(struct vmctx *ctx, int vcpu __unused, int in,
+pm1_control_handler(struct vmctx *ctx, int in,
int port __unused, int bytes, uint32_t *eax, void *arg __unused)
{
int error;
@@ -285,7 +285,7 @@
}
static int
-gpe0_sts(struct vmctx *ctx, int vcpu __unused, int in, int port __unused,
+gpe0_sts(struct vmctx *ctx, int in, int port __unused,
int bytes, uint32_t *eax, void *arg __unused)
{
/*
@@ -309,7 +309,7 @@
INOUT_PORT(gpe0_sts, IO_GPE0_STS, IOPORT_F_INOUT, gpe0_sts);
static int
-gpe0_en(struct vmctx *ctx, int vcpu __unused, int in, int port __unused,
+gpe0_en(struct vmctx *ctx, int in, int port __unused,
int bytes, uint32_t *eax, void *arg __unused)
{
if (bytes != 1)
@@ -333,7 +333,7 @@
* This write-only register is used to enable and disable ACPI.
*/
static int
-smi_cmd_handler(struct vmctx *ctx, int vcpu __unused, int in, int port __unused,
+smi_cmd_handler(struct vmctx *ctx, int in, int port __unused,
int bytes, uint32_t *eax, void *arg __unused)
{
diff --git a/usr.sbin/bhyve/post.c b/usr.sbin/bhyve/post.c
--- a/usr.sbin/bhyve/post.c
+++ b/usr.sbin/bhyve/post.c
@@ -39,7 +39,7 @@
#include "pci_lpc.h"
static int
-post_data_handler(struct vmctx *ctx __unused, int vcpu __unused, int in,
+post_data_handler(struct vmctx *ctx __unused, int in,
int port __unused, int bytes, uint32_t *eax, void *arg __unused)
{
assert(in == 1);
diff --git a/usr.sbin/bhyve/vga.c b/usr.sbin/bhyve/vga.c
--- a/usr.sbin/bhyve/vga.c
+++ b/usr.sbin/bhyve/vga.c
@@ -1215,7 +1215,7 @@
}
static int
-vga_port_handler(struct vmctx *ctx, int vcpu __unused, int in, int port,
+vga_port_handler(struct vmctx *ctx, int in, int port,
int bytes, uint32_t *eax, void *arg)
{
uint8_t val;

File Metadata

Mime Type
text/plain
Expires
Sun, Jan 12, 1:38 PM (20 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15769792
Default Alt Text
D37653.diff (7 KB)

Event Timeline