diff options
| author |   mikeb <mikeb@openbsd.org> | 2016-01-29 18:49:06 +0000 |
|---|---|---|
| committer | mikeb <mikeb@openbsd.org> | 2016-01-29 18:49:06 +0000 |
| commit | 5baa72a11cbd6f10cc24375ae7bf32a0154e61e7 (patch) | |
| tree | 9e6f746e06a0c1e4917af38c87595dfce66cbad1 /sys/dev/pv/xen.c | |
| parent | Base 10 should be enough for anybody! Allowing hex and octal number (diff) | |
| download | wireguard-openbsd-5baa72a11cbd6f10cc24375ae7bf32a0154e61e7.tar.xz wireguard-openbsd-5baa72a11cbd6f10cc24375ae7bf32a0154e61e7.zip | |
Cleanup XenStore API
Turns out that we want to let devices choose whether they're issuing
XenStore requests to the backend or frontend. This also unifies the
the API somewhat as providing the xen softcore structure is now
mandatory.
Diffstat (limited to 'sys/dev/pv/xen.c')
| -rw-r--r-- | sys/dev/pv/xen.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/pv/xen.c b/sys/dev/pv/xen.c index bed695dd1b7..e6848a6fdca 100644 --- a/sys/dev/pv/xen.c +++ b/sys/dev/pv/xen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xen.c,v 1.45 2016/01/28 11:19:49 mikeb Exp $ */ +/* $OpenBSD: xen.c,v 1.46 2016/01/29 18:49:06 mikeb Exp $ */ /* * Copyright (c) 2015 Mike Belopuhov @@ -1173,9 +1173,9 @@ xen_probe_devices(struct xen_softc *sc) { struct xen_attach_args xa; struct xs_transaction xst; - struct iovec *iovp1, *iovp2, *iovp3; - int i, j, error = 0, iov1_cnt, iov2_cnt, iov3_cnt; - char path[128]; + struct iovec *iovp1, *iovp2; + int i, j, error = 0, iov1_cnt, iov2_cnt; + char path[256]; memset(&xst, 0, sizeof(xst)); xst.xst_id = 0; @@ -1203,11 +1203,11 @@ xen_probe_devices(struct xen_softc *sc) snprintf(xa.xa_node, sizeof(xa.xa_node), "device/%s/%s", (char *)iovp1[i].iov_base, (char *)iovp2[j].iov_base); - snprintf(path, sizeof(path), "%s/backend", xa.xa_node); - if (!xs_cmd(&xst, XS_READ, path, &iovp3, &iov3_cnt)) { - strlcpy(xa.xa_backend, (char *)iovp3->iov_base, - sizeof(xa.xa_backend)); - xs_resfree(&xst, iovp3, iov3_cnt); + if (xs_getprop(sc, xa.xa_node, "backend", xa.xa_backend, + sizeof(xa.xa_backend))) { + printf("%s: failed to identify \"backend\" " + "for \"%s\"\n", sc->sc_dev.dv_xname, + xa.xa_node); } config_found((struct device *)sc, &xa, xen_attach_print); |