[v1] qemu: Improve handling of architecture-specific defaults

[PATCH 26/33] qemu: Add qemuDomainDefaultPanicModel()

Posted by Andrea Bolognani 7 months, 2 weeks ago

Factor out the existing code.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 src/qemu/qemu_domain.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index c9d213dd7b..8a37cda464 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4346,6 +4346,19 @@ qemuDomainDefaultSerialModel(const virDomainDef *def,
 }
 
 
+static int
+qemuDomainDefaultPanicModel(const virDomainDef *def)
+{
+    if (qemuDomainIsPSeries(def))
+        return VIR_DOMAIN_PANIC_MODEL_PSERIES;
+
+    if (ARCH_IS_S390(def->os.arch))
+        return VIR_DOMAIN_PANIC_MODEL_S390;
+
+    return VIR_DOMAIN_PANIC_MODEL_ISA;
+}
+
+
 static int
 qemuDomainDefAddDefaultDevices(virQEMUDriver *driver,
                                virDomainDef *def,
@@ -6123,14 +6136,8 @@ static int
 qemuDomainDevicePanicDefPostParse(virDomainPanicDef *panic,
                                   const virDomainDef *def)
 {
-    if (panic->model == VIR_DOMAIN_PANIC_MODEL_DEFAULT) {
-        if (qemuDomainIsPSeries(def))
-            panic->model = VIR_DOMAIN_PANIC_MODEL_PSERIES;
-        else if (ARCH_IS_S390(def->os.arch))
-            panic->model = VIR_DOMAIN_PANIC_MODEL_S390;
-        else
-            panic->model = VIR_DOMAIN_PANIC_MODEL_ISA;
-    }
+    if (panic->model == VIR_DOMAIN_PANIC_MODEL_DEFAULT)
+        panic->model = qemuDomainDefaultPanicModel(def);
 
     return 0;
 }
-- 
2.43.0
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org

Re: [PATCH 26/33] qemu: Add qemuDomainDefaultPanicModel()

Posted by Peter Krempa 7 months, 2 weeks ago

On Wed, Jan 24, 2024 at 20:37:46 +0100, Andrea Bolognani wrote:
> Factor out the existing code.
> 
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
>  src/qemu/qemu_domain.c | 23 +++++++++++++++--------
>  1 file changed, 15 insertions(+), 8 deletions(-)
> 
> diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
> index c9d213dd7b..8a37cda464 100644
> --- a/src/qemu/qemu_domain.c
> +++ b/src/qemu/qemu_domain.c
> @@ -4346,6 +4346,19 @@ qemuDomainDefaultSerialModel(const virDomainDef *def,
>  }
>  
>  
> +static int

static virDomainPanicModel

> +qemuDomainDefaultPanicModel(const virDomainDef *def)
> +{
> +    if (qemuDomainIsPSeries(def))
> +        return VIR_DOMAIN_PANIC_MODEL_PSERIES;
> +
> +    if (ARCH_IS_S390(def->os.arch))
> +        return VIR_DOMAIN_PANIC_MODEL_S390;
> +
> +    return VIR_DOMAIN_PANIC_MODEL_ISA;
> +}
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org

Re: [PATCH 26/33] qemu: Add qemuDomainDefaultPanicModel()

Posted by Peter Krempa 7 months, 2 weeks ago

On Wed, Jan 24, 2024 at 20:37:46 +0100, Andrea Bolognani wrote:
> Factor out the existing code.
> 
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
>  src/qemu/qemu_domain.c | 23 +++++++++++++++--------
>  1 file changed, 15 insertions(+), 8 deletions(-)
> 
> diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
> index c9d213dd7b..8a37cda464 100644
> --- a/src/qemu/qemu_domain.c
> +++ b/src/qemu/qemu_domain.c
> @@ -4346,6 +4346,19 @@ qemuDomainDefaultSerialModel(const virDomainDef *def,
>  }
>  
>  
> +static int
> +qemuDomainDefaultPanicModel(const virDomainDef *def)
> +{
> +    if (qemuDomainIsPSeries(def))
> +        return VIR_DOMAIN_PANIC_MODEL_PSERIES;
> +
> +    if (ARCH_IS_S390(def->os.arch))
> +        return VIR_DOMAIN_PANIC_MODEL_S390;
> +

You see, this is much better ;)

> +    return VIR_DOMAIN_PANIC_MODEL_ISA;
> +}
> +

Reviewed-by: Peter Krempa <pkrempa@redhat.com>
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org