diff mbox

machine: add comment to abort path in machine_set_kernel_irqchip

Message ID 146843350570.23888.3512119586941866197.stgit@bahia.lan
State New
Headers show

Commit Message

Greg Kurz July 13, 2016, 6:11 p.m. UTC
We're not supposed to abort when the user passes a bogus value.
Since the ckecing is done in visit_type_OnOffSplit(), the call to
abort() is legitimate. Let's add a comment to make it explicit.

Signed-off-by: Greg Kurz <groug@kaod.org>
---
 hw/core/machine.c |    3 +++
 1 file changed, 3 insertions(+)

Comments

Greg Kurz July 13, 2016, 6:49 p.m. UTC | #1
On Wed, 13 Jul 2016 20:11:45 +0200
Greg Kurz <groug@kaod.org> wrote:

> We're not supposed to abort when the user passes a bogus value.
> Since the ckecing is done in visit_type_OnOffSplit(), the call to

s/ckecing/checking :)

> abort() is legitimate. Let's add a comment to make it explicit.
> 
> Signed-off-by: Greg Kurz <groug@kaod.org>
> ---
>  hw/core/machine.c |    3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 2fe6ff6f3007..e5a456f21dd9 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -65,6 +65,9 @@ static void machine_set_kernel_irqchip(Object *obj, Visitor *v,
>              ms->kernel_irqchip_split = true;
>              break;
>          default:
> +            /* The value was checked in visit_type_OnOffSplit() above. If
> +             * we get here, then something is wrong in QEMU.
> +             */
>              abort();
>          }
>      }
> 
>
Eduardo Habkost July 13, 2016, 8:03 p.m. UTC | #2
On Wed, Jul 13, 2016 at 08:11:45PM +0200, Greg Kurz wrote:
> We're not supposed to abort when the user passes a bogus value.
> Since the ckecing is done in visit_type_OnOffSplit(), the call to
> abort() is legitimate. Let's add a comment to make it explicit.
> 
> Signed-off-by: Greg Kurz <groug@kaod.org>

Applied to machine-next, thanks. Although I believe the property
should be changed to use object_property_add_enum() instead.
diff mbox

Patch

diff --git a/hw/core/machine.c b/hw/core/machine.c
index 2fe6ff6f3007..e5a456f21dd9 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -65,6 +65,9 @@  static void machine_set_kernel_irqchip(Object *obj, Visitor *v,
             ms->kernel_irqchip_split = true;
             break;
         default:
+            /* The value was checked in visit_type_OnOffSplit() above. If
+             * we get here, then something is wrong in QEMU.
+             */
             abort();
         }
     }