Skip to content

Commits

Permalink
block-replicat…
Switch branches/tags

Name already in use

A tag already exists with the provided branch name. Many Git commands accept both tag and branch names, so creating this branch may cause unexpected behavior. Are you sure you want to create this branch?

Commits on May 20, 2015

  1. Implement new driver for block replication

    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang committed May 20, 2015
    Copy the full SHA
    e472780 View commit details
    Browse the repository at this point in the history
  2. quorum: allow ignoring child errors

    If the child is not ready, read/write/getlength/flush will
    return -errno. It is not critical error, and can be ignored:
    1. read/write:
       Just not report the error event.
    2. getlength:
       just ignore it. If all children's getlength return -errno,
       and be ignored, return -EIO.
    3. flush:
       Just ignore it. If all children's getlength return -errno,
       and be ignored, return 0.
    
    Usage: children.x.ignore-errors=true
    
    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang committed May 20, 2015
    Copy the full SHA
    829b371 View commit details
    Browse the repository at this point in the history
  3. quorum: implement block driver interfaces for block replication

    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang committed May 20, 2015
    Copy the full SHA
    3d718c7 View commit details
    Browse the repository at this point in the history
  4. skip nbd_target when starting block replication

    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang committed May 20, 2015
    Copy the full SHA
    1877a1f View commit details
    Browse the repository at this point in the history
  5. Add new block driver interfaces to control block replication

    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    Cc: Luiz Capitulino <lcapitulino@redhat.com>
    Cc: Michael Roth <mdroth@linux.vnet.ibm.com>
    Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
    wencongyang committed May 20, 2015
    Copy the full SHA
    49c7090 View commit details
    Browse the repository at this point in the history
  6. NBD client: connect to nbd server later

    The secondary qemu starts later than the primary qemu, so we
    cannot connect to nbd server in bdrv_open(). Introduce a new
    open flags to control it.
    
    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang committed May 20, 2015
    Copy the full SHA
    ab4685b View commit details
    Browse the repository at this point in the history
  7. Introduce a new -drive option to control whether to connect to remote…

    … target
    
    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang committed May 20, 2015
    Copy the full SHA
    2868145 View commit details
    Browse the repository at this point in the history
  8. NBD client: implement block driver interfaces to connect/disconnect N…

    …BD server
    
    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang committed May 20, 2015
    Copy the full SHA
    296b23a View commit details
    Browse the repository at this point in the history
  9. Add new block driver interface to connect/disconnect the remote target

    In some cases, we want to connect/disconnect the remote target when
    we need, not in bdrv_open()/bdrv_close().
    
    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang committed May 20, 2015
    Copy the full SHA
    d9834a4 View commit details
    Browse the repository at this point in the history
  10. Don't allow a disk use backing reference target

    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang committed May 20, 2015
    Copy the full SHA
    300f95e View commit details
    Browse the repository at this point in the history
  11. Backup: clear all bitmap when doing block checkpoint

    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    Cc: Jeff Cody <jcody@redhat.com>
    wencongyang committed May 20, 2015
    Copy the full SHA
    70473a7 View commit details
    Browse the repository at this point in the history
  12. block: Parse "backing_reference" option to reference existing BDS

    Usage:
    -drive file=xxx,id=Y, \
    -drive file=xxxx,id=X,backing_reference.drive_id=Y,backing_reference.hidden-disk.*
    
    It will create such backing chain:
                   {virtio-blk dev 'Y'}                                      {virtio-blk dev 'X'}
                             |                                                          |
                             |                                                          |
                             v                                                          v
    
        [base] <- [mid] <- ( Y )  <----------------- (hidden target) <--------------- ( X )
    
                             v                              ^
                             v                              ^
                             v                              ^
                             v                              ^
                             >>>> drive-backup sync=none >>>>
    
    X's backing file is hidden-disk, and hidden-disk's backing file is Y.
    Disk Y may be opened or reopened in read-write mode, so A block backup
    job is automatically created: source is Y and target is hidden disk.
    Active disk X, hidden disk, and Y are all on the same AioContext.
    
    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang committed May 20, 2015
    Copy the full SHA
    64c6f24 View commit details
    Browse the repository at this point in the history
  13. Allow creating backup jobs when opening BDS

    When opening BDS, we need to create backup jobs for
    image-fleecing.
    
    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    Cc: Jeff Cody <jcody@redhat.com>
    wencongyang committed May 20, 2015
    Copy the full SHA
    120ee37 View commit details
    Browse the repository at this point in the history
  14. allow writing to the backing file

    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang committed May 20, 2015
    Copy the full SHA
    387db9c View commit details
    Browse the repository at this point in the history
  15. docs: block replication's description

    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang committed May 20, 2015
    Copy the full SHA
    c746d88 View commit details
    Browse the repository at this point in the history
  16. mirror: correct buf_size

    If bus_size is less than 0, the command fails.
    If buf_size is 0, use DEFAULT_MIRROR_BUF_SIZE.
    If buf_size % granularity is not 0, mirror_free_init() will
    do dangerous things.
    
    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Reviewed-by: Fam Zheng <famz@redhat.com>
    wencongyang committed May 20, 2015
    Copy the full SHA
    c895741 View commit details
    Browse the repository at this point in the history
  17. util/hbitmap: Add an API to reset all set bits in hbitmap

    The function bdrv_clear_dirty_bitmap() is updated to use
    faster hbitmap_reset_all() call.
    
    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    Acked-by: Paolo Bonzini <pbonzini@redhat.com>
    wencongyang committed May 20, 2015
    Copy the full SHA
    e1b9066 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2015

  1. Merge remote-tracking branch 'remotes/kraxel/tags/pull-serial-2015051…

    …9-1' into staging
    
    serial: fix multi-pci card error cleanup.
    
    # gpg: Signature made Tue May 19 11:47:29 2015 BST 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-serial-20150519-1:
      serial: fix multi-pci card error cleanup.
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    pm215 committed May 19, 2015
    Copy the full SHA
    eba05e9 View commit details
    Browse the repository at this point in the history
  2. serial: fix multi-pci card error cleanup.

    Put the number of serial ports into a local variable in
    multi_serial_pci_realize, then increment the port count
    (pci->ports) as we initialize the serial port cores.
    
    Now pci->ports always holds the number of successfully
    initialized ports and we can use multi_serial_pci_exit
    to properly cleanup the already initialized bits in case
    of a init failure.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=970551
    
    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
    Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
    kraxel committed May 19, 2015
    Copy the full SHA
    a48da7b View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20150519-1…

    …' into staging
    
    hw/display: qomify vga cards
    
    # gpg: Signature made Tue May 19 11:23:09 2015 BST 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-vga-20150519-1:
      vga-pci: QOMify
      qxl: QOMify
      cirrus_vga: QOMify
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    pm215 committed May 19, 2015
    Copy the full SHA
    fdbe454 View commit details
    Browse the repository at this point in the history
  4. vga-pci: QOMify

    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
    gongleiarei authored and kraxel committed May 19, 2015
    Copy the full SHA
    176c324 View commit details
    Browse the repository at this point in the history
  5. qxl: QOMify

    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
    gongleiarei authored and kraxel committed May 19, 2015
    Copy the full SHA
    c69f6c7 View commit details
    Browse the repository at this point in the history
  6. cirrus_vga: QOMify

    QOMify pci-cirrus-vga like isa-cirrus-vga device.
    
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
    gongleiarei authored and kraxel committed May 19, 2015
    Copy the full SHA
    d338bae View commit details
    Browse the repository at this point in the history
  7. Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-201505…

    …19' into staging
    
    cocoa queue:
     * fix various issues with full screen in the OSX UI
     * set an icon for our binary file
     * add entries to the View menu for QEMU consoles
     * fix various warnings that are produced when building on 10.10
       (largely deprecated interfaces)
    
    # gpg: Signature made Tue May 19 09:17:23 2015 BST using RSA key ID 14360CDE
    # gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
    
    * remotes/pmaydell/tags/pull-cocoa-20150519:
      ui/cocoa: Add console items to the View menu
      ui/cocoa: Avoid deprecated NSOKButton/NSCancelButton constants
      ui/cocoa: Don't use NSWindow useOptimizedDrawing on OSX 10.10 and up
      ui/cocoa: Declare that QemuCocoaAppController implements NSApplicationDelegate
      ui/cocoa: openPanelDidEnd returnCode should be NSInteger, not int
      ui/cocoa: Remove compatibility ifdefs for OSX 10.4
      ui/cocoa: Drop tests for CGImageCreateWithImageInRect support
      Makefile.target: set icon for binary file on Mac OS X
      ui/cocoa: Make -full-screen option work on Mac OS X
      ui/cocoa: Fix several full screen issues on Mac OS X
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    pm215 committed May 19, 2015
    Copy the full SHA
    faa261a View commit details
    Browse the repository at this point in the history
  8. ui/cocoa: Add console items to the View menu

    Add any console that is available to the current emulator as a
    menu item under the View menu.
    
    Signed-off-by: John Arbuckle <programmingkidx@gmail.com>
    [PMM: Adjusted to apply after zoom-to-fit menu item was added;
     create the View menu at the same time as all the others, and only
     add the dynamically-determined items to it later]
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    programmingkidx authored and pm215 committed May 19, 2015
    Copy the full SHA
    b4c6a11 View commit details
    Browse the repository at this point in the history
  9. ui/cocoa: Avoid deprecated NSOKButton/NSCancelButton constants

    In OSX 10.10, the NSOKButton and NSCancelButton constants are deprecated
    and provoke compiler warnings. Avoid them by using the
    NSFileHandlingPanelCancelButton and NSFileHandlingPanelOKButton constants
    instead. These are the documented correct constants for the 10.6-and-up
    beginSheetModalForWindow API we use. We also use the same method for
    the pre-10.6 compatibility code path, but conveniently the constant
    values are the same and the constant names have been present since 10.0.
    Preferring the constant names that match the non-legacy API makes more
    sense anyway.
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    Message-id: 1431296361-16981-7-git-send-email-peter.maydell@linaro.org
    pm215 committed May 19, 2015
    Copy the full SHA
    8617989 View commit details
    Browse the repository at this point in the history
  10. ui/cocoa: Don't use NSWindow useOptimizedDrawing on OSX 10.10 and up

    Starting in OSX 10.10, NSWindow useOptimizedDrawing is deprecated, so
    don't use it there.
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    Message-id: 1431296361-16981-6-git-send-email-peter.maydell@linaro.org
    pm215 committed May 19, 2015
    Copy the full SHA
    81801ae View commit details
    Browse the repository at this point in the history
  11. ui/cocoa: Declare that QemuCocoaAppController implements NSApplicatio…

    …nDelegate
    
    Our class QemuCocoaAppController implements the NSApplicationDelegate
    interface, and we pass an object of this class to [NSApp setDelegate].
    However, we weren't declaring in the class definition that we implemented
    this interface; in OSX 10.10 this provokes the following (slighly
    misleading) warning:
    ui/cocoa.m:1031:24: warning: sending 'QemuCocoaAppController *' to parameter of
          incompatible type 'id<NSFileManagerDelegate>'
        [NSApp setDelegate:appController];
                           ^~~~~~~~~~~~~
    /System/Library/Frameworks/Foundation.framework/Headers/NSFileManager.h:109:47:
    note: passing argument to parameter 'delegate' here
    @Property (assign) id <NSFileManagerDelegate> delegate NS_AVAILABLE(10_5,
    2_0);
                                                  ^
    
    Annoyingly, this interface wasn't formally defined until OSX 10.6, so we
    have to surround the relevant part of the @interface line with an ifdef.
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    Message-id: 1431296361-16981-5-git-send-email-peter.maydell@linaro.org
    pm215 committed May 19, 2015
    Copy the full SHA
    2a4c8c5 View commit details
    Browse the repository at this point in the history
  12. ui/cocoa: openPanelDidEnd returnCode should be NSInteger, not int

    The type for openPanelDidEnd's returnCode argument should be NSInteger,
    not int. This only matters for the OSX 10.5 code path where we pass
    the method directly to an OSX function to call.
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    Message-id: 1431296361-16981-4-git-send-email-peter.maydell@linaro.org
    pm215 committed May 19, 2015
    Copy the full SHA
    de1aade View commit details
    Browse the repository at this point in the history
  13. ui/cocoa: Remove compatibility ifdefs for OSX 10.4

    Remove compatibility ifdefs that work around OSX 10.4 not providing
    various typedefs and functions.
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    Message-id: 1431296361-16981-3-git-send-email-peter.maydell@linaro.org
    pm215 committed May 19, 2015
    Copy the full SHA
    89424ff View commit details
    Browse the repository at this point in the history
  14. ui/cocoa: Drop tests for CGImageCreateWithImageInRect support

    The code that tries to test at both compiletime and runtime
    for whether CGImageCreateWithImageInRect is supported provokes
    a compile warning on OSX 10.3:
    
    ui/cocoa.m:378:13: warning: comparison of function 'CGImageCreateWithImageInRect'
          equal to a null pointer is always false[-Wtautological-pointer-compare]
            if (CGImageCreateWithImageInRect == NULL) { // test if "CGImageCreateWithImageInRect" is
    supported on host at runtime
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~    ~~~~
    
    The simplest way to deal with this is just to drop this code,
    since we don't in practice support OSX 10.4 anyway. (10.5 was
    released in 2007 and is the last PPC version, so is the earliest
    we really need to continue to support at all.)
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    Message-id: 1431296361-16981-2-git-send-email-peter.maydell@linaro.org
    pm215 committed May 19, 2015
    Copy the full SHA
    b63901d View commit details
    Browse the repository at this point in the history
  15. Makefile.target: set icon for binary file on Mac OS X

    Implements setting the icon for the binary file in Mac OS X.
    
    Signed-off-by: John Arbuckle <programmingkidx@gmail.com>
    [PMM: tweaked makefile to use $@ and quiet-command]
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    programmingkidx authored and pm215 committed May 19, 2015
    Copy the full SHA
    4e34017 View commit details
    Browse the repository at this point in the history
  16. ui/cocoa: Make -full-screen option work on Mac OS X

    This patch makes the -full-screen option actually instruct QEMU to
    enter fullscreen at startup, on Mac OS X.
    
    Signed-off-by: John Arbuckle <programmingkidx@gmail.com>
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    programmingkidx authored and pm215 committed May 19, 2015
    Copy the full SHA
    43227af View commit details
    Browse the repository at this point in the history
  17. ui/cocoa: Fix several full screen issues on Mac OS X

    This patch makes several changes:
    - Minimizes distorted full screen display by respecting aspect
    ratios.
    - Makes full screen mode available on Mac OS 10.7 and higher.
    - Allows user to decide if video should be stretched to fill the
    screen, using a menu item called "Zoom To Fit".
    - Hides the normalWindow so it won't show up in full screen mode.
    - Allows user to exit full screen mode.
    
    Signed-off-by: John Arbuckle <programmingkidx@gmail.com>
    [PMM: minor whitespace tweaks, remove incorrectly duplicated
     use of 'f' menu accelerator key]
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    programmingkidx authored and pm215 committed May 19, 2015
    Copy the full SHA
    5d1b2ee View commit details
    Browse the repository at this point in the history

