[qemu/epel7: 46/54] Merge remote-tracking branch 'origin/master' into epel7

Lubomir Rintel lkundrak at fedoraproject.org
Wed Feb 26 18:36:17 UTC 2014


commit 5f9089d1b5ffe089d41db2618d52b24ca53eac76
Merge: 7a207f1 755ac92
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Wed Feb 26 19:31:34 2014 +0100

    Merge remote-tracking branch 'origin/master' into epel7
    
    Basically throwing away whatever's left in the EPEL branch, bringing into sync
    with Fedora master.
    
    Conflicts:
    	0001-char-Split-out-tcp-socket-close-code-in-a-separate-f.patch
    	0002-char-Add-a-QemuChrHandlers-struct-to-initialise-char.patch
    	0003-iohandlers-Add-enable-disable_write_fd_handler-funct.patch
    	0004-char-Add-framework-for-a-write-unblocked-callback.patch
    	0005-char-Update-send_all-to-handle-nonblocking-chardev-w.patch
    	0006-char-Equip-the-unix-tcp-backend-to-handle-nonblockin.patch
    	0007-virtio-console-Enable-port-throttling-when-chardev-i.patch
    	0008-spice-qemu-char.c-add-throttling.patch
    	0009-spice-qemu-char.c-remove-intermediate-buffer.patch
    	0010-usb-redir-Add-flow-control-support.patch
    	0011-char-Disable-write-callback-if-throttled-chardev-is-.patch
    	0012-hw-virtio-serial-bus-replay-guest-open-on-destinatio.patch
    	0201-configure-Add-enable-migration-from-qemu-kvm.patch
    	0202-acpi_piix4-Drop-minimum_version_id-to-handle-qemu-kv.patch
    	0203-i8254-Fix-migration-from-qemu-kvm-1.1.patch
    	0204-pc_piix-Add-compat-handling-for-qemu-kvm-VGA-mem-siz.patch
    	0205-qxl-Add-rom_size-compat-property-fix-migration-from-.patch

 .gitignore                                         |    8 +-
 ...out-tcp-socket-close-code-in-a-separate-f.patch |   54 -
 ...h => 0001-pci-do-not-export-pci_bus_reset.patch |   43 +-
 ...QemuChrHandlers-struct-to-initialise-char.patch | 1068 --------------------
 ...both-pre-and-post-order-vists-in-qdev-wal.patch |   67 +-
 ...Add-enable-disable_write_fd_handler-funct.patch |   74 --
 ...h => 0003-qdev-switch-reset-to-post-order.patch |   87 +-
 ...-framework-for-a-write-unblocked-callback.patch |   59 --
 0004-virtio-bus-remove-vdev-field.patch            |  248 +++++
 ...-send_all-to-handle-nonblocking-chardev-w.patch |  178 ----
 0005-virtio-pci-remove-vdev-field.patch            |  447 ++++++++
 ...the-unix-tcp-backend-to-handle-nonblockin.patch |   72 --
 0006-virtio-ccw-remove-vdev-field.patch            |  293 ++++++
 ...-virtio-bus-cleanup-plug-unplug-interface.patch |  148 +++
 ...ole-Enable-port-throttling-when-chardev-i.patch |   47 -
 0008-spice-qemu-char.c-add-throttling.patch        |  132 ---
 ...switch-exit-callback-to-VirtioDeviceClass.patch |   53 +
 ...ce-qemu-char.c-remove-intermediate-buffer.patch |   70 --
 ...al-switch-exit-callback-to-VirtioDeviceCl.patch |   53 +
 0010-usb-redir-Add-flow-control-support.patch      |   62 --
 ...switch-exit-callback-to-VirtioDeviceClass.patch |   58 ++
 ...e-write-callback-if-throttled-chardev-is-.patch |   33 -
 ...-switch-exit-callback-to-VirtioDeviceClas.patch |  112 ++
 ...erial-bus-replay-guest-open-on-destinatio.patch |   51 -
 ...oon-switch-exit-callback-to-VirtioDeviceC.patch |   49 +
 ...switch-exit-callback-to-VirtioDeviceClass.patch |   49 +
 ...-virtio-pci-add-device_unplugged-callback.patch |   59 ++
 ...ose-backing-file-early-in-bdrv_img_create.patch |   72 ++
 ...-compilation-with-newer-versions-of-GNU-T.patch |   47 -
 ...change-initial-value-of-expected_downtime.patch |   29 -
 ...seccomp-add-kill-to-the-syscall-whitelist.patch |    6 +-
 ...alculate-end-time-after-we-have-sent-the-.patch |   34 -
 ...ip-streaming-video-mode-to-off-by-default.patch |    6 +-
 ...on-t-account-sleep-time-for-calculating-b.patch |   51 -
 ...x-transfer-length-and-direction-for-VERIF.patch |   59 ++
 0105-migration-calculate-expected_downtime.patch   |   61 --
 0105-scsi-disk-fix-VERIFY-emulation.patch          |   90 ++
 0106-migration-simplify-while-loop.patch           |   48 -
 ...-migration-always-use-vm_stop_force_state.patch |   50 -
 ...ove-more-error-handling-to-migrate_fd_cle.patch |   66 --
 ...ush-qemu_savevm_state_cancel-out-of-qemu_.patch |   70 --
 ...tion-remove-useless-calls-to-blk_mig_clea.patch |  103 --
 ...ass-errno-from-qemu_fflush-via-f-last_err.patch |   84 --
 ...se-qemu_file_set_error-to-pass-error-code.patch |  143 ---
 ...emporarily-expose-qemu_file_set_error-and.patch |   69 --
 ...lush-all-data-to-fd-when-buffered_flush-i.patch |   29 -
 0115-migration-use-qemu_file_set_error.patch       |   80 --
 0116-migration-simplify-error-handling.patch       |  140 ---
 ...ation-do-not-nest-flushing-of-device-data.patch |  152 ---
 ...igration-add-migrate_set_state-tracepoint.patch |   81 --
 ...repare-to-access-s-state-outside-critical.patch |  126 ---
 ...leanup-migration-including-thread-in-the-.patch |  129 ---
 ...tion-remove-variables-that-are-never-read.patch |   70 --
 ...tion-small-preparatory-changes-for-lockin.patch |   88 --
 ...tion-document-usage-of-state-across-threa.patch |   75 --
 0124-block-migration-add-lock.patch                |  279 -----
 ...-migration-reorder-SaveVMHandlers-members.patch |   40 -
 ...un-pending-iterate-callbacks-out-of-big-l.patch |  265 -----
 ...ation-run-setup-callbacks-out-of-big-lock.patch |  117 ---
 0128-migration-yay-buffering-is-gone.patch         |  176 ----
 0129-Rename-buffered_-to-migration_.patch          |  114 ---
 ...ake-qemu_fflush-and-qemu_file_set_error-p.patch |   58 --
 0131-migration-eliminate-last_round.patch          |   67 --
 0132-migration-detect-error-before-sleeping.patch  |   39 -
 ...-remove-useless-qemu_file_get_error-check.patch |   33 -
 ...ion-use-qemu_file_rate_limit-consistently.patch |   36 -
 ...tion-merge-qemu_popen_cmd-with-qemu_popen.patch |  103 --
 ...qemu-file-fsync-a-writable-stdio-QEMUFile.patch |   45 -
 ...heck-exit-status-when-closing-a-pipe-QEMU.patch |   65 --
 0138-qemu-file-add-writable-socket-QEMUFile.patch  |  111 --
 ...-qemu-file-simplify-and-export-qemu_ftell.patch |   73 --
 ...se-QEMUFile-for-migration-channel-lifetim.patch |  280 -----
 ...se-QEMUFile-for-writing-outgoing-migratio.patch |  251 -----
 ...ation-use-qemu_ftell-to-compute-bandwidth.patch |   45 -
 ...ration-small-changes-around-rate-limiting.patch |   78 --
 ...-migration-move-rate-limiting-to-QEMUFile.patch |  270 -----
 ...ove-contents-of-migration_close-to-migrat.patch |   52 -
 0146-migration-eliminate-s-migration_file.patch    |  196 ----
 0147-migration-inline-migrate_fd_close.patch       |   48 -
 ...ation-don-t-account-sleep-time-for-calcul.patch |   91 --
 ...figure-Add-enable-migration-from-qemu-kvm.patch |   66 --
 ...Drop-minimum_version_id-to-handle-qemu-kv.patch |   53 -
 0203-i8254-Fix-migration-from-qemu-kvm-1.1.patch   |   36 -
 ...-compat-handling-for-qemu-kvm-VGA-mem-siz.patch |   83 --
 ..._size-compat-property-fix-migration-from-.patch |  101 --
 ...sh-queued-packets-when-RxBufPtr-is-writte.patch |   47 -
 ...char-vmc_write-Don-t-write-more-bytes-the.patch |   44 -
 0208-configure-dtc-Probe-for-libfdt_env.h.patch    |   85 --
 0209-Fix-usage-of-USB_DEV_FLAG_IS_HOST-flag.patch  |   29 -
 0210-qxl-Fix-QXLRam-initialisation.patch           |   31 -
 0211-qemu-socket-Make-socket_optslist-public.patch |  110 --
 ...ibcacard-correct-T0-historical-bytes-size.patch |   35 -
 ...mul-do-not-crash-if-backend-is-not-provid.patch |   36 -
 ...ackend_enum_table-static-const-and-adjust.patch |   46 -
 ...lare-DEFAULT_ATR-table-to-be-static-const.patch |   29 -
 ...se-system-config-directory-for-nss-db-on-.patch |   47 -
 0217-util-move-socket_init-to-osdep.c.patch        |   94 --
 ...build-sys-must-link-with-fstack-protector.patch |   70 --
 0219-libcacard-fix-mingw64-cross-compilation.patch |   54 -
 ...-split-vscclient-main-from-socket-reading.patch |  374 -------
 ...scclient-to-use-QemuThread-for-portabilit.patch |   42 -
 ...each-vscclient-to-use-GMainLoop-for-porta.patch |  544 ----------
 0223-libcacard-remove-sql-prefix.patch             |   44 -
 ...bcacard-remove-default-libcoolkey-loading.patch |   61 --
 0225-dev-smartcard-reader-white-space-fixes.patch  |   51 -
 ...dev-smartcard-reader-nicer-debug-messages.patch |  141 ---
 ...rd-reader-remove-aborts-never-triggered-b.patch |   68 --
 ...ev-smartcard-reader-support-windows-guest.patch |   35 -
 ...-smartcard-reader-reuse-usb.h-definitions.patch |   62 --
 0230-libcacard-change-default-ATR.patch            |   39 -
 0231-ccid-card-passthru-add-atr-check.patch        |   92 --
 ...assthru-dev-smartcard-reader-add-debug-en.patch |  107 --
 ...rd-reader-define-structs-for-CCID_Paramet.patch |  158 ---
 ...ard-reader-change-default-protocol-to-T-0.patch |   47 -
 ...rd-reader-copy-atr-protocol-to-ccid-param.patch |   81 --
 ...d-vreader-add-debugging-messages-for-apdu.patch |  166 ---
 ...d-move-atr-setting-from-macro-to-function.patch |  158 ---
 ...rd-reader-empty-implementation-for-Mechan.patch |   31 -
 ...ac-change-big-switch-functions-to-single-.patch |  206 ----
 ...scclient-fix-leakage-of-socket-on-error-p.patch |   51 -
 ...ix-cppcheck-warning-and-remove-unneeded-c.patch |   85 --
 0311-isapc-disable-kvmvapic.patch                  |   34 -
 ...avoid-assertion-failure-on-VERIFY-command.patch |   63 --
 ...-target-ppc-Add-read-and-write-of-PPR-SPR.patch |   30 -
 0317-qxl-fix-local-renderer.patch                  |   65 --
 ...-Allocate-SCSITargetReq-r-buf-dynamically.patch |  155 ---
 ...robust-against-paths-without-FS_IOC_GETVE.patch |   42 -
 ...-9pfs-Fix-errno-value-for-xattr-functions.patch |   68 --
 ...omp-fine-tuning-whitelist-by-adding-times.patch |   28 -
 qemu.spec                                          |  645 ++++++------
 sources                                            |    2 +-
 131 files changed, 2220 insertions(+), 11315 deletions(-)
---


More information about the scm-commits mailing list