1. 15 6月, 2018 13 次提交
  2. 14 6月, 2018 5 次提交
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180614-pull-request' into staging · 409c241f
      Peter Maydell 提交于
      ui: bugfixes for sdl and gtk
      
      # gpg: Signature made Thu 14 Jun 2018 09:32:45 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-20180614-pull-request:
        sdl2: restore window dimensions by resize
        ui: darwin: gtk: Add missing input keymap
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      409c241f
    • P
      Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging · 666b0e73
      Peter Maydell 提交于
      # gpg: Signature made Wed 13 Jun 2018 15:52:27 BST
      # gpg:                using RSA key BDBE7B27C0DE3057
      # gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
      # gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
      # gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
      # Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057
      
      * remotes/cody/tags/block-pull-request:
        block: Ignore generated job QAPI files
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      666b0e73
    • P
      Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2018-06-13' into staging · 945741da
      Peter Maydell 提交于
      Miscellaneous patches for 2018-06-13
      
      # gpg: Signature made Wed 13 Jun 2018 13:51:51 BST
      # gpg:                using RSA key 3870B400EB918653
      # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
      # gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
      # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653
      
      * remotes/armbru/tags/pull-misc-2018-06-13:
        Purge uses of banned g_assert_FOO()
        coverity-model: replay data is considered trusted
        Revert "Makefile: add target to print generated files"
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      945741da
    • A
      sdl2: restore window dimensions by resize · 64bf97e5
      Amadeusz Sławiński 提交于
      instead of destroying and recreating window, fixes segfault caused by
      handle_keyup trying to access no more existing window when using
      Ctrl-Alt-U to restore window "un-scaled" dimensions
      
       Thread 1 "qemu-system-x86" received signal SIGSEGV, Segmentation fault.
       [Switching to Thread 0x7ffff7f92b80 (LWP 3711)]
       handle_keyup (ev=0x7fffffffd010) at ui/sdl2.c:416
       416         scon->ignore_hotkeys = false;
       (gdb) bt
       #0  handle_keyup (ev=0x7fffffffd010) at ui/sdl2.c:416
       #1  sdl2_poll_events (scon=0x100fee5a8) at ui/sdl2.c:608
       #2  0x0000000100585bf2 in dpy_refresh (s=0x101ad3e00) at ui/console.c:1658
       #3  gui_update (opaque=0x101ad3e00) at ui/console.c:205
       #4  0x0000000100690f2c in timerlist_run_timers (timer_list=0x100ede130) at util/qemu-timer.c:536
       #5  0x0000000100691177 in qemu_clock_run_timers (type=QEMU_CLOCK_REALTIME) at util/qemu-timer.c:547
       #6  qemu_clock_run_all_timers () at util/qemu-timer.c:674
       #7  0x0000000100691651 in main_loop_wait (nonblocking=<optimized out>) at util/main-loop.c:503
       #8  0x00000001003d650f in main_loop () at vl.c:1848
       #9  0x0000000100289681 in main (argc=<optimized out>, argv=<optimized out>, envp=<optimized out>) at vl.c:4605
      Signed-off-by: NAmadeusz Sławiński <amade@asmblr.net>
      Message-id: 20180613172707.31530-1-amade@asmblr.net
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      64bf97e5
    • K
      ui: darwin: gtk: Add missing input keymap · 656282d2
      Keno Fischer 提交于
      In appears the input keymap for osx was forgotten in the commit that
      converted the gtk frontend to keycodemapdb. Add it.
      
      Fixes: 2ec78706 ("ui: convert GTK and SDL1 frontends to keycodemapdb")
      CC: Daniel P. Berrange <berrange@redhat.com>
      Signed-off-by: NKeno Fischer <keno@juliacomputing.com>
      Message-id: 1528933916-40670-1-git-send-email-keno@juliacomputing.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      656282d2
  3. 13 6月, 2018 4 次提交
  4. 12 6月, 2018 18 次提交
    • P
      Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-3.0-pull-request' into staging · 3b2a4d39
      Peter Maydell 提交于
      Fixes in syscall numbers,
      disable the build of binaries not needed for linux-user,
      update of qemu-binfmt-conf.sh and cleanup around is_error()
      
      # gpg: Signature made Tue 12 Jun 2018 11:57:18 BST
      # gpg:                using RSA key F30C38BD3F2FBE3C
      # 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>"
      # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C
      
      * remotes/vivier2/tags/linux-user-for-3.0-pull-request:
        linux-user/sparc64: Add inotify_rm_watch and tee syscalls
        linux-user/microblaze: Fix typo in accept4 syscall
        linux-user/hppa: Fix typo in mknodat syscall
        linux-user/alpha: Fix epoll syscalls
        qemu-binfmt-conf.sh: ignore the OS/ABI field
        linux-user: disable qemu-bridge-helper and socket_scm_helper build
        linux-user: Use is_error() to avoid warnings and make the code clearer
        linux-user: Export use is_error(), use it to avoid warnings
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      3b2a4d39
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180612-pull-request' into staging · 2ab09bf2
      Peter Maydell 提交于
      usb: bug fix collection, doc update.
      
      # gpg: Signature made Tue 12 Jun 2018 11:44: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/usb-20180612-pull-request:
        usb-mtp: Return error on suspicious TYPE_DATA packet from initiator
        usb-hcd-xhci-test: add a test for ccid hotplug
        usb-ccid: fix bus leak
        object: fix OBJ_PROP_LINK_UNREF_ON_RELEASE ambivalence
        bus: do not unref the added child bus on realize
        usb/dev-mtp: Fix use of uninitialized values
        usb: correctly handle Zero Length Packets
        usb: update docs
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      2ab09bf2
    • P
      Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-3.0-20180612' into staging · 3b68de85
      Peter Maydell 提交于
      ppc patch queue 2018-06-12
      
      Here's another batch of ppc patches towards the 3.0 release.  There's
      a fair bit here, because I've been working through my mail backlog
      after a holiday.  There's not much of a central theme, amongst other
      things we have:
          * ppc440 / sam460ex improvements
          * logging and error cleanups
          * 40p (PReP) bugfixes
          * Macintosh fixes and cleanups
          * Add emulation of the new POWER9 store-forwarding barrier
            instruction variant
          * Hotplug cleanups
      
      # gpg: Signature made Tue 12 Jun 2018 07:43:21 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-3.0-20180612: (33 commits)
        spapr_pci: Remove unhelpful pagesize warning
        xics_kvm: use KVM helpers
        ppc/pnv: fix LPC HC firmware address space
        spapr: handle cpu core unplug via hotplug handler chain
        spapr: handle pc-dimm unplug via hotplug handler chain
        spapr: introduce machine unplug handler
        spapr: move memory hotplug support check into spapr_memory_pre_plug()
        spapr: move lookup of the node into spapr_memory_plug()
        spapr: no need to verify the node
        target/ppc: Allow PIR read in privileged mode
        ppc4xx_i2c: Clean up and improve error logging
        target/ppc: extend eieio for POWER9
        mos6522: convert VMSTATE_TIMER_PTR_TEST to VMSTATE_TIMER_PTR
        mos6522: move timer frequency initialisation to mos6522_reset
        cuda: embed mos6522_cuda device directly rather than using QOM object link
        mos6522: fix vmstate_mos6522_timer version in vmstate_mos6522
        ppc: add missing FW_CFG_PPC_NVRAM_FLAT definition
        ppc: remove obsolete macio_init() definition from mac.h
        ppc: remove obsolete pci_pmac_init() definitions from mac.h
        hw/misc/mos6522: Add trailing '\n' to qemu_log() calls
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      3b68de85
    • P
      Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' into staging · 98d11a6e
      Peter Maydell 提交于
      bitmaps pull request
      
      # gpg: Signature made Mon 11 Jun 2018 20:33:09 BST
      # gpg:                using RSA key 7DEF8106AAFC390E
      # gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
      # Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
      #      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E
      
      * remotes/jnsnow/tags/bitmaps-pull-request:
        qapi: add disabled parameter to block-dirty-bitmap-add
        qapi: add x-block-dirty-bitmap-merge
        qmp: transaction support for x-block-dirty-bitmap-enable/disable
        qapi: add x-block-dirty-bitmap-enable/disable
        block/dirty-bitmap: add lock to bdrv_enable/disable_dirty_bitmap
        block: simplify code around releasing bitmaps
        block: remove bdrv_dirty_bitmap_make_anon
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      98d11a6e
    • P
      Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · 59f3a1c6
      Peter Maydell 提交于
      pc: fixes
      
      A couple of fixes to acpi and nvdimm.
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      
      # gpg: Signature made Mon 11 Jun 2018 20:21:03 BST
      # gpg:                using RSA key 281F0DB8D28D5469
      # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
      # gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
      # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
      #      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469
      
      * remotes/mst/tags/for_upstream:
        nvdimm: make persistence option symbolic
        hw/i386: Update SSDT table used by "make check"
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      59f3a1c6
    • P
      Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging · 5eca450b
      Peter Maydell 提交于
      Python queue, 2018-06-11
      
      * Make code compatible with Python 3 using 'futurize --stage1'
      * Require Python >= 2.7 and remove Python 2.6 compatibility
        modules
      
      # gpg: Signature made Mon 11 Jun 2018 18:41:26 BST
      # gpg:                using RSA key 2807936F984DC5A6
      # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
      # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6
      
      * remotes/ehabkost/tags/python-next-pull-request:
        python: Remove scripts/ordereddict.py
        python: Remove scripts/argparse.py
        configure: Require Python 2.7 or newer
        python: futurize -f lib2to3.fixes.fix_numliterals
        python: futurize -f lib2to3.fixes.fix_except
        python: futurize -f lib2to3.fixes.fix_renames
        python: futurize -f lib2to3.fixes.fix_tuple_params
        python: futurize -f lib2to3.fixes.fix_reduce
        python: futurize -f lib2to3.fixes.fix_standarderror
        python: futurize -f lib2to3.fixes.fix_has_key
        python: futurize -f libfuturize.fixes.fix_next_call
        python: futurize -f libfuturize.fixes.fix_absolute_import
        python: futurize -f libfuturize.fixes.fix_print_with_import
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      5eca450b
    • B
      usb-mtp: Return error on suspicious TYPE_DATA packet from initiator · 3c969a60
      Bandan Das 提交于
      CID 1390604
      If the initiator sends a packet with TYPE_DATA set without
      initiating a CMD_GET_OBJECT_INFO first, then usb_mtp_get_data
      can trip on a null s->data_out.
      Signed-off-by: NBandan Das <bsd@redhat.com>
      Message-Id: <jpgr2m8ajfk.fsf_-_@linux.bootlegged.copy>
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      3c969a60
    • M
      usb-hcd-xhci-test: add a test for ccid hotplug · 1a3ff20e
      Marc-André Lureau 提交于
      Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Message-id: 20180531195119.22021-5-marcandre.lureau@redhat.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      1a3ff20e
    • M
      usb-ccid: fix bus leak · 410a096a
      Marc-André Lureau 提交于
      qbus_create_inplace() creates a new reference in realize(), it must be
      released in unrealize().
      Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Message-id: 20180531195119.22021-4-marcandre.lureau@redhat.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      410a096a
    • M
      object: fix OBJ_PROP_LINK_UNREF_ON_RELEASE ambivalence · 265b578c
      Marc-André Lureau 提交于
      A link property can be set during creation, with
      object_property_add_link() and later with object_property_set_link().
      
      add_link() doesn't add a reference to the target object, while
      set_link() does.
      
      Furthemore, OBJ_PROP_LINK_UNREF_ON_RELEASE flags, set during add_link,
      says whether a reference must be released when the property is destroyed.
      This can lead to leaks if the property was later set_link(), as the
      added reference is never released.
      
      Instead, rename OBJ_PROP_LINK_UNREF_ON_RELEASE to OBJ_PROP_LINK_STRONG
      and use that has an indication on how the link handle reference
      management in set_link().
      Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Message-id: 20180531195119.22021-3-marcandre.lureau@redhat.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      265b578c
    • M
      bus: do not unref the added child bus on realize · f3d58385
      Marc-André Lureau 提交于
      When the parent bus removes the child property, it takes care of
      removing the added reference, in object_finalize_child_property().
      Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Message-id: 20180531195119.22021-2-marcandre.lureau@redhat.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      f3d58385
    • P
      usb/dev-mtp: Fix use of uninitialized values · 62713a2e
      Philippe Mathieu-Daudé 提交于
      This fixes:
      
        hw/usb/dev-mtp.c:971:5: warning: 4th function call argument is an uninitialized value
            trace_usb_mtp_op_get_partial_object(s->dev.addr, o->handle, o->path,
                                                 c->argv[1], c->argv[2]);
                                                             ^~~~~~~~~~
      and:
      
        hw/usb/dev-mtp.c:981:12: warning: Assigned value is garbage or undefined
            offset = c->argv[1];
                     ^ ~~~~~~~~~~
      
      Reported-by: Clang Static Analyzer
      Signed-off-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Message-id: 20180604151421.23385-3-f4bug@amsat.org
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      62713a2e
    • P
      usb: correctly handle Zero Length Packets · bf78fb1c
      Philippe Mathieu-Daudé 提交于
      USB Specification Revision 2.0, §5.5.3:
        The Data stage of a control transfer from an endpoint to the host is complete when the endpoint does one of the following:
        • Has transferred exactly the amount of data specified during the Setup stage
        • Transfers a packet with a payload size less than wMaxPacketSize or transfers a zero-length packet"
      
      hw/usb/redirect.c:802:9: warning: Declared variable-length array (VLA) has zero size
              uint8_t buf[size];
              ^~~~~~~~~~~ ~~~~
      
      Reported-by: Clang Static Analyzer
      Signed-off-by: NPhilippe Mathieu-Daudé <f4bug@amsat.org>
      Message-id: 20180604151421.23385-2-f4bug@amsat.org
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      bf78fb1c
    • G
      usb: update docs · 649ae104
      Gerd Hoffmann 提交于
      xhci is rock solid meanwhile.  So move it up in the docs and feature it
      as prefered usb host adapter, instead of the old shy version saying "you
      might want try ...".
      
      While being at it rework the text on ehci and companion controllers too.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      Reviewed-by: NMarkus Armbruster <armbru@redhat.com>
      Message-id: 20180605132915.3640-1-kraxel@redhat.com
      649ae104
    • P
      Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging · 6e3bd769
      Peter Maydell 提交于
      Machine queue, 2018-06-11
      
      * Fix -daemonize hang caused by --preconfig code
      
      # gpg: Signature made Mon 11 Jun 2018 18:32:52 BST
      # gpg:                using RSA key 2807936F984DC5A6
      # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
      # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6
      
      * remotes/ehabkost/tags/machine-next-pull-request:
        cli: Don't run early event loop if no --preconfig was specified
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      6e3bd769
    • D
      spapr_pci: Remove unhelpful pagesize warning · 30f79dc1
      David Gibson 提交于
      By default, the IOMMU model built into the spapr virtual PCI host bridge
      supports 4kiB and 64kiB IOMMU page sizes.  However this can be overridden
      which may be desirable to allow larger IOMMU page sizes when running a
      guest with hugepage backing and passthrough devices.  For that reason a
      warning was printed when the device wasn't configured to allow the pagesize
      with which guest RAM is backed.
      
      Experience has proven, however, that this message is more confusing than
      useful.  Worse it sometimes makes little sense when the host-available page
      sizes don't match those available on the guest, which can happen with
      a POWER8 guest running on a POWER9 KVM host.
      
      Long term we do want better handling to allow large IOMMU page sizes to be
      used, but for now this parameter and warning don't really accomplish it.
      So, remove the message, pending a better solution.
      Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
      30f79dc1
    • C
      xics_kvm: use KVM helpers · bf358b54
      Cédric Le Goater 提交于
      The KVM helpers hide the low level interface used to communicate to
      the XICS KVM device and provide a good cleanup to the XICS KVM models.
      Signed-off-by: NCédric Le Goater <clg@kaod.org>
      Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
      bf358b54
    • C
      ppc/pnv: fix LPC HC firmware address space · d61c2857
      Cédric Le Goater 提交于
      A specific MemoryRegion is required for the LPC HC Firmware address
      space.
      Signed-off-by: NCédric Le Goater <clg@kaod.org>
      Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
      d61c2857