From 97868a2b85d8a5475df3510eede061c3c44423b4 Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Wed, 18 May 2016 18:46:40 -0400 Subject: [PATCH] qemu: Introduce qemuDomainSecretSetup Currently just a shim to call qemuDomainSecretPlainSetup, but soon to be more --- src/qemu/qemu_domain.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3c54105d3b..3b3f008daa 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -835,6 +835,26 @@ qemuDomainSecretPlainSetup(virConnectPtr conn, } +/* qemuDomainSecretSetup: + * @conn: Pointer to connection + * @secinfo: Pointer to secret info + * @protocol: Protocol for secret + * @authdef: Pointer to auth data + * + * A shim to call plain setup. + * + * Returns 0 on success, -1 on failure + */ +static int +qemuDomainSecretSetup(virConnectPtr conn, + qemuDomainSecretInfoPtr secinfo, + virStorageNetProtocol protocol, + virStorageAuthDefPtr authdef) +{ + return qemuDomainSecretPlainSetup(conn, secinfo, protocol, authdef); +} + + /* qemuDomainSecretDiskDestroy: * @disk: Pointer to a disk definition * @@ -880,8 +900,8 @@ qemuDomainSecretDiskPrepare(virConnectPtr conn, if (VIR_ALLOC(secinfo) < 0) return -1; - if (qemuDomainSecretPlainSetup(conn, secinfo, src->protocol, - src->auth) < 0) + if (qemuDomainSecretSetup(conn, secinfo, src->protocol, + src->auth) < 0) goto error; diskPriv->secinfo = secinfo; @@ -945,9 +965,9 @@ qemuDomainSecretHostdevPrepare(virConnectPtr conn, if (VIR_ALLOC(secinfo) < 0) return -1; - if (qemuDomainSecretPlainSetup(conn, secinfo, - VIR_STORAGE_NET_PROTOCOL_ISCSI, - iscsisrc->auth) < 0) + if (qemuDomainSecretSetup(conn, secinfo, + VIR_STORAGE_NET_PROTOCOL_ISCSI, + iscsisrc->auth) < 0) goto error; hostdevPriv->secinfo = secinfo;