| 1 | The following changes since commit f55a585d1037e5de6088f25e75443c2776786e29: | 1 | The following changes since commit 77d472291812cf04f97974dadbda767e59e31fde: |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2019-04-07 14:54:55 +0100) | 3 | Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20170707-tag' into staging (2017-07-10 10:29:11 +0100) |
| 4 | 4 | ||
| 5 | are available in the Git repository at: | 5 | are available in the git repository at: |
| 6 | |||
| 6 | 7 | ||
| 7 | git://repo.or.cz/qemu/kevin.git tags/for-upstream | 8 | git://repo.or.cz/qemu/kevin.git tags/for-upstream |
| 8 | 9 | ||
| 9 | for you to fetch changes up to ab63817119b03b95f7dce6fae036e6d063ad63fb: | 10 | for you to fetch changes up to 51b0a488882328f8f02519bb47ca7e0e7fbe12ff: |
| 10 | 11 | ||
| 11 | hmp: Fix drive_add ... format=help crash (2019-04-08 17:42:06 +0200) | 12 | block: Make bdrv_is_allocated_above() byte-based (2017-07-10 13:18:07 +0200) |
| 12 | 13 | ||
| 13 | ---------------------------------------------------------------- | 14 | ---------------------------------------------------------------- |
| 14 | Block layer patches: | 15 | Block layer patches |
| 15 | |||
| 16 | - hmp: Fix drive_add ... format=help crash | ||
| 17 | - block: Forward 'discard' to temporary overlay | ||
| 18 | 16 | ||
| 19 | ---------------------------------------------------------------- | 17 | ---------------------------------------------------------------- |
| 20 | Kevin Wolf (1): | 18 | Daniel P. Berrange (1): |
| 21 | block: Forward 'discard' to temporary overlay | 19 | qemu-img: drop -e and -6 options from the 'create' & 'convert' commands |
| 22 | 20 | ||
| 23 | Markus Armbruster (1): | 21 | Eric Blake (25): |
| 24 | hmp: Fix drive_add ... format=help crash | 22 | qemu-io: Don't die on second open |
| 23 | block: Guarantee that *file is set on bdrv_get_block_status() | ||
| 24 | block: Simplify use of BDRV_BLOCK_RAW | ||
| 25 | blkdebug: Support .bdrv_co_get_block_status | ||
| 26 | blockjob: Track job ratelimits via bytes, not sectors | ||
| 27 | trace: Show blockjob actions via bytes, not sectors | ||
| 28 | stream: Switch stream_populate() to byte-based | ||
| 29 | stream: Drop reached_end for stream_complete() | ||
| 30 | stream: Switch stream_run() to byte-based | ||
| 31 | commit: Switch commit_populate() to byte-based | ||
| 32 | commit: Switch commit_run() to byte-based | ||
| 33 | mirror: Switch MirrorBlockJob to byte-based | ||
| 34 | mirror: Switch mirror_do_zero_or_discard() to byte-based | ||
| 35 | mirror: Update signature of mirror_clip_sectors() | ||
| 36 | mirror: Switch mirror_cow_align() to byte-based | ||
| 37 | mirror: Switch mirror_do_read() to byte-based | ||
| 38 | mirror: Switch mirror_iteration() to byte-based | ||
| 39 | block: Drop unused bdrv_round_sectors_to_clusters() | ||
| 40 | backup: Switch BackupBlockJob to byte-based | ||
| 41 | backup: Switch block_backup.h to byte-based | ||
| 42 | backup: Switch backup_do_cow() to byte-based | ||
| 43 | backup: Switch backup_run() to byte-based | ||
| 44 | block: Make bdrv_is_allocated() byte-based | ||
| 45 | block: Minimize raw use of bds->total_sectors | ||
| 46 | block: Make bdrv_is_allocated_above() byte-based | ||
| 25 | 47 | ||
| 26 | block.c | 3 ++- | 48 | Hervé Poussineau (13): |
| 27 | device-hotplug.c | 2 +- | 49 | vvfat: fix qemu-img map and qemu-img convert |
| 28 | tests/test-hmp.c | 1 + | 50 | vvfat: replace tabs by 8 spaces |
| 29 | 3 files changed, 4 insertions(+), 2 deletions(-) | 51 | vvfat: fix typos |
| 52 | vvfat: rename useless enumeration values | ||
| 53 | vvfat: introduce offset_to_bootsector, offset_to_fat and offset_to_root_dir | ||
| 54 | vvfat: fix field names in FAT12/FAT16 and FAT32 boot sectors | ||
| 55 | vvfat: always create . and .. entries at first and in that order | ||
| 56 | vvfat: correctly create long names for non-ASCII filenames | ||
| 57 | vvfat: correctly create base short names for non-ASCII filenames | ||
| 58 | vvfat: correctly generate numeric-tail of short file names | ||
| 59 | vvfat: limit number of entries in root directory in FAT12/FAT16 | ||
| 60 | vvfat: handle KANJI lead byte 0xe5 | ||
| 61 | vvfat: change OEM name to 'MSWIN4.1' | ||
| 30 | 62 | ||
| 63 | Thomas Huth (1): | ||
| 64 | blockdev: Print a warning for legacy drive options that belong to -device | ||
| 65 | |||
| 66 | block/backup.c | 128 +-- | ||
| 67 | block/blkdebug.c | 11 + | ||
| 68 | block/commit.c | 56 +- | ||
| 69 | block/io.c | 102 +- | ||
| 70 | block/mirror.c | 310 +++--- | ||
| 71 | block/raw-format.c | 2 +- | ||
| 72 | block/replication.c | 29 +- | ||
| 73 | block/stream.c | 37 +- | ||
| 74 | block/trace-events | 14 +- | ||
| 75 | block/vpc.c | 2 +- | ||
| 76 | block/vvfat.c | 2336 ++++++++++++++++++++++-------------------- | ||
| 77 | blockdev.c | 14 + | ||
| 78 | include/block/block.h | 16 +- | ||
| 79 | include/block/block_backup.h | 11 +- | ||
| 80 | include/qemu/ratelimit.h | 3 +- | ||
| 81 | migration/block.c | 16 +- | ||
| 82 | qemu-img.c | 41 +- | ||
| 83 | qemu-io-cmds.c | 70 +- | ||
| 84 | qemu-io.c | 7 +- | ||
| 85 | qemu-options.hx | 9 +- | ||
| 86 | tests/qemu-iotests/060.out | 1 + | ||
| 87 | tests/qemu-iotests/114.out | 5 +- | ||
| 88 | tests/qemu-iotests/153.out | 6 + | ||
| 89 | tests/qemu-iotests/177 | 3 + | ||
| 90 | tests/qemu-iotests/177.out | 5 + | ||
| 91 | 25 files changed, 1675 insertions(+), 1559 deletions(-) | ||
| 92 | diff view generated by jsdifflib |
Deleted patch | |||
|---|---|---|---|
| 1 | When bdrv_temp_snapshot_options() is called for snapshot=on, the | ||
| 2 | 'discard' option in the options QDict hasn't been parsed and merged into | ||
| 3 | the flags yet. So copy the dict entry to make sure that the temporary | ||
| 4 | overlay enables discard when it was requested for the drive. | ||
| 5 | 1 | ||
| 6 | Signed-off-by: Kevin Wolf <kwolf@redhat.com> | ||
| 7 | Reviewed-by: Eric Blake <eblake@redhat.com> | ||
| 8 | Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> | ||
| 9 | Reviewed-by: Alberto Garcia <berto@igalia.com> | ||
| 10 | --- | ||
| 11 | block.c | 3 ++- | ||
| 12 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/block.c b/block.c | ||
| 15 | index XXXXXXX..XXXXXXX 100644 | ||
| 16 | --- a/block.c | ||
| 17 | +++ b/block.c | ||
| 18 | @@ -XXX,XX +XXX,XX @@ static void bdrv_temp_snapshot_options(int *child_flags, QDict *child_options, | ||
| 19 | qdict_set_default_str(child_options, BDRV_OPT_CACHE_DIRECT, "off"); | ||
| 20 | qdict_set_default_str(child_options, BDRV_OPT_CACHE_NO_FLUSH, "on"); | ||
| 21 | |||
| 22 | - /* Copy the read-only option from the parent */ | ||
| 23 | + /* Copy the read-only and discard options from the parent */ | ||
| 24 | qdict_copy_default(child_options, parent_options, BDRV_OPT_READ_ONLY); | ||
| 25 | + qdict_copy_default(child_options, parent_options, BDRV_OPT_DISCARD); | ||
| 26 | |||
| 27 | /* aio=native doesn't work for cache.direct=off, so disable it for the | ||
| 28 | * temporary snapshot */ | ||
| 29 | -- | ||
| 30 | 2.20.1 | ||
| 31 | |||
| 32 | diff view generated by jsdifflib |
Deleted patch | |||
|---|---|---|---|
| 1 | From: Markus Armbruster <armbru@redhat.com> | ||
| 2 | 1 | ||
| 3 | drive_new() returns null without setting an error when it provided | ||
| 4 | help. add_init_drive() assumes null means failure, and crashes trying | ||
| 5 | to report a null error. | ||
| 6 | |||
| 7 | Fixes: c4f26c9f37ce511e5fe629c21c180dc6eb7c5a25 | ||
| 8 | Cc: qemu-stable@nongnu.org | ||
| 9 | Signed-off-by: Markus Armbruster <armbru@redhat.com> | ||
| 10 | Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> | ||
| 11 | Signed-off-by: Kevin Wolf <kwolf@redhat.com> | ||
| 12 | --- | ||
| 13 | device-hotplug.c | 2 +- | ||
| 14 | tests/test-hmp.c | 1 + | ||
| 15 | 2 files changed, 2 insertions(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/device-hotplug.c b/device-hotplug.c | ||
| 18 | index XXXXXXX..XXXXXXX 100644 | ||
| 19 | --- a/device-hotplug.c | ||
| 20 | +++ b/device-hotplug.c | ||
| 21 | @@ -XXX,XX +XXX,XX @@ static DriveInfo *add_init_drive(const char *optstr) | ||
| 22 | |||
| 23 | mc = MACHINE_GET_CLASS(current_machine); | ||
| 24 | dinfo = drive_new(opts, mc->block_default_type, &err); | ||
| 25 | - if (!dinfo) { | ||
| 26 | + if (err) { | ||
| 27 | error_report_err(err); | ||
| 28 | qemu_opts_del(opts); | ||
| 29 | return NULL; | ||
| 30 | diff --git a/tests/test-hmp.c b/tests/test-hmp.c | ||
| 31 | index XXXXXXX..XXXXXXX 100644 | ||
| 32 | --- a/tests/test-hmp.c | ||
| 33 | +++ b/tests/test-hmp.c | ||
| 34 | @@ -XXX,XX +XXX,XX @@ static const char *hmp_cmds[] = { | ||
| 35 | "cpu 0", | ||
| 36 | "device_add ?", | ||
| 37 | "device_add usb-mouse,id=mouse1", | ||
| 38 | + "drive_add ignored format=help", | ||
| 39 | "mouse_button 7", | ||
| 40 | "mouse_move 10 10", | ||
| 41 | "mouse_button 0", | ||
| 42 | -- | ||
| 43 | 2.20.1 | ||
| 44 | |||
| 45 | diff view generated by jsdifflib |