File c92c6cd2-qemuBuildSevCommandLine.patch of Package libvirt.16766
commit c92c6cd2f926bfae571c5089faa43cdf3621d9c6
Author: Michal Privoznik <mprivozn@redhat.com>
Date: Wed Jun 13 12:25:52 2018 +0200
qemuBuildSevCommandLine: s/obj/buf/
The variable points to a buffer not a domain object therefore its
current name is misleading.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Index: libvirt-4.0.0/src/qemu/qemu_command.c
===================================================================
--- libvirt-4.0.0.orig/src/qemu/qemu_command.c
+++ libvirt-4.0.0/src/qemu/qemu_command.c
@@ -9942,7 +9942,7 @@ static int
qemuBuildSEVCommandLine(virDomainObjPtr vm, virCommandPtr cmd,
virDomainSEVDefPtr sev)
{
- virBuffer obj = VIR_BUFFER_INITIALIZER;
+ virBuffer buf = VIR_BUFFER_INITIALIZER;
qemuDomainObjPrivatePtr priv = vm->privateData;
char *path = NULL;
@@ -9952,25 +9952,25 @@ qemuBuildSEVCommandLine(virDomainObjPtr
VIR_DEBUG("policy=0x%x cbitpos=%d reduced_phys_bits=%d",
sev->policy, sev->cbitpos, sev->reduced_phys_bits);
- virBufferAsprintf(&obj, "sev-guest,id=sev0,cbitpos=%d", sev->cbitpos);
- virBufferAsprintf(&obj, ",reduced-phys-bits=%d", sev->reduced_phys_bits);
- virBufferAsprintf(&obj, ",policy=0x%x", sev->policy);
+ virBufferAsprintf(&buf, "sev-guest,id=sev0,cbitpos=%d", sev->cbitpos);
+ virBufferAsprintf(&buf, ",reduced-phys-bits=%d", sev->reduced_phys_bits);
+ virBufferAsprintf(&buf, ",policy=0x%x", sev->policy);
if (sev->dh_cert) {
if (virAsprintf(&path, "%s/dh_cert.base64", priv->libDir) < 0)
return -1;
- virBufferAsprintf(&obj, ",dh-cert-file=%s", path);
+ virBufferAsprintf(&buf, ",dh-cert-file=%s", path);
VIR_FREE(path);
}
if (sev->session) {
if (virAsprintf(&path, "%s/session.base64", priv->libDir) < 0)
return -1;
- virBufferAsprintf(&obj, ",session-file=%s", path);
+ virBufferAsprintf(&buf, ",session-file=%s", path);
VIR_FREE(path);
}
- virCommandAddArgList(cmd, "-object", virBufferContentAndReset(&obj), NULL);
+ virCommandAddArgList(cmd, "-object", virBufferContentAndReset(&buf), NULL);
return 0;
}