1. 09 3月, 2014 6 次提交
  2. 08 3月, 2014 6 次提交
    • P
      Merge remote-tracking branch 'remotes/kvaneesh/for-upstream' into staging · f53f3d0a
      Peter Maydell 提交于
      * remotes/kvaneesh/for-upstream:
        hw/9pfs: Include virtio-9p-device.o in build
        hw/9pfs: use g_strdup_printf() instead of PATH_MAX limitation
        hw/9pfs/virtio-9p-local.c: use snprintf() instead of sprintf()
        hw/9pfs/virtio-9p-local.c: move v9fs_string_free() to below "err_out:"
        fsdev: Fix overrun after readlink() fills buffer completely
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      f53f3d0a
    • P
      Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging · d7c698af
      Peter Maydell 提交于
      Block patches
      
      # gpg: Signature made Fri 07 Mar 2014 13:30:04 GMT using RSA key ID C88F2FD6
      # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
      
      * remotes/kevin/tags/for-upstream:
        block: qemu-iotests 085 - live snapshots tests
        hw/ide/ahci.h: Avoid shifting left into sign bit
        block: Fix error path segfault in bdrv_open()
        qemu-iotests: Test a few blockdev-add error cases
        blockdev: Fix NULL pointer dereference in blockdev-add
        blockdev: Fail blockdev-add with encrypted images
        block/raw-win32: Strip "file:" prefix on creation
        block/raw-win32: Implement bdrv_parse_filename()
        block/raw-posix: Strip "file:" prefix on creation
        block/raw-posix: Implement bdrv_parse_filename()
        block: Keep "filename" option after parsing
        block: mirror - remove code cruft that has no function
        block: make bdrv_swap rebuild the bs graph node list field.
        block: Fix bs->request_alignment assertion for bs->sg=1
        iscsi: Use bs->sg for everything else than disks
        qemu-iotests: Test progress output for conversion
        qemu-img convert: Fix progress output
        gluster: Remove unused defines and header include
        gluster: Change licence to GPLv2+
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      d7c698af
    • L
      build: Fix installation of target-dependent files · 6570025e
      Lluís Vilanova 提交于
      Pass all the relevant sub-directory make variables.
      Signed-off-by: NLluís Vilanova <vilanova@ac.upc.edu>
      Reviewed-by: NPaolo Bonzini <pbonzini@redhat.com>
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      Message-id: 20140120112153.5685.30949.stgit@fimbulvetr.bsc.es
      6570025e
    • A
      xenfb: Fix graphic_console_init() build failure · 80aaa074
      Andreas Färber 提交于
      In commit 5643706a (console: add head
      to index to qemu consoles.) graphic_console_init() was extended to take
      an additional argument, but xenfb was not updated accordingly. Fix it.
      
      Cc: Gerd Hoffmann <kraxel@redhat.com>
      Signed-off-by: NAndreas Färber <afaerber@suse.de>
      Reviewed-by: NStefan Weil <sw@weilnetz.de>
      Reviewed-by: NDon Slutz <dslutz@verizon.com>
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      Message-id: 1394228528-31625-1-git-send-email-afaerber@suse.de
      80aaa074
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-4' into staging · 6fc0303b
      Peter Maydell 提交于
      Input handling rewrite.
      SDL2 support.
      
      # gpg: Signature made Wed 05 Mar 2014 11:16:08 GMT using RSA key ID D3E87138
      # 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>"
      
      * remotes/kraxel/tags/pull-input-4: (38 commits)
        ui/sdl2 : initial port to SDL 2.0 (v2.0)
        console: add QemuUIInfo
        console: add head to index to qemu consoles.
        input: remove index_from_keycode (no users)
        input: move do_mouse_set to new core
        input: move qmp_query_mice to new core
        input: add input_mouse_mode tracepoint
        input: move mouse mode notifier to new core
        input-legacy: remove kbd_mouse_event
        input-legacy: remove kbd_mouse_is_absolute
        input-legacy: remove kbd_mouse_has_absolute
        input-legacy: remove kbd_put_keycode
        input: trace events
        input: mouse: switch cocoa ui to new core
        input: keyboard: switch cocoa ui to new core
        input: mouse: switch monitor to new core
        input: mouse: switch spice ui to new core
        input: mouse: switch vnc ui to new core
        input: mouse: switch sdl ui to new core
        input: mouse: switch gtk ui to new core
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      6fc0303b
    • P
      Merge remote-tracking branch 'remotes/agraf/tags/signed-ppc-for-upstream' into staging · bb2b0450
      Peter Maydell 提交于
      Patch queue for ppc - 2014-03-05
      
      This pull request includes:
      
        - VSX emulation support
        - book3s pr/hv selection
        - some bug fixes
        - qdev stable numbering
        - eTSEC emulation
      
      # gpg: Signature made Wed 05 Mar 2014 02:14:19 GMT using RSA key ID 03FEDC60
      # gpg: Can't check signature: public key not found
      
      * remotes/agraf/tags/signed-ppc-for-upstream: (130 commits)
        target-ppc: spapr: e500: fix to use cpu_dt_id
        target-ppc: add PowerPCCPU::cpu_dt_id
        target-ppc: Introduce hypervisor call H_GET_TCE
        target-ppc: Update ppc_hash64_store_hpte to support updating in-kernel htab
        target-ppc: Change the hpte store API
        target-ppc: Fix page table lookup with kvm enabled
        target-ppc: Fix htab_mask calculation
        target-ppc: Use Additional Temporary in stqcx Case
        target-ppc: Fix Compiler Warnings Due to 64-Bit Constants Declared as UL
        PPC: sPAPR: Only use getpagesize() when we run with kvm
        target-ppc/translate.c: Use ULL suffix for 64 bit constants
        spapr-vlan: flush queue whenever can_receive can go from false to true
        target-ppc: Altivec 2.07: Vector Permute and Exclusive OR
        target-ppc: Altivec 2.07: Vector SHA Sigma Instructions
        target-ppc: Altivec 2.07: AES Instructions
        target-ppc: Altivec 2.07: Binary Coded Decimal Instructions
        target-ppc: Altivec 2.07: Vector Polynomial Multiply Sum
        target-ppc: Altivec 2.07: Vector Gather Bits by Bytes
        target-ppc: Altivec 2.07: Doubleword Compares
        target-ppc: Altivec 2.07: vbpermq Instruction
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      bb2b0450
  3. 07 3月, 2014 9 次提交
    • P
      Merge remote-tracking branch 'remotes/cohuck/tags/virtio-ccw-20140305' into staging · c3f8d28e
      Peter Maydell 提交于
      One patch introducing support for adapter interrupts in virtio-ccw.
      
      This improves performance for those guests that issue the new
      CCW_CMD_SET_IND_ADAPTER channel command.
      
      # gpg: Signature made Wed 05 Mar 2014 08:48:18 GMT using RSA key ID C6F02FAF
      # gpg: Can't check signature: public key not found
      
      * remotes/cohuck/tags/virtio-ccw-20140305:
        s390x/virtio-ccw: Adapter interrupt support.
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      c3f8d28e
    • J
      block: qemu-iotests 085 - live snapshots tests · 4089f7c6
      Jeff Cody 提交于
      This adds tests for live snapshots, both through the single
      snapshot command, and the transaction group snapshot command.
      
      The snapshots are done through the QMP interface, using the
      following commands for snapshots:
      
      Single snapshot:
      { 'execute': 'blockdev-snapshot-sync', 'arguments':
                   { 'device': 'virtio0', 'snapshot-file':'...',
                     'format': 'qcow2' } }"
      
      Group snapshot:
      { 'execute': 'transaction', 'arguments':
                    {'actions': [
                        { 'type': 'blockdev-snapshot-sync', 'data' :
                          { 'device': 'virtio0', 'snapshot-file': '...' } },
                        { 'type': 'blockdev-snapshot-sync', 'data' :
                          { 'device': 'virtio1', 'snapshot-file': '...' } } ]
                   } }
      Signed-off-by: NJeff Cody <jcody@redhat.com>
      Reviewed-by: NBenoit Canet <benoit@irqsave.net>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      4089f7c6
    • P
      hw/ide/ahci.h: Avoid shifting left into sign bit · 2c02f887
      Peter Maydell 提交于
      Add 'U' suffixes to avoid undefined behaviour shifting left into
      the signed bit of a signed integer type. Clang's sanitizer will
      warn about this:
      
       hw/ide/ahci.c:1210:27: runtime error: left shift of 1 by 31 places cannot be represented in type 'int'
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      Reviewed-by: NPeter Crosthwaite <peter.crosthwaite@xilinx.com>
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      2c02f887
    • P
      configure: Always build with -fno-common · 4c288acb
      Peter Maydell 提交于
      MacOSX doesn't pull .o files from .a archives if the symbol that it
      requires is one which the .o file defines as a common symbol.
      (Common symbols are those declared without "extern"; the linker
      will merge together common symbols with the same name, so
      redeclaring the same variable in two compilation units results in
      them referring to the same symbol rather than a compilation error).
      
      This MacOSX difference from traditional linker behaviour means that
      "make check" produces link errors:
      
      Undefined symbols for architecture x86_64:
        "_cur_mon", referenced from:
            _error_vprintf in libqemuutil.a(qemu-error.o)
            _error_printf in libqemuutil.a(qemu-error.o)
            _error_printf_unless_qmp in libqemuutil.a(qemu-error.o)
            _error_print_loc in libqemuutil.a(qemu-error.o)
            _error_report in libqemuutil.a(qemu-error.o)
      ld: symbol(s) not found for architecture x86_64
      
      in this case because "cur_mon" is a common symbol in
      libqemustub.a(mon-set-error.o).
      
      In QEMU we don't make any use at all of the common symbol
      functionality, so we can avoid this problem entirely simply
      by compiling with -fno-common. Enable this option for all
      builds, not just MacOSX, so that if we ever inadvertently
      introduce multiple definitions of some variable that will
      be immediately spotted as a build error rather than only
      breaking the MacOSX build.
      Suggested-by: NMarkus Armbruster <armbru@redhat.com>
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      Reviewed-by: NRichard Henderson <rth@twiddle.net>
      Message-id: 1393451610-24617-1-git-send-email-peter.maydell@linaro.org
      4c288acb
    • P
      configure: Make C++ test work with --enable-werror · 9c83ffd8
      Peter Maydell 提交于
      gcc's C++ compiler complains about being passed some -W options
      which make sense for C but not for C++. This means we mustn't try
      a C++ compile with QEMU_CFLAGS, but only with a filtered version
      that removes the offending options. This filtering was already being
      done for uses of C++ in the build itself, but was omitted for the
      "does C++ work?" configure test. This only showed up when doing
      builds which explicitly enabled -Werror with --enable-werror,
      because the "do the compilers work" tests were mistakenly placed
      above the "default werror based on whether compiling from git" code.
      Another error in this category is that clang warns if you ask it to
      compile C++ code from a file named "foo.c". Further, because we
      were running do_cc in a subshell in the condition part of an "if",
      the error_exit inside do_compiler wouldn't terminate configure and
      we would plunge on regardless. Fix this complex of errors:
      
      1. Move the default-werror code up so that there are no invocations
      of compile_object and friends between it and the point where we
      set $werror explicitly based on the --enable-werror command line
      option.
      
      2. Provide a mechanism for filtering QEMU_CFLAGS to create
      QEMU_CXXFLAGS, and use it for the test we run here.
      
      3. Provide a do_cxx function to run a test with the C++ compiler
      rather than doing cute tricks with subshells and do_cc.
      
      4. Use a new temporary file TMPCXX for the C++ program fragment.
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      Message-id: 1393352869-22257-1-git-send-email-peter.maydell@linaro.org
      Tested-by: NAndreas Färber <afaerber@suse.de>
      9c83ffd8
    • K
      block: Fix error path segfault in bdrv_open() · eb909c7f
      Kevin Wolf 提交于
      Using an invalid option for a block device that is opened with
      BDRV_O_PROTOCOL led to drv = NULL, and when trying to include the driver
      name in the error message, qemu dereferenced it:
      
          $ x86_64-softmmu/qemu-system-x86_64 -drive file=/tmp/test.qcow2,file.foo=bar
          Segmentation fault (core dumped)
      
      With this patch applied, the expected error message is printed:
      
          $ x86_64-softmmu/qemu-system-x86_64 -drive file=/tmp/test.qcow2,file.foo=bar
          qemu-system-x86_64: -drive file=/tmp/test.qcow2,file.foo=bar: could
          not open disk image /tmp/test.qcow2: Block protocol 'file' doesn't
          support the option 'foo'
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NBenoit Canet <benoit@irqsave.net>
      eb909c7f
    • K
      qemu-iotests: Test a few blockdev-add error cases · c75203c8
      Kevin Wolf 提交于
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NBenoit Canet <benoit@irqsave.net>
      c75203c8
    • K
      blockdev: Fix NULL pointer dereference in blockdev-add · c6e0bd9b
      Kevin Wolf 提交于
      If aio=native, we check that cache.direct is set as well. If however
      cache wasn't specified at all, qemu just segfaulted.
      
      The old condition didn't make any sense anyway because it effectively
      only checked for the default cache mode case, but not for an explicitly
      set cache.direct=off mode.
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NBenoit Canet <benoit@irqsave.net>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      c6e0bd9b
    • K
      blockdev: Fail blockdev-add with encrypted images · 8ae8e904
      Kevin Wolf 提交于
      Encrypted images need a password before they can be used, and we don't
      want blockdev-add to create BDSes that aren't fully initialised. So for
      now simply forbid encrypted images; we can come back to it later if we
      need the functionality.
      Signed-off-by: NKevin Wolf <kwolf@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      8ae8e904
  4. 06 3月, 2014 7 次提交
  5. 05 3月, 2014 12 次提交