d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bhyvectl: reduce code duplication

Browse Source 
Combine send_start_checkpoint() and send_start_suspend() into a
single function named snapshot_request().

snapshot_request() is equivalent to send_start_checkpoint() and
send_start_suspend() except that it takes an additional argument. The
additional argument, enum ipc_opcode, is used to determine the type of
snapshot request being performed. Also, switch to using strlcpy instead
of strncpy.

Reviewed by:	jhb
Differential Revision:	https://reviews.freebsd.org/D28878
This commit is contained in:
Robert Wing 2021-02-27 12:05:52 -09:00
parent b7fd9c4e5e
commit da9713917e
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
usr.sbin/bhyvectl/bhyvectl.c
View File

@ -1734,25 +1734,12 @@ send_checkpoint_op_req(struct vmctx *ctx, struct checkpoint_op *op)
}
static int
send_start_checkpoint(struct vmctx *ctx, const char *checkpoint_file)
snapshot_request(struct vmctx *ctx, const char *file, enum ipc_opcode code)
{
struct checkpoint_op op;
op.op = START_CHECKPOINT;
strncpy(op.snapshot_filename, checkpoint_file, MAX_SNAPSHOT_VMNAME);
op.snapshot_filename[MAX_SNAPSHOT_VMNAME - 1] = 0;
return (send_checkpoint_op_req(ctx, &op));
}
static int
send_start_suspend(struct vmctx *ctx, const char *suspend_file)
{
struct checkpoint_op op;
op.op = START_SUSPEND;
strncpy(op.snapshot_filename, suspend_file, MAX_SNAPSHOT_VMNAME);
op.snapshot_filename[MAX_SNAPSHOT_VMNAME - 1] = 0;
op.op = code;
strlcpy(op.snapshot_filename, file, MAX_SNAPSHOT_VMNAME);
return (send_checkpoint_op_req(ctx, &op));
}
@ -2416,10 +2403,10 @@ main(int argc, char *argv[])
#ifdef BHYVE_SNAPSHOT
if (!error && vm_checkpoint_opt)
error = send_start_checkpoint(ctx, checkpoint_file);
error = snapshot_request(ctx, checkpoint_file, START_CHECKPOINT);
if (!error && vm_suspend_opt)
error = send_start_suspend(ctx, suspend_file);
error = snapshot_request(ctx, suspend_file, START_SUSPEND);
#endif
free (opts);