1. 11 1月, 2013 1 次提交
  2. 07 1月, 2013 1 次提交
  3. 03 1月, 2013 1 次提交
    • M
      disallow -daemonize usage of stdio (curses display, -nographic, -serial stdio etc) · ab51b1d5
      Michael Tokarev 提交于
      Curses display requires stdin/out to stay on the terminal,
      so -daemonize makes no sense in this case.  Instead of
      leaving display uninitialized like is done since 995ee2bf,
      explicitly detect this case earlier and error out.
      
      -nographic can actually be used with -daemonize, by redirecting
      everything to a null device, but the problem is that according
      to documentation and historical behavour, -nographic redirects
      guest ports to stdin/out, which, again, makes no sense in case
      of -daemonize.  Since -nographic is a legacy option, don't bother
      fixing this case (to allow -nographic and -daemonize by redirecting
      guest ports to null instead of stdin/out in this case), but disallow
      it completely instead, to stop garbling host terminal.
      
      If no display display needed and user wants to use -nographic,
      the right way to go is to use
        -serial null -parallel null -monitor none -display none -vga none
      instead of -nographic.
      
      Also prevent the same issue -- it was possible to get garbled
      host tty after
      
        -nographic -daemonize
      
      and it is still possible to have it by using
      
        -serial stdio -daemonize
      
      Fix this by disallowing opening stdio chardev when -daemonize
      is specified.
      Signed-off-by: NMichael Tokarev <mjt@tls.msk.ru>
      Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
      ab51b1d5
  4. 19 12月, 2012 10 次提交
  5. 11 12月, 2012 3 次提交
  6. 27 11月, 2012 2 次提交
    • P
      vl.c: Fix broken -usb option · fa5358c6
      Peter Maydell 提交于
      Commit 094b287f accidentally broke the "-usb" command line
      option, so it would have no effect if the user had not specified
      any machine options at that point. (the return value from
      'qemu_opts_find(qemu_find_opts("machine"), 0);' is NULL if there
      are no user specified options, so it is only to be used for
      looking up an option, not when trying to set one.) Similarly,
      would '-usbdevice' no longer cause USB to default to enabled.
      
      Fix this regression by using the same style of code for forcing
      the usb=on machine option that we use for other aliases such as
      '-enable-kvm'.
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
      fa5358c6
    • P
      vl.c: Fix broken -usb option · c4d88267
      Peter Maydell 提交于
      Commit 094b287f accidentally broke the "-usb" command line
      option, so it would have no effect if the user had not specified
      any machine options at that point. (the return value from
      'qemu_opts_find(qemu_find_opts("machine"), 0);' is NULL if there
      are no user specified options, so it is only to be used for
      looking up an option, not when trying to set one.) Similarly,
      would '-usbdevice' no longer cause USB to default to enabled.
      
      Fix this regression by using the same style of code for forcing
      the usb=on machine option that we use for other aliases such as
      '-enable-kvm'.
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      Signed-off-by: NAlexander Graf <agraf@suse.de>
      c4d88267
  7. 16 11月, 2012 1 次提交
  8. 03 11月, 2012 2 次提交
  9. 02 11月, 2012 1 次提交
  10. 01 11月, 2012 5 次提交
  11. 31 10月, 2012 5 次提交
  12. 30 10月, 2012 2 次提交
  13. 29 10月, 2012 1 次提交
    • Z
      Add USB option in machine options · 094b287f
      zhlcindy@gmail.com 提交于
      When -usb option is used, global varible usb_enabled is set.
      And all the plaform will create one USB controller according
      to this variable. In fact, global varibles make code hard
      to read.
      
      So this patch is to remove global variable usb_enabled and
      add USB option in machine options. All the plaforms will get
      USB option value from machine options.
      
      USB option of machine options will be set either by:
        * -usb
        * -machine type=pseries,usb=on
      
      Both these ways can work now. They both set USB option in
      machine options. In the future, the first way will be removed.
      Signed-off-by: NLi Zhang <zhlcindy@linux.vnet.ibm.com>
      Acked-by: NAlexander Graf <agraf@suse.de>
      Signed-off-by: NAlexander Graf <agraf@suse.de>
      094b287f
  14. 24 10月, 2012 2 次提交
    • P
      migration: go to paused state after finishing incoming migration with -S · 29ed72f1
      Paolo Bonzini 提交于
      At the end of migration the machine has started already, and cannot be
      destroyed without losing the guest's data.  Hence, prelaunch is the
      wrong state.  Go to the paused state instead.  QEMU would reach that
      state anyway (after running the guest for the blink of an eye) if the
      "stop" command had been received after the start of migration.
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      Signed-off-by: NLuiz Capitulino <lcapitulino@redhat.com>
      29ed72f1
    • C
      qemu-config: Add new -add-fd command line option · 587ed6be
      Corey Bryant 提交于
      This option can be used for passing file descriptors on the
      command line.  It mirrors the existing add-fd QMP command which
      allows an fd to be passed to QEMU via SCM_RIGHTS and added to an
      fd set.
      
      This can be combined with commands such as -drive to link file
      descriptors in an fd set to a drive:
      
          qemu-kvm -add-fd fd=3,set=2,opaque="rdwr:/path/to/file"
                   -add-fd fd=4,set=2,opaque="rdonly:/path/to/file"
                   -drive file=/dev/fdset/2,index=0,media=disk
      
      This example adds dups of fds 3 and 4, and the accompanying opaque
      strings to the fd set with ID=2.  qemu_open() already knows how
      to handle a filename of this format.  qemu_open() searches the
      corresponding fd set for an fd and when it finds a match, QEMU
      goes on to use a dup of that fd just like it would have used an
      fd that it opened itself.
      Signed-off-by: NCorey Bryant <coreyb@linux.vnet.ibm.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      587ed6be
  15. 23 10月, 2012 2 次提交
  16. 20 10月, 2012 1 次提交
    • E
      create struct for machine initialization arguments · 5f072e1f
      Eduardo Habkost 提交于
      This should help us to:
      - More easily add or remove machine initialization arguments without
        having to change every single machine init function;
      - More easily make mechanical changes involving the machine init
        functions in the future;
      - Let machine initialization forward the init arguments to other
        functions more easily.
      
      This change was half-mechanical process: first the struct was added with
      the local ram_size, boot_device, kernel_*, initrd_*, and cpu_model local
      variable initialization to all functions. Then the compiler helped me
      locate the local variables that are unused, so they could be removed.
      Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>
      5f072e1f