1. 06 3月, 2018 36 次提交
  2. 05 3月, 2018 4 次提交
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180305-pull-request' into staging · 4ee02f53
      Peter Maydell 提交于
      ui: build curses, gtk and sdl as modules.
      
      # gpg: Signature made Mon 05 Mar 2018 08:48:24 GMT
      # 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-20180305-pull-request:
        ui/sdl: build as module
        audio: rename CONFIG_* to CONFIG_AUDIO_*
        ui/curses: build as module
        ui/gtk: build as module
        configure: opengl doesn't depend on x11
        configure: add X11 vars to config-host.mak
        console: add ui module loading support
        console: add and use qemu_display_find_default
        egl-headless: switch over to new display registry
        curses: switch over to new display registry
        cocoa: switch over to new display registry
        sdl: switch over to new display registry
        console: add qemu display registry, add gtk
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      4ee02f53
    • P
      Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging · 41dfc0dc
      Peter Maydell 提交于
      # gpg: Signature made Mon 05 Mar 2018 03:06:59 GMT
      # 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:
        tap: setting error appropriately when calling net_init_tap_one()
        hw/net: Remove unnecessary header includes
        net: Add a new convenience option "--nic" to configure default/on-board NICs
        net: Remove the deprecated 'host_net_add' and 'host_net_remove' HMP commands
        net: Remove the deprecated way of dumping network packets
        net: Make net_client_init() static
        net: Only show vhost-user in the help text if CONFIG_POSIX is defined
        net: List available netdevs with "-netdev help"
        net: Move error reporting from net_init_client/netdev to the calling site
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      41dfc0dc
    • P
      Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.12-pull-request' into staging · 4a22592e
      Peter Maydell 提交于
      # gpg: Signature made Sun 04 Mar 2018 17:32:25 GMT
      # 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/vivier/tags/m68k-for-2.12-pull-request:
        target/m68k: add fscale, fgetman and fgetexp
        softfloat: use floatx80_infinity in softfloat
        target/m68k: add fmod/frem
        softfloat: export some functions
        target/m68k: TCGv returned by gen_load() must be freed
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      4a22592e
    • P
      Merge remote-tracking branch 'remotes/ericb/tags/pull-qapi-2018-03-01-v4' into staging · 7fceeb19
      Peter Maydell 提交于
      qapi patches for 2018-03-01
      
      - Markus Armbruster: Modularize generated QAPI code
      
      # gpg: Signature made Fri 02 Mar 2018 19:50:16 GMT
      # gpg:                using RSA key A7A16B4A2527436A
      # gpg: Good signature from "Eric Blake <eblake@redhat.com>"
      # gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>"
      # gpg:                 aka "[jpeg image of size 6874]"
      # Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A
      
      * remotes/ericb/tags/pull-qapi-2018-03-01-v4: (30 commits)
        qapi: Don't create useless directory qapi-generated
        Fix up dangling references to qmp-commands.* in comment and doc
        qapi: Move qapi-schema.json to qapi/, rename generated files
        docs: Correct outdated information on QAPI
        docs/devel/writing-qmp-commands: Update for modular QAPI
        qapi: Empty out qapi-schema.json
        Include less of the generated modular QAPI headers
        qapi: Generate separate .h, .c for each module
        watchdog: Consolidate QAPI into single file
        qapi/common: Fix guardname() for funny filenames
        qapi/types qapi/visit: Generate built-in stuff into separate files
        qapi: Make code-generating visitors use QAPIGen more
        qapi: Rename generated qmp-marshal.c to qmp-commands.c
        qapi: Record 'include' directives in intermediate representation
        qapi: Generate in source order
        qapi: Record 'include' directives in parse tree
        qapi: Concentrate QAPISchemaParser.exprs updates in .__init__()
        qapi: Lift error reporting from QAPISchema.__init__() to callers
        qapi/common: Eliminate QAPISchema.exprs
        qapi: Improve include file name reporting in error messages
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      7fceeb19