1. 18 12月, 2013 33 次提交
  2. 17 12月, 2013 3 次提交
    • L
      qemu_opts_parse(): always check return value · f46e720a
      Laszlo Ersek 提交于
      qemu_opts_parse() can always return NULL, even if the QemuOptsList.desc in
      question would be trivial to satisfy (eg. because it's empty). For
      example:
      
      qemu_opts_parse()
        opts_parse()
          qemu_opts_create()
            id_wellformed()
      
      In practice:
      
        $ .../qemu-system-x86_64 -acpitable id=3
        qemu-system-x86_64: -acpitable id=3: Parameter 'id' expects an identifier
        **
        ERROR:vl.c:3491:main: assertion failed: (opts != NULL)
        Aborted (core dumped)
      
        $ .../qemu-system-x86_64 -smbios id=3
        qemu-system-x86_64: -smbios id=3: Parameter 'id' expects an identifier
        Segmentation fault (core dumped)
      
      I checked all qemu_opts_parse() invocations (and all drive_def()
      invocations too, because it blindly forwards the former's retval). Only
      the two above examples look problematic.
      Signed-off-by: NLaszlo Ersek <lersek@redhat.com>
      Reviewed-by: NMarkus Armbruster <armbru@redhat.com>
      Message-id: 1385658779-7529-1-git-send-email-lersek@redhat.com
      Signed-off-by: NAnthony Liguori <aliguori@amazon.com>
      f46e720a
    • A
      Merge remote-tracking branch 'spice/tags/pull-spice-1' into staging · b91f9324
      Anthony Liguori 提交于
      Collection of little cleanups anf bugfixes.
      nbd patches in preparation of spice-nbd.
      
      # gpg: Signature made Mon 16 Dec 2013 01:27:45 AM PST using RSA key ID D3E87138
      # gpg: Can't check signature: public key not found
      
      # By Marc-André Lureau (12) and Gerd Hoffmann (4)
      # Via Gerd Hoffmann
      * spice/tags/pull-spice-1:
        spice: stop server for qxl hard reset
        spice: move spice_server_vm_{start,stop} calls into qemu_spice_display_*()
        spice: move qemu_spice_display_*() from spice-graphics to spice-core
        nbd: avoid uninitialized warnings
        nbd: finish any pending coroutine
        nbd: make nbd_client_session_close() idempotent
        nbd: pass export name as init argument
        nbd: don't change socket block during negotiate
        Split nbd block client code
        spice-char: implement chardev port event
        char: add qemu_chr_fe_event()
        include: add missing config-host.h include
        qmp_change_blockdev() remove unused has_format
        spice-char: remove unused field
        vscclient: do not add a socket watch if there is not data to send
        spice: flip streaming video mode to off by default
      b91f9324
    • A
      Merge remote-tracking branch 'kwolf/tags/for-anthony' into staging · 80d6f5ea
      Anthony Liguori 提交于
      Block patches
      
      # gpg: Signature made Fri 13 Dec 2013 09:47:03 AM PST using RSA key ID C88F2FD6
      # gpg: Can't check signature: public key not found
      
      # By Peter Lieven (2) and others
      # Via Kevin Wolf
      * kwolf/tags/for-anthony:
        blkdebug: Use QLIST_FOREACH_SAFE to resume IO
        qemu-img: make progress output more accurate during convert
        block: expect get_block_status errors in bdrv_make_zero
        block/vvfat: Fix compiler warnings for OpenBSD
        qapi-schema.json: Change 1.8 reference to 2.0
        sheepdog: check if '-o redundancy' is passed from user
      
      Message-id: 1386956943-19474-1-git-send-email-kwolf@redhat.com
      Signed-off-by: NAnthony Liguori <aliguori@amazon.com>
      80d6f5ea
  3. 16 12月, 2013 4 次提交