paaudio: port to -audiodev config

[qemu.git] / vl.c

diff --git a/vl.c b/vl.c
index 064872cc9868a17a2f36534e2899494541bc005a..db04aea7f8c97f255f1a0852a39053fca5d10360 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -106,9 +106,6 @@ int main(int argc, char **argv)
 
 #include "disas/disas.h"
 
 
 #include "disas/disas.h"
 

-
-#include "slirp/libslirp.h"
-

 #include "trace-root.h"
 #include "trace/control.h"
 #include "qemu/queue.h"
 #include "trace-root.h"
 #include "trace/control.h"
 #include "qemu/queue.h"


@@ -160,11 +157,9 @@ static int rtc_host_datetime_offset = -1; /* valid & used only with
 QEMUClockType rtc_clock;
 int vga_interface_type = VGA_NONE;
 static DisplayOptions dpy;
 QEMUClockType rtc_clock;
 int vga_interface_type = VGA_NONE;
 static DisplayOptions dpy;

-int no_frame;

 static int num_serial_hds;
 static Chardev **serial_hds;
 Chardev *parallel_hds[MAX_PARALLEL_PORTS];
 static int num_serial_hds;
 static Chardev **serial_hds;
 Chardev *parallel_hds[MAX_PARALLEL_PORTS];

-Chardev *virtcon_hds[MAX_VIRTIO_CONSOLES];

 int win2k_install_hack = 0;
 int singlestep = 0;
 int smp_cpus;
 int win2k_install_hack = 0;
 int singlestep = 0;
 int smp_cpus;


@@ -215,7 +210,6 @@ bool xen_domid_restrict;
 static int has_defaults = 1;
 static int default_serial = 1;
 static int default_parallel = 1;
 static int has_defaults = 1;
 static int default_serial = 1;
 static int default_parallel = 1;

-static int default_virtcon = 1;

 static int default_monitor = 1;
 static int default_floppy = 1;
 static int default_cdrom = 1;
 static int default_monitor = 1;
 static int default_floppy = 1;
 static int default_cdrom = 1;


@@ -236,8 +230,6 @@ static struct {
     { .driver = "ide-drive",            .flag = &default_cdrom     },
     { .driver = "scsi-cd",              .flag = &default_cdrom     },
     { .driver = "scsi-hd",              .flag = &default_cdrom     },
     { .driver = "ide-drive",            .flag = &default_cdrom     },
     { .driver = "scsi-cd",              .flag = &default_cdrom     },
     { .driver = "scsi-hd",              .flag = &default_cdrom     },

-    { .driver = "virtio-serial-pci",    .flag = &default_virtcon   },
-    { .driver = "virtio-serial",        .flag = &default_virtcon   },

     { .driver = "VGA",                  .flag = &default_vga       },
     { .driver = "isa-vga",              .flag = &default_vga       },
     { .driver = "cirrus-vga",           .flag = &default_vga       },
     { .driver = "VGA",                  .flag = &default_vga       },
     { .driver = "isa-vga",              .flag = &default_vga       },
     { .driver = "cirrus-vga",           .flag = &default_vga       },


@@ -731,6 +723,9 @@ void runstate_set(RunState new_state)
 {
     assert(new_state < RUN_STATE__MAX);
 
 {
     assert(new_state < RUN_STATE__MAX);
 

+    trace_runstate_set(current_run_state, RunState_str(current_run_state),
+                       new_state, RunState_str(current_run_state));
+

     if (current_run_state == new_state) {
         return;
     }
     if (current_run_state == new_state) {
         return;
     }


@@ -741,7 +736,7 @@ void runstate_set(RunState new_state)
                      RunState_str(new_state));
         abort();
     }
                      RunState_str(new_state));
         abort();
     }

-    trace_runstate_set(new_state);
+

     current_run_state = new_state;
 }
 
     current_run_state = new_state;
 }
 


@@ -1529,7 +1524,7 @@ struct vm_change_state_entry {
     QLIST_ENTRY (vm_change_state_entry) entries;
 };
 
     QLIST_ENTRY (vm_change_state_entry) entries;
 };
 

-static QLIST_HEAD(vm_change_state_head, vm_change_state_entry) vm_change_state_head;
+static QLIST_HEAD(, vm_change_state_entry) vm_change_state_head;

 
 VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb,
                                                      void *opaque)
 
 VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb,
                                                      void *opaque)


@@ -1554,7 +1549,7 @@ void vm_state_notify(int running, RunState state)
 {
     VMChangeStateEntry *e, *next;
 
 {
     VMChangeStateEntry *e, *next;
 

-    trace_vm_state_notify(running, state);
+    trace_vm_state_notify(running, state, RunState_str(state));

 
     QLIST_FOREACH_SAFE(e, &vm_change_state_head, entries, next) {
         e->cb(e->opaque, running, state);
 
     QLIST_FOREACH_SAFE(e, &vm_change_state_head, entries, next) {
         e->cb(e->opaque, running, state);


@@ -2110,18 +2105,7 @@ static void parse_display(const char *p)
         while (*opts) {
             const char *nextopt;
 
         while (*opts) {
             const char *nextopt;
 

-            if (strstart(opts, ",frame=", &nextopt)) {
-                g_printerr("The frame= sdl option is deprecated, and will be\n"
-                           "removed in a future release.\n");
-                opts = nextopt;
-                if (strstart(opts, "on", &nextopt)) {
-                    no_frame = 0;
-                } else if (strstart(opts, "off", &nextopt)) {
-                    no_frame = 1;
-                } else {
-                    goto invalid_sdl_args;
-                }
-            } else if (strstart(opts, ",alt_grab=", &nextopt)) {
+            if (strstart(opts, ",alt_grab=", &nextopt)) {

                 opts = nextopt;
                 if (strstart(opts, "on", &nextopt)) {
                     alt_grab = 1;
                 opts = nextopt;
                 if (strstart(opts, "on", &nextopt)) {
                     alt_grab = 1;


@@ -2315,7 +2299,7 @@ static int chardev_init_func(void *opaque, QemuOpts *opts, Error **errp)
 {
     Error *local_err = NULL;
 
 {
     Error *local_err = NULL;
 

-    if (!qemu_chr_new_from_opts(opts, &local_err)) {
+    if (!qemu_chr_new_from_opts(opts, NULL, &local_err)) {

         if (local_err) {
             error_propagate(errp, local_err);
             return -1;
         if (local_err) {
             error_propagate(errp, local_err);
             return -1;


@@ -2402,7 +2386,6 @@ struct device_config {
         DEV_BT,        /* -bt            */
         DEV_SERIAL,    /* -serial        */
         DEV_PARALLEL,  /* -parallel      */
         DEV_BT,        /* -bt            */
         DEV_SERIAL,    /* -serial        */
         DEV_PARALLEL,  /* -parallel      */

