Page MenuHomeFreeBSD
Files F102162063

D41286.diff
No OneTemporary
Actions

D41286.diff
View Options

diff --git a/usr.sbin/bhyve/amd64/fwctl.c b/usr.sbin/bhyve/amd64/fwctl.c
--- a/usr.sbin/bhyve/amd64/fwctl.c
+++ b/usr.sbin/bhyve/amd64/fwctl.c
@@ -63,8 +63,7 @@
* Back-end state-machine
*/
static enum state {
- IDENT_WAIT,
- IDENT_SEND,
+ IDENT,
REQ,
RESP
} be_state;
@@ -75,7 +74,7 @@
struct op_info {
int op;
int (*op_start)(uint32_t len);
- void (*op_data)(uint32_t data, uint32_t len);
+ void (*op_data)(uint32_t data);
int (*op_result)(struct iovec **data);
void (*op_done)(struct iovec *data);
};
@@ -120,7 +119,7 @@
}
static void
-errop_data(uint32_t data __unused, uint32_t len __unused)
+errop_data(uint32_t data __unused)
{
/* ignore */
@@ -192,7 +191,7 @@
}
static void
-fget_data(uint32_t data, uint32_t len __unused)
+fget_data(uint32_t data)
{
assert(fget_cnt + sizeof(uint32_t) <= sizeof(fget_str));
@@ -347,7 +346,7 @@
else
rinfo.req_size -= sizeof(uint32_t);
- (*rinfo.req_op->op_data)(value, rinfo.req_size);
+ (*rinfo.req_op->op_data)(value);
if (rinfo.req_size < sizeof(uint32_t)) {
fwctl_request_done();
@@ -360,7 +359,6 @@
static int
fwctl_request(uint32_t value)
{
-
int ret;
ret = 0;
@@ -451,12 +449,11 @@
/* Discard partially-received request. */
memset(&rinfo, 0, sizeof(rinfo));
break;
- case IDENT_WAIT:
- case IDENT_SEND:
+ case IDENT:
break;
}
- be_state = IDENT_SEND;
+ be_state = IDENT;
ident_idx = 0;
}
@@ -472,7 +469,7 @@
retval = 0xff;
switch (be_state) {
- case IDENT_SEND:
+ case IDENT:
retval = sig[ident_idx++];
if (ident_idx >= sizeof(sig))
be_state = REQ;
@@ -580,5 +577,5 @@
ops[OP_GET_LEN] = &fgetlen_info;
ops[OP_GET] = &fgetval_info;
- be_state = IDENT_WAIT;
+ be_state = IDENT;
}

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 9, 9:31 AM (21 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14555474
Default Alt Text
D41286.diff (1 KB)

Event Timeline