Commit 02756054 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Eric Blake
Browse files

qcow2.py: python style fixes 



Fix flake8 complaints.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200606081806.23897-2-vsementsov@virtuozzo.com>
Tested-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
[eblake: commit message improved]
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent 1d745940

tests/qemu-iotests/qcow2.py

+56 −39
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ import sys 
import struct

import string





class QcowHeaderExtension:



    def __init__(self, magic, length, data):
@@ -19,6 +20,7 @@ class QcowHeaderExtension: 
    def create(cls, magic, data):

        return QcowHeaderExtension(magic, len(data), data)





class QcowHeader:



    uint32_t = 'I'
@@ -46,7 +48,7 @@ class QcowHeader: 
        [uint64_t, 'mask', 'autoclear_features'],

        [uint32_t, '%d',   'refcount_order'],

        [uint32_t, '%d',   'header_length'],

    ];

    ]



    fmt = '>' + ''.join(field[0] for field in fields)
@@ -96,7 +98,8 @@ class QcowHeader: 
            else:

                padded = (length + 7) & ~7

                data = fd.read(padded)

                self.extensions.append(QcowHeaderExtension(magic, length, data))

                self.extensions.append(QcowHeaderExtension(magic, length,

                                                           data))



    def update_extensions(self, fd):
@@ -108,14 +111,13 @@ class QcowHeader: 
            fd.write(buf)

            fd.write(ex.data)



        if self.backing_file != None:

        if self.backing_file is not None:

            self.backing_file_offset = fd.tell()

            fd.write(self.backing_file)



        if fd.tell() > self.cluster_size:

            raise Exception("I think I just broke the image...")





    def update(self, fd):

        header_bytes = self.header_length
@@ -163,19 +165,21 @@ def cmd_dump_header(fd): 
    h.dump()

    h.dump_extensions()





def cmd_dump_header_exts(fd):

    h = QcowHeader(fd)

    h.dump_extensions()





def cmd_set_header(fd, name, value):

    try:

        value = int(value, 0)

    except:

    except ValueError:

        print("'%s' is not a valid number" % value)

        sys.exit(1)



    fields = (field[2] for field in QcowHeader.fields)

    if not name in fields:

    if name not in fields:

        print("'%s' is not a known header field" % name)

        sys.exit(1)
@@ -183,25 +187,29 @@ def cmd_set_header(fd, name, value): 
    h.__dict__[name] = value

    h.update(fd)





def cmd_add_header_ext(fd, magic, data):

    try:

        magic = int(magic, 0)

    except:

    except ValueError:

        print("'%s' is not a valid magic number" % magic)

        sys.exit(1)



    h = QcowHeader(fd)

    h.extensions.append(QcowHeaderExtension.create(magic, data.encode('ascii')))

    h.extensions.append(QcowHeaderExtension.create(magic,

                                                   data.encode('ascii')))

    h.update(fd)





def cmd_add_header_ext_stdio(fd, magic):

    data = sys.stdin.read()

    cmd_add_header_ext(fd, magic, data)





def cmd_del_header_ext(fd, magic):

    try:

        magic = int(magic, 0)

    except:

    except ValueError:

        print("'%s' is not a valid magic number" % magic)

        sys.exit(1)
@@ -219,12 +227,13 @@ def cmd_del_header_ext(fd, magic): 


    h.update(fd)





def cmd_set_feature_bit(fd, group, bit):

    try:

        bit = int(bit, 0)

        if bit < 0 or bit >= 64:

            raise ValueError

    except:

    except ValueError:

        print("'%s' is not a valid bit number in range [0, 64)" % bit)

        sys.exit(1)
@@ -236,21 +245,27 @@ def cmd_set_feature_bit(fd, group, bit): 
    elif group == 'autoclear':

        h.autoclear_features |= 1 << bit

    else:

        print("'%s' is not a valid group, try 'incompatible', 'compatible', or 'autoclear'" % group)

        print("'%s' is not a valid group, try "

              "'incompatible', 'compatible', or 'autoclear'" % group)

        sys.exit(1)



    h.update(fd)





cmds = [

    [ 'dump-header',          cmd_dump_header,          0, 'Dump image header and header extensions' ],

    [ 'dump-header-exts',     cmd_dump_header_exts,     0, 'Dump image header extensions' ],

    ['dump-header', cmd_dump_header, 0,

     'Dump image header and header extensions'],

    ['dump-header-exts', cmd_dump_header_exts, 0,

     'Dump image header extensions'],

    ['set-header', cmd_set_header, 2, 'Set a field in the header'],

    ['add-header-ext', cmd_add_header_ext, 2, 'Add a header extension'],

    [ 'add-header-ext-stdio', cmd_add_header_ext_stdio, 1, 'Add a header extension, data from stdin' ],

    ['add-header-ext-stdio', cmd_add_header_ext_stdio, 1,

     'Add a header extension, data from stdin'],

    ['del-header-ext', cmd_del_header_ext, 1, 'Delete a header extension'],

    ['set-feature-bit', cmd_set_feature_bit, 2, 'Set a feature bit'],

]





def main(filename, cmd, args):

    fd = open(filename, "r+b")

    try:
@@ -267,6 +282,7 @@ def main(filename, cmd, args): 
    finally:

        fd.close()





def usage():

    print("Usage: %s <file> <cmd> [<arg>, ...]" % sys.argv[0])

    print("")
@@ -274,6 +290,7 @@ def usage(): 
    for name, handler, num_args, desc in cmds:

        print("    %-20s - %s" % (name, desc))





if __name__ == '__main__':

    if len(sys.argv) < 3:

        usage()