-        DEV_VIRTCON,   /* -virtioconsole */

         DEV_DEBUGCON,  /* -debugcon */
         DEV_GDB,       /* -gdb, -s */
         DEV_SCLP,      /* s390 sclp */
         DEV_DEBUGCON,  /* -debugcon */
         DEV_GDB,       /* -gdb, -s */
         DEV_SCLP,      /* s390 sclp */


@@ -2454,7 +2437,7 @@ static int serial_parse(const char *devname)
     snprintf(label, sizeof(label), "serial%d", index);
     serial_hds = g_renew(Chardev *, serial_hds, index + 1);
 
     snprintf(label, sizeof(label), "serial%d", index);
     serial_hds = g_renew(Chardev *, serial_hds, index + 1);
 

-    serial_hds[index] = qemu_chr_new_mux_mon(label, devname);
+    serial_hds[index] = qemu_chr_new_mux_mon(label, devname, NULL);

     if (!serial_hds[index]) {
         error_report("could not connect serial device"
                      " to character backend '%s'", devname);
     if (!serial_hds[index]) {
         error_report("could not connect serial device"
                      " to character backend '%s'", devname);


@@ -2490,7 +2473,7 @@ static int parallel_parse(const char *devname)
         exit(1);
     }
     snprintf(label, sizeof(label), "parallel%d", index);
         exit(1);
     }
     snprintf(label, sizeof(label), "parallel%d", index);

-    parallel_hds[index] = qemu_chr_new_mux_mon(label, devname);
+    parallel_hds[index] = qemu_chr_new_mux_mon(label, devname, NULL);

     if (!parallel_hds[index]) {
         error_report("could not connect parallel device"
                      " to character backend '%s'", devname);
     if (!parallel_hds[index]) {
         error_report("could not connect parallel device"
                      " to character backend '%s'", devname);


@@ -2500,44 +2483,11 @@ static int parallel_parse(const char *devname)
     return 0;
 }
 
     return 0;
 }
 

