qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 1d7459: qemu-img: Fix doc typo for 'bitmap' s


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 1d7459: qemu-img: Fix doc typo for 'bitmap' subcommand
Date: Thu, 11 Jun 2020 10:00:33 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 1d74594065a387c03b962a2c5cf77efa394ff82d
      
https://github.com/qemu/qemu/commit/1d74594065a387c03b962a2c5cf77efa394ff82d
  Author: Eric Blake <eblake@redhat.com>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M docs/tools/qemu-img.rst

  Log Message:
  -----------
  qemu-img: Fix doc typo for 'bitmap' subcommand

Prefer a consistent naming for the --merge argument.

Fixes: 3b51ab4bf
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200529144527.1943527-1-eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>


  Commit: 02756054e1e4e662e2fbdb283754a4a32e9bbd91
      
https://github.com/qemu/qemu/commit/02756054e1e4e662e2fbdb283754a4a32e9bbd91
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/qcow2.py

  Log Message:
  -----------
  qcow2.py: python style fixes

Fix flake8 complaints.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200606081806.23897-2-vsementsov@virtuozzo.com>
Tested-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[eblake: commit message improved]
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: 16306a7b39fd63cf6e2e0cdf35a1834a5294235a
      
https://github.com/qemu/qemu/commit/16306a7b39fd63cf6e2e0cdf35a1834a5294235a
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/qcow2.py

  Log Message:
  -----------
  qcow2.py: add licensing blurb

Add classic heading, which is missing here. Keep copyright place empty,
prior authors may add a line later.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200606081806.23897-3-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[eblake: tweak commit message]
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: d5262c712488674fba74a749e81894e098226bfa
      
https://github.com/qemu/qemu/commit/d5262c712488674fba74a749e81894e098226bfa
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/qcow2.py
    A tests/qemu-iotests/qcow2_format.py

  Log Message:
  -----------
  qcow2.py: move qcow2 format classes to separate module

We are going to enhance qcow2 format parsing by adding more structure
classes. Let's split format parsing from utility code.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200606081806.23897-4-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: eeafed5f6e76a98d3b640f003b96b1490d2281b1
      
https://github.com/qemu/qemu/commit/eeafed5f6e76a98d3b640f003b96b1490d2281b1
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/qcow2.py
    M tests/qemu-iotests/qcow2_format.py

  Log Message:
  -----------
  qcow2_format.py: drop new line printing at end of dump()

This will simplify further conversion. To compensate, print this empty
line directly in cmd_dump_header().

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Message-Id: <20200606081806.23897-5-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: b2f1415444af944a087a72ed0e55f971a78a2371
      
https://github.com/qemu/qemu/commit/b2f1415444af944a087a72ed0e55f971a78a2371
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/qcow2_format.py

  Log Message:
  -----------
  qcow2_format.py: use tuples instead of lists for fields

No need in lists: it's a constant variable.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Message-Id: <20200606081806.23897-6-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: 621ca4988a20733eca43148396f910373e02d571
      
https://github.com/qemu/qemu/commit/621ca4988a20733eca43148396f910373e02d571
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/qcow2_format.py

  Log Message:
  -----------
  qcow2_format.py: use modern string formatting

Use .format and f-strings instead of old %style. Also, the file uses
both '' and "" quotes, for consistency let's use '', except for cases
when we need '' inside the string (use "" to avoid extra escaping).

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Message-Id: <20200606081806.23897-7-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: 5432a0db528cde9f58d6a843105a66c79b523a73
      
https://github.com/qemu/qemu/commit/5432a0db528cde9f58d6a843105a66c79b523a73
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/qcow2_format.py

  Log Message:
  -----------
  qcow2_format.py: use strings to specify c-type of struct fields

We are going to move field-parsing to super-class, this will be simpler
with simple string specifiers instead of variables.

For some reason, python doesn't allow the definition of ctypes variable
in the class alongside fields: it would not be available then for use
by the 'for' operator. Don't worry: ctypes will be moved to metaclass
soon.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Message-Id: <20200606081806.23897-8-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: 0903e3b3714df385931e4ff844e4aff713aa2411
      
https://github.com/qemu/qemu/commit/0903e3b3714df385931e4ff844e4aff713aa2411
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/qcow2_format.py

  Log Message:
  -----------
  qcow2_format.py: separate generic functionality of structure classes

We are going to introduce more Qcow2 structure types, defined like
QcowHeader. Move generic functionality into base class to be reused for
further structure classes.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Message-Id: <20200606081806.23897-9-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: 860543f055654017cdb5b25ed06c2bc91b72af70
      
https://github.com/qemu/qemu/commit/860543f055654017cdb5b25ed06c2bc91b72af70
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/qcow2_format.py

  Log Message:
  -----------
  qcow2_format.py: add field-formatting class

Allow formatter class in structure definition instead of hacking with
'mask'. This will simplify further introduction of new formatters.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Message-Id: <20200606081806.23897-10-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: 0931fcc7beb1c2461f094e16720a979e749085e9
      
