qcow: convert QCow to use QCryptoBlock for encryption

[qemu.git] / vl.c

diff --git a/vl.c b/vl.c
index 25e1fb4e9f21427e45ab3b175bd0ad5e3ba1bc93..f7560de622a5b2a071b62429ee9473f5d2d9154f 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -81,16 +81,18 @@ int main(int argc, char **argv)
 #include "sysemu/numa.h"
 #include "exec/gdbstub.h"
 #include "qemu/timer.h"
 #include "sysemu/numa.h"
 #include "exec/gdbstub.h"
 #include "qemu/timer.h"

-#include "sysemu/char.h"
+#include "chardev/char.h"

 #include "qemu/bitmap.h"
 #include "qemu/log.h"
 #include "sysemu/blockdev.h"
 #include "hw/block/block.h"
 #include "qemu/bitmap.h"
 #include "qemu/log.h"
 #include "sysemu/blockdev.h"
 #include "hw/block/block.h"

-#include "migration/block.h"
+#include "migration/misc.h"
+#include "migration/snapshot.h"
+#include "migration/global_state.h"

 #include "sysemu/tpm.h"
 #include "sysemu/dma.h"
 #include "sysemu/tpm.h"
 #include "sysemu/dma.h"

+#include "hw/audio/soundhw.h"

 #include "audio/audio.h"
 #include "audio/audio.h"

-#include "migration/migration.h"

 #include "sysemu/cpus.h"
 #include "migration/colo.h"
 #include "sysemu/kvm.h"
 #include "sysemu/cpus.h"
 #include "migration/colo.h"
 #include "sysemu/kvm.h"


@@ -186,7 +188,6 @@ bool boot_strict;
 uint8_t *boot_splash_filedata;
 size_t boot_splash_filedata_size;
 uint8_t qemu_extra_params_fw[2];
 uint8_t *boot_splash_filedata;
 size_t boot_splash_filedata_size;
 uint8_t qemu_extra_params_fw[2];

-int only_migratable; /* turn it off unless user states otherwise */

 
 int icount_align_option;
 
 
 int icount_align_option;
 


@@ -1435,6 +1436,9 @@ static int usb_parse(const char *cmdline)
 void hmp_usb_add(Monitor *mon, const QDict *qdict)
 {
     const char *devname = qdict_get_str(qdict, "devname");
 void hmp_usb_add(Monitor *mon, const QDict *qdict)
 {
     const char *devname = qdict_get_str(qdict, "devname");

+
+    error_report("usb_add is deprecated, please use device_add instead");
+

     if (usb_device_add(devname) < 0) {
         error_report("could not add USB device '%s'", devname);
     }
     if (usb_device_add(devname) < 0) {
         error_report("could not add USB device '%s'", devname);
     }


@@ -1443,6 +1447,9 @@ void hmp_usb_add(Monitor *mon, const QDict *qdict)
 void hmp_usb_del(Monitor *mon, const QDict *qdict)
 {
     const char *devname = qdict_get_str(qdict, "devname");
 void hmp_usb_del(Monitor *mon, const QDict *qdict)
 {
     const char *devname = qdict_get_str(qdict, "devname");

+
+    error_report("usb_del is deprecated, please use device_del instead");
+

     if (usb_device_del(devname) < 0) {
         error_report("could not delete USB device '%s'", devname);
     }
     if (usb_device_del(devname) < 0) {
         error_report("could not delete USB device '%s'", devname);
     }


@@ -2140,7 +2147,7 @@ static DisplayType select_display(const char *p)
             exit(1);
         }
     } else if (strstart(p, "egl-headless", &opts)) {
             exit(1);
         }
     } else if (strstart(p, "egl-headless", &opts)) {

-#ifdef CONFIG_OPENGL
+#ifdef CONFIG_OPENGL_DMABUF

         request_opengl = 1;
         display_opengl = 1;
         display = DT_EGL;
         request_opengl = 1;
         display_opengl = 1;
         display = DT_EGL;


@@ -2961,6 +2968,25 @@ static int qemu_read_default_config_file(void)
     return 0;
 }
 
     return 0;
 }
 