-static int virtcon_parse(const char *devname)
-{
-    QemuOptsList *device = qemu_find_opts("device");
-    static int index = 0;
-    char label[32];
-    QemuOpts *bus_opts, *dev_opts;
-
-    if (strcmp(devname, "none") == 0)
-        return 0;
-    if (index == MAX_VIRTIO_CONSOLES) {
-        error_report("too many virtio consoles");
-        exit(1);
-    }
-
-    bus_opts = qemu_opts_create(device, NULL, 0, &error_abort);
-    qemu_opt_set(bus_opts, "driver", "virtio-serial", &error_abort);
-
-    dev_opts = qemu_opts_create(device, NULL, 0, &error_abort);
-    qemu_opt_set(dev_opts, "driver", "virtconsole", &error_abort);
-
-    snprintf(label, sizeof(label), "virtcon%d", index);
-    virtcon_hds[index] = qemu_chr_new_mux_mon(label, devname);
-    if (!virtcon_hds[index]) {
-        error_report("could not connect virtio console"
-                     " to character backend '%s'", devname);
-        return -1;
-    }
-    qemu_opt_set(dev_opts, "chardev", label, &error_abort);
-
-    index++;
-    return 0;
-}
-

 static int debugcon_parse(const char *devname)
 {
     QemuOpts *opts;
 
 static int debugcon_parse(const char *devname)
 {
     QemuOpts *opts;
 

-    if (!qemu_chr_new_mux_mon("debugcon", devname)) {
+    if (!qemu_chr_new_mux_mon("debugcon", devname, NULL)) {

         error_report("invalid character backend '%s'", devname);
         exit(1);
     }
         error_report("invalid character backend '%s'", devname);
         exit(1);
     }


@@ -3086,6 +3036,7 @@ int main(int argc, char **argv, char **envp)
     module_call_init(MODULE_INIT_OPTS);
 
     runstate_init();
     module_call_init(MODULE_INIT_OPTS);
 
     runstate_init();

+    precopy_infrastructure_init();

     postcopy_infrastructure_init();
     monitor_init_globals();
 
     postcopy_infrastructure_init();
     monitor_init_globals();
 


@@ -3302,9 +3253,12 @@ int main(int argc, char **argv, char **envp)
                 add_device_config(DEV_BT, optarg);
                 break;
             case QEMU_OPTION_audio_help:
                 add_device_config(DEV_BT, optarg);
                 break;
             case QEMU_OPTION_audio_help:

-                AUD_help ();
+                audio_legacy_help();

                 exit (0);
                 break;
                 exit (0);
                 break;

+            case QEMU_OPTION_audiodev:
+                audio_parse_option(optarg);
+                break;

             case QEMU_OPTION_soundhw:
                 select_soundhw (optarg);
                 break;
             case QEMU_OPTION_soundhw:
                 select_soundhw (optarg);
                 break;


@@ -3567,15 +3521,6 @@ int main(int argc, char **argv, char **envp)
                     exit(1);
                 }
                 break;
                     exit(1);
                 }
                 break;

-            case QEMU_OPTION_virtiocon:
-                warn_report("This option is deprecated, "
-                            "use '-device virtconsole' instead");
-                add_device_config(DEV_VIRTCON, optarg);
-                default_virtcon = 0;
-                if (strncmp(optarg, "mon:", 4) == 0) {
-                    default_monitor = 0;
-                }
-                break;

             case QEMU_OPTION_parallel:
                 add_device_config(DEV_PARALLEL, optarg);
                 default_parallel = 0;
             case QEMU_OPTION_parallel:
                 add_device_config(DEV_PARALLEL, optarg);
                 default_parallel = 0;


@@ -3593,11 +3538,6 @@ int main(int argc, char **argv, char **envp)
                 dpy.has_full_screen = true;
                 dpy.full_screen = true;
                 break;
                 dpy.has_full_screen = true;
                 dpy.full_screen = true;
                 break;

-            case QEMU_OPTION_no_frame:
-                g_printerr("The -no-frame switch is deprecated, and will be\n"
-                           "removed in a future release.\n");
-                no_frame = 1;
-                break;

             case QEMU_OPTION_alt_grab:
                 alt_grab = 1;
                 break;
             case QEMU_OPTION_alt_grab:
                 alt_grab = 1;
                 break;


@@ -3652,11 +3592,6 @@ int main(int argc, char **argv, char **envp)
                 olist = qemu_find_opts("machine");
                 qemu_opts_parse_noisily(olist, "accel=kvm", false);
                 break;
                 olist = qemu_find_opts("machine");
                 qemu_opts_parse_noisily(olist, "accel=kvm", false);
                 break;

