Page MenuHomeFreeBSD
Files F156682825

D34290.diff
No OneTemporary
Actions

D34290.diff
View Options

diff --git a/lib/libvmmapi/vmmapi.h b/lib/libvmmapi/vmmapi.h
--- a/lib/libvmmapi/vmmapi.h
+++ b/lib/libvmmapi/vmmapi.h
@@ -133,7 +133,7 @@
void vm_set_lowmem_limit(struct vmctx *ctx, uint32_t limit);
void vm_set_memflags(struct vmctx *ctx, int flags);
int vm_get_memflags(struct vmctx *ctx);
-int vm_get_name(struct vmctx *ctx, char *buffer, size_t max_len);
+const char *vm_get_name(struct vmctx *ctx);
size_t vm_get_lowmem_size(struct vmctx *ctx);
size_t vm_get_highmem_size(struct vmctx *ctx);
int vm_set_desc(struct vmctx *ctx, int vcpu, int reg,
diff --git a/lib/libvmmapi/vmmapi.c b/lib/libvmmapi/vmmapi.c
--- a/lib/libvmmapi/vmmapi.c
+++ b/lib/libvmmapi/vmmapi.c
@@ -496,14 +496,11 @@
return ((vm_paddr_t)-1);
}
-/* TODO: maximum size for vmname */
-int
-vm_get_name(struct vmctx *ctx, char *buf, size_t max_len)
+const char *
+vm_get_name(struct vmctx *ctx)
{
- if (strlcpy(buf, ctx->name, max_len) >= max_len)
- return (EINVAL);
- return (0);
+ return (ctx->name);
}
size_t
diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c
--- a/usr.sbin/bhyve/snapshot.c
+++ b/usr.sbin/bhyve/snapshot.c
@@ -1123,28 +1123,15 @@
static int
vm_snapshot_basic_metadata(struct vmctx *ctx, xo_handle_t *xop, size_t memsz)
{
- int error;
- int memflags;
- char vmname_buf[MAX_VMNAME];
-
- memset(vmname_buf, 0, MAX_VMNAME);
- error = vm_get_name(ctx, vmname_buf, MAX_VMNAME - 1);
- if (error != 0) {
- perror("Failed to get VM name");
- goto err;
- }
-
- memflags = vm_get_memflags(ctx);
xo_open_container_h(xop, JSON_BASIC_METADATA_KEY);
xo_emit_h(xop, "{:" JSON_NCPUS_KEY "/%ld}\n", guest_ncpus);
- xo_emit_h(xop, "{:" JSON_VMNAME_KEY "/%s}\n", vmname_buf);
+ xo_emit_h(xop, "{:" JSON_VMNAME_KEY "/%s}\n", vm_get_name(ctx));
xo_emit_h(xop, "{:" JSON_MEMSIZE_KEY "/%lu}\n", memsz);
- xo_emit_h(xop, "{:" JSON_MEMFLAGS_KEY "/%d}\n", memflags);
+ xo_emit_h(xop, "{:" JSON_MEMFLAGS_KEY "/%d}\n", vm_get_memflags(ctx));
xo_close_container_h(xop, JSON_BASIC_METADATA_KEY);
-err:
- return (error);
+ return (0);
}
static int
@@ -1518,7 +1505,6 @@
struct sockaddr_un addr;
int socket_fd;
pthread_t checkpoint_pthread;
- char vmname_buf[MAX_VMNAME];
int err;
memset(&addr, 0, sizeof(addr));
@@ -1532,14 +1518,8 @@
addr.sun_family = AF_UNIX;
- err = vm_get_name(ctx, vmname_buf, MAX_VMNAME - 1);
- if (err != 0) {
- perror("Failed to get VM name");
- goto fail;
- }
-
snprintf(addr.sun_path, sizeof(addr.sun_path), "%s%s",
- BHYVE_RUN_DIR, vmname_buf);
+ BHYVE_RUN_DIR, vm_get_name(ctx));
addr.sun_len = SUN_LEN(&addr);
unlink(addr.sun_path);

File Metadata

Mime Type
text/plain
Expires
Sat, May 16, 4:12 PM (6 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33137157
Default Alt Text
D34290.diff (2 KB)

Event Timeline