1. 26 9月, 2015 3 次提交
    • P
      Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150925.0' into staging · 8bfbbb4b
      Peter Maydell 提交于
      VFIO updates 2015-09-25
      
       - Remove use of g_malloc0_n for glib2.22 compat
      
      # gpg: Signature made Fri 25 Sep 2015 17:58:04 BST using RSA key ID 3BB08B22
      # gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>"
      # gpg:                 aka "Alex Williamson <alex@shazbot.org>"
      # gpg:                 aka "Alex Williamson <alwillia@redhat.com>"
      # gpg:                 aka "Alex Williamson <alex.l.williamson@gmail.com>"
      
      * remotes/awilliam/tags/vfio-update-20150925.0:
        vfio/pci: Remove use of g_malloc0_n() from quirks
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      8bfbbb4b
    • P
      Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging · 54b37623
      Peter Maydell 提交于
      # gpg: Signature made Fri 25 Sep 2015 16:47:31 BST using RSA key ID C0DE3057
      # gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
      # gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
      # gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
      
      * remotes/cody/tags/block-pull-request:
        sheepdog: refine discard support
        sheepdog: use per AIOCB dirty indexes for non overlapping requests
        Backup: don't do copy-on-read in before_write_notifier
        block: Introduce a new API bdrv_co_no_copy_on_readv()
        sheepdog: add reopen support
        block/nfs: cache allocated filesize for read-only files
        block/nfs: fix calculation of allocated file size
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      54b37623
    • P
      Merge remote-tracking branch 'remotes/vivier-misc/tags/pull-muldiv64-20150925' into staging · 690b286f
      Peter Maydell 提交于
      Remove muldiv64() by using period instead of frequency
      
      # gpg: Signature made Fri 25 Sep 2015 14:54:37 BST using RSA key ID 3F2FBE3C
      # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
      # gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
      # gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
      # gpg: WARNING: This key is not certified with a trusted signature!
      # gpg:          There is no indication that the signature belongs to the owner.
      # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C
      
      * remotes/vivier-misc/tags/pull-muldiv64-20150925:
        net: remove muldiv64()
        bt: remove muldiv64()
        hpet: remove muldiv64()
        arm: clarify the use of muldiv64()
        openrisc: remove muldiv64()
        mips: remove muldiv64()
        pcnet: remove muldiv64()
        rtl8139: remove muldiv64()
        i6300esb: remove muldiv64()
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      690b286f
  2. 25 9月, 2015 26 次提交
    • P
      Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · cdf98182
      Peter Maydell 提交于
      virtio,pc features, fixes
      
      New features:
          vhost-user multiqueue support
          virtio-ccw virtio 1 support
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      
      # gpg: Signature made Fri 25 Sep 2015 07:40:35 BST using RSA key ID D28D5469
      # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
      # gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
      
      * remotes/mst/tags/for_upstream:
        MAINTAINERS: add more devices to the PCI section
        MAINTAINERS: add more devices to the PC section
        vhost-user: add a new message to disable/enable a specific virt queue.
        vhost-user: add multiple queue support
        vhost: introduce vhost_backend_get_vq_index method
        vhost-user: add VHOST_USER_GET_QUEUE_NUM message
        vhost: rename VHOST_RESET_OWNER to VHOST_RESET_DEVICE
        vhost-user: add protocol feature negotiation
        vhost-user: use VHOST_USER_XXX macro for switch statement
        virtio-ccw: enable virtio-1
        virtio-ccw: feature bits > 31 handling
        virtio-ccw: support ring size changes
        virtio: ring sizes vs. reset
        pc: Introduce pc-*-2.5 machine classes
        q35: Move options common to all classes to pc_i440fx_machine_options()
        q35: Move options common to all classes to pc_q35_machine_options()
        virtio-net: unbreak self announcement and guest offloads after migration
        virtio: right size for virtio_queue_get_avail_size
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      cdf98182
    • H
      sheepdog: refine discard support · e6fd57ea
      Hitoshi Mitake 提交于
      This patch refines discard support of the sheepdog driver. The
      existing discard mechanism was implemented on SD_OP_DISCARD_OBJ, which
      was introduced before fine grained reference counting on newer
      sheepdog. It doesn't care about relations of snapshots and clones and
      discards objects unconditionally.
      
      With this patch, the driver just updates an inode object for updating
      reference. Removing the object is done in sheep process side.
      
      Cc: Teruaki Ishizaki <ishizaki.teruaki@lab.ntt.co.jp>
      Cc: Vasiliy Tolstov <v.tolstov@selfip.ru>
      Cc: Jeff Cody <jcody@redhat.com>
      Signed-off-by: NHitoshi Mitake <mitake.hitoshi@lab.ntt.co.jp>
      Tested-by: NVasiliy Tolstov <v.tolstov@selfip.ru>
      Message-id: 1441076590-8015-3-git-send-email-mitake.hitoshi@lab.ntt.co.jp
      Signed-off-by: NJeff Cody <jcody@redhat.com>
      e6fd57ea
    • H
      sheepdog: use per AIOCB dirty indexes for non overlapping requests · 498f2140
      Hitoshi Mitake 提交于
      In the commit 96b14ff85acf, requests for overlapping areas are
      serialized. However, it cannot handle a case of non overlapping
      requests. In such a case, min_dirty_data_idx and max_dirty_data_idx
      can be overwritten by the requests and invalid inode update can
      happen e.g. a case like create(1, 2) and create(3, 4) are issued in
      parallel.
      
      This patch lets SheepdogAIOCB have dirty data indexes instead of
      BDRVSheepdogState for avoiding the above situation.
      
      This patch also does trivial renaming for better description:
      overwrapping -> overlapping
      
      Cc: Teruaki Ishizaki <ishizaki.teruaki@lab.ntt.co.jp>
      Cc: Vasiliy Tolstov <v.tolstov@selfip.ru>
      Cc: Jeff Cody <jcody@redhat.com>
      Signed-off-by: NHitoshi Mitake <mitake.hitoshi@lab.ntt.co.jp>
      Tested-by: NVasiliy Tolstov <v.tolstov@selfip.ru>
      Message-id: 1441076590-8015-2-git-send-email-mitake.hitoshi@lab.ntt.co.jp
      Signed-off-by: NJeff Cody <jcody@redhat.com>
      498f2140
    • L
      net: remove muldiv64() · ab60b748
      Laurent Vivier 提交于
      muldiv64() is used to convert nanoseconds to microseconds.
      
          x = muldiv64(qemu_clock_get_ns(..), 1000000, get_ticks_per_sec());
      
      As  get_ticks_per_sec() is 10^9, it can be replaced by:
      
          x = qemu_clock_get_us(..);
      Signed-off-by: NLaurent Vivier <lvivier@redhat.com>
      Reviewed-by: NStefan Hajnoczi <stefanha@redhat.com>
      ab60b748
    • L
      bt: remove muldiv64() · fdfea124
      Laurent Vivier 提交于
      Originally, timers were ticks based, and it made sense to
      add ticks to current time to know when to trigger an alarm.
      
      But since commit:
      
      74475455 change all other clock references to use nanosecond resolution accessors
      
      All timers use nanoseconds and we need to convert ticks to nanoseconds.
      
      As get_ticks_per_sec() is 10^9,
      
          a = muldiv64(b, get_ticks_per_sec(), 100);
          y = muldiv64(x, get_ticks_per_sec(), 1000000);
      
      can be converted to
      
          a = b * 10000000;
          y = x * 1000;
      Signed-off-by: NLaurent Vivier <lvivier@redhat.com>
      Reviewed-by: NPaolo Bonzini <pbonzini@redhat.com>
      fdfea124
    • L
      hpet: remove muldiv64() · 0a4f9240
      Laurent Vivier 提交于
      hpet defines a clock period in femtoseconds but
      then converts it to nanoseconds to use the internal
      timers.
      
      We can define the period in nanoseconds and use it
      directly, this allows to remove muldiv64().
      
      We only need to convert the period to femtoseconds
      to put it in internal hpet capability register.
      Signed-off-by: NLaurent Vivier <lvivier@redhat.com>
      Reviewed-by: NPaolo Bonzini <pbonzini@redhat.com>
      0a4f9240
    • L
      arm: clarify the use of muldiv64() · 352c98e5
      Laurent Vivier 提交于
      muldiv64() is used to convert microseconds into CPU ticks.
      
      But it is not clear and not commented. This patch uses macro
      to clearly identify what is used: time, CPU frequency and ticks.
      For an elapsed time and a given frequency, we compute how many ticks
       we have.
      Signed-off-by: NLaurent Vivier <lvivier@redhat.com>
      Reviewed-by: NPeter Crosthwaite <crosthwaite.peter@gmail.com>
      Acked-by: NPeter Maydell <peter.maydell@linaro.org>
      352c98e5
    • L
      openrisc: remove muldiv64() · ccaf1749
      Laurent Vivier 提交于
      Originally, timers were ticks based, and it made sense to
      add ticks to current time to know when to trigger an alarm.
      
      But since commit:
      
      74475455 change all other clock references to use nanosecond resolution accessors
      
      All timers use nanoseconds and we need to convert ticks to nanoseconds, by
      doing something like:
      
          y = muldiv64(x, get_ticks_per_sec(), TIMER_FREQ)
      
      where x is the number of device ticks and y the number of system ticks.
      
      y is used as nanoseconds in timer functions,
      it works because 1 tick is 1 nanosecond.
      (get_ticks_per_sec() is 10^9)
      
      But as openrisc timer frequency is 20 MHz, we can also do:
      
          y = x * 50; /* 20 MHz period is 50 ns */
      Signed-off-by: NLaurent Vivier <lvivier@redhat.com>
      ccaf1749
    • L
      mips: remove muldiv64() · 683dca6b
      Laurent Vivier 提交于
      Originally, timers were ticks based, and it made sense to
      add ticks to current time to know when to trigger an alarm.
      
      But since commit:
      
      74475455 change all other clock references to use nanosecond resolution accessors
      
      All timers use nanoseconds and we need to convert ticks to nanoseconds, by
      doing something like:
      
          y = muldiv64(x, get_ticks_per_sec(), TIMER_FREQ)
      
      where x is the number of device ticks and y the number of system ticks.
      
      y is used as nanoseconds in timer functions,
      it works because 1 tick is 1 nanosecond.
      (get_ticks_per_sec() is 10^9)
      
      But as MIPS timer frequency is 100 MHz, we can also do:
      
          y = x * 10; /* 100 MHz period is 10 ns */
      Signed-off-by: NLaurent Vivier <lvivier@redhat.com>
      Reviewed-by: NLeon Alrae <leon.alrae@imgtec.com>
      683dca6b
    • L
      pcnet: remove muldiv64() · c6acbe86
      Laurent Vivier 提交于
      Originally, timers were ticks based, and it made sense to
      add ticks to current time to know when to trigger an alarm.
      
      But since commit:
      
      74475455 change all other clock references to use nanosecond resolution accessors
      
      All timers use nanoseconds and we need to convert ticks to nanoseconds, by
      doing something like:
      
          y = muldiv64(x, get_ticks_per_sec(), PCI_FREQUENCY)
      
      where x is the number of device ticks and y the number of system ticks.
      
      y is used as nanoseconds in timer functions,
      it works because 1 tick is 1 nanosecond.
      (get_ticks_per_sec() is 10^9)
      
      But as PCI frequency is 33 MHz, we can also do:
      
          y = x * 30; /* 33 MHz PCI period is 30 ns */
      
      Which is much more simple.
      
      This implies a 33.333333 MHz PCI frequency,
      but this is correct.
      Signed-off-by: NLaurent Vivier <lvivier@redhat.com>
      Reviewed-by: NStefan Hajnoczi <stefanha@redhat.com>
      c6acbe86
    • L
      rtl8139: remove muldiv64() · 37b9ab92
      Laurent Vivier 提交于
      Originally, timers were ticks based, and it made sense to
      add ticks to current time to know when to trigger an alarm.
      
      But since commit:
      
      74475455 change all other clock references to use nanosecond resolution accessors
      
      All timers use nanoseconds and we need to convert ticks to nanoseconds, by
      doing something like:
      
          y = muldiv64(x, get_ticks_per_sec(), PCI_FREQUENCY)
      
      where x is the number of device ticks and y the number of system ticks.
      
      y is used as nanoseconds in timer functions,
      it works because 1 tick is 1 nanosecond.
      (get_ticks_per_sec() is 10^9)
      
      But as PCI frequency is 33 MHz, we can also do:
      
          y = x * 30; /* 33 MHz PCI period is 30 ns */
      
      Which is much more simple.
      
      This implies a 33.333333 MHz PCI frequency,
      but this is correct.
      Signed-off-by: NLaurent Vivier <lvivier@redhat.com>
      Reviewed-by: NStefan Hajnoczi <stefanha@redhat.com>
      37b9ab92
    • L
      i6300esb: remove muldiv64() · 9491e9bc
      Laurent Vivier 提交于
      Originally, timers were ticks based, and it made sense to
      add ticks to current time to know when to trigger an alarm.
      
      But since commit:
      
      74475455 change all other clock references to use nanosecond resolution accessors
      
      All timers use nanoseconds and we need to convert ticks to nanoseconds, by
      doing something like:
      
          y = muldiv64(x, get_ticks_per_sec(), PCI_FREQUENCY)
      
      where x is the number of device ticks and y the number of system ticks.
      
      y is used as nanoseconds in timer functions,
      it works because 1 tick is 1 nanosecond.
      (get_ticks_per_sec() is 10^9)
      
      But as PCI frequency is 33 MHz, we can also do:
      
          y = x * 30; /* 33 MHz PCI period is 30 ns */
      
      Which is much more simple.
      
      This implies a 33.333333 MHz PCI frequency,
      but this is correct.
      Signed-off-by: NLaurent Vivier <lvivier@redhat.com>
      9491e9bc
    • W
      Backup: don't do copy-on-read in before_write_notifier · 06c3916b
      Wen Congyang 提交于
      We will copy data in before_write_notifier to do backup.
      It is a nested I/O request, so we cannot do copy-on-read.
      
      The steps to reproduce it:
      1. -drive copy-on-read=on,...  // qemu option
      2. drive_backup -f disk0 /path_to_backup.img // monitor command
      Signed-off-by: NWen Congyang <wency@cn.fujitsu.com>
      Tested-by: NJeff Cody <jcody@redhat.com>
      Message-id: 1441682913-14320-3-git-send-email-wency@cn.fujitsu.com
      Signed-off-by: NJeff Cody <jcody@redhat.com>
      06c3916b
    • W
      block: Introduce a new API bdrv_co_no_copy_on_readv() · 9568b511
      Wen Congyang 提交于
      In some cases, we need to disable copy-on-read, and just
      read the data.
      Signed-off-by: NWen Congyang <wency@cn.fujitsu.com>
      Message-id: 1441682913-14320-2-git-send-email-wency@cn.fujitsu.com
      Signed-off-by: NJeff Cody <jcody@redhat.com>
      9568b511
    • L
      sheepdog: add reopen support · 4da65c80
      Liu Yuan 提交于
      With reopen supported, block-commit (and offline commit) is now supported for
      image files whose base image uses the Sheepdog protocol driver.
      
      Cc: qemu-devel@nongnu.org
      Cc: Jeff Cody <jcody@redhat.com>
      Cc: Kevin Wolf <kwolf@redhat.com>
      Cc: Stefan Hajnoczi <stefanha@redhat.com>
      Signed-off-by: NLiu Yuan <liuyuan@cmss.chinamobile.com>
      Message-id: 1440730438-24676-1-git-send-email-namei.unix@gmail.com
      Signed-off-by: NJeff Cody <jcody@redhat.com>
      4da65c80
    • P
      block/nfs: cache allocated filesize for read-only files · 18a8056e
      Peter Lieven 提交于
      If the file is readonly its not expected to grow so
      save the blocking call to nfs_fstat_async and use
      the value saved at connection time. Also important
      the monitor (and thus the main loop) will not hang
      if block device info is queried and the NFS share
      is unresponsive.
      Signed-off-by: NPeter Lieven <pl@kamp.de>
      Reviewed-by: NJeff Cody <jcody@redhat.com>
      Reviewed-by: NMax Reitz <mreitz@redhat.com>
      Message-id: 1440671441-7978-1-git-send-email-pl@kamp.de
      Signed-off-by: NJeff Cody <jcody@redhat.com>
      18a8056e
    • P
      block/nfs: fix calculation of allocated file size · 055c6f91
      Peter Lieven 提交于
      st.st_blocks is always counted in 512 byte units. Do not
      use st.st_blksize as multiplicator which may be larger.
      
      Cc: qemu-stable@nongnu.org
      Signed-off-by: NPeter Lieven <pl@kamp.de>
      Reviewed-by: NMax Reitz <mreitz@redhat.com>
      Reviewed-by: NJeff Cody <jcody@redhat.com>
      Message-id: 1440067607-14547-1-git-send-email-pl@kamp.de
      Signed-off-by: NJeff Cody <jcody@redhat.com>
      055c6f91
    • P
      MAINTAINERS: add more devices to the PCI section · f178bc6b
      Paolo Bonzini 提交于
      Cc: Michael S. Tsirkin <mst@redhat.com>
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      Reviewed-by: NMichael S. Tsirkin <mst@redhat.com>
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      f178bc6b
    • P
      MAINTAINERS: add more devices to the PC section · 9cc3b73c
      Paolo Bonzini 提交于
      For chipset devices, I can co-maintain it with Michael.
      
      Cc: Michael S. Tsirkin <mst@redhat.com>
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      Reviewed-by: NMichael S. Tsirkin <mst@redhat.com>
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      9cc3b73c
    • P
      Merge remote-tracking branch 'remotes/weil/tags/pull-wxx-20150924' into staging · 8a47d575
      Peter Maydell 提交于
      wxx patch queue
      
      # gpg: Signature made Thu 24 Sep 2015 20:24:50 BST using RSA key ID 677450AD
      # gpg: Good signature from "Stefan Weil <sw@weilnetz.de>"
      # gpg:                 aka "Stefan Weil <stefan.weil@weilnetz.de>"
      # gpg:                 aka "Stefan Weil <stefan.weil@bib.uni-mannheim.de>"
      # gpg: WARNING: This key is not certified with sufficiently trusted signatures!
      # gpg:          It is not certain that the signature belongs to the owner.
      # Primary key fingerprint: 4923 6FEA 75C9 5D69 8EC2  B78A E08C 21D5 6774 50AD
      
      * remotes/weil/tags/pull-wxx-20150924:
        oslib-win32: only provide localtime_r/gmtime_r if missing
        gtk: avoid redefining _WIN32_WINNT macro
        qemu-thread: add a fast path to the Win32 QemuEvent
        slirp: Fix non blocking connect for w32
        nsis: Add QEMU version information to Windows registry
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      8a47d575
    • D
      oslib-win32: only provide localtime_r/gmtime_r if missing · 4d9310f4
      Daniel P. Berrange 提交于
      The oslib-win32 file currently provides a localtime_r and
      gmtime_r replacement unconditionally. Some versions of
      Mingw-w64 would provide crude macros for localtime_r/gmtime_r
      which QEMU takes care to disable. Latest versions of Mingw-w64
      now provide actual functions for localtime_r/gmtime_r, but
      with a twist that you have to include unistd.h or pthread.h
      before including time.h.  By luck some files in QEMU have
      such an include order, resulting in compile errors:
      
        CC    util/osdep.o
      In file included from include/qemu-common.h:48:0,
                       from util/osdep.c:48:
      include/sysemu/os-win32.h:77:12: error: redundant redeclaration of 'gmtime_r' [-Werror=redundant-decls]
       struct tm *gmtime_r(const time_t *timep, struct tm *result);
                  ^
      In file included from include/qemu-common.h:35:0,
                       from util/osdep.c:48:
      /usr/i686-w64-mingw32/sys-root/mingw/include/time.h:272:107: note: previous definition of 'gmtime_r' was here
      In file included from include/qemu-common.h:48:0,
                       from util/osdep.c:48:
      include/sysemu/os-win32.h:79:12: error: redundant redeclaration of 'localtime_r' [-Werror=redundant-decls]
       struct tm *localtime_r(const time_t *timep, struct tm *result);
                  ^
      In file included from include/qemu-common.h:35:0,
                       from util/osdep.c:48:
      /usr/i686-w64-mingw32/sys-root/mingw/include/time.h:269:107: note: previous definition of 'localtime_r' was here
      
      This change adds a configure test to see if localtime_r
      exits, and only enables the QEMU impl if missing. We also
      re-arrange qemu-common.h try attempt to guarantee that all
      source files get unistd.h before time.h and thus see the
      localtime_r/gmtime_r defs.
      
      [sw: Use "official" spellings for Mingw-w64, MinGW in comments.]
      [sw: Terminate sentences with a dot in comments.]
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      Reviewed-by: NDenis V. Lunev <den@openvz.org>
      Signed-off-by: NStefan Weil <sw@weilnetz.de>
      4d9310f4
    • D
      gtk: avoid redefining _WIN32_WINNT macro · c8f3f17c
      Daniel P. Berrange 提交于
      When building for Mingw64 target on Fedora 22 a warning
      is issued about _WIN32_WINNT being redefined.
      
      In file included from ui/gtk.c:40:0:
      include/ui/gtk.h:5:0: warning: "_WIN32_WINNT" redefined
       # define _WIN32_WINNT 0x0601 /* needed to get definition of MAPVK_VK_TO_VSC */
        ^
      In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/crtdefs.h:10:0,
                       from /usr/i686-w64-mingw32/sys-root/mingw/include/stdio.h:9,
                       from /home/berrange/src/virt/qemu/include/qemu/fprintf-fn.h:12,
                       from /home/berrange/src/virt/qemu/include/qemu-common.h:18,
                       from ui/gtk.c:37:
      /usr/i686-w64-mingw32/sys-root/mingw/include/_mingw.h:225:0: note: this is the location of the previous definition
       #define _WIN32_WINNT 0x502
       ^
      
      Rather than try to get MAPVK_VK_TO_VSC defined indirectly
      by defining _WIN32_WINNT, instead just define it explicitly
      if missing.
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      Signed-off-by: NStefan Weil <sw@weilnetz.de>
      Acked-by: NPaolo Bonzini <pbonzini@redhat.com>
      c8f3f17c
    • P
      qemu-thread: add a fast path to the Win32 QemuEvent · 7c9b2bf6
      Paolo Bonzini 提交于
      QemuEvents are used heavily by call_rcu.  We do not want them to be slow,
      but the current implementation does a kernel call on every invocation
      of qemu_event_* and won't cut it.
      
      So, wrap a Win32 manual-reset event with a fast userspace path.  The
      states and transitions are the same as for the futex and mutex/condvar
      implementations, but the slow path is different of course.  The idea
      is to reset the Win32 event lazily, as part of a test-reset-test-wait
      sequence.  Such a sequence is, indeed, how QemuEvents are used by
      RCU and other subsystems!
      
      The patch includes a formal model of the algorithm.
      Tested-by: NStefan Weil <sw@weilnetz.de>
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      Signed-off-by: NStefan Weil <sw@weilnetz.de>
      7c9b2bf6
    • S
      slirp: Fix non blocking connect for w32 · a246a016
      Stefan Weil 提交于
      Signed-off-by: NStefan Weil <sw@weilnetz.de>
      a246a016
    • S
      nsis: Add QEMU version information to Windows registry · 805d8a67
      Stefan Weil 提交于
      The uninstall keys include an option key "DisplayVersion" which we set
      now. By default the version value is read from file VERSION, but it is
      also possible to pass VERSION=#.#.# to make.
      Signed-off-by: NStefan Weil <sw@weilnetz.de>
      805d8a67
    • P
      Merge remote-tracking branch 'remotes/elmarco/tags/rm-libcacard' into staging · 9438fe9e
      Peter Maydell 提交于
      Remove libcacard
      
      # gpg: Signature made Wed 23 Sep 2015 22:37:11 BST using RSA key ID 75969CE5
      # gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
      # gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
      # gpg: WARNING: This key is not certified with sufficiently trusted signatures!
      # gpg:          It is not certain that the signature belongs to the owner.
      # Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5
      
      * remotes/elmarco/tags/rm-libcacard:
        libcacard: use the standalone project
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      9438fe9e
  3. 24 9月, 2015 11 次提交