-            case QEMU_OPTION_enable_hax:
-                warn_report("Option is deprecated, use '-accel hax' instead");
-                olist = qemu_find_opts("machine");
-                qemu_opts_parse_noisily(olist, "accel=hax", false);
-                break;

             case QEMU_OPTION_M:
             case QEMU_OPTION_machine:
                 olist = qemu_find_opts("machine");
             case QEMU_OPTION_M:
             case QEMU_OPTION_machine:
                 olist = qemu_find_opts("machine");


@@ -3801,12 +3736,6 @@ int main(int argc, char **argv, char **envp)
             case QEMU_OPTION_old_param:
                 old_param = 1;
                 break;
             case QEMU_OPTION_old_param:
                 old_param = 1;
                 break;

-            case QEMU_OPTION_clock:
-                /* Clock options no longer exist.  Keep this option for
-                 * backward compatibility.
-                 */
-                warn_report("This option is ignored and will be removed soon");
-                break;

             case QEMU_OPTION_rtc:
                 opts = qemu_opts_parse_noisily(qemu_find_opts("rtc"), optarg,
                                                false);
             case QEMU_OPTION_rtc:
                 opts = qemu_opts_parse_noisily(qemu_find_opts("rtc"), optarg,
                                                false);


@@ -3856,13 +3785,6 @@ int main(int argc, char **argv, char **envp)
                 }
                 xen_domid = atoi(optarg);
                 break;
                 }
                 xen_domid = atoi(optarg);
                 break;

-            case QEMU_OPTION_xen_create:
-                if (!(xen_available())) {
-                    error_report("Option not supported for this target");
-                    exit(1);
-                }
-                xen_mode = XEN_CREATE;
-                break;

             case QEMU_OPTION_xen_attach:
                 if (!(xen_available())) {
                     error_report("Option not supported for this target");
             case QEMU_OPTION_xen_attach:
                 if (!(xen_available())) {
                     error_report("Option not supported for this target");


@@ -4192,9 +4114,6 @@ int main(int argc, char **argv, char **envp)
     if (!has_defaults || machine_class->no_parallel) {
         default_parallel = 0;
     }
     if (!has_defaults || machine_class->no_parallel) {
         default_parallel = 0;
     }

-    if (!has_defaults || !machine_class->use_virtcon) {
-        default_virtcon = 0;
-    }

     if (!has_defaults || machine_class->no_floppy) {
         default_floppy = 0;
     }
     if (!has_defaults || machine_class->no_floppy) {
         default_floppy = 0;
     }


@@ -4227,8 +4146,7 @@ int main(int argc, char **argv, char **envp)
          * usage, -nographic is just a no-op in this case.
          */
         if (nographic
          * usage, -nographic is just a no-op in this case.
          */
         if (nographic

-            && (default_parallel || default_serial
-                || default_monitor || default_virtcon)) {
+            && (default_parallel || default_serial || default_monitor)) {

             error_report("-nographic cannot be used with -daemonize");
             exit(1);
         }
             error_report("-nographic cannot be used with -daemonize");
             exit(1);
         }


@@ -4245,13 +4163,9 @@ int main(int argc, char **argv, char **envp)
             add_device_config(DEV_PARALLEL, "null");
         if (default_serial && default_monitor) {
             add_device_config(DEV_SERIAL, "mon:stdio");
             add_device_config(DEV_PARALLEL, "null");
         if (default_serial && default_monitor) {
             add_device_config(DEV_SERIAL, "mon:stdio");

-        } else if (default_virtcon && default_monitor) {
-            add_device_config(DEV_VIRTCON, "mon:stdio");

         } else {
             if (default_serial)
                 add_device_config(DEV_SERIAL, "stdio");
         } else {
             if (default_serial)
                 add_device_config(DEV_SERIAL, "stdio");

-            if (default_virtcon)
-                add_device_config(DEV_VIRTCON, "stdio");

             if (default_monitor)
                 monitor_parse("stdio", "readline", false);
         }
             if (default_monitor)
                 monitor_parse("stdio", "readline", false);
         }


@@ -4262,8 +4176,6 @@ int main(int argc, char **argv, char **envp)
             add_device_config(DEV_PARALLEL, "vc:80Cx24C");
         if (default_monitor)
             monitor_parse("vc:80Cx24C", "readline", false);
             add_device_config(DEV_PARALLEL, "vc:80Cx24C");
         if (default_monitor)
             monitor_parse("vc:80Cx24C", "readline", false);

-        if (default_virtcon)
-            add_device_config(DEV_VIRTCON, "vc:80Cx24C");

     }
 
 #if defined(CONFIG_VNC)
     }
 
 #if defined(CONFIG_VNC)


