From 8d1b6f659252e5fa195d3dd187ebc099f162c278 Mon Sep 17 00:00:00 2001
From: Matt Borgerson <mborgerson@gmail.com>
Date: Fri, 21 Aug 2015 19:12:50 -0700
Subject: [PATCH] Use consistent naming conventions.

---
 hw/xbox/smbus_xbox_smc.c | 4 ++--
 vl.c                     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/xbox/smbus_xbox_smc.c b/hw/xbox/smbus_xbox_smc.c
index 4a80f5652f..ff329af273 100644
--- a/hw/xbox/smbus_xbox_smc.c
+++ b/hw/xbox/smbus_xbox_smc.c
@@ -139,9 +139,9 @@ static uint8_t smc_read_data(SMBusDevice *dev, uint8_t cmd, int n)
             return SMC_REG_AVPACK_COMPOSITE;
 
         case SMC_REG_SCRATCH: {
-            /* Skip boot animation if the "skipanim" flag was set. */
+            /* Skip boot animation if the "short_animation" flag was set. */
             QemuOpts *opts = qemu_opts_find(qemu_find_opts("machine"), NULL);
-            if (opts && qemu_opt_get_bool(opts, "skipanim", 0))
+            if (opts && qemu_opt_get_bool(opts, "short_animation", 0))
             {
                 return SMC_REG_SCRATCH_SHORT_ANIMATION;
             }
diff --git a/vl.c b/vl.c
index 8d2f0ededd..e58890fd4f 100644
--- a/vl.c
+++ b/vl.c
@@ -441,9 +441,9 @@ static QemuOptsList qemu_machine_opts = {
             .type = QEMU_OPT_STRING,
             .help = "Chihiro mediaboard filesystem file",
         },{
-            .name = "skipanim",
+            .name = "short_animation",
             .type = QEMU_OPT_BOOL,
-            .help = "Skip boot animation",
+            .help = "Skip Xbox boot animation",
         },
         { /* End of list */ }
     },