1. 30 4月, 2018 32 次提交
  2. 27 4月, 2018 8 次提交
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180427-pull-request' into staging · 6f0c4706
      Peter Maydell 提交于
      usb: ccid bugfix, misc small improvements.
      
      # gpg: Signature made Fri 27 Apr 2018 11:20:18 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/usb-20180427-pull-request:
        ccid-card: include libcacard.h only
        Fix libusb-1.0.22 deprecated libusb_set_debug with libusb_set_option
        ccid: Fix dwProtocols advertisement of T=0
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      6f0c4706
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180427-pull-request' into staging · 10f4718b
      Peter Maydell 提交于
      vnc: fix use-after-free.
      sdl2: gles support.
      vfio-display: add reset support.
      
      # gpg: Signature made Fri 27 Apr 2018 10:54:17 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-20180427-pull-request:
        ui: introduce vfio_display_reset
        console: introduce dpy_gfx_update_full
        sdl: Allow OpenGL ES context creation
        sdl: Move DisplayOptions global to sdl2_console
        qapi: Parameter gl of DisplayType now accept an enum
        vnc: fix use-after-free
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      10f4718b
    • P
      Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.13-20180427' into staging · dcbd26f8
      Peter Maydell 提交于
      ppc patch queue 2018-04-27
      
      Here's the first batch of ppc patches for 2.13.  This has a lot of
      stuff that's accumulated during the 2.12 freeze.  Highlights are:
      
          * Many improvements for the Uninorth PCI host bridge for Mac
            machine types
          * Preliminary helpers improve handling of multiple backing
            pagesizes (not strictly ppc related, but have acks and aimed to
            allow future ppc changes)
          * Cleanups to pseries cpu initialization
          * Cleanups to hash64 MMU handling
          * Assorted bugfixes and improvements
      
      # gpg: Signature made Fri 27 Apr 2018 10:20:30 BST
      # gpg:                using RSA key 6C38CACA20D9B392
      # gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>"
      # gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>"
      # gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
      # gpg:                 aka "David Gibson (kernel.org) <dwg@kernel.org>"
      # Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392
      
      * remotes/dgibson/tags/ppc-for-2.13-20180427: (49 commits)
        Clear mem_path if we fall back to anonymous RAM allocation
        spapr: Set compatibility mode before the rest of spapr_cpu_reset()
        target/ppc: Don't bother with MSR_EP in cpu_ppc_set_papr()
        spapr: Support ibm,dynamic-memory-v2 property
        ppc: e500: switch E500 based machines to full machine definition
        spapr: Add ibm,max-associativity-domains property
        target/ppc: Fold slb_nr into PPCHash64Options
        target/ppc: Get rid of POWERPC_MMU_VER() macros
        target/ppc: Remove unnecessary POWERPC_MMU_V3 flag from mmu_model
        target/ppc: Fold ci_large_pages flag into PPCHash64Options
        target/ppc: Move 1T segment and AMR options to PPCHash64Options
        target/ppc: Make hash64_opts field mandatory for 64-bit hash MMUs
        target/ppc: Split page size information into a separate allocation
        target/ppc: Move page size setup to helper function
        target/ppc: Remove fallback 64k pagesize information
        target/ppc: Avoid taking "env" parameter to mmu-hash64 functions
        target/ppc: Pass cpu instead of env to ppc_create_page_sizes_prop()
        target/ppc: Simplify cpu valid check in ppc_cpu_realize
        target/ppc: Standardize instance_init and realize function names
        spapr: drop useless dynamic sysbus device sanity check
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      dcbd26f8
    • T
      ui: introduce vfio_display_reset · 8983e3e3
      Tina Zhang 提交于
      During guest OS reboot, guest framebuffer is invalid. It will cause
      bugs, if the invalid guest framebuffer is still used by host.
      
      This patch is to introduce vfio_display_reset which is invoked
      during vfio display reset. This vfio_display_reset function is used
      to release the invalid display resource, disable scanout mode and
      replace the invalid surface with QemuConsole's DisplaySurafce.
      
      This patch can fix the GPU hang issue caused by gd_egl_draw during
      guest OS reboot.
      
      Changes v3->v4:
       - Move dma-buf based display check into the vfio_display_reset().
         (Gerd)
      
      Changes v2->v3:
       - Limit vfio_display_reset to dma-buf based vfio display. (Gerd)
      
      Changes v1->v2:
       - Use dpy_gfx_update_full() update screen after reset. (Gerd)
       - Remove dpy_gfx_switch_surface(). (Gerd)
      Signed-off-by: NTina Zhang <tina.zhang@intel.com>
      Message-id: 1524820266-27079-3-git-send-email-tina.zhang@intel.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      8983e3e3
    • T
      console: introduce dpy_gfx_update_full · 7cd0afe6
      Tina Zhang 提交于
      dpy_gfx_update_full is used to do the whole display surface update.
      
      This function is proposed by Gerd Hoffmann.
      Signed-off-by: NTina Zhang <tina.zhang@intel.com>
      Message-id: 1524820266-27079-2-git-send-email-tina.zhang@intel.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      7cd0afe6
    • E
      sdl: Allow OpenGL ES context creation · 4867e47c
      Elie Tournier 提交于
      Signed-off-by: NElie Tournier <elie.tournier@collabora.com>
      Message-id: 20180413135842.21325-4-tournier.elie@gmail.com
      
      [ kraxel: fix indent ]
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      4867e47c
    • M
      ccid-card: include libcacard.h only · 0f5c642d
      Michal Privoznik 提交于
      When trying to build with latest libcacard-2.5.1, I hit the
      following error:
      
      In file included from hw/usb/ccid-card-passthru.c:12:0:
      /usr/include/cacard/vscard_common.h:26:2: error: #warning "Only <libcacard.h> can be included directly" [-Werror=cpp]
       #warning "Only <libcacard.h> can be included directly"
      
      While it was fixed in libcacard upstream (so that individual
      files can be included directly), it doesn't make much sense.
      Let's switch to including the main libcacard.h and also require
      at least libcacard-2.5.1 which introduced it. It's available
      since late 2015.
      Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
      Reviewed-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Message-id: 3c36db1dc0702763ebb7966cc27428ed67d43804.1522751624.git.mprivozn@redhat.com
      
      [ kraxel: fix include path ]
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      0f5c642d
    • J
      Fix libusb-1.0.22 deprecated libusb_set_debug with libusb_set_option · 9d8fa0df
      John Thomson 提交于
      libusb-1.0.22 marked libusb_set_debug deprecated
      it is replaced with
      libusb_set_option(libusb_context, LIBUSB_OPTION_LOG_LEVEL, libusb_log_level);
      
      details here: https://github.com/libusb/libusb/commit/539f22e2fd916558d11ab9a66f10f461c5593168
      
      Warning here:
      
        CC      hw/usb/host-libusb.o
      /builds/xen/src/qemu-xen/hw/usb/host-libusb.c: In function 'usb_host_init':
      /builds/xen/src/qemu-xen/hw/usb/host-libusb.c:250:5: error: 'libusb_set_debug' is deprecated: Use libusb_set_option instead [-Werror=deprecated-declarations]
           libusb_set_debug(ctx, loglevel);
           ^~~~~~~~~~~~~~~~
      In file included from /builds/xen/src/qemu-xen/hw/usb/host-libusb.c:40:0:
      /usr/include/libusb-1.0/libusb.h:1300:18: note: declared here
       void LIBUSB_CALL libusb_set_debug(libusb_context *ctx, int level);
                        ^~~~~~~~~~~~~~~~
      cc1: all warnings being treated as errors
      make: *** [/builds/xen/src/qemu-xen/rules.mak:66: hw/usb/host-libusb.o] Error 1
      make: Leaving directory '/builds/xen/src/xen/tools/qemu-xen-build'
      Signed-off-by: NJohn Thomson <git@johnthomson.fastmail.com.au>
      Message-id: 20180405132046.4968-1-git@johnthomson.fastmail.com.au
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      9d8fa0df