https://github.com/qemu/qemu/commit/0931fcc7beb1c2461f094e16720a979e749085e9
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/qcow2_format.py

  Log Message:
  -----------
  qcow2_format.py: QcowHeaderExtension: add dump method

Obviously, for-loop body in dump_extensions should be the dump method
of extension.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Message-Id: <20200606081806.23897-11-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: a9e750e1ce0bfcca1ff51c71e66eb4b0f66061a8
      
https://github.com/qemu/qemu/commit/a9e750e1ce0bfcca1ff51c71e66eb4b0f66061a8
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/qcow2_format.py

  Log Message:
  -----------
  qcow2_format: refactor QcowHeaderExtension as a subclass of Qcow2Struct

Only two fields we can parse by generic code, but that is better than
nothing. Keep further refactoring of variable-length fields for another
day.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Message-Id: <20200606081806.23897-12-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: aef87784f93b9e7e07ea7b2ee9dee4c257c1881f
      
https://github.com/qemu/qemu/commit/aef87784f93b9e7e07ea7b2ee9dee4c257c1881f
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/031.out
    M tests/qemu-iotests/036.out
    M tests/qemu-iotests/061.out
    M tests/qemu-iotests/qcow2_format.py

  Log Message:
  -----------
  qcow2: QcowHeaderExtension print names for extension magics

Suggested-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200606081806.23897-13-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: 820c6bee534ec3bd61c7d14d7040ec917cc25ab2
      
https://github.com/qemu/qemu/commit/820c6bee534ec3bd61c7d14d7040ec917cc25ab2
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/291
    M tests/qemu-iotests/291.out
    M tests/qemu-iotests/qcow2_format.py

  Log Message:
  -----------
  qcow2_format.py: dump bitmaps header extension

Add class for bitmap extension and dump its fields. Further work is to
dump bitmap directory.

Test new functionality inside 291 iotest.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Message-Id: <20200606081806.23897-14-vsementsov@virtuozzo.com>
[eblake: fix iotest output]
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: adf92f4645ba46726368735916fed763d3e5a09b
      
https://github.com/qemu/qemu/commit/adf92f4645ba46726368735916fed763d3e5a09b
  Author: Eric Blake <eblake@redhat.com>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M tests/qemu-iotests/291
    M tests/qemu-iotests/291.out

  Log Message:
  -----------
  iotests: Fix 291 across more file systems

Depending on the granularity of holes and amount of metadata consumed
by a file, the 'disk size:' number of 'qemu-img info' is not reliable.
Adjust our test to use a different set of filters to avoid spurious
failures.

Reported-by: Kevin Wolf <kwolf@redhat.com>
Fixes: cf2d1203dc
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200608195629.3299649-1-eblake@redhat.com>
Acked-by: Kevin Wolf <kwolf@redhat.com>
[eblake: fix merge conflict]
Signed-off-by: Eric Blake <eblake@redhat.com>


  Commit: 3666f684761a3cccd86d13c752273be207ecade4
      
https://github.com/qemu/qemu/commit/3666f684761a3cccd86d13c752273be207ecade4
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-06-11 (Thu, 11 Jun 2020)

  Changed paths:
    M docs/tools/qemu-img.rst
    M tests/qemu-iotests/031.out
    M tests/qemu-iotests/036.out
    M tests/qemu-iotests/061.out
    M tests/qemu-iotests/291
    M tests/qemu-iotests/291.out
    M tests/qemu-iotests/qcow2.py
    A tests/qemu-iotests/qcow2_format.py

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/ericb/tags/pull-bitmaps-2020-06-09' 
into staging

bitmaps patches for 2020-06-09

- documenation fix
- various improvements to qcow2.py program used in iotests

# gpg: Signature made Tue 09 Jun 2020 21:50:35 BST
# gpg:                using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full]
# gpg:                 aka "Eric Blake (Free Software Programmer) 
<ebb9@byu.net>" [full]
# gpg:                 aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-bitmaps-2020-06-09:
  iotests: Fix 291 across more file systems
  qcow2_format.py: dump bitmaps header extension
  qcow2: QcowHeaderExtension print names for extension magics
  qcow2_format: refactor QcowHeaderExtension as a subclass of Qcow2Struct
  qcow2_format.py: QcowHeaderExtension: add dump method
  qcow2_format.py: add field-formatting class
  qcow2_format.py: separate generic functionality of structure classes
  qcow2_format.py: use strings to specify c-type of struct fields
  qcow2_format.py: use modern string formatting
  qcow2_format.py: use tuples instead of lists for fields
  qcow2_format.py: drop new line printing at end of dump()
  qcow2.py: move qcow2 format classes to separate module
  qcow2.py: add licensing blurb
  qcow2.py: python style fixes
  qemu-img: Fix doc typo for 'bitmap' subcommand

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/470dd165d152...3666f684761a



reply via email to

[Prev in Thread] Current Thread [Next in Thread]