Commits on May 18, 2015

  1. Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-2…

    …0150518-3' into staging
    
    target-arm:
     * New board model: xlnx-ep108
     * Some more preparation for AArch64 EL2/EL3
     * Fix bugs in access checking for generic counter registers
     * Remove a stray '+' sign
    
    # gpg: Signature made Mon May 18 20:13:05 2015 BST using RSA key ID 14360CDE
    # gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
    
    * remotes/pmaydell/tags/pull-target-arm-20150518-3: (21 commits)
      target-arm: Remove unneeded '+'
      target-arm: Correct accessfn for CNTV_TVAL_EL0
      target-arm: Correct accessfn for CNTP_{CT}VAL_EL0
      target-arm: Add WFx syndrome function
      target-arm: Add EL3 and EL2 TCR checking
      target-arm: Add TTBR regime function and use
      linux-user/arm: Correct TARGET_NR_timerfd to TARGET_NR_timerfd_create
      arm: xlnx-ep108: Add bootloading
      arm: xlnx-ep108: Add external RAM
      arm: Add xlnx-ep108 machine
      arm: xlnx-zynqmp: Add UART support
      char: cadence_uart: Split state struct and type into header
      char: cadence_uart: Clean up variable names
      arm: xlnx-zynqmp: Add GEM support
      net: cadence_gem: Split state struct and type into header
      net: cadence_gem: Clean up variable names
      arm: xlnx-zynqmp: Connect CPU Timers to GIC
      arm: xlnx-zynqmp: Add GIC
      arm: Introduce Xilinx ZynqMP SoC
      target-arm: cpu64: Add support for Cortex-A53
      ...
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    pm215 committed May 18, 2015
    Copy the full SHA
    62bf3df View commit details
    Browse the repository at this point in the history
Older