1. 10 4月, 2018 17 次提交
    • V
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180410-pull-request' into staging · df6378eb
      Peter Maydell 提交于
      configure: don't warn on old sdl/gtk versions if disabled.
      keymap + gtk fixes.
      
      # gpg: Signature made Tue 10 Apr 2018 10:23:37 BST
      # gpg:                using RSA key 4CB6D8EED3E87138
      # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
      # gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
      # gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
      # Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138
      
      * remotes/kraxel/tags/ui-20180410-pull-request:
        configure: don't warn SDL abi if disabled
        configure: don't warn GTK if disabled
        gtk: drop pointless code from gd_window_close
        ui: fix keymap detection under Xwayland
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      df6378eb
    • P
      Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging · daf6b59b
      Peter Maydell 提交于
      # gpg: Signature made Tue 10 Apr 2018 04:36:01 BST
      # gpg:                using RSA key EF04965B398D6211
      # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.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: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211
      
      * remotes/jasowang/tags/net-pull-request:
        e1000: Old machine types, turn new subsection off
        e1000: Choose which set of props to migrate
        e1000: Migrate props via a temporary structure
        e1000: wire new subsection to property
        e1000: Dupe offload data on reading old stream
        e1000: Convert v3 fields to subsection
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      daf6b59b
    • P
      Merge remote-tracking branch 'remotes/xtensa/tags/20180409-xtensa' into staging · fb4fe32d
      Peter Maydell 提交于
      Fix file offset for preadv/pwritev linux-user syscalls.
      
      # gpg: Signature made Tue 10 Apr 2018 03:04:24 BST
      # gpg:                using RSA key 51F9CC91F83FA044
      # gpg: Good signature from "Max Filippov <filippov@cadence.com>"
      # gpg:                 aka "Max Filippov <max.filippov@cogentembedded.com>"
      # gpg:                 aka "Max Filippov <jcmvbkbc@gmail.com>"
      # Primary key fingerprint: 2B67 854B 98E5 327D CDEB  17D8 51F9 CC91 F83F A044
      
      * remotes/xtensa/tags/20180409-xtensa:
        linux-user: fix preadv/pwritev offsets
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      fb4fe32d
    • P
      configure: don't warn SDL abi if disabled · c6093a05
      Peter Xu 提交于
      SDL has the same problem as GTK that we might get warnings on SDL ABI
      version even if SDL is disabled.  Fix that by only probing SDL if SDL is
      enabled.  Also this should let configure be a little bit faster since we
      don't really need to probe SDL stuff when it's off.
      
      CC: Paolo Bonzini <pbonzini@redhat.com>
      CC: Gerd Hoffmann <kraxel@redhat.com>
      CC: Peter Maydell <peter.maydell@linaro.org>
      CC: Daniel P. Berrange <berrange@redhat.com>
      CC: Fam Zheng <famz@redhat.com>
      CC: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
      Signed-off-by: NPeter Xu <peterx@redhat.com>
      Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>
      Reviewed-by: NFam Zheng <famz@redhat.com>
      Message-id: 20180410054034.20479-1-peterx@redhat.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      c6093a05
    • P
      configure: don't warn GTK if disabled · 5a464e6c
      Peter Xu 提交于
      We don't need to detect GTK ABI if GTK is disabled in general.
      Otherwise we could get this warning (when host is installed with GTK ABI
      version 2) even when configure with "--disable-gtk":
      
          WARNING: Use of GTK 2.0 is deprecated and will be removed in
          WARNING: future releases. Please switch to using GTK 3.0
      
      CC: Paolo Bonzini <pbonzini@redhat.com>
      CC: Gerd Hoffmann <kraxel@redhat.com>
      CC: Peter Maydell <peter.maydell@linaro.org>
      CC: Fam Zheng <famz@redhat.com>
      CC: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
      Signed-off-by: NPeter Xu <peterx@redhat.com>
      Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>
      Message-id: 20180409082323.29575-1-peterx@redhat.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      5a464e6c
    • G
      gtk: drop pointless code from gd_window_close · fa2d039b
      Gerd Hoffmann 提交于
      Unregistering the display change listener looks like a pointless
      excercise given we'll exit in a moment.  When exiting qemu via
      menu/file/quit this will not happen either.  Just drop the code.
      
      Also return TRUE unconditionally.  This will tell gtk to ignore the
      close request, so gtk will not start destroying widgets and causing
      warnings due to UI code trying to talk to widgets which are gone.
      Just depend on qmp_quit() doing it's job instead.
      Reported-by: NMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      Message-Id: <20180314080439.4229-1-kraxel@redhat.com>
      fa2d039b
    • D
      ui: fix keymap detection under Xwayland · 1e70de67
      Daniel P. Berrangé 提交于
      The X11 code currently detects the keymap by looking for the keycode
      name property. Unfortunately due to the way Xwayland handles keyboards,
      this property gets unset almost immediately after the first application
      starts using Xwayland resulting in
      
        ** (qemu-system-x86_64:19644): WARNING **: Unknown X11 keycode mapping '(unnamed)'.
        Please report to qemu-devel@nongnu.org
        including the following information:
      
          - Operating system
          - X11 Server
          - xprop -root
          - xdpyinfo
      
      Fortunately people will only see this problem if they built QEMU with
      GTK2, or have told GTK3 to prefer X11 by setting the GDK_BACKEND=x11
      env variable.
      
      To workaround the problem, we add a heuristic that looks at what
      scancode the XK_Page_Up keysymbol maps to, to determine if we've
      likely got the X11 kbd or evdev driver.
      Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>
      Message-Id: <20180313104235.20725-1-berrange@redhat.com>
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      1e70de67
    • D
      e1000: Old machine types, turn new subsection off · 5f523530
      Dr. David Alan Gilbert 提交于
      Turn the newly added subsection off for old machine types
      Signed-off-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
      Signed-off-by: NJason Wang <jasowang@redhat.com>
      5f523530
    • D
      e1000: Choose which set of props to migrate · ff214d42
      Dr. David Alan Gilbert 提交于
      When we're using the subsection we migrate both
      the 'props' and 'tso_props' data; when we're not using
      the subsection (to migrate to 2.11 or old machine types) we've
      got to choose what to migrate in the main structure.
      
      If we're using the subsection migrate 'props' in the main structure.
      If we're not using the subsection then migrate the last one
      that changed, which gives behaviour similar to the old behaviour.
      Signed-off-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
      Signed-off-by: NJason Wang <jasowang@redhat.com>
      ff214d42
    • D
      e1000: Migrate props via a temporary structure · 59354484
      Dr. David Alan Gilbert 提交于
      Swing the tx.props out via a temporary structure, so in future patches
      we can select what we're going to send.
      Signed-off-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
      Signed-off-by: NJason Wang <jasowang@redhat.com>
      59354484
    • D
      e1000: wire new subsection to property · 46f2a9ec
      Dr. David Alan Gilbert 提交于
      Wire the new subsection from the previous commit to a property
      so we can turn it off easily.
      Signed-off-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
      Signed-off-by: NJason Wang <jasowang@redhat.com>
      46f2a9ec
    • D
      e1000: Dupe offload data on reading old stream · 3c4053c5
      Dr. David Alan Gilbert 提交于
      Old QEMUs only had one set of offload data;  when we only receive
      one lot, dupe the received data - that should give us about the
      same bug level as the old version.
      Signed-off-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
      Signed-off-by: NJason Wang <jasowang@redhat.com>
      3c4053c5
    • D
      e1000: Convert v3 fields to subsection · 4ae4bf5b
      Dr. David Alan Gilbert 提交于
      A bunch of new TSO fields were introduced by d62644b4 and this bumped
      the VMState version; however it's easier for those trying to keep
      backwards migration compatibility if these fields are added in a
      subsection instead.
      
      Move the new fields to a subsection.
      
      Since this was added after 2.11, this change will only affect
      compatbility with 2.12-rc0.
      Signed-off-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
      Signed-off-by: NJason Wang <jasowang@redhat.com>
      4ae4bf5b
    • M
      linux-user: fix preadv/pwritev offsets · 9ac22517
      Max Filippov 提交于
      preadv/pwritev accept low and high parts of file offset in two separate
      parameters. When host bitness doesn't match guest bitness these parts
      must be appropriately recombined.
      Introduce target_to_host_low_high that does this recombination and use
      it in preadv/pwritev syscalls.
      
      This fixes glibc testsuite test misc/tst-preadvwritev64.
      Reviewed-by: NLaurent Vivier <laurent@vivier.eu>
      Reviewed-by: NRichard Henderson <richard.henderson@linaro.org>
      Signed-off-by: NMax Filippov <jcmvbkbc@gmail.com>
      9ac22517
    • P
      Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180409' into staging · 1e7e92e2
      Peter Maydell 提交于
      Fixes for s390x: kvm, vfio-ccw, ipl code, bios. Includes a rebuild
      of s390-ccw.img and s390-netboot.img.
      
      # gpg: Signature made Mon 09 Apr 2018 16:08:19 BST
      # gpg:                using RSA key DECF6B93C6F02FAF
      # gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
      # gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
      # gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
      # gpg:                 aka "Cornelia Huck <cohuck@kernel.org>"
      # gpg:                 aka "Cornelia Huck <cohuck@redhat.com>"
      # Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF
      
      * remotes/cohuck/tags/s390x-20180409:
        s390x: load_psw() should only exchange the PSW for KVM
        s390x/mmu: don't overwrite pending exception in mmu translate
        vfio-ccw: fix memory leaks in vfio_ccw_realize()
        pc-bios/s390: update images
        s390: Do not pass inofficial IPL type to the guest
        s390: Ensure IPL from SCSI works as expected
        s390: Refactor IPL parameter block generation
        s390x/kvm: call cpu_synchronize_state() on every kvm_arch_handle_exit()
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      1e7e92e2
    • P
      Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging · 915d34c5
      Peter Maydell 提交于
      Miscellaneous bugfixes, including crash fixes from Alexey, Peter M. and
      Thomas.
      
      # gpg: Signature made Mon 09 Apr 2018 15:37:15 BST
      # gpg:                using RSA key BFFBD25F78C7AE83
      # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
      # gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
      # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
      #      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83
      
      * remotes/bonzini/tags/for-upstream:
        Add missing bit for SSE instr in VEX decoding
        maint: Add .mailmap entries for patches claiming list authorship
        dump: Fix build with newer gcc
        device-crash-test: Remove fixed isa-fdc entry
        qemu-pr-helper: Write pidfile more often
        qemu-pr-helper: Daemonize before dropping privileges
        virtio-serial: fix heapover-flow
        kvmclock: fix clock_is_reliable on migration from QEMU < 2.9
        hw/dma/i82374: Avoid double creation of the 82374 controller
        hw/scsi: support SCSI-2 passthrough without PI
        scsi-disk: allow customizing the SCSI version
        scsi-disk: Don't enlarge min_io_size to max_io_size
        configure: Add missing configure options to help text
        i386/hyperv: error out if features requested but unsupported
        i386/hyperv: add hv-frequencies cpu property
        target/i386: WHPX: set CPUID_EXT_HYPERVISOR bit
        memfd: fix vhost-user-test on non-memfd capable host
        scripts/checkpatch.pl: Bug fix
        target/i386: Fix andn instruction
        sys_membarrier: fix up include directives
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      915d34c5
  2. 09 4月, 2018 23 次提交