Merge remote-tracking branch 'stefanha/trivial-patches' into staging

* stefanha/trivial-patches:
  linux-user: brk() debugging
  virtio: Remove unneeded g_free() check in virtio_cleanup()
  net: remove extra spaces in help messages
  fmopl: Fix typo in function name
  vl.c: Fix typo in variable name
  ide: fix compilation errors when DEBUG_IDE is set
  cpu-exec.c: Correct comment about this file and indentation cleanup
  CODING_STYLE: Clarify style for enum and function type names
  linux-user: fail execve() if env/args too big

diff --combined hw/ide/piix.c
index aee60aa,76cf209..1030fcc
--- 1/hw/ide/piix.c
--- 2/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@@ -53,7 -53,7 +53,7 @@@ static uint64_t bmdma_read(void *opaque
          break;
      }
  #ifdef DEBUG_IDE
-     printf("bmdma: readb 0x%02x : 0x%02x\n", addr, val);
+     printf("bmdma: readb 0x%02x : 0x%02x\n", (uint8_t)addr, val);
  #endif
      return val;
  }
@@@ -68,7 -68,7 +68,7 @@@ static void bmdma_write(void *opaque, t
      }
  
  #ifdef DEBUG_IDE
-     printf("bmdma: writeb 0x%02x : 0x%02x\n", addr, val);
+     printf("bmdma: writeb 0x%02x : 0x%02x\n", (uint8_t)addr, (uint8_t)val);
  #endif
      switch(addr & 3) {
      case 0:
@@@ -299,11 -299,10 +299,11 @@@ static TypeInfo piix4_ide_info = 
      .class_init    = piix4_ide_class_init,
  };
  
 -static void piix_ide_register(void)
 +static void piix_ide_register_types(void)
  {
      type_register_static(&piix3_ide_info);
      type_register_static(&piix3_ide_xen_info);
      type_register_static(&piix4_ide_info);
  }
 -device_init(piix_ide_register);
 +
 +type_init(piix_ide_register_types)

diff --combined vl.c
index 37f2f96,c4b3aab..9609d2b
--- 1/vl.c
--- 2/vl.c
+++ b/vl.c
@@@ -2030,7 -2030,7 +2030,7 @@@ static int configure_accelerator(void
      const char *p = NULL;
      char buf[10];
      int i, ret;
-     bool accel_initalised = 0;
+     bool accel_initialised = 0;
      bool init_failed = 0;
  
      QemuOptsList *list = qemu_find_opts("machine");
@@@ -2043,7 -2043,7 +2043,7 @@@
          p = "tcg";
      }
  
-     while (!accel_initalised && *p != '\0') {
+     while (!accel_initialised && *p != '\0') {
          if (*p == ':') {
              p++;
          }
@@@ -2064,7 -2064,7 +2064,7 @@@
                      }
                      *(accel_list[i].allowed) = 0;
                  } else {
-                     accel_initalised = 1;
+                     accel_initialised = 1;
                  }
                  break;
              }
@@@ -2074,7 -2074,7 +2074,7 @@@
          }
      }
  
-     if (!accel_initalised) {
+     if (!accel_initialised) {
          fprintf(stderr, "No accelerator found!\n");
          exit(1);
      }
@@@ -2083,7 -2083,7 +2083,7 @@@
          fprintf(stderr, "Back to %s accelerator.\n", accel_list[i].name);
      }
  
-     return !accel_initalised;
+     return !accel_initialised;
  }
  
  void qemu_add_exit_notifier(Notifier *notify)
@@@ -2529,14 -2529,6 +2529,14 @@@ int main(int argc, char **argv, char **
                      exit(1);
                  }
                  break;
 +#ifdef CONFIG_LIBISCSI
 +            case QEMU_OPTION_iscsi:
 +                opts = qemu_opts_parse(qemu_find_opts("iscsi"), optarg, 0);
 +                if (!opts) {
 +                    exit(1);
 +                }
 +                break;
 +#endif
  #ifdef CONFIG_SLIRP
              case QEMU_OPTION_tftp:
                  legacy_tftp_prefix = optarg;
@@@ -2882,10 -2874,12 +2882,10 @@@
                  break;
              case QEMU_OPTION_enable_kvm:
                  olist = qemu_find_opts("machine");
 -                qemu_opts_reset(olist);
                  qemu_opts_parse(olist, "accel=kvm", 0);
                  break;
              case QEMU_OPTION_machine:
                  olist = qemu_find_opts("machine");
 -                qemu_opts_reset(olist);
                  opts = qemu_opts_parse(olist, optarg, 1);
                  if (!opts) {
                      fprintf(stderr, "parse error: %s\n", optarg);
@@@ -3367,7 -3361,7 +3367,7 @@@
      if (foreach_device_config(DEV_DEBUGCON, debugcon_parse) < 0)
          exit(1);
  
 -    module_call_init(MODULE_INIT_DEVICE);
 +    module_call_init(MODULE_INIT_QOM);
  
      /* must be after qdev registration but before machine init */
      if (vga_model) {