motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-26 20:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/xen: Use xs_node_read() from xs_node_vscanf()

Browse source 
Reduce some duplication.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Anthony PERARD <anthony.perard@vates.tech>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
This commit is contained in:
David Woodhouse 2025-01-10 09:37:48 +00:00
parent 7a0b74d871
commit 76f26e46ac
2 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
hw/xen/trace-events
View file

@ -38,7 +38,6 @@ xen_device_remove_watch(const char *type, char *name, const char *node, const ch
xs_node_create(const char *node) "%s" xs_node_create(const char *node) "%s"
xs_node_destroy(const char *node) "%s" xs_node_destroy(const char *node) "%s"
xs_node_vprintf(char *path, char *value) "%s %s" xs_node_vprintf(char *path, char *value) "%s %s"
xs_node_vscanf(char *path, char *value) "%s %s"
xs_node_read(const char *path, const char *value) "%s %s" xs_node_read(const char *path, const char *value) "%s %s"
xs_node_watch(char *path) "%s" xs_node_watch(char *path) "%s"
xs_node_unwatch(char *path) "%s" xs_node_unwatch(char *path) "%s"

15
hw/xen/xen-bus-helper.c
View file

@ -105,25 +105,22 @@ int xs_node_vscanf(struct qemu_xs_handle *h, xs_transaction_t tid,
const char *node, const char *key, Error **errp, const char *node, const char *key, Error **errp,
const char *fmt, va_list ap) const char *fmt, va_list ap)
{ {
char *path, *value; char *value;
int rc; int rc;
path = (strlen(node) != 0) ? g_strdup_printf("%s/%s", node, key) : if (node && strlen(node) != 0) {
g_strdup(key); value = xs_node_read(h, tid, NULL, errp, "%s/%s", node, key);
value = qemu_xen_xs_read(h, tid, path, NULL); } else {
value = xs_node_read(h, tid, NULL, errp, "%s", key);
trace_xs_node_vscanf(path, value); }
if (value) { if (value) {
rc = vsscanf(value, fmt, ap); rc = vsscanf(value, fmt, ap);
} else { } else {
error_setg_errno(errp, errno, "failed to read from '%s'",
path);
rc = EOF; rc = EOF;
} }
free(value); free(value);
g_free(path);
return rc; return rc;
} }