[libvirt] [PATCH v1 03/15] qemu_capabilities: Expose qemu <-> libvirt arch translators

Michal Privoznik posted 15 patches 6 years, 11 months ago
There is a newer version of this series
[libvirt] [PATCH v1 03/15] qemu_capabilities: Expose qemu <-> libvirt arch translators
Posted by Michal Privoznik 6 years, 11 months ago
In some cases, the string representing architecture is different
in qemu and libvirt. That is the reason why we have
virQEMUCapsArchFromString() and virQEMUCapsArchToString(). So
far, we did not need them outside of qemu_capabilities code, but
this will change shortly. Expose them then.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/qemu/qemu_capabilities.c | 4 ++--
 src/qemu/qemu_capabilities.h | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index b48bcbebee..32e7a975a2 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -615,7 +615,7 @@ static int virQEMUCapsOnceInit(void)
 
 VIR_ONCE_GLOBAL_INIT(virQEMUCaps);
 
-static virArch virQEMUCapsArchFromString(const char *arch)
+virArch virQEMUCapsArchFromString(const char *arch)
 {
     if (STREQ(arch, "i386"))
         return VIR_ARCH_I686;
@@ -628,7 +628,7 @@ static virArch virQEMUCapsArchFromString(const char *arch)
 }
 
 
-static const char *virQEMUCapsArchToString(virArch arch)
+const char *virQEMUCapsArchToString(virArch arch)
 {
     if (arch == VIR_ARCH_I686)
         return "i386";
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index ba84052bca..eb0fa5f3c0 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -642,4 +642,7 @@ bool virQEMUCapsCPUFilterFeatures(const char *name,
 virSEVCapabilityPtr
 virQEMUCapsGetSEVCapabilities(virQEMUCapsPtr qemuCaps);
 
+virArch virQEMUCapsArchFromString(const char *arch);
+const char *virQEMUCapsArchToString(virArch arch);
+
 #endif /* LIBVIRT_QEMU_CAPABILITIES_H */
-- 
2.19.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH v1 03/15] qemu_capabilities: Expose qemu <-> libvirt arch translators
Posted by Laszlo Ersek 6 years, 11 months ago
On 02/27/19 11:04, Michal Privoznik wrote:
> In some cases, the string representing architecture is different
> in qemu and libvirt. That is the reason why we have
> virQEMUCapsArchFromString() and virQEMUCapsArchToString(). So
> far, we did not need them outside of qemu_capabilities code, but
> this will change shortly. Expose them then.
> 
> Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
> ---
>  src/qemu/qemu_capabilities.c | 4 ++--
>  src/qemu/qemu_capabilities.h | 3 +++
>  2 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index b48bcbebee..32e7a975a2 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -615,7 +615,7 @@ static int virQEMUCapsOnceInit(void)
>  
>  VIR_ONCE_GLOBAL_INIT(virQEMUCaps);
>  
> -static virArch virQEMUCapsArchFromString(const char *arch)
> +virArch virQEMUCapsArchFromString(const char *arch)
>  {
>      if (STREQ(arch, "i386"))
>          return VIR_ARCH_I686;
> @@ -628,7 +628,7 @@ static virArch virQEMUCapsArchFromString(const char *arch)
>  }
>  
>  
> -static const char *virQEMUCapsArchToString(virArch arch)
> +const char *virQEMUCapsArchToString(virArch arch)
>  {
>      if (arch == VIR_ARCH_I686)
>          return "i386";
> diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
> index ba84052bca..eb0fa5f3c0 100644
> --- a/src/qemu/qemu_capabilities.h
> +++ b/src/qemu/qemu_capabilities.h
> @@ -642,4 +642,7 @@ bool virQEMUCapsCPUFilterFeatures(const char *name,
>  virSEVCapabilityPtr
>  virQEMUCapsGetSEVCapabilities(virQEMUCapsPtr qemuCaps);
>  
> +virArch virQEMUCapsArchFromString(const char *arch);
> +const char *virQEMUCapsArchToString(virArch arch);
> +
>  #endif /* LIBVIRT_QEMU_CAPABILITIES_H */
> 

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list