Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging

[thirdparty/qemu.git] / softmmu / vl.c

diff --git a/softmmu/vl.c b/softmmu/vl.c
index 59a472a0b108f5cfc132cbda4767670f835f6d1e..98e071e63bb626bccee0b84041711f0dc7bf9f58 100644 (file)
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -1962,9 +1962,7 @@ static void qemu_create_early_backends(void)
      * setting machine properties, so they can be referred to.
      */
     configure_blockdev(&bdo_queue, machine_class, snapshot);
-    if (!audio_init_audiodevs()) {
-        exit(1);
-    }
+    audio_init_audiodevs();
 }
 
 
@@ -2926,10 +2924,6 @@ void qemu_init(int argc, char **argv)
                 }
                 break;
 #endif
-            case QEMU_OPTION_audio_help:
-                audio_legacy_help();
-                exit (0);
-                break;
             case QEMU_OPTION_audiodev:
                 audio_parse_option(optarg);
                 break;