From 6b90f4bb62db2c6cb284ad5324997e79dd90746b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Tue, 12 Jun 2018 13:27:16 +0200 Subject: [PATCH] Rename virDomainSevDefPtr to virDomainSEVDefPtr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some identifiers use Sev, some SEV. Prefer the latter. Signed-off-by: Ján Tomko Reviewed-by: Brijesh Singh Tested-by: Brijesh Singh Reviewed-by: Daniel P. Berrangé --- src/conf/domain_conf.c | 8 ++++---- src/conf/domain_conf.h | 8 ++++---- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_process.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b4c3b249d0..522e0c2bf3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2962,7 +2962,7 @@ virDomainCachetuneDefFree(virDomainCachetuneDefPtr cachetune) static void -virDomainSEVDefFree(virDomainSevDefPtr def) +virDomainSEVDefFree(virDomainSEVDefPtr def) { if (!def) return; @@ -15845,13 +15845,13 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node, } -static virDomainSevDefPtr +static virDomainSEVDefPtr virDomainSEVDefParseXML(xmlNodePtr sevNode, xmlXPathContextPtr ctxt) { char *type = NULL; xmlNodePtr save = ctxt->node; - virDomainSevDefPtr def; + virDomainSEVDefPtr def; unsigned long policy; if (VIR_ALLOC(def) < 0) @@ -26754,7 +26754,7 @@ virDomainKeyWrapDefFormat(virBufferPtr buf, virDomainKeyWrapDefPtr keywrap) static void -virDomainSEVDefFormat(virBufferPtr buf, virDomainSevDefPtr sev) +virDomainSEVDefFormat(virBufferPtr buf, virDomainSEVDefPtr sev) { if (!sev) return; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ea8ddb2b39..6344c02d1c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2324,10 +2324,10 @@ typedef enum { VIR_DOMAIN_LAUNCH_SECURITY_LAST, } virDomainLaunchSecurity; -typedef struct _virDomainSevDef virDomainSevDef; -typedef virDomainSevDef *virDomainSevDefPtr; +typedef struct _virDomainSEVDef virDomainSEVDef; +typedef virDomainSEVDef *virDomainSEVDefPtr; -struct _virDomainSevDef { +struct _virDomainSEVDef { int sectype; /* enum virDomainLaunchSecurity */ char *dh_cert; char *session; @@ -2529,7 +2529,7 @@ struct _virDomainDef { virDomainKeyWrapDefPtr keywrap; /* SEV-specific domain */ - virDomainSevDefPtr sev; + virDomainSEVDefPtr sev; /* Application-specific custom metadata */ xmlNodePtr metadata; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 796831f79c..0bc7814a0d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9692,7 +9692,7 @@ qemuBuildTPMCommandLine(virCommandPtr cmd, static int qemuBuildSevCommandLine(virDomainObjPtr vm, virCommandPtr cmd, - virDomainSevDefPtr sev) + virDomainSEVDefPtr sev) { virBuffer buf = VIR_BUFFER_INITIALIZER; qemuDomainObjPrivatePtr priv = vm->privateData; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index faa6915c25..883f777aee 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5854,7 +5854,7 @@ qemuProcessPrepareSevGuestInput(virDomainObjPtr vm) qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDefPtr def = vm->def; virQEMUCapsPtr qemuCaps = priv->qemuCaps; - virDomainSevDefPtr sev = def->sev; + virDomainSEVDefPtr sev = def->sev; if (!sev) return 0;