+static void user_register_global_props(void)
+{
+    qemu_opts_foreach(qemu_find_opts("global"),
+                      global_init_func, NULL, NULL);
+}
+
+/*
+ * Note: we should see that these properties are actually having a
+ * priority: accel < machine < user. This means e.g. when user
+ * specifies something in "-global", it'll always be used with highest
+ * priority than either machine/accelerator compat properties.
+ */
+static void register_global_properties(MachineState *ms)
+{
+    accel_register_compat_props(ms->accelerator);
+    machine_register_compat_props(ms);
+    user_register_global_props();
+}
+

 int main(int argc, char **argv, char **envp)
 {
     int i;
 int main(int argc, char **argv, char **envp)
 {
     int i;


@@ -3749,26 +3775,25 @@ int main(int argc, char **argv, char **envp)
                 qdev_prop_register_global(&kvm_pit_lost_tick_policy);
                 break;
             }
                 qdev_prop_register_global(&kvm_pit_lost_tick_policy);
                 break;
             }

-            case QEMU_OPTION_accel: {
-                QemuOpts *accel_opts;
-
+            case QEMU_OPTION_accel:

                 accel_opts = qemu_opts_parse_noisily(qemu_find_opts("accel"),
                                                      optarg, true);
                 optarg = qemu_opt_get(accel_opts, "accel");
                 if (!optarg || is_help_option(optarg)) {
                     error_printf("Possible accelerators: kvm, xen, hax, tcg\n");
                 accel_opts = qemu_opts_parse_noisily(qemu_find_opts("accel"),
                                                      optarg, true);
                 optarg = qemu_opt_get(accel_opts, "accel");
                 if (!optarg || is_help_option(optarg)) {
                     error_printf("Possible accelerators: kvm, xen, hax, tcg\n");

-                    exit(1);
+                    exit(0);

                 }
                 }

-                accel_opts = qemu_opts_create(qemu_find_opts("machine"), NULL,
-                                              false, &error_abort);
-                qemu_opt_set(accel_opts, "accel", optarg, &error_abort);
+                opts = qemu_opts_create(qemu_find_opts("machine"), NULL,
+                                        false, &error_abort);
+                qemu_opt_set(opts, "accel", optarg, &error_abort);

                 break;
                 break;

-            }

             case QEMU_OPTION_usb:
                 olist = qemu_find_opts("machine");
                 qemu_opts_parse_noisily(olist, "usb=on", false);
                 break;
             case QEMU_OPTION_usbdevice:
             case QEMU_OPTION_usb:
                 olist = qemu_find_opts("machine");
                 qemu_opts_parse_noisily(olist, "usb=on", false);
                 break;
             case QEMU_OPTION_usbdevice:

+                error_report("'-usbdevice' is deprecated, please use "
+                             "'-device usb-...' instead");

                 olist = qemu_find_opts("machine");
                 qemu_opts_parse_noisily(olist, "usb=on", false);
                 add_device_config(DEV_USB, optarg);
                 olist = qemu_find_opts("machine");
                 qemu_opts_parse_noisily(olist, "usb=on", false);
                 add_device_config(DEV_USB, optarg);


@@ -3908,9 +3933,13 @@ int main(int argc, char **argv, char **envp)
                 configure_rtc(opts);
                 break;
             case QEMU_OPTION_tb_size:
                 configure_rtc(opts);
                 break;
             case QEMU_OPTION_tb_size:

-                tcg_tb_size = strtol(optarg, NULL, 0);
-                if (tcg_tb_size < 0) {
-                    tcg_tb_size = 0;
+                if (!tcg_enabled()) {
+                    error_report("TCG is disabled");
+                    exit(1);
+                }
+                if (qemu_strtoul(optarg, NULL, 0, &tcg_tb_size) < 0) {
+                    error_report("Invalid argument to -tb-size");
+                    exit(1);

                 }
                 break;
             case QEMU_OPTION_icount:
                 }
                 break;
             case QEMU_OPTION_icount:


@@ -3927,7 +3956,13 @@ int main(int argc, char **argv, char **envp)
                 incoming = optarg;
                 break;
             case QEMU_OPTION_only_migratable:
                 incoming = optarg;
                 break;
             case QEMU_OPTION_only_migratable:

-                only_migratable = 1;
+                /*
+                 * TODO: we can remove this option one day, and we
+                 * should all use:
+                 *
+                 * "-global migration.only-migratable=true"
+                 */
+                qemu_global_option("migration.only-migratable=true");

                 break;
             case QEMU_OPTION_nodefaults:
                 has_defaults = 0;
                 break;
             case QEMU_OPTION_nodefaults:
                 has_defaults = 0;


@@ -4383,6 +4418,18 @@ int main(int argc, char **argv, char **envp)
 
     configure_accelerator(current_machine);
 
 
     configure_accelerator(current_machine);
 

+    /*
+     * Register all the global properties, including accel properties,
+     * machine properties, and user-specified ones.
+     */
+    register_global_properties(current_machine);
+
+    /*
+     * Migration object can only be created after global properties
+     * are applied correctly.
+     */
+    migration_object_init();
+

     if (qtest_chrdev) {
         qtest_init(qtest_chrdev, qtest_log, &error_fatal);
     }
     if (qtest_chrdev) {
         qtest_init(qtest_chrdev, qtest_log, &error_fatal);
     }


@@ -4450,7 +4497,9 @@ int main(int argc, char **argv, char **envp)
         qemu_opts_del(icount_opts);
     }
 
         qemu_opts_del(icount_opts);
     }
 

-    qemu_tcg_configure(accel_opts, &error_fatal);
+    if (tcg_enabled()) {
+        qemu_tcg_configure(accel_opts, &error_fatal);
+    }

 
     if (default_net) {
         QemuOptsList *net = qemu_find_opts("net");
 
     if (default_net) {
         QemuOptsList *net = qemu_find_opts("net");


@@ -4564,11 +4613,6 @@ int main(int argc, char **argv, char **envp)
             exit (i == 1 ? 1 : 0);
     }
 
             exit (i == 1 ? 1 : 0);
     }
 

-    machine_register_compat_props(current_machine);
-
-    qemu_opts_foreach(qemu_find_opts("global"),
-                      global_init_func, NULL, NULL);
-

     /* This checkpoint is required by replay to separate prior clock
        reading from the other reads, because timer polling functions query
        clock values from the log. */
     /* This checkpoint is required by replay to separate prior clock
        reading from the other reads, because timer polling functions query
        clock values from the log. */


@@ -4585,7 +4629,7 @@ int main(int argc, char **argv, char **envp)
 
     realtime_init();
 
 
     realtime_init();
 

-    audio_init();
+    soundhw_init();

 
     if (hax_enabled()) {
         hax_sync_vcpus();
 
     if (hax_enabled()) {
         hax_sync_vcpus();


@@ -4679,7 +4723,7 @@ int main(int argc, char **argv, char **envp)
         qemu_spice_display_init();
     }
 
         qemu_spice_display_init();
     }
 

-#ifdef CONFIG_OPENGL
+#ifdef CONFIG_OPENGL_DMABUF

     if (display_type == DT_EGL) {
         egl_headless_init();
     }
     if (display_type == DT_EGL) {
         egl_headless_init();
     }


@@ -4713,7 +4757,7 @@ int main(int argc, char **argv, char **envp)
         replay_vmstate_init();
     } else if (loadvm) {
         Error *local_err = NULL;
         replay_vmstate_init();
     } else if (loadvm) {
         Error *local_err = NULL;

-        if (load_vmstate(loadvm, &local_err) < 0) {
+        if (load_snapshot(loadvm, &local_err) < 0) {

             error_report_err(local_err);
             autostart = 0;
         }
             error_report_err(local_err);
             autostart = 0;
         }