@@ -4283,8 +4195,8 @@ int main(int argc, char **argv, char **envp)
         dpy.type = DISPLAY_TYPE_NONE;
     }
 
         dpy.type = DISPLAY_TYPE_NONE;
     }
 

-    if ((no_frame || alt_grab || ctrl_grab) && dpy.type != DISPLAY_TYPE_SDL) {
-        error_report("-no-frame, -alt-grab and -ctrl-grab are only valid "
+    if ((alt_grab || ctrl_grab) && dpy.type != DISPLAY_TYPE_SDL) {
+        error_report("-alt-grab and -ctrl-grab are only valid "

                      "for SDL, ignoring option");
     }
     if (dpy.has_window_close &&
                      "for SDL, ignoring option");
     }
     if (dpy.has_window_close &&


@@ -4328,8 +4240,11 @@ int main(int argc, char **argv, char **envp)
     machine_opts = qemu_get_machine_opts();
     qemu_opt_foreach(machine_opts, machine_set_property, current_machine,
                      &error_fatal);
     machine_opts = qemu_get_machine_opts();
     qemu_opt_foreach(machine_opts, machine_set_property, current_machine,
                      &error_fatal);

+    current_machine->ram_size = ram_size;
+    current_machine->maxram_size = maxram_size;
+    current_machine->ram_slots = ram_slots;

 
 

-    configure_accelerator(current_machine);
+    configure_accelerator(current_machine, argv[0]);

 
     if (!qtest_enabled() && machine_class->deprecation_reason) {
         error_report("Machine type '%s' is deprecated: %s",
 
     if (!qtest_enabled() && machine_class->deprecation_reason) {
         error_report("Machine type '%s' is deprecated: %s",


@@ -4494,8 +4409,6 @@ int main(int argc, char **argv, char **envp)
         exit(1);
     if (foreach_device_config(DEV_PARALLEL, parallel_parse) < 0)
         exit(1);
         exit(1);
     if (foreach_device_config(DEV_PARALLEL, parallel_parse) < 0)
         exit(1);

-    if (foreach_device_config(DEV_VIRTCON, virtcon_parse) < 0)
-        exit(1);

     if (foreach_device_config(DEV_DEBUGCON, debugcon_parse) < 0)
         exit(1);
 
     if (foreach_device_config(DEV_DEBUGCON, debugcon_parse) < 0)
         exit(1);
 


@@ -4525,9 +4438,6 @@ int main(int argc, char **argv, char **envp)
     replay_checkpoint(CHECKPOINT_INIT);
     qdev_machine_init();
 
     replay_checkpoint(CHECKPOINT_INIT);
     qdev_machine_init();
 

-    current_machine->ram_size = ram_size;
-    current_machine->maxram_size = maxram_size;
-    current_machine->ram_slots = ram_slots;

     current_machine->boot_order = boot_order;
 
     /* parse features once if machine provides default cpu_type */
     current_machine->boot_order = boot_order;
 
     /* parse features once if machine provides default cpu_type */


@@ -4540,6 +4450,8 @@ int main(int argc, char **argv, char **envp)
     /* do monitor/qmp handling at preconfig state if requested */
     main_loop();
 
     /* do monitor/qmp handling at preconfig state if requested */
     main_loop();
 

+    audio_init_audiodevs();
+

     /* from here on runstate is RUN_STATE_PRELAUNCH */
     machine_run_board_init(current_machine);
 
     /* from here on runstate is RUN_STATE_PRELAUNCH */
     machine_run_board_init(current_machine);
 


@@ -4670,6 +4582,12 @@ int main(int argc, char **argv, char **envp)
 
     gdbserver_cleanup();
 
 
     gdbserver_cleanup();
 

+    /*
+     * cleaning up the migration object cancels any existing migration
+     * try to do this early so that it also stops using devices.
+     */
+    migration_shutdown();
+

     /* No more vcpu or device emulation activity beyond this point */
     vm_shutdown();
 
     /* No more vcpu or device emulation activity beyond this point */
     vm_shutdown();
 


@@ -4685,7 +4603,6 @@ int main(int argc, char **argv, char **envp)
     monitor_cleanup();
     qemu_chr_cleanup();
     user_creatable_cleanup();
     monitor_cleanup();
     qemu_chr_cleanup();
     user_creatable_cleanup();

-    migration_object_finalize();

     /* TODO: unref root container, check all devices are ok */
 
     return 0;
     /* TODO: unref root container, check all devices are ok */
 